@rocicorp/zero 0.24.2025092400 → 0.24.2025092700

package/out/{chunk-5JTC5G4I.js → chunk-YHZFOFXO.js}

@@ -49,6 +49,8 @@ import {
   compareCookiesForSnapshots,
   compareTTL,
   compareValues,
+  constraintMatchesPrimaryKey,
+  constraintMatchesRow,
   createChunk,
   createPredicate,
   decodeIndexKey,
@@ -103,6 +105,7 @@ import {
   normalizeAST,
   once,
   parse,
+  primaryKeyConstraintFromFilters,
   primaryKeySchema,
   primaryKeyValueRecordSchema,
   readFromDefaultHead,
@@ -132,7 +135,7 @@ import {
   withWrite,
   withWriteNoImplicitCommit,
   wrapIterable
-} from "./chunk-QZPMFA73.js";
+} from "./chunk-MGNNTSXN.js";
 import {
   assert,
   assertArray,
@@ -6425,7 +6428,7 @@ var downstreamSchema = valita_exports.union(
 );
 
 // ../zero-protocol/src/protocol-version.ts
-var PROTOCOL_VERSION = 33;
+var PROTOCOL_VERSION = 34;
 var MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 18;
 assert(MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION);
 
@@ -7283,7 +7286,7 @@ var MeasurePushOperator = class {
   }
   push(change) {
     const startTime = performance.now();
-    this.#output.push(change);
+    this.#output.push(change, this);
     this.#metricsDelegate.addMetric(
       this.#metricName,
       performance.now() - startTime,
@@ -7292,73 +7295,6 @@ var MeasurePushOperator = class {
   }
 };
 
-// ../zql/src/ivm/constraint.ts
-function constraintMatchesRow(constraint, row) {
-  for (const key in constraint) {
-    if (!valuesEqual(row[key], constraint[key])) {
-      return false;
-    }
-  }
-  return true;
-}
-function constraintMatchesPrimaryKey(constraint, primary) {
-  const constraintKeys = Object.keys(constraint);
-  if (constraintKeys.length !== primary.length) {
-    return false;
-  }
-  constraintKeys.sort(stringCompare);
-  for (let i = 0; i < constraintKeys.length; i++) {
-    if (constraintKeys[i] !== primary[i]) {
-      return false;
-    }
-  }
-  return true;
-}
-function pullSimpleAndComponents(condition) {
-  if (condition.type === "and") {
-    return condition.conditions.flatMap(pullSimpleAndComponents);
-  }
-  if (condition.type === "simple") {
-    return [condition];
-  }
-  if (condition.type === "or" && condition.conditions.length === 1) {
-    return pullSimpleAndComponents(condition.conditions[0]);
-  }
-  return [];
-}
-function primaryKeyConstraintFromFilters(condition, primary) {
-  if (condition === void 0) {
-    return void 0;
-  }
-  const conditions = pullSimpleAndComponents(condition);
-  if (conditions.length === 0) {
-    return void 0;
-  }
-  const ret = {};
-  for (const subCondition of conditions) {
-    if (subCondition.op === "=") {
-      const column = extractColumn(subCondition);
-      if (column !== void 0) {
-        if (!primary.includes(column.name)) {
-          continue;
-        }
-        ret[column.name] = column.value;
-      }
-    }
-  }
-  if (Object.keys(ret).length !== primary.length) {
-    return void 0;
-  }
-  return ret;
-}
-function extractColumn(condition) {
-  if (condition.left.type === "column") {
-    assert(condition.right.type === "literal");
-    return { name: condition.left.name, value: condition.right.value };
-  }
-  return void 0;
-}
-
 // ../zql/src/ivm/memory-source.ts
 var MemorySource = class _MemorySource {
   #tableName;
@@ -7368,7 +7304,6 @@ var MemorySource = class _MemorySource {
   #indexes = /* @__PURE__ */ new Map();
   #connections = [];
   #overlay;
-  #splitEditOverlay;
   constructor(tableName, columns, primaryKey, primaryIndexData) {
     this.#tableName = tableName;
     this.#columns = columns;
@@ -7524,7 +7459,6 @@ var MemorySource = class _MemorySource {
       // rather than as the fetch constraint.
       req.constraint,
       this.#overlay,
-      this.#splitEditOverlay,
       callingConnectionIndex,
       // Use indexComparator, generateWithOverlayInner has a subtle dependency
       // on this.  Since generateWithConstraint is done after
@@ -7558,7 +7492,7 @@ var MemorySource = class _MemorySource {
     const { data } = primaryIndex;
     const exists = (row) => data.has(row);
     const setOverlay = (o) => this.#overlay = o;
-    const setSplitEditOverlay = (o) => this.#splitEditOverlay = o;
+    const writeChange = (c) => this.#writeChange(c);
     if (change.type === "set") {
       const existing = data.get(change.row);
       if (existing !== void 0) {
@@ -7574,31 +7508,31 @@ var MemorySource = class _MemorySource {
         };
       }
     }
-    for (const x of genPush(
+    yield* genPushAndWriteWithSplitEdit(
+      this.#connections,
       change,
       exists,
-      this.#connections.entries(),
       setOverlay,
-      setSplitEditOverlay
-    )) {
-      yield x;
-    }
-    for (const { data: data2 } of this.#indexes.values()) {
+      writeChange
+    );
+  }
+  #writeChange(change) {
+    for (const { data } of this.#indexes.values()) {
       switch (change.type) {
         case "add": {
-          const added = data2.add(change.row);
+          const added = data.add(change.row);
           assert(added);
           break;
         }
         case "remove": {
-          const removed = data2.delete(change.row);
+          const removed = data.delete(change.row);
           assert(removed);
           break;
         }
         case "edit": {
-          const removed = data2.delete(change.oldRow);
+          const removed = data.delete(change.oldRow);
           assert(removed);
-          data2.add(change.row);
+          data.add(change.row);
           break;
         }
         default:
@@ -7622,7 +7556,58 @@ function* generateWithFilter(it, filter) {
     }
   }
 }
-function* genPush(change, exists, connections, setOverlay, setSplitEditOverlay) {
+function* genPushAndWriteWithSplitEdit(connections, change, exists, setOverlay, writeChange) {
+  let shouldSplitEdit = false;
+  if (change.type === "edit") {
+    for (const { splitEditKeys } of connections) {
+      if (splitEditKeys) {
+        for (const key of splitEditKeys) {
+          if (!valuesEqual(change.row[key], change.oldRow[key])) {
+            shouldSplitEdit = true;
+            break;
+          }
+        }
+      }
+    }
+  }
+  if (change.type === "edit" && shouldSplitEdit) {
+    yield* genPushAndWrite(
+      connections,
+      {
+        type: "remove",
+        row: change.oldRow
+      },
+      exists,
+      setOverlay,
+      writeChange
+    );
+    yield* genPushAndWrite(
+      connections,
+      {
+        type: "add",
+        row: change.row
+      },
+      exists,
+      setOverlay,
+      writeChange
+    );
+  } else {
+    yield* genPushAndWrite(
+      connections,
+      change,
+      exists,
+      setOverlay,
+      writeChange
+    );
+  }
+}
+function* genPushAndWrite(connections, change, exists, setOverlay, writeChange) {
+  for (const x of genPush(connections, change, exists, setOverlay)) {
+    yield x;
+  }
+  writeChange(change);
+}
+function* genPush(connections, change, exists, setOverlay) {
   switch (change.type) {
     case "add":
       assert(
@@ -7639,68 +7624,28 @@ function* genPush(change, exists, connections, setOverlay, setSplitEditOverlay)
     default:
       unreachable(change);
   }
-  for (const [outputIndex, { output, splitEditKeys, filters }] of connections) {
+  for (const [outputIndex, { output, filters, input }] of connections.entries()) {
     if (output) {
-      let splitEdit = false;
-      if (change.type === "edit" && splitEditKeys) {
-        for (const key of splitEditKeys) {
-          if (!valuesEqual(change.row[key], change.oldRow[key])) {
-            splitEdit = true;
-            break;
-          }
+      setOverlay({ outputIndex, change });
+      const outputChange = change.type === "edit" ? {
+        type: change.type,
+        oldNode: {
+          row: change.oldRow,
+          relationships: {}
+        },
+        node: {
+          row: change.row,
+          relationships: {}
         }
-      }
-      if (splitEdit) {
-        assert(change.type === "edit");
-        setSplitEditOverlay({
-          outputIndex,
-          change: {
-            type: "remove",
-            row: change.oldRow
-          }
-        });
-        const outputRemove = {
-          type: "remove",
-          node: {
-            row: change.oldRow,
-            relationships: {}
-          }
-        };
-        filterPush(outputRemove, output, filters?.predicate);
-        yield;
-        setSplitEditOverlay(void 0);
-        setOverlay({ outputIndex, change });
-        const outputAdd = {
-          type: "add",
-          node: {
-            row: change.row,
-            relationships: {}
-          }
-        };
-        filterPush(outputAdd, output, filters?.predicate);
-        yield;
-      } else {
-        setOverlay({ outputIndex, change });
-        const outputChange = change.type === "edit" ? {
-          type: change.type,
-          oldNode: {
-            row: change.oldRow,
-            relationships: {}
-          },
-          node: {
-            row: change.row,
-            relationships: {}
-          }
-        } : {
-          type: change.type,
-          node: {
-            row: change.row,
-            relationships: {}
-          }
-        };
-        filterPush(outputChange, output, filters?.predicate);
-        yield;
-      }
+      } : {
+        type: change.type,
+        node: {
+          row: change.row,
+          relationships: {}
+        }
+      };
+      filterPush(outputChange, output, input, filters?.predicate);
+      yield;
     }
   }
   setOverlay(void 0);
@@ -7728,11 +7673,9 @@ function* generateWithStart(nodes, start, compare2) {
     }
   }
 }
-function* generateWithOverlay(startAt, rows, constraint, overlay, splitEditOverlay, connectionIndex, compare2, filterPredicate) {
+function* generateWithOverlay(startAt, rows, constraint, overlay, connectionIndex, compare2, filterPredicate) {
   let overlayToApply = void 0;
-  if (splitEditOverlay && splitEditOverlay.outputIndex === connectionIndex) {
-    overlayToApply = splitEditOverlay;
-  } else if (overlay && connectionIndex <= overlay.outputIndex) {
+  if (overlay && connectionIndex <= overlay.outputIndex) {
     overlayToApply = overlay;
   }
   const overlays = computeOverlays(
@@ -8749,7 +8692,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.24.2025092400";
+var version2 = "0.24.2025092700";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -11724,4 +11667,4 @@ export {
   update_needed_reason_type_enum_exports,
   Zero
 };
-//# sourceMappingURL=chunk-5JTC5G4I.js.map
+//# sourceMappingURL=chunk-YHZFOFXO.js.map