prostgles-server 2.0.145 → 2.0.148

package/tests/isomorphic_queries.ts

@@ -4,21 +4,33 @@ import { DbHandler} from "../dist/Prostgles";
 import { DBHandlerClient } from "./client/index";
 import * as fs from "fs";
 
-export async function tryRun(desc: string, func: () => any){
+export async function tryRun(desc: string, func: () => any, log?: Function){
   try {
     await func();
   } catch(err) {
     console.error(desc + " FAILED:");
-    throw err;
+    log?.("FAIL: ", err);
+    setTimeout(() => {
+      throw err;
+
+    }, 2000)
   }
 }
-export function tryRunP(desc: string, func: (resolve: any, reject: any) => any){
-  return new Promise((rv, rj) => {
-    func(rv, rj)
+export function tryRunP(desc: string, func: (resolve: any, reject: any) => any, log?: Function){
+  return new Promise(async (rv, rj) => {
+    try {
+      await func(rv, rj)
+    } catch(err: any){
+      log?.(JSON.stringify(err));
+      setTimeout(() => {
+        log?.("Throw err");
+        throw err;
+      }, 1000)
+    }
   });
 }
 
-export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHandlerClient>){
+export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHandlerClient>) {
   console.log("Starting isomorphic queries");
 
   if(await db.items.count()){
@@ -353,6 +365,29 @@ export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHand
     assert.equal(res, 1)
   });
 
+  await tryRun("Complex filtering", async () => {
+    const res = await db.various.count({ 
+      $and: [
+        { 
+          $filter: [
+            { $year: ["added"] },
+            "=",
+            '1996'
+          ] 
+        },
+        { 
+          $filter: [
+            { $Mon: ["added"] },
+            "=",
+            'Dec'
+          ] 
+        }
+
+      ]
+    });
+    assert.equal(res, 1)
+  });
+
   await tryRun("template_string function", async () => {
     const res = await db.various.findOne({ name: 'abc9' }, { select: { tstr: { $template_string: ["{name} is hehe"] } } });
     const res2 = await db.various.findOne({ name: 'abc9' }, { select: { tstr: { $template_string: ["is hehe"] } } });

package/tests/server/package-lock.json

@@ -14,33 +14,32 @@
         "@types/socket.io-client": "^1.4.34",
         "express": "^4.17.1",
         "prostgles-server": "file:../..",
-        "socket.io": "^4.5.0"
+        "socket.io": "^4.5.1"
       },
       "devDependencies": {
         "tsc-watch": "^4.5.0",
-        "typescript": "^4.1.3"
+        "typescript": "^4.7.2"
       }
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.144",
+      "version": "2.0.147",
       "license": "MIT",
       "dependencies": {
-        "@aws-sdk/client-s3": "^3.86.0",
-        "aws-sdk": "^2.1134.0",
+        "@aws-sdk/client-s3": "^3.95.0",
+        "aws-sdk": "^2.1141.0",
         "bluebird": "^3.7.2",
         "file-type": "^16.5.3",
-        "i": "^0.3.7",
-        "npm": "^8.1.4",
-        "pg-promise": "^10.9.5",
-        "prostgles-types": "^1.5.123",
-        "sharp": "^0.30.4"
+        "pg-promise": "^10.11.1",
+        "prostgles-types": "^1.5.124",
+        "sharp": "^0.30.5"
       },
       "devDependencies": {
         "@aws-sdk/types": "^3.34.0",
         "@types/bluebird": "^3.5.36",
         "@types/node": "^14.14.35",
-        "typescript": "^3.9.7"
+        "@types/sharp": "^0.30.2",
+        "typescript": "^4.7.2"
       }
     },
     "node_modules/@types/component-emitter": {
@@ -735,9 +734,9 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.0.tgz",
-      "integrity": "sha512-slTYqU2jCgMjXwresG8grhUi/cC6GjzmcfqArzaH3BN/9I/42eZk9yamNvZJdBfTubkjEdKAKs12NEztId+bUA==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.1.tgz",
+      "integrity": "sha512-0y9pnIso5a9i+lJmsCdtmTTgJFFSvNQKDnPQRz28mGNnxbmqYg2QPtJTLFxhymFZhAIn50eHAKzJeiNaKr+yUQ==",
       "dependencies": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
@@ -909,9 +908,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz",
-      "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==",
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz",
+      "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -1428,19 +1427,18 @@
     "prostgles-server": {
       "version": "file:../..",
       "requires": {
-        "@aws-sdk/client-s3": "^3.86.0",
+        "@aws-sdk/client-s3": "^3.95.0",
         "@aws-sdk/types": "^3.34.0",
         "@types/bluebird": "^3.5.36",
         "@types/node": "^14.14.35",
-        "aws-sdk": "^2.1134.0",
+        "@types/sharp": "^0.30.2",
+        "aws-sdk": "^2.1141.0",
         "bluebird": "^3.7.2",
         "file-type": "^16.5.3",
-        "i": "^0.3.7",
-        "npm": "^8.1.4",
-        "pg-promise": "^10.9.5",
-        "prostgles-types": "^1.5.123",
-        "sharp": "^0.30.4",
-        "typescript": "^3.9.7"
+        "pg-promise": "^10.11.1",
+        "prostgles-types": "^1.5.124",
+        "sharp": "^0.30.5",
+        "typescript": "^4.7.2"
       }
     },
     "proxy-addr": {
@@ -1551,9 +1549,9 @@
       "dev": true
     },
     "socket.io": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.0.tgz",
-      "integrity": "sha512-slTYqU2jCgMjXwresG8grhUi/cC6GjzmcfqArzaH3BN/9I/42eZk9yamNvZJdBfTubkjEdKAKs12NEztId+bUA==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.1.tgz",
+      "integrity": "sha512-0y9pnIso5a9i+lJmsCdtmTTgJFFSvNQKDnPQRz28mGNnxbmqYg2QPtJTLFxhymFZhAIn50eHAKzJeiNaKr+yUQ==",
       "requires": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
@@ -1680,9 +1678,9 @@
       }
     },
     "typescript": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz",
-      "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==",
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz",
+      "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==",
       "dev": true
     },
     "unpipe": {

package/tests/server/package.json

@@ -18,10 +18,10 @@
     "@types/socket.io-client": "^1.4.34",
     "express": "^4.17.1",
     "prostgles-server": "file:../..",
-    "socket.io": "^4.5.0"
+    "socket.io": "^4.5.1"
   },
   "devDependencies": {
     "tsc-watch": "^4.5.0",
-    "typescript": "^4.1.3"
+    "typescript": "^4.7.2"
   }
 }

package/tests/server/tsconfig.json

@@ -2,8 +2,8 @@
 	"files": ["./index.ts"],
 	"compilerOptions": {
 		// "outDir": "dist",
-		"target": "es2019",
-		"lib": [ "es2019" ],
+		"target": "es2020",
+		"lib": [ "es2020" ],
 		"esModuleInterop" : true,
 		"allowSyntheticDefaultImports": true,
 		"allowJs": true,

package/tsconfig.json

@@ -2,11 +2,11 @@
   // "files": ["lib/rootExport.ts"],
   "files": ["lib/index.ts"],
   "compilerOptions": {
-    "target": "ES2017",
+    "target": "ES2020",
     "lib": [
       "es2019"
     ],
-    // "strict": true,
+    "strict": true,
     "module": "commonjs",
     // "removeComments": true,
     "sourceMap": true,
@@ -17,6 +17,7 @@
     "resolveJsonModule": true,
     // "outFile": "bundle.js",
     // "moduleResolution": "node"
+    "keyofStringsOnly": true,
     "declaration": true,
     "declarationMap": true
   },