prostgles-server 4.2.619 → 4.2.621

package/lib/PublishParser/validatePublishProfiles.ts

@@ -0,0 +1,22 @@
+import { validateClientSchemaName } from "../DBSchemaBuilder/getClientDBGeneratedSchemas";
+import type { PublishProfile } from "./publishTypesAndUtils";
+
+export const validatePublishProfiles = (profiles: PublishProfile[]) => {
+  const names = new Set<string>();
+  const userTypes = new Set<string>();
+  const entries = profiles.map((profile, index) => {
+    const name = profile.name ?? `Publish${index + 1}Schema`;
+    validateClientSchemaName(name);
+    if (names.has(name)) throw new Error(`Duplicate publish schema name: ${name}`);
+    names.add(name);
+    if (!profile.userTypes.length) {
+      throw new Error(`Publish ${name}: userTypes must not be empty`);
+    }
+    for (const userType of profile.userTypes) {
+      if (userTypes.has(userType)) throw new Error(`Duplicate publish user type: ${userType}`);
+      userTypes.add(userType);
+    }
+    return { ...profile, name };
+  });
+  return entries;
+};

package/lib/SchemaWatch/SchemaWatch.ts

@@ -81,7 +81,7 @@ export class SchemaWatch {
           console.log("watchSchema: Re-writing TS schema");
 
           await this.dboBuilder.prostgles.refreshDBO();
-          this.dboBuilder.prostgles.writeDBSchema(true);
+          await this.dboBuilder.prostgles.writeDBSchema(true);
         }
       } else {
         /* Full re-init. Sockets must reconnect */

package/lib/TableHooks/TableHooks.ts

@@ -1,5 +1,9 @@
 import type pgPromise from "pg-promise";
-import type { AnyObject, DBSchema } from "prostgles-types";
+import type {
+  AnyObject,
+  DBSchema,
+  InsertDataWithNested,
+} from "prostgles-types";
 
 import type { DbTxTableHandlers } from "../DboBuilder/DboBuilderTypes";
 import type { DBOFullyTyped } from "../DBSchemaBuilder/DBSchemaBuilder";
@@ -10,13 +14,13 @@ import type {
   TransactionCallbacks,
 } from "../PublishParser/PublishParser";
 
-export type TableHooks<S = void, Context = undefined> =
-  S extends DBSchema ?
-    Partial<{
+export type TableHooks<S = void, Context = undefined> = S extends DBSchema
+  ? Partial<{
       [tableName in keyof S]: TableHooksDefinition<
         Required<S[tableName]["columns"]>,
         DBOFullyTyped<S>,
-        Context
+        Context,
+        InsertDataWithNested<S[tableName]["columns"], S, tableName>
       >;
     }>
   : Record<string, TableHooksDefinition<AnyObject, DbTxTableHandlers, Context>>;
@@ -25,6 +29,7 @@ export type TableHooksDefinition<
   RowDataType = AnyObject,
   DBX = DbTxTableHandlers,
   Context = undefined,
+  InputDataType = RowDataType,
 > = {
   /**
    * Runs sequentially before data validation and mutation SQL for each insert row,
@@ -33,19 +38,21 @@ export type TableHooksDefinition<
    * Also runs when generating SQL statements (including updateBatch).
    * File inserts/updates reject SQL-only requests; file updates lock matching rows before hooks.
    * May replace the pending data and pass `hookContext` to the next hook.
+   * Data is the raw input, including nested inserts and values awaiting PostgreSQL casts.
    * Register `onCommit`/`onRollback` before starting external work so cleanup also runs if the
    * hook throws. These callbacks are awaited after the outer transaction finishes and receive
    * the non-transactional `db` and `dbo` objects.
    */
-  beforeEach?: BeforeEachTsTrigger<RowDataType, DBX, Context>[];
+  beforeEach?: BeforeEachTsTrigger<InputDataType, DBX, Context>[];
 
   /**
    * Runs once per affected row after SQL, inside the same transaction.
    * `row` is the inserted/updated row or the deleted row's pre-delete state. Throwing rolls back.
+   * `data` is the input for the operation, including the whole array for bulk inserts.
    * Use `onCommit` for side effects that must only run after the transaction commits.
    * Its callback receives the non-transactional `db` and `dbo` objects.
    */
-  afterEach?: AfterEachTsTrigger<RowDataType, DBX, Context>[];
+  afterEach?: AfterEachTsTrigger<RowDataType, DBX, Context, InputDataType>[];
 
   /**
    * Runs once after all applicable `afterEach` hooks, inside the same transaction.

package/lib/WebsocketAPI/getClientHandlers.ts

@@ -7,7 +7,7 @@ import {
   type TableHandler,
 } from "prostgles-types";
 import type { AuthClientRequest } from "../Auth/AuthTypes";
-import type { DBOFullyTyped } from "../DBSchemaBuilder/DBSchemaBuilder";
+import type { DBOFullyTypedClient } from "../DBSchemaBuilder/DBSchemaBuilder";
 import type { Prostgles } from "../Prostgles";
 import type { ServerFunctionDefinition } from "../PublishParser/defineServerFunction";
 import type { PermissionScope } from "../PublishParser/publishTypesAndUtils";
@@ -16,7 +16,7 @@ import { getClientSchema } from "./getClientSchema";
 
 export type ClientHandlers<S = void> = {
   clientSql: SQLHandler;
-  clientDb: DBOFullyTyped<S, false>;
+  clientDb: DBOFullyTypedClient<S>;
   clientMethods: Record<string, ServerFunctionDefinition>;
   clientSchema: ClientSchema;
 };
@@ -24,7 +24,7 @@ export const getClientHandlers = async <S = void>(
   prostgles: Prostgles,
   clientReq: AuthClientRequest,
   scope: PermissionScope | undefined,
-): Promise<ClientHandlers> => {
+): Promise<ClientHandlers<S>> => {
   prostgles.checkNotDestroyed();
   const clientSchema =
     clientReq.socket?.prostgles?.get(prostgles.appId) ??
@@ -67,7 +67,7 @@ export const getClientHandlers = async <S = void>(
   const clientDb = {
     ...tableHandlers,
     ...txNotAllowed,
-  } as DBOFullyTyped<S, false>;
+  } as DBOFullyTypedClient<S>;
 
   const clientMethods: Record<string, ServerFunctionDefinition> = Object.fromEntries(
     clientSchema.methods.map(({ name, input, description, output }) => {

package/lib/index.ts

@@ -20,8 +20,8 @@ export const createProstgles = <S = void, SUser extends SessionUser = SessionUse
 };
 export * from "./PublishParser/defineServerFunction";
 export * from "./Auth/AuthTypes";
-export type { PublishParams } from "./PublishParser/publishTypesAndUtils";
-export type { DBOFullyTyped } from "./DBSchemaBuilder/DBSchemaBuilder";
+export type { PublishParams, PublishProfile } from "./PublishParser/publishTypesAndUtils";
+export type { DBOFullyTyped, DBOFullyTypedClient } from "./DBSchemaBuilder/DBSchemaBuilder";
 export type { DBHandlerServer } from "./Prostgles";
 export type { StorageClient as CloudClient } from "./StorageClient/StorageClientTypes";
 export * from "./StorageClient/getLocalStorageClient";

package/lib/initProstgles.ts

@@ -12,7 +12,7 @@ import { getDbConnection } from "./getDbConnection";
 import type { DBHandlerServer, Prostgles } from "./Prostgles";
 import { getIsSuperUser } from "./Prostgles";
 import type { ProstglesInitOptions } from "./ProstglesTypes";
-import { PublishParser, type PermissionScope } from "./PublishParser/PublishParser";
+import type { PermissionScope } from "./PublishParser/PublishParser";
 import { SchemaWatch } from "./SchemaWatch/SchemaWatch";
 import { runSQLFile } from "./TableConfig/runSQLFile";
 import { updateConfiguration, type clientOnlyUpdateKeys } from "./updateConfiguration";
@@ -92,15 +92,9 @@ export type CreateContextParams<S> = OnReadyParamsCommon & {
   dbo: DBOFullyTyped<S>;
   onCleanup: (cleanup: ContextCleanup) => void;
 };
-export type CreateContext<S, Context> = (
-  params: CreateContextParams<S>,
-) => MaybePromise<Context>;
+export type CreateContext<S, Context> = (params: CreateContextParams<S>) => MaybePromise<Context>;
 
-export type OnReadyCallback<
-  S,
-  SUser extends SessionUser,
-  Context = undefined,
-> = (
+export type OnReadyCallback<S, SUser extends SessionUser, Context = undefined> = (
   params: OnReadyParams<S, Context>,
   update: (newOpts: UpdatableOptions<S, SUser, Context>, force?: true) => Promise<void>,
 ) => void | Promise<void>;
@@ -109,11 +103,7 @@ export type OnReadyCallbackBasic = (
   update: (newOpts: UpdatableOptions<void, SessionUser, any>, force?: true) => Promise<void>,
 ) => void | Promise<void>;
 
-export type InitResult<
-  S = void,
-  SUser extends SessionUser = SessionUser,
-  Context = undefined,
-> = {
+export type InitResult<S = void, SUser extends SessionUser = SessionUser, Context = undefined> = {
   db: DBOFullyTyped<S>;
   context: Context;
   sql: SQLHandler;
@@ -126,7 +116,7 @@ export type InitResult<
    */
   getTSSchema: typeof DboBuilder.prototype.getTsDefinitions;
   getSchema: typeof DboBuilder.prototype.getSchema;
-  reWriteDBSchema: () => void;
+  reWriteDBSchema: () => Promise<void>;
   update: (newOpts: UpdatableOptions<S, SUser, Context>, force?: true) => Promise<void>;
   restart: () => Promise<InitResult<S, SUser, Context>>;
   options: ProstglesInitOptions<S, SUser, Context>;
@@ -259,10 +249,8 @@ export const initProstgles = async function (
       /* 3.9 Check auth config */
       this.initAuthHandler();
 
-      this.publishParser = new PublishParser(this);
-      this.dboBuilder.publishParser = this.publishParser;
-
       /* 4. Set publish and auth listeners */
+      this.initPublishParser();
       this.setupSocketIO();
     } else if (this.opts.auth) {
       throw "Auth config does not work without publish";
@@ -270,7 +258,7 @@ export const initProstgles = async function (
 
     this.dbEventsManager = new DBEventsManager(db, pgp);
 
-    this.writeDBSchema();
+    await this.writeDBSchema();
 
     /* 5. Finish init and provide DBO object */
     try {

package/lib/updateConfiguration.ts

@@ -32,6 +32,9 @@ export const updateConfiguration = async (
   if (includes(optionsThatChanged, "schema")) {
     await prgl.refreshDBO();
   }
+  if (includes(optionsThatChanged, "publish")) {
+    prgl.initPublishParser();
+  }
   if (includes(optionsThatChanged, "auth")) {
     prgl.initAuthHandler();
   }
@@ -42,10 +45,11 @@ export const updateConfiguration = async (
   }
 
   if (
+    includes(optionsThatChanged, "publish") ||
     includes(optionsThatChanged, "tsGeneratedTypesDir") ||
     includes(optionsThatChanged, "tsGeneratedTypesFunctionsPath")
   ) {
-    prgl.writeDBSchema();
+    await prgl.writeDBSchema();
   }
 
   if (isEmpty(newOpts)) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.619",
+  "version": "4.2.621",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -57,7 +57,7 @@
     "pg": "^8.23.0",
     "pg-cursor": "^2.22.0",
     "pg-promise": "^12.7.1",
-    "prostgles-types": "^4.0.282"
+    "prostgles-types": "^4.0.284"
   },
   "devDependencies": {
     "@eslint/js": "^9.22.0",