prostgles-server 2.0.145 → 2.0.148

package/tests/client/index.js

@@ -14,13 +14,16 @@ const log = (msg, extra) => {
 log("Started client...");
 const url = process.env.PRGL_CLIENT_URL || "http://127.0.0.1:3001", path = process.env.PRGL_CLIENT_PATH || "/teztz/s", socket = (0, socket_io_client_1.default)(url, { path, query: { token: "haha" } }), //  
 stopTest = (err) => {
-    socket.emit("stop-test", !err ? err : { err: err.toString(), error: err }, cb => {
-        log("Stopping client...");
-        if (err)
-            console.trace(err);
-    });
+    log("Stopping client due to error: " + JSON.stringify(err));
     setTimeout(() => {
-        process.exit(err ? 1 : 0);
+        socket.emit("stop-test", !err ? err : { err: err.toString(), error: err }, cb => {
+            log("Stopping client...");
+            if (err)
+                console.trace(err);
+        });
+        setTimeout(() => {
+            process.exit(err ? 1 : 0);
+        }, 1000);
     }, 1000);
 };
 try {
@@ -62,7 +65,7 @@ try {
                 catch (err) {
                     console.trace(err);
                     stopTest(err);
-                    throw err;
+                    // throw err;
                 }
             }
         });

package/tests/client/index.ts

@@ -15,15 +15,19 @@ const url = process.env.PRGL_CLIENT_URL || "http://127.0.0.1:3001",
   path = process.env.PRGL_CLIENT_PATH || "/teztz/s",
   socket = io(url, { path, query: { token: "haha" }  }), //  
   stopTest = (err?) => {
-    socket.emit("stop-test", !err? err : { err: err.toString(), error: err }, cb => {
+    log("Stopping client due to error: " + JSON.stringify(err));
 
-      log("Stopping client...");
-      if(err) console.trace(err);
-  
-
-    });
     setTimeout(() => {
-      process.exit(err? 1 : 0)
+      socket.emit("stop-test", !err? err : { err: err.toString(), error: err }, cb => {
+  
+        log("Stopping client...");
+        if(err) console.trace(err);
+    
+  
+      });
+      setTimeout(() => {
+        process.exit(err? 1 : 0)
+      }, 1000);
     }, 1000);
     
   };
@@ -70,7 +74,7 @@ try {
         } catch (err){
           console.trace(err)
           stopTest(err);
-          throw err;
+          // throw err;
         }
       }
     }); 

package/tests/client/package-lock.json

@@ -11,9 +11,9 @@
       "dependencies": {
         "@types/node": "^14.14.16",
         "@types/socket.io-client": "^1.4.35",
-        "prostgles-client": "^1.5.132",
+        "prostgles-client": "^1.5.138",
         "prostgles-types": "^1.5.68",
-        "socket.io-client": "^4.5.0"
+        "socket.io-client": "^4.5.1"
       }
     },
     "node_modules/@socket.io/component-emitter": {
@@ -73,9 +73,9 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/prostgles-client": {
-      "version": "1.5.132",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.132.tgz",
-      "integrity": "sha512-jUH313HIl5EvA0x8g/XEKjJRQf7W5m8NlUNH1GfqkY+7wqQSclFMhvCsCRKECcwzOC2krFnZ5nCsAdU1H8TwHQ==",
+      "version": "1.5.138",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.138.tgz",
+      "integrity": "sha512-+xuu1erZ9mReRyGlTYLEvF0kB6VniVerXUW2ib/wRRBokBxKVKa5lB8cfZznP+Ch+U51gzzCIZzEVNlYSwy/cw==",
       "dependencies": {
         "prostgles-types": "^1.5.123"
       }
@@ -86,9 +86,9 @@
       "integrity": "sha512-BL5I7lc8eqTa6z3SH5Z9g/1g1H+crlDoBCPH8zVEDBK3y5xMIiCW3SOYRZQfPfRM1lYnW4ljWzx3Cb2x9D1Ofg=="
     },
     "node_modules/socket.io-client": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.0.tgz",
-      "integrity": "sha512-HW61c1G7OrYGxaI79WRn17+b03iBCdvhBj4iqyXHBoL5M8w2MSO/vChsjA93knG4GYEai1/vbXWJna9dzxXtSg==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.1.tgz",
+      "integrity": "sha512-e6nLVgiRYatS+AHXnOnGi4ocOpubvOUCGhyWw8v+/FxW8saHkinG6Dfhi9TU0Kt/8mwJIAASxvw6eujQmjdZVA==",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.2",
@@ -187,9 +187,9 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "prostgles-client": {
-      "version": "1.5.132",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.132.tgz",
-      "integrity": "sha512-jUH313HIl5EvA0x8g/XEKjJRQf7W5m8NlUNH1GfqkY+7wqQSclFMhvCsCRKECcwzOC2krFnZ5nCsAdU1H8TwHQ==",
+      "version": "1.5.138",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.138.tgz",
+      "integrity": "sha512-+xuu1erZ9mReRyGlTYLEvF0kB6VniVerXUW2ib/wRRBokBxKVKa5lB8cfZznP+Ch+U51gzzCIZzEVNlYSwy/cw==",
       "requires": {
         "prostgles-types": "^1.5.123"
       }
@@ -200,9 +200,9 @@
       "integrity": "sha512-BL5I7lc8eqTa6z3SH5Z9g/1g1H+crlDoBCPH8zVEDBK3y5xMIiCW3SOYRZQfPfRM1lYnW4ljWzx3Cb2x9D1Ofg=="
     },
     "socket.io-client": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.0.tgz",
-      "integrity": "sha512-HW61c1G7OrYGxaI79WRn17+b03iBCdvhBj4iqyXHBoL5M8w2MSO/vChsjA93knG4GYEai1/vbXWJna9dzxXtSg==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.1.tgz",
+      "integrity": "sha512-e6nLVgiRYatS+AHXnOnGi4ocOpubvOUCGhyWw8v+/FxW8saHkinG6Dfhi9TU0Kt/8mwJIAASxvw6eujQmjdZVA==",
       "requires": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.2",

package/tests/client/package.json

@@ -14,8 +14,8 @@
   "dependencies": {
     "@types/node": "^14.14.16",
     "@types/socket.io-client": "^1.4.35",
-    "prostgles-client": "^1.5.132",
+    "prostgles-client": "^1.5.138",
     "prostgles-types": "^1.5.68",
-    "socket.io-client": "^4.5.0"
+    "socket.io-client": "^4.5.1"
   }
 }

package/tests/client/tsconfig.json

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

package/tests/client_only_queries.js

@@ -6,45 +6,62 @@ async function client_only(db, auth, log, methods) {
     const testRealtime = () => {
         log("Started testRealtime");
         return new Promise(async (resolve, reject) => {
-            var _a, _b;
-            /* METHODS */
-            const t222 = await methods.get();
-            assert_1.strict.equal(t222, 222, "methods.get() failed");
-            /* RAWSQL */
-            const sqlStatement = await db.sql("SELECT $1", [1], { returnType: "statement" });
-            assert_1.strict.equal(sqlStatement, "SELECT 1", "db.sql statement query failed");
-            const arrayMode = await db.sql("SELECT 1 as a, 2 as a", undefined, { returnType: "arrayMode" });
-            assert_1.strict.equal((_a = arrayMode.rows) === null || _a === void 0 ? void 0 : _a[0].join("."), "1.2", "db.sql statement arrayMode failed");
-            assert_1.strict.equal((_b = arrayMode.fields) === null || _b === void 0 ? void 0 : _b.map(f => f.name).join("."), "a.a", "db.sql statement arrayMode failed");
-            const select1 = await db.sql("SELECT $1 as col1", [1], { returnType: "rows" });
-            assert_1.strict.deepStrictEqual(select1[0], { col1: 1 }, "db.sql justRows query failed");
-            const fullResult = await db.sql("SELECT $1 as col1", [1]);
-            // console.log(fullResult)
-            assert_1.strict.deepStrictEqual(fullResult.rows[0], { col1: 1 }, "db.sql query failed");
-            assert_1.strict.deepStrictEqual(fullResult.fields, [{ name: 'col1', tableID: 0, columnID: 0, dataTypeID: 23, dataTypeSize: 4, dataTypeModifier: -1, format: 'text', dataType: 'int4' }], "db.sql query failed");
-            await (0, isomorphic_queries_1.tryRunP)("sql LISTEN NOTIFY events", async (resolve, reject) => {
-                const sub = await db.sql("LISTEN chnl ");
-                // console.log({ sub })
-                sub.addListener(notif => {
-                    // console.log({ notif })
-                    if (notif === "hello")
-                        resolve(true);
-                    else
-                        reject("Something went bad");
-                });
-                db.sql("NOTIFY chnl , 'hello'; ");
-            });
-            await (0, isomorphic_queries_1.tryRunP)("sql NOTICE events", async (resolve, reject) => {
-                const sub = await db.sql("", {}, { returnType: "noticeSubscription" });
-                // console.log({ sub })
-                sub.addListener(notice => {
-                    // console.log({ notif })
-                    if (notice.message === "hello2")
-                        resolve(true);
-                    else
-                        reject("Something went bad");
-                });
-                db.sql(`
+            try {
+                /* METHODS */
+                const t222 = await methods.get();
+                assert_1.strict.equal(t222, 222, "methods.get() failed");
+                log("SQL Full result");
+                /* RAWSQL */
+                await (0, isomorphic_queries_1.tryRunP)("SQL Full result", async (resolve, reject) => {
+                    const sqlStatement = await db.sql("SELECT $1", [1], { returnType: "statement" });
+                    assert_1.strict.equal(sqlStatement, "SELECT 1", "db.sql statement query failed");
+                    const arrayMode = await db.sql("SELECT 1 as a, 2 as a", undefined, { returnType: "arrayMode" });
+                    assert_1.strict.equal(arrayMode.rows?.[0].join("."), "1.2", "db.sql statement arrayMode failed");
+                    assert_1.strict.equal(arrayMode.fields?.map(f => f.name).join("."), "a.a", "db.sql statement arrayMode failed");
+                    const select1 = await db.sql("SELECT $1 as col1", [1], { returnType: "rows" });
+                    assert_1.strict.deepStrictEqual(select1[0], { col1: 1 }, "db.sql justRows query failed");
+                    const fullResult = await db.sql("SELECT $1 as col1", [1]);
+                    // console.log(fullResult)
+                    assert_1.strict.deepStrictEqual(fullResult.rows[0], { col1: 1 }, "db.sql query failed");
+                    assert_1.strict.deepStrictEqual(fullResult.fields, [{
+                            name: 'col1',
+                            tableID: 0,
+                            columnID: 0,
+                            dataTypeID: 23,
+                            dataTypeSize: 4,
+                            dataTypeModifier: -1,
+                            format: 'text',
+                            dataType: 'int4',
+                            udt_name: 'int4',
+                            tsDataType: "number"
+                        }], "db.sql query failed");
+                    resolve(true);
+                }, log);
+                log("sql LISTEN NOTIFY events");
+                await (0, isomorphic_queries_1.tryRunP)("sql LISTEN NOTIFY events", async (resolve, reject) => {
+                    const sub = await db.sql("LISTEN chnl ");
+                    // console.log({ sub })
+                    sub.addListener(notif => {
+                        // console.log({ notif })
+                        if (notif === "hello")
+                            resolve(true);
+                        else
+                            reject("Something went bad");
+                    });
+                    db.sql("NOTIFY chnl , 'hello'; ");
+                }, log);
+                log("sql NOTICE events");
+                await (0, isomorphic_queries_1.tryRunP)("sql NOTICE events", async (resolve, reject) => {
+                    const sub = await db.sql("", {}, { returnType: "noticeSubscription" });
+                    // console.log({ sub })
+                    sub.addListener(notice => {
+                        // console.log({ notif })
+                        if (notice.message === "hello2")
+                            resolve(true);
+                        else
+                            reject("Something went bad");
+                    });
+                    db.sql(`
           DO $$ 
           BEGIN
 
@@ -52,72 +69,78 @@ async function client_only(db, auth, log, methods) {
 
           END $$;
         `);
-            });
-            /* REPLICATION */
-            let start = Date.now();
-            const msLimit = 20000;
-            setTimeout(() => {
-                const msg = "Replication test failed due to taking longer than " + msLimit + "ms";
-                log(msg);
-                reject(msg);
-            }, msLimit);
-            await db.planes.delete();
-            let inserts = new Array(100).fill(null).map((d, i) => ({ id: i, flight_number: `FN${i}`, x: Math.random(), y: i }));
-            await db.planes.insert(inserts);
-            if ((await db.planes.count()) !== 100)
-                throw "Not 100 planes";
-            /**
-             * Two listeners are added at the same time to dbo.planes (which has 100 records):
-             *  subscribe({ x: 10 }
-             *  sync({}
-             *
-             * sync starts updating x to 10
-             * subscribe waits for 100 records of x=10 and then updates everything to x=20
-             * sync waits for 100 records of x=20 and finishes the test
-             */
-            /* After all sync records are updated to x10 here we'll update them to x20 */
-            const sP = await db.planes.subscribe({ x: 10 }, {}, async (planes) => {
-                const p10 = planes.filter(p => p.x == 10);
-                log("sub: x10 -> ", p10.length, "    x20 ->", planes.filter(p => p.x == 20).length);
-                if (p10.length === 100) {
-                    // db.planes.findOne({}, { select: { last_updated: "$max"}}).then(log);
-                    sP.unsubscribe();
-                    log("Update to x20 start");
-                    const dLastUpdated = Math.max(...p10.map(v => +v.last_updated));
-                    const last_updated = Date.now();
-                    if (dLastUpdated >= last_updated)
-                        throw "dLastUpdated >= last_updated should not happen";
-                    await db.planes.update({}, { x: 20, last_updated });
-                    log("Updated to x20", await db.planes.count({ x: 20 }));
-                    // db.planes.findOne({}, { select: { last_updated: "$max"}}).then(log)
-                }
-            });
-            let updt = 0;
-            const sync = await db.planes.sync({}, { handlesOnData: true, patchText: true }, (planes, deltas) => {
-                const x20 = planes.filter(p => p.x == 20).length;
-                const x10 = planes.filter(p => p.x == 10);
-                log(`sync: \nx10 -> ${x10.length} \nx20 -> ${x20}`);
-                let update = false;
-                planes.map(p => {
-                    // if(p.y === 1) window.up = p;
-                    if (typeof p.x !== "number")
-                        log(typeof p.x);
-                    if (+p.x < 10) {
-                        updt++;
-                        update = true;
-                        p.$update({ x: 10 });
+                }, log);
+                /* REPLICATION */
+                let start = Date.now();
+                const msLimit = 20000;
+                setTimeout(() => {
+                    const msg = "Replication test failed due to taking longer than " + msLimit + "ms";
+                    log(msg);
+                    reject(msg);
+                }, msLimit);
+                await db.planes.delete();
+                let inserts = new Array(100).fill(null).map((d, i) => ({ id: i, flight_number: `FN${i}`, x: Math.random(), y: i }));
+                await db.planes.insert(inserts);
+                if ((await db.planes.count()) !== 100)
+                    throw "Not 100 planes";
+                /**
+                 * Two listeners are added at the same time to dbo.planes (which has 100 records):
+                 *  subscribe({ x: 10 }
+                 *  sync({}
+                 *
+                 * sync starts updating x to 10
+                 * subscribe waits for 100 records of x=10 and then updates everything to x=20
+                 * sync waits for 100 records of x=20 and finishes the test
+                 */
+                /* After all sync records are updated to x10 here we'll update them to x20 */
+                const sP = await db.planes.subscribe({ x: 10 }, {}, async (planes) => {
+                    const p10 = planes.filter(p => p.x == 10);
+                    log("sub: x10 -> ", p10.length, "    x20 ->", planes.filter(p => p.x == 20).length);
+                    if (p10.length === 100) {
+                        // db.planes.findOne({}, { select: { last_updated: "$max"}}).then(log);
+                        sP.unsubscribe();
+                        log("Update to x20 start");
+                        const dLastUpdated = Math.max(...p10.map(v => +v.last_updated));
+                        const last_updated = Date.now();
+                        if (dLastUpdated >= last_updated)
+                            throw "dLastUpdated >= last_updated should not happen";
+                        await db.planes.update({}, { x: 20, last_updated });
+                        log("Updated to x20", await db.planes.count({ x: 20 }));
+                        // db.planes.findOne({}, { select: { last_updated: "$max"}}).then(log)
                     }
                 });
-                // if(update) log("$update({ x: 10 })", updt)
-                if (x20 === 100) {
-                    // log(22)
-                    // console.timeEnd("test")
-                    log("Finished replication test. Inserting 100 rows then updating two times took: " + (Date.now() - start) + "ms");
-                    resolve(true);
-                }
-            });
-            // sync.upsert(inserts)
-            // await db.planes.update({}, { x: 20, last_updated: Date.now() });
+                let updt = 0;
+                const sync = await db.planes.sync({}, { handlesOnData: true, patchText: true }, (planes, deltas) => {
+                    const x20 = planes.filter(p => p.x == 20).length;
+                    const x10 = planes.filter(p => p.x == 10);
+                    log(`sync: \nx10 -> ${x10.length} \nx20 -> ${x20}`);
+                    let update = false;
+                    planes.map(p => {
+                        // if(p.y === 1) window.up = p;
+                        if (typeof p.x !== "number")
+                            log(typeof p.x);
+                        if (+p.x < 10) {
+                            updt++;
+                            update = true;
+                            p.$update({ x: 10 });
+                        }
+                    });
+                    // if(update) log("$update({ x: 10 })", updt)
+                    if (x20 === 100) {
+                        // log(22)
+                        // console.timeEnd("test")
+                        log("Finished replication test. Inserting 100 rows then updating two times took: " + (Date.now() - start) + "ms");
+                        resolve(true);
+                    }
+                });
+                // sync.upsert(inserts)
+                // await db.planes.update({}, { x: 20, last_updated: Date.now() });
+            }
+            catch (err) {
+                log(JSON.stringify(err));
+                await tout(1000);
+                throw err;
+            }
         });
     };
     /* TODO: SECURITY */
@@ -175,7 +198,7 @@ async function client_only(db, auth, log, methods) {
                 { id: 1, public: 'public data' },
                 { id: 2, public: 'public data' }
             ]);
-        });
+        }, log);
     }
 }
 exports.default = client_only;

package/tests/client_only_queries.ts

@@ -9,26 +9,45 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
   const testRealtime = () => {
     log("Started testRealtime")
     return new Promise(async (resolve, reject) => {
+      try {
+
       /* METHODS */
       const t222 = await methods.get();
       assert.equal(t222, 222, "methods.get() failed");
   
+      log("SQL Full result")
       /* RAWSQL */
-      const sqlStatement = await db.sql("SELECT $1", [1], { returnType: "statement" });
-      assert.equal(sqlStatement, "SELECT 1", "db.sql statement query failed");
-    
-      const arrayMode = await db.sql("SELECT 1 as a, 2 as a", undefined, { returnType: "arrayMode" });
-      assert.equal(arrayMode.rows?.[0].join("."), "1.2", "db.sql statement arrayMode failed");
-      assert.equal(arrayMode.fields?.map(f => f.name).join("."), "a.a", "db.sql statement arrayMode failed");
-
-      const select1 = await db.sql("SELECT $1 as col1", [1], { returnType: "rows" });
-      assert.deepStrictEqual(select1[0], { col1: 1 }, "db.sql justRows query failed");
-  
-      const fullResult = await db.sql("SELECT $1 as col1", [1]);
-      // console.log(fullResult)
-      assert.deepStrictEqual(fullResult.rows[0], { col1: 1 }, "db.sql query failed");
-      assert.deepStrictEqual(fullResult.fields, [ { name: 'col1', tableID: 0,columnID: 0, dataTypeID: 23, dataTypeSize: 4, dataTypeModifier: -1,format: 'text', dataType: 'int4' } ] , "db.sql query failed");
+      await tryRunP("SQL Full result", async (resolve, reject) => {
+        const sqlStatement = await db.sql("SELECT $1", [1], { returnType: "statement" });
+        assert.equal(sqlStatement, "SELECT 1", "db.sql statement query failed");
+      
+        const arrayMode = await db.sql("SELECT 1 as a, 2 as a", undefined, { returnType: "arrayMode" });
+        assert.equal(arrayMode.rows?.[0].join("."), "1.2", "db.sql statement arrayMode failed");
+        assert.equal(arrayMode.fields?.map(f => f.name).join("."), "a.a", "db.sql statement arrayMode failed");
   
+        const select1 = await db.sql("SELECT $1 as col1", [1], { returnType: "rows" });
+        assert.deepStrictEqual(select1[0], { col1: 1 }, "db.sql justRows query failed");
+
+        const fullResult = await db.sql("SELECT $1 as col1", [1]);
+        // console.log(fullResult)
+        assert.deepStrictEqual(fullResult.rows[0], { col1: 1 }, "db.sql query failed");
+        assert.deepStrictEqual(fullResult.fields, [ { 
+          name: 'col1', 
+          tableID: 0,
+          columnID: 0, 
+          dataTypeID: 23, 
+          dataTypeSize: 4, 
+          dataTypeModifier: -1,
+          format: 'text', 
+          dataType: 'int4', 
+          udt_name: 'int4', 
+          tsDataType: "number" 
+        }] , "db.sql query failed");
+        resolve(true);
+      }, log);
+
+      log("sql LISTEN NOTIFY events")
+
       await tryRunP("sql LISTEN NOTIFY events", async (resolve, reject) => {
         
         const sub = await db.sql("LISTEN chnl ");
@@ -39,7 +58,9 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
           else reject("Something went bad")
         });
         db.sql("NOTIFY chnl , 'hello'; ");
-      });
+      }, log);
+
+    log("sql NOTICE events")
       await tryRunP("sql NOTICE events", async (resolve, reject) => {
         
         const sub = await db.sql("", {}, { returnType: "noticeSubscription" });
@@ -57,7 +78,7 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
 
           END $$;
         `);
-      });
+      }, log);
 
   
       /* REPLICATION */
@@ -135,6 +156,11 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
       // await db.planes.update({}, { x: 20, last_updated: Date.now() });
       
       
+      } catch(err){
+        log(JSON.stringify(err));
+        await tout(1000);
+        throw err;
+      }
     });
 
   }
@@ -205,7 +231,7 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
         { id: 1, public: 'public data' },
         { id: 2, public: 'public data' }
       ]);
-    });
+    }, log);
   }
 
 }

package/tests/isomorphic_queries.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -22,19 +26,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryRunP = exports.tryRun = void 0;
 const assert_1 = require("assert");
 const fs = __importStar(require("fs"));
-async function tryRun(desc, func) {
+async function tryRun(desc, func, log) {
     try {
         await func();
     }
     catch (err) {
         console.error(desc + " FAILED:");
-        throw err;
+        log?.("FAIL: ", err);
+        setTimeout(() => {
+            throw err;
+        }, 2000);
     }
 }
 exports.tryRun = tryRun;
-function tryRunP(desc, func) {
-    return new Promise((rv, rj) => {
-        func(rv, rj);
+function tryRunP(desc, func, log) {
+    return new Promise(async (rv, rj) => {
+        try {
+            await func(rv, rj);
+        }
+        catch (err) {
+            log?.(JSON.stringify(err));
+            setTimeout(() => {
+                log?.("Throw err");
+                throw err;
+            }, 1000);
+        }
     });
 }
 exports.tryRunP = tryRunP;
@@ -313,6 +329,27 @@ async function isomorphic(db) {
         const res = await db.various.count({ "jsn->a->>b": '3' });
         assert_1.strict.equal(res, 1);
     });
+    await tryRun("Complex filtering", async () => {
+        const res = await db.various.count({
+            $and: [
+                {
+                    $filter: [
+                        { $year: ["added"] },
+                        "=",
+                        '1996'
+                    ]
+                },
+                {
+                    $filter: [
+                        { $Mon: ["added"] },
+                        "=",
+                        'Dec'
+                    ]
+                }
+            ]
+        });
+        assert_1.strict.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"] } } });