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-09 13:54:01 +01:00
parent 3358412028
commit 5e3476ad15
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,8 +30,8 @@ function dsqlMethodCrud(_a) {
let LIMIT = 10; let LIMIT = 10;
let PAGE = 1; let PAGE = 1;
let OFFSET = (PAGE - 1) * LIMIT; let OFFSET = (PAGE - 1) * LIMIT;
if (finalQuery) { if (method == "GET") {
const newFinalQuery = lodash_1.default.cloneDeep(finalQuery); const newFinalQuery = lodash_1.default.cloneDeep(finalQuery || {});
Object.keys(newFinalQuery).forEach((key) => { Object.keys(newFinalQuery).forEach((key) => {
const value = newFinalQuery[key]; const value = newFinalQuery[key];
if (typeof value == "string" && value.match(/^\{|^\[/)) { if (typeof value == "string" && value.match(/^\{|^\[/)) {
@ -51,9 +51,6 @@ function dsqlMethodCrud(_a) {
OFFSET = (PAGE - 1) * LIMIT; OFFSET = (PAGE - 1) * LIMIT;
finalQuery = newFinalQuery; finalQuery = newFinalQuery;
} }
else {
finalQuery = {};
}
let finalData = finalBody let finalData = finalBody
? Object.assign(Object.assign({}, finalBody), extraData) ? Object.assign(Object.assign({}, finalBody), extraData)
: {}; : {};
@ -76,7 +73,7 @@ function dsqlMethodCrud(_a) {
console.log("DEBUG:::transforming Query ..."); console.log("DEBUG:::transforming Query ...");
} }
finalQuery = yield transformQuery({ finalQuery = yield transformQuery({
query: finalQuery, query: finalQuery || {},
user, user,
reqMethod: method, reqMethod: method,
}); });
@ -90,7 +87,7 @@ function dsqlMethodCrud(_a) {
const GET_RESULT = yield (0, crud_1.default)({ const GET_RESULT = yield (0, crud_1.default)({
action: "get", action: "get",
table: tableName, table: tableName,
query: finalQuery && ((_b = Object.keys(finalQuery)) === null || _b === void 0 ? void 0 : _b[0]) query: finalQuery && Boolean((_b = Object.keys(finalQuery)) === null || _b === void 0 ? void 0 : _b[0])
? Object.assign(Object.assign({}, finalQuery), { query: Object.assign(Object.assign({}, finalQuery.query), ((user === null || user === void 0 ? void 0 : user.id) && addUser ? Object.assign(Object.assign({}, finalQuery), { query: Object.assign(Object.assign({}, finalQuery.query), ((user === null || user === void 0 ? void 0 : user.id) && addUser
? { ? {
[addUser.field]: { [addUser.field]: {

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

@ -54,9 +54,10 @@ export default async function dsqlMethodCrud<
let PAGE = 1; let PAGE = 1;
let OFFSET = (PAGE - 1) * LIMIT; let OFFSET = (PAGE - 1) * LIMIT;
if (finalQuery) { if (method == "GET") {
const newFinalQuery = _.cloneDeep(finalQuery); const newFinalQuery = _.cloneDeep(
finalQuery || ({} as DsqlCrudQueryObject<T>)
);
Object.keys(newFinalQuery).forEach((key) => { Object.keys(newFinalQuery).forEach((key) => {
const value = newFinalQuery[key]; const value = newFinalQuery[key];
if (typeof value == "string" && value.match(/^\{|^\[/)) { if (typeof value == "string" && value.match(/^\{|^\[/)) {
@ -75,8 +76,6 @@ export default async function dsqlMethodCrud<
OFFSET = (PAGE - 1) * LIMIT; OFFSET = (PAGE - 1) * LIMIT;
finalQuery = newFinalQuery; finalQuery = newFinalQuery;
} else {
finalQuery = {};
} }
let finalData = finalBody let finalData = finalBody
@ -112,7 +111,7 @@ export default async function dsqlMethodCrud<
} }
finalQuery = await transformQuery({ finalQuery = await transformQuery({
query: finalQuery, query: finalQuery || {},
user, user,
reqMethod: method, reqMethod: method,
}); });
@ -129,7 +128,7 @@ export default async function dsqlMethodCrud<
action: "get", action: "get",
table: tableName, table: tableName,
query: query:
finalQuery && Object.keys(finalQuery)?.[0] finalQuery && Boolean(Object.keys(finalQuery)?.[0])
? ({ ? ({
...finalQuery, ...finalQuery,
query: { query: {

2
package.json
View File

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