prostgles-server 4.2.583 → 4.2.585

package/lib/TableConfig/TableConfigTypes.ts

@@ -28,36 +28,14 @@ export type ColExtraInfo = {
 
 export type LangToTranslation = Record<string, string>;
 
-type BaseTableDefinition<R = AnyObject, DBX = DBHandlerServer> = {
+type BaseTableDefinition = {
   info?: {
     label?: string | LangToTranslation;
   };
   dropIfExistsCascade?: boolean;
   dropIfExists?: boolean;
   syncConfig?: SyncConfig;
-  hooks?: {
-    /**
-     * Hook used to run custom logic before inserting a row.
-     * The returned row must satisfy the table schema.
-     */
-    getPreInsertRow?: (
-      args: GetPreInsertRowArgs,
-    ) => Promise<{ row: AnyObject; onInserted: Promise<void> }>;
-    beforeEach?: BeforeEachTsTrigger<R, DBX>[];
-    afterEach?: AfterEachTsTrigger<R, DBX>[];
-    afterAll?: AfterAllTsTrigger<R, DBX>[];
-    onInsteadOfDelete?: (args: {
-      dbx: DBX;
-      tx: pgPromise.ITask<{}>;
-      returningQuery: string;
-      isOneOrNone: boolean;
-      queryType: "any" | "none";
-      filterOpts: {
-        where: string;
-        filter: AnyObject;
-      };
-    }) => Promise<AnyObject[]>;
-  };
+
   triggers?: {
     [triggerName: string]: {
       /**
@@ -232,11 +210,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 = { en: 1 },
-  R = AnyObject,
-  DBX = DBHandlerServer,
-> = BaseTableDefinition<R, DBX> & {
+export type TableDefinition<LANG_IDS = { en: 1 }> = BaseTableDefinition & {
   onMount?: (params: {
     dbo: DBHandlerServer;
     _db: DB;
@@ -323,18 +297,6 @@ export type TableDefinition<
   };
 };
 
-type GetPreInsertRowArgs = Omit<ValidateRowArgsCommon, "localParams"> & {
-  validate: InsertRule["validate"];
-  localParams: LocalParams | undefined;
+export type TableConfig<LANG_IDS = { en: 1 }> = {
+  [table_name: string]: TableDefinition<LANG_IDS> | LookupTableDefinition<LANG_IDS>;
 };
-
-export type TableConfig<LANG_IDS = { en: 1 }, S = void> =
-  S extends DBSchema ?
-    Partial<{
-      [TableName in keyof S]:
-        | TableDefinition<LANG_IDS, S[TableName]["columns"], DBOFullyTyped<S>>
-        | LookupTableDefinition<LANG_IDS>;
-    }>
-  : {
-      [table_name: string]: TableDefinition<LANG_IDS> | LookupTableDefinition<LANG_IDS>;
-    };

package/lib/TableConfig/TableConfigurator.ts

@@ -16,7 +16,7 @@ export class TableConfigurator {
   instanceId = Date.now() + Math.random();
 
   get config() {
-    return this.prostgles.mergedTableConfig ?? {};
+    return this.prostgles.mergedTableConfig.tableConfig ?? {};
   }
   get dbo(): DBHandlerServer {
     if (!this.prostgles.dbo) throw "this.prostgles.dbo missing";

package/lib/TableHooks/TableHooks.ts

@@ -0,0 +1,51 @@
+import type pgPromise from "pg-promise";
+import type { AnyObject, DBSchema } from "prostgles-types";
+
+import type { DbTxTableHandlers, LocalParams } from "../DboBuilder/DboBuilderTypes";
+import type { DBOFullyTyped } from "../DBSchemaBuilder/DBSchemaBuilder";
+import type {
+  AfterAllTsTrigger,
+  AfterEachTsTrigger,
+  BeforeEachTsTrigger,
+  InsertRule,
+  ValidateRowArgsCommon,
+} from "../PublishParser/PublishParser";
+
+export type TableHooks<S = void> =
+  S extends DBSchema ?
+    Partial<{
+      [tableName in keyof S]: TableHooksDefinition<
+        Required<S[tableName]["columns"]>,
+        DBOFullyTyped<S>
+      >;
+    }>
+  : Record<string, TableHooksDefinition>;
+
+export type TableHooksDefinition<R = AnyObject, DBX = DbTxTableHandlers> = {
+  /**
+   * Hook used to run custom logic before inserting a row.
+   * The returned row must satisfy the table schema.
+   */
+  getPreInsertRow?: (
+    args: PreInsertRowArgs,
+  ) => Promise<{ row: AnyObject; onInserted: Promise<void> }>;
+  beforeEach?: BeforeEachTsTrigger<R, DBX>[];
+  afterEach?: AfterEachTsTrigger<R, DBX>[];
+  afterAll?: AfterAllTsTrigger<R, DBX>[];
+  onInsteadOfDelete?: (args: {
+    dbx: DBX;
+    tx: pgPromise.ITask<{}>;
+    returningQuery: string;
+    isOneOrNone: boolean;
+    queryType: "any" | "none";
+    filterOpts: {
+      where: string;
+      filter: AnyObject;
+    };
+  }) => Promise<AnyObject[] | undefined>;
+};
+
+type PreInsertRowArgs = Omit<ValidateRowArgsCommon, "localParams"> & {
+  validate: InsertRule["validate"];
+  localParams: LocalParams | undefined;
+};

package/lib/index.ts

@@ -20,6 +20,7 @@ export type { StorageClient as CloudClient } from "./StorageClient/StorageClient
 export * from "./StorageClient/getLocalStorageClient";
 export type { DB } from "./initProstgles";
 export type * from "./TableConfig/TableConfigTypes";
+export type * from "./TableHooks/TableHooks";
 export * from "./Auth/utils/upsertNamedExpressMiddleware";
 export type { RequestWithUser } from "./Auth/middleware/userContextMiddleware";
 export default prostgles;

package/lib/updateConfiguration.ts

@@ -29,7 +29,10 @@ export const updateConfiguration = async <DBSchema, UserSchema extends SessionUs
     prgl.initRestApi();
   }
   if (includes(optionsThatChanged, "tableConfig")) {
-    await prgl.initTableConfig({ type: "prgl.update", newOpts });
+    await prgl.initTableConfig({
+      type: "prgl.update",
+      newOpts: newOpts,
+    });
   }
   if (includes(optionsThatChanged, "schema")) {
     await prgl.refreshDBO();
@@ -61,7 +64,10 @@ export const updateConfiguration = async <DBSchema, UserSchema extends SessionUs
   ) {
     prgl.setupSocketIO();
   } else {
-    await prgl.init(onReady, { type: "prgl.update", newOpts });
+    await prgl.init(onReady, {
+      type: "prgl.update",
+      newOpts: newOpts,
+    });
   }
 };
 

package/package.json

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