@rocicorp/zero 0.17.2025031401 → 0.17.2025031904

package/out/advanced.js

@@ -1,7 +1,7 @@
 import "./chunk-ULOTOBTC.js";
 import {
   applyChange
-} from "./chunk-SVJISXWE.js";
+} from "./chunk-MJCITZ5S.js";
 import "./chunk-424PT5DM.js";
 export {
   applyChange

package/out/{chunk-UZE45UK4.js → chunk-BPGCXNAT.js}

@@ -21,7 +21,7 @@ import {
   throwInvalidType,
   unreachable,
   valuesEqual
-} from "./chunk-SVJISXWE.js";
+} from "./chunk-MJCITZ5S.js";
 import {
   __export,
   __reExport
@@ -6315,7 +6315,7 @@ async function persistDD31(lc, clientID, memdag, perdag, mutators, closed, forma
     return;
   }
   let memdagBaseSnapshotPersisted = false;
-  const zeroDataForMemdagBaseSnapshot = getZeroData && await getZeroData(memdagBaseSnapshot.chunk.hash);
+  const zeroDataForMemdagBaseSnapshot = getZeroData && await getZeroData("rebase", 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(newMainClientGroupHeadHash, {
+      zeroDataForPerdagHeadCommit = getZeroData && await getZeroData("rebase", newMainClientGroupHeadHash, {
         openLazySourceRead: perdagWrite
       });
     }
@@ -6575,9 +6575,13 @@ 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?.(newMemdagHeadHash, {
-          openLazyRead: memdagWrite
-        });
+        const zeroData2 = await zero?.getTxData?.(
+          "rebase",
+          newMemdagHeadHash,
+          {
+            openLazyRead: memdagWrite
+          }
+        );
         for (let i = newMemdagMutations.length - 1; i >= 0; i--) {
           newMemdagHeadHash = (await rebaseMutationAndPutCommit(
             newMemdagMutations[i],
@@ -7620,7 +7624,7 @@ var ReplicacheImpl = class {
         void this.#schedulePersist();
         return;
       }
-      const zeroData2 = await this.#zero?.getTxData?.(syncHead);
+      const zeroData2 = await this.#zero?.getTxData?.("rebase", syncHead);
       for (const mutation of replayMutations) {
         if (this.#subscriptions.hasPendingSubscriptionRuns) {
           await Promise.resolve();
@@ -8186,7 +8190,7 @@ var ReplicacheImpl = class {
           clientID,
           await dbWrite.getMutationID(),
           "initial",
-          await this.#zero?.getTxData(headHash, {
+          await this.#zero?.getTxData("initial", headHash, {
             openLazyRead: dagWrite
           }),
           dbWrite,
@@ -10128,6 +10132,8 @@ 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);
@@ -10163,6 +10169,12 @@ 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;
@@ -10305,14 +10317,16 @@ 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.#output.push(removeChange);
+      this.#withRowHiddenFromFetch(change.node.row, () => {
+        this.#output.push(removeChange);
+      });
+      this.#output.push(change);
     } else if (change.type === "remove") {
       if (takeState.bound === void 0) {
         return;
@@ -10483,19 +10497,21 @@ 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: "remove",
-        node: oldBoundNode
+        type: "add",
+        node: change.node
       });
       return;
     }
@@ -10539,6 +10555,14 @@ 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,
@@ -11074,7 +11098,6 @@ var ArrayView = class {
   onDestroy;
   #dirty = false;
   #complete = false;
-  #refCountMap = /* @__PURE__ */ new WeakMap();
   constructor(input, format = { singular: false, relationships: {} }, queryComplete = true) {
     this.#input = input;
     this.#schema = input.getSchema();
@@ -11124,22 +11147,14 @@ var ArrayView = class {
         { type: "add", node },
         this.#schema,
         "",
-        this.#format,
-        this.#refCountMap
+        this.#format
       );
     }
     this.flush();
   }
   push(change) {
     this.#dirty = true;
-    applyChange(
-      this.#root,
-      change,
-      this.#schema,
-      "",
-      this.#format,
-      this.#refCountMap
-    );
+    applyChange(this.#root, change, this.#schema, "", this.#format);
   }
   flush() {
     if (!this.#dirty) {
@@ -13682,7 +13697,14 @@ var IVMSourceBranch = class _IVMSourceBranch {
   /**
    * Fork the branch and patch it up to match the desired head.
    */
-  async forkToHead(store, desiredHead, readOptions) {
+  async forkToHead(reason, store, desiredHead, readOptions) {
+    if (reason === "initial") {
+      assert(
+        this.hash === desiredHead,
+        "main branch must be at desired head for `initial`"
+      );
+      return this;
+    }
     const fork = this.fork();
     if (fork.hash === desiredHead) {
       return fork;
@@ -14103,7 +14125,12 @@ var TransactionImpl = class {
     this.mutate = makeSchemaCRUD(
       schema,
       repTx,
-      must(
+      // 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(
         castedRepTx[zeroData],
         "zero was not set on replicache internal options!"
       )
@@ -14499,7 +14526,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.17.2025031401";
+var version2 = "0.17.2025031904";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -15451,11 +15478,12 @@ var ZeroRep = class {
     this.#store = store;
     this.#context.processChanges(void 0, hash2, diffs);
   }
-  getTxData = (desiredHead, readOptions) => {
+  getTxData = (reason, desiredHead, readOptions) => {
     if (!this.#customMutatorsEnabled) {
       return;
     }
     return this.#ivmMain.forkToHead(
+      reason,
       must(this.#store),
       desiredHead,
       readOptions
@@ -15656,45 +15684,19 @@ 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);
-    if (options.mutators) {
-      for (const [namespaceOrKey, mutatorOrMutators] of Object.entries(
-        options.mutators
+    for (const [namespace, mutatorsForNamespace] of Object.entries(
+      options.mutators ?? {}
+    )) {
+      for (const [name, mutator] of Object.entries(
+        mutatorsForNamespace
       )) {
-        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);
+        replicacheMutators[customMutatorKey(namespace, name)] = makeReplicacheMutator(
+          lc,
+          mutator,
+          schema,
+          slowMaterializeThreshold
+        );
       }
     }
     this.storageKey = storageKey ?? "";
@@ -15768,23 +15770,19 @@ var Zero = class {
     if (options.mutators) {
       mutate = {};
       mutateBatch = void 0;
-      for (const [namespaceOrKey, mutatorsOrMutator] of Object.entries(
-        options.mutators
+    }
+    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
       )) {
-        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)]
-          );
-        }
+        existing[name] = must(rep.mutate[customMutatorKey(namespace, name)]);
       }
     }
     this.mutate = mutate;
@@ -16804,4 +16802,4 @@ export {
   escapeLike,
   Zero
 };
-//# sourceMappingURL=chunk-UZE45UK4.js.map
+//# sourceMappingURL=chunk-BPGCXNAT.js.map