@rocicorp/zero 0.25.0-canary.9 → 0.25.1

package/out/zero-schema/src/schema-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-config.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/schema-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAIhD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAC,YAAY,EAAE,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAEjE,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAAC;AASF,eAAO,MAAM,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAGnD,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;cAI5B,CAAC;AAEH,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAKhD,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;cAKvB,CAAC;AAGH,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,YAAY,CAGhE;AAED,wBAAsB,eAAe,CAAC,MAAM,EAAE,OAAO,mBAoBpD;AAED,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb;IACD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAWA"}
+{"version":3,"file":"schema-config.d.ts","sourceRoot":"","sources":["../../../../zero-schema/src/schema-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAIhD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAAC,KAAK,iBAAiB,EAAC,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,EAAC,YAAY,EAAE,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAEjE,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAAC;AASF,eAAO,MAAM,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAGnD,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;cAI5B,CAAC;AAEH,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAKhD,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;cAKvB,CAAC;AAGH,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,YAAY,CAGhE"}

package/out/zero-schema/src/schema-config.js

@@ -32,7 +32,7 @@ readonlyObject({
   enableLegacyMutators: boolean().optional()
 });
 function isSchemaConfig(value) {
-  return value != null && "schema" in value && "permissions" in value;
+  return value != null && "schema" in value;
 }
 export {
   isSchemaConfig,

package/out/zero-schema/src/schema-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema-config.js","sources":["../../../../zero-schema/src/schema-config.ts"],"sourcesContent":["import * as v from '../../shared/src/valita.ts';\nimport {compoundKeySchema} from '../../zero-protocol/src/ast.ts';\nimport {valueTypeSchema} from '../../zero-protocol/src/client-schema.ts';\nimport {primaryKeySchema} from '../../zero-protocol/src/primary-key.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport {\n  permissionsConfigSchema,\n  type PermissionsConfig,\n} from './compiled-permissions.ts';\nimport type {Relationship, TableSchema} from './table-schema.ts';\n\nexport type SchemaConfig = {\n  schema: Schema;\n  permissions: PermissionsConfig;\n};\n\nconst relationshipPart = v.readonlyObject({\n  sourceField: compoundKeySchema,\n  destField: compoundKeySchema,\n  destSchema: v.string(),\n  cardinality: v.literalUnion('one', 'many'),\n});\n\nexport const relationshipSchema: v.Type<Relationship> = v.union(\n  v.readonly(v.tuple([relationshipPart])),\n  v.readonly(v.tuple([relationshipPart, relationshipPart])),\n);\n\nexport const schemaValueSchema = v.readonlyObject({\n  type: valueTypeSchema,\n  serverName: v.string().optional(),\n  optional: v.boolean().optional(),\n});\n\nexport const tableSchemaSchema: v.Type<TableSchema> = v.readonlyObject({\n  name: v.string(),\n  serverName: v.string().optional(),\n  columns: v.record(schemaValueSchema),\n  primaryKey: primaryKeySchema,\n});\n\nexport const schemaSchema = v.readonlyObject({\n  tables: v.record(tableSchemaSchema),\n  relationships: v.record(v.record(relationshipSchema)),\n  enableLegacyQueries: v.boolean().optional(),\n  enableLegacyMutators: v.boolean().optional(),\n});\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\nexport function isSchemaConfig(value: any): value is SchemaConfig {\n  // oxlint-disable-next-line eqeqeq\n  return value != null && 'schema' in value && 'permissions' in value;\n}\n\nexport async function stringifySchema(module: unknown) {\n  if (!isSchemaConfig(module)) {\n    throw new Error(\n      'Schema file must have a export `schema` and `permissions`.',\n    );\n  }\n  const schemaConfig = module;\n  const permissions = v.parse(\n    await schemaConfig.permissions,\n    permissionsConfigSchema,\n  );\n\n  return JSON.stringify(\n    {\n      permissions,\n      schema: schemaConfig.schema,\n    },\n    undefined,\n    2,\n  );\n}\n\nexport function parseSchema(\n  input: string,\n  source: string,\n): {\n  schema: Schema;\n  permissions: PermissionsConfig;\n} {\n  try {\n    const config = JSON.parse(input);\n    const permissions = v.parse(config.permissions, permissionsConfigSchema);\n    return {\n      permissions,\n      schema: config.schema,\n    };\n  } catch (e) {\n    throw new Error(`Failed to parse schema config from ${source}: ${e}`);\n  }\n}\n"],"names":["v.readonlyObject","v.string","v.literalUnion","v.union","v.readonly","v.tuple","v.boolean","v.record"],"mappings":";;;;;;AAgBA,MAAM,mBAAmBA,eAAiB;AAAA,EACxC,aAAa;AAAA,EACb,WAAW;AAAA,EACX,YAAYC,OAAE;AAAA,EACd,aAAaC,aAAe,OAAO,MAAM;AAC3C,CAAC;AAEM,MAAM,qBAA2CC;AAAAA,EACtDC,SAAWC,MAAQ,CAAC,gBAAgB,CAAC,CAAC;AAAA,EACtCD,SAAWC,MAAQ,CAAC,kBAAkB,gBAAgB,CAAC,CAAC;AAC1D;AAEO,MAAM,oBAAoBL,eAAiB;AAAA,EAChD,MAAM;AAAA,EACN,YAAYC,OAAE,EAAS,SAAA;AAAA,EACvB,UAAUK,QAAE,EAAU,SAAA;AACxB,CAAC;AAEM,MAAM,oBAAyCN,eAAiB;AAAA,EACrE,MAAMC,OAAE;AAAA,EACR,YAAYA,OAAE,EAAS,SAAA;AAAA,EACvB,SAASM,OAAS,iBAAiB;AAAA,EACnC,YAAY;AACd,CAAC;AAE2BP,eAAiB;AAAA,EAC3C,QAAQO,OAAS,iBAAiB;AAAA,EAClC,eAAeA,OAASA,OAAS,kBAAkB,CAAC;AAAA,EACpD,qBAAqBD,QAAE,EAAU,SAAA;AAAA,EACjC,sBAAsBA,QAAE,EAAU,SAAA;AACpC,CAAC;AAGM,SAAS,eAAe,OAAmC;AAEhE,SAAO,SAAS,QAAQ,YAAY,SAAS,iBAAiB;AAChE;"}
+{"version":3,"file":"schema-config.js","sources":["../../../../zero-schema/src/schema-config.ts"],"sourcesContent":["import * as v from '../../shared/src/valita.ts';\nimport {compoundKeySchema} from '../../zero-protocol/src/ast.ts';\nimport {valueTypeSchema} from '../../zero-protocol/src/client-schema.ts';\nimport {primaryKeySchema} from '../../zero-protocol/src/primary-key.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport {type PermissionsConfig} from './compiled-permissions.ts';\nimport type {Relationship, TableSchema} from './table-schema.ts';\n\nexport type SchemaConfig = {\n  schema: Schema;\n  permissions: PermissionsConfig;\n};\n\nconst relationshipPart = v.readonlyObject({\n  sourceField: compoundKeySchema,\n  destField: compoundKeySchema,\n  destSchema: v.string(),\n  cardinality: v.literalUnion('one', 'many'),\n});\n\nexport const relationshipSchema: v.Type<Relationship> = v.union(\n  v.readonly(v.tuple([relationshipPart])),\n  v.readonly(v.tuple([relationshipPart, relationshipPart])),\n);\n\nexport const schemaValueSchema = v.readonlyObject({\n  type: valueTypeSchema,\n  serverName: v.string().optional(),\n  optional: v.boolean().optional(),\n});\n\nexport const tableSchemaSchema: v.Type<TableSchema> = v.readonlyObject({\n  name: v.string(),\n  serverName: v.string().optional(),\n  columns: v.record(schemaValueSchema),\n  primaryKey: primaryKeySchema,\n});\n\nexport const schemaSchema = v.readonlyObject({\n  tables: v.record(tableSchemaSchema),\n  relationships: v.record(v.record(relationshipSchema)),\n  enableLegacyQueries: v.boolean().optional(),\n  enableLegacyMutators: v.boolean().optional(),\n});\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\nexport function isSchemaConfig(value: any): value is SchemaConfig {\n  // oxlint-disable-next-line eqeqeq\n  return value != null && 'schema' in value;\n}\n"],"names":["v.readonlyObject","v.string","v.literalUnion","v.union","v.readonly","v.tuple","v.boolean","v.record"],"mappings":";;;;;;AAaA,MAAM,mBAAmBA,eAAiB;AAAA,EACxC,aAAa;AAAA,EACb,WAAW;AAAA,EACX,YAAYC,OAAE;AAAA,EACd,aAAaC,aAAe,OAAO,MAAM;AAC3C,CAAC;AAEM,MAAM,qBAA2CC;AAAAA,EACtDC,SAAWC,MAAQ,CAAC,gBAAgB,CAAC,CAAC;AAAA,EACtCD,SAAWC,MAAQ,CAAC,kBAAkB,gBAAgB,CAAC,CAAC;AAC1D;AAEO,MAAM,oBAAoBL,eAAiB;AAAA,EAChD,MAAM;AAAA,EACN,YAAYC,OAAE,EAAS,SAAA;AAAA,EACvB,UAAUK,QAAE,EAAU,SAAA;AACxB,CAAC;AAEM,MAAM,oBAAyCN,eAAiB;AAAA,EACrE,MAAMC,OAAE;AAAA,EACR,YAAYA,OAAE,EAAS,SAAA;AAAA,EACvB,SAASM,OAAS,iBAAiB;AAAA,EACnC,YAAY;AACd,CAAC;AAE2BP,eAAiB;AAAA,EAC3C,QAAQO,OAAS,iBAAiB;AAAA,EAClC,eAAeA,OAASA,OAAS,kBAAkB,CAAC;AAAA,EACpD,qBAAqBD,QAAE,EAAU,SAAA;AAAA,EACjC,sBAAsBA,QAAE,EAAU,SAAA;AACpC,CAAC;AAGM,SAAS,eAAe,OAAmC;AAEhE,SAAO,SAAS,QAAQ,YAAY;AACtC;"}

package/out/zero-server/src/custom.d.ts

@@ -1,13 +1,9 @@
 import type { Schema } from '../../zero-types/src/schema.ts';
 import type { ServerSchema } from '../../zero-types/src/server-schema.ts';
-import type { DBTransaction, SchemaCRUD, TransactionBase } from '../../zql/src/mutate/custom.ts';
+import { type CRUDExecutor, type TransactionMutate } from '../../zql/src/mutate/crud.ts';
+import type { DBTransaction, MutateCRUD, ServerTransaction } from '../../zql/src/mutate/custom.ts';
 import type { HumanReadable, Query, RunOptions } from '../../zql/src/query/query.ts';
-import type { SchemaQuery } from '../../zql/src/query/schema-query.ts';
-interface ServerTransaction<TSchema extends Schema, TWrappedTransaction> extends TransactionBase<TSchema> {
-    readonly location: 'server';
-    readonly reason: 'authoritative';
-    readonly dbTransaction: DBTransaction<TWrappedTransaction>;
-}
+import type { ConditionalSchemaQuery } from '../../zql/src/query/schema-query.ts';
 export type CustomMutatorDefs<TDBTransaction> = {
     [namespaceOrKey: string]: CustomMutatorImpl<TDBTransaction> | CustomMutatorDefs<TDBTransaction>;
 };
@@ -19,12 +15,43 @@ export declare class TransactionImpl<TSchema extends Schema, TWrappedTransaction
     readonly dbTransaction: DBTransaction<TWrappedTransaction>;
     readonly clientID: string;
     readonly mutationID: number;
-    readonly mutate: SchemaCRUD<TSchema>;
-    readonly query: SchemaQuery<TSchema>;
-    constructor(dbTransaction: DBTransaction<TWrappedTransaction>, clientID: string, mutationID: number, mutate: SchemaCRUD<TSchema>, query: SchemaQuery<TSchema>, schema: TSchema, serverSchema: ServerSchema);
-    run<TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn>, _options?: RunOptions): Promise<HumanReadable<TReturn>>;
+    readonly mutate: TransactionMutate<TSchema>;
+    /**
+     * @deprecated Use {@linkcode createBuilder} with `tx.run(zql.table.where(...))` instead.
+     */
+    readonly query: ConditionalSchemaQuery<TSchema>;
+    constructor(dbTransaction: DBTransaction<TWrappedTransaction>, clientID: string, mutationID: number, mutate: TransactionMutate<TSchema>, schema: TSchema, serverSchema: ServerSchema);
+    run<TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TTable, TSchema, TReturn>, _options?: RunOptions): Promise<HumanReadable<TReturn>>;
+}
+/**
+ * Factory for creating MutateCRUD instances efficiently.
+ *
+ * Pre-creates the SQL-generating TableCRUD methods once from the schema,
+ * caches the serverSchema after first fetch, and only binds the transaction
+ * at transaction time.
+ *
+ * Use this when you need to create many transactions and want to avoid
+ * the overhead of re-creating CRUD methods for each one.
+ */
+export declare class CRUDMutatorFactory<S extends Schema> {
+    #private;
+    constructor(schema: S);
+    /**
+     * Creates a CRUDExecutor bound to the given transaction and serverSchema.
+     * Uses the pre-created TableCRUD methods from construction time.
+     */
+    createExecutor(dbTransaction: DBTransaction<unknown>, serverSchema: ServerSchema): CRUDExecutor;
+    /**
+     * Creates a full ServerTransaction.
+     * Fetches/caches serverSchema automatically.
+     */
+    createTransaction<TWrappedTransaction>(dbTransaction: DBTransaction<TWrappedTransaction>, clientID: string, mutationID: number): Promise<TransactionImpl<S, TWrappedTransaction>>;
 }
-export declare function makeServerTransaction<TSchema extends Schema, TWrappedTransaction>(dbTransaction: DBTransaction<TWrappedTransaction>, clientID: string, mutationID: number, schema: TSchema, mutate: (dbTransaction: DBTransaction<TWrappedTransaction>, serverSchema: ServerSchema) => SchemaCRUD<TSchema>, query: SchemaQuery<TSchema>): Promise<TransactionImpl<TSchema, TWrappedTransaction>>;
-export declare function makeSchemaCRUD<S extends Schema>(schema: S): (dbTransaction: DBTransaction<unknown>, serverSchema: ServerSchema) => SchemaCRUD<S>;
-export {};
+export declare function makeServerTransaction<TSchema extends Schema, TWrappedTransaction>(dbTransaction: DBTransaction<TWrappedTransaction>, clientID: string, mutationID: number, schema: TSchema): Promise<TransactionImpl<TSchema, TWrappedTransaction>>;
+/**
+ * @deprecated Use transactions instead.
+ *
+ * Returns a curried function for backwards compatibility.
+ */
+export declare function makeSchemaCRUD<S extends Schema>(schema: S): (dbTransaction: DBTransaction<unknown>, serverSchema: ServerSchema) => MutateCRUD<S, true>;
 //# sourceMappingURL=custom.d.ts.map

package/out/zero-server/src/custom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/custom.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/custom.ts"],"names":[],"mappings":"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"}

package/out/zero-server/src/custom.js

@@ -1,7 +1,42 @@
 import { assert } from "../../shared/src/asserts.js";
+import { mapValues } from "../../shared/src/objects.js";
+import { recordProxy } from "../../shared/src/record-proxy.js";
 import { formatPgInternalConvert, sql, sqlConvertColumnArg } from "../../z2s/src/sql.js";
+import { makeTransactionMutate, makeCRUDMutate } from "../../zql/src/mutate/crud.js";
+import { createRunnableBuilder } from "../../zql/src/query/create-builder.js";
+import { QueryDelegateBase } from "../../zql/src/query/query-delegate-base.js";
 import { asQueryInternals } from "../../zql/src/query/query-internals.js";
 import { getServerSchema } from "./schema.js";
+class ServerTransactionQueryDelegate extends QueryDelegateBase {
+  #dbTransaction;
+  #schema;
+  #serverSchema;
+  defaultQueryComplete = true;
+  constructor(dbTransaction, schema, serverSchema) {
+    super();
+    this.#dbTransaction = dbTransaction;
+    this.#schema = schema;
+    this.#serverSchema = serverSchema;
+  }
+  getSource() {
+    throw new Error("not implemented");
+  }
+  run(query, _options) {
+    const queryInternals = asQueryInternals(query);
+    return this.#dbTransaction.runQuery(
+      queryInternals.ast,
+      queryInternals.format,
+      this.#schema,
+      this.#serverSchema
+    );
+  }
+  preload() {
+    throw new Error("preload() is not supported in server transactions");
+  }
+  materialize() {
+    throw new Error("materialize() is not supported in server transactions");
+  }
+}
 class TransactionImpl {
   location = "server";
   reason = "authoritative";
@@ -9,17 +44,25 @@ class TransactionImpl {
   clientID;
   mutationID;
   mutate;
+  /**
+   * @deprecated Use {@linkcode createBuilder} with `tx.run(zql.table.where(...))` instead.
+   */
   query;
   #schema;
   #serverSchema;
-  constructor(dbTransaction, clientID, mutationID, mutate, query, schema, serverSchema) {
+  constructor(dbTransaction, clientID, mutationID, mutate, schema, serverSchema) {
     this.dbTransaction = dbTransaction;
     this.clientID = clientID;
     this.mutationID = mutationID;
     this.mutate = mutate;
-    this.query = query;
     this.#schema = schema;
     this.#serverSchema = serverSchema;
+    const delegate = new ServerTransactionQueryDelegate(
+      dbTransaction,
+      schema,
+      serverSchema
+    );
+    this.query = createRunnableBuilder(delegate, schema);
   }
   run(query, _options) {
     const queryInternals = asQueryInternals(query);
@@ -33,50 +76,80 @@ class TransactionImpl {
 }
 const dbTxSymbol = Symbol();
 const serverSchemaSymbol = Symbol();
-async function makeServerTransaction(dbTransaction, clientID, mutationID, schema, mutate, query) {
+class CRUDMutatorFactory {
+  #schema;
+  #tableCRUDs;
+  #serverSchema;
+  constructor(schema) {
+    this.#schema = schema;
+    this.#tableCRUDs = {};
+    for (const tableSchema of Object.values(schema.tables)) {
+      this.#tableCRUDs[tableSchema.name] = makeServerTableCRUD(tableSchema);
+    }
+  }
+  /**
+   * Gets the cached serverSchema, or fetches and caches it on first call.
+   */
+  async #getOrFetchServerSchema(dbTransaction) {
+    if (!this.#serverSchema) {
+      this.#serverSchema = await getServerSchema(dbTransaction, this.#schema);
+    }
+    return this.#serverSchema;
+  }
+  /**
+   * Creates a CRUDExecutor bound to the given transaction and serverSchema.
+   * Uses the pre-created TableCRUD methods from construction time.
+   */
+  createExecutor(dbTransaction, serverSchema) {
+    const txHolder = {
+      [dbTxSymbol]: dbTransaction,
+      [serverSchemaSymbol]: serverSchema
+    };
+    const boundCRUDs = recordProxy(
+      this.#tableCRUDs,
+      (tableCRUD) => mapValues(tableCRUD, (method) => method.bind(txHolder))
+    );
+    return (table, kind, args) => {
+      const tableCRUD = boundCRUDs[table];
+      return tableCRUD[kind](args);
+    };
+  }
+  /**
+   * Creates a full ServerTransaction.
+   * Fetches/caches serverSchema automatically.
+   */
+  async createTransaction(dbTransaction, clientID, mutationID) {
+    const serverSchema = await this.#getOrFetchServerSchema(dbTransaction);
+    const executor = this.createExecutor(dbTransaction, serverSchema);
+    const mutate = makeTransactionMutate(this.#schema, executor);
+    return new TransactionImpl(
+      dbTransaction,
+      clientID,
+      mutationID,
+      mutate,
+      this.#schema,
+      serverSchema
+    );
+  }
+}
+async function makeServerTransaction(dbTransaction, clientID, mutationID, schema) {
   const serverSchema = await getServerSchema(dbTransaction, schema);
+  const executor = makeServerCRUDExecutor(schema, dbTransaction, serverSchema);
+  const mutate = makeTransactionMutate(schema, executor);
   return new TransactionImpl(
     dbTransaction,
     clientID,
     mutationID,
-    mutate(dbTransaction, serverSchema),
-    query,
+    mutate,
     schema,
     serverSchema
   );
 }
 function makeSchemaCRUD(schema) {
-  const schemaCRUDs = {};
-  for (const tableSchema of Object.values(schema.tables)) {
-    schemaCRUDs[tableSchema.name] = makeTableCRUD(tableSchema);
-  }
-  class CRUDHandler {
-    #dbTransaction;
-    #serverSchema;
-    constructor(dbTransaction, serverSchema) {
-      this.#dbTransaction = dbTransaction;
-      this.#serverSchema = serverSchema;
-    }
-    get(target, prop) {
-      if (prop in target) {
-        return target[prop];
-      }
-      const txHolder = {
-        [dbTxSymbol]: this.#dbTransaction,
-        [serverSchemaSymbol]: this.#serverSchema
-      };
-      target[prop] = Object.fromEntries(
-        Object.entries(schemaCRUDs[prop]).map(([name, method]) => [
-          name,
-          method.bind(txHolder)
-        ])
-      );
-      return target[prop];
-    }
-  }
-  return (dbTransaction, serverSchema) => new Proxy(
-    {},
-    new CRUDHandler(dbTransaction, serverSchema)
+  return (dbTransaction, serverSchema) => makeCRUDMutate(
+    schema,
+    true,
+    makeServerCRUDExecutor(schema, dbTransaction, serverSchema)
   );
 }
 function removeUndefined(value) {
@@ -88,7 +161,25 @@ function removeUndefined(value) {
   }
   return valueWithoutUndefined;
 }
-function makeTableCRUD(schema) {
+function makeServerCRUDExecutor(schema, dbTransaction, serverSchema) {
+  const tableCRUDs = {};
+  for (const tableSchema of Object.values(schema.tables)) {
+    tableCRUDs[tableSchema.name] = makeServerTableCRUD(tableSchema);
+  }
+  const txHolder = {
+    [dbTxSymbol]: dbTransaction,
+    [serverSchemaSymbol]: serverSchema
+  };
+  const boundCRUDs = recordProxy(
+    tableCRUDs,
+    (tableCRUD) => mapValues(tableCRUD, (method) => method.bind(txHolder))
+  );
+  return (table, kind, args) => {
+    const tableCRUD = boundCRUDs[table];
+    return tableCRUD[kind](args);
+  };
+}
+function makeServerTableCRUD(schema) {
   return {
     async insert(value) {
       value = removeUndefined(value);
@@ -206,6 +297,7 @@ function sqlInsertValue(value, serverColumnSchema) {
   return sqlConvertColumnArg(serverColumnSchema, value, false, false);
 }
 export {
+  CRUDMutatorFactory,
   TransactionImpl,
   makeSchemaCRUD,
   makeServerTransaction

package/out/zero-server/src/custom.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom.js","sources":["../../../../zero-server/src/custom.ts"],"sourcesContent":["import {assert} from '../../shared/src/asserts.ts';\nimport {\n  formatPgInternalConvert,\n  sql,\n  sqlConvertColumnArg,\n} from '../../z2s/src/sql.ts';\nimport type {TableSchema} from '../../zero-schema/src/table-schema.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {\n  ServerColumnSchema,\n  ServerSchema,\n  ServerTableSchema,\n} from '../../zero-types/src/server-schema.ts';\nimport type {\n  DBTransaction,\n  SchemaCRUD,\n  TableCRUD,\n  TransactionBase,\n} from '../../zql/src/mutate/custom.ts';\nimport {asQueryInternals} from '../../zql/src/query/query-internals.ts';\nimport type {\n  HumanReadable,\n  Query,\n  RunOptions,\n} from '../../zql/src/query/query.ts';\nimport type {SchemaQuery} from '../../zql/src/query/schema-query.ts';\nimport {getServerSchema} from './schema.ts';\n\ninterface ServerTransaction<TSchema extends Schema, TWrappedTransaction>\n  extends TransactionBase<TSchema> {\n  readonly location: 'server';\n  readonly reason: 'authoritative';\n  readonly dbTransaction: DBTransaction<TWrappedTransaction>;\n}\n\nexport type CustomMutatorDefs<TDBTransaction> = {\n  [namespaceOrKey: string]:\n    | CustomMutatorImpl<TDBTransaction>\n    | CustomMutatorDefs<TDBTransaction>;\n};\n\nexport type CustomMutatorImpl<\n  TDBTransaction,\n  // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n  TArgs = any,\n  Context = unknown,\n> = (tx: TDBTransaction, args: TArgs, ctx: Context) => Promise<void>;\n\nexport class TransactionImpl<TSchema extends Schema, TWrappedTransaction>\n  implements ServerTransaction<TSchema, TWrappedTransaction>\n{\n  readonly location = 'server';\n  readonly reason = 'authoritative';\n  readonly dbTransaction: DBTransaction<TWrappedTransaction>;\n  readonly clientID: string;\n  readonly mutationID: number;\n  readonly mutate: SchemaCRUD<TSchema>;\n  readonly query: SchemaQuery<TSchema>;\n  readonly #schema: TSchema;\n  readonly #serverSchema: ServerSchema;\n\n  constructor(\n    dbTransaction: DBTransaction<TWrappedTransaction>,\n    clientID: string,\n    mutationID: number,\n    mutate: SchemaCRUD<TSchema>,\n    query: SchemaQuery<TSchema>,\n    schema: TSchema,\n    serverSchema: ServerSchema,\n  ) {\n    this.dbTransaction = dbTransaction;\n    this.clientID = clientID;\n    this.mutationID = mutationID;\n    this.mutate = mutate;\n    this.query = query;\n    this.#schema = schema;\n    this.#serverSchema = serverSchema;\n  }\n\n  run<TTable extends keyof TSchema['tables'] & string, TReturn>(\n    query: Query<TSchema, TTable, TReturn>,\n    _options?: RunOptions,\n  ): Promise<HumanReadable<TReturn>> {\n    const queryInternals = asQueryInternals(query);\n\n    // Execute the query using the database-specific executor\n    return this.dbTransaction.runQuery<TReturn>(\n      queryInternals.ast,\n      queryInternals.format,\n      this.#schema,\n      this.#serverSchema,\n    );\n  }\n}\n\nconst dbTxSymbol = Symbol();\n\nconst serverSchemaSymbol = Symbol();\n\ntype WithHiddenTxAndSchema = {\n  [dbTxSymbol]: DBTransaction<unknown>;\n  [serverSchemaSymbol]: ServerSchema;\n};\n\nexport async function makeServerTransaction<\n  TSchema extends Schema,\n  TWrappedTransaction,\n>(\n  dbTransaction: DBTransaction<TWrappedTransaction>,\n  clientID: string,\n  mutationID: number,\n  schema: TSchema,\n  mutate: (\n    dbTransaction: DBTransaction<TWrappedTransaction>,\n    serverSchema: ServerSchema,\n  ) => SchemaCRUD<TSchema>,\n  query: SchemaQuery<TSchema>,\n) {\n  const serverSchema = await getServerSchema(dbTransaction, schema);\n  return new TransactionImpl(\n    dbTransaction,\n    clientID,\n    mutationID,\n    mutate(dbTransaction, serverSchema),\n    query,\n    schema,\n    serverSchema,\n  );\n}\n\nexport function makeSchemaCRUD<S extends Schema>(\n  schema: S,\n): (\n  dbTransaction: DBTransaction<unknown>,\n  serverSchema: ServerSchema,\n) => SchemaCRUD<S> {\n  const schemaCRUDs: Record<string, TableCRUD<TableSchema>> = {};\n  for (const tableSchema of Object.values(schema.tables)) {\n    schemaCRUDs[tableSchema.name] = makeTableCRUD(tableSchema);\n  }\n\n  /**\n   * For users with very large schemas it is expensive to re-create\n   * all the CRUD mutators for each transaction. Instead, we create\n   * them all once up-front and then bind them to the transaction\n   * as requested.\n   */\n  class CRUDHandler {\n    readonly #dbTransaction: DBTransaction<unknown>;\n    readonly #serverSchema: ServerSchema;\n    constructor(\n      dbTransaction: DBTransaction<unknown>,\n      serverSchema: ServerSchema,\n    ) {\n      this.#dbTransaction = dbTransaction;\n      this.#serverSchema = serverSchema;\n    }\n\n    get(target: Record<string, TableCRUD<TableSchema>>, prop: string) {\n      if (prop in target) {\n        return target[prop];\n      }\n\n      const txHolder: WithHiddenTxAndSchema = {\n        [dbTxSymbol]: this.#dbTransaction,\n        [serverSchemaSymbol]: this.#serverSchema,\n      };\n      target[prop] = Object.fromEntries(\n        Object.entries(schemaCRUDs[prop]).map(([name, method]) => [\n          name,\n          method.bind(txHolder),\n        ]),\n      ) as TableCRUD<TableSchema>;\n\n      return target[prop];\n    }\n  }\n\n  return (dbTransaction: DBTransaction<unknown>, serverSchema: ServerSchema) =>\n    new Proxy(\n      {},\n      new CRUDHandler(dbTransaction, serverSchema),\n    ) as SchemaCRUD<S>;\n}\n\nfunction removeUndefined<T extends Record<string, unknown>>(value: T): T {\n  const valueWithoutUndefined: Record<string, unknown> = {};\n  for (const [key, val] of Object.entries(value)) {\n    if (val !== undefined) {\n      valueWithoutUndefined[key] = val;\n    }\n  }\n  return valueWithoutUndefined as T;\n}\n\nfunction makeTableCRUD(schema: TableSchema): TableCRUD<TableSchema> {\n  return {\n    async insert(this: WithHiddenTxAndSchema, value) {\n      value = removeUndefined(value);\n      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];\n\n      const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);\n      const stmt = formatPgInternalConvert(\n        sql`INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(\n          targetedColumns.map(([, serverName]) => sql.ident(serverName)),\n          ',',\n        )}) VALUES (${sql.join(\n          Object.entries(value).map(([col, v]) =>\n            sqlInsertValue(v, serverTableSchema[serverNameFor(col, schema)]),\n          ),\n          ', ',\n        )})`,\n      );\n      const tx = this[dbTxSymbol];\n      await tx.query(stmt.text, stmt.values);\n    },\n    async upsert(this: WithHiddenTxAndSchema, value) {\n      value = removeUndefined(value);\n      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];\n      const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);\n      const primaryKeyColumns = origAndServerNamesFor(\n        schema.primaryKey,\n        schema,\n      );\n      const stmt = formatPgInternalConvert(\n        sql`INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(\n          targetedColumns.map(([, serverName]) => sql.ident(serverName)),\n          ',',\n        )}) VALUES (${sql.join(\n          Object.entries(value).map(([col, val]) =>\n            sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)]),\n          ),\n          ', ',\n        )}) ON CONFLICT (${sql.join(\n          primaryKeyColumns.map(([, serverName]) => sql.ident(serverName)),\n          ', ',\n        )}) DO UPDATE SET ${sql.join(\n          Object.entries(value).map(\n            ([col, val]) =>\n              sql`${sql.ident(\n                schema.columns[col].serverName ?? col,\n              )} = ${sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)])}`,\n          ),\n          ', ',\n        )}`,\n      );\n      const tx = this[dbTxSymbol];\n      await tx.query(stmt.text, stmt.values);\n    },\n    async update(this: WithHiddenTxAndSchema, value) {\n      value = removeUndefined(value);\n      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];\n      const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);\n      const stmt = formatPgInternalConvert(\n        sql`UPDATE ${sql.ident(serverName(schema))} SET ${sql.join(\n          targetedColumns.map(\n            ([origName, serverName]) =>\n              sql`${sql.ident(serverName)} = ${sqlInsertValue(value[origName], serverTableSchema[serverName])}`,\n          ),\n          ', ',\n        )} WHERE ${primaryKeyClause(schema, serverTableSchema, value)}`,\n      );\n      const tx = this[dbTxSymbol];\n      await tx.query(stmt.text, stmt.values);\n    },\n    async delete(this: WithHiddenTxAndSchema, value) {\n      value = removeUndefined(value);\n      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];\n      const stmt = formatPgInternalConvert(\n        sql`DELETE FROM ${sql.ident(\n          serverName(schema),\n        )} WHERE ${primaryKeyClause(schema, serverTableSchema, value)}`,\n      );\n      const tx = this[dbTxSymbol];\n      await tx.query(stmt.text, stmt.values);\n    },\n  };\n}\n\nfunction serverName(x: {name: string; serverName?: string | undefined}) {\n  return x.serverName ?? x.name;\n}\n\nfunction primaryKeyClause(\n  schema: TableSchema,\n  serverTableSchema: ServerTableSchema,\n  row: Record<string, unknown>,\n) {\n  const primaryKey = origAndServerNamesFor(schema.primaryKey, schema);\n  return sql`${sql.join(\n    primaryKey.map(\n      ([origName, serverName]) =>\n        sql`${sql.ident(serverName)}${maybeCastColumn(serverTableSchema[serverName])} = ${sqlValue(row[origName], serverTableSchema[serverName])}`,\n    ),\n    ' AND ',\n  )}`;\n}\n\nfunction maybeCastColumn(col: ServerColumnSchema) {\n  if (col.type === 'uuid' || col.isEnum) {\n    return sql`::text`;\n  }\n  return sql``;\n}\n\nfunction origAndServerNamesFor(\n  originalNames: readonly string[],\n  schema: TableSchema,\n): [origName: string, serverName: string][] {\n  return originalNames.map(\n    name => [name, serverNameFor(name, schema)] as const,\n  );\n}\n\nfunction serverNameFor(originalName: string, schema: TableSchema): string {\n  const col = schema.columns[originalName];\n  assert(\n    col,\n    `Column ${originalName} was not found in the Zero schema for the table ${schema.name}`,\n  );\n  return col.serverName ?? originalName;\n}\n\nfunction sqlValue(value: unknown, serverColumnSchema: ServerColumnSchema) {\n  return sqlConvertColumnArg(serverColumnSchema, value, false, true);\n}\n\nfunction sqlInsertValue(\n  value: unknown,\n  serverColumnSchema: ServerColumnSchema,\n) {\n  return sqlConvertColumnArg(serverColumnSchema, value, false, false);\n}\n"],"names":["serverName"],"mappings":"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"}
+{"version":3,"file":"custom.js","sources":["../../../../zero-server/src/custom.ts"],"sourcesContent":["import {assert} from '../../shared/src/asserts.ts';\nimport {mapValues} from '../../shared/src/objects.ts';\nimport {recordProxy} from '../../shared/src/record-proxy.ts';\nimport {\n  formatPgInternalConvert,\n  sql,\n  sqlConvertColumnArg,\n} from '../../z2s/src/sql.ts';\nimport type {TableSchema} from '../../zero-schema/src/table-schema.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {\n  ServerColumnSchema,\n  ServerSchema,\n  ServerTableSchema,\n} from '../../zero-types/src/server-schema.ts';\nimport {\n  type CRUDExecutor,\n  type CRUDKind,\n  makeCRUDMutate,\n  makeTransactionMutate,\n  type SchemaCRUD,\n  type TableCRUD,\n  type TransactionMutate,\n} from '../../zql/src/mutate/crud.ts';\nimport type {\n  DBTransaction,\n  MutateCRUD,\n  ServerTransaction,\n} from '../../zql/src/mutate/custom.ts';\nimport {createRunnableBuilder} from '../../zql/src/query/create-builder.ts';\nimport {QueryDelegateBase} from '../../zql/src/query/query-delegate-base.ts';\nimport {asQueryInternals} from '../../zql/src/query/query-internals.ts';\nimport type {\n  HumanReadable,\n  Query,\n  RunOptions,\n} from '../../zql/src/query/query.ts';\nimport type {ConditionalSchemaQuery} from '../../zql/src/query/schema-query.ts';\nimport {getServerSchema} from './schema.ts';\n\nexport type CustomMutatorDefs<TDBTransaction> = {\n  [namespaceOrKey: string]:\n    | CustomMutatorImpl<TDBTransaction>\n    | CustomMutatorDefs<TDBTransaction>;\n};\n\nexport type CustomMutatorImpl<\n  TDBTransaction,\n  // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n  TArgs = any,\n  Context = unknown,\n> = (tx: TDBTransaction, args: TArgs, ctx: Context) => Promise<void>;\n\n/**\n * QueryDelegate implementation for server-side transactions.\n * Extends QueryDelegateBase to satisfy the QueryDelegate interface,\n * but overrides run() to execute against Postgres and throws on\n * preload()/materialize() which don't make sense server-side.\n */\nclass ServerTransactionQueryDelegate extends QueryDelegateBase {\n  readonly #dbTransaction: DBTransaction<unknown>;\n  readonly #schema: Schema;\n  readonly #serverSchema: ServerSchema;\n\n  readonly defaultQueryComplete = true;\n\n  constructor(\n    dbTransaction: DBTransaction<unknown>,\n    schema: Schema,\n    serverSchema: ServerSchema,\n  ) {\n    super();\n    this.#dbTransaction = dbTransaction;\n    this.#schema = schema;\n    this.#serverSchema = serverSchema;\n  }\n\n  getSource(): never {\n    throw new Error('not implemented');\n  }\n\n  override run<\n    TTable extends keyof TSchema['tables'] & string,\n    TSchema extends Schema,\n    TReturn,\n  >(\n    query: Query<TTable, TSchema, TReturn>,\n    _options?: RunOptions,\n  ): Promise<HumanReadable<TReturn>> {\n    const queryInternals = asQueryInternals(query);\n    return this.#dbTransaction.runQuery<TReturn>(\n      queryInternals.ast,\n      queryInternals.format,\n      this.#schema,\n      this.#serverSchema,\n    );\n  }\n\n  override preload(): never {\n    throw new Error('preload() is not supported in server transactions');\n  }\n\n  override materialize(): never {\n    throw new Error('materialize() is not supported in server transactions');\n  }\n}\n\nexport class TransactionImpl<TSchema extends Schema, TWrappedTransaction>\n  implements ServerTransaction<TSchema, TWrappedTransaction>\n{\n  readonly location = 'server';\n  readonly reason = 'authoritative';\n  readonly dbTransaction: DBTransaction<TWrappedTransaction>;\n  readonly clientID: string;\n  readonly mutationID: number;\n  readonly mutate: TransactionMutate<TSchema>;\n  /**\n   * @deprecated Use {@linkcode createBuilder} with `tx.run(zql.table.where(...))` instead.\n   */\n  readonly query: ConditionalSchemaQuery<TSchema>;\n\n  readonly #schema: TSchema;\n  readonly #serverSchema: ServerSchema;\n\n  constructor(\n    dbTransaction: DBTransaction<TWrappedTransaction>,\n    clientID: string,\n    mutationID: number,\n    mutate: TransactionMutate<TSchema>,\n    schema: TSchema,\n    serverSchema: ServerSchema,\n  ) {\n    this.dbTransaction = dbTransaction;\n    this.clientID = clientID;\n    this.mutationID = mutationID;\n    this.mutate = mutate;\n    this.#schema = schema;\n    this.#serverSchema = serverSchema;\n\n    const delegate = new ServerTransactionQueryDelegate(\n      dbTransaction,\n      schema,\n      serverSchema,\n    );\n    this.query = createRunnableBuilder(delegate, schema);\n  }\n\n  run<TTable extends keyof TSchema['tables'] & string, TReturn>(\n    query: Query<TTable, TSchema, TReturn>,\n    _options?: RunOptions,\n  ): Promise<HumanReadable<TReturn>> {\n    const queryInternals = asQueryInternals(query);\n\n    // Execute the query using the database-specific executor\n    return this.dbTransaction.runQuery<TReturn>(\n      queryInternals.ast,\n      queryInternals.format,\n      this.#schema,\n      this.#serverSchema,\n    );\n  }\n}\n\nconst dbTxSymbol = Symbol();\n\nconst serverSchemaSymbol = Symbol();\n\ntype WithHiddenTxAndSchema = {\n  [dbTxSymbol]: DBTransaction<unknown>;\n  [serverSchemaSymbol]: ServerSchema;\n};\n\n/**\n * Factory for creating MutateCRUD instances efficiently.\n *\n * Pre-creates the SQL-generating TableCRUD methods once from the schema,\n * caches the serverSchema after first fetch, and only binds the transaction\n * at transaction time.\n *\n * Use this when you need to create many transactions and want to avoid\n * the overhead of re-creating CRUD methods for each one.\n */\nexport class CRUDMutatorFactory<S extends Schema> {\n  readonly #schema: S;\n  readonly #tableCRUDs: Record<string, TableCRUD<TableSchema>>;\n  #serverSchema: ServerSchema | undefined;\n\n  constructor(schema: S) {\n    this.#schema = schema;\n    // Pre-create TableCRUD methods for each table once\n    this.#tableCRUDs = {};\n    for (const tableSchema of Object.values(schema.tables)) {\n      this.#tableCRUDs[tableSchema.name] = makeServerTableCRUD(tableSchema);\n    }\n  }\n\n  /**\n   * Gets the cached serverSchema, or fetches and caches it on first call.\n   */\n  async #getOrFetchServerSchema(\n    dbTransaction: DBTransaction<unknown>,\n  ): Promise<ServerSchema> {\n    if (!this.#serverSchema) {\n      this.#serverSchema = await getServerSchema(dbTransaction, this.#schema);\n    }\n    return this.#serverSchema;\n  }\n\n  /**\n   * Creates a CRUDExecutor bound to the given transaction and serverSchema.\n   * Uses the pre-created TableCRUD methods from construction time.\n   */\n  createExecutor(\n    dbTransaction: DBTransaction<unknown>,\n    serverSchema: ServerSchema,\n  ): CRUDExecutor {\n    const txHolder: WithHiddenTxAndSchema = {\n      [dbTxSymbol]: dbTransaction,\n      [serverSchemaSymbol]: serverSchema,\n    };\n    const boundCRUDs = recordProxy(this.#tableCRUDs, tableCRUD =>\n      mapValues(tableCRUD, method => method.bind(txHolder)),\n    ) as unknown as SchemaCRUD<S>;\n\n    return (table: string, kind: CRUDKind, args: unknown) => {\n      const tableCRUD = boundCRUDs[table as keyof S['tables']];\n      // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n      return (tableCRUD as any)[kind](args);\n    };\n  }\n\n  /**\n   * Creates a full ServerTransaction.\n   * Fetches/caches serverSchema automatically.\n   */\n  async createTransaction<TWrappedTransaction>(\n    dbTransaction: DBTransaction<TWrappedTransaction>,\n    clientID: string,\n    mutationID: number,\n  ): Promise<TransactionImpl<S, TWrappedTransaction>> {\n    const serverSchema = await this.#getOrFetchServerSchema(dbTransaction);\n    const executor = this.createExecutor(dbTransaction, serverSchema);\n    const mutate = makeTransactionMutate(this.#schema, executor);\n    return new TransactionImpl(\n      dbTransaction,\n      clientID,\n      mutationID,\n      mutate,\n      this.#schema,\n      serverSchema,\n    );\n  }\n}\n\nexport async function makeServerTransaction<\n  TSchema extends Schema,\n  TWrappedTransaction,\n>(\n  dbTransaction: DBTransaction<TWrappedTransaction>,\n  clientID: string,\n  mutationID: number,\n  schema: TSchema,\n) {\n  const serverSchema = await getServerSchema(dbTransaction, schema);\n  // Use the internal executor and shared function directly,\n  // bypassing the validation in makeMutateCRUD/makeSchemaCRUD\n  const executor = makeServerCRUDExecutor(schema, dbTransaction, serverSchema);\n  const mutate = makeTransactionMutate(schema, executor);\n  return new TransactionImpl(\n    dbTransaction,\n    clientID,\n    mutationID,\n    mutate,\n    schema,\n    serverSchema,\n  );\n}\n\n/**\n * @deprecated Use transactions instead.\n *\n * Returns a curried function for backwards compatibility.\n */\nexport function makeSchemaCRUD<S extends Schema>(\n  schema: S,\n): (\n  dbTransaction: DBTransaction<unknown>,\n  serverSchema: ServerSchema,\n) => MutateCRUD<S, true> {\n  return (dbTransaction: DBTransaction<unknown>, serverSchema: ServerSchema) =>\n    makeCRUDMutate(\n      schema,\n      true,\n      makeServerCRUDExecutor(schema, dbTransaction, serverSchema),\n    );\n}\n\nfunction removeUndefined<T extends Record<string, unknown>>(value: T): T {\n  const valueWithoutUndefined: Record<string, unknown> = {};\n  for (const [key, val] of Object.entries(value)) {\n    if (val !== undefined) {\n      valueWithoutUndefined[key] = val;\n    }\n  }\n  return valueWithoutUndefined as T;\n}\n\n/**\n * Creates a CRUDExecutor for server-side SQL execution.\n *\n * For users with very large schemas it is expensive to re-create\n * all the CRUD mutators for each transaction. Instead, we create\n * the SQL-generating methods once up-front and then bind them to\n * the transaction as requested.\n */\nfunction makeServerCRUDExecutor<S extends Schema>(\n  schema: S,\n  dbTransaction: DBTransaction<unknown>,\n  serverSchema: ServerSchema,\n): CRUDExecutor {\n  // Pre-create TableCRUD methods for each table (optimization for large schemas)\n  const tableCRUDs: Record<string, TableCRUD<TableSchema>> = {};\n  for (const tableSchema of Object.values(schema.tables)) {\n    tableCRUDs[tableSchema.name] = makeServerTableCRUD(tableSchema);\n  }\n\n  // Bind transaction context to the methods\n  const txHolder: WithHiddenTxAndSchema = {\n    [dbTxSymbol]: dbTransaction,\n    [serverSchemaSymbol]: serverSchema,\n  };\n  const boundCRUDs = recordProxy(tableCRUDs, tableCRUD =>\n    mapValues(tableCRUD, method => method.bind(txHolder)),\n  ) as unknown as SchemaCRUD<S>;\n\n  // Return executor that dispatches to bound methods\n  return (table: string, kind: CRUDKind, args: unknown) => {\n    const tableCRUD = boundCRUDs[table as keyof S['tables']];\n    // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n    return (tableCRUD as any)[kind](args);\n  };\n}\n\n/**\n * Creates SQL-generating TableCRUD methods for a table.\n * Methods use `this` context to access transaction and server schema.\n */\nfunction makeServerTableCRUD(schema: TableSchema): TableCRUD<TableSchema> {\n  return {\n    async insert(this: WithHiddenTxAndSchema, value) {\n      value = removeUndefined(value);\n      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];\n\n      const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);\n      const stmt = formatPgInternalConvert(\n        sql`INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(\n          targetedColumns.map(([, serverName]) => sql.ident(serverName)),\n          ',',\n        )}) VALUES (${sql.join(\n          Object.entries(value).map(([col, v]) =>\n            sqlInsertValue(v, serverTableSchema[serverNameFor(col, schema)]),\n          ),\n          ', ',\n        )})`,\n      );\n      const tx = this[dbTxSymbol];\n      await tx.query(stmt.text, stmt.values);\n    },\n    async upsert(this: WithHiddenTxAndSchema, value) {\n      value = removeUndefined(value);\n      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];\n      const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);\n      const primaryKeyColumns = origAndServerNamesFor(\n        schema.primaryKey,\n        schema,\n      );\n      const stmt = formatPgInternalConvert(\n        sql`INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(\n          targetedColumns.map(([, serverName]) => sql.ident(serverName)),\n          ',',\n        )}) VALUES (${sql.join(\n          Object.entries(value).map(([col, val]) =>\n            sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)]),\n          ),\n          ', ',\n        )}) ON CONFLICT (${sql.join(\n          primaryKeyColumns.map(([, serverName]) => sql.ident(serverName)),\n          ', ',\n        )}) DO UPDATE SET ${sql.join(\n          Object.entries(value).map(\n            ([col, val]) =>\n              sql`${sql.ident(\n                schema.columns[col].serverName ?? col,\n              )} = ${sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)])}`,\n          ),\n          ', ',\n        )}`,\n      );\n      const tx = this[dbTxSymbol];\n      await tx.query(stmt.text, stmt.values);\n    },\n    async update(this: WithHiddenTxAndSchema, value) {\n      value = removeUndefined(value);\n      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];\n      const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);\n      const stmt = formatPgInternalConvert(\n        sql`UPDATE ${sql.ident(serverName(schema))} SET ${sql.join(\n          targetedColumns.map(\n            ([origName, serverName]) =>\n              sql`${sql.ident(serverName)} = ${sqlInsertValue(value[origName], serverTableSchema[serverName])}`,\n          ),\n          ', ',\n        )} WHERE ${primaryKeyClause(schema, serverTableSchema, value)}`,\n      );\n      const tx = this[dbTxSymbol];\n      await tx.query(stmt.text, stmt.values);\n    },\n    async delete(this: WithHiddenTxAndSchema, value) {\n      value = removeUndefined(value);\n      const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];\n      const stmt = formatPgInternalConvert(\n        sql`DELETE FROM ${sql.ident(\n          serverName(schema),\n        )} WHERE ${primaryKeyClause(schema, serverTableSchema, value)}`,\n      );\n      const tx = this[dbTxSymbol];\n      await tx.query(stmt.text, stmt.values);\n    },\n  };\n}\n\nfunction serverName(x: {name: string; serverName?: string | undefined}) {\n  return x.serverName ?? x.name;\n}\n\nfunction primaryKeyClause(\n  schema: TableSchema,\n  serverTableSchema: ServerTableSchema,\n  row: Record<string, unknown>,\n) {\n  const primaryKey = origAndServerNamesFor(schema.primaryKey, schema);\n  return sql`${sql.join(\n    primaryKey.map(\n      ([origName, serverName]) =>\n        sql`${sql.ident(serverName)}${maybeCastColumn(serverTableSchema[serverName])} = ${sqlValue(row[origName], serverTableSchema[serverName])}`,\n    ),\n    ' AND ',\n  )}`;\n}\n\nfunction maybeCastColumn(col: ServerColumnSchema) {\n  if (col.type === 'uuid' || col.isEnum) {\n    return sql`::text`;\n  }\n  return sql``;\n}\n\nfunction origAndServerNamesFor(\n  originalNames: readonly string[],\n  schema: TableSchema,\n): [origName: string, serverName: string][] {\n  return originalNames.map(\n    name => [name, serverNameFor(name, schema)] as const,\n  );\n}\n\nfunction serverNameFor(originalName: string, schema: TableSchema): string {\n  const col = schema.columns[originalName];\n  assert(\n    col,\n    `Column ${originalName} was not found in the Zero schema for the table ${schema.name}`,\n  );\n  return col.serverName ?? originalName;\n}\n\nfunction sqlValue(value: unknown, serverColumnSchema: ServerColumnSchema) {\n  return sqlConvertColumnArg(serverColumnSchema, value, false, true);\n}\n\nfunction sqlInsertValue(\n  value: unknown,\n  serverColumnSchema: ServerColumnSchema,\n) {\n  return sqlConvertColumnArg(serverColumnSchema, value, false, false);\n}\n"],"names":["serverName"],"mappings":"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"}

package/out/zero-server/src/mod.d.ts

@@ -4,6 +4,6 @@ export * from './custom.ts';
 export * from './process-mutations.ts';
 export * from './push-processor.ts';
 export * from './queries/process-queries.ts';
-export { handleTransformRequest, type TransformQueryFunction, } from './queries/process-queries.ts';
+export { handleQueryRequest, handleTransformRequest, handleGetQueriesRequest, type TransformQueryFunction, } from './queries/process-queries.ts';
 export * from './zql-database.ts';
 //# sourceMappingURL=mod.d.ts.map

package/out/zero-server/src/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,8CAA8C,CAAC;AAC7D,cAAc,gCAAgC,CAAC;AAC/C,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,OAAO,EACL,sBAAsB,EACtB,KAAK,sBAAsB,GAC5B,MAAM,8BAA8B,CAAC;AACtC,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,8CAA8C,CAAC;AAC7D,cAAc,gCAAgC,CAAC;AAC/C,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,uBAAuB,EACvB,KAAK,sBAAsB,GAC5B,MAAM,8BAA8B,CAAC;AACtC,cAAc,mBAAmB,CAAC"}

package/out/zero-server/src/process-mutations.d.ts

@@ -26,14 +26,18 @@ export interface Database<T> {
 }
 export type ExtractTransactionType<D> = D extends Database<infer T> ? T : never;
 export type Params = v.Infer<typeof pushParamsSchema>;
-export type TransactFn<D extends Database<ExtractTransactionType<D>>, Context> = (cb: TransactFnCallback<D, Context>) => Promise<MutationResponse>;
-export type TransactFnCallback<D extends Database<ExtractTransactionType<D>>, Context> = (tx: ExtractTransactionType<D>, mutatorName: string, mutatorArgs: ReadonlyJSONValue | undefined, ctx: Context) => Promise<void>;
-export type Parsed<D extends Database<ExtractTransactionType<D>>, Context> = {
-    transact: TransactFn<D, Context>;
+export type TransactFn<D extends Database<ExtractTransactionType<D>>> = (cb: TransactFnCallback<D>) => Promise<MutationResponse>;
+export type TransactFnCallback<D extends Database<ExtractTransactionType<D>>> = (tx: ExtractTransactionType<D>, mutatorName: string, mutatorArgs: ReadonlyJSONValue | undefined) => Promise<void>;
+export type Parsed<D extends Database<ExtractTransactionType<D>>> = {
+    transact: TransactFn<D>;
     mutations: CustomMutation[];
 };
-export declare function handleMutationRequest<D extends Database<ExtractTransactionType<D>>, C = undefined>(dbProvider: D, cb: (transact: TransactFn<D, C>, mutation: CustomMutation) => Promise<MutationResponse>, queryString: URLSearchParams | Record<string, string>, body: ReadonlyJSONValue, context?: C, logLevel?: LogLevel): Promise<PushResponse>;
-export declare function handleMutationRequest<D extends Database<ExtractTransactionType<D>>, C = undefined>(dbProvider: D, cb: (transact: TransactFn<D, C>, mutation: CustomMutation) => Promise<MutationResponse>, request: Request, context?: C, logLevel?: LogLevel): Promise<PushResponse>;
+/**
+ * @deprecated Use {@linkcode handleMutateRequest} instead.
+ */
+export declare const handleMutationRequest: typeof handleMutateRequest;
+export declare function handleMutateRequest<D extends Database<ExtractTransactionType<D>>>(dbProvider: D, cb: (transact: TransactFn<D>, mutation: CustomMutation) => Promise<MutationResponse>, queryString: URLSearchParams | Record<string, string>, body: ReadonlyJSONValue, logLevel?: LogLevel): Promise<PushResponse>;
+export declare function handleMutateRequest<D extends Database<ExtractTransactionType<D>>>(dbProvider: D, cb: (transact: TransactFn<D>, mutation: CustomMutation) => Promise<MutationResponse>, request: Request, logLevel?: LogLevel): Promise<PushResponse>;
 export declare class OutOfOrderMutation extends Error {
     constructor(clientID: string, receivedMutationID: number, lastMutationID: number | bigint);
 }

package/out/zero-server/src/process-mutations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"process-mutations.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/process-mutations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"process-mutations.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/process-mutations.ts"],"names":[],"mappings":"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"}

package/out/zero-server/src/process-mutations.js

@@ -20,17 +20,16 @@ const applicationErrorWrapper = async (fn) => {
     throw wrapWithApplicationError(error);
   }
 };
-async function handleMutationRequest(dbProvider, cb, queryStringOrRequest, bodyOrContext, contextOrLogLevel, logLevel) {
+const handleMutationRequest = handleMutateRequest;
+async function handleMutateRequest(dbProvider, cb, queryStringOrRequest, bodyOrLogLevel, logLevel) {
   const isRequestOverload = queryStringOrRequest instanceof Request;
   let request;
   let queryString;
   let jsonBody;
-  let context;
   let lc;
   if (isRequestOverload) {
     request = queryStringOrRequest;
-    context = bodyOrContext;
-    const level = contextOrLogLevel ?? "info";
+    const level = bodyOrLogLevel ?? "info";
     lc = createLogContext(level).withContext("PushProcessor");
     const url = new URL(request.url);
     queryString = url.searchParams;
@@ -51,8 +50,7 @@ async function handleMutationRequest(dbProvider, cb, queryStringOrRequest, bodyO
     }
   } else {
     queryString = queryStringOrRequest;
-    jsonBody = bodyOrContext;
-    context = contextOrLogLevel;
+    jsonBody = bodyOrLogLevel;
     const level = logLevel ?? "info";
     lc = createLogContext(level).withContext("PushProcessor");
   }
@@ -107,13 +105,7 @@ async function handleMutationRequest(dbProvider, cb, queryStringOrRequest, bodyO
   const responses = [];
   let processedCount = 0;
   try {
-    const transactor = new Transactor(
-      dbProvider,
-      pushBody,
-      queryParams,
-      lc,
-      context
-    );
+    const transactor = new Transactor(dbProvider, pushBody, queryParams, lc);
     for (const m of pushBody.mutations) {
       assert(m.type === "custom", "Expected custom mutation");
       lc.debug?.(
@@ -125,7 +117,7 @@ async function handleMutationRequest(dbProvider, cb, queryStringOrRequest, bodyO
         mutationPhase = "transactionPending";
         const result = await transactor.transact(
           m,
-          (tx, name, args) => applicationErrorWrapper(() => innerCb(tx, name, args, context))
+          (tx, name, args) => applicationErrorWrapper(() => innerCb(tx, name, args))
         );
         mutationPhase = "postCommit";
         return result;
@@ -178,13 +170,11 @@ class Transactor {
   #req;
   #params;
   #lc;
-  #context;
-  constructor(dbProvider, req, params, lc, context) {
+  constructor(dbProvider, req, params, lc) {
     this.#dbProvider = dbProvider;
     this.#req = req;
     this.#params = params;
     this.#lc = lc;
-    this.#context = context;
   }
   transact = async (mutation, cb) => {
     let appError = void 0;
@@ -258,7 +248,7 @@ class Transactor {
               `Executing mutator '${mutation.name}' (id=${mutation.id})`
             );
             try {
-              await cb(dbTx, mutation.name, mutation.args[0], this.#context);
+              await cb(dbTx, mutation.name, mutation.args[0]);
             } catch (appError2) {
               throw wrapWithApplicationError(appError2);
             }
@@ -360,6 +350,7 @@ class DatabaseTransactionError extends Error {
 export {
   OutOfOrderMutation,
   getMutation,
+  handleMutateRequest,
   handleMutationRequest
 };
 //# sourceMappingURL=process-mutations.js.map