Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Benjamin Toby 2025-02-07 13:58:34 +01:00
parent 64ee344ba1
commit b8fbbd3afb
5 changed files with 56 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/package-shared/types/index.d.ts vendored
View File

@ -1313,9 +1313,10 @@ export type DsqlCrudTransformFunction<T extends {
[key: string]: any; [key: string]: any;
} = { } = {
[key: string]: any; [key: string]: any;
}> = ({ data, existingData, user, }: { }> = ({ data, query, existingData, user, }: {
user?: DATASQUIREL_LoggedInUser; user?: DATASQUIREL_LoggedInUser;
data: T; data?: T;
query?: DsqlCrudQueryObject<T>;
existingData?: T; existingData?: T;
reqMethod: (typeof DataCrudRequestMethods)[number]; reqMethod: (typeof DataCrudRequestMethods)[number];
}) => Promise<T>; }) => Promise<T>;

37
dist/package-shared/utils/data-fetching/method-crud.js vendored
View File

@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.default = dsqlMethodCrud; exports.default = dsqlMethodCrud;
const lodash_1 = __importDefault(require("lodash"));
const deserialize_query_1 = __importDefault(require("../deserialize-query")); const deserialize_query_1 = __importDefault(require("../deserialize-query"));
const ejson_1 = __importDefault(require("../ejson")); const ejson_1 = __importDefault(require("../ejson"));
const numberfy_1 = __importDefault(require("../numberfy")); const numberfy_1 = __importDefault(require("../numberfy"));
@ -29,36 +30,46 @@ function dsqlMethodCrud(_a) {
let PAGE = 1; let PAGE = 1;
let OFFSET = (PAGE - 1) * LIMIT; let OFFSET = (PAGE - 1) * LIMIT;
if (finalQuery) { if (finalQuery) {
Object.keys(finalQuery).forEach((key) => { const newFinalQuery = lodash_1.default.cloneDeep(finalQuery);
const value = finalQuery[key]; Object.keys(newFinalQuery).forEach((key) => {
const value = newFinalQuery[key];
if (typeof value == "string" && value.match(/^\{|^\[/)) { if (typeof value == "string" && value.match(/^\{|^\[/)) {
finalQuery[key] = ejson_1.default.stringify(value); newFinalQuery[key] = ejson_1.default.stringify(value);
} }
if (value == "true") { if (value == "true") {
finalQuery[key] = true; newFinalQuery[key] = true;
} }
if (value == "false") { if (value == "false") {
finalQuery[key] = false; newFinalQuery[key] = false;
} }
}); });
if (finalQuery.limit) if (newFinalQuery.limit)
LIMIT = (0, numberfy_1.default)(finalQuery.limit); LIMIT = (0, numberfy_1.default)(newFinalQuery.limit);
if (finalQuery.page) if (newFinalQuery.page)
PAGE = (0, numberfy_1.default)(finalQuery.page); PAGE = (0, numberfy_1.default)(newFinalQuery.page);
OFFSET = (PAGE - 1) * LIMIT; OFFSET = (PAGE - 1) * LIMIT;
finalQuery = newFinalQuery;
}
else {
finalQuery = {};
} }
let finalData = finalBody let finalData = finalBody
? Object.assign(Object.assign({}, finalBody), extraData) ? Object.assign(Object.assign({}, finalBody), extraData)
: undefined; : {};
if (finalData && (user === null || user === void 0 ? void 0 : user.id) && addUser) { if ((user === null || user === void 0 ? void 0 : user.id) && addUser) {
finalData = Object.assign(Object.assign({}, finalData), { [addUser.field]: String(user.id) }); finalData = Object.assign(Object.assign({}, finalData), { [addUser.field]: String(user.id) });
} }
if (transform && finalData) { if (transform) {
finalData = yield transform({ finalData = (yield transform({
data: finalData, data: finalData,
existingData: existingData, existingData: existingData,
user, user,
reqMethod: method, reqMethod: method,
}));
finalQuery = yield transform({
query: finalQuery,
user,
reqMethod: method,
}); });
} }
switch (method) { switch (method) {

4
package-shared/types/index.ts
View File

@ -1489,11 +1489,13 @@ export type DsqlCrudTransformFunction<
T extends { [key: string]: any } = { [key: string]: any } T extends { [key: string]: any } = { [key: string]: any }
> = ({ > = ({
data, data,
query,
existingData, existingData,
user, user,
}: { }: {
user?: DATASQUIREL_LoggedInUser; user?: DATASQUIREL_LoggedInUser;
data: T; data?: T;
query?: DsqlCrudQueryObject<T>;
existingData?: T; existingData?: T;
reqMethod: (typeof DataCrudRequestMethods)[number]; reqMethod: (typeof DataCrudRequestMethods)[number];
}) => Promise<T>; }) => Promise<T>;

37
package-shared/utils/data-fetching/method-crud.ts
View File

@ -1,3 +1,4 @@
import _ from "lodash";
import sqlGenerator from "../../functions/dsql/sql/sql-generator"; import sqlGenerator from "../../functions/dsql/sql/sql-generator";
import { import {
DsqlCrudQueryObject, DsqlCrudQueryObject,
@ -52,22 +53,28 @@ export default async function dsqlMethodCrud<
let OFFSET = (PAGE - 1) * LIMIT; let OFFSET = (PAGE - 1) * LIMIT;
if (finalQuery) { if (finalQuery) {
Object.keys(finalQuery).forEach((key) => { const newFinalQuery = _.cloneDeep(finalQuery);
const value = finalQuery[key];
Object.keys(newFinalQuery).forEach((key) => {
const value = newFinalQuery[key];
if (typeof value == "string" && value.match(/^\{|^\[/)) { if (typeof value == "string" && value.match(/^\{|^\[/)) {
finalQuery[key] = EJSON.stringify(value); newFinalQuery[key] = EJSON.stringify(value);
} }
if (value == "true") { if (value == "true") {
finalQuery[key] = true; newFinalQuery[key] = true;
} }
if (value == "false") { if (value == "false") {
finalQuery[key] = false; newFinalQuery[key] = false;
} }
}); });
if (finalQuery.limit) LIMIT = numberfy(finalQuery.limit); if (newFinalQuery.limit) LIMIT = numberfy(newFinalQuery.limit);
if (finalQuery.page) PAGE = numberfy(finalQuery.page); if (newFinalQuery.page) PAGE = numberfy(newFinalQuery.page);
OFFSET = (PAGE - 1) * LIMIT; OFFSET = (PAGE - 1) * LIMIT;
finalQuery = newFinalQuery;
} else {
finalQuery = {};
} }
let finalData = finalBody let finalData = finalBody
@ -75,21 +82,27 @@ export default async function dsqlMethodCrud<
...finalBody, ...finalBody,
...extraData, ...extraData,
} as T) } as T)
: undefined; : ({} as T);
if (finalData && user?.id && addUser) { if (user?.id && addUser) {
finalData = { finalData = {
...finalData, ...finalData,
[addUser.field]: String(user.id), [addUser.field]: String(user.id),
}; } as T;
} }
if (transform && finalData) { if (transform) {
finalData = await transform({ finalData = (await transform({
data: finalData, data: finalData,
existingData: existingData, existingData: existingData,
user, user,
reqMethod: method, reqMethod: method,
})) as T;
finalQuery = await transform({
query: finalQuery,
user,
reqMethod: method,
}); });
} }

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@moduletrace/datasquirel", "name": "@moduletrace/datasquirel",
"version": "3.9.9", "version": "4.0.0",
"description": "Cloud-based SQL data management tool", "description": "Cloud-based SQL data management tool",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {