@rocicorp/zero 0.17.2025032000 → 0.18.2025031800

package/out/{chunk-OI2PV2HL.js → chunk-FNFCFUNQ.js}

@@ -6315,7 +6315,7 @@ async function persistDD31(lc, clientID, memdag, perdag, mutators, closed, forma
     return;
   }
   let memdagBaseSnapshotPersisted = false;
-  const zeroDataForMemdagBaseSnapshot = getZeroData && await getZeroData("rebase", memdagBaseSnapshot.chunk.hash);
+  const zeroDataForMemdagBaseSnapshot = getZeroData && await getZeroData(memdagBaseSnapshot.chunk.hash);
   await withWrite(perdag, async (perdagWrite) => {
     const [mainClientGroup, latestPerdagMainClientGroupHeadCommit] = await getClientGroupInfo(perdagWrite, mainClientGroupID);
     let newMainClientGroupHeadHash = latestPerdagMainClientGroupHeadCommit.chunk.hash;
@@ -6368,7 +6368,7 @@ async function persistDD31(lc, clientID, memdag, perdag, mutators, closed, forma
     }
     let zeroDataForPerdagHeadCommit;
     if (!memdagBaseSnapshotPersisted) {
-      zeroDataForPerdagHeadCommit = getZeroData && await getZeroData("rebase", newMainClientGroupHeadHash, {
+      zeroDataForPerdagHeadCommit = getZeroData && await getZeroData(newMainClientGroupHeadHash, {
         openLazySourceRead: perdagWrite
       });
     }
@@ -6575,13 +6575,9 @@ async function refresh(lc, memdag, perdag, clientID, mutators, diffConfig, close
       await Promise.all(ps);
       let newMemdagHeadHash = perdagClientGroupHeadHash;
       if (newMemdagMutations.length > 0) {
-        const zeroData2 = await zero?.getTxData?.(
-          "rebase",
-          newMemdagHeadHash,
-          {
-            openLazyRead: memdagWrite
-          }
-        );
+        const zeroData2 = await zero?.getTxData?.(newMemdagHeadHash, {
+          openLazyRead: memdagWrite
+        });
         for (let i = newMemdagMutations.length - 1; i >= 0; i--) {
           newMemdagHeadHash = (await rebaseMutationAndPutCommit(
             newMemdagMutations[i],
@@ -7624,7 +7620,7 @@ var ReplicacheImpl = class {
         void this.#schedulePersist();
         return;
       }
-      const zeroData2 = await this.#zero?.getTxData?.("rebase", syncHead);
+      const zeroData2 = await this.#zero?.getTxData?.(syncHead);
       for (const mutation of replayMutations) {
         if (this.#subscriptions.hasPendingSubscriptionRuns) {
           await Promise.resolve();
@@ -8190,7 +8186,7 @@ var ReplicacheImpl = class {
           clientID,
           await dbWrite.getMutationID(),
           "initial",
-          await this.#zero?.getTxData("initial", headHash, {
+          await this.#zero?.getTxData(headHash, {
             openLazyRead: dagWrite
           }),
           dbWrite,
@@ -10132,8 +10128,6 @@ var Take = class {
   #limit;
   #partitionKey;
   #partitionKeyComparator;
-  // Fetch overlay needed for some split push cases.
-  #rowHiddenFromFetch;
   #output = throwOutput;
   constructor(input, storage, limit, partitionKey) {
     assert(limit >= 0);
@@ -10169,12 +10163,6 @@ var Take = class {
         if (this.getSchema().compareRows(takeState.bound, inputNode.row) < 0) {
           return;
         }
-        if (this.#rowHiddenFromFetch && this.getSchema().compareRows(
-          this.#rowHiddenFromFetch,
-          inputNode.row
-        ) === 0) {
-          continue;
-        }
         yield inputNode;
       }
       return;
@@ -10317,16 +10305,14 @@ var Take = class {
         type: "remove",
         node: boundNode
       };
+      this.#output.push(change);
       this.#setTakeState(
         takeStateKey,
         takeState.size,
         beforeBoundNode === void 0 || compareRows(change.node.row, beforeBoundNode.row) > 0 ? change.node.row : beforeBoundNode.row,
         maxBound
       );
-      this.#withRowHiddenFromFetch(change.node.row, () => {
-        this.#output.push(removeChange);
-      });
-      this.#output.push(change);
+      this.#output.push(removeChange);
     } else if (change.type === "remove") {
       if (takeState.bound === void 0) {
         return;
@@ -10497,21 +10483,19 @@ var Take = class {
         }),
         2
       );
+      this.#output.push({
+        type: "add",
+        node: change.node
+      });
       this.#setTakeState(
         takeStateKey,
         takeState.size,
         newBoundNode.row,
         maxBound
       );
-      this.#withRowHiddenFromFetch(change.node.row, () => {
-        this.#output.push({
-          type: "remove",
-          node: oldBoundNode
-        });
-      });
       this.#output.push({
-        type: "add",
-        node: change.node
+        type: "remove",
+        node: oldBoundNode
       });
       return;
     }
@@ -10555,14 +10539,6 @@ var Take = class {
     }
     unreachable();
   }
-  #withRowHiddenFromFetch(row, fn) {
-    this.#rowHiddenFromFetch = row;
-    try {
-      fn();
-    } finally {
-      this.#rowHiddenFromFetch = void 0;
-    }
-  }
   #setTakeState(takeStateKey, size, bound, maxBound) {
     this.#storage.set(takeStateKey, {
       size,
@@ -11189,9 +11165,7 @@ var ExpressionBuilder = class {
   and = and;
   or = or;
   not = not2;
-  exists(relationship, cb) {
-    return this.#exists(relationship, cb);
-  }
+  exists = (relationship, cb) => this.#exists(relationship, cb);
 };
 function and(...conditions) {
   const expressions = filterTrue(filterUndefined(conditions));
@@ -12338,8 +12312,6 @@ var pokeStartBodySchema = valita_exports.object({
   // 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,
-  // Deprecated: Replaced by pokeEnd.cookie.
-  cookie: versionSchema.optional(),
   /**
    * This field is always set if the poke contains a `rowsPatch`.
    * It may be absent for patches that only update clients and queries.
@@ -12435,10 +12407,8 @@ var Custom = "custom";
 
 // ../zero-protocol/src/protocol-version.ts
 var PROTOCOL_VERSION = 7;
-var MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 2;
+var MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 6;
 assert(MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION);
-var MIN_SERVER_SUPPORTED_PERMISSIONS_PROTOCOL = 4;
-assert(MIN_SERVER_SUPPORTED_PERMISSIONS_PROTOCOL < PROTOCOL_VERSION);
 
 // ../zero-protocol/src/push.ts
 var CRUD_MUTATION_NAME = "_zero_crud";
@@ -13697,14 +13667,7 @@ var IVMSourceBranch = class _IVMSourceBranch {
   /**
    * Fork the branch and patch it up to match the desired head.
    */
-  async forkToHead(reason, store, desiredHead, readOptions) {
-    if (reason === "initial") {
-      assert(
-        this.hash === desiredHead,
-        "main branch must be at desired head for `initial`"
-      );
-      return this;
-    }
+  async forkToHead(store, desiredHead, readOptions) {
     const fork = this.fork();
     if (fork.hash === desiredHead) {
       return fork;
@@ -14125,12 +14088,7 @@ var TransactionImpl = class {
     this.mutate = makeSchemaCRUD(
       schema,
       repTx,
-      // CRUD operators should not mutate the IVM store directly
-      // for `initial`. The IVM store will be updated via calls to `advance`
-      // after the transaction has been committed to the Replicache b-tree.
-      // Mutating the IVM store in the mutator would cause us to synchronously
-      // notify listeners of IVM while we're inside of the Replicache DB transaction.
-      repTx.reason === "initial" ? void 0 : must(
+      must(
         castedRepTx[zeroData],
         "zero was not set on replicache internal options!"
       )
@@ -14526,7 +14484,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.17.2025032000";
+var version2 = "0.18.2025031800";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -15478,12 +15436,11 @@ var ZeroRep = class {
     this.#store = store;
     this.#context.processChanges(void 0, hash2, diffs);
   }
-  getTxData = (reason, desiredHead, readOptions) => {
+  getTxData = (desiredHead, readOptions) => {
     if (!this.#customMutatorsEnabled) {
       return;
     }
     return this.#ivmMain.forkToHead(
-      reason,
       must(this.#store),
       desiredHead,
       readOptions
@@ -15684,19 +15641,45 @@ var Zero = class {
       [CRUD_MUTATION_NAME]: makeCRUDMutator(schema)
     };
     this.#ivmMain = new IVMSourceBranch(schema.tables);
+    function assertUnique(key) {
+      assert(
+        replicacheMutators[key] === void 0,
+        `A mutator, or mutator namespace, has already been defined for ${key}`
+      );
+    }
     const lc = new LogContext4(logOptions.logLevel, {}, logOptions.logSink);
-    for (const [namespace, mutatorsForNamespace] of Object.entries(
-      options.mutators ?? {}
-    )) {
-      for (const [name, mutator] of Object.entries(
-        mutatorsForNamespace
+    if (options.mutators) {
+      for (const [namespaceOrKey, mutatorOrMutators] of Object.entries(
+        options.mutators
       )) {
-        replicacheMutators[customMutatorKey(namespace, name)] = makeReplicacheMutator(
-          lc,
-          mutator,
-          schema,
-          slowMaterializeThreshold
-        );
+        if (typeof mutatorOrMutators === "function") {
+          const key = namespaceOrKey;
+          assertUnique(key);
+          replicacheMutators[key] = makeReplicacheMutator(
+            lc,
+            mutatorOrMutators,
+            schema,
+            slowMaterializeThreshold
+          );
+          continue;
+        }
+        if (typeof mutatorOrMutators === "object") {
+          for (const [name, mutator] of Object.entries(mutatorOrMutators)) {
+            const key = customMutatorKey(
+              namespaceOrKey,
+              name
+            );
+            assertUnique(key);
+            replicacheMutators[key] = makeReplicacheMutator(
+              lc,
+              mutator,
+              schema,
+              slowMaterializeThreshold
+            );
+          }
+          continue;
+        }
+        unreachable(mutatorOrMutators);
       }
     }
     this.storageKey = storageKey ?? "";
@@ -15770,19 +15753,23 @@ var Zero = class {
     if (options.mutators) {
       mutate = {};
       mutateBatch = void 0;
-    }
-    for (const [namespace, mutatorsForNamespace] of Object.entries(
-      options.mutators ?? {}
-    )) {
-      let existing = mutate[namespace];
-      if (existing === void 0) {
-        existing = {};
-        mutate[namespace] = existing;
-      }
-      for (const name of Object.keys(
-        mutatorsForNamespace
+      for (const [namespaceOrKey, mutatorsOrMutator] of Object.entries(
+        options.mutators
       )) {
-        existing[name] = must(rep.mutate[customMutatorKey(namespace, name)]);
+        if (typeof mutatorsOrMutator === "function") {
+          mutate[namespaceOrKey] = must(rep.mutate[namespaceOrKey]);
+          continue;
+        }
+        let existing = mutate[namespaceOrKey];
+        if (existing === void 0) {
+          existing = {};
+          mutate[namespaceOrKey] = existing;
+        }
+        for (const name of Object.keys(mutatorsOrMutator)) {
+          existing[name] = must(
+            rep.mutate[customMutatorKey(namespaceOrKey, name)]
+          );
+        }
       }
     }
     this.mutate = mutate;
@@ -16802,4 +16789,4 @@ export {
   escapeLike,
   Zero
 };
-//# sourceMappingURL=chunk-OI2PV2HL.js.map
+//# sourceMappingURL=chunk-FNFCFUNQ.js.map