prostgles-server 2.0.243 → 2.0.246

package/lib/PublishParser.ts

@@ -1,6 +1,7 @@
 import { getKeys, RULE_METHODS, AnyObject, get, TableSchemaForClient, DBSchemaTable, MethodKey, TableInfo, FullFilter } from "prostgles-types";
 import { ClientInfo } from "./AuthHandler";
 import { CommonTableRules, Filter, isPlainObject, LocalParams, PRGLIOSocket, TableHandler, ViewHandler } from "./DboBuilder";
+import type { TableHandler as TableHandlerFromTypes } from "prostgles-types";
 import { Prostgles, DBHandlerServer, DB, TABLE_METHODS } from "./Prostgles";
 import type { DBOFullyTyped, PublishFullyTyped } from "./DBSchemaBuilder";
 export type Method = (...args: any) => ( any | Promise<any> );
@@ -47,7 +48,7 @@ const RULE_TO_METHODS = [
      methods: RULE_METHODS.insert, 
      no_limits: <SelectRule>{ fields: "*" }, 
      table_only: true,
-     allowed_params: <Array<keyof InsertRule>>["fields", "forcedData", "returningFields", "validate", "preValidate"] ,
+     allowed_params: <Array<keyof InsertRule>>["fields", "forcedData", "returningFields", "validate", "preValidate", "postValidate"] ,
      hint: ` expecting "*" | true | { fields: string | string[] | {}  }`
   },
  { 
@@ -126,8 +127,8 @@ export type UpdateRequestDataBatch<R> = {
 }
 export type UpdateRequestData<R extends AnyObject = AnyObject> = UpdateRequestDataOne<R> | UpdateRequestDataBatch<R>;
 
-export type ValidateRow<R extends AnyObject = AnyObject> = (row: R) => R | Promise<R>;
-export type ValidateUpdateRow<R extends AnyObject = AnyObject> = (args: { update: Partial<R>, filter: FullFilter<R> }) => R | Promise<R>;
+export type ValidateRow<R extends AnyObject = AnyObject, S = void> = (row: R, dbx: DBOFullyTyped<S>) => R | Promise<R>;
+export type ValidateUpdateRow<R extends AnyObject = AnyObject, S = void> = (args: { update: Partial<R>, filter: FullFilter<R> }, dbx: DBOFullyTyped<S>) => R | Promise<R>;
 
 
 export type SelectRule<Cols extends AnyObject = AnyObject, S = void> = {
@@ -158,7 +159,7 @@ export type SelectRule<Cols extends AnyObject = AnyObject, S = void> = {
     validate?(args: SelectRequestData): SelectRequestData | Promise<SelectRequestData>;
 
 }
-export type InsertRule<Cols extends AnyObject = AnyObject> = {
+export type InsertRule<Cols extends AnyObject = AnyObject, S = void> = {
 
     /**
      * Fields allowed to be inserted.   Tip: Use false to exclude field
@@ -178,12 +179,17 @@ export type InsertRule<Cols extends AnyObject = AnyObject> = {
     /**
      * Validation logic to check/update data for each request. Happens before publish rule checks (for fields, forcedData/forcedFilter)
      */
-    preValidate?: ValidateRow<Cols>;
+    preValidate?: ValidateRow<Cols, S>;
 
     /**
      * Validation logic to check/update data for each request. Happens after publish rule checks (for fields, forcedData/forcedFilter)
      */
-    validate?: InsertRule<Cols>["preValidate"]
+    validate?: ValidateRow<Cols, S>;
+
+    /**
+     * Validation logic to check/update data after the insert. Happens in the same transaction so upon throwing an error the record will be deleted (not committed)
+     */
+    postValidate?: ValidateRow<Required<Cols>, S>;
 }
 export type UpdateRule<Cols extends AnyObject = AnyObject, S = void> = {
 
@@ -213,7 +219,7 @@ export type UpdateRule<Cols extends AnyObject = AnyObject, S = void> = {
     /**
      * Data to include/overwrite on each updatDBe
      */
-    forcedData?: InsertRule<Cols>["forcedData"]
+    forcedData?: InsertRule<Cols, S>["forcedData"]
 
     /**
      * Fields user can use to find the updates
@@ -228,7 +234,7 @@ export type UpdateRule<Cols extends AnyObject = AnyObject, S = void> = {
     /**
      * Validation logic to check/update data for each request
      */
-    validate?: ValidateUpdateRow<Cols>;
+    validate?: ValidateUpdateRow<Cols, S>;
 
 };
 
@@ -291,11 +297,11 @@ export type ViewRule<S = AnyObject> = CommonTableRules & {
    */
   select?: SelectRule<S>;
 };
-export type TableRule<S = AnyObject> = ViewRule<S> & {
-  insert?: InsertRule<S>;
-  update?: UpdateRule<S>;
-  delete?: DeleteRule<S>;
-  sync?: SyncRule<S>;
+export type TableRule<RowType = AnyObject, S = void> = ViewRule<RowType> & {
+  insert?: InsertRule<RowType, S>;
+  update?: UpdateRule<RowType, S>;
+  delete?: DeleteRule<RowType, S>;
+  sync?: SyncRule<RowType>;
   subscribe?: SubscribeRule;
 };
 export type PublishViewRule<Col extends AnyObject = AnyObject, S = void> = {
@@ -304,7 +310,7 @@ export type PublishViewRule<Col extends AnyObject = AnyObject, S = void> = {
   getInfo?: PublishAllOrNothing;
 };
 export type PublishTableRule<Col extends AnyObject = AnyObject, S = void> = PublishViewRule<Col, S> & {
-  insert?: InsertRule<Col> | PublishAllOrNothing
+  insert?: InsertRule<Col, S> | PublishAllOrNothing
   update?: UpdateRule<Col, S> | PublishAllOrNothing
   delete?: DeleteRule<Col, S> | PublishAllOrNothing
   sync?: SyncRule<Col>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.243",
+  "version": "2.0.246",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/client/PID.txt

@@ -1 +1 @@
-13174
+13630

package/tests/client_only_queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client_only_queries.d.ts","sourceRoot":"","sources":["client_only_queries.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAa,MAAM,4CAA4C,CAAC;AAGtF,wBAA8B,WAAW,CAAC,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,OAAO,KAAA,EAAE,WAAW,EAAE,aAAa,EAAE,iBA6S7I"}
+{"version":3,"file":"client_only_queries.d.ts","sourceRoot":"","sources":["client_only_queries.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAa,MAAM,4CAA4C,CAAC;AAGtF,wBAA8B,WAAW,CAAC,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,OAAO,KAAA,EAAE,WAAW,EAAE,aAAa,EAAE,iBAsT7I"}

package/tests/client_only_queries.js

@@ -194,13 +194,21 @@ async function client_only(db, auth, log, methods, tableSchema) {
                 { 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");
+            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');
+            try {
+                await db.insert_rules.insert({ name: "notfail" }, { returning: "*" });
+                await db.insert_rules.insert({ name: "fail" }, { returning: "*" });
+            }
+            catch (err) {
+            }
+            assert_1.strict.equal(0, +(await db.insert_rules.count({ name: "fail" })), "postValidation failed");
+            assert_1.strict.equal(1, +(await db.insert_rules.count({ name: "notfail" })), "postValidation failed");
         });
         // await tryRun("Duplicate subscription", async () => {
         //   return new Promise(async (resolve, reject) => {

package/tests/client_only_queries.ts

@@ -224,9 +224,8 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
         { 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")
+      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: "*" });
@@ -235,6 +234,16 @@ export default async function client_only(db: DBHandlerClient, auth: Auth, log:
       /* forced UUID insert */
       const row: any = await db.uuid_text.insert({}, {returning: "*"});
       assert.equal(row.id, 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e');
+
+
+      try {
+        await db.insert_rules.insert({ name: "notfail" }, { returning: "*" });
+        await db.insert_rules.insert({ name: "fail" }, { returning: "*" });
+      } catch(err){
+
+      }
+      assert.equal(0, +(await db.insert_rules.count({ name: "fail" })), "postValidation failed");
+      assert.equal(1, +(await db.insert_rules.count({ name: "notfail" })), "postValidation failed");
     });
 
     // await tryRun("Duplicate subscription", async () => {

package/tests/server/dboTypeCheck.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dboTypeCheck.d.ts","sourceRoot":"","sources":["dboTypeCheck.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,YAexB,CAAA"}
+{"version":3,"file":"dboTypeCheck.d.ts","sourceRoot":"","sources":["dboTypeCheck.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,YAAY,YA4BxB,CAAA"}

package/tests/server/dboTypeCheck.js

@@ -11,6 +11,17 @@ const testDboTypes = () => {
         db.items2.find;
         const values = await db.items2.find({}, { select: { items_id: 1 }, returnType: "values" });
         const numArr = values;
+        const publish = {
+            items: {
+                insert: {
+                    fields: { name: 1 },
+                    validate: async (row) => ({
+                        ...row,
+                        h: [""]
+                    })
+                }
+            }
+        };
     });
 };
 exports.testDboTypes = testDboTypes;

package/tests/server/dboTypeCheck.ts

@@ -1,6 +1,7 @@
 import type { DBOFullyTyped } from "../../dist/DBSchemaBuilder";
 import type { DBHandlerServer } from "../../dist/DboBuilder";
 import { DBSchemaGenerated } from "./DBoGenerated";
+import { Publish } from "../../dist/PublishParser";
 
 export const testDboTypes =  () => {
   (async () => {
@@ -16,5 +17,18 @@ export const testDboTypes =  () => {
 
     const values = await db.items2.find({}, { select: { items_id: 1 }, returnType: "values" });
     const numArr: number[] = values;
+
+
+    const publish: Publish<DBSchemaGenerated> = {
+      items: {
+        insert: {
+          fields: { name: 1 },
+          validate: async (row) => ({
+            ...row,
+            h: [""]
+          })
+        }
+      }
+    }
   })
 }

package/tests/server/index.js

@@ -304,6 +304,7 @@ function dd() {
                 prostgles_lookup_media_items_with_one_media: "*",
                 prostgles_lookup_media_items_with_media: "*",
                 insert_rules: {
+                    select: "*",
                     insert: {
                         fields: "*",
                         returningFields: { name: 1 },
@@ -311,6 +312,11 @@ function dd() {
                             if (row.name === "a")
                                 row.name = "b";
                             return row;
+                        },
+                        postValidate: async (row, dbo) => {
+                            if (row.name === "fail")
+                                throw "Failed";
+                            return undefined;
                         }
                     }
                 },

package/tests/server/index.ts

@@ -333,12 +333,17 @@ function dd(){
 				prostgles_lookup_media_items_with_one_media: "*",
 				prostgles_lookup_media_items_with_media: "*",
 				insert_rules: {
+					select: "*",
 					insert: {
 						fields: "*",
 						returningFields: { name: 1 },
 						validate: async (row) => {
 							if(row.name === "a") row.name = "b"
 							return row
+						},
+						postValidate: async (row, dbo) => {
+							if(row.name === "fail") throw "Failed";
+							return undefined
 						}
 					}
 				},

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.239",
+      "version": "2.0.245",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.121.0",