prostgles-server 4.2.469 → 4.2.471

package/lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts

@@ -14,15 +14,15 @@ type RunInsertUpdateQueryArgs = {
   returningFields: FieldFilter | undefined;
 } & (
   | {
-      type: "insert";
+      command: "insert";
       params: InsertParams | undefined;
       rule: InsertRule | undefined;
-      data: AnyObject | AnyObject[];
+      data: AnyObject;
       isMultiInsert: boolean;
       nestedInsertsResultsObj?: undefined;
     }
   | {
-      type: "update";
+      command: "update";
       nestedInsertsResultsObj: Record<string, any>;
       params: UpdateParams | undefined;
       rule: UpdateRule | undefined;
@@ -41,6 +41,7 @@ export const runInsertUpdateQuery = async (args: RunInsertUpdateQueryArgs) => {
     params,
     nestedInsertsResultsObj,
     data,
+    command,
   } = args;
   const { name } = tableHandler;
 
@@ -48,7 +49,7 @@ export const runInsertUpdateQuery = async (args: RunInsertUpdateQueryArgs) => {
     params?.returning,
     tableHandler.parseFieldFilter(returningFields),
   );
-  const { checkFilter, postValidate } = rule ?? {};
+  const { checkFilter } = rule ?? {};
   let checkCondition = "WHERE FALSE";
   if (checkFilter) {
     const checkCond = await tableHandler.prepareWhere({
@@ -110,7 +111,7 @@ export const runInsertUpdateQuery = async (args: RunInsertUpdateQueryArgs) => {
 
   const tx = localParams?.tx?.t || tableHandler.tx?.t;
   if (tx) {
-    result = await tx[queryType](query).catch((err: any) =>
+    result = await tx[queryType](query).catch((err: unknown) =>
       getClientErrorFromPGError(err, {
         type: "tableMethod",
         localParams,
@@ -137,26 +138,63 @@ export const runInsertUpdateQuery = async (args: RunInsertUpdateQueryArgs) => {
     );
   }
 
+  const rows = result.modified ?? [];
   const finalDBtx = tableHandler.getFinalDBtx(localParams);
-  if (postValidate) {
-    if (!finalDBtx) throw new Error("Unexpected: no dbTX for postValidate");
-    if (!localParams) throw new Error("Unexpected: no localParams for postValidate");
+  const { postValidate } = rule ?? {};
+  const afterHooks = tableHandler.config?.hooks?.afterEach;
+  let changedFieldsSet = undefined as undefined | Set<string>;
+  const getChangedFieldsSet = () => {
+    changedFieldsSet ??= new Set<string>(rows.map((row) => Object.keys(row)).flat());
+    return changedFieldsSet;
+  };
+  const applicableAfterHooks = afterHooks?.filter(({ commands, changedFields }) => {
+    return (
+      commands[command] &&
+      (!changedFields || changedFields.some((f) => getChangedFieldsSet().has(f)))
+    );
+  });
+
+  if (postValidate && !localParams) {
+    throw new Error("Unexpected: no localParams for postValidate");
+  }
+  const validationHooks = [
+    ...(applicableAfterHooks ?? []).map(
+      (h) => ({ type: "afterEach", validate: h.validate, localParams }) as const,
+    ),
+    ...(postValidate && localParams ?
+      [{ type: "postValidate", validate: postValidate, localParams } as const]
+    : []),
+  ];
+
+  if (validationHooks.length) {
+    if (!finalDBtx) throw new Error("Unexpected: no dbTX for after hooks/postValidate");
 
-    const rows = result.modified ?? [];
     for (const row of rows) {
-      await postValidate({
+      const commonParams = {
         row: row,
         tx: tx || tableHandler.db,
         dbx: finalDBtx,
-        localParams,
-        command: args.type,
-        data: args.data,
-      });
+        command,
+        data,
+      } as const;
+      for (const hook of validationHooks) {
+        if (hook.type === "afterEach") {
+          await hook.validate({
+            ...commonParams,
+            localParams: hook.localParams,
+          });
+        } else {
+          await hook.validate({
+            ...commonParams,
+            localParams: hook.localParams,
+          });
+        }
+      }
     }
   }
 
   let returnMany = false;
-  if (args.type === "update") {
+  if (args.command === "update") {
     const { multi = true } = args.params || {};
     if (!multi && result.row_count && +result.row_count > 1) {
       throw `More than 1 row modified: ${result.row_count} rows affected`;

package/lib/DboBuilder/TableHandler/update.ts

@@ -32,7 +32,7 @@ export async function update(
         ),
       );
     const rule = tableRules?.[ACTION];
-    if (rule?.postValidate && !finalDBtx) {
+    if (this.shouldWrapInTx({ name: ACTION, rule }, localParams)) {
       return wrapInTx();
     }
 
@@ -180,7 +180,7 @@ export async function update(
       queryWithoutUserRLS,
       returningFields,
       rule,
-      type: "update",
+      command: "update",
       nestedInsertsResultsObj,
     });
     await this._log({

package/lib/DboBuilder/ViewHandler/ViewHandler.ts

@@ -28,6 +28,7 @@ import type { OnData } from "./subscribe";
 import { subscribe } from "./subscribe";
 import { validateViewRules } from "./validateViewRules";
 import { escapeTSNames } from "../../utils/utils";
+import type { TableDefinition } from "../../TableConfig/TableConfig";
 
 export type JoinPaths = {
   t1: string;
@@ -48,6 +49,7 @@ export class ViewHandler {
   joinGraph?: Graph;
   joinPaths?: JoinPaths;
   dboBuilder: DboBuilder;
+  config: TableDefinition<any> | undefined;
 
   tx?: {
     t: pgPromise.ITask<{}>;
@@ -60,13 +62,22 @@ export class ViewHandler {
   is_view = true;
   filterDef = "";
   is_media = false;
-  constructor(
-    db: DB,
-    tableOrViewInfo: TableSchema,
-    dboBuilder: DboBuilder,
-    tx?: { t: pgPromise.ITask<{}>; dbTX: TableHandlers },
-    joinPaths?: JoinPaths,
-  ) {
+  constructor({
+    db,
+    config,
+    dboBuilder,
+    tableOrViewInfo,
+    tx,
+    joinPaths,
+  }: {
+    db: DB;
+    tableOrViewInfo: TableSchema;
+    dboBuilder: DboBuilder;
+    config: TableDefinition<any> | undefined;
+    tx?: { t: pgPromise.ITask<{}>; dbTX: TableHandlers };
+    joinPaths?: JoinPaths;
+  }) {
+    this.config = config;
     this.db = db;
     this.tx = tx;
     this.joinPaths = joinPaths;

package/lib/PublishParser/publishTypesAndUtils.ts

@@ -185,11 +185,11 @@ export type ValidateRowArgsCommon<R = AnyObject, DBX = DBHandlerServer> = {
 } & (
   | {
       command: "insert";
-      data: R | R[];
+      data: R;
     }
   | {
       command: "update";
-      data: R | Partial<R>;
+      data: Partial<R>;
     }
 );
 

package/lib/TableConfig/TableConfig.ts

@@ -41,7 +41,7 @@ export const parseI18N = <Config extends LangToTranslation>(params: {
   return defaultValue;
 };
 
-type BaseTableDefinition = {
+type BaseTableDefinition<R = AnyObject, DBX = DBHandlerServer> = {
   info?: {
     label?: string | LangToTranslation;
   };
@@ -55,6 +55,15 @@ type BaseTableDefinition = {
     getPreInsertRow?: (
       args: GetPreInsertRowArgs,
     ) => Promise<{ row: AnyObject; onInserted: Promise<void> }>;
+    afterEach?: {
+      commands: Partial<Record<"insert" | "update", 1>>;
+      changedFields?: string[];
+      validate: <R = AnyObject, DBX = DBHandlerServer>(
+        params: Omit<ValidateRowArgsCommon<R, DBX>, "localParams"> & {
+          localParams: undefined | LocalParams;
+        },
+      ) => Promise<void>;
+    }[];
   };
   triggers?: {
     [triggerName: string]: {
@@ -89,7 +98,7 @@ type BaseTableDefinition = {
   };
 };
 
-type LookupTableDefinition<LANG_IDS> = {
+type LookupTableDefinition<LANG_IDS> = BaseTableDefinition & {
   isLookupTable: {
     values: {
       [id_value: string]:
@@ -230,7 +239,7 @@ type ConstraintType = "PRIMARY KEY" | "UNIQUE" | "CHECK" | "FOREIGN KEY";
  * Each column definition cannot reference to tables that appear later in the table definition.
  * These references should be specified in constraints property
  */
-export type TableDefinition<LANG_IDS> = {
+export type TableDefinition<LANG_IDS> = BaseTableDefinition & {
   onMount?: (params: {
     dbo: DBHandlerServer;
     _db: DB;
@@ -323,12 +332,8 @@ type GetPreInsertRowArgs = Omit<ValidateRowArgsCommon, "localParams"> & {
   localParams: LocalParams | undefined;
 };
 
-/**
- * Helper utility to create lookup tables for TEXT columns
- */
 export type TableConfig<LANG_IDS = { en: 1 }> = {
-  [table_name: string]: BaseTableDefinition &
-    (TableDefinition<LANG_IDS> | LookupTableDefinition<LANG_IDS>);
+  [table_name: string]: TableDefinition<LANG_IDS> | LookupTableDefinition<LANG_IDS>;
 };
 
 /**

package/package.json

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