prostgles-server 2.0.196 → 2.0.199

package/lib/QueryBuilder.ts

@@ -1326,7 +1326,7 @@ export async function getNewQuery(
   //   .filter(s => s.type !== "joinedColumn")
   //   .map(s => s.alias);
     
-  const where = await _this.prepareWhere({
+  const filterOpts = await _this.prepareWhere({
     filter, 
     select, 
     forcedFilter: get(tableRules, "select.forcedFilter"), 
@@ -1335,6 +1335,7 @@ export async function getNewQuery(
     localParams,
     tableRule: tableRules
   });
+  const where = filterOpts.where;
   const p = _this.getValidatedRules(tableRules, localParams);
 
   let resQuery: NewQuery = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.196",
+  "version": "2.0.199",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -24,8 +24,8 @@
   },
   "homepage": "https://github.com/prostgles/prostgles-server-js#readme",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.95.0",
-    "aws-sdk": "^2.1141.0",
+    "@aws-sdk/client-s3": "^3.121.0",
+    "aws-sdk": "^2.1168.0",
     "bluebird": "^3.7.2",
     "file-type": "^17.1.2",
     "pg-promise": "^10.11.1",
@@ -33,9 +33,9 @@
     "sharp": "^0.30.7"
   },
   "devDependencies": {
-    "@aws-sdk/types": "^3.34.0",
+    "@aws-sdk/types": "^3.110.0",
     "@types/bluebird": "^3.5.36",
-    "@types/node": "^14.14.35",
+    "@types/node": "^18.0.3",
     "@types/sharp": "^0.30.4",
     "typescript": "^4.7.4"
   }

package/tests/client/PID.txt

@@ -1 +1 @@
-9812
+13021

package/tests/client/package-lock.json

@@ -10,7 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "@types/node": "^14.14.16",
-        "prostgles-client": "^1.5.165",
+        "prostgles-client": "^1.5.166",
         "prostgles-types": "^1.5.68",
         "socket.io-client": "^4.5.1"
       }
@@ -67,9 +67,9 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/prostgles-client": {
-      "version": "1.5.165",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.165.tgz",
-      "integrity": "sha512-aoC99ttKrwjjSiz0Fi6WPsX/RAeIVX2yK66biC1ijT1LZWFJn8t1UWxIRIFyEQMJjy4NhwZ2kLbDh1o0Pl5JoQ==",
+      "version": "1.5.166",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.166.tgz",
+      "integrity": "sha512-O/oKyXIbhtRW10KyR2pHlU5hExdw0vKOQXlgHmTKQ11zQkNr/aFPQyhctCB9J0n/SrSNtcxuZbMkZp9v1YjC/A==",
       "dependencies": {
         "prostgles-types": "^1.5.162"
       }
@@ -176,9 +176,9 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "prostgles-client": {
-      "version": "1.5.165",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.165.tgz",
-      "integrity": "sha512-aoC99ttKrwjjSiz0Fi6WPsX/RAeIVX2yK66biC1ijT1LZWFJn8t1UWxIRIFyEQMJjy4NhwZ2kLbDh1o0Pl5JoQ==",
+      "version": "1.5.166",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.166.tgz",
+      "integrity": "sha512-O/oKyXIbhtRW10KyR2pHlU5hExdw0vKOQXlgHmTKQ11zQkNr/aFPQyhctCB9J0n/SrSNtcxuZbMkZp9v1YjC/A==",
       "requires": {
         "prostgles-types": "^1.5.162"
       }

package/tests/client/package.json

@@ -13,7 +13,7 @@
   "license": "ISC",
   "dependencies": {
     "@types/node": "^14.14.16",
-    "prostgles-client": "^1.5.165",
+    "prostgles-client": "^1.5.166",
     "prostgles-types": "^1.5.68",
     "socket.io-client": "^4.5.1"
   }

package/tests/isomorphic_queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isomorphic_queries.d.ts","sourceRoot":"","sources":["isomorphic_queries.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGtD,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,iBAYzE;AACD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,oBAW7F;AAED,wBAA8B,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,iBAovB/F"}
+{"version":3,"file":"isomorphic_queries.d.ts","sourceRoot":"","sources":["isomorphic_queries.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGtD,wBAAsB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,iBAYzE;AACD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,oBAW7F;AAED,wBAA8B,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,iBA2vB/F"}

package/tests/isomorphic_queries.js

@@ -481,8 +481,9 @@ async function isomorphic(db) {
             //  extent3D: 'BOX3D(-2 1 0,-1 2 6.952908662134e-310)' <-- looks like a value that will fail tests at some point
         });
     });
+    const fileName = "sample_file.txt";
     await tryRun("Local file upload", async () => {
-        let str = "This is a string", data = Buffer.from(str, "utf-8"), mediaFile = { data, name: "sample_file.txt" };
+        let str = "This is a string", data = Buffer.from(str, "utf-8"), mediaFile = { data, name: fileName };
         const file = await db.media.insert(mediaFile, { returning: "*" });
         const _data = fs.readFileSync(__dirname + "/server/media/" + file.name);
         assert_1.strict.equal(str, _data.toString('utf8'));
@@ -508,6 +509,9 @@ async function isomorphic(db) {
         //   );
         // });
     });
+    await tryRun("Local file delete", async () => {
+        const file = await db.media.delete({ name: fileName }, { returning: "*" });
+    });
     await tryRun("Exists filter example", async () => {
         const fo = await db.items.findOne(), f = await db.items.find();
         assert_1.strict.deepStrictEqual(fo, { h: null, id: 1, name: 'a' }, "findOne query failed");

package/tests/isomorphic_queries.ts

@@ -539,10 +539,11 @@ export default async function isomorphic(db: Partial<DBHandlerServer> | Partial<
 
   });
 
+  const fileName = "sample_file.txt"
   await tryRun("Local file upload", async () => {
     let str = "This is a string",
       data = Buffer.from(str, "utf-8"),
-      mediaFile = { data, name: "sample_file.txt" }
+      mediaFile = { data, name: fileName }
 
     const file = await db.media.insert(mediaFile, { returning: "*" });
     const _data = fs.readFileSync(__dirname + "/server/media/"+file.name);
@@ -580,6 +581,12 @@ export default async function isomorphic(db: Partial<DBHandlerServer> | Partial<
     // });
   });
 
+  await tryRun("Local file delete", async () => {
+
+    const file = await db.media.delete({ name: fileName }, { returning: "*" });
+    
+  })
+
   
   await tryRun("Exists filter example", async () => {
   

package/tests/server/index.js

@@ -157,7 +157,6 @@ function dd() {
             }
             return true;
         },
-        // DEBUG_MODE: true,
         publishRawSQL: async (params) => {
             return true; // Boolean(user && user.type === "admin")
         },

package/tests/server/index.ts

@@ -184,7 +184,6 @@ function dd(){
 			}
 			return true;
 		},
-		// DEBUG_MODE: true,
 		
 		publishRawSQL: async (params) => {
 			return true;// Boolean(user && user.type === "admin")

package/tests/server/package-lock.json

@@ -21,11 +21,11 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.195",
+      "version": "2.0.198",
       "license": "MIT",
       "dependencies": {
-        "@aws-sdk/client-s3": "^3.95.0",
-        "aws-sdk": "^2.1141.0",
+        "@aws-sdk/client-s3": "^3.121.0",
+        "aws-sdk": "^2.1168.0",
         "bluebird": "^3.7.2",
         "file-type": "^17.1.2",
         "pg-promise": "^10.11.1",
@@ -33,9 +33,9 @@
         "sharp": "^0.30.7"
       },
       "devDependencies": {
-        "@aws-sdk/types": "^3.34.0",
+        "@aws-sdk/types": "^3.110.0",
         "@types/bluebird": "^3.5.36",
-        "@types/node": "^14.14.35",
+        "@types/node": "^18.0.3",
         "@types/sharp": "^0.30.4",
         "typescript": "^4.7.4"
       }
@@ -1362,12 +1362,12 @@
     "prostgles-server": {
       "version": "file:../..",
       "requires": {
-        "@aws-sdk/client-s3": "^3.95.0",
-        "@aws-sdk/types": "^3.34.0",
+        "@aws-sdk/client-s3": "^3.121.0",
+        "@aws-sdk/types": "^3.110.0",
         "@types/bluebird": "^3.5.36",
-        "@types/node": "^14.14.35",
+        "@types/node": "^18.0.3",
         "@types/sharp": "^0.30.4",
-        "aws-sdk": "^2.1141.0",
+        "aws-sdk": "^2.1168.0",
         "bluebird": "^3.7.2",
         "file-type": "^17.1.2",
         "pg-promise": "^10.11.1",