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

package/out/zero-protocol/src/down.d.ts

@@ -11,7 +11,6 @@ export declare const downstreamSchema: v.UnionType<[v.TupleType<[v.Type<"connect
     }>;
     timestamp: v.Optional<number>;
 }, undefined>]>, v.TupleType<[v.Type<"pokePart">, v.ObjectType<{
-    pokeID: v.Type<string>;
     lastMutationIDChanges: v.Optional<Record<string, number>>;
     desiredQueriesPatches: v.Optional<Record<string, ({
         ttl?: number | undefined;
@@ -75,6 +74,7 @@ export declare const downstreamSchema: v.UnionType<[v.TupleType<[v.Type<"connect
             clientID: string;
         };
     })[]>;
+    pokeID: v.Type<string>;
 }, undefined>]>, v.TupleType<[v.Type<"pokeEnd">, v.ObjectType<{
     pokeID: v.Type<string>;
     cookie: v.Type<string>;

package/out/zero-protocol/src/poke.d.ts

@@ -11,12 +11,14 @@ import * as v from '../../shared/src/valita.ts';
  * A poke begins with a `poke-start` message which contains the `baseCookie`
  * the poke is updating from and the `cookie` the poke is updating to.
  *
- * The poke continues with zero to many `poke-part` messages, each of which
- * can contain patch parts.  These patch parts should be merged in the order
- * received.
+ * Through protocol version 51, the poke continues with zero to many
+ * `poke-part` JSON messages. Starting in version 52, it continues with zero to
+ * many binary `pokeChunk` messages. Each binary message starts with a message
+ * type byte. Concatenating and decoding the payload after that byte produces a
+ * PokePartBody array. pokeChunk boundaries have no semantic meaning.
  *
- * Finally, the poke ends with a `poke-end` message.  The merged `poke-parts`
- * can now be applied as a whole to update from `baseCookie` to `cookie`.
+ * Finally, the poke ends with a `poke-end` message. The decoded patches can
+ * now be applied as a whole to update from `baseCookie` to `cookie`.
  *
  * Poke messages can be intermingled with other `down` messages, but cannot be
  * intermingled with poke messages for a different `pokeID`. If this is
@@ -37,7 +39,6 @@ export declare const pokeStartBodySchema: v.ObjectType<{
     timestamp: v.Optional<number>;
 }, undefined>;
 export declare const pokePartBodySchema: v.ObjectType<{
-    pokeID: v.Type<string>;
     lastMutationIDChanges: v.Optional<Record<string, number>>;
     desiredQueriesPatches: v.Optional<Record<string, ({
         ttl?: number | undefined;
@@ -101,7 +102,79 @@ export declare const pokePartBodySchema: v.ObjectType<{
             clientID: string;
         };
     })[]>;
+    pokeID: v.Type<string>;
 }, undefined>;
+/**
+ * The logical payload carried by binary poke chunks. Chunk boundaries are
+ * arbitrary; concatenating and decoding all chunks for a poke produces this
+ * array.
+ */
+export declare const pokePartsSchema: v.ArrayType<v.ObjectType<{
+    lastMutationIDChanges: v.Optional<Record<string, number>>;
+    desiredQueriesPatches: v.Optional<Record<string, ({
+        ttl?: number | undefined;
+        op: "put";
+        hash: string;
+    } | {
+        op: "del";
+        hash: string;
+    } | {
+        op: "clear";
+    })[]>>;
+    gotQueriesPatch: v.Optional<({
+        ttl?: number | undefined;
+        op: "put";
+        hash: string;
+    } | {
+        op: "del";
+        hash: string;
+    } | {
+        op: "clear";
+    })[]>;
+    rowsPatch: v.Optional<({
+        op: "put";
+        tableName: string;
+        value: Readonly<Record<string, import("../../shared/src/json.ts").ReadonlyJSONValue | undefined>>;
+    } | {
+        merge?: import("../../shared/src/json.ts").ReadonlyJSONObject | undefined;
+        constrain?: string[] | undefined;
+        op: "update";
+        tableName: string;
+        id: Readonly<Record<string, string | number | boolean>>;
+    } | {
+        op: "del";
+        tableName: string;
+        id: Readonly<Record<string, string | number | boolean>>;
+    } | {
+        op: "clear";
+    })[]>;
+    mutationsPatch: v.Optional<({
+        op: "put";
+        mutation: {
+            id: {
+                id: number;
+                clientID: string;
+            };
+            result: {
+                message?: string | undefined;
+                details?: import("../../shared/src/json.ts").ReadonlyJSONValue | undefined;
+                error: "app";
+            } | {
+                details?: import("../../shared/src/json.ts").ReadonlyJSONValue | undefined;
+                error: "oooMutation" | "alreadyProcessed";
+            } | {
+                data?: import("../../shared/src/json.ts").ReadonlyJSONValue | undefined;
+            };
+        };
+    } | {
+        op: "del";
+        id: {
+            id: number;
+            clientID: string;
+        };
+    })[]>;
+    pokeID: v.Type<string>;
+}, undefined>>;
 export declare const pokeEndBodySchema: v.ObjectType<{
     pokeID: v.Type<string>;
     cookie: v.Type<string>;
@@ -121,7 +194,6 @@ export declare const pokeStartMessageSchema: v.TupleType<[v.Type<"pokeStart">, v
     timestamp: v.Optional<number>;
 }, undefined>]>;
 export declare const pokePartMessageSchema: v.TupleType<[v.Type<"pokePart">, v.ObjectType<{
-    pokeID: v.Type<string>;
     lastMutationIDChanges: v.Optional<Record<string, number>>;
     desiredQueriesPatches: v.Optional<Record<string, ({
         ttl?: number | undefined;
@@ -185,6 +257,7 @@ export declare const pokePartMessageSchema: v.TupleType<[v.Type<"pokePart">, v.O
             clientID: string;
         };
     })[]>;
+    pokeID: v.Type<string>;
 }, undefined>]>;
 export declare const pokeEndMessageSchema: v.TupleType<[v.Type<"pokeEnd">, v.ObjectType<{
     pokeID: v.Type<string>;
@@ -193,7 +266,16 @@ export declare const pokeEndMessageSchema: v.TupleType<[v.Type<"pokeEnd">, v.Obj
 }, undefined>]>;
 export type PokeStartBody = v.Infer<typeof pokeStartBodySchema>;
 export type PokePartBody = v.Infer<typeof pokePartBodySchema>;
+export type PokeParts = v.Infer<typeof pokePartsSchema>;
 export type PokeEndBody = v.Infer<typeof pokeEndBodySchema>;
+/** The first byte identifying a binary WebSocket message as a poke chunk. */
+export declare const POKE_CHUNK_MESSAGE_TYPE = 0;
+/** The first protocol version that receives binary poke chunks. */
+export declare const POKE_CHUNK_PROTOCOL_VERSION = 52;
+/** The last protocol version that receives JSON pokePart messages. */
+export declare const LAST_POKE_PART_PROTOCOL_VERSION = 51;
+/** A tagged binary poke chunk WebSocket message. */
+export type PokeChunk = Uint8Array;
 export type PokeStartMessage = v.Infer<typeof pokeStartMessageSchema>;
 export type PokePartMessage = v.Infer<typeof pokePartMessageSchema>;
 export type PokeEndMessage = v.Infer<typeof pokeEndMessageSchema>;

package/out/zero-protocol/src/poke.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"poke.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/poke.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAMhD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,eAAO,MAAM,mBAAmB;;;IAM9B;;;OAGG;;;;;;aAQH,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAa7B,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;aAO5B,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;IArCjC;;;OAGG;;;;;;eAqCH,CAAC;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAGhC,CAAC;AACH,eAAO,MAAM,oBAAoB;;;;eAG/B,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAChE,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC9D,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AACtE,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACpE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
+{"version":3,"file":"poke.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/poke.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAMhD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,eAAO,MAAM,mBAAmB;;;IAM9B;;;OAGG;;;;;;aAQH,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAa7B,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAA8B,CAAC;AAE3D,eAAO,MAAM,iBAAiB;;;;aAO5B,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;IA5CjC;;;OAGG;;;;;;eA4CH,CAAC;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAGhC,CAAC;AACH,eAAO,MAAM,oBAAoB;;;;eAG/B,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAChE,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC9D,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AACxD,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D,6EAA6E;AAC7E,eAAO,MAAM,uBAAuB,IAAO,CAAC;AAE5C,mEAAmE;AACnE,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAE9C,sEAAsE;AACtE,eAAO,MAAM,+BAA+B,KAAK,CAAC;AAElD,oDAAoD;AACpD,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC;AAEnC,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AACtE,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AACpE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}

package/out/zero-protocol/src/poke.js

@@ -16,12 +16,14 @@ import { nullableVersionSchema, versionSchema } from "./version.js";
 * A poke begins with a `poke-start` message which contains the `baseCookie`
 * the poke is updating from and the `cookie` the poke is updating to.
 *
-* The poke continues with zero to many `poke-part` messages, each of which
-* can contain patch parts.  These patch parts should be merged in the order
-* received.
+* Through protocol version 51, the poke continues with zero to many
+* `poke-part` JSON messages. Starting in version 52, it continues with zero to
+* many binary `pokeChunk` messages. Each binary message starts with a message
+* type byte. Concatenating and decoding the payload after that byte produces a
+* PokePartBody array. pokeChunk boundaries have no semantic meaning.
 *
-* Finally, the poke ends with a `poke-end` message.  The merged `poke-parts`
-* can now be applied as a whole to update from `baseCookie` to `cookie`.
+* Finally, the poke ends with a `poke-end` message. The decoded patches can
+* now be applied as a whole to update from `baseCookie` to `cookie`.
 *
 * Poke messages can be intermingled with other `down` messages, but cannot be
 * intermingled with poke messages for a different `pokeID`. If this is
@@ -42,13 +44,19 @@ var pokeStartBodySchema = valita_exports.object({
 	timestamp: valita_exports.number().optional()
 });
 var pokePartBodySchema = valita_exports.object({
-	pokeID: valita_exports.string(),
 	lastMutationIDChanges: valita_exports.record(valita_exports.number()).optional(),
 	desiredQueriesPatches: valita_exports.record(queriesPatchSchema).optional(),
 	gotQueriesPatch: queriesPatchSchema.optional(),
 	rowsPatch: rowsPatchSchema.optional(),
-	mutationsPatch: mutationsPatchSchema.optional()
+	mutationsPatch: mutationsPatchSchema.optional(),
+	pokeID: valita_exports.string()
 });
+/**
+* The logical payload carried by binary poke chunks. Chunk boundaries are
+* arbitrary; concatenating and decoding all chunks for a poke produces this
+* array.
+*/
+var pokePartsSchema = valita_exports.array(pokePartBodySchema);
 var pokeEndBodySchema = valita_exports.object({
 	pokeID: valita_exports.string(),
 	cookie: versionSchema,
@@ -58,6 +66,6 @@ var pokeStartMessageSchema = valita_exports.tuple([valita_exports.literal("pokeS
 var pokePartMessageSchema = valita_exports.tuple([valita_exports.literal("pokePart"), pokePartBodySchema]);
 var pokeEndMessageSchema = valita_exports.tuple([valita_exports.literal("pokeEnd"), pokeEndBodySchema]);
 //#endregion
-export { pokeEndMessageSchema, pokePartMessageSchema, pokeStartMessageSchema };
+export { pokeEndMessageSchema, pokePartMessageSchema, pokePartsSchema, pokeStartMessageSchema };
 
 //# sourceMappingURL=poke.js.map

package/out/zero-protocol/src/poke.js.map

@@ -1 +1 @@
-{"version":3,"file":"poke.js","names":[],"sources":["../../../../zero-protocol/src/poke.ts"],"sourcesContent":["import * as v from '../../shared/src/valita.ts';\nimport {mutationsPatchSchema} from './mutations-patch.ts';\nimport {queriesPatchSchema} from './queries-patch.ts';\nimport {rowsPatchSchema} from './row-patch.ts';\nimport {nullableVersionSchema, versionSchema} from './version.ts';\n\n/**\n * Pokes use a multi-part format. Pokes send entity data to the client and can\n * be multiple mega-bytes in size. Using a multi-part format allows the server\n * to avoid having to have the full poke in memory at one time.\n *\n * Each poke is assigned a `pokeID`, a unique id (within the context of the\n * connection) for identifying the poke.  All messages for a poke will have the\n * same `pokeID`.\n *\n * A poke begins with a `poke-start` message which contains the `baseCookie`\n * the poke is updating from and the `cookie` the poke is updating to.\n *\n * The poke continues with zero to many `poke-part` messages, each of which\n * can contain patch parts.  These patch parts should be merged in the order\n * received.\n *\n * Finally, the poke ends with a `poke-end` message.  The merged `poke-parts`\n * can now be applied as a whole to update from `baseCookie` to `cookie`.\n *\n * Poke messages can be intermingled with other `down` messages, but cannot be\n * intermingled with poke messages for a different `pokeID`. If this is\n * observed it is an unexpected error; the client should ignore both pokes,\n * disconnect, and reconnect.\n */\n\nexport const pokeStartBodySchema = v.object({\n  pokeID: v.string(),\n  // We always specify a Version as our cookie, but Replicache starts clients\n  // with initial cookie `null`, before the first request. So we have to be\n  // able to send a base cookie with value `null` to match that state.\n  baseCookie: nullableVersionSchema,\n  /**\n   * This field is always set if the poke contains a `rowsPatch`.\n   * It may be absent for patches that only update clients and queries.\n   */\n  schemaVersions: v\n    .object({\n      minSupportedVersion: v.number(),\n      maxSupportedVersion: v.number(),\n    })\n    .optional(),\n  timestamp: v.number().optional(),\n});\n\nexport const pokePartBodySchema = v.object({\n  pokeID: v.string(),\n  // Changes to last mutation id by client id.\n  lastMutationIDChanges: v.record(v.number()).optional(),\n  // Patches to the desired query sets by client id.\n  desiredQueriesPatches: v.record(queriesPatchSchema).optional(),\n  // Patches to the set of queries for which entities are sync'd in\n  // rowsPatch.\n  gotQueriesPatch: queriesPatchSchema.optional(),\n  // Patches to the rows set.\n  rowsPatch: rowsPatchSchema.optional(),\n  // Mutation results patch\n  mutationsPatch: mutationsPatchSchema.optional(),\n});\n\nexport const pokeEndBodySchema = v.object({\n  pokeID: v.string(),\n  // Note: This should be ignored (and may be empty) if cancel === `true`.\n  cookie: versionSchema,\n  // If `true`, the poke with id `pokeID` should be discarded without\n  // applying it.\n  cancel: v.boolean().optional(),\n});\n\nexport const pokeStartMessageSchema = v.tuple([\n  v.literal('pokeStart'),\n  pokeStartBodySchema,\n]);\nexport const pokePartMessageSchema = v.tuple([\n  v.literal('pokePart'),\n  pokePartBodySchema,\n]);\nexport const pokeEndMessageSchema = v.tuple([\n  v.literal('pokeEnd'),\n  pokeEndBodySchema,\n]);\n\nexport type PokeStartBody = v.Infer<typeof pokeStartBodySchema>;\nexport type PokePartBody = v.Infer<typeof pokePartBodySchema>;\nexport type PokeEndBody = v.Infer<typeof pokeEndBodySchema>;\n\nexport type PokeStartMessage = v.Infer<typeof pokeStartMessageSchema>;\nexport type PokePartMessage = v.Infer<typeof pokePartMessageSchema>;\nexport type PokeEndMessage = v.Infer<typeof pokeEndMessageSchema>;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+BA,IAAa,sBAAsB,eAAE,OAAO;CAC1C,QAAQ,eAAE,OAAO;CAIjB,YAAY;;;;;CAKZ,gBAAgB,eACb,OAAO;EACN,qBAAqB,eAAE,OAAO;EAC9B,qBAAqB,eAAE,OAAO;CAChC,CAAC,EACA,SAAS;CACZ,WAAW,eAAE,OAAO,EAAE,SAAS;AACjC,CAAC;AAED,IAAa,qBAAqB,eAAE,OAAO;CACzC,QAAQ,eAAE,OAAO;CAEjB,uBAAuB,eAAE,OAAO,eAAE,OAAO,CAAC,EAAE,SAAS;CAErD,uBAAuB,eAAE,OAAO,kBAAkB,EAAE,SAAS;CAG7D,iBAAiB,mBAAmB,SAAS;CAE7C,WAAW,gBAAgB,SAAS;CAEpC,gBAAgB,qBAAqB,SAAS;AAChD,CAAC;AAED,IAAa,oBAAoB,eAAE,OAAO;CACxC,QAAQ,eAAE,OAAO;CAEjB,QAAQ;CAGR,QAAQ,eAAE,QAAQ,EAAE,SAAS;AAC/B,CAAC;AAED,IAAa,yBAAyB,eAAE,MAAM,CAC5C,eAAE,QAAQ,WAAW,GACrB,mBACF,CAAC;AACD,IAAa,wBAAwB,eAAE,MAAM,CAC3C,eAAE,QAAQ,UAAU,GACpB,kBACF,CAAC;AACD,IAAa,uBAAuB,eAAE,MAAM,CAC1C,eAAE,QAAQ,SAAS,GACnB,iBACF,CAAC"}
+{"version":3,"file":"poke.js","names":[],"sources":["../../../../zero-protocol/src/poke.ts"],"sourcesContent":["import * as v from '../../shared/src/valita.ts';\nimport {mutationsPatchSchema} from './mutations-patch.ts';\nimport {queriesPatchSchema} from './queries-patch.ts';\nimport {rowsPatchSchema} from './row-patch.ts';\nimport {nullableVersionSchema, versionSchema} from './version.ts';\n\n/**\n * Pokes use a multi-part format. Pokes send entity data to the client and can\n * be multiple mega-bytes in size. Using a multi-part format allows the server\n * to avoid having to have the full poke in memory at one time.\n *\n * Each poke is assigned a `pokeID`, a unique id (within the context of the\n * connection) for identifying the poke.  All messages for a poke will have the\n * same `pokeID`.\n *\n * A poke begins with a `poke-start` message which contains the `baseCookie`\n * the poke is updating from and the `cookie` the poke is updating to.\n *\n * Through protocol version 51, the poke continues with zero to many\n * `poke-part` JSON messages. Starting in version 52, it continues with zero to\n * many binary `pokeChunk` messages. Each binary message starts with a message\n * type byte. Concatenating and decoding the payload after that byte produces a\n * PokePartBody array. pokeChunk boundaries have no semantic meaning.\n *\n * Finally, the poke ends with a `poke-end` message. The decoded patches can\n * now be applied as a whole to update from `baseCookie` to `cookie`.\n *\n * Poke messages can be intermingled with other `down` messages, but cannot be\n * intermingled with poke messages for a different `pokeID`. If this is\n * observed it is an unexpected error; the client should ignore both pokes,\n * disconnect, and reconnect.\n */\n\nexport const pokeStartBodySchema = v.object({\n  pokeID: v.string(),\n  // We always specify a Version as our cookie, but Replicache starts clients\n  // with initial cookie `null`, before the first request. So we have to be\n  // able to send a base cookie with value `null` to match that state.\n  baseCookie: nullableVersionSchema,\n  /**\n   * This field is always set if the poke contains a `rowsPatch`.\n   * It may be absent for patches that only update clients and queries.\n   */\n  schemaVersions: v\n    .object({\n      minSupportedVersion: v.number(),\n      maxSupportedVersion: v.number(),\n    })\n    .optional(),\n  timestamp: v.number().optional(),\n});\n\nexport const pokePartBodySchema = v.object({\n  // Changes to last mutation id by client id.\n  lastMutationIDChanges: v.record(v.number()).optional(),\n  // Patches to the desired query sets by client id.\n  desiredQueriesPatches: v.record(queriesPatchSchema).optional(),\n  // Patches to the set of queries for which entities are sync'd in\n  // rowsPatch.\n  gotQueriesPatch: queriesPatchSchema.optional(),\n  // Patches to the rows set.\n  rowsPatch: rowsPatchSchema.optional(),\n  // Mutation results patch\n  mutationsPatch: mutationsPatchSchema.optional(),\n  pokeID: v.string(),\n});\n\n/**\n * The logical payload carried by binary poke chunks. Chunk boundaries are\n * arbitrary; concatenating and decoding all chunks for a poke produces this\n * array.\n */\nexport const pokePartsSchema = v.array(pokePartBodySchema);\n\nexport const pokeEndBodySchema = v.object({\n  pokeID: v.string(),\n  // Note: This should be ignored (and may be empty) if cancel === `true`.\n  cookie: versionSchema,\n  // If `true`, the poke with id `pokeID` should be discarded without\n  // applying it.\n  cancel: v.boolean().optional(),\n});\n\nexport const pokeStartMessageSchema = v.tuple([\n  v.literal('pokeStart'),\n  pokeStartBodySchema,\n]);\nexport const pokePartMessageSchema = v.tuple([\n  v.literal('pokePart'),\n  pokePartBodySchema,\n]);\nexport const pokeEndMessageSchema = v.tuple([\n  v.literal('pokeEnd'),\n  pokeEndBodySchema,\n]);\n\nexport type PokeStartBody = v.Infer<typeof pokeStartBodySchema>;\nexport type PokePartBody = v.Infer<typeof pokePartBodySchema>;\nexport type PokeParts = v.Infer<typeof pokePartsSchema>;\nexport type PokeEndBody = v.Infer<typeof pokeEndBodySchema>;\n\n/** The first byte identifying a binary WebSocket message as a poke chunk. */\nexport const POKE_CHUNK_MESSAGE_TYPE = 0x00;\n\n/** The first protocol version that receives binary poke chunks. */\nexport const POKE_CHUNK_PROTOCOL_VERSION = 52;\n\n/** The last protocol version that receives JSON pokePart messages. */\nexport const LAST_POKE_PART_PROTOCOL_VERSION = 51;\n\n/** A tagged binary poke chunk WebSocket message. */\nexport type PokeChunk = Uint8Array;\n\nexport type PokeStartMessage = v.Infer<typeof pokeStartMessageSchema>;\nexport type PokePartMessage = v.Infer<typeof pokePartMessageSchema>;\nexport type PokeEndMessage = v.Infer<typeof pokeEndMessageSchema>;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiCA,IAAa,sBAAsB,eAAE,OAAO;CAC1C,QAAQ,eAAE,OAAO;CAIjB,YAAY;;;;;CAKZ,gBAAgB,eACb,OAAO;EACN,qBAAqB,eAAE,OAAO;EAC9B,qBAAqB,eAAE,OAAO;CAChC,CAAC,EACA,SAAS;CACZ,WAAW,eAAE,OAAO,EAAE,SAAS;AACjC,CAAC;AAED,IAAa,qBAAqB,eAAE,OAAO;CAEzC,uBAAuB,eAAE,OAAO,eAAE,OAAO,CAAC,EAAE,SAAS;CAErD,uBAAuB,eAAE,OAAO,kBAAkB,EAAE,SAAS;CAG7D,iBAAiB,mBAAmB,SAAS;CAE7C,WAAW,gBAAgB,SAAS;CAEpC,gBAAgB,qBAAqB,SAAS;CAC9C,QAAQ,eAAE,OAAO;AACnB,CAAC;;;;;;AAOD,IAAa,kBAAkB,eAAE,MAAM,kBAAkB;AAEzD,IAAa,oBAAoB,eAAE,OAAO;CACxC,QAAQ,eAAE,OAAO;CAEjB,QAAQ;CAGR,QAAQ,eAAE,QAAQ,EAAE,SAAS;AAC/B,CAAC;AAED,IAAa,yBAAyB,eAAE,MAAM,CAC5C,eAAE,QAAQ,WAAW,GACrB,mBACF,CAAC;AACD,IAAa,wBAAwB,eAAE,MAAM,CAC3C,eAAE,QAAQ,UAAU,GACpB,kBACF,CAAC;AACD,IAAa,uBAAuB,eAAE,MAAM,CAC1C,eAAE,QAAQ,SAAS,GACnB,iBACF,CAAC"}

package/out/zero-protocol/src/protocol-version.d.ts

@@ -10,15 +10,20 @@
  * release. The server (`zero-cache`) must be deployed before clients start
  * running the new code.
  */
-export declare const PROTOCOL_VERSION = 51;
+export declare const PROTOCOL_VERSION = 52;
 /**
  * The minimum server-supported sync protocol version (i.e. the version
- * declared in the "/sync/v{#}/connect" URL). The contract for
- * backwards compatibility is that a `zero-cache` supports the current
- * `PROTOCOL_VERSION` and at least the previous one (i.e. `PROTOCOL_VERSION - 1`)
- * if not earlier ones as well. This corresponds to supporting clients running
- * the current release and the previous (major) release. Any client connections
- * from protocol versions before `MIN_SERVER_SUPPORTED_PROTOCOL_VERSION` are
+ * declared in the "/sync/v{#}/connect" URL).
+ *
+ * CloudZero can serve applications running old client releases indefinitely.
+ * Consequently, this value must never be increased: `zero-cache` must continue
+ * to support every sync protocol from this version through `PROTOCOL_VERSION`.
+ * A wire change that an old client cannot ignore must branch on the client's
+ * protocol version and retain the old behavior. Keep each compatibility fork
+ * isolated at the boundary that owns the changed behavior and test both sides
+ * of its version cutoff.
+ *
+ * Client connections from protocol versions before this historical floor are
  * closed with a `VersionNotSupported` error.
  */
 export declare const MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 30;

package/out/zero-protocol/src/protocol-version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol-version.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/protocol-version.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AA8CH,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC;;;;;;;;;GASG;AACH,eAAO,MAAM,kCAAkC,KAAK,CAAC"}
+{"version":3,"file":"protocol-version.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/protocol-version.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AAgDH,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,kCAAkC,KAAK,CAAC"}

package/out/zero-protocol/src/protocol-version.js.map

@@ -1 +1 @@
-{"version":3,"file":"protocol-version.js","names":[],"sources":["../../../../zero-protocol/src/protocol-version.ts"],"sourcesContent":["import {assert} from '../../shared/src/asserts.ts';\n\n/**\n * The current `PROTOCOL_VERSION` of the code.\n *\n * The `PROTOCOL_VERSION` encompasses both the wire-protocol of the `/sync/...`\n * connection between the browser and `zero-cache`, as well as the format of\n * the `AST` objects stored in both components (i.e. IDB and CVR).\n *\n * A change in the `AST` schema (e.g. new functionality added) must be\n * accompanied by an increment of the `PROTOCOL_VERSION` and a new major\n * release. The server (`zero-cache`) must be deployed before clients start\n * running the new code.\n */\n// History:\n// -- Version 5 adds support for `pokeEnd.cookie`. (0.14)\n// -- Version 6 makes `pokeStart.cookie` optional. (0.16)\n// -- Version 7 introduces the initConnection.clientSchema field. (0.17)\n// -- Version 8 drops support for Version 5 (0.18).\n// -- Version 11 adds inspect queries. (0.18)\n// -- Version 12 adds 'timestamp' and 'date' types to the ClientSchema ValueType. (not shipped, reversed by version 14)\n// -- Version 14 removes 'timestamp' and 'date' types from the ClientSchema ValueType. (0.18)\n// -- Version 15 adds a `userPushParams` field to `initConnection` (0.19)\n// -- Version 16 adds a new error type (alreadyProcessed) to mutation responses (0.19)\n// -- Version 17 deprecates `AST` in downstream query puts. It was never used anyway. (0.21)\n// -- Version 18 adds `name` and `args` to the `queries-patch` protocol (0.21)\n// -- Version 19 adds `activeClients` to the `initConnection` protocol (0.22)\n// -- Version 20 changes inspector down message (0.22)\n// -- Version 21 removes `AST` in downstream query puts which was deprecated in Version 17, removes support for versions < 18 (0.22)\n// -- Version 22 adds an optional 'userQueryParams' field to `initConnection` (0.22)\n// -- Version 23 add `mutationResults` to poke (0.22)\n// -- Version 24 adds `ackMutationResults` to upstream (0.22).\n// -- version 25 modifies `mutationsResults` to include `del` patches (0.22)\n// -- version 26 adds inspect/metrics and adds metrics to inspect/query (0.23)\n// -- version 27 adds inspect/version (0.23)\n// -- version 28 adds more inspect/metrics (0.23)\n// -- version 29 adds error responses for custom queries (0.23)\n// -- version 30 adds an optional primaryKey to the ClientSchema (0.24)\n// -- version 31 adds admin password authentication to inspector RPC calls (0.24)\n// -- version 32 adds analyze-query to the inspector RPC calls (0.24)\n// -- version 33 adds `flip` to CorrelatedSubquery (0.25)\n// -- version 34 moves `flip` from CorrelatedSubquery to CorrelatedSubqueryCondition (0.25)\n// -- version 35 adds `readRows`, `readRowCountsByQuery` and `readRowCount` to analyze-query result (0.25)\n// -- version 36 changes inspector analyze-query and adds error response to RPC (0.25)\n// -- version 37 adds `elapsed` to AnalyzeQueryResult (0.25)\n// -- version 38 adds structured push/transform error responses (0.25)\n// -- version 39 removes per-transform error types and adds `message` to app error (0.25)\n// -- version 40 adds `dbRowScansByQuery` to AnalyzeQueryResult (0.25)\n// -- version 41 makes ClientSchema.primaryKey required (0.25)\n// -- version 42 adds planner events to AnalyzeQueryResult (0.25)\n// -- version 43 renames `plans` to `sqlitePlans`, `plannerEvents` to `joinPlans`, and `plannerDebug` option to `joinPlans` (0.25)\n// -- version 44 adds profileID to connection URL (0.25)\n// -- version 45 adds userPushHeaders and userQueryHeaders to initConnection (0.25)\n// -- version 46 adds scalarSubquery condition type to AST\n// -- version 47 adds optional auth token to push body\n// -- version 48 adds updateAuth\n// -- version 49 adds `scalar` to CorrelatedSubqueryCondition, removes scalarSubquery\n// -- version 50 adds OTEL headers to push and query messages\n// -- version 51 changes inspector metrics fields\nexport const PROTOCOL_VERSION = 51;\n\n/**\n * The minimum server-supported sync protocol version (i.e. the version\n * declared in the \"/sync/v{#}/connect\" URL). The contract for\n * backwards compatibility is that a `zero-cache` supports the current\n * `PROTOCOL_VERSION` and at least the previous one (i.e. `PROTOCOL_VERSION - 1`)\n * if not earlier ones as well. This corresponds to supporting clients running\n * the current release and the previous (major) release. Any client connections\n * from protocol versions before `MIN_SERVER_SUPPORTED_PROTOCOL_VERSION` are\n * closed with a `VersionNotSupported` error.\n */\nexport const MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 30;\n\nassert(\n  MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION,\n  'MIN_SERVER_SUPPORTED_SYNC_PROTOCOL must be less than PROTOCOL_VERSION',\n);\n"],"mappings":";AAyEA,OAAA,MAEE,uEACF"}
+{"version":3,"file":"protocol-version.js","names":[],"sources":["../../../../zero-protocol/src/protocol-version.ts"],"sourcesContent":["import {assert} from '../../shared/src/asserts.ts';\n\n/**\n * The current `PROTOCOL_VERSION` of the code.\n *\n * The `PROTOCOL_VERSION` encompasses both the wire-protocol of the `/sync/...`\n * connection between the browser and `zero-cache`, as well as the format of\n * the `AST` objects stored in both components (i.e. IDB and CVR).\n *\n * A change in the `AST` schema (e.g. new functionality added) must be\n * accompanied by an increment of the `PROTOCOL_VERSION` and a new major\n * release. The server (`zero-cache`) must be deployed before clients start\n * running the new code.\n */\n// History:\n// -- Version 5 adds support for `pokeEnd.cookie`. (0.14)\n// -- Version 6 makes `pokeStart.cookie` optional. (0.16)\n// -- Version 7 introduces the initConnection.clientSchema field. (0.17)\n// -- Version 8 drops support for Version 5 (0.18).\n// -- Version 11 adds inspect queries. (0.18)\n// -- Version 12 adds 'timestamp' and 'date' types to the ClientSchema ValueType. (not shipped, reversed by version 14)\n// -- Version 14 removes 'timestamp' and 'date' types from the ClientSchema ValueType. (0.18)\n// -- Version 15 adds a `userPushParams` field to `initConnection` (0.19)\n// -- Version 16 adds a new error type (alreadyProcessed) to mutation responses (0.19)\n// -- Version 17 deprecates `AST` in downstream query puts. It was never used anyway. (0.21)\n// -- Version 18 adds `name` and `args` to the `queries-patch` protocol (0.21)\n// -- Version 19 adds `activeClients` to the `initConnection` protocol (0.22)\n// -- Version 20 changes inspector down message (0.22)\n// -- Version 21 removes `AST` in downstream query puts which was deprecated in Version 17, removes support for versions < 18 (0.22)\n// -- Version 22 adds an optional 'userQueryParams' field to `initConnection` (0.22)\n// -- Version 23 add `mutationResults` to poke (0.22)\n// -- Version 24 adds `ackMutationResults` to upstream (0.22).\n// -- version 25 modifies `mutationsResults` to include `del` patches (0.22)\n// -- version 26 adds inspect/metrics and adds metrics to inspect/query (0.23)\n// -- version 27 adds inspect/version (0.23)\n// -- version 28 adds more inspect/metrics (0.23)\n// -- version 29 adds error responses for custom queries (0.23)\n// -- version 30 adds an optional primaryKey to the ClientSchema (0.24)\n// -- version 31 adds admin password authentication to inspector RPC calls (0.24)\n// -- version 32 adds analyze-query to the inspector RPC calls (0.24)\n// -- version 33 adds `flip` to CorrelatedSubquery (0.25)\n// -- version 34 moves `flip` from CorrelatedSubquery to CorrelatedSubqueryCondition (0.25)\n// -- version 35 adds `readRows`, `readRowCountsByQuery` and `readRowCount` to analyze-query result (0.25)\n// -- version 36 changes inspector analyze-query and adds error response to RPC (0.25)\n// -- version 37 adds `elapsed` to AnalyzeQueryResult (0.25)\n// -- version 38 adds structured push/transform error responses (0.25)\n// -- version 39 removes per-transform error types and adds `message` to app error (0.25)\n// -- version 40 adds `dbRowScansByQuery` to AnalyzeQueryResult (0.25)\n// -- version 41 makes ClientSchema.primaryKey required (0.25)\n// -- version 42 adds planner events to AnalyzeQueryResult (0.25)\n// -- version 43 renames `plans` to `sqlitePlans`, `plannerEvents` to `joinPlans`, and `plannerDebug` option to `joinPlans` (0.25)\n// -- version 44 adds profileID to connection URL (0.25)\n// -- version 45 adds userPushHeaders and userQueryHeaders to initConnection (0.25)\n// -- version 46 adds scalarSubquery condition type to AST\n// -- version 47 adds optional auth token to push body\n// -- version 48 adds updateAuth\n// -- version 49 adds `scalar` to CorrelatedSubqueryCondition, removes scalarSubquery\n// -- version 50 adds OTEL headers to push and query messages\n// -- version 51 changes inspector metrics fields\n// -- version 52 replaces JSON pokePart messages with binary poke chunks for\n//    clients using protocol version 52 or newer. Older clients retain pokePart.\nexport const PROTOCOL_VERSION = 52;\n\n/**\n * The minimum server-supported sync protocol version (i.e. the version\n * declared in the \"/sync/v{#}/connect\" URL).\n *\n * CloudZero can serve applications running old client releases indefinitely.\n * Consequently, this value must never be increased: `zero-cache` must continue\n * to support every sync protocol from this version through `PROTOCOL_VERSION`.\n * A wire change that an old client cannot ignore must branch on the client's\n * protocol version and retain the old behavior. Keep each compatibility fork\n * isolated at the boundary that owns the changed behavior and test both sides\n * of its version cutoff.\n *\n * Client connections from protocol versions before this historical floor are\n * closed with a `VersionNotSupported` error.\n */\nexport const MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 30;\n\nassert(\n  MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION,\n  'MIN_SERVER_SUPPORTED_SYNC_PROTOCOL must be less than PROTOCOL_VERSION',\n);\n"],"mappings":";AAgFA,OAAA,MAEE,uEACF"}

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"}