prostgles-server 2.0.130 → 2.0.131

package/dist/Filtering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Filtering.d.ts","sourceRoot":"","sources":["../lib/Filtering.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAW,UAAU,EAAsG,MAAM,iBAAiB,CAAC;AAG1J;;;EAGE;AACF,aAAK,mBAAmB,GAAG;IAAG,MAAM,EAAE,UAAU,CAAC;IAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAE,CAAC;AACzG,eAAO,MAAM,eAAe,SAAU,mBAAmB,KAAG,MAkR3D,CAAA"}
+{"version":3,"file":"Filtering.d.ts","sourceRoot":"","sources":["../lib/Filtering.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAW,UAAU,EAAsG,MAAM,iBAAiB,CAAC;AAG1J;;;EAGE;AACF,aAAK,mBAAmB,GAAG;IAAG,MAAM,EAAE,UAAU,CAAC;IAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAE,CAAC;AACzG,eAAO,MAAM,eAAe,SAAU,mBAAmB,KAAG,MAwR3D,CAAA"}

package/dist/Filtering.js

@@ -192,18 +192,24 @@ exports.parseFilterItem = (args) => {
         else if (["$in"].includes(fOpType)) {
             if (!(fVal === null || fVal === void 0 ? void 0 : fVal.length))
                 throw "$in filter array is empty";
-            let res = leftQ + " IN " + parseRightVal(fVal, "csv");
+            let _fVal = fVal.filter(v => v !== null);
+            let c1 = "", c2 = "";
+            if (_fVal.length)
+                c1 = leftQ + " IN " + parseRightVal(_fVal, "csv");
             if (fVal.includes(null))
-                res += ` OR ${leftQ} IS NULL `;
-            return res;
+                c2 = ` ${leftQ} IS NULL `;
+            return [c1, c2].filter(c => c).join(" OR ");
         }
         else if (["$nin"].includes(fOpType)) {
             if (!(fVal === null || fVal === void 0 ? void 0 : fVal.length))
                 throw "$nin filter array is empty";
-            let res = leftQ + " NOT IN " + parseRightVal(fVal, "csv");
+            let _fVal = fVal.filter(v => v !== null);
+            let c1 = "", c2 = "";
+            if (_fVal.length)
+                c1 = leftQ + " NOT IN " + parseRightVal(_fVal, "csv");
             if (fVal.includes(null))
-                res += ` AND ${leftQ} IS NOT NULL `;
-            return res;
+                c2 = ` ${leftQ} IS NOT NULL `;
+            return [c1, c2].filter(c => c).join(" AND ");
         }
         else if (["$between"].includes(fOpType)) {
             if (!Array.isArray(fVal) || fVal.length !== 2) {

package/dist/Filtering.js.map

@@ -1 +1 @@
-{"version":3,"file":"Filtering.js","sourceRoot":"","sources":["../lib/Filtering.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Filtering.js","sourceRoot":"","sources":["../lib/Filtering.ts"],"names":[],"mappings":"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"}

package/lib/Filtering.ts

@@ -224,15 +224,21 @@ export const parseFilterItem = (args: ParseFilterItemArgs): string => {
 
     } else if(["$in"].includes(fOpType)){
       if(!fVal?.length) throw "$in filter array is empty";
-      let res = leftQ + " IN " + parseRightVal(fVal, "csv");
-      if(fVal.includes(null)) res += ` OR ${leftQ} IS NULL `
-      return res;
+
+      let _fVal: any[] = fVal.filter(v => v !== null);
+      let c1 = "", c2 = "";
+      if(_fVal.length) c1 = leftQ + " IN " + parseRightVal(_fVal, "csv");
+      if(fVal.includes(null)) c2 = ` ${leftQ} IS NULL `;
+      return [c1, c2].filter(c => c).join(" OR ");
 
     } else if(["$nin"].includes(fOpType)){
       if(!fVal?.length) throw "$nin filter array is empty";
-      let res = leftQ + " NOT IN " + parseRightVal(fVal, "csv");
-      if(fVal.includes(null)) res += ` AND ${leftQ} IS NOT NULL `
-      return res;
+
+      let _fVal: any[] = fVal.filter(v => v !== null);
+      let c1 = "", c2 = "";
+      if(_fVal.length) c1 = leftQ + " NOT IN " + parseRightVal(_fVal, "csv");
+      if(fVal.includes(null)) c2 = ` ${leftQ} IS NOT NULL `;
+      return [c1, c2].filter(c => c).join(" AND ");
 
     } else if(["$between"].includes(fOpType)){
       if(!Array.isArray(fVal) || fVal.length !== 2){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.130",
+  "version": "2.0.131",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/client/PID.txt

@@ -1 +1 @@
-6505
+12112

package/tests/server/package-lock.json

@@ -23,7 +23,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.129",
+      "version": "2.0.130",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.32.0",