From 5e3476ad1512b19a446bc9a078939c8e78f19698 Mon Sep 17 00:00:00 2001
From: Benjamin Toby <benoti.san@gmail.com>
Date: Sun, 9 Feb 2025 13:54:01 +0100
Subject: [PATCH] Updates

---
 .../utils/data-fetching/method-crud.js              | 11 ++++-------
 package-shared/utils/data-fetching/method-crud.ts   | 13 ++++++-------
 package.json                                        |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/dist/package-shared/utils/data-fetching/method-crud.js b/dist/package-shared/utils/data-fetching/method-crud.js
index a744eee..4d86a02 100644
--- a/dist/package-shared/utils/data-fetching/method-crud.js
+++ b/dist/package-shared/utils/data-fetching/method-crud.js
@@ -30,8 +30,8 @@ function dsqlMethodCrud(_a) {
             let LIMIT = 10;
             let PAGE = 1;
             let OFFSET = (PAGE - 1) * LIMIT;
-            if (finalQuery) {
-                const newFinalQuery = lodash_1.default.cloneDeep(finalQuery);
+            if (method == "GET") {
+                const newFinalQuery = lodash_1.default.cloneDeep(finalQuery || {});
                 Object.keys(newFinalQuery).forEach((key) => {
                     const value = newFinalQuery[key];
                     if (typeof value == "string" && value.match(/^\{|^\[/)) {
@@ -51,9 +51,6 @@ function dsqlMethodCrud(_a) {
                 OFFSET = (PAGE - 1) * LIMIT;
                 finalQuery = newFinalQuery;
             }
-            else {
-                finalQuery = {};
-            }
             let finalData = finalBody
                 ? Object.assign(Object.assign({}, finalBody), extraData)
                 : {};
@@ -76,7 +73,7 @@ function dsqlMethodCrud(_a) {
                     console.log("DEBUG:::transforming Query ...");
                 }
                 finalQuery = yield transformQuery({
-                    query: finalQuery,
+                    query: finalQuery || {},
                     user,
                     reqMethod: method,
                 });
@@ -90,7 +87,7 @@ function dsqlMethodCrud(_a) {
                     const GET_RESULT = yield (0, crud_1.default)({
                         action: "get",
                         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
                                     ? {
                                         [addUser.field]: {
diff --git a/package-shared/utils/data-fetching/method-crud.ts b/package-shared/utils/data-fetching/method-crud.ts
index 761257e..cf47a63 100644
--- a/package-shared/utils/data-fetching/method-crud.ts
+++ b/package-shared/utils/data-fetching/method-crud.ts
@@ -54,9 +54,10 @@ export default async function dsqlMethodCrud<
         let PAGE = 1;
         let OFFSET = (PAGE - 1) * LIMIT;
 
-        if (finalQuery) {
-            const newFinalQuery = _.cloneDeep(finalQuery);
-
+        if (method == "GET") {
+            const newFinalQuery = _.cloneDeep(
+                finalQuery || ({} as DsqlCrudQueryObject<T>)
+            );
             Object.keys(newFinalQuery).forEach((key) => {
                 const value = newFinalQuery[key];
                 if (typeof value == "string" && value.match(/^\{|^\[/)) {
@@ -75,8 +76,6 @@ export default async function dsqlMethodCrud<
             OFFSET = (PAGE - 1) * LIMIT;
 
             finalQuery = newFinalQuery;
-        } else {
-            finalQuery = {};
         }
 
         let finalData = finalBody
@@ -112,7 +111,7 @@ export default async function dsqlMethodCrud<
             }
 
             finalQuery = await transformQuery({
-                query: finalQuery,
+                query: finalQuery || {},
                 user,
                 reqMethod: method,
             });
@@ -129,7 +128,7 @@ export default async function dsqlMethodCrud<
                     action: "get",
                     table: tableName,
                     query:
-                        finalQuery && Object.keys(finalQuery)?.[0]
+                        finalQuery && Boolean(Object.keys(finalQuery)?.[0])
                             ? ({
                                   ...finalQuery,
                                   query: {
diff --git a/package.json b/package.json
index a5b6875..2cd30d9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "4.0.2",
+    "version": "4.0.3",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {