@rocicorp/zero 0.22.2025071900 → 0.22.2025072500

package/out/{chunk-A6LHZQIK.js → chunk-CPTFADYI.js}

@@ -1,7 +1,7 @@
 import {
   clientToServer,
   mapEntries
-} from "./chunk-IQCMHXK7.js";
+} from "./chunk-ROYQ5GXF.js";
 import {
   AbstractQuery,
   ExpressionBuilder,
@@ -356,4 +356,4 @@ export {
   named,
   namedWithContext
 };
-//# sourceMappingURL=chunk-A6LHZQIK.js.map
+//# sourceMappingURL=chunk-CPTFADYI.js.map

package/out/{chunk-IQCMHXK7.js → chunk-ROYQ5GXF.js}

@@ -5988,116 +5988,6 @@ var errorMessageSchema = valita_exports.tuple([
   errorBodySchema
 ]);
 
-// ../zero-protocol/src/row-patch.ts
-var putOpSchema2 = valita_exports.object({
-  op: valita_exports.literal("put"),
-  tableName: valita_exports.string(),
-  value: rowSchema
-});
-var updateOpSchema = valita_exports.object({
-  op: valita_exports.literal("update"),
-  tableName: valita_exports.string(),
-  id: primaryKeyValueRecordSchema,
-  merge: jsonObjectSchema.optional(),
-  constrain: valita_exports.array(valita_exports.string()).optional()
-});
-var delOpSchema2 = valita_exports.object({
-  op: valita_exports.literal("del"),
-  tableName: valita_exports.string(),
-  id: primaryKeyValueRecordSchema
-});
-var clearOpSchema2 = valita_exports.object({
-  op: valita_exports.literal("clear")
-});
-var rowPatchOpSchema = valita_exports.union(
-  putOpSchema2,
-  updateOpSchema,
-  delOpSchema2,
-  clearOpSchema2
-);
-var rowsPatchSchema = valita_exports.array(rowPatchOpSchema);
-
-// ../zero-protocol/src/version.ts
-var versionSchema = valita_exports.string();
-var nullableVersionSchema = valita_exports.union(versionSchema, valita_exports.null());
-
-// ../zero-protocol/src/poke.ts
-var pokeStartBodySchema = valita_exports.object({
-  pokeID: valita_exports.string(),
-  // We always specify a Version as our cookie, but Replicache starts clients
-  // with initial cookie `null`, before the first request. So we have to be
-  // able to send a base cookie with value `null` to match that state.
-  baseCookie: nullableVersionSchema,
-  /**
-   * This field is always set if the poke contains a `rowsPatch`.
-   * It may be absent for patches that only update clients and queries.
-   */
-  schemaVersions: valita_exports.object({
-    minSupportedVersion: valita_exports.number(),
-    maxSupportedVersion: valita_exports.number()
-  }).optional(),
-  timestamp: valita_exports.number().optional()
-});
-var pokePartBodySchema = valita_exports.object({
-  pokeID: valita_exports.string(),
-  // Changes to last mutation id by client id.
-  lastMutationIDChanges: valita_exports.record(valita_exports.number()).optional(),
-  // Patches to the desired query sets by client id.
-  desiredQueriesPatches: valita_exports.record(queriesPatchSchema).optional(),
-  // Patches to the set of queries for which entities are sync'd in
-  // rowsPatch.
-  gotQueriesPatch: queriesPatchSchema.optional(),
-  // Patches to the rows set.
-  rowsPatch: rowsPatchSchema.optional()
-});
-var pokeEndBodySchema = valita_exports.object({
-  pokeID: valita_exports.string(),
-  // Note: This should be ignored (and may be empty) if cancel === `true`.
-  cookie: versionSchema,
-  // If `true`, the poke with id `pokeID` should be discarded without
-  // applying it.
-  cancel: valita_exports.boolean().optional()
-});
-var pokeStartMessageSchema = valita_exports.tuple([
-  valita_exports.literal("pokeStart"),
-  pokeStartBodySchema
-]);
-var pokePartMessageSchema = valita_exports.tuple([
-  valita_exports.literal("pokePart"),
-  pokePartBodySchema
-]);
-var pokeEndMessageSchema = valita_exports.tuple([
-  valita_exports.literal("pokeEnd"),
-  pokeEndBodySchema
-]);
-
-// ../zero-protocol/src/pong.ts
-var pongBodySchema = valita_exports.object({});
-var pongMessageSchema = valita_exports.tuple([valita_exports.literal("pong"), pongBodySchema]);
-
-// ../zero-protocol/src/pull.ts
-var pullRequestBodySchema = valita_exports.object({
-  clientGroupID: valita_exports.string(),
-  cookie: nullableVersionSchema,
-  requestID: valita_exports.string()
-});
-var pullResponseBodySchema = valita_exports.object({
-  cookie: versionSchema,
-  // Matches pullRequestBodySchema requestID that initiated this response
-  requestID: valita_exports.string(),
-  lastMutationIDChanges: valita_exports.record(valita_exports.number())
-  // Pull is currently only used for mutation recovery which does not use
-  // the patch so we save work by not computing the patch.
-});
-var pullRequestMessageSchema = valita_exports.tuple([
-  valita_exports.literal("pull"),
-  pullRequestBodySchema
-]);
-var pullResponseMessageSchema = valita_exports.tuple([
-  valita_exports.literal("pull"),
-  pullResponseBodySchema
-]);
-
 // ../zero-protocol/src/mutation-type-enum.ts
 var CRUD = "crud";
 var Custom = "custom";
@@ -6116,7 +6006,7 @@ var upsertOpSchema = valita_exports.object({
   primaryKey: primaryKeySchema,
   value: rowSchema
 });
-var updateOpSchema2 = valita_exports.object({
+var updateOpSchema = valita_exports.object({
   op: valita_exports.literal("update"),
   tableName: valita_exports.string(),
   primaryKey: primaryKeySchema,
@@ -6133,7 +6023,7 @@ var deleteOpSchema = valita_exports.object({
 var crudOpSchema = valita_exports.union(
   insertOpSchema,
   upsertOpSchema,
-  updateOpSchema2,
+  updateOpSchema,
   deleteOpSchema
 );
 var crudArgSchema = valita_exports.object({
@@ -6187,7 +6077,10 @@ var mutationOkSchema = valita_exports.object({
   data: jsonSchema.optional()
 });
 var mutationErrorSchema = valita_exports.union(appErrorSchema, zeroErrorSchema);
-var mutationResultSchema = valita_exports.union(mutationOkSchema, mutationErrorSchema);
+var mutationResultSchema = valita_exports.union(
+  mutationOkSchema,
+  mutationErrorSchema
+);
 var mutationResponseSchema = valita_exports.object({
   id: mutationIDSchema,
   result: mutationResultSchema
@@ -6231,6 +6124,10 @@ var pushResponseMessageSchema = valita_exports.tuple([
   valita_exports.literal("pushResponse"),
   pushResponseSchema
 ]);
+var ackMutationResponsesMessageSchema = valita_exports.tuple([
+  valita_exports.literal("ackMutationResponses"),
+  mutationIDSchema
+]);
 var pushParamsSchema = valita_exports.object({
   schema: valita_exports.string(),
   appID: valita_exports.string()
@@ -6250,6 +6147,126 @@ function mapCRUD(arg, map) {
   };
 }
 
+// ../zero-protocol/src/mutations-patch.ts
+var putOpSchema2 = valita_exports.object({
+  op: valita_exports.literal("put"),
+  mutation: mutationResponseSchema
+});
+var patchOpSchema2 = putOpSchema2;
+var mutationsPatchSchema = valita_exports.array(patchOpSchema2);
+
+// ../zero-protocol/src/row-patch.ts
+var putOpSchema3 = valita_exports.object({
+  op: valita_exports.literal("put"),
+  tableName: valita_exports.string(),
+  value: rowSchema
+});
+var updateOpSchema2 = valita_exports.object({
+  op: valita_exports.literal("update"),
+  tableName: valita_exports.string(),
+  id: primaryKeyValueRecordSchema,
+  merge: jsonObjectSchema.optional(),
+  constrain: valita_exports.array(valita_exports.string()).optional()
+});
+var delOpSchema2 = valita_exports.object({
+  op: valita_exports.literal("del"),
+  tableName: valita_exports.string(),
+  id: primaryKeyValueRecordSchema
+});
+var clearOpSchema2 = valita_exports.object({
+  op: valita_exports.literal("clear")
+});
+var rowPatchOpSchema = valita_exports.union(
+  putOpSchema3,
+  updateOpSchema2,
+  delOpSchema2,
+  clearOpSchema2
+);
+var rowsPatchSchema = valita_exports.array(rowPatchOpSchema);
+
+// ../zero-protocol/src/version.ts
+var versionSchema = valita_exports.string();
+var nullableVersionSchema = valita_exports.union(versionSchema, valita_exports.null());
+
+// ../zero-protocol/src/poke.ts
+var pokeStartBodySchema = valita_exports.object({
+  pokeID: valita_exports.string(),
+  // We always specify a Version as our cookie, but Replicache starts clients
+  // with initial cookie `null`, before the first request. So we have to be
+  // able to send a base cookie with value `null` to match that state.
+  baseCookie: nullableVersionSchema,
+  /**
+   * This field is always set if the poke contains a `rowsPatch`.
+   * It may be absent for patches that only update clients and queries.
+   */
+  schemaVersions: valita_exports.object({
+    minSupportedVersion: valita_exports.number(),
+    maxSupportedVersion: valita_exports.number()
+  }).optional(),
+  timestamp: valita_exports.number().optional()
+});
+var pokePartBodySchema = valita_exports.object({
+  pokeID: valita_exports.string(),
+  // Changes to last mutation id by client id.
+  lastMutationIDChanges: valita_exports.record(valita_exports.number()).optional(),
+  // Patches to the desired query sets by client id.
+  desiredQueriesPatches: valita_exports.record(queriesPatchSchema).optional(),
+  // Patches to the set of queries for which entities are sync'd in
+  // rowsPatch.
+  gotQueriesPatch: queriesPatchSchema.optional(),
+  // Patches to the rows set.
+  rowsPatch: rowsPatchSchema.optional(),
+  // Mutation results patch
+  mutationsPatch: mutationsPatchSchema.optional()
+});
+var pokeEndBodySchema = valita_exports.object({
+  pokeID: valita_exports.string(),
+  // Note: This should be ignored (and may be empty) if cancel === `true`.
+  cookie: versionSchema,
+  // If `true`, the poke with id `pokeID` should be discarded without
+  // applying it.
+  cancel: valita_exports.boolean().optional()
+});
+var pokeStartMessageSchema = valita_exports.tuple([
+  valita_exports.literal("pokeStart"),
+  pokeStartBodySchema
+]);
+var pokePartMessageSchema = valita_exports.tuple([
+  valita_exports.literal("pokePart"),
+  pokePartBodySchema
+]);
+var pokeEndMessageSchema = valita_exports.tuple([
+  valita_exports.literal("pokeEnd"),
+  pokeEndBodySchema
+]);
+
+// ../zero-protocol/src/pong.ts
+var pongBodySchema = valita_exports.object({});
+var pongMessageSchema = valita_exports.tuple([valita_exports.literal("pong"), pongBodySchema]);
+
+// ../zero-protocol/src/pull.ts
+var pullRequestBodySchema = valita_exports.object({
+  clientGroupID: valita_exports.string(),
+  cookie: nullableVersionSchema,
+  requestID: valita_exports.string()
+});
+var pullResponseBodySchema = valita_exports.object({
+  cookie: versionSchema,
+  // Matches pullRequestBodySchema requestID that initiated this response
+  requestID: valita_exports.string(),
+  lastMutationIDChanges: valita_exports.record(valita_exports.number())
+  // Pull is currently only used for mutation recovery which does not use
+  // the patch so we save work by not computing the patch.
+});
+var pullRequestMessageSchema = valita_exports.tuple([
+  valita_exports.literal("pull"),
+  pullRequestBodySchema
+]);
+var pullResponseMessageSchema = valita_exports.tuple([
+  valita_exports.literal("pull"),
+  pullResponseBodySchema
+]);
+
 // ../zero-protocol/src/down.ts
 var downstreamSchema = valita_exports.union(
   connectedMessageSchema,
@@ -6265,7 +6282,7 @@ var downstreamSchema = valita_exports.union(
 );
 
 // ../zero-protocol/src/protocol-version.ts
-var PROTOCOL_VERSION = 22;
+var PROTOCOL_VERSION = 24;
 var MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 18;
 assert(MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION);
 
@@ -8557,7 +8574,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.22.2025071900";
+var version2 = "0.22.2025072500";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -8869,10 +8886,15 @@ var MutationTracker = class {
   #allMutationsAppliedListeners;
   #lc;
   #limboMutations;
+  // This is only used in the new code path that processes
+  // mutation responses that arrive via the `poke` protocol.
+  // The old code path will be removed in the release after
+  // the one containing mutation-responses-via-poke.
+  #ackMutations;
   #clientID;
   #largestOutstandingMutationID;
   #currentMutationID;
-  constructor(lc) {
+  constructor(lc, ackMutations) {
     this.#lc = lc.withContext("MutationTracker");
     this.#outstandingMutations = /* @__PURE__ */ new Map();
     this.#ephemeralIDsByMutationID = /* @__PURE__ */ new Map();
@@ -8880,6 +8902,7 @@ var MutationTracker = class {
     this.#limboMutations = /* @__PURE__ */ new Set();
     this.#largestOutstandingMutationID = 0;
     this.#currentMutationID = 0;
+    this.#ackMutations = ackMutations;
   }
   set clientID(clientID) {
     this.#clientID = clientID;
@@ -8913,6 +8936,28 @@ var MutationTracker = class {
       this.#settleMutation(id, entry, "reject", e);
     }
   }
+  /**
+   * Used when zero-cache pokes down mutation results.
+   */
+  processMutationResponses(patches) {
+    try {
+      for (const patch of patches) {
+        if (patch.mutation.id.clientID !== this.#clientID) {
+          continue;
+        }
+        if ("error" in patch.mutation.result) {
+          this.#processMutationError(patch.mutation.id, patch.mutation.result);
+        } else {
+          this.#processMutationOk(patch.mutation.id, patch.mutation.result);
+        }
+      }
+    } finally {
+      const last = patches[patches.length - 1];
+      if (last) {
+        this.#ackMutations(last.mutation.id);
+      }
+    }
+  }
   processPushResponse(response) {
     if ("error" in response) {
       this.#lc.error?.(
@@ -9063,7 +9108,7 @@ var MutationTracker = class {
       if ("error" in mutation.result) {
         this.#processMutationError(mutation.id, mutation.result);
       } else {
-        this.#processMutationOk(mutation.result, mutation.id);
+        this.#processMutationOk(mutation.id, mutation.result);
       }
     }
   }
@@ -9085,7 +9130,7 @@ var MutationTracker = class {
     assert(entry && entry.mutationID === mid.id);
     this.#settleMutation(ephemeralID, entry, "reject", error);
   }
-  #processMutationOk(result, mid) {
+  #processMutationOk(mid, result) {
     assert(
       mid.clientID === this.#clientID,
       "received mutation for the wrong client"
@@ -9628,14 +9673,16 @@ var PokeHandler = class {
   #pokeLock = new Lock3();
   #schema;
   #serverToClient;
+  #mutationTracker;
   #raf = getBrowserGlobalMethod("requestAnimationFrame") ?? rafFallback;
-  constructor(replicachePoke, onPokeError, clientID, schema, lc) {
+  constructor(replicachePoke, onPokeError, clientID, schema, lc, mutationTracker) {
     this.#replicachePoke = replicachePoke;
     this.#onPokeError = onPokeError;
     this.#clientID = clientID;
     this.#schema = schema;
     this.#serverToClient = serverToClient(schema.tables);
     this.#lc = lc.withContext("PokeHandler");
+    this.#mutationTracker = mutationTracker;
   }
   handlePokeStart(pokeStart) {
     if (this.#receivingPoke) {
@@ -9726,6 +9773,15 @@ var PokeHandler = class {
         lc.debug?.("poking replicache");
         await this.#replicachePoke(merged);
         lc.debug?.("poking replicache took", performance.now() - start);
+        this.#mutationTracker.processMutationResponses(
+          merged.mutationResults ?? []
+        );
+        if (!("error" in merged.pullResponse)) {
+          const lmid = merged.pullResponse.lastMutationIDChanges[this.#clientID];
+          if (lmid !== void 0) {
+            this.#mutationTracker.lmidAdvanced(lmid);
+          }
+        }
       } catch (e) {
         this.#handlePokeError(e);
       }
@@ -9754,6 +9810,7 @@ function mergePokes(pokeBuffer, schema, serverToClient2) {
   const { cookie } = lastPoke.pokeEnd;
   const mergedPatch = [];
   const mergedLastMutationIDChanges = {};
+  const mutationResults = [];
   let prevPokeEnd = void 0;
   for (const pokeAccumulator of pokeBuffer) {
     if (prevPokeEnd && pokeAccumulator.pokeStart.baseCookie && pokeAccumulator.pokeStart.baseCookie > prevPokeEnd.cookie) {
@@ -9800,9 +9857,12 @@ function mergePokes(pokeBuffer, schema, serverToClient2) {
           );
         }
       }
+      if (pokePart.mutationsPatch) {
+        mutationResults.push(...pokePart.mutationsPatch);
+      }
     }
   }
-  return {
+  const ret = {
     baseCookie,
     pullResponse: {
       lastMutationIDChanges: mergedLastMutationIDChanges,
@@ -9810,6 +9870,10 @@ function mergePokes(pokeBuffer, schema, serverToClient2) {
       cookie
     }
   };
+  if (mutationResults.length > 0) {
+    ret.mutationResults = mutationResults;
+  }
+  return ret;
 }
 function queryPatchOpToReplicachePatchOp(op, toKey) {
   switch (op.op) {
@@ -10150,7 +10214,10 @@ var Zero = class _Zero {
       }
     };
     const lc = new ZeroLogContext(logOptions.logLevel, {}, logSink);
-    this.#mutationTracker = new MutationTracker(lc);
+    this.#mutationTracker = new MutationTracker(
+      lc,
+      (upTo) => this.#send(["ackMutationResponses", upTo])
+    );
     if (options.mutators) {
       for (const [namespaceOrKey, mutatorOrMutators] of Object.entries(
         options.mutators
@@ -10330,7 +10397,8 @@ var Zero = class _Zero {
       () => this.#onPokeError(),
       rep.clientID,
       schema,
-      this.#lc
+      this.#lc,
+      this.#mutationTracker
     );
     this.#visibilityWatcher = getDocumentVisibilityWatcher(
       getBrowserGlobal("document"),
@@ -10862,7 +10930,6 @@ var Zero = class _Zero {
   #handlePokeEnd(_lc, pokeMessage) {
     this.#abortPingTimeout();
     this.#pokeHandler.handlePokeEnd(pokeMessage[1]);
-    this.#mutationTracker.lmidAdvanced(this.#lastMutationIDReceived);
   }
   #onPokeError() {
     const lc = this.#lc;
@@ -11371,4 +11438,4 @@ export {
   update_needed_reason_type_enum_exports,
   Zero
 };
-//# sourceMappingURL=chunk-IQCMHXK7.js.map
+//# sourceMappingURL=chunk-ROYQ5GXF.js.map