@rocicorp/zero 0.22.2025070600 → 0.22.2025070702

package/out/{chunk-U52OBQ2U.js → chunk-4XUYLHLN.js}

@@ -3209,7 +3209,6 @@ function applyChange(parentEntry, change, schema, relationship, format, withIDs
   switch (change.type) {
     case "add": {
       let newEntry;
-      let rc = 1;
       if (singular) {
         const oldEntry = parentEntry[relationship];
         if (oldEntry !== void 0) {
@@ -3217,42 +3216,40 @@ function applyChange(parentEntry, change, schema, relationship, format, withIDs
             schema.compareRows(oldEntry, change.node.row) === 0,
             `Singular relationship '${relationship}' should not have multiple rows. You may need to declare this relationship with the \`many\` helper instead of the \`one\` helper in your schema.`
           );
-          rc = oldEntry[refCountSymbol] + 1;
+          oldEntry[refCountSymbol]++;
+        } else {
+          newEntry = makeNewMetaEntry(change.node.row, schema, withIDs, 1);
+          parentEntry[relationship] = newEntry;
         }
-        newEntry = makeNewEntryWithRefCount(
-          change.node.row,
-          schema,
-          withIDs,
-          rc
-        );
-        parentEntry[relationship] = newEntry;
       } else {
-        newEntry = makeNewEntryAndInsert(
+        newEntry = add(
           change.node.row,
           getChildEntryList(parentEntry, relationship),
           schema,
           withIDs
         );
       }
-      for (const [relationship2, children] of Object.entries(
-        change.node.relationships
-      )) {
-        const childSchema = must(schema.relationships[relationship2]);
-        const childFormat = childFormats[relationship2];
-        if (childFormat === void 0) {
-          continue;
-        }
-        const newView = childFormat.singular ? void 0 : [];
-        newEntry[relationship2] = newView;
-        for (const node of children()) {
-          applyChange(
-            newEntry,
-            { type: "add", node },
-            childSchema,
-            relationship2,
-            childFormat,
-            withIDs
-          );
+      if (newEntry) {
+        for (const [relationship2, children] of Object.entries(
+          change.node.relationships
+        )) {
+          const childSchema = must(schema.relationships[relationship2]);
+          const childFormat = childFormats[relationship2];
+          if (childFormat === void 0) {
+            continue;
+          }
+          const newView = childFormat.singular ? void 0 : [];
+          newEntry[relationship2] = newView;
+          for (const node of children()) {
+            applyChange(
+              newEntry,
+              { type: "add", node },
+              childSchema,
+              relationship2,
+              childFormat,
+              withIDs
+            );
+          }
         }
       }
       break;
@@ -3309,50 +3306,54 @@ function applyChange(parentEntry, change, schema, relationship, format, withIDs
     case "edit": {
       if (singular) {
         const existing = parentEntry[relationship];
-        assertRCEntry(existing);
-        const rc = existing[refCountSymbol];
-        const newEntry = {
-          ...existing,
-          ...change.node.row,
-          [refCountSymbol]: rc
-        };
-        existing[refCountSymbol] = 0;
-        parentEntry[relationship] = newEntry;
+        assertMetaEntry(existing);
+        applyEdit(existing, change, schema, withIDs);
       } else {
         const view = getChildEntryList(parentEntry, relationship);
-        if (schema.compareRows(change.oldNode.row, change.node.row) === 0) {
-          const { pos, found } = binarySearch3(
+        if (schema.compareRows(change.oldNode.row, change.node.row) !== 0) {
+          const { pos: oldPos, found: oldFound } = binarySearch3(
             view,
             change.oldNode.row,
             schema.compareRows
           );
-          assert(found, "node does not exist");
-          const oldEntry = view[pos];
-          const rc = oldEntry[refCountSymbol];
-          oldEntry[refCountSymbol] = 0;
-          const newEntry = makeEntryPreserveRelationships(
+          assert(oldFound, "old node does not exist");
+          const oldEntry = view[oldPos];
+          const { pos, found } = binarySearch3(
+            view,
             change.node.row,
-            oldEntry,
-            format.relationships,
-            schema,
-            withIDs,
-            rc
+            schema.compareRows
           );
-          view[pos] = newEntry;
+          if (oldEntry[refCountSymbol] === 1 && (pos === oldPos || pos - 1 === oldPos)) {
+            applyEdit(oldEntry, change, schema, withIDs);
+          } else {
+            oldEntry[refCountSymbol]--;
+            let adjustedPos = pos;
+            if (oldEntry[refCountSymbol] === 0) {
+              view.splice(oldPos, 1);
+              adjustedPos = oldPos < pos ? pos - 1 : pos;
+            }
+            let entryToEdit;
+            if (found) {
+              entryToEdit = view[adjustedPos];
+            } else {
+              view.splice(adjustedPos, 0, oldEntry);
+              entryToEdit = oldEntry;
+              if (oldEntry[refCountSymbol] > 0) {
+                const oldEntryCopy = { ...oldEntry };
+                view[oldPos] = oldEntryCopy;
+              }
+            }
+            entryToEdit[refCountSymbol]++;
+            applyEdit(entryToEdit, change, schema, withIDs);
+          }
         } else {
-          const oldEntry = removeAndUpdateRefCount(
+          const { pos, found } = binarySearch3(
             view,
             change.oldNode.row,
             schema.compareRows
           );
-          insertAndSetRefCount(
-            view,
-            change.node.row,
-            oldEntry,
-            format.relationships,
-            schema,
-            withIDs
-          );
+          assert(found, "node does not exist");
+          applyEdit(view[pos], change, schema, withIDs);
         }
       }
       break;
@@ -3361,39 +3362,21 @@ function applyChange(parentEntry, change, schema, relationship, format, withIDs
       unreachable(change);
   }
 }
-function makeNewEntryAndInsert(newRow, view, schema, withIDs) {
-  const { pos, found } = binarySearch3(view, newRow, schema.compareRows);
-  let deleteCount = 0;
-  let rc = 1;
-  if (found) {
-    deleteCount = 1;
-    rc = view[pos][refCountSymbol];
-    view[pos][refCountSymbol] = rc - 1;
-    rc++;
+function applyEdit(existing, change, schema, withIDs) {
+  Object.assign(existing, change.node.row);
+  if (withIDs) {
+    existing[idSymbol] = makeID(change.node.row, schema);
   }
-  const newEntry = makeNewEntryWithRefCount(newRow, schema, withIDs, rc);
-  view.splice(pos, deleteCount, newEntry);
-  return newEntry;
 }
-function insertAndSetRefCount(view, newRow, oldEntry, relationships, schema, withIDs) {
-  const { pos, found } = binarySearch3(view, newRow, schema.compareRows);
-  let deleteCount = 0;
-  let rc = 1;
+function add(row, view, schema, withIDs) {
+  const { pos, found } = binarySearch3(view, row, schema.compareRows);
   if (found) {
-    deleteCount = 1;
-    const oldEntry2 = view[pos];
-    rc = oldEntry2[refCountSymbol] + 1;
-    oldEntry2[refCountSymbol] = 0;
-  }
-  const newEntry = makeEntryPreserveRelationships(
-    newRow,
-    oldEntry,
-    relationships,
-    schema,
-    withIDs,
-    rc
-  );
-  view.splice(pos, deleteCount, newEntry);
+    view[pos][refCountSymbol]++;
+    return void 0;
+  }
+  const newEntry = makeNewMetaEntry(row, schema, withIDs, 1);
+  view.splice(pos, 0, newEntry);
+  return newEntry;
 }
 function removeAndUpdateRefCount(view, row, compareRows) {
   const { pos, found } = binarySearch3(view, row, compareRows);
@@ -3422,20 +3405,12 @@ function binarySearch3(view, target, comparator) {
   }
   return { pos: low, found: false };
 }
-function makeEntryPreserveRelationships(newRow, oldEntry, relationships, schema, withIDs, rc) {
-  const entry = makeNewEntryWithRefCount(newRow, schema, withIDs, rc);
-  for (const relationship in relationships) {
-    assert(!(relationship in newRow), "Relationship already exists");
-    entry[relationship] = oldEntry[relationship];
-  }
-  return entry;
-}
 function getChildEntryList(parentEntry, relationship) {
   const view = parentEntry[relationship];
   assertArray(view);
   return view;
 }
-function assertRCEntry(v2) {
+function assertMetaEntry(v2) {
   assertNumber(v2[refCountSymbol]);
 }
 function getSingularEntry(parentEntry, relationship) {
@@ -3443,9 +3418,11 @@ function getSingularEntry(parentEntry, relationship) {
   assertNumber(e[refCountSymbol]);
   return e;
 }
-function makeNewEntryWithRefCount(row, schema, withIDs, rc) {
-  const id = withIDs ? makeID(row, schema) : "";
-  return { ...row, [refCountSymbol]: rc, [idSymbol]: id };
+function makeNewMetaEntry(row, schema, withIDs, rc) {
+  if (withIDs) {
+    return { ...row, [refCountSymbol]: rc, [idSymbol]: makeID(row, schema) };
+  }
+  return { ...row, [refCountSymbol]: rc };
 }
 function makeID(row, schema) {
   if (schema.primaryKey.length === 1) {
@@ -7088,4 +7065,4 @@ export {
   toPrimaryKeyString,
   sourceNameFromKey
 };
-//# sourceMappingURL=chunk-U52OBQ2U.js.map
+//# sourceMappingURL=chunk-4XUYLHLN.js.map