diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts index c11d328..c0c43c2 100644 --- a/dist/package-shared/types/index.d.ts +++ b/dist/package-shared/types/index.d.ts @@ -1285,4 +1285,43 @@ export type ApiGetQueryObject = { + method: (typeof DataCrudRequestMethods)[number]; + body?: T; + query?: string | T; + tableName: string; + addUser?: { + field: string; + }; + user?: DATASQUIREL_LoggedInUser; + extraData?: T; + transform?: ({ data, existingData, user, }: { + user?: DATASQUIREL_LoggedInUser; + data: T; + existingData?: T; + reqMethod: (typeof DataCrudRequestMethods)[number]; + }) => Promise; + existingData?: T; +}; +export declare const DsqlCrudActions: readonly ["insert", "update", "delete", "get"]; +export type DsqlCrudQueryObject = ServerQueryParam & { + query: ServerQueryQueryObject; +}; +export type DsqlCrudParam = { + action: (typeof DsqlCrudActions)[number]; + table: string; + data?: T; + targetId?: string | number; + query?: DsqlCrudQueryObject; + sanitize?: (data?: T) => T; +}; export {}; diff --git a/dist/package-shared/types/index.js b/dist/package-shared/types/index.js index 442b8f2..1f53184 100644 --- a/dist/package-shared/types/index.js +++ b/dist/package-shared/types/index.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.ServerQueryEqualities = exports.ServerQueryOperators = exports.TextFieldTypesArray = void 0; +exports.DsqlCrudActions = exports.DataCrudRequestMethods = exports.ServerQueryEqualities = exports.ServerQueryOperators = exports.TextFieldTypesArray = void 0; exports.TextFieldTypesArray = [ { title: "Plain Text", value: "plain" }, { title: "Rich Text", value: "richText" }, @@ -12,3 +12,5 @@ exports.TextFieldTypesArray = [ ]; exports.ServerQueryOperators = ["AND", "OR"]; exports.ServerQueryEqualities = ["EQUAL", "LIKE", "NOT EQUAL"]; +exports.DataCrudRequestMethods = ["GET", "POST", "PUT", "DELETE"]; +exports.DsqlCrudActions = ["insert", "update", "delete", "get"]; diff --git a/dist/package-shared/utils/data-fetching/crud.d.ts b/dist/package-shared/utils/data-fetching/crud.d.ts index 3d80f62..383eab5 100644 --- a/dist/package-shared/utils/data-fetching/crud.d.ts +++ b/dist/package-shared/utils/data-fetching/crud.d.ts @@ -1,25 +1,9 @@ import sqlGenerator from "../../functions/dsql/sql/sql-generator"; -import { PostReturn, ServerQueryParam, ServerQueryQueryObject } from "../../types"; -export declare const DsqlCrudActions: readonly ["insert", "update", "delete", "get"]; -export type CrudQueryObject = ServerQueryParam & { - query: ServerQueryQueryObject; -}; -export type CrudParam = { - action: (typeof DsqlCrudActions)[number]; - table: string; - data?: T; - targetId?: string | number; - query?: CrudQueryObject; - sanitize?: (data?: T) => T; -}; +import { DsqlCrudParam, PostReturn } from "../../types"; export default function dsqlCrud({ action, data, table, targetId, query, sanitize, }: CrudParam): Promise<(PostReturn & { +}>({ action, data, table, targetId, query, sanitize, }: DsqlCrudParam): Promise<(PostReturn & { queryObject?: ReturnType>; }) | null>; diff --git a/dist/package-shared/utils/data-fetching/crud.js b/dist/package-shared/utils/data-fetching/crud.js index ba95a5c..fe71ce8 100644 --- a/dist/package-shared/utils/data-fetching/crud.js +++ b/dist/package-shared/utils/data-fetching/crud.js @@ -12,12 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.DsqlCrudActions = void 0; exports.default = dsqlCrud; const get_1 = __importDefault(require("../../actions/get")); const post_1 = __importDefault(require("../../actions/post")); const sql_generator_1 = __importDefault(require("../../functions/dsql/sql/sql-generator")); -exports.DsqlCrudActions = ["insert", "update", "delete", "get"]; function dsqlCrud(_a) { return __awaiter(this, arguments, void 0, function* ({ action, data, table, targetId, query, sanitize, }) { const finalData = sanitize ? sanitize(data) : data; diff --git a/dist/package-shared/utils/data-fetching/method-crud.d.ts b/dist/package-shared/utils/data-fetching/method-crud.d.ts index 6434c10..e5389a7 100644 --- a/dist/package-shared/utils/data-fetching/method-crud.d.ts +++ b/dist/package-shared/utils/data-fetching/method-crud.d.ts @@ -1,5 +1,4 @@ -import { DATASQUIREL_LoggedInUser, ServerQueryParam } from "../../types"; -export declare const DataCrudRequestMethods: readonly ["GET", "POST", "PUT", "DELETE"]; +import { DsqlMethodCrudParam, ServerQueryParam } from "../../types"; export type APIDataCrudQuery = ServerQueryParam & { page?: number; }; @@ -9,28 +8,6 @@ export type CRUDResponseObject

= { msg?: string; error?: string; }; -export type DsqlMethodCrudParam = { - method: (typeof DataCrudRequestMethods)[number]; - body?: T; - query?: string | T; - tableName: string; - addUser?: { - field: string; - }; - user?: DATASQUIREL_LoggedInUser; - extraData?: T; - transform?: ({ data, existingData, user, }: { - user?: DATASQUIREL_LoggedInUser; - data: T; - existingData?: T; - reqMethod: (typeof DataCrudRequestMethods)[number]; - }) => Promise; - existingData?: T; -}; export default function dsqlMethodCrud = { + method: (typeof DataCrudRequestMethods)[number]; + body?: T; + query?: string | T; + tableName: string; + addUser?: { + field: string; + }; + user?: DATASQUIREL_LoggedInUser; + extraData?: T; + transform?: ({ + data, + existingData, + user, + }: { + user?: DATASQUIREL_LoggedInUser; + data: T; + existingData?: T; + reqMethod: (typeof DataCrudRequestMethods)[number]; + }) => Promise; + existingData?: T; +}; + +export const DsqlCrudActions = ["insert", "update", "delete", "get"] as const; + +export type DsqlCrudQueryObject = + ServerQueryParam & { + query: ServerQueryQueryObject; + }; + +export type DsqlCrudParam = { + action: (typeof DsqlCrudActions)[number]; + table: string; + data?: T; + targetId?: string | number; + query?: DsqlCrudQueryObject; + sanitize?: (data?: T) => T; +}; diff --git a/package-shared/utils/data-fetching/crud.ts b/package-shared/utils/data-fetching/crud.ts index 337e016..8bd3719 100644 --- a/package-shared/utils/data-fetching/crud.ts +++ b/package-shared/utils/data-fetching/crud.ts @@ -1,28 +1,7 @@ import get from "../../actions/get"; import post from "../../actions/post"; import sqlGenerator from "../../functions/dsql/sql/sql-generator"; -import { - PostReturn, - ServerQueryParam, - ServerQueryQueryObject, -} from "../../types"; -import numberfy from "../numberfy"; - -export const DsqlCrudActions = ["insert", "update", "delete", "get"] as const; - -export type CrudQueryObject = - ServerQueryParam & { - query: ServerQueryQueryObject; - }; - -export type CrudParam = { - action: (typeof DsqlCrudActions)[number]; - table: string; - data?: T; - targetId?: string | number; - query?: CrudQueryObject; - sanitize?: (data?: T) => T; -}; +import { DsqlCrudParam, PostReturn } from "../../types"; export default async function dsqlCrud< T extends { [key: string]: any } = { [key: string]: any } @@ -33,7 +12,7 @@ export default async function dsqlCrud< targetId, query, sanitize, -}: CrudParam): Promise< +}: DsqlCrudParam): Promise< | (PostReturn & { queryObject?: ReturnType>; }) diff --git a/package-shared/utils/data-fetching/method-crud.ts b/package-shared/utils/data-fetching/method-crud.ts index 29b9127..96b8b5a 100644 --- a/package-shared/utils/data-fetching/method-crud.ts +++ b/package-shared/utils/data-fetching/method-crud.ts @@ -1,9 +1,7 @@ -import { DATASQUIREL_LoggedInUser, ServerQueryParam } from "../../types"; +import { DsqlMethodCrudParam, ServerQueryParam } from "../../types"; import EJSON from "../ejson"; import dsqlCrud from "./crud"; -export const DataCrudRequestMethods = ["GET", "POST", "PUT", "DELETE"] as const; - export type APIDataCrudQuery = ServerQueryParam & { page?: number; }; @@ -15,31 +13,6 @@ export type CRUDResponseObject

= { error?: string; }; -export type DsqlMethodCrudParam< - T extends { [key: string]: any } = { [key: string]: any } -> = { - method: (typeof DataCrudRequestMethods)[number]; - body?: T; - query?: string | T; - tableName: string; - addUser?: { - field: string; - }; - user?: DATASQUIREL_LoggedInUser; - extraData?: T; - transform?: ({ - data, - existingData, - user, - }: { - user?: DATASQUIREL_LoggedInUser; - data: T; - existingData?: T; - reqMethod: (typeof DataCrudRequestMethods)[number]; - }) => Promise; - existingData?: T; -}; - export default async function dsqlMethodCrud< T extends { [key: string]: any } = { [key: string]: any }, P extends { [key: string]: any } = { [key: string]: any } @@ -96,7 +69,7 @@ export default async function dsqlMethodCrud< data: finalData, existingData: existingData, user, - reqMethod: method as (typeof DataCrudRequestMethods)[number], + reqMethod: method, }); } diff --git a/package.json b/package.json index 59e6220..8469ac4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "3.8.6", + "version": "3.8.7", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {