prostgles-server 4.2.619 → 4.2.621

package/dist/updateConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateConfiguration.js","sourceRoot":"","sources":["../lib/updateConfiguration.ts"],"names":[],"mappings":";;;AAAA,qDAAiF;AAI1E,MAAM,mBAAmB,GAAG,KAAK,EACtC,IAAe,EACf,OAA6B,EAC7B,OAAyC,EACzC,KAAY,EACZ,EAAE;IACF,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACzB,MAAM,kBAAkB,GAAG,IAAA,yBAAO,EAAC,OAAO,CAAC;SACxC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,6DAA6D;QAC7D,IAAI,KAAK,IAAI,CAAC,IAAA,yBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAChD,YAAY;YACZ,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC1B,OAAO,CAAC,CAAC;QACX,CAAC;QACD,OAAO;IACT,CAAC,CAAC;SACD,MAAM,CAAC,2BAAS,CAAC,CAAC;IACrB,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC;QAC/B,MAAM,IAAI,CAAC,WAAW,CAAC;QACvB,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACnC,OAAO;IACT,CAAC;IAED,IAAI,IAAA,0BAAQ,EAAC,kBAAkB,EAAE,SAAS,CAAC,EAAE,CAAC;QAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IACD,IAAI,IAAA,0BAAQ,EAAC,kBAAkB,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC3C,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;IAC1B,CAAC;IACD,IAAI,IAAA,0BAAQ,EAAC,kBAAkB,EAAE,MAAM,CAAC,EAAE,CAAC;QACzC,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IACD,IAAI,IAAA,0BAAQ,EAAC,kBAAkB,EAAE,IAAI,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACvC,MAAM,CAAC,UAAU,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IACE,IAAA,0BAAQ,EAAC,kBAAkB,EAAE,qBAAqB,CAAC;QACnD,IAAA,0BAAQ,EAAC,kBAAkB,EAAE,+BAA+B,CAAC,EAC7D,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAED,IAAI,IAAA,yBAAO,EAAC,OAAO,CAAC;QAAE,OAAO;IAE7B,IACE,kBAAkB,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,UAAU,CAAC,CAAC,EAChG,CAAC;QACD,OAAO;IACT,CAAC;IAED;;;OAGG;IACH,IACE,kBAAkB,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,4BAAoB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,UAAU,CAAC,CAAC,EAChG,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACvB,IAAI,EAAE,aAAa;YACnB,OAAO;SACR,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AApEW,QAAA,mBAAmB,uBAoE9B;AAEF;;GAEG;AACU,QAAA,oBAAoB,GAAG;IAClC,IAAI;IACJ,MAAM;IACN,SAAS;IACT,WAAW;IACX,eAAe;IACf,oBAAoB;CACyB,CAAC;AAEhD,MAAM,oBAAoB,GAAG,CAAC,YAAY,CAA+C,CAAC"}
+{"version":3,"file":"updateConfiguration.js","sourceRoot":"","sources":["../lib/updateConfiguration.ts"],"names":[],"mappings":"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"}

package/eslint.config.mjs

@@ -3,7 +3,7 @@ import tseslint from "typescript-eslint";
 
 export default tseslint.config(
   {
-    ignores: ["node_modules", "dist", "examples", "**/*.d.ts", "tests", "docs"],
+    ignores: ["node_modules", "dist", "debug", "examples", "**/*.d.ts", "tests", "docs"],
   },
   eslint.configs.recommended,
   tseslint.configs.recommendedTypeChecked,

package/lib/DBSchemaBuilder/DBSchemaBuilder.ts

@@ -27,6 +27,16 @@ export type DBOFullyTyped<
 > = DBTableHandlersFromSchema<Schema> &
   DBHandlerServerWithTx<DBTableHandlersFromSchema<Schema>, WithTransactions>;
 
+/** Publish-aware server wrappers for client requests; transactions and isView are unavailable. */
+export type DBOFullyTypedClient<Schema = void> =
+  Schema extends DBSchema ?
+    {
+      [TName in keyof Schema]:
+        | TableHandler<Schema[TName]["columns"], Schema, TName>
+        | (Schema[TName] extends { optional: true } ? undefined : never);
+    }
+  : Record<string, Partial<TableHandler>>;
+
 export type PublishFullyTyped<Schema = void> =
   Schema extends DBSchema ?
     {

package/lib/DBSchemaBuilder/constants.ts

@@ -0,0 +1 @@
+export const DB_GENERATED_SCHEMA_NAME = "DBGeneratedSchema";

package/lib/DBSchemaBuilder/getClientDBGeneratedSchemas.ts

@@ -0,0 +1,116 @@
+import { DB_GENERATED_SCHEMA_NAME } from "./constants";
+import type { DBSchemaTable, TableSchema } from "prostgles-types";
+import type { TableConfig } from "../TableConfig/TableConfigTypes";
+
+/** Permissions compiled from publish profiles at startup. */
+export type ClientSchemaProfiles = Record<string, { tableSchema: DBSchemaTable[] }>;
+
+export const getClientDBGeneratedSchemas = (
+  profiles: ClientSchemaProfiles,
+  tables: TableSchema[],
+  config: TableConfig | undefined,
+): string => {
+  const entries = Object.entries(profiles).sort(([a], [b]) => a.localeCompare(b));
+  if (!entries.length) return "";
+  for (const [name, schema] of entries) {
+    validateClientSchemaName(name);
+    for (const table of schema.tableSchema) {
+      const base = tables.find((t) => t.name === table.name);
+      if (!base || table.columns.some((c) => !base.columns.some((b) => b.name === c.name))) {
+        throw new Error(`Cannot generate ${name}: unknown table or column in ${table.name}.`);
+      }
+    }
+  }
+
+  const generate = (name: string, schemas: ClientSchemaProfiles[string][]) => {
+    const definitions = tables
+      .slice()
+      .sort((a, b) => a.name.localeCompare(b.name))
+      .flatMap((table) => {
+        const published = schemas.map((s) => s.tableSchema.find((t) => t.name === table.name));
+        if (!published.some(Boolean)) return [];
+        const inserting = published.filter((t) => t?.publishInfo.insert);
+        const tableType = `${DB_GENERATED_SCHEMA_NAME}[${JSON.stringify(table.name)}]`;
+        const required: string[] = [];
+        const optional: string[] = [];
+        const excluded: string[] = [];
+        for (const column of table.columns.slice().sort((a, b) => a.name.localeCompare(b.name))) {
+          const writable = inserting.map(
+            (t) => !!t?.columns.find((c) => c.name === column.name)?.insert,
+          );
+          if (!writable.some(Boolean)) {
+            excluded.push(`${JSON.stringify(column.name)}?: never`);
+          } else if (
+            !writable.every(Boolean) ||
+            config?.[table.name]?.syncConfig?.synced_field === column.name
+          ) {
+            optional.push(column.name);
+          } else {
+            required.push(column.name);
+          }
+        }
+        const input =
+          !inserting.length ? "never" : (
+            [
+              required.length ? `Pick<${tableType}["columns"], ${keys(required)}>` : "",
+              optional.length ? `Partial<Pick<${tableType}["columns"], ${keys(optional)}>>` : "",
+              excluded.length ? `{ ${excluded.join("; ")} }` : "",
+            ]
+              .filter(Boolean)
+              .join(" & ") || "Record<string, never>"
+          );
+        const updating = published.filter((t) => t?.publishInfo.update);
+        const updateAllowed = table.columns
+          .filter((column) =>
+            updating.some((t) => t?.columns.some((c) => c.name === column.name && c.update)),
+          )
+          .map((column) => column.name)
+          .sort();
+        const updateExcluded = table.columns
+          .filter((column) => !updateAllowed.includes(column.name))
+          .map((column) => `${JSON.stringify(column.name)}?: never`)
+          .sort();
+        const updateInput =
+          !updating.length ? "never" : (
+            [
+              updateAllowed.length ?
+                `Partial<import("prostgles-types").UpsertDataToPGCast<Pick<${tableType}["columns"], ${keys(updateAllowed)}>>>`
+              : "",
+              updateExcluded.length ? `{ ${updateExcluded.join("; ")} }` : "",
+            ]
+              .filter(Boolean)
+              .join(" & ") || "Record<string, never>"
+          );
+        const optionalTable = published.every(Boolean) ? "" : " optional: true;";
+        return [
+          `  ${JSON.stringify(table.name)}: ${tableType} & { insertColumns: ${input}; updateColumns: ${updateInput};${optionalTable} };`,
+        ];
+      });
+    return `export type ${name} = {\n${definitions.join("\n")}\n};`;
+  };
+
+  return [
+    "/** Publish access profiles. Row types retain the database schema; runtime permissions still apply. */",
+    ...entries.map(([name, schema]) => generate(name, [schema])),
+    "/** Permissive write inputs across all supplied profiles; tables missing from a profile are optional. */",
+    generate(
+      "ClientDBSchema",
+      entries.map(([, schema]) => schema),
+    ),
+  ].join("\n\n");
+};
+
+const keys = (names: string[]) => names.map((name) => JSON.stringify(name)).join(" | ");
+const reservedNames = new Set([
+  DB_GENERATED_SCHEMA_NAME,
+  "DBSchema",
+  "DBSchemaForInsert",
+  "ClientDBSchema",
+]);
+
+export const validateClientSchemaName = (name: string) => {
+  // Requiring a Schema suffix also avoids TypeScript keywords and primitive type names.
+  if (!/^[A-Za-z_$][\w$]*Schema$/.test(name) || reservedNames.has(name)) {
+    throw new Error(`Invalid client schema name: ${name}. Use a unique name ending in Schema.`);
+  }
+};

package/lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts

@@ -25,8 +25,8 @@ export const getColumnTypescriptDefinition = ({
   column: TableSchema["columns"][number];
 }) => {
   /**
-   * Columns that are nullable or have default values can be ommitted from an insert
-   * Non nullable columns with default values cannot containt null values in an insert so they must contain a valid value or be omitted
+   * Columns that are nullable or have default values can be omitted from an insert
+   * Non nullable columns with default values cannot contain null values in an insert so they must contain a valid value or be omitted
    */
 
   const dataType = getDataType({

package/lib/DBSchemaBuilder/getDBGeneratedSchema.ts

@@ -1,15 +1,22 @@
+import { DB_GENERATED_SCHEMA_NAME } from "./constants";
 import { isDefined, isEmpty, type TableSchema } from "prostgles-types";
 import type { TableConfig } from "../TableConfig/TableConfigTypes";
 import { escapeTSNames } from "../utils/utils";
 import { getColumnTypescriptDefinition } from "./getColumnTypescriptDefinition";
 import { fromEntries } from "../PublishParser/applyScopeToTableRules";
+import {
+  getClientDBGeneratedSchemas,
+  type ClientSchemaProfiles,
+} from "./getClientDBGeneratedSchemas";
 
 export const getDBGeneratedSchema = ({
   config,
   tablesOrViews,
+  clientSchemas,
 }: {
   config: TableConfig | undefined;
   tablesOrViews: TableSchema[];
+  clientSchemas?: ClientSchemaProfiles;
 }): string => {
   const tables: string[] = [];
 
@@ -61,7 +68,7 @@ export const getDBGeneratedSchema = ({
   };\n  `);
     });
   return `
-export type DBGeneratedSchema = {
+export type ${DB_GENERATED_SCHEMA_NAME} = {
   ${tables.join("")}
 }
 
@@ -69,14 +76,14 @@ export type DBGeneratedSchema = {
  * Data types as expected when selecting from the database
  * */
 export type DBSchema = {
-  [K in keyof DBGeneratedSchema]: Required<DBGeneratedSchema[K]["columns"]>;
+  [K in keyof ${DB_GENERATED_SCHEMA_NAME}]: Required<${DB_GENERATED_SCHEMA_NAME}[K]["columns"]>;
 };
 
 /**
  * Data types as expected when inserting into the database (optional fields might be nullable/with defaults)
  * */
 export type DBSchemaForInsert = {
-  [K in keyof DBGeneratedSchema]: DBGeneratedSchema[K]["columns"];
-};
+  [K in keyof ${DB_GENERATED_SCHEMA_NAME}]: ${DB_GENERATED_SCHEMA_NAME}[K]["columns"];
+};${clientSchemas ? "\n" + getClientDBGeneratedSchemas(clientSchemas, tablesOrViews, config) : ""}
 `;
 };

package/lib/DBSchemaBuilder/getPublishSchemas.ts

@@ -0,0 +1,41 @@
+import { getRawColumns } from "../DboBuilder/getColumns";
+import { getRawInfo } from "../DboBuilder/ViewHandler/getRawInfo";
+import { getPublishedTableNames } from "../PublishParser/getPublishedTableNames";
+import type { PublishObject, PublishParser } from "../PublishParser/PublishParser";
+import type { ClientSchemaProfiles } from "./getClientDBGeneratedSchemas";
+
+export const getPublishSchemas = async (
+  publishParser: PublishParser,
+): Promise<ClientSchemaProfiles | undefined> => {
+  if (!Array.isArray(publishParser.publish)) {
+    return;
+  }
+  const entries = publishParser.publish;
+  const profiles: ClientSchemaProfiles = Object.fromEntries(
+    entries.map(({ name }) => [name, { tableSchema: [] }]),
+  );
+  const { tablesOrViews = [] } = publishParser.prostgles.dboBuilder;
+  for (const { name, publish } of entries) {
+    const publishObject: PublishObject =
+      publish === "*" ?
+        Object.fromEntries(tablesOrViews.map((table) => [table.name, "*"]))
+      : (publish ?? {});
+    const tableNames = getPublishedTableNames(publishParser, publishObject);
+    for (const tableName of tableNames) {
+      const rules = await publishParser.getTableRules(
+        { tableName, clientReq: undefined },
+        undefined,
+        undefined,
+        publishObject,
+      );
+      if (!rules || !Object.values(rules).some(Boolean)) continue;
+      const table = publishParser.dbo[tableName]!;
+      profiles[name]!.tableSchema.push({
+        ...getRawInfo.call(table, undefined, rules),
+        name: tableName,
+        columns: await getRawColumns.call(table, undefined, undefined, rules),
+      });
+    }
+  }
+  return profiles;
+};

package/lib/DboBuilder/DboBuilder.ts

@@ -35,6 +35,7 @@ import { prepareShortestJoinPaths } from "./joins/prepareShortestJoinPaths";
 import { cacheDBTypes, runSQL } from "./runSql/runSQL";
 import { getDetailedFieldInfo, type getDbTypes } from "./runSql/runSqlUtils";
 import { getTablesForSchemaPostgresSQL } from "./schema/getTablesForSchemaPostgresSQL";
+import { getPublishSchemas } from "../DBSchemaBuilder/getPublishSchemas";
 
 export * from "./DboBuilderTypes";
 export * from "./dboBuilderUtils";
@@ -208,8 +209,8 @@ export class DboBuilder {
     return this.shortestJoinPaths;
   }
 
-  prepareShortestJoinPaths = async () => {
-    const { joins, shortestJoinPaths, joinGraph } = await prepareShortestJoinPaths(this);
+  prepareShortestJoinPaths = () => {
+    const { joins, shortestJoinPaths, joinGraph } = prepareShortestJoinPaths(this);
     this.joinGraph = joinGraph;
     this.joins = joins;
     this.shortestJoinPaths = shortestJoinPaths;
@@ -276,7 +277,7 @@ export class DboBuilder {
       this.prostgles.dbForSchema!,
       this.prostgles.opts.schemaFilter,
     );
-    await this.prepareShortestJoinPaths();
+    this.prepareShortestJoinPaths();
 
     this.dbo = {};
     this.tablesOrViews.map((tov) => {
@@ -349,7 +350,7 @@ export class DboBuilder {
     }
     return this.tablesOrViews;
   };
-  getTsDefinitions = <DDL extends string | undefined = undefined>({
+  getTsDefinitions = async ({
     excludeFunctions,
     extraTables = [],
     ddlWithRollback,
@@ -362,12 +363,13 @@ export class DboBuilder {
      * This is useful for generating an updated TypeScript schema after running a migration SQL file, for example.
      * Note that this will be run within a transaction that is rolled back, so it SHOULD not affect the actual database schema.
      */
-    ddlWithRollback?: DDL;
-  } = {}): DDL extends string ? Promise<{ tsSchema: string; tablesOrViews: TableSchema[] }>
-  : { tsSchema: string; tablesOrViews: TableSchema[] } => {
+    ddlWithRollback?: string;
+  } = {}): Promise<{ tsSchema: string; tablesOrViews: TableSchema[] }> => {
+    const clientSchemas = this.publishParser && (await getPublishSchemas(this.publishParser));
     const getSchema = (tablesOrViews: TableSchema[]) => {
       const tableTsDefinitions = getDBGeneratedSchema({
         config: this.prostgles.mergedTableConfig.tableConfig,
+        clientSchemas,
         tablesOrViews: [
           ...tablesOrViews,
           ...extraTables.filter(
@@ -386,26 +388,17 @@ export class DboBuilder {
       return { tsSchema, tablesOrViews };
     };
     if (ddlWithRollback) {
-      return new Promise<{ tsSchema: string; tablesOrViews: TableSchema[] }>((resolve, reject) => {
-        getTablesForSchemaPostgresSQL(this, {
-          schemaFilter: this.prostgles.opts.schemaFilter,
-          ddlWithRollback,
-        })
-          .then((res) => {
-            const tablesOrViews = res.result;
-            resolve(getSchema(tablesOrViews));
-          })
-          .catch(reject);
-      }) as DDL extends string ? Promise<{ tsSchema: string; tablesOrViews: TableSchema[] }>
-      : { tsSchema: string; tablesOrViews: TableSchema[] };
+      const { result } = await getTablesForSchemaPostgresSQL(this, {
+        schemaFilter: this.prostgles.opts.schemaFilter,
+        ddlWithRollback,
+      });
+      return getSchema(result);
     }
     const tablesOrViews = this.tablesOrViews;
     if (!tablesOrViews) {
       throw new Error("Unexpected error: tablesOrViews is undefined");
     }
-    return getSchema(tablesOrViews) as DDL extends string ?
-      Promise<{ tsSchema: string; tablesOrViews: TableSchema[] }>
-    : { tsSchema: string; tablesOrViews: TableSchema[] };
+    return getSchema(tablesOrViews);
   };
 
   getShortestJoinPath = (

package/lib/Prostgles.ts

@@ -1,3 +1,4 @@
+import { DB_GENERATED_SCHEMA_NAME } from "./DBSchemaBuilder/constants";
 import type pgPromise from "pg-promise";
 import { AuthHandler } from "./Auth/AuthHandler";
 import type { SessionUser } from "./Auth/AuthTypes";
@@ -21,7 +22,7 @@ export { applyTableConfig } from "./TableConfig/applyTableConfig";
 
 import { CHANNELS, tryCatchV2 } from "prostgles-types";
 import type { DBEventsManager } from "./DBEventsManager";
-import type { PublishParser } from "./PublishParser/PublishParser";
+import { PublishParser } from "./PublishParser/PublishParser";
 import { pushSocketSchema } from "./WebsocketAPI/pushSocketSchema";
 
 export type DB = pgPromise.IDatabase<{}, pg.IClient>;
@@ -229,7 +230,7 @@ export class Prostgles {
   }
 
   getTSFileName() {
-    const fileName = "DBGeneratedSchema.ts";
+    const fileName = `${DB_GENERATED_SCHEMA_NAME}.ts`;
     const _dir = this.opts.tsGeneratedTypesDir || "";
     const dir = _dir.endsWith("/") ? _dir : `${_dir}/`;
     const fullPath = dir + fileName;
@@ -240,10 +241,10 @@ export class Prostgles {
    * Will write the Schema Typescript definitions to file (tsGeneratedTypesDir)
    * force is used for hotReloadMode to trigger a restart
    */
-  writeDBSchema(force = false) {
+  async writeDBSchema(force = false) {
     if (this.opts.tsGeneratedTypesDir) {
+      const { tsSchema: fileContent } = await this.dboBuilder.getTsDefinitions();
       const { fullPath, fileName } = this.getTSFileName();
-      const { tsSchema: fileContent } = this.dboBuilder.getTsDefinitions();
       fs.mkdirSync(dirname(fullPath), { recursive: true });
 
       const existingContent =
@@ -348,6 +349,11 @@ export class Prostgles {
     this.restApi = this.opts.restApi && new RestApi({ prostgles: this, ...this.opts.restApi });
   };
 
+  initPublishParser = () => {
+    this.publishParser = new PublishParser(this);
+    this.dboBuilder.publishParser = this.publishParser;
+  };
+
   initAuthHandler = () => {
     this.authHandler.destroy();
     this.authHandler = new AuthHandler(this);

package/lib/PublishParser/PublishParser.ts

@@ -25,9 +25,12 @@ import {
   type PermissionScope,
   type PublishObject,
 } from "./publishTypesAndUtils";
+import { validatePublishProfiles } from "./validatePublishProfiles";
 
 export class PublishParser {
-  publish: ProstglesInitOptions<void, SessionUser, any>["publish"];
+  publish:
+    | Exclude<ProstglesInitOptions<void, SessionUser, any>["publish"], unknown[]>
+    | ReturnType<typeof validatePublishProfiles>;
   publishRawSQL?: any;
   dbo: DBHandlerServer;
   db: DB;
@@ -35,7 +38,8 @@ export class PublishParser {
 
   constructor(prostgles: Prostgles) {
     this.prostgles = prostgles;
-    this.publish = prostgles.opts.publish;
+    const { publish } = prostgles.opts;
+    this.publish = Array.isArray(publish) ? validatePublishProfiles(publish) : publish;
 
     // eslint-disable-next-line @typescript-eslint/unbound-method
     this.publishRawSQL = prostgles.opts.publishRawSQL;
@@ -119,7 +123,7 @@ export class PublishParser {
             const { clientDb } = await publishParams.getClientDBHandlers(undefined);
             const { clientInfo, clientReq, tables } = publishParams;
             const restrictedCtx: RestrictedFunctionContext<void, SessionUser, unknown> = {
-              dbo: clientDb as unknown as DBOFullyTyped<void>,
+              dbo: clientDb,
               user,
               clientInfo,
               clientReq,
@@ -146,7 +150,17 @@ export class PublishParser {
     clientInfo: AuthResultWithSID | undefined,
   ): Promise<PublishObject | undefined> {
     const publishParams = await this.getPublishParams(clientReq, clientInfo);
-    const publish = await applyParamsIfFunc(this.publish, publishParams);
+
+    const publish = await (() => {
+      if (Array.isArray(this.publish)) {
+        const { user } = publishParams;
+        if (!user) return undefined;
+        return this.publish.find((publishRule) => publishRule.userTypes.includes(user.type))
+          ?.publish;
+      }
+
+      return applyParamsIfFunc(this.publish, publishParams);
+    })();
 
     if (publish === "*") {
       const publish: PublishObject = {};
@@ -271,13 +285,18 @@ export class PublishParser {
     args: DboTable,
     clientInfo: AuthResultWithSID | undefined,
     scope: PermissionScope | undefined,
+    overriddenPublish?: PublishObject,
   ): Promise<ParsedTableRule | undefined> {
     const { tableName } = args;
     const tableHandler = this.dbo[tableName];
     if (!tableHandler) {
       throw "INTERNAL ERROR: table handler not found for " + args.tableName;
     }
-    const fileTablePublishRules = await this.getTableRulesWithoutFileTable(args, clientInfo);
+    const fileTablePublishRules = await this.getTableRulesWithoutFileTable(
+      args,
+      clientInfo,
+      overriddenPublish,
+    );
     if (this.dbo[args.tableName]?.is_media) {
       const { rules: fileTableRules } = await getFileTableRules.bind(this)(
         args.tableName,
@@ -285,6 +304,7 @@ export class PublishParser {
         args.clientReq,
         clientInfo,
         scope,
+        overriddenPublish,
       );
       return applyScopeToTableRules(
         tableName,

package/lib/PublishParser/defineServerFunction.ts

@@ -8,7 +8,7 @@ import type {
   SQLHandler,
 } from "prostgles-types";
 import type { SessionUser } from "../Auth/AuthTypes";
-import type { DBOFullyTyped } from "../DBSchemaBuilder/DBSchemaBuilder";
+import type { DBOFullyTyped, DBOFullyTypedClient } from "../DBSchemaBuilder/DBSchemaBuilder";
 import type { DB } from "../initProstgles";
 import type { PublishParams } from "./publishTypesAndUtils";
 
@@ -17,7 +17,6 @@ type FunctionContextBase<S, SUser extends SessionUser, Context> = Pick<
   "tables" | "clientReq" | "clientInfo"
 > & {
   context: Context;
-  dbo: DBOFullyTyped<S>;
   user: S extends DBSchema ?
     S["users"]["columns"] extends AnyObject ?
       Required<S["users"]["columns"]>
@@ -29,13 +28,16 @@ export type RestrictedFunctionContext<
   S = void,
   SUser extends SessionUser = SessionUser,
   Context = undefined,
-> = FunctionContextBase<S, SUser, Context>;
+> = FunctionContextBase<S, SUser, Context> & {
+  dbo: DBOFullyTypedClient<S>;
+};
 
 export type UnrestrictedFunctionContext<
   S = void,
   SUser extends SessionUser = SessionUser,
   Context = undefined,
 > = FunctionContextBase<S, SUser, Context> & {
+  dbo: DBOFullyTyped<S>;
   db: DB;
   sql: SQLHandler;
   getClientDBHandlers: PublishParams<S, SUser>["getClientDBHandlers"];

package/lib/PublishParser/getFileTableRules.ts

@@ -3,7 +3,7 @@ import { includes, isDefined } from "prostgles-types";
 import type { AuthClientRequest, AuthResultWithSID } from "../Auth/AuthTypes";
 import { parseFieldFilter } from "../DboBuilder/ViewHandler/parseFieldFilter";
 import type { PublishParser } from "./PublishParser";
-import type { ParsedPublishTable, UpdateRule } from "./publishTypesAndUtils";
+import type { ParsedPublishTable, PublishObject, UpdateRule } from "./publishTypesAndUtils";
 import type { LocalParams } from "../DboBuilder/DboBuilder";
 
 /**
@@ -21,6 +21,7 @@ export async function getFileTableRules(
   clientReq: AuthClientRequest | undefined,
   clientInfo: AuthResultWithSID | undefined,
   scope: LocalParams["scope"],
+  overriddenPublish?: PublishObject,
 ) {
   const forcedDeleteFilters: FullFilter<AnyObject, void>[] = [];
   const forcedSelectFilters: FullFilter<AnyObject, void>[] = [];
@@ -42,7 +43,7 @@ export async function getFileTableRules(
     .filter(isDefined);
   if (referencedColumns?.length) {
     for (const { tableName, fileColumns, allColumns } of referencedColumns) {
-      const tableRules = await this.getTableRules({ clientReq, tableName }, clientInfo, scope);
+      const tableRules = await this.getTableRules({ clientReq, tableName }, clientInfo, scope, overriddenPublish);
       if (tableRules) {
         fileColumns.map((column) => {
           const path = [{ table: tableName, on: [{ id: column }] }];

package/lib/PublishParser/getPublishedTableNames.ts

@@ -0,0 +1,29 @@
+import type { PublishParser } from "./PublishParser";
+import { type PublishObject } from "./PublishParser";
+
+export const getPublishedTableNames = (
+  publishParserInstance: PublishParser,
+  publishObject: PublishObject,
+) => {
+  const txKey = !publishParserInstance.prostgles.opts.transactions ? "" : "tx";
+  const tableNames = Object.keys(publishObject).filter((k) => !txKey || txKey !== k);
+
+  /**
+   * Add file table to the list of published tables if it's referenced by other published tables.
+   * Access to the file table is controlled through the publish rules of the tables referencing it.
+   */
+  const fileTableName = publishParserInstance.prostgles.opts.fileTable?.tableName;
+  if (
+    fileTableName &&
+    publishParserInstance.dbo[fileTableName]?.is_media &&
+    !tableNames.includes(fileTableName)
+  ) {
+    const isReferenced = publishParserInstance.prostgles.dboBuilder.tablesOrViews?.some((t) =>
+      t.columns.some((c) => c.references?.some((r) => r.ftable === fileTableName)),
+    );
+    if (isReferenced) {
+      tableNames.unshift(fileTableName);
+    }
+  }
+  return tableNames;
+};

package/lib/PublishParser/getSchemaFromPublish.ts

@@ -4,6 +4,7 @@ import type { AuthClientRequest, AuthResultWithSID } from "../Auth/AuthTypes";
 import type { PublishParser } from "./PublishParser";
 import { type PermissionScope, type PublishObject } from "./PublishParser";
 import { getDBSchemaTable } from "./getDBSchemaTable";
+import { getPublishedTableNames } from "./getPublishedTableNames";
 
 type Args = AuthClientRequest & {
   userData: AuthResultWithSID | undefined;
@@ -19,8 +20,6 @@ export async function getSchemaFromPublish(
   const tableSchemaErrors: TableSchemaErrors = {};
   const tables: DBSchemaTable[] = [];
 
-  const txKey = !this.prostgles.opts.transactions ? "" : "tx";
-
   try {
     /* Publish tables and views based on socket */
     const clientInfo =
@@ -39,21 +38,7 @@ export async function getSchemaFromPublish(
     if (!publish || !Object.keys(publish).length) {
       return { tables, tableSchemaErrors };
     }
-    const tableNames = Object.keys(publish).filter((k) => !txKey || txKey !== k);
-
-    /**
-     * Add file table to the list of published tables if it's referenced by other published tables.
-     * Access to the file table is controlled through the publish rules of the tables referencing it.
-     */
-    const fileTableName = this.prostgles.opts.fileTable?.tableName;
-    if (fileTableName && this.dbo[fileTableName]?.is_media && !tableNames.includes(fileTableName)) {
-      const isReferenced = this.prostgles.dboBuilder.tablesOrViews?.some((t) =>
-        t.columns.some((c) => c.references?.some((r) => r.ftable === fileTableName)),
-      );
-      if (isReferenced) {
-        tableNames.unshift(fileTableName);
-      }
-    }
+    const tableNames = getPublishedTableNames(this, publish);
 
     await Promise.all(
       tableNames.map(async (tableName) => {

package/lib/PublishParser/publishTypesAndUtils.ts

@@ -62,7 +62,7 @@ export type ValidateBeforeRowArgsCommon<R = AnyObject, DBX = DBHandlerServer> =
   data: Partial<R>;
   filter: AnyObject | undefined;
 };
-export type ValidateRowArgsCommon<R = AnyObject, DBX = DBHandlerServer> = {
+export type ValidateRowArgsCommon<R = AnyObject, DBX = DBHandlerServer, InputDataType = R> = {
   row: R;
   dbx: DBX;
   tx: pgPromise.ITask<{}> | DB;
@@ -73,11 +73,12 @@ export type ValidateRowArgsCommon<R = AnyObject, DBX = DBHandlerServer> = {
     }
   | {
       command: "insert";
-      data: R;
+      /** The whole input, including all rows for a bulk insert. */
+      data: Partial<InputDataType> | Partial<InputDataType>[];
     }
   | {
       command: "update";
-      data: Partial<R>;
+      data: Partial<InputDataType>;
     }
 );
 
@@ -113,14 +114,14 @@ export type TransactionCallbacks<DBO = DBHandlerServer> = {
   onRollback: OnCommit<DBO>;
 };
 
-export type AfterEachTsTrigger<R, DBX, Context = undefined> = {
+export type AfterEachTsTrigger<R, DBX, Context = undefined, InputDataType = R> = {
   commands: Partial<Record<"insert" | "update" | "delete", 1>>;
   /**
    * Will only run this trigger if the insert/update provides non null values for these fields.
    */
   changedFields?: (keyof R)[];
   validate: (
-    params: ValidateRowArgsCommon<R, DBX> &
+    params: ValidateRowArgsCommon<R, DBX, InputDataType> &
       TransactionCallbacks<DBX> & {
         localParams: undefined | LocalParams;
         context: Context;
@@ -556,6 +557,13 @@ export type ParsedPublishTables = {
 
 type PublishAllOrNothingRoot = Exclude<PublishAllOrNothing, boolean>;
 export type PublishedResult<Schema = void> = PublishAllOrNothingRoot | PublishFullyTyped<Schema>;
+export type PublishProfile<Schema = void> = {
+  /** Exported schema type name; defaults to Publish1Schema, Publish2Schema, etc. */
+  name?: string;
+  userTypes: string[];
+  publish: PublishedResult<Schema>;
+};
 export type Publish<Schema = void, SUser extends SessionUser = SessionUser> =
+  | PublishProfile<Schema>[]
   | PublishedResult<Schema>
   | ((params: PublishParams<Schema, SUser>) => Awaitable<PublishedResult<Schema>>);