prostgles-server 2.0.160 → 2.0.163

package/lib/Prostgles.ts

@@ -107,6 +107,7 @@ export type UpdateRequestDataBatch = {
 export type UpdateRequestData = UpdateRequestDataOne | UpdateRequestDataBatch;
 
 export type ValidateRow = (row: AnyObject) => AnyObject | Promise<AnyObject>;
+export type ValidateUpdateRow = (args: { update: AnyObject, filter: AnyObject }) => AnyObject | Promise<AnyObject>;
 
 export type SelectRule = {
 
@@ -166,9 +167,21 @@ export type InsertRule = {
 export type UpdateRule = {
 
     /**
-     * Fields allowed to be updated.   Tip: Use false to exclude field
+     * Fields allowed to be updated.   Tip: Use false/0 to exclude field
      */
     fields: FieldFilter;
+    
+    /**
+     * Row level FGAC
+     * Used when the editable fields change based on the updated row
+     * If specified then the fields from the first matching filter table.count({ ...filter, ...updateFilter }) > 0 will be used
+     * If none matching then the "fields" will be used
+     * Specify in decreasing order of specificity otherwise a more general filter will match first
+     */
+    dynamicFields?: {
+        filter: AnyObject;
+        fields: FieldFilter;
+    }[];
 
     /**
      * Filter added to every query (e.g. user_id) to restrict access
@@ -194,8 +207,10 @@ export type UpdateRule = {
     /**
      * Validation logic to check/update data for each request
      */
-    validate?: ValidateRow
-}
+    validate?: ValidateUpdateRow;
+
+};
+
 export type DeleteRule = {
     
     /**
@@ -1065,7 +1080,7 @@ const RULE_TO_METHODS = [
        methods: RULE_METHODS.update, 
        no_limits: <UpdateRule>{ fields: "*", filterFields: "*", returningFields: "*"  },
        table_only: true, 
-       allowed_params: <Array<keyof UpdateRule>>["fields", "filterFields", "forcedFilter", "forcedData", "returningFields", "validate"] ,
+       allowed_params: <Array<keyof UpdateRule>>["fields", "filterFields", "forcedFilter", "forcedData", "returningFields", "validate", "dynamicFields"] ,
        hint: ` expecting "*" | true | { fields: string | string[] | {}  }`
     },
    { 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.160",
+  "version": "2.0.163",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
     "bluebird": "^3.7.2",
     "file-type": "^16.5.3",
     "pg-promise": "^10.11.1",
-    "prostgles-types": "^1.5.132",
+    "prostgles-types": "^1.5.134",
     "sharp": "^0.30.5"
   },
   "devDependencies": {

package/tests/client/PID.txt

@@ -1 +1 @@
-50285
+18727

package/tests/client/package-lock.json

@@ -10,7 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "@types/node": "^14.14.16",
-        "prostgles-client": "^1.5.146",
+        "prostgles-client": "^1.5.147",
         "prostgles-types": "^1.5.68",
         "socket.io-client": "^4.5.1"
       }
@@ -67,17 +67,17 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/prostgles-client": {
-      "version": "1.5.146",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.146.tgz",
-      "integrity": "sha512-yslX4cBxLUelQfs+4051lv3CITl61YsuQLMNaw+B33ck0fTmN8ZhUVjDS0N4BCipM94i4kMbjLSz8BUCG54X4g==",
+      "version": "1.5.147",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.147.tgz",
+      "integrity": "sha512-OHKHn9/Ynv/v3QSB53ZvhVvWp4pWsrLIy8ZDXloQprB8IUXSS2SdCWnbdkBoD9JH9Z4tUBoq88lTdS7G1KZY3w==",
       "dependencies": {
-        "prostgles-types": "^1.5.132"
+        "prostgles-types": "^1.5.133"
       }
     },
     "node_modules/prostgles-types": {
-      "version": "1.5.132",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.132.tgz",
-      "integrity": "sha512-Ol+NTzRpcyQS4ED/Ptx9RAfnEXzHBNt/e70bo9LeQ5phLNUbAqjNQkksJLU5SPnu39+egRzRW8fNn5XSd9EySw=="
+      "version": "1.5.133",
+      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.133.tgz",
+      "integrity": "sha512-WVSuoiWAo1hgDl+9QSBPVhszwhxuX1WRi6CdE4epede1eD2Q5rQfO22bli0BBCQXyhE6l/A0Tt6UxhAIlDDSmw=="
     },
     "node_modules/socket.io-client": {
       "version": "4.5.1",
@@ -176,17 +176,17 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "prostgles-client": {
-      "version": "1.5.146",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.146.tgz",
-      "integrity": "sha512-yslX4cBxLUelQfs+4051lv3CITl61YsuQLMNaw+B33ck0fTmN8ZhUVjDS0N4BCipM94i4kMbjLSz8BUCG54X4g==",
+      "version": "1.5.147",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.147.tgz",
+      "integrity": "sha512-OHKHn9/Ynv/v3QSB53ZvhVvWp4pWsrLIy8ZDXloQprB8IUXSS2SdCWnbdkBoD9JH9Z4tUBoq88lTdS7G1KZY3w==",
       "requires": {
-        "prostgles-types": "^1.5.132"
+        "prostgles-types": "^1.5.133"
       }
     },
     "prostgles-types": {
-      "version": "1.5.132",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.132.tgz",
-      "integrity": "sha512-Ol+NTzRpcyQS4ED/Ptx9RAfnEXzHBNt/e70bo9LeQ5phLNUbAqjNQkksJLU5SPnu39+egRzRW8fNn5XSd9EySw=="
+      "version": "1.5.133",
+      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.133.tgz",
+      "integrity": "sha512-WVSuoiWAo1hgDl+9QSBPVhszwhxuX1WRi6CdE4epede1eD2Q5rQfO22bli0BBCQXyhE6l/A0Tt6UxhAIlDDSmw=="
     },
     "socket.io-client": {
       "version": "4.5.1",

package/tests/client/package.json

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

package/tests/client_only_queries.js

@@ -78,6 +78,7 @@ async function client_only(db, auth, log, methods) {
                 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);
+                const CLOCK_DRIFT = 2000;
                 if ((await db.planes.count()) !== 100)
                     throw "Not 100 planes";
                 /**
@@ -94,16 +95,19 @@ async function client_only(db, auth, log, methods) {
                     const p10 = planes.filter(p => p.x == 10);
                     log(Date.now() + ": sub stats: 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(Date.now() + ": sub: db.planes.update({}, { x: 20, last_updated });");
-                        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(Date.now() + ": sub: Updated to x20", await db.planes.count({ x: 20 }));
-                        // db.planes.findOne({}, { select: { last_updated: "$max"}}).then(log)
+                        /** 2 second delay to account for client-server clock drift */
+                        setTimeout(async () => {
+                            // db.planes.findOne({}, { select: { last_updated: "$max"}}).then(log);
+                            sP.unsubscribe();
+                            log(Date.now() + ": sub: db.planes.update({}, { x: 20, last_updated });");
+                            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(Date.now() + ": sub: Updated to x20", await db.planes.count({ x: 20 }));
+                            // db.planes.findOne({}, { select: { last_updated: "$max"}}).then(log)
+                        }, CLOCK_DRIFT);
                     }
                 });
                 let updt = 0;
@@ -127,7 +131,7 @@ async function client_only(db, auth, log, methods) {
                     if (x20 === 100) {
                         // log(22)
                         // console.timeEnd("test")
-                        log(Date.now() + ": sync end: Finished replication test. Inserting 100 rows then updating two times took: " + (Date.now() - start) + "ms");
+                        log(Date.now() + ": sync end: Finished replication test. Inserting 100 rows then updating two times took: " + (Date.now() - start - CLOCK_DRIFT) + "ms");
                         resolve(true);
                     }
                 });
@@ -166,6 +170,14 @@ async function client_only(db, auth, log, methods) {
                 { id: 1, public: 'public data' },
                 { id: 2, public: 'public data' }
             ]);
+            const cols = await db.insert_rules.getColumns();
+            assert_1.strict.equal(cols.filter(({ insert, update: u, select: s, delete: d }) => insert && !u && !s && !d).length, 3, "Validated getColumns failed");
+            /* Validated insert */
+            const expectB = await db.insert_rules.insert({ name: "a" }, { returning: "*" });
+            assert_1.strict.deepStrictEqual(expectB, { name: "b" }, "Validated insert failed");
+            /* forced UUID insert */
+            const row = await db.uuid_text.insert({}, { returning: "*" });
+            assert_1.strict.equal(row.id, 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e');
         });
         // await tryRun("Duplicate subscription", async () => {
         //   return new Promise(async (resolve, reject) => {
@@ -189,14 +201,6 @@ async function client_only(db, auth, log, methods) {
         //     });
         //   })
         // })
-        const cols = await db.insert_rules.getColumns();
-        assert_1.strict.equal(cols.filter(({ insert, update: u, select: s, delete: d }) => insert && !u && !s && !d).length, 3, "Validated getColumns failed");
-        /* Validated insert */
-        const expectB = await db.insert_rules.insert({ name: "a" }, { returning: "*" });
-        assert_1.strict.deepStrictEqual(expectB, { name: "b" }, "Validated insert failed");
-        /* forced UUID insert */
-        const row = await db.uuid_text.insert({}, { returning: "*" });
-        assert_1.strict.equal(row.id, 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e');
         await testRealtime();
         // auth.login({ username: "john", password: "secret" });
         // await tout();
@@ -210,6 +214,27 @@ async function client_only(db, auth, log, methods) {
                 { id: 1, public: 'public data' },
                 { id: 2, public: 'public data' }
             ]);
+            const dynamicCols = await db.uuid_text.getColumns(undefined, {
+                rule: "update",
+                filter: {
+                    id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e'
+                },
+                data: {
+                    id: "dwadwa"
+                }
+            });
+            assert_1.strict.equal(dynamicCols.length, 1);
+            assert_1.strict.equal(dynamicCols[0].name, "id");
+            const defaultCols = await db.uuid_text.getColumns(undefined, {
+                rule: "update",
+                filter: {
+                    id: 'not matching'
+                },
+                data: {
+                    id: "dwadwa"
+                }
+            });
+            throw defaultCols.map(c => c.name);
         }, log);
     }
 }

package/tests/client_only_queries.ts

@@ -93,6 +93,8 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
       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);
     
+      const CLOCK_DRIFT = 2000;
+
       if((await db.planes.count()) !== 100) throw "Not 100 planes";
 
       /**
@@ -112,17 +114,22 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
         log(Date.now() + ": sub stats: 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(Date.now() + ": sub: db.planes.update({}, { x: 20, last_updated });");
-          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(Date.now() + ": sub: Updated to x20" , await db.planes.count({ x: 20 }))
-  
-          // db.planes.findOne({}, { select: { last_updated: "$max"}}).then(log)
+
+          /** 2 second delay to account for client-server clock drift */
+          setTimeout(async () => {
+
+            // db.planes.findOne({}, { select: { last_updated: "$max"}}).then(log);
+    
+            sP.unsubscribe();
+            log(Date.now() + ": sub: db.planes.update({}, { x: 20, last_updated });");
+            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(Date.now() + ": sub: Updated to x20" , await db.planes.count({ x: 20 }))
+    
+            // db.planes.findOne({}, { select: { last_updated: "$max"}}).then(log)
+          }, CLOCK_DRIFT)
         }
       }); 
       
@@ -148,7 +155,7 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
         if(x20 === 100){
           // log(22)
           // console.timeEnd("test")
-          log(Date.now() + ": sync end: Finished replication test. Inserting 100 rows then updating two times took: " + (Date.now() - start) + "ms")
+          log(Date.now() + ": sync end: Finished replication test. Inserting 100 rows then updating two times took: " + (Date.now() - start - CLOCK_DRIFT) + "ms")
           resolve(true)
         }
       });
@@ -194,6 +201,18 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
         { id: 1, public: 'public data' },
         { id: 2, public: 'public data' }
       ]);
+
+
+      const cols = await db.insert_rules.getColumns();
+      assert.equal(cols.filter(({ insert, update: u, select: s, delete: d }) => insert && !u && !s && !d).length, 3, "Validated getColumns failed")
+
+      /* Validated insert */
+      const expectB = await db.insert_rules.insert({ name: "a" }, { returning: "*" });
+      assert.deepStrictEqual(expectB, { name: "b" }, "Validated insert failed");
+
+      /* forced UUID insert */
+      const row: any = await db.uuid_text.insert({}, {returning: "*"});
+      assert.equal(row.id, 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e');
     });
 
     // await tryRun("Duplicate subscription", async () => {
@@ -221,16 +240,7 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
     //   })
     // })
 
-    const cols = await db.insert_rules.getColumns();
-    assert.equal(cols.filter(({ insert, update: u, select: s, delete: d }) => insert && !u && !s && !d).length, 3, "Validated getColumns failed")
-
-    /* Validated insert */
-    const expectB = await db.insert_rules.insert({ name: "a" }, { returning: "*" });
-    assert.deepStrictEqual(expectB, { name: "b" }, "Validated insert failed");
 
-    /* forced UUID insert */
-    const row: any = await db.uuid_text.insert({}, {returning: "*"});
-    assert.equal(row.id, 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e')
 
     await testRealtime();
 
@@ -247,6 +257,29 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
         { id: 1, public: 'public data' },
         { id: 2, public: 'public data' }
       ]);
+
+
+      const dynamicCols = await db.uuid_text.getColumns(undefined, {
+        rule: "update",
+        filter: {
+          id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e'
+        },
+        data: {
+          id: "dwadwa"
+        }
+      });
+      assert.equal(dynamicCols.length, 1);
+      assert.equal(dynamicCols[0].name, "id");
+      const defaultCols = await db.uuid_text.getColumns(undefined, {
+        rule: "update",
+        filter: {
+          id: 'not matching'
+        },
+        data: {
+          id: "dwadwa"
+        }
+      });
+      throw defaultCols.map(c => c.name);
     }, log);
   }
 

package/tests/isomorphic_queries.js

@@ -87,7 +87,7 @@ async function isomorphic(db) {
     await tryRun("getColumns definition", async () => {
         const res = await db.tr2.getColumns("fr");
         // console.log(JSON.stringify(res, null, 2))
-        assert_1.strict.deepStrictEqual(res, [
+        const expected = [
             {
                 "label": "Id",
                 "name": "id",
@@ -180,7 +180,10 @@ async function isomorphic(db) {
                 "update": true,
                 "delete": true
             }
-        ]);
+        ];
+        assert_1.strict.deepStrictEqual(res, expected);
+        const resDynamic = await db.tr2.getColumns("fr", { rule: "update", filter: {}, data: { t2: "a" } });
+        assert_1.strict.deepStrictEqual(resDynamic, expected);
     });
     await tryRun("$unnest_words", async () => {
         const res = await db.various.find({}, { returnType: "values", select: { name: "$unnest_words" } });

package/tests/isomorphic_queries.ts

@@ -73,9 +73,7 @@ export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHand
   await tryRun("getColumns definition", async () => {
     const res = await db.tr2.getColumns("fr");
     // console.log(JSON.stringify(res, null, 2))
-    assert.deepStrictEqual(
-      res, 
-      [
+    const expected =  [
         {
           "label": "Id",
           "name": "id",
@@ -168,7 +166,17 @@ export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHand
           "update": true,
           "delete": true
         }
-      ]
+      ];
+
+    assert.deepStrictEqual(
+      res, 
+      expected
+    );
+
+    const resDynamic = await db.tr2.getColumns("fr", { rule: "update", filter: {}, data: { t2: "a" } });
+    assert.deepStrictEqual(
+      resDynamic, 
+      expected
     );
   });
 

package/tests/server/index.js

@@ -268,6 +268,15 @@ const dbConnection = {
                         forcedData: {
                             id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e'
                         }
+                    },
+                    update: {
+                        fields: [],
+                        dynamicFields: [{
+                                fields: { id: 1 },
+                                filter: {
+                                    id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e'
+                                }
+                            }]
                     }
                 }
             };

package/tests/server/index.ts

@@ -290,6 +290,15 @@ const dbConnection = {
 						forcedData: {
 							id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e'
 						}
+					},
+					update: {
+						fields: [],
+						dynamicFields: [{
+							fields: { id: 1 },
+							filter: {
+								id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e'
+							}
+						}]
 					}
 				}
 			};

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.159",
+      "version": "2.0.162",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.95.0",
@@ -29,7 +29,7 @@
         "bluebird": "^3.7.2",
         "file-type": "^16.5.3",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^1.5.132",
+        "prostgles-types": "^1.5.134",
         "sharp": "^0.30.5"
       },
       "devDependencies": {
@@ -1371,7 +1371,7 @@
         "bluebird": "^3.7.2",
         "file-type": "^16.5.3",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^1.5.132",
+        "prostgles-types": "^1.5.134",
         "sharp": "^0.30.5",
         "typescript": "^4.7.2"
       }