@rocicorp/zero 1.10.0-canary.0 → 1.10.0-canary.2

package/out/zero-schema/src/builder/table-builder.d.ts

@@ -56,6 +56,29 @@ export declare class TableBuilderWithColumns<TShape extends TableSchema> {
     primaryKey<TPKColNames extends (keyof TShape['columns'])[]>(...pkColumnNames: TPKColNames): TableBuilderWithColumns<TShape & {
         primaryKey: TPKColNames;
     }>;
+    /**
+     * Declares that `columnNames` together are unique — mirroring a unique index
+     * that already exists upstream. Call once per index.
+     *
+     * Zero neither creates nor enforces the constraint; declaring it tells the
+     * type checker what the server already knows from the replica, which is what
+     * lets a `{scalar: true}` subquery pinned on these columns typecheck.
+     *
+     * The return type is spelled out so the column names stay literal — spreading
+     * the accumulated keys widens them to `PrimaryKey`, which loses exactly the
+     * information the check needs.
+     */
+    unique<const TUniqueColNames extends [
+        keyof TShape['columns'] & string,
+        ...(keyof TShape['columns'] & string)[]
+    ]>(...columnNames: TUniqueColNames): TableBuilderWithColumns<Omit<TShape, 'uniqueKeys'> & {
+        uniqueKeys: [
+            ...(TShape extends {
+                uniqueKeys: infer TExisting extends readonly PrimaryKey[];
+            } ? TExisting : []),
+            TUniqueColNames
+        ];
+    }>;
     get schema(): TShape;
     build(): TShape;
 }

package/out/zero-schema/src/builder/table-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table-builder.d.ts","sourceRoot":"","sources":["../../../../../zero-schema/src/builder/table-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAEnE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAC1E,OAAO,KAAK,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAGjE,wBAAgB,KAAK,CAAC,KAAK,SAAS,MAAM,EAAE,IAAI,EAAE,KAAK;;;gBAI1B,UAAU;GAEtC;AAED,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;;;gBAIb,CAAC;GAEnC;AAED,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;;;gBAIb,CAAC;GAEnC;AAED,wBAAgB,OAAO,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;;;gBAIhB,CAAC;GAEnC;AAED,wBAAgB,IAAI,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB;;;gBAIjC,CAAC;GAEnC;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM;;;gBAIT,CAAC;GAEnC;AAED,eAAO,MAAM,MAAM;;;;;;CAMlB,CAAC;AAEF,qBAAa,YAAY,CAAC,MAAM,SAAS,WAAW;;gBAEtC,MAAM,EAAE,MAAM;IAI1B,IAAI,CAAC,UAAU,SAAS,MAAM,EAAE,UAAU,EAAE,UAAU;IAYtD,OAAO,CAAC,KAAK,CAAC,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,EACvE,OAAO,EAAE,QAAQ,GAChB,uBAAuB,CAAC;QACzB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QACrB,OAAO,EAAE;aAAE,CAAC,IAAI,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;SAAC,CAAC;QACxD,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;KAClC,CAAC;CAOH;AAED,qBAAa,uBAAuB,CAAC,MAAM,SAAS,WAAW;;gBAGjD,MAAM,EAAE,MAAM;IAI1B,UAAU,CAAC,WAAW,SAAS,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EACxD,GAAG,aAAa,EAAE,WAAW;;;IAQ/B,IAAI,MAAM,WAET;IAED,KAAK;CAqBN;AAED,cAAM,aAAa,CAAC,MAAM,SAAS,WAAW,CAAC,GAAG,CAAC;;gBAErC,MAAM,EAAE,MAAM;IAI1B,IAAI,CAAC,UAAU,SAAS,MAAM,EAAE,UAAU,EAAE,UAAU;oBACL,MAAM;;IAMvD,QAAQ,IAAI,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAC,CAAC;IAOtE,IAAI,MAAM,WAET;CACF;AAED,YAAY,EAAC,aAAa,EAAC,CAAC"}
+{"version":3,"file":"table-builder.d.ts","sourceRoot":"","sources":["../../../../../zero-schema/src/builder/table-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAEnE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAC1E,OAAO,KAAK,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAGjE,wBAAgB,KAAK,CAAC,KAAK,SAAS,MAAM,EAAE,IAAI,EAAE,KAAK;;;gBAI1B,UAAU;GAEtC;AAED,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;;;gBAIb,CAAC;GAEnC;AAED,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;;;gBAIb,CAAC;GAEnC;AAED,wBAAgB,OAAO,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;;;gBAIhB,CAAC;GAEnC;AAED,wBAAgB,IAAI,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB;;;gBAIjC,CAAC;GAEnC;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM;;;gBAIT,CAAC;GAEnC;AAED,eAAO,MAAM,MAAM;;;;;;CAMlB,CAAC;AAEF,qBAAa,YAAY,CAAC,MAAM,SAAS,WAAW;;gBAEtC,MAAM,EAAE,MAAM;IAI1B,IAAI,CAAC,UAAU,SAAS,MAAM,EAAE,UAAU,EAAE,UAAU;IAYtD,OAAO,CAAC,KAAK,CAAC,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,EACvE,OAAO,EAAE,QAAQ,GAChB,uBAAuB,CAAC;QACzB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QACrB,OAAO,EAAE;aAAE,CAAC,IAAI,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;SAAC,CAAC;QACxD,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;KAClC,CAAC;CAOH;AAED,qBAAa,uBAAuB,CAAC,MAAM,SAAS,WAAW;;gBAGjD,MAAM,EAAE,MAAM;IAI1B,UAAU,CAAC,WAAW,SAAS,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,EACxD,GAAG,aAAa,EAAE,WAAW;;;IAQ/B;;;;;;;;;;;OAWG;IACH,MAAM,CACJ,KAAK,CAAC,eAAe,SAAS;QAC5B,MAAM,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM;QAChC,GAAG,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,EAAE;KACxC,EAED,GAAG,WAAW,EAAE,eAAe,GAC9B,uBAAuB,CACxB,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG;QAC3B,UAAU,EAAE;YACV,GAAG,CAAC,MAAM,SAAS;gBACjB,UAAU,EAAE,MAAM,SAAS,SAAS,SAAS,UAAU,EAAE,CAAC;aAC3D,GACG,SAAS,GACT,EAAE,CAAC;YACP,eAAe;SAChB,CAAC;KACH,CACF;IAOD,IAAI,MAAM,WAET;IAED,KAAK;CAqBN;AAED,cAAM,aAAa,CAAC,MAAM,SAAS,WAAW,CAAC,GAAG,CAAC;;gBAErC,MAAM,EAAE,MAAM;IAI1B,IAAI,CAAC,UAAU,SAAS,MAAM,EAAE,UAAU,EAAE,UAAU;oBACL,MAAM;;IAMvD,QAAQ,IAAI,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAC,CAAC;IAOtE,IAAI,MAAM,WAET;CACF;AAED,YAAY,EAAC,aAAa,EAAC,CAAC"}

package/out/zero-schema/src/builder/table-builder.js

@@ -72,6 +72,24 @@ var TableBuilderWithColumns = class TableBuilderWithColumns {
 			primaryKey: pkColumnNames
 		});
 	}
+	/**
+	* Declares that `columnNames` together are unique — mirroring a unique index
+	* that already exists upstream. Call once per index.
+	*
+	* Zero neither creates nor enforces the constraint; declaring it tells the
+	* type checker what the server already knows from the replica, which is what
+	* lets a `{scalar: true}` subquery pinned on these columns typecheck.
+	*
+	* The return type is spelled out so the column names stay literal — spreading
+	* the accumulated keys widens them to `PrimaryKey`, which loses exactly the
+	* information the check needs.
+	*/
+	unique(...columnNames) {
+		return new TableBuilderWithColumns({
+			...this.#schema,
+			uniqueKeys: [...this.#schema.uniqueKeys ?? [], columnNames]
+		});
+	}
 	get schema() {
 		return this.#schema;
 	}

package/out/zero-schema/src/builder/table-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"table-builder.js","names":["#schema"],"sources":["../../../../../zero-schema/src/builder/table-builder.ts"],"sourcesContent":["import type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {mapValues} from '../../../shared/src/objects.ts';\nimport type {PrimaryKey} from '../../../zero-protocol/src/primary-key.ts';\nimport type {SchemaValue, TableSchema} from '../table-schema.ts';\n\n/* oxlint-disable @typescript-eslint/no-explicit-any */\nexport function table<TName extends string>(name: TName) {\n  return new TableBuilder({\n    name,\n    columns: {},\n    primaryKey: [] as any as PrimaryKey,\n  });\n}\n\nexport function string<T extends string = string>() {\n  return new ColumnBuilder({\n    type: 'string',\n    optional: false,\n    customType: null as unknown as T,\n  });\n}\n\nexport function number<T extends number = number>() {\n  return new ColumnBuilder({\n    type: 'number',\n    optional: false,\n    customType: null as unknown as T,\n  });\n}\n\nexport function boolean<T extends boolean = boolean>() {\n  return new ColumnBuilder({\n    type: 'boolean',\n    optional: false,\n    customType: null as unknown as T,\n  });\n}\n\nexport function json<T extends ReadonlyJSONValue = ReadonlyJSONValue>() {\n  return new ColumnBuilder({\n    type: 'json',\n    optional: false,\n    customType: null as unknown as T,\n  });\n}\n\nexport function enumeration<T extends string>() {\n  return new ColumnBuilder({\n    type: 'string',\n    optional: false,\n    customType: null as unknown as T,\n  });\n}\n\nexport const column = {\n  string,\n  number,\n  boolean,\n  json,\n  enumeration,\n};\n\nexport class TableBuilder<TShape extends TableSchema> {\n  readonly #schema: TShape;\n  constructor(schema: TShape) {\n    this.#schema = schema;\n  }\n\n  from<ServerName extends string>(serverName: ServerName) {\n    return new TableBuilder<TShape>({\n      ...this.#schema,\n      // Strip the \"public.\" schema if specified, as tables in the upstream\n      // \"public\" schema are created without the schema prefix on the replica.\n      // See liteTableName() in zero-cache/src/types/names.ts\n      serverName: serverName.startsWith('public.')\n        ? serverName.substring('public.'.length)\n        : serverName,\n    });\n  }\n\n  columns<const TColumns extends Record<string, ColumnBuilder<SchemaValue>>>(\n    columns: TColumns,\n  ): TableBuilderWithColumns<{\n    name: TShape['name'];\n    columns: {[K in keyof TColumns]: TColumns[K]['schema']};\n    primaryKey: TShape['primaryKey'];\n  }> {\n    const columnSchemas = mapValues(columns, column => column.schema);\n    return new TableBuilderWithColumns({\n      ...this.#schema,\n      columns: columnSchemas,\n    }) as any;\n  }\n}\n\nexport class TableBuilderWithColumns<TShape extends TableSchema> {\n  readonly #schema: TShape;\n\n  constructor(schema: TShape) {\n    this.#schema = schema;\n  }\n\n  primaryKey<TPKColNames extends (keyof TShape['columns'])[]>(\n    ...pkColumnNames: TPKColNames\n  ) {\n    return new TableBuilderWithColumns({\n      ...this.#schema,\n      primaryKey: pkColumnNames,\n    });\n  }\n\n  get schema() {\n    return this.#schema;\n  }\n\n  build() {\n    // We can probably get the type system to throw an error if primaryKey is not called\n    // before passing the schema to createSchema\n    // Till then --\n    if (this.#schema.primaryKey.length === 0) {\n      throw new Error(`Table \"${this.#schema.name}\" is missing a primary key`);\n    }\n    const names = new Set<string>();\n    for (const [col, {serverName}] of Object.entries(this.#schema.columns)) {\n      const name = serverName ?? col;\n      if (names.has(name)) {\n        throw new Error(\n          `Table \"${\n            this.#schema.name\n          }\" has multiple columns referencing \"${name}\"`,\n        );\n      }\n      names.add(name);\n    }\n    return this.#schema;\n  }\n}\n\nclass ColumnBuilder<TShape extends SchemaValue<any>> {\n  readonly #schema: TShape;\n  constructor(schema: TShape) {\n    this.#schema = schema;\n  }\n\n  from<ServerName extends string>(serverName: ServerName) {\n    return new ColumnBuilder<TShape & {serverName: string}>({\n      ...this.#schema,\n      serverName,\n    });\n  }\n\n  optional(): ColumnBuilder<Omit<TShape, 'optional'> & {optional: true}> {\n    return new ColumnBuilder({\n      ...this.#schema,\n      optional: true,\n    });\n  }\n\n  get schema() {\n    return this.#schema;\n  }\n}\n\nexport type {ColumnBuilder};\n"],"mappings":";;AAMA,SAAgB,MAA4B,MAAa;CACvD,OAAO,IAAI,aAAa;EACtB;EACA,SAAS,CAAC;EACV,YAAY,CAAC;CACf,CAAC;AACH;AAEA,SAAgB,SAAoC;CAClD,OAAO,IAAI,cAAc;EACvB,MAAM;EACN,UAAU;EACV,YAAY;CACd,CAAC;AACH;AAEA,SAAgB,SAAoC;CAClD,OAAO,IAAI,cAAc;EACvB,MAAM;EACN,UAAU;EACV,YAAY;CACd,CAAC;AACH;AAEA,SAAgB,UAAuC;CACrD,OAAO,IAAI,cAAc;EACvB,MAAM;EACN,UAAU;EACV,YAAY;CACd,CAAC;AACH;AAEA,SAAgB,OAAwD;CACtE,OAAO,IAAI,cAAc;EACvB,MAAM;EACN,UAAU;EACV,YAAY;CACd,CAAC;AACH;AAEA,SAAgB,cAAgC;CAC9C,OAAO,IAAI,cAAc;EACvB,MAAM;EACN,UAAU;EACV,YAAY;CACd,CAAC;AACH;AAUA,IAAa,eAAb,MAAa,aAAyC;CACpD;CACA,YAAY,QAAgB;EAC1B,KAAKA,UAAU;CACjB;CAEA,KAAgC,YAAwB;EACtD,OAAO,IAAI,aAAqB;GAC9B,GAAG,KAAKA;GAIR,YAAY,WAAW,WAAW,SAAS,IACvC,WAAW,UAAU,CAAgB,IACrC;EACN,CAAC;CACH;CAEA,QACE,SAKC;EACD,MAAM,gBAAgB,UAAU,UAAS,WAAU,OAAO,MAAM;EAChE,OAAO,IAAI,wBAAwB;GACjC,GAAG,KAAKA;GACR,SAAS;EACX,CAAC;CACH;AACF;AAEA,IAAa,0BAAb,MAAa,wBAAoD;CAC/D;CAEA,YAAY,QAAgB;EAC1B,KAAKA,UAAU;CACjB;CAEA,WACE,GAAG,eACH;EACA,OAAO,IAAI,wBAAwB;GACjC,GAAG,KAAKA;GACR,YAAY;EACd,CAAC;CACH;CAEA,IAAI,SAAS;EACX,OAAO,KAAKA;CACd;CAEA,QAAQ;EAIN,IAAI,KAAKA,QAAQ,WAAW,WAAW,GACrC,MAAM,IAAI,MAAM,UAAU,KAAKA,QAAQ,KAAK,2BAA2B;EAEzE,MAAM,wBAAQ,IAAI,IAAY;EAC9B,KAAK,MAAM,CAAC,KAAK,EAAC,iBAAgB,OAAO,QAAQ,KAAKA,QAAQ,OAAO,GAAG;GACtE,MAAM,OAAO,cAAc;GAC3B,IAAI,MAAM,IAAI,IAAI,GAChB,MAAM,IAAI,MACR,UACE,KAAKA,QAAQ,KACd,sCAAsC,KAAK,EAC9C;GAEF,MAAM,IAAI,IAAI;EAChB;EACA,OAAO,KAAKA;CACd;AACF;AAEA,IAAM,gBAAN,MAAM,cAA+C;CACnD;CACA,YAAY,QAAgB;EAC1B,KAAKA,UAAU;CACjB;CAEA,KAAgC,YAAwB;EACtD,OAAO,IAAI,cAA6C;GACtD,GAAG,KAAKA;GACR;EACF,CAAC;CACH;CAEA,WAAuE;EACrE,OAAO,IAAI,cAAc;GACvB,GAAG,KAAKA;GACR,UAAU;EACZ,CAAC;CACH;CAEA,IAAI,SAAS;EACX,OAAO,KAAKA;CACd;AACF"}
+{"version":3,"file":"table-builder.js","names":["#schema"],"sources":["../../../../../zero-schema/src/builder/table-builder.ts"],"sourcesContent":["import type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {mapValues} from '../../../shared/src/objects.ts';\nimport type {PrimaryKey} from '../../../zero-protocol/src/primary-key.ts';\nimport type {SchemaValue, TableSchema} from '../table-schema.ts';\n\n/* oxlint-disable @typescript-eslint/no-explicit-any */\nexport function table<TName extends string>(name: TName) {\n  return new TableBuilder({\n    name,\n    columns: {},\n    primaryKey: [] as any as PrimaryKey,\n  });\n}\n\nexport function string<T extends string = string>() {\n  return new ColumnBuilder({\n    type: 'string',\n    optional: false,\n    customType: null as unknown as T,\n  });\n}\n\nexport function number<T extends number = number>() {\n  return new ColumnBuilder({\n    type: 'number',\n    optional: false,\n    customType: null as unknown as T,\n  });\n}\n\nexport function boolean<T extends boolean = boolean>() {\n  return new ColumnBuilder({\n    type: 'boolean',\n    optional: false,\n    customType: null as unknown as T,\n  });\n}\n\nexport function json<T extends ReadonlyJSONValue = ReadonlyJSONValue>() {\n  return new ColumnBuilder({\n    type: 'json',\n    optional: false,\n    customType: null as unknown as T,\n  });\n}\n\nexport function enumeration<T extends string>() {\n  return new ColumnBuilder({\n    type: 'string',\n    optional: false,\n    customType: null as unknown as T,\n  });\n}\n\nexport const column = {\n  string,\n  number,\n  boolean,\n  json,\n  enumeration,\n};\n\nexport class TableBuilder<TShape extends TableSchema> {\n  readonly #schema: TShape;\n  constructor(schema: TShape) {\n    this.#schema = schema;\n  }\n\n  from<ServerName extends string>(serverName: ServerName) {\n    return new TableBuilder<TShape>({\n      ...this.#schema,\n      // Strip the \"public.\" schema if specified, as tables in the upstream\n      // \"public\" schema are created without the schema prefix on the replica.\n      // See liteTableName() in zero-cache/src/types/names.ts\n      serverName: serverName.startsWith('public.')\n        ? serverName.substring('public.'.length)\n        : serverName,\n    });\n  }\n\n  columns<const TColumns extends Record<string, ColumnBuilder<SchemaValue>>>(\n    columns: TColumns,\n  ): TableBuilderWithColumns<{\n    name: TShape['name'];\n    columns: {[K in keyof TColumns]: TColumns[K]['schema']};\n    primaryKey: TShape['primaryKey'];\n  }> {\n    const columnSchemas = mapValues(columns, column => column.schema);\n    return new TableBuilderWithColumns({\n      ...this.#schema,\n      columns: columnSchemas,\n    }) as any;\n  }\n}\n\nexport class TableBuilderWithColumns<TShape extends TableSchema> {\n  readonly #schema: TShape;\n\n  constructor(schema: TShape) {\n    this.#schema = schema;\n  }\n\n  primaryKey<TPKColNames extends (keyof TShape['columns'])[]>(\n    ...pkColumnNames: TPKColNames\n  ) {\n    return new TableBuilderWithColumns({\n      ...this.#schema,\n      primaryKey: pkColumnNames,\n    });\n  }\n\n  /**\n   * Declares that `columnNames` together are unique — mirroring a unique index\n   * that already exists upstream. Call once per index.\n   *\n   * Zero neither creates nor enforces the constraint; declaring it tells the\n   * type checker what the server already knows from the replica, which is what\n   * lets a `{scalar: true}` subquery pinned on these columns typecheck.\n   *\n   * The return type is spelled out so the column names stay literal — spreading\n   * the accumulated keys widens them to `PrimaryKey`, which loses exactly the\n   * information the check needs.\n   */\n  unique<\n    const TUniqueColNames extends [\n      keyof TShape['columns'] & string,\n      ...(keyof TShape['columns'] & string)[],\n    ],\n  >(\n    ...columnNames: TUniqueColNames\n  ): TableBuilderWithColumns<\n    Omit<TShape, 'uniqueKeys'> & {\n      uniqueKeys: [\n        ...(TShape extends {\n          uniqueKeys: infer TExisting extends readonly PrimaryKey[];\n        }\n          ? TExisting\n          : []),\n        TUniqueColNames,\n      ];\n    }\n  > {\n    return new TableBuilderWithColumns({\n      ...this.#schema,\n      uniqueKeys: [...(this.#schema.uniqueKeys ?? []), columnNames],\n    }) as any;\n  }\n\n  get schema() {\n    return this.#schema;\n  }\n\n  build() {\n    // We can probably get the type system to throw an error if primaryKey is not called\n    // before passing the schema to createSchema\n    // Till then --\n    if (this.#schema.primaryKey.length === 0) {\n      throw new Error(`Table \"${this.#schema.name}\" is missing a primary key`);\n    }\n    const names = new Set<string>();\n    for (const [col, {serverName}] of Object.entries(this.#schema.columns)) {\n      const name = serverName ?? col;\n      if (names.has(name)) {\n        throw new Error(\n          `Table \"${\n            this.#schema.name\n          }\" has multiple columns referencing \"${name}\"`,\n        );\n      }\n      names.add(name);\n    }\n    return this.#schema;\n  }\n}\n\nclass ColumnBuilder<TShape extends SchemaValue<any>> {\n  readonly #schema: TShape;\n  constructor(schema: TShape) {\n    this.#schema = schema;\n  }\n\n  from<ServerName extends string>(serverName: ServerName) {\n    return new ColumnBuilder<TShape & {serverName: string}>({\n      ...this.#schema,\n      serverName,\n    });\n  }\n\n  optional(): ColumnBuilder<Omit<TShape, 'optional'> & {optional: true}> {\n    return new ColumnBuilder({\n      ...this.#schema,\n      optional: true,\n    });\n  }\n\n  get schema() {\n    return this.#schema;\n  }\n}\n\nexport type {ColumnBuilder};\n"],"mappings":";;AAMA,SAAgB,MAA4B,MAAa;CACvD,OAAO,IAAI,aAAa;EACtB;EACA,SAAS,CAAC;EACV,YAAY,CAAC;CACf,CAAC;AACH;AAEA,SAAgB,SAAoC;CAClD,OAAO,IAAI,cAAc;EACvB,MAAM;EACN,UAAU;EACV,YAAY;CACd,CAAC;AACH;AAEA,SAAgB,SAAoC;CAClD,OAAO,IAAI,cAAc;EACvB,MAAM;EACN,UAAU;EACV,YAAY;CACd,CAAC;AACH;AAEA,SAAgB,UAAuC;CACrD,OAAO,IAAI,cAAc;EACvB,MAAM;EACN,UAAU;EACV,YAAY;CACd,CAAC;AACH;AAEA,SAAgB,OAAwD;CACtE,OAAO,IAAI,cAAc;EACvB,MAAM;EACN,UAAU;EACV,YAAY;CACd,CAAC;AACH;AAEA,SAAgB,cAAgC;CAC9C,OAAO,IAAI,cAAc;EACvB,MAAM;EACN,UAAU;EACV,YAAY;CACd,CAAC;AACH;AAUA,IAAa,eAAb,MAAa,aAAyC;CACpD;CACA,YAAY,QAAgB;EAC1B,KAAKA,UAAU;CACjB;CAEA,KAAgC,YAAwB;EACtD,OAAO,IAAI,aAAqB;GAC9B,GAAG,KAAKA;GAIR,YAAY,WAAW,WAAW,SAAS,IACvC,WAAW,UAAU,CAAgB,IACrC;EACN,CAAC;CACH;CAEA,QACE,SAKC;EACD,MAAM,gBAAgB,UAAU,UAAS,WAAU,OAAO,MAAM;EAChE,OAAO,IAAI,wBAAwB;GACjC,GAAG,KAAKA;GACR,SAAS;EACX,CAAC;CACH;AACF;AAEA,IAAa,0BAAb,MAAa,wBAAoD;CAC/D;CAEA,YAAY,QAAgB;EAC1B,KAAKA,UAAU;CACjB;CAEA,WACE,GAAG,eACH;EACA,OAAO,IAAI,wBAAwB;GACjC,GAAG,KAAKA;GACR,YAAY;EACd,CAAC;CACH;;;;;;;;;;;;;CAcA,OAME,GAAG,aAYH;EACA,OAAO,IAAI,wBAAwB;GACjC,GAAG,KAAKA;GACR,YAAY,CAAC,GAAI,KAAKA,QAAQ,cAAc,CAAC,GAAI,WAAW;EAC9D,CAAC;CACH;CAEA,IAAI,SAAS;EACX,OAAO,KAAKA;CACd;CAEA,QAAQ;EAIN,IAAI,KAAKA,QAAQ,WAAW,WAAW,GACrC,MAAM,IAAI,MAAM,UAAU,KAAKA,QAAQ,KAAK,2BAA2B;EAEzE,MAAM,wBAAQ,IAAI,IAAY;EAC9B,KAAK,MAAM,CAAC,KAAK,EAAC,iBAAgB,OAAO,QAAQ,KAAKA,QAAQ,OAAO,GAAG;GACtE,MAAM,OAAO,cAAc;GAC3B,IAAI,MAAM,IAAI,IAAI,GAChB,MAAM,IAAI,MACR,UACE,KAAKA,QAAQ,KACd,sCAAsC,KAAK,EAC9C;GAEF,MAAM,IAAI,IAAI;EAChB;EACA,OAAO,KAAKA;CACd;AACF;AAEA,IAAM,gBAAN,MAAM,cAA+C;CACnD;CACA,YAAY,QAAgB;EAC1B,KAAKA,UAAU;CACjB;CAEA,KAAgC,YAAwB;EACtD,OAAO,IAAI,cAA6C;GACtD,GAAG,KAAKA;GACR;EACF,CAAC;CACH;CAEA,WAAuE;EACrE,OAAO,IAAI,cAAc;GACvB,GAAG,KAAKA;GACR,UAAU;EACZ,CAAC;CACH;CAEA,IAAI,SAAS;EACX,OAAO,KAAKA;CACd;AACF"}

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

@@ -162,7 +162,8 @@ function makeServerTableCRUD(schema) {
 			value = removeUndefined(value);
 			const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
 			const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);
-			const stmt = formatPgInternalConvert(sql`INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(targetedColumns.map(([, serverName]) => sql.ident(serverName)), ",")}) VALUES (${sql.join(Object.entries(value).map(([col, v]) => sqlInsertValue(v, serverTableSchema[serverNameFor(col, schema)])), ", ")})`);
+			const primaryKeyColumns = origAndServerNamesFor(schema.primaryKey, schema);
+			const stmt = formatPgInternalConvert(sql`INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(targetedColumns.map(([, serverName]) => sql.ident(serverName)), ",")}) VALUES (${sql.join(Object.entries(value).map(([col, v]) => sqlInsertValue(v, serverTableSchema[serverNameFor(col, schema)])), ", ")}) ON CONFLICT (${sql.join(primaryKeyColumns.map(([, serverName]) => sql.ident(serverName)), ", ")}) DO NOTHING`);
 			await this[dbTxSymbol].query(stmt.text, stmt.values);
 		},
 		async upsert(value) {
@@ -170,13 +171,16 @@ function makeServerTableCRUD(schema) {
 			const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
 			const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);
 			const primaryKeyColumns = origAndServerNamesFor(schema.primaryKey, schema);
-			const stmt = formatPgInternalConvert(sql`INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(targetedColumns.map(([, serverName]) => sql.ident(serverName)), ",")}) VALUES (${sql.join(Object.entries(value).map(([col, val]) => sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)])), ", ")}) ON CONFLICT (${sql.join(primaryKeyColumns.map(([, serverName]) => sql.ident(serverName)), ", ")}) DO UPDATE SET ${sql.join(Object.entries(value).map(([col, val]) => sql`${sql.ident(schema.columns[col].serverName ?? col)} = ${sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)])}`), ", ")}`);
+			const updatedEntries = nonPrimaryKeyEntries(value, schema);
+			const conflictAction = updatedEntries.length === 0 ? sql`DO NOTHING` : sql`DO UPDATE SET ${sql.join(updatedEntries.map(([col, val]) => sql`${sql.ident(schema.columns[col].serverName ?? col)} = ${sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)])}`), ", ")}`;
+			const stmt = formatPgInternalConvert(sql`INSERT INTO ${sql.ident(serverName(schema))} (${sql.join(targetedColumns.map(([, serverName]) => sql.ident(serverName)), ",")}) VALUES (${sql.join(Object.entries(value).map(([col, val]) => sqlInsertValue(val, serverTableSchema[serverNameFor(col, schema)])), ", ")}) ON CONFLICT (${sql.join(primaryKeyColumns.map(([, serverName]) => sql.ident(serverName)), ", ")}) ${conflictAction}`);
 			await this[dbTxSymbol].query(stmt.text, stmt.values);
 		},
 		async update(value) {
 			value = removeUndefined(value);
 			const serverTableSchema = this[serverSchemaSymbol][serverName(schema)];
-			const targetedColumns = origAndServerNamesFor(Object.keys(value), schema);
+			const targetedColumns = origAndServerNamesFor(nonPrimaryKeyEntries(value, schema).map(([name]) => name), schema);
+			if (targetedColumns.length === 0) return;
 			const stmt = formatPgInternalConvert(sql`UPDATE ${sql.ident(serverName(schema))} SET ${sql.join(targetedColumns.map(([origName, serverName]) => sql`${sql.ident(serverName)} = ${sqlInsertValue(value[origName], serverTableSchema[serverName])}`), ", ")} WHERE ${primaryKeyClause(schema, serverTableSchema, value)}`);
 			await this[dbTxSymbol].query(stmt.text, stmt.values);
 		},
@@ -188,6 +192,9 @@ function makeServerTableCRUD(schema) {
 		}
 	};
 }
+function nonPrimaryKeyEntries(value, schema) {
+	return Object.entries(value).filter(([name]) => !schema.primaryKey.includes(name));
+}
 function serverName(x) {
 	return x.serverName ?? x.name;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"custom.js","names":["#dbTransaction","#schema","#serverSchema","#tableCRUDs","#getOrFetchServerSchema"],"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<\n  TSchema extends Schema,\n  TWrappedTransaction,\n> implements ServerTransaction<TSchema, TWrappedTransaction> {\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)} = ${sqlValue(row[origName], serverTableSchema[serverName])}`,\n    ),\n    ' AND ',\n  )}`;\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"],"mappings":"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"}
+{"version":3,"file":"custom.js","names":["#dbTransaction","#schema","#serverSchema","#tableCRUDs","#getOrFetchServerSchema"],"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<\n  TSchema extends Schema,\n  TWrappedTransaction,\n> implements ServerTransaction<TSchema, TWrappedTransaction> {\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 primaryKeyColumns = origAndServerNamesFor(\n        schema.primaryKey,\n        schema,\n      );\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, v]) =>\n            sqlInsertValue(v, serverTableSchema[serverNameFor(col, schema)]),\n          ),\n          ', ',\n        )}) ON CONFLICT (${sql.join(\n          primaryKeyColumns.map(([, serverName]) => sql.ident(serverName)),\n          ', ',\n        )}) DO NOTHING`,\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 updatedEntries = nonPrimaryKeyEntries(value, schema);\n      const conflictAction =\n        updatedEntries.length === 0\n          ? sql`DO NOTHING`\n          : sql`DO UPDATE SET ${sql.join(\n              updatedEntries.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      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        )}) ${conflictAction}`,\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(\n        nonPrimaryKeyEntries(value, schema).map(([name]) => name),\n        schema,\n      );\n      if (targetedColumns.length === 0) {\n        return;\n      }\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 nonPrimaryKeyEntries(\n  value: Record<string, unknown>,\n  schema: TableSchema,\n) {\n  return Object.entries(value).filter(\n    ([name]) => !schema.primaryKey.includes(name),\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)} = ${sqlValue(row[origName], serverTableSchema[serverName])}`,\n    ),\n    ' AND ',\n  )}`;\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"],"mappings":"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"}

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

@@ -2,6 +2,14 @@ import type { Schema } from '../../zero-types/src/schema.ts';
 import type { ServerSchema } from '../../zero-types/src/server-schema.ts';
 import type { DBTransaction } from '../../zql/src/mutate/custom.ts';
 export declare function getServerSchema<S extends Schema>(dbTransaction: DBTransaction<unknown>, schema: S): Promise<ServerSchema>;
+/**
+ * The query behind {@linkcode getServerSchema}, exported so that it can be
+ * diffed against the `information_schema` query it replaced.
+ */
+export declare function serverSchemaQuery(schemaTablePairs: readonly (readonly [string, string])[]): {
+    text: string;
+    values: unknown[];
+};
 export type SchemaIncompatibilityError = {
     type: 'typeError';
     table: string;

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/schema.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AACxE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,gCAAgC,CAAC;AAkBlE,wBAAsB,eAAe,CAAC,CAAC,SAAS,MAAM,EACpD,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,EACrC,MAAM,EAAE,CAAC,GACR,OAAO,CAAC,YAAY,CAAC,CAgHvB;AAwCD,MAAM,MAAM,0BAA0B,GAClC;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,0BAA0B,EAAE,CAkD9B"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/schema.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AACxE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,gCAAgC,CAAC;AAkBlE,wBAAsB,eAAe,CAAC,CAAC,SAAS,MAAM,EACpD,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,EACrC,MAAM,EAAE,CAAC,GACR,OAAO,CAAC,YAAY,CAAC,CAgFvB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,gBAAgB,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,GACvD;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAC,CAiFnC;AAwCD,MAAM,MAAM,0BAA0B,GAClC;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,0BAA0B,EAAE,CAkD9B"}

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

@@ -13,30 +13,7 @@ async function getServerSchema(dbTransaction, schema) {
 		return schemaTablePair;
 	});
 	if (schemaTablePairs.length === 0) return {};
-	const { text, values } = formatPg(sql`
-      SELECT
-          c.table_schema::text AS schema,
-          c.table_name::text AS table,
-          c.column_name::text AS column,
-          c.data_type::text AS "dataType",
-          c.character_maximum_length AS length,
-          c.numeric_precision AS precision,
-          c.numeric_scale AS scale,
-          t.typtype::text AS typtype,
-          t.typname::text AS typename,
-          CASE WHEN t.typelem <> 0 THEN et.typtype::text ELSE NULL END AS "elemTyptype",
-          CASE WHEN t.typelem <> 0 THEN et.typname::text ELSE NULL END AS "elemTypname"
-      FROM
-          information_schema.columns c
-      JOIN
-          pg_catalog.pg_type t ON c.udt_name = t.typname
-      LEFT JOIN
-          pg_catalog.pg_type et ON t.typelem = et.oid
-      JOIN
-          pg_catalog.pg_namespace n ON t.typnamespace = n.oid
-      WHERE
-          (c.table_schema, c.table_name) IN (${sql.join(schemaTablePairs.map(([schema, table]) => sql`(${schema}::text, ${table}::text)`), ",")})
-    `);
+	const { text, values } = serverSchemaQuery(schemaTablePairs);
 	const results = await dbTransaction.query(text, values);
 	const serverSchema = {};
 	for (const row of results) {
@@ -64,6 +41,68 @@ async function getServerSchema(dbTransaction, schema) {
 	assert(errors.length === 0, () => makeSchemaIncompatibleErrorMessage(errors));
 	return serverSchema;
 }
+/**
+* The query behind {@linkcode getServerSchema}, exported so that it can be
+* diffed against the `information_schema` query it replaced.
+*/
+function serverSchemaQuery(schemaTablePairs) {
+	return formatPg(sql`
+      SELECT
+          n.nspname::text AS schema,
+          cl.relname::text AS table,
+          a.attname::text AS column,
+          CASE
+              WHEN ut.typelem <> 0 AND ut.typlen = -1 THEN 'ARRAY'
+              WHEN nut.nspname = 'pg_catalog' THEN pg_catalog.format_type(ut.oid, NULL)
+              ELSE 'USER-DEFINED'
+          END::text AS "dataType",
+          CASE
+              WHEN tm.typmod = -1 THEN NULL
+              WHEN ut.oid IN ('pg_catalog.bpchar'::regtype, 'pg_catalog.varchar'::regtype) THEN tm.typmod - 4
+              WHEN ut.oid IN ('pg_catalog.bit'::regtype, 'pg_catalog.varbit'::regtype) THEN tm.typmod
+          END AS length,
+          CASE ut.oid
+              WHEN 'pg_catalog.int2'::regtype THEN 16
+              WHEN 'pg_catalog.int4'::regtype THEN 32
+              WHEN 'pg_catalog.int8'::regtype THEN 64
+              WHEN 'pg_catalog.float4'::regtype THEN 24
+              WHEN 'pg_catalog.float8'::regtype THEN 53
+              WHEN 'pg_catalog.numeric'::regtype THEN CASE WHEN tm.typmod = -1 THEN NULL ELSE ((tm.typmod - 4) >> 16) & 65535 END
+          END AS precision,
+          CASE
+              WHEN ut.oid IN ('pg_catalog.int2'::regtype, 'pg_catalog.int4'::regtype, 'pg_catalog.int8'::regtype) THEN 0
+              WHEN ut.oid = 'pg_catalog.numeric'::regtype AND tm.typmod <> -1 THEN (tm.typmod - 4) & 65535
+          END AS scale,
+          ut.typtype::text AS typtype,
+          ut.typname::text AS typename,
+          CASE WHEN ut.typelem <> 0 THEN et.typtype::text ELSE NULL END AS "elemTyptype",
+          CASE WHEN ut.typelem <> 0 THEN et.typname::text ELSE NULL END AS "elemTypname"
+      FROM
+          pg_catalog.pg_attribute a
+      JOIN
+          pg_catalog.pg_class cl ON cl.oid = a.attrelid
+      JOIN
+          pg_catalog.pg_namespace n ON n.oid = cl.relnamespace
+      JOIN
+          pg_catalog.pg_type t ON t.oid = a.atttypid
+      JOIN
+          pg_catalog.pg_type ut ON ut.oid = CASE WHEN t.typtype = 'd' THEN t.typbasetype ELSE t.oid END
+      JOIN
+          pg_catalog.pg_namespace nut ON nut.oid = ut.typnamespace
+      LEFT JOIN
+          pg_catalog.pg_type et ON et.oid = ut.typelem
+      CROSS JOIN LATERAL
+          (SELECT CASE WHEN t.typtype = 'd' THEN t.typtypmod ELSE a.atttypmod END AS typmod) tm
+      WHERE
+          a.attnum > 0
+          AND NOT a.attisdropped
+          AND cl.relkind IN ('r', 'v', 'f', 'p')
+          AND NOT pg_catalog.pg_is_other_temp_schema(n.oid)
+          AND (pg_catalog.pg_has_role(cl.relowner, 'USAGE')
+               OR pg_catalog.has_column_privilege(cl.oid, a.attnum, 'SELECT, INSERT, UPDATE, REFERENCES'))
+          AND (n.nspname, cl.relname) IN (${sql.join(schemaTablePairs.map(([schema, table]) => sql`(${schema}::text, ${table}::text)`), ",")})
+    `);
+}
 function makeSchemaIncompatibleErrorMessage(errors) {
 	if (errors.length === 0) return "No schema incompatibilities found.";
 	const messages = [];

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

@@ -1 +1 @@
-{"version":3,"file":"schema.js","names":[],"sources":["../../../../zero-server/src/schema.ts"],"sourcesContent":["import {assert} from '../../shared/src/asserts.ts';\nimport type {Enum} from '../../shared/src/enum.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport * as PostgresTypeClass from '../../zero-cache/src/db/postgres-type-class-enum.ts';\nimport {dataTypeToZqlValueType} from '../../zero-cache/src/types/pg-data-type.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../zero-types/src/server-schema.ts';\nimport type {DBTransaction} from '../../zql/src/mutate/custom.ts';\n\ntype PostgresTypeClass = Enum<typeof PostgresTypeClass>;\n\ntype ServerSchemaRow = {\n  schema: string;\n  table: string;\n  column: string;\n  dataType: string;\n  length: string | null;\n  precision: string | null;\n  scale: string | null;\n  typtype: PostgresTypeClass;\n  typename: string;\n  elemTyptype: PostgresTypeClass | null;\n  elemTypname: string | null;\n};\n\nexport async function getServerSchema<S extends Schema>(\n  dbTransaction: DBTransaction<unknown>,\n  schema: S,\n): Promise<ServerSchema> {\n  const schemaTablePairs: [string, string][] = Object.values(schema.tables).map(\n    ({name, serverName}) => {\n      let schemaTablePair: [string, string] = ['public', serverName ?? name];\n      if (serverName) {\n        const firstPeriod = serverName.indexOf('.');\n        if (firstPeriod > -1) {\n          schemaTablePair = [\n            serverName.substring(0, firstPeriod),\n            serverName.substring(firstPeriod + 1, serverName.length),\n          ];\n        }\n      }\n      return schemaTablePair;\n    },\n  );\n\n  if (schemaTablePairs.length === 0) {\n    return {}; // No pairs to query for\n  }\n\n  // Cast all inputs to text and all outputs to text to avoid\n  // any conversions customer's DBTransaction impl has on other types.\n  const inClause = sql.join(\n    schemaTablePairs.map(\n      ([schema, table]) => sql`(${schema}::text, ${table}::text)`,\n    ),\n    ',',\n  );\n  const query = sql`\n      SELECT\n          c.table_schema::text AS schema,\n          c.table_name::text AS table,\n          c.column_name::text AS column,\n          c.data_type::text AS \"dataType\",\n          c.character_maximum_length AS length,\n          c.numeric_precision AS precision,\n          c.numeric_scale AS scale,\n          t.typtype::text AS typtype,\n          t.typname::text AS typename,\n          CASE WHEN t.typelem <> 0 THEN et.typtype::text ELSE NULL END AS \"elemTyptype\",\n          CASE WHEN t.typelem <> 0 THEN et.typname::text ELSE NULL END AS \"elemTypname\"\n      FROM\n          information_schema.columns c\n      JOIN\n          pg_catalog.pg_type t ON c.udt_name = t.typname\n      LEFT JOIN\n          pg_catalog.pg_type et ON t.typelem = et.oid\n      JOIN\n          pg_catalog.pg_namespace n ON t.typnamespace = n.oid\n      WHERE\n          (c.table_schema, c.table_name) IN (${inClause})\n    `;\n  const {text, values} = formatPg(query);\n  const results: Iterable<ServerSchemaRow> = (await dbTransaction.query(\n    text,\n    values,\n  )) as Iterable<ServerSchemaRow>;\n\n  const serverSchema: ServerSchema = {};\n\n  for (const row of results) {\n    const tableName =\n      row.schema === 'public' ? row.table : `${row.schema}.${row.table}`;\n    let tableSchema = serverSchema[tableName];\n    if (!tableSchema) {\n      tableSchema = {};\n      serverSchema[tableName] = tableSchema;\n    }\n    const isArray = row.elemTyptype !== null;\n    const isEnum = (row.elemTyptype ?? row.typtype) === PostgresTypeClass.Enum;\n    let type = row.dataType.toLowerCase();\n    if (isArray) {\n      type = must(\n        row.elemTypname,\n        `Array column \"${row.column}\" in table \"${tableName}\" is missing element type name`,\n      );\n    } else if (isEnum) {\n      type = row.typename;\n    } else if (\n      type === 'user-defined' &&\n      dataTypeToZqlValueType(row.typename, false, false) !== undefined\n    ) {\n      type = row.typename;\n    }\n    if (\n      (type === 'bpchar' ||\n        type === 'character' ||\n        type === 'character varying' ||\n        type === 'varchar') &&\n      row.length\n    ) {\n      type = `${type}(${row.length})`;\n    }\n    if (\n      (type === 'numeric' || type === 'decimal') &&\n      row.precision !== null &&\n      row.scale !== null\n    ) {\n      type = `${type}(${row.precision}, ${row.scale})`;\n    }\n    tableSchema[row.column] = {\n      type,\n      isEnum,\n      isArray,\n    };\n  }\n\n  const errors = checkSchemasAreCompatible(schema, serverSchema);\n  assert(errors.length === 0, () => makeSchemaIncompatibleErrorMessage(errors));\n\n  return serverSchema;\n}\n\nfunction makeSchemaIncompatibleErrorMessage(\n  errors: SchemaIncompatibilityError[],\n) {\n  if (errors.length === 0) {\n    return 'No schema incompatibilities found.';\n  }\n\n  const messages: string[] = [];\n\n  for (const error of errors) {\n    switch (error.type) {\n      case 'missingTable':\n        messages.push(\n          `Table \"${error.table}\" is defined in your zero schema but does not exist in the database.`,\n        );\n        break;\n      case 'missingColumn':\n        messages.push(\n          `Column \"${error.column}\" in table \"${error.table}\" is defined in your zero schema but does not exist in the database.`,\n        );\n        break;\n      case 'typeError':\n        messages.push(\n          `Type mismatch for column \"${error.column}\" in table \"${error.table}\": ${error.requiredType === undefined ? `${error.pgType} is currently unsupported in Zero. Please file a bug at https://bugs.rocicorp.dev/` : `${error.pgType} should be mapped to ${error.requiredType} in Zero not ${error.declaredType}.`}`,\n        );\n        break;\n    }\n  }\n\n  return [\n    'Schema incompatibility detected between your zero schema definition and the database:',\n    '',\n    ...messages.map(msg => `  - ${msg}`),\n    '',\n    'Please update your schema definition to match the database or migrate your database to match the schema.',\n  ].join('\\n');\n}\n\nexport type SchemaIncompatibilityError =\n  | {\n      type: 'typeError';\n      table: string;\n      column: string;\n      pgType: string;\n      declaredType: string;\n      requiredType: string | undefined;\n    }\n  | {\n      type: 'missingColumn';\n      table: string;\n      column: string;\n    }\n  | {\n      type: 'missingTable';\n      table: string;\n    };\n\nexport function checkSchemasAreCompatible(\n  schema: Schema,\n  serverSchema: ServerSchema,\n): SchemaIncompatibilityError[] {\n  const errors: SchemaIncompatibilityError[] = [];\n  // Check that all tables in schema exist in serverSchema\n  for (const table of Object.values(schema.tables)) {\n    const serverTableName = table.serverName ?? table.name;\n\n    if (!serverSchema[serverTableName]) {\n      errors.push({\n        type: 'missingTable',\n        table: serverTableName,\n      });\n      continue;\n    }\n\n    // Check that all columns in the table exist in serverSchema\n    for (const [columnName, column] of Object.entries(table.columns)) {\n      const serverColumnName = column.serverName ?? columnName;\n\n      if (!serverSchema[serverTableName][serverColumnName]) {\n        errors.push({\n          type: 'missingColumn',\n          table: serverTableName,\n          column: serverColumnName,\n        });\n        continue;\n      }\n\n      // Check type compatibility\n      const serverColumn = serverSchema[serverTableName][serverColumnName];\n      const declaredType = column.type;\n      const pgType = serverColumn.type;\n      const requiredType = dataTypeToZqlValueType(\n        pgType,\n        serverColumn.isEnum,\n        serverColumn.isArray,\n      );\n      if (requiredType !== declaredType) {\n        errors.push({\n          type: 'typeError',\n          table: serverTableName,\n          column: serverColumnName,\n          pgType,\n          declaredType,\n          requiredType,\n        });\n      }\n    }\n  }\n\n  return errors;\n}\n"],"mappings":"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"}
+{"version":3,"file":"schema.js","names":[],"sources":["../../../../zero-server/src/schema.ts"],"sourcesContent":["import {assert} from '../../shared/src/asserts.ts';\nimport type {Enum} from '../../shared/src/enum.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport * as PostgresTypeClass from '../../zero-cache/src/db/postgres-type-class-enum.ts';\nimport {dataTypeToZqlValueType} from '../../zero-cache/src/types/pg-data-type.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../zero-types/src/server-schema.ts';\nimport type {DBTransaction} from '../../zql/src/mutate/custom.ts';\n\ntype PostgresTypeClass = Enum<typeof PostgresTypeClass>;\n\ntype ServerSchemaRow = {\n  schema: string;\n  table: string;\n  column: string;\n  dataType: string;\n  length: string | null;\n  precision: string | null;\n  scale: string | null;\n  typtype: PostgresTypeClass;\n  typename: string;\n  elemTyptype: PostgresTypeClass | null;\n  elemTypname: string | null;\n};\n\nexport async function getServerSchema<S extends Schema>(\n  dbTransaction: DBTransaction<unknown>,\n  schema: S,\n): Promise<ServerSchema> {\n  const schemaTablePairs: [string, string][] = Object.values(schema.tables).map(\n    ({name, serverName}) => {\n      let schemaTablePair: [string, string] = ['public', serverName ?? name];\n      if (serverName) {\n        const firstPeriod = serverName.indexOf('.');\n        if (firstPeriod > -1) {\n          schemaTablePair = [\n            serverName.substring(0, firstPeriod),\n            serverName.substring(firstPeriod + 1, serverName.length),\n          ];\n        }\n      }\n      return schemaTablePair;\n    },\n  );\n\n  if (schemaTablePairs.length === 0) {\n    return {}; // No pairs to query for\n  }\n\n  const {text, values} = serverSchemaQuery(schemaTablePairs);\n  const results: Iterable<ServerSchemaRow> = (await dbTransaction.query(\n    text,\n    values,\n  )) as Iterable<ServerSchemaRow>;\n\n  const serverSchema: ServerSchema = {};\n\n  for (const row of results) {\n    const tableName =\n      row.schema === 'public' ? row.table : `${row.schema}.${row.table}`;\n    let tableSchema = serverSchema[tableName];\n    if (!tableSchema) {\n      tableSchema = {};\n      serverSchema[tableName] = tableSchema;\n    }\n    const isArray = row.elemTyptype !== null;\n    const isEnum = (row.elemTyptype ?? row.typtype) === PostgresTypeClass.Enum;\n    let type = row.dataType.toLowerCase();\n    if (isArray) {\n      type = must(\n        row.elemTypname,\n        `Array column \"${row.column}\" in table \"${tableName}\" is missing element type name`,\n      );\n    } else if (isEnum) {\n      type = row.typename;\n    } else if (\n      type === 'user-defined' &&\n      dataTypeToZqlValueType(row.typename, false, false) !== undefined\n    ) {\n      type = row.typename;\n    }\n    if (\n      (type === 'bpchar' ||\n        type === 'character' ||\n        type === 'character varying' ||\n        type === 'varchar') &&\n      row.length\n    ) {\n      type = `${type}(${row.length})`;\n    }\n    if (\n      (type === 'numeric' || type === 'decimal') &&\n      row.precision !== null &&\n      row.scale !== null\n    ) {\n      type = `${type}(${row.precision}, ${row.scale})`;\n    }\n    tableSchema[row.column] = {\n      type,\n      isEnum,\n      isArray,\n    };\n  }\n\n  const errors = checkSchemasAreCompatible(schema, serverSchema);\n  assert(errors.length === 0, () => makeSchemaIncompatibleErrorMessage(errors));\n\n  return serverSchema;\n}\n\n/**\n * The query behind {@linkcode getServerSchema}, exported so that it can be\n * diffed against the `information_schema` query it replaced.\n */\nexport function serverSchemaQuery(\n  schemaTablePairs: readonly (readonly [string, string])[],\n): {text: string; values: unknown[]} {\n  // Cast all inputs to text and all outputs to text to avoid\n  // any conversions customer's DBTransaction impl has on other types.\n  const inClause = sql.join(\n    schemaTablePairs.map(\n      ([schema, table]) => sql`(${schema}::text, ${table}::text)`,\n    ),\n    ',',\n  );\n  // Read pg_catalog directly instead of information_schema.columns. The view\n  // derives every column it returns through the information_schema._pg_*\n  // functions and a per column privilege check, which is several times slower\n  // than the query below. Server processes run this on the first transaction\n  // they serve, so serverless deployments pay for it on every cold start.\n  //\n  // The expressions below reproduce the parts of the view's definition that we\n  // select, down to the int4 wire types of length, precision and scale: the\n  // _pg_char_max_length / _pg_numeric_precision / _pg_numeric_scale arithmetic,\n  // the single level domain unwrap that data_type and udt_name perform (`ut`),\n  // and the view's own relkind, attnum and privilege filters. pg_type is joined\n  // by OID rather than by udt_name, which additionally avoids duplicate rows\n  // when two schemas declare a type with the same name. The types those\n  // functions special case are named through regtype, which the parser resolves\n  // while planning.\n  const query = sql`\n      SELECT\n          n.nspname::text AS schema,\n          cl.relname::text AS table,\n          a.attname::text AS column,\n          CASE\n              WHEN ut.typelem <> 0 AND ut.typlen = -1 THEN 'ARRAY'\n              WHEN nut.nspname = 'pg_catalog' THEN pg_catalog.format_type(ut.oid, NULL)\n              ELSE 'USER-DEFINED'\n          END::text AS \"dataType\",\n          CASE\n              WHEN tm.typmod = -1 THEN NULL\n              WHEN ut.oid IN ('pg_catalog.bpchar'::regtype, 'pg_catalog.varchar'::regtype) THEN tm.typmod - 4\n              WHEN ut.oid IN ('pg_catalog.bit'::regtype, 'pg_catalog.varbit'::regtype) THEN tm.typmod\n          END AS length,\n          CASE ut.oid\n              WHEN 'pg_catalog.int2'::regtype THEN 16\n              WHEN 'pg_catalog.int4'::regtype THEN 32\n              WHEN 'pg_catalog.int8'::regtype THEN 64\n              WHEN 'pg_catalog.float4'::regtype THEN 24\n              WHEN 'pg_catalog.float8'::regtype THEN 53\n              WHEN 'pg_catalog.numeric'::regtype THEN CASE WHEN tm.typmod = -1 THEN NULL ELSE ((tm.typmod - 4) >> 16) & 65535 END\n          END AS precision,\n          CASE\n              WHEN ut.oid IN ('pg_catalog.int2'::regtype, 'pg_catalog.int4'::regtype, 'pg_catalog.int8'::regtype) THEN 0\n              WHEN ut.oid = 'pg_catalog.numeric'::regtype AND tm.typmod <> -1 THEN (tm.typmod - 4) & 65535\n          END AS scale,\n          ut.typtype::text AS typtype,\n          ut.typname::text AS typename,\n          CASE WHEN ut.typelem <> 0 THEN et.typtype::text ELSE NULL END AS \"elemTyptype\",\n          CASE WHEN ut.typelem <> 0 THEN et.typname::text ELSE NULL END AS \"elemTypname\"\n      FROM\n          pg_catalog.pg_attribute a\n      JOIN\n          pg_catalog.pg_class cl ON cl.oid = a.attrelid\n      JOIN\n          pg_catalog.pg_namespace n ON n.oid = cl.relnamespace\n      JOIN\n          pg_catalog.pg_type t ON t.oid = a.atttypid\n      JOIN\n          pg_catalog.pg_type ut ON ut.oid = CASE WHEN t.typtype = 'd' THEN t.typbasetype ELSE t.oid END\n      JOIN\n          pg_catalog.pg_namespace nut ON nut.oid = ut.typnamespace\n      LEFT JOIN\n          pg_catalog.pg_type et ON et.oid = ut.typelem\n      CROSS JOIN LATERAL\n          (SELECT CASE WHEN t.typtype = 'd' THEN t.typtypmod ELSE a.atttypmod END AS typmod) tm\n      WHERE\n          a.attnum > 0\n          AND NOT a.attisdropped\n          AND cl.relkind IN ('r', 'v', 'f', 'p')\n          AND NOT pg_catalog.pg_is_other_temp_schema(n.oid)\n          AND (pg_catalog.pg_has_role(cl.relowner, 'USAGE')\n               OR pg_catalog.has_column_privilege(cl.oid, a.attnum, 'SELECT, INSERT, UPDATE, REFERENCES'))\n          AND (n.nspname, cl.relname) IN (${inClause})\n    `;\n  return formatPg(query);\n}\n\nfunction makeSchemaIncompatibleErrorMessage(\n  errors: SchemaIncompatibilityError[],\n) {\n  if (errors.length === 0) {\n    return 'No schema incompatibilities found.';\n  }\n\n  const messages: string[] = [];\n\n  for (const error of errors) {\n    switch (error.type) {\n      case 'missingTable':\n        messages.push(\n          `Table \"${error.table}\" is defined in your zero schema but does not exist in the database.`,\n        );\n        break;\n      case 'missingColumn':\n        messages.push(\n          `Column \"${error.column}\" in table \"${error.table}\" is defined in your zero schema but does not exist in the database.`,\n        );\n        break;\n      case 'typeError':\n        messages.push(\n          `Type mismatch for column \"${error.column}\" in table \"${error.table}\": ${error.requiredType === undefined ? `${error.pgType} is currently unsupported in Zero. Please file a bug at https://bugs.rocicorp.dev/` : `${error.pgType} should be mapped to ${error.requiredType} in Zero not ${error.declaredType}.`}`,\n        );\n        break;\n    }\n  }\n\n  return [\n    'Schema incompatibility detected between your zero schema definition and the database:',\n    '',\n    ...messages.map(msg => `  - ${msg}`),\n    '',\n    'Please update your schema definition to match the database or migrate your database to match the schema.',\n  ].join('\\n');\n}\n\nexport type SchemaIncompatibilityError =\n  | {\n      type: 'typeError';\n      table: string;\n      column: string;\n      pgType: string;\n      declaredType: string;\n      requiredType: string | undefined;\n    }\n  | {\n      type: 'missingColumn';\n      table: string;\n      column: string;\n    }\n  | {\n      type: 'missingTable';\n      table: string;\n    };\n\nexport function checkSchemasAreCompatible(\n  schema: Schema,\n  serverSchema: ServerSchema,\n): SchemaIncompatibilityError[] {\n  const errors: SchemaIncompatibilityError[] = [];\n  // Check that all tables in schema exist in serverSchema\n  for (const table of Object.values(schema.tables)) {\n    const serverTableName = table.serverName ?? table.name;\n\n    if (!serverSchema[serverTableName]) {\n      errors.push({\n        type: 'missingTable',\n        table: serverTableName,\n      });\n      continue;\n    }\n\n    // Check that all columns in the table exist in serverSchema\n    for (const [columnName, column] of Object.entries(table.columns)) {\n      const serverColumnName = column.serverName ?? columnName;\n\n      if (!serverSchema[serverTableName][serverColumnName]) {\n        errors.push({\n          type: 'missingColumn',\n          table: serverTableName,\n          column: serverColumnName,\n        });\n        continue;\n      }\n\n      // Check type compatibility\n      const serverColumn = serverSchema[serverTableName][serverColumnName];\n      const declaredType = column.type;\n      const pgType = serverColumn.type;\n      const requiredType = dataTypeToZqlValueType(\n        pgType,\n        serverColumn.isEnum,\n        serverColumn.isArray,\n      );\n      if (requiredType !== declaredType) {\n        errors.push({\n          type: 'typeError',\n          table: serverTableName,\n          column: serverColumnName,\n          pgType,\n          declaredType,\n          requiredType,\n        });\n      }\n    }\n  }\n\n  return errors;\n}\n"],"mappings":"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"}

package/out/zero-types/src/schema.d.ts

@@ -9,6 +9,17 @@ export type TableSchema = {
     readonly serverName?: string | undefined;
     readonly columns: Record<string, SchemaValue>;
     readonly primaryKey: PrimaryKey;
+    /**
+     * Additional unique keys on the table, beyond the primary key — one entry
+     * per unique index, each listing every column the index covers.
+     *
+     * This is metadata for the type checker, not a constraint Zero creates or
+     * enforces: it mirrors unique indexes that already exist upstream. The
+     * server reads the real indexes off the replica, so declaring these only
+     * affects what the client-side types can prove — notably whether a
+     * `{scalar: true}` subquery is provably limited to one row.
+     */
+    readonly uniqueKeys?: readonly PrimaryKey[] | undefined;
 };
 export type RelationshipsSchema = {
     readonly [name: string]: Relationship;

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../zero-types/src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAEnD;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC9C,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,MAAM,CAAC;AAEzC,KAAK,UAAU,GAAG;IAChB,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,YAAY,GACpB,SAAS,CAAC,UAAU,CAAC,GACrB,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AAEtC,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,YAAY,IAAI,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,CAAC,GAC1E,CAAC,GACD,CAAC,SAAS,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,GACnC,CAAC,GACD,CAAC,SAAS,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,GAC5C,CAAC,GACD,KAAK,CAAC;AAEd;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,MAAM,EAAE;QAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW,CAAA;KAAC,CAAC;IACzD,QAAQ,CAAC,aAAa,EAAE;QAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAC,CAAC;IACxE;;;;;;OAMG;IACH,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACnD;;;;;;OAMG;IACH,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACrD,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../zero-types/src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAEnD;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC9C,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC;;;;;;;;;OASG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,UAAU,EAAE,GAAG,SAAS,CAAC;CACzD,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,MAAM,CAAC;AAEzC,KAAK,UAAU,GAAG;IAChB,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,YAAY,GACpB,SAAS,CAAC,UAAU,CAAC,GACrB,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AAEtC,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,YAAY,IAAI,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,CAAC,GAC1E,CAAC,GACD,CAAC,SAAS,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,GACnC,CAAC,GACD,CAAC,SAAS,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,GAC5C,CAAC,GACD,KAAK,CAAC;AAEd;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,MAAM,EAAE;QAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW,CAAA;KAAC,CAAC;IACzD,QAAQ,CAAC,aAAa,EAAE;QAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAC,CAAC;IACxE;;;;;;OAMG;IACH,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACnD;;;;;;OAMG;IACH,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACrD,CAAC"}

package/out/zql/src/mutate/crud.d.ts

@@ -8,10 +8,11 @@ export type SchemaCRUD<S extends Schema> = {
 export type TransactionMutate<S extends Schema> = SchemaCRUD<S>;
 export type TableCRUD<S extends TableSchema> = {
     /**
-     * Writes a row if a row with the same primary key doesn't already exist.
-     * Non-primary-key fields that are 'optional' can be omitted or set to
-     * `undefined`. Such fields will be assigned the value `null` optimistically
-     * and then the default value as defined by the server.
+     * Writes a row. If a row with the same primary key already exists this is a
+     * no-op; the existing row is left unchanged. A collision on any other unique
+     * constraint still throws. Non-primary-key fields that are 'optional' can be
+     * omitted or set to `undefined`. Such fields will be assigned the value
+     * `null` optimistically and then the default value as defined by the server.
      */
     insert: (value: InsertValue<S>) => Promise<void>;
     /**
@@ -57,10 +58,11 @@ export type UpdateValue<S extends TableSchema> = Expand<PrimaryKeyFields<S> & {
  */
 export type TableMutator<TS extends TableSchema> = {
     /**
-     * Writes a row if a row with the same primary key doesn't already exist.
-     * Non-primary-key fields that are 'optional' can be omitted or set to
-     * `undefined`. Such fields will be assigned the value `null` optimistically
-     * and then the default value as defined by the server.
+     * Writes a row. If a row with the same primary key already exists this is a
+     * no-op; the existing row is left unchanged. A collision on any other unique
+     * constraint still throws. Non-primary-key fields that are 'optional' can be
+     * omitted or set to `undefined`. Such fields will be assigned the value
+     * `null` optimistically and then the default value as defined by the server.
      */
     insert: (value: InsertValue<TS>) => Promise<void>;
     /**

package/out/zql/src/mutate/crud.d.ts.map

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

package/out/zql/src/mutate/crud.js.map

@@ -1 +1 @@
-{"version":3,"file":"crud.js","names":[],"sources":["../../../../../zql/src/mutate/crud.ts"],"sourcesContent":["import type {Expand} from '../../../shared/src/expand.ts';\nimport {assignProperty, mapValues} from '../../../shared/src/objects.ts';\nimport {recordProxy} from '../../../shared/src/record-proxy.ts';\nimport type {SchemaValueToTSType} from '../../../zero-types/src/schema-value.ts';\nimport type {Schema, TableSchema} from '../../../zero-types/src/schema.ts';\nimport type {MutateCRUD} from './custom.ts';\n\nexport type SchemaCRUD<S extends Schema> = {\n  [Table in keyof S['tables']]: TableCRUD<S['tables'][Table]>;\n};\n\nexport type TransactionMutate<S extends Schema> = SchemaCRUD<S>;\n\nexport type TableCRUD<S extends TableSchema> = {\n  /**\n   * Writes a row if a row with the same primary key doesn't already exist.\n   * Non-primary-key fields that are 'optional' can be omitted or set to\n   * `undefined`. Such fields will be assigned the value `null` optimistically\n   * and then the default value as defined by the server.\n   */\n  insert: (value: InsertValue<S>) => Promise<void>;\n\n  /**\n   * Writes a row unconditionally, overwriting any existing row with the same\n   * primary key. Non-primary-key fields that are 'optional' can be omitted or\n   * set to `undefined`. Such fields will be assigned the value `null`\n   * optimistically and then the default value as defined by the server.\n   */\n  upsert: (value: UpsertValue<S>) => Promise<void>;\n\n  /**\n   * Updates a row with the same primary key. If no such row exists, this\n   * function does nothing. All non-primary-key fields can be omitted or set to\n   * `undefined`. Such fields will be left unchanged from previous value.\n   */\n  update: (value: UpdateValue<S>) => Promise<void>;\n\n  /**\n   * Deletes the row with the specified primary key. If no such row exists, this\n   * function does nothing.\n   */\n  delete: (id: DeleteID<S>) => Promise<void>;\n};\n\nexport type CRUDKind = keyof TableCRUD<TableSchema>;\n\nexport const CRUD_KINDS = ['insert', 'upsert', 'update', 'delete'] as const;\n\nexport type DeleteID<S extends TableSchema> = Expand<PrimaryKeyFields<S>>;\n\ntype PrimaryKeyFields<S extends TableSchema> = {\n  [K in Extract<\n    S['primaryKey'][number],\n    keyof S['columns']\n  >]: SchemaValueToTSType<S['columns'][K]>;\n};\n\nexport type InsertValue<S extends TableSchema> = Expand<\n  PrimaryKeyFields<S> & {\n    [K in keyof S['columns'] as S['columns'][K] extends {optional: true}\n      ? K\n      : never]?: SchemaValueToTSType<S['columns'][K]> | undefined;\n  } & {\n    [K in keyof S['columns'] as S['columns'][K] extends {optional: true}\n      ? never\n      : K]: SchemaValueToTSType<S['columns'][K]>;\n  }\n>;\n\nexport type UpsertValue<S extends TableSchema> = InsertValue<S>;\n\nexport type UpdateValue<S extends TableSchema> = Expand<\n  PrimaryKeyFields<S> & {\n    [K in keyof S['columns']]?:\n      | SchemaValueToTSType<S['columns'][K]>\n      | undefined;\n  }\n>;\n\n/**\n * This is the type of the generated mutate.<name>.<verb> function.\n */\nexport type TableMutator<TS extends TableSchema> = {\n  /**\n   * Writes a row if a row with the same primary key doesn't already exist.\n   * Non-primary-key fields that are 'optional' can be omitted or set to\n   * `undefined`. Such fields will be assigned the value `null` optimistically\n   * and then the default value as defined by the server.\n   */\n  insert: (value: InsertValue<TS>) => Promise<void>;\n\n  /**\n   * Writes a row unconditionally, overwriting any existing row with the same\n   * primary key. Non-primary-key fields that are 'optional' can be omitted or\n   * set to `undefined`. Such fields will be assigned the value `null`\n   * optimistically and then the default value as defined by the server.\n   */\n  upsert: (value: UpsertValue<TS>) => Promise<void>;\n\n  /**\n   * Updates a row with the same primary key. If no such row exists, this\n   * function does nothing. All non-primary-key fields can be omitted or set to\n   * `undefined`. Such fields will be left unchanged from previous value.\n   */\n  update: (value: UpdateValue<TS>) => Promise<void>;\n\n  /**\n   * Deletes the row with the specified primary key. If no such row exists, this\n   * function does nothing.\n   */\n  delete: (id: DeleteID<TS>) => Promise<void>;\n};\n\n/**\n * A function that executes a CRUD operation.\n * Client and server provide different implementations.\n */\nexport type CRUDExecutor = (\n  table: string,\n  kind: CRUDKind,\n  args: unknown,\n) => Promise<void>;\n\n/**\n * Creates a MutateCRUD function from a schema and executor.\n * This is the shared implementation used by both client and server.\n *\n * @param schema - The Zero schema\n * @param executor - A function that executes CRUD operations\n * @returns A MutateCRUD function that can be called with CRUDMutateRequest objects\n */\nexport function makeCRUDMutate<\n  TSchema extends Schema,\n  TAddSchemaCRUD extends boolean,\n>(\n  schema: TSchema,\n  addSchemaCRUD: TAddSchemaCRUD,\n  executor: CRUDExecutor,\n): MutateCRUD<TSchema, TAddSchemaCRUD> {\n  // Create a callable function that accepts CRUDMutateRequest\n  const mutate = (request: AnyCRUDMutateRequest) => {\n    const {table, kind, args} = request;\n    return executor(table, kind, args);\n  };\n\n  // Only add table properties when enableLegacyMutators is true\n  if (addSchemaCRUD) {\n    // Add table names as keys so the proxy can discover them\n    for (const tableName of Object.keys(schema.tables)) {\n      assignProperty(\n        mutate as unknown as Record<string, undefined>,\n        tableName,\n        undefined,\n      );\n    }\n\n    // Wrap in proxy that lazily creates and caches table CRUD objects\n    return recordProxy(\n      mutate as unknown as Record<string, undefined>,\n      (_value, tableName) => makeTableCRUD(tableName, executor),\n    ) as unknown as MutateCRUD<TSchema, TAddSchemaCRUD>;\n  }\n\n  return mutate as MutateCRUD<TSchema, TAddSchemaCRUD>;\n}\n\nexport function makeTransactionMutate<TSchema extends Schema>(\n  schema: TSchema,\n  executor: CRUDExecutor,\n): TransactionMutate<TSchema> {\n  const target = mapValues(schema.tables, () => undefined);\n\n  return recordProxy(target, (_value, tableName) =>\n    makeTableCRUD(tableName, executor),\n  ) as SchemaCRUD<TSchema>;\n}\n\n/**\n * Creates a TableCRUD object that delegates to the executor.\n */\nfunction makeTableCRUD(\n  tableName: string,\n  executor: CRUDExecutor,\n): TableCRUD<TableSchema> {\n  return Object.fromEntries(\n    CRUD_KINDS.map(kind => [\n      kind,\n      (value: unknown) => executor(tableName, kind, value),\n    ]),\n  ) as TableCRUD<TableSchema>;\n}\n\nexport type CRUDMutator<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TKind extends keyof TableMutator<TSchema['tables'][TTable]>,\n  TArgs extends Parameters<TableMutator<TSchema['tables'][TTable]>[TKind]>[0],\n> = {\n  (args: TArgs): CRUDMutateRequest<TSchema, TTable, TKind, TArgs>;\n\n  /**\n   * Type-only phantom property to surface mutator types in a covariant position.\n   */\n  ['~']: Expand<CRUDMutatorTypes<TSchema, TTable, TKind, TArgs>>;\n};\n\nexport type CRUDMutatorTypes<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TKind extends keyof TableMutator<TSchema['tables'][TTable]>,\n  TArgs extends Parameters<TableMutator<TSchema['tables'][TTable]>[TKind]>[0],\n> = 'CRUDMutator' & CRUDMutateRequest<TSchema, TTable, TKind, TArgs>;\n\nexport type CRUDMutateRequest<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'],\n  TKind extends keyof TableMutator<TSchema['tables'][TTable]>,\n  TArgs extends Parameters<TableMutator<TSchema['tables'][TTable]>[TKind]>[0],\n> = {\n  readonly schema: TSchema;\n  readonly table: TTable;\n  readonly kind: TKind;\n  readonly args: TArgs;\n};\n\n// oxlint-disable-next-line no-explicit-any\nexport type AnyCRUDMutateRequest = CRUDMutateRequest<any, any, CRUDKind, any>;\n"],"mappings":";;;AA8CA,IAAa,aAAa;CAAC;CAAU;CAAU;CAAU;AAAQ;;;;;;;;;AAqFjE,SAAgB,eAId,QACA,eACA,UACqC;CAErC,MAAM,UAAU,YAAkC;EAChD,MAAM,EAAC,OAAO,MAAM,SAAQ;EAC5B,OAAO,SAAS,OAAO,MAAM,IAAI;CACnC;CAGA,IAAI,eAAe;EAEjB,KAAK,MAAM,aAAa,OAAO,KAAK,OAAO,MAAM,GAC/C,eACE,QACA,WACA,KAAA,CACF;EAIF,OAAO,YACL,SACC,QAAQ,cAAc,cAAc,WAAW,QAAQ,CAC1D;CACF;CAEA,OAAO;AACT;AAEA,SAAgB,sBACd,QACA,UAC4B;CAG5B,OAAO,YAFQ,UAAU,OAAO,cAAc,KAAA,CAE3B,IAAS,QAAQ,cAClC,cAAc,WAAW,QAAQ,CACnC;AACF;;;;AAKA,SAAS,cACP,WACA,UACwB;CACxB,OAAO,OAAO,YACZ,WAAW,KAAI,SAAQ,CACrB,OACC,UAAmB,SAAS,WAAW,MAAM,KAAK,CACrD,CAAC,CACH;AACF"}
+{"version":3,"file":"crud.js","names":[],"sources":["../../../../../zql/src/mutate/crud.ts"],"sourcesContent":["import type {Expand} from '../../../shared/src/expand.ts';\nimport {assignProperty, mapValues} from '../../../shared/src/objects.ts';\nimport {recordProxy} from '../../../shared/src/record-proxy.ts';\nimport type {SchemaValueToTSType} from '../../../zero-types/src/schema-value.ts';\nimport type {Schema, TableSchema} from '../../../zero-types/src/schema.ts';\nimport type {MutateCRUD} from './custom.ts';\n\nexport type SchemaCRUD<S extends Schema> = {\n  [Table in keyof S['tables']]: TableCRUD<S['tables'][Table]>;\n};\n\nexport type TransactionMutate<S extends Schema> = SchemaCRUD<S>;\n\nexport type TableCRUD<S extends TableSchema> = {\n  /**\n   * Writes a row. If a row with the same primary key already exists this is a\n   * no-op; the existing row is left unchanged. A collision on any other unique\n   * constraint still throws. Non-primary-key fields that are 'optional' can be\n   * omitted or set to `undefined`. Such fields will be assigned the value\n   * `null` optimistically and then the default value as defined by the server.\n   */\n  insert: (value: InsertValue<S>) => Promise<void>;\n\n  /**\n   * Writes a row unconditionally, overwriting any existing row with the same\n   * primary key. Non-primary-key fields that are 'optional' can be omitted or\n   * set to `undefined`. Such fields will be assigned the value `null`\n   * optimistically and then the default value as defined by the server.\n   */\n  upsert: (value: UpsertValue<S>) => Promise<void>;\n\n  /**\n   * Updates a row with the same primary key. If no such row exists, this\n   * function does nothing. All non-primary-key fields can be omitted or set to\n   * `undefined`. Such fields will be left unchanged from previous value.\n   */\n  update: (value: UpdateValue<S>) => Promise<void>;\n\n  /**\n   * Deletes the row with the specified primary key. If no such row exists, this\n   * function does nothing.\n   */\n  delete: (id: DeleteID<S>) => Promise<void>;\n};\n\nexport type CRUDKind = keyof TableCRUD<TableSchema>;\n\nexport const CRUD_KINDS = ['insert', 'upsert', 'update', 'delete'] as const;\n\nexport type DeleteID<S extends TableSchema> = Expand<PrimaryKeyFields<S>>;\n\ntype PrimaryKeyFields<S extends TableSchema> = {\n  [K in Extract<\n    S['primaryKey'][number],\n    keyof S['columns']\n  >]: SchemaValueToTSType<S['columns'][K]>;\n};\n\nexport type InsertValue<S extends TableSchema> = Expand<\n  PrimaryKeyFields<S> & {\n    [K in keyof S['columns'] as S['columns'][K] extends {optional: true}\n      ? K\n      : never]?: SchemaValueToTSType<S['columns'][K]> | undefined;\n  } & {\n    [K in keyof S['columns'] as S['columns'][K] extends {optional: true}\n      ? never\n      : K]: SchemaValueToTSType<S['columns'][K]>;\n  }\n>;\n\nexport type UpsertValue<S extends TableSchema> = InsertValue<S>;\n\nexport type UpdateValue<S extends TableSchema> = Expand<\n  PrimaryKeyFields<S> & {\n    [K in keyof S['columns']]?:\n      | SchemaValueToTSType<S['columns'][K]>\n      | undefined;\n  }\n>;\n\n/**\n * This is the type of the generated mutate.<name>.<verb> function.\n */\nexport type TableMutator<TS extends TableSchema> = {\n  /**\n   * Writes a row. If a row with the same primary key already exists this is a\n   * no-op; the existing row is left unchanged. A collision on any other unique\n   * constraint still throws. Non-primary-key fields that are 'optional' can be\n   * omitted or set to `undefined`. Such fields will be assigned the value\n   * `null` optimistically and then the default value as defined by the server.\n   */\n  insert: (value: InsertValue<TS>) => Promise<void>;\n\n  /**\n   * Writes a row unconditionally, overwriting any existing row with the same\n   * primary key. Non-primary-key fields that are 'optional' can be omitted or\n   * set to `undefined`. Such fields will be assigned the value `null`\n   * optimistically and then the default value as defined by the server.\n   */\n  upsert: (value: UpsertValue<TS>) => Promise<void>;\n\n  /**\n   * Updates a row with the same primary key. If no such row exists, this\n   * function does nothing. All non-primary-key fields can be omitted or set to\n   * `undefined`. Such fields will be left unchanged from previous value.\n   */\n  update: (value: UpdateValue<TS>) => Promise<void>;\n\n  /**\n   * Deletes the row with the specified primary key. If no such row exists, this\n   * function does nothing.\n   */\n  delete: (id: DeleteID<TS>) => Promise<void>;\n};\n\n/**\n * A function that executes a CRUD operation.\n * Client and server provide different implementations.\n */\nexport type CRUDExecutor = (\n  table: string,\n  kind: CRUDKind,\n  args: unknown,\n) => Promise<void>;\n\n/**\n * Creates a MutateCRUD function from a schema and executor.\n * This is the shared implementation used by both client and server.\n *\n * @param schema - The Zero schema\n * @param executor - A function that executes CRUD operations\n * @returns A MutateCRUD function that can be called with CRUDMutateRequest objects\n */\nexport function makeCRUDMutate<\n  TSchema extends Schema,\n  TAddSchemaCRUD extends boolean,\n>(\n  schema: TSchema,\n  addSchemaCRUD: TAddSchemaCRUD,\n  executor: CRUDExecutor,\n): MutateCRUD<TSchema, TAddSchemaCRUD> {\n  // Create a callable function that accepts CRUDMutateRequest\n  const mutate = (request: AnyCRUDMutateRequest) => {\n    const {table, kind, args} = request;\n    return executor(table, kind, args);\n  };\n\n  // Only add table properties when enableLegacyMutators is true\n  if (addSchemaCRUD) {\n    // Add table names as keys so the proxy can discover them\n    for (const tableName of Object.keys(schema.tables)) {\n      assignProperty(\n        mutate as unknown as Record<string, undefined>,\n        tableName,\n        undefined,\n      );\n    }\n\n    // Wrap in proxy that lazily creates and caches table CRUD objects\n    return recordProxy(\n      mutate as unknown as Record<string, undefined>,\n      (_value, tableName) => makeTableCRUD(tableName, executor),\n    ) as unknown as MutateCRUD<TSchema, TAddSchemaCRUD>;\n  }\n\n  return mutate as MutateCRUD<TSchema, TAddSchemaCRUD>;\n}\n\nexport function makeTransactionMutate<TSchema extends Schema>(\n  schema: TSchema,\n  executor: CRUDExecutor,\n): TransactionMutate<TSchema> {\n  const target = mapValues(schema.tables, () => undefined);\n\n  return recordProxy(target, (_value, tableName) =>\n    makeTableCRUD(tableName, executor),\n  ) as SchemaCRUD<TSchema>;\n}\n\n/**\n * Creates a TableCRUD object that delegates to the executor.\n */\nfunction makeTableCRUD(\n  tableName: string,\n  executor: CRUDExecutor,\n): TableCRUD<TableSchema> {\n  return Object.fromEntries(\n    CRUD_KINDS.map(kind => [\n      kind,\n      (value: unknown) => executor(tableName, kind, value),\n    ]),\n  ) as TableCRUD<TableSchema>;\n}\n\nexport type CRUDMutator<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TKind extends keyof TableMutator<TSchema['tables'][TTable]>,\n  TArgs extends Parameters<TableMutator<TSchema['tables'][TTable]>[TKind]>[0],\n> = {\n  (args: TArgs): CRUDMutateRequest<TSchema, TTable, TKind, TArgs>;\n\n  /**\n   * Type-only phantom property to surface mutator types in a covariant position.\n   */\n  ['~']: Expand<CRUDMutatorTypes<TSchema, TTable, TKind, TArgs>>;\n};\n\nexport type CRUDMutatorTypes<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TKind extends keyof TableMutator<TSchema['tables'][TTable]>,\n  TArgs extends Parameters<TableMutator<TSchema['tables'][TTable]>[TKind]>[0],\n> = 'CRUDMutator' & CRUDMutateRequest<TSchema, TTable, TKind, TArgs>;\n\nexport type CRUDMutateRequest<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'],\n  TKind extends keyof TableMutator<TSchema['tables'][TTable]>,\n  TArgs extends Parameters<TableMutator<TSchema['tables'][TTable]>[TKind]>[0],\n> = {\n  readonly schema: TSchema;\n  readonly table: TTable;\n  readonly kind: TKind;\n  readonly args: TArgs;\n};\n\n// oxlint-disable-next-line no-explicit-any\nexport type AnyCRUDMutateRequest = CRUDMutateRequest<any, any, CRUDKind, any>;\n"],"mappings":";;;AA+CA,IAAa,aAAa;CAAC;CAAU;CAAU;CAAU;AAAQ;;;;;;;;;AAsFjE,SAAgB,eAId,QACA,eACA,UACqC;CAErC,MAAM,UAAU,YAAkC;EAChD,MAAM,EAAC,OAAO,MAAM,SAAQ;EAC5B,OAAO,SAAS,OAAO,MAAM,IAAI;CACnC;CAGA,IAAI,eAAe;EAEjB,KAAK,MAAM,aAAa,OAAO,KAAK,OAAO,MAAM,GAC/C,eACE,QACA,WACA,KAAA,CACF;EAIF,OAAO,YACL,SACC,QAAQ,cAAc,cAAc,WAAW,QAAQ,CAC1D;CACF;CAEA,OAAO;AACT;AAEA,SAAgB,sBACd,QACA,UAC4B;CAG5B,OAAO,YAFQ,UAAU,OAAO,cAAc,KAAA,CAE3B,IAAS,QAAQ,cAClC,cAAc,WAAW,QAAQ,CACnC;AACF;;;;AAKA,SAAS,cACP,WACA,UACwB;CACxB,OAAO,OAAO,YACZ,WAAW,KAAI,SAAQ,CACrB,OACC,UAAmB,SAAS,WAAW,MAAM,KAAK,CACrD,CAAC,CACH;AACF"}

package/out/zql/src/query/query-delegate-base.d.ts.map

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