prostgles-server 3.0.86 → 3.0.88

package/tests/client/PID.txt

@@ -1 +1 @@
-42886
+362414

package/tests/client/package-lock.json

@@ -11,7 +11,10 @@
       "dependencies": {
         "@types/node": "^14.14.16",
         "prostgles-client": "^3.0.6",
-        "socket.io-client": "^4.5.3"
+        "socket.io-client": "^4.6.1"
+      },
+      "devDependencies": {
+        "typescript": "^4.9.5"
       }
     },
     "node_modules/@socket.io/component-emitter": {
@@ -41,21 +44,21 @@
       }
     },
     "node_modules/engine.io-client": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.2.3.tgz",
-      "integrity": "sha512-aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.4.0.tgz",
+      "integrity": "sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g==",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1",
         "engine.io-parser": "~5.0.3",
-        "ws": "~8.2.3",
+        "ws": "~8.11.0",
         "xmlhttprequest-ssl": "~2.0.0"
       }
     },
     "node_modules/engine.io-parser": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz",
-      "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz",
+      "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -79,14 +82,14 @@
       "integrity": "sha512-fnrq9YH5OofpxrSIXlssTciNO58eVU9TF2IUsZkvLnJP7FUpPxgVLG3wi5c4IEsGTGV4kykHAgcFm3e0/2xbiw=="
     },
     "node_modules/socket.io-client": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.3.tgz",
-      "integrity": "sha512-I/hqDYpQ6JKwtJOf5ikM+Qz+YujZPMEl6qBLhxiP0nX+TfXKhW4KZZG8lamrD6Y5ngjmYHreESVasVCgi5Kl3A==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.6.1.tgz",
+      "integrity": "sha512-5UswCV6hpaRsNg5kkEHVcbBIXEYoVbMQaHJBXJCyEQ+CiFPV1NIOY0XOFWG4XR4GZcB8Kn6AsRs/9cy9TbqVMQ==",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.2",
-        "engine.io-client": "~6.2.3",
-        "socket.io-parser": "~4.2.0"
+        "engine.io-client": "~6.4.0",
+        "socket.io-parser": "~4.2.1"
       },
       "engines": {
         "node": ">=10.0.0"
@@ -104,10 +107,23 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/typescript": {
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
     "node_modules/ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -153,21 +169,21 @@
       }
     },
     "engine.io-client": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.2.3.tgz",
-      "integrity": "sha512-aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.4.0.tgz",
+      "integrity": "sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g==",
       "requires": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1",
         "engine.io-parser": "~5.0.3",
-        "ws": "~8.2.3",
+        "ws": "~8.11.0",
         "xmlhttprequest-ssl": "~2.0.0"
       }
     },
     "engine.io-parser": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz",
-      "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg=="
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz",
+      "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw=="
     },
     "ms": {
       "version": "2.1.2",
@@ -188,14 +204,14 @@
       "integrity": "sha512-fnrq9YH5OofpxrSIXlssTciNO58eVU9TF2IUsZkvLnJP7FUpPxgVLG3wi5c4IEsGTGV4kykHAgcFm3e0/2xbiw=="
     },
     "socket.io-client": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.3.tgz",
-      "integrity": "sha512-I/hqDYpQ6JKwtJOf5ikM+Qz+YujZPMEl6qBLhxiP0nX+TfXKhW4KZZG8lamrD6Y5ngjmYHreESVasVCgi5Kl3A==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.6.1.tgz",
+      "integrity": "sha512-5UswCV6hpaRsNg5kkEHVcbBIXEYoVbMQaHJBXJCyEQ+CiFPV1NIOY0XOFWG4XR4GZcB8Kn6AsRs/9cy9TbqVMQ==",
       "requires": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.2",
-        "engine.io-client": "~6.2.3",
-        "socket.io-parser": "~4.2.0"
+        "engine.io-client": "~6.4.0",
+        "socket.io-parser": "~4.2.1"
       }
     },
     "socket.io-parser": {
@@ -207,10 +223,16 @@
         "debug": "~4.3.1"
       }
     },
+    "typescript": {
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "dev": true
+    },
     "ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
       "requires": {}
     },
     "xmlhttprequest-ssl": {

package/tests/client/package.json

@@ -14,6 +14,9 @@
   "dependencies": {
     "@types/node": "^14.14.16",
     "prostgles-client": "^3.0.6",
-    "socket.io-client": "^4.5.3"
+    "socket.io-client": "^4.6.1"
+  },
+  "devDependencies": {
+    "typescript": "^4.9.5"
   }
 }

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,QAAQ,CAAC,eAAe,CAAC,GAAG,QAAQ,CAAC,eAAe,CAAC,iBAk6BjG"}
+{"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,QAAQ,CAAC,eAAe,CAAC,GAAG,QAAQ,CAAC,eAAe,CAAC,iBAm6BjG"}

package/tests/isomorphic_queries.js

@@ -590,7 +590,7 @@ async function isomorphic(db) {
         const json = { a: true, arr: "2", arr1: 3, arr2: [1], arrStr: ["1123.string"] };
         const fo = await db.tjson.insert({ colOneOf: "a", json }, { returning: "*" });
         // assert.deepStrictEqual(fo.json, json);
-        await db.tjson.insert({ colOneOf: "a", json: { ...json, o: { o1: 2, o2: true } } });
+        await db.tjson.insert({ colOneOf: "a", json: { ...json, o: { o1: 2 } } });
         try {
             await db.tjson.insert({ colOneOf: "a", json: { a: true, arr: "22" } });
             throw "Should have failed";
@@ -602,64 +602,66 @@ async function isomorphic(db) {
     });
     await tryRun("jsonb JSON Schema validation", async () => {
         const cols = await db.tjson.getColumns();
-        assert_1.strict.deepEqual(cols.find(c => c.name === "json")?.jsonSchema, {
+        const jsonColSchema = cols.find(c => c.name === "json")?.jsonSchema;
+        // console.trace(JSON.stringify(jsonColSchema, null, 2))
+        assert_1.strict.deepEqual(jsonColSchema, {
             $id: 'tjson.json',
             $schema: 'https://json-schema.org/draft/2020-12/schema',
-            title: 'json',
-            required: true,
+            // title: 'json', 
             type: 'object',
+            required: ['a', 'arr', 'arr1', 'arr2'],
             properties: {
-                a: { type: 'boolean', required: true },
+                a: { type: 'boolean' },
                 arr: {
-                    type: 'string', enum: ['1', '2', '3'],
-                    required: true
+                    type: 'string', enum: ['1', '2', '3']
                 },
                 arr1: {
-                    type: 'number', enum: [1, 2, 3],
-                    required: true
+                    type: 'number', enum: [1, 2, 3]
                 },
-                arr2: { type: 'array', items: { type: 'integer' }, required: true },
+                arr2: { type: 'array', items: { type: 'integer' } },
                 arrStr: {
                     type: "object",
                     oneOf: [
                         { type: 'array', items: { type: 'string' } },
                         { type: 'null' }
-                    ],
-                    required: false
+                    ]
                 },
                 o: {
                     type: "object",
                     oneOf: [
-                        { type: "object", properties: { o1: { type: 'integer', required: true } } },
-                        { type: "object", properties: { o2: { type: 'boolean', required: true } } },
+                        { type: "object", required: ["o1"], properties: { o1: { type: 'integer' } } },
+                        { type: "object", required: ["o2"], properties: { o2: { type: 'boolean' } } },
                         { type: 'null' }
-                    ],
-                    required: false
+                    ]
                 }
             }
         });
-        assert_1.strict.deepEqual(cols.find(c => c.name === "status")?.jsonSchema, {
+        const statusColJSONSchema = cols.find(c => c.name === "status")?.jsonSchema;
+        // console.trace(JSON.stringify(statusColJSONSchema, null, 2));
+        assert_1.strict.deepEqual(statusColJSONSchema, {
             $id: 'tjson.status',
             $schema: 'https://json-schema.org/draft/2020-12/schema',
             type: "object",
             oneOf: [
-                { type: "object", properties: { ok: { required: true, type: 'string' } } },
-                { type: "object", properties: { err: { required: true, type: 'string' } } },
+                { type: "object", required: ["ok"], properties: { ok: { type: 'string' } } },
+                { type: "object", required: ["err"], properties: { err: { type: 'string' } } },
                 {
-                    type: "object", properties: {
+                    type: "object",
+                    required: ["loading"],
+                    properties: {
                         loading: {
+                            required: ["loaded", "total"],
                             properties: {
-                                loaded: { required: true, type: 'number' },
-                                total: { required: true, type: 'number' }
+                                loaded: { type: 'number' },
+                                total: { type: 'number' }
                             },
-                            required: true,
                             type: 'object'
                         }
                     }
-                }
+                },
+                { type: "null" }
             ],
-            required: false,
-            title: 'status'
+            // title: 'status'
         });
     });
     await tryRun("Exists filter example", async () => {

package/tests/isomorphic_queries.ts

@@ -674,7 +674,7 @@ export default async function isomorphic(db: Required<DBHandlerServer> | Require
     const json = { a: true, arr: "2", arr1: 3, arr2: [1], arrStr: ["1123.string"] }
     const fo = await db.tjson.insert!({ colOneOf: "a", json }, { returning: "*"});
     // assert.deepStrictEqual(fo.json, json);
-    await db.tjson.insert!({ colOneOf: "a", json: {...json, o: { o1: 2, o2: true } } })
+    await db.tjson.insert!({ colOneOf: "a", json: {...json, o: { o1: 2 } } })
     try {
       await db.tjson.insert!({ colOneOf: "a", json: { a: true, arr: "22"} });
       throw "Should have failed"
@@ -687,70 +687,71 @@ export default async function isomorphic(db: Required<DBHandlerServer> | Require
 
   await tryRun("jsonb JSON Schema validation", async () => {
     const cols = await db.tjson.getColumns!();
+    const jsonColSchema = cols.find(c => c.name === "json")?.jsonSchema;
+    // console.trace(JSON.stringify(jsonColSchema, null, 2))
     assert.deepEqual(
-      cols.find(c => c.name === "json")?.jsonSchema,
+      jsonColSchema,
       {
         $id: 'tjson.json',
         $schema: 'https://json-schema.org/draft/2020-12/schema',
-        title: 'json',
-        required: true,
+        // title: 'json', 
         type: 'object',
+        required: [ 'a', 'arr', 'arr1', 'arr2' ],
         properties: {
-          a: { type: 'boolean', required: true },
+          a: { type: 'boolean' },
           arr: {
-            type: 'string', enum: [ '1', '2', '3' ],
-            required: true
+            type: 'string', enum: [ '1', '2', '3' ] 
           },
           arr1: {
-            type: 'number', enum: [ 1, 2, 3 ],
-            required: true
+            type: 'number', enum: [ 1, 2, 3 ] 
           },
-          arr2: { type: 'array', items: { type: 'integer' }, required: true },
+          arr2: { type: 'array', items: { type: 'integer' } },
           arrStr: {
             type: "object",
             oneOf: [
               { type: 'array', items: { type: 'string' } },
               { type: 'null' }
-            ],
-            required: false
+            ]
           },
           o: {
             type: "object",
             oneOf: [
-              { type: "object", properties: {o1: { type: 'integer', required: true } } },
-              { type: "object", properties: {o2: { type: 'boolean', required: true } } },
+              { type: "object", required: ["o1"], properties: {o1: { type: 'integer' } } },
+              { type: "object", required: ["o2"], properties: {o2: { type: 'boolean' } } },
               { type: 'null' }
-            ],
-            required: false
+            ]
           }
         }
       }
     );
-
+    const statusColJSONSchema = cols.find(c => c.name === "status")?.jsonSchema;
+    // console.trace(JSON.stringify(statusColJSONSchema, null, 2));
     assert.deepEqual(
-      cols.find(c => c.name === "status")?.jsonSchema, 
+      statusColJSONSchema,
       {
         $id: 'tjson.status',
         $schema: 'https://json-schema.org/draft/2020-12/schema',
         type: "object",
         oneOf: [
-          { type: "object", properties: { ok: { required: true, type: 'string' } } },
-          { type: "object", properties: { err: { required: true, type: 'string' } } },
+          { type: "object", required: ["ok"], properties: { ok: { type: 'string' } } },
+          { type: "object", required: ["err"], properties: { err: { type: 'string' } } },
           {
-            type: "object", properties: { 
+            type: "object", 
+            required: ["loading"],
+            properties: { 
               loading: {
+                required: ["loaded", "total"],
                 properties: {
-                  loaded: { required: true, type: 'number' },
-                  total: { required: true, type: 'number'}
-                },
-                required: true,
+                  loaded: { type: 'number' },
+                  total: { type: 'number'}
+                }, 
                 type: 'object'
               }
             }
-          }
-        ],
-        required: false,
-        title: 'status'
+          },
+          { type: "null" }
+        ], 
+        // title: 'status'
       }
     );
   })

package/tests/server/DBoGenerated.d.ts

@@ -390,7 +390,7 @@ export type DBSchemaGenerated = {
         | {  err: string; }
         | {  loading: {  loaded: number; total: number; }; }
       table_config?: null |       { 
-        referencedTables?: {  }; 
+        referencedTables?: {  name: string; minFiles: number; }[]; 
       };
     };
   };

package/tests/server/index.js

@@ -91,7 +91,7 @@ function dd() {
                 email: { sqlDefinition: `TEXT NOT NULL` },
                 status: { enum: ["active", "disabled", "pending"] },
                 preferences: { defaultValue: "{}",
-                    jsonbSchema: {
+                    jsonbSchemaType: {
                         showIntro: { type: "boolean", optional: true },
                         theme: { enum: ["light", "dark", "auto"], optional: true },
                         others: { type: "any[]" }
@@ -102,13 +102,16 @@ function dd() {
         tjson: {
             dropIfExists: true,
             columns: {
-                json: { jsonbSchema: {
+                json: { jsonbSchemaType: {
                         a: { type: "boolean" },
                         arr: { enum: ["1", "2", "3"] },
                         arr1: { enum: [1, 2, 3] },
                         arr2: { type: "integer[]" },
                         arrStr: { type: "string[]", optional: true, nullable: true },
-                        o: { oneOf: [{ o1: { type: "integer" } }, { o2: { type: "boolean" } }], optional: true, nullable: true },
+                        o: { optional: true, nullable: true, oneOf: [
+                                { o1: "integer" },
+                                { o2: "boolean" }
+                            ] },
                     }
                 },
                 colOneOf: { enum: ["a", "b", "c"] },
@@ -140,10 +143,8 @@ function dd() {
                         ]
                     }
                 },
-                table_config: {
-                    nullable: true,
-                    jsonbSchema: {
-                        referencedTables: { type: {}, optional: true },
+                table_config: { nullable: true, jsonbSchemaType: {
+                        referencedTables: { arrayOf: { name: "string", minFiles: "number" }, optional: true },
                     }
                 }
             }

package/tests/server/index.ts

@@ -112,7 +112,7 @@ function dd(){
         email:        { sqlDefinition: `TEXT NOT NULL` },
         status:       { enum: ["active", "disabled", "pending"] },
         preferences:  { defaultValue: "{}", 
-          jsonbSchema: { 
+          jsonbSchemaType: { 
             showIntro:  { type: "boolean", optional: true },
             theme:      { enum: ["light", "dark", "auto"], optional: true },
 						others: 		{ type: "any[]" }
@@ -123,13 +123,16 @@ function dd(){
 		tjson: {
 			dropIfExists: true,
 			columns: {
-				json: { jsonbSchema: { 
+				json: { jsonbSchemaType: { 
 						a: { type: "boolean" },
 						arr: { enum: ["1", "2", "3"] },
 						arr1: { enum: [1, 2, 3] },
 						arr2: { type: "integer[]" },
 						arrStr: { type: "string[]", optional: true, nullable: true },
-						o: { oneOf: [{ o1: { type: "integer" } }, { o2: { type: "boolean" } }], optional: true, nullable: true },
+						o: { optional: true, nullable: true, oneOf: [
+							{ o1: "integer" }, 
+							{ o2:  "boolean" }
+						] },
 					}  
 				},
 				colOneOf: { enum: ["a", "b", "c"] },
@@ -161,11 +164,10 @@ function dd(){
 						]
 					}
 				},
-				table_config:        {
-        nullable: true,
-        jsonbSchema: {
-          referencedTables: { type: {}, optional: true },
-				}}
+				table_config:	{ nullable: true, jsonbSchemaType: {
+          	referencedTables: { optional: true, arrayOf: { name: "string", minFiles: "number" } },
+					}
+				}
 			}
 		},
 		lookup_col1: {