@rocicorp/zero 0.12.2025012902 → 0.12.2025013000

package/out/advanced.js

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

package/out/{chunk-HQA4Z25K.js → chunk-UEPZPKPV.js}

@@ -10,10 +10,15 @@ import {
   assertNumber,
   assertObject,
   assertString,
+  compareValues,
+  drainStreams,
+  makeComparator,
   must,
+  normalizeUndefined,
   throwInvalidType,
-  unreachable
-} from "./chunk-QAAJZ32T.js";
+  unreachable,
+  valuesEqual
+} from "./chunk-ZVLXEWWB.js";
 import {
   __export,
   __reExport
@@ -8939,63 +8944,6 @@ function isTwoHop(r) {
   return r.length === 2;
 }
 
-// ../zql/src/ivm/change.ts
-function rowForChange(change) {
-  const { type } = change;
-  return type === "child" ? change.row : change.node.row;
-}
-
-// ../zql/src/ivm/data.ts
-import { compareUTF8 as compareUTF84 } from "compare-utf8";
-function compareValues(a, b) {
-  a = normalizeUndefined(a);
-  b = normalizeUndefined(b);
-  if (a === b) {
-    return 0;
-  }
-  if (a === null) {
-    return -1;
-  }
-  if (b === null) {
-    return 1;
-  }
-  if (typeof a === "boolean") {
-    assertBoolean(b);
-    return a ? 1 : -1;
-  }
-  if (typeof a === "number") {
-    assertNumber(b);
-    return a - b;
-  }
-  if (typeof a === "string") {
-    assertString(b);
-    return compareUTF84(a, b);
-  }
-  throw new Error(`Unsupported type: ${a}`);
-}
-function normalizeUndefined(v2) {
-  return v2 ?? null;
-}
-function makeComparator(order, reverse) {
-  return (a, b) => {
-    for (const ord of order) {
-      const field = ord[0];
-      const comp = compareValues(a[field], b[field]);
-      if (comp !== 0) {
-        const result = ord[1] === "asc" ? comp : -comp;
-        return reverse ? -result : result;
-      }
-    }
-    return 0;
-  };
-}
-function valuesEqual(a, b) {
-  if (a == null || b == null) {
-    return false;
-  }
-  return a === b;
-}
-
 // ../zql/src/ivm/operator.ts
 var throwOutput = {
   push(_change) {
@@ -9056,17 +9004,19 @@ var Exists = class {
   }
   *fetch(req) {
     for (const node of this.#input.fetch(req)) {
-      if (this.#filter(node.row)) {
+      if (this.#filter(node)) {
         yield node;
       }
     }
   }
   *cleanup(req) {
     for (const node of this.#input.cleanup(req)) {
-      if (this.#filter(node.row)) {
+      if (this.#filter(node)) {
         yield node;
+      } else {
+        drainStreams(node);
       }
-      this.#delSize(node.row);
+      this.#delSize(node);
     }
   }
   push(change) {
@@ -9079,12 +9029,12 @@ var Exists = class {
         return;
       }
       case "remove": {
-        const size = this.#getSize(change.node.row);
+        const size = this.#getSize(change.node);
         if (size === void 0) {
           return;
         }
         this.#pushWithFilter(change, size);
-        this.#delSize(change.node.row);
+        this.#delSize(change.node);
         return;
       }
       case "child":
@@ -9094,13 +9044,13 @@ var Exists = class {
         }
         switch (change.child.change.type) {
           case "add": {
-            let size = this.#getSize(change.row);
+            let size = this.#getSize(change.node);
             if (size !== void 0) {
               size++;
-              this.#setCachedSize(change.row, size);
-              this.#setSize(change.row, size);
+              this.#setCachedSize(change.node, size);
+              this.#setSize(change.node, size);
             } else {
-              size = this.#fetchSize(change.row);
+              size = this.#fetchSize(change.node);
             }
             if (size === 1) {
               const type = this.#not ? "remove" : "add";
@@ -9109,7 +9059,7 @@ var Exists = class {
               }
               this.#output.push({
                 type,
-                node: this.#fetchNodeForRow(change.row)
+                node: change.node
               });
             } else {
               this.#pushWithFilter(change, size);
@@ -9117,16 +9067,16 @@ var Exists = class {
             return;
           }
           case "remove": {
-            let size = this.#getSize(change.row);
+            let size = this.#getSize(change.node);
             if (size !== void 0) {
               if (size === 0) {
                 return;
               }
               size--;
-              this.#setCachedSize(change.row, size);
-              this.#setSize(change.row, size);
+              this.#setCachedSize(change.node, size);
+              this.#setSize(change.node, size);
             } else {
-              size = this.#fetchSize(change.row);
+              size = this.#fetchSize(change.node);
             }
             if (size === 0) {
               const type = this.#not ? "add" : "remove";
@@ -9135,7 +9085,7 @@ var Exists = class {
               }
               this.#output.push({
                 type,
-                node: this.#fetchNodeForRow(change.row)
+                node: change.node
               });
             } else {
               this.#pushWithFilter(change, size);
@@ -9149,106 +9099,90 @@ var Exists = class {
     }
   }
   /**
-   * Returns whether or not the change's row's this.#relationshipName
+   * Returns whether or not the node's this.#relationshipName
    * relationship passes the exist/not exists filter condition.
    * If the optional `size` is passed it is used.
    * Otherwise, if there is a stored size for the row it is used.
-   * Otherwise the size is computed by fetching a node for the row from
-   * this.#input (this computed size is also stored).
+   * Otherwise the size is computed by streaming the node's
+   * relationship with this.#relationshipName (this computed size is also
+   * stored).
    */
-  #filter(row, size) {
-    const exists = (size ?? this.#getOrFetchSize(row)) > 0;
+  #filter(node, size) {
+    const exists = (size ?? this.#getOrFetchSize(node)) > 0;
     return this.#not ? !exists : exists;
   }
   /**
    * Pushes a change if this.#filter is true for its row.
    */
   #pushWithFilter(change, size) {
-    const row = rowForChange(change);
-    if (this.#filter(row, size)) {
+    if (this.#filter(change.node, size)) {
       this.#output.push(change);
     }
   }
-  #getSize(row) {
-    return this.#storage.get(this.#makeSizeStorageKey(row));
+  #getSize(node) {
+    return this.#storage.get(this.#makeSizeStorageKey(node));
   }
-  #setSize(row, size) {
-    this.#storage.set(this.#makeSizeStorageKey(row), size);
+  #setSize(node, size) {
+    this.#storage.set(this.#makeSizeStorageKey(node), size);
   }
-  #setCachedSize(row, size) {
+  #setCachedSize(node, size) {
     if (this.#skipCache) {
       return;
     }
-    this.#storage.set(this.#makeCacheStorageKey(row), size);
+    this.#storage.set(this.#makeCacheStorageKey(node), size);
   }
-  #getCachedSize(row) {
+  #getCachedSize(node) {
     if (this.#skipCache) {
       return void 0;
     }
-    return this.#storage.get(this.#makeCacheStorageKey(row));
+    return this.#storage.get(this.#makeCacheStorageKey(node));
   }
-  #delSize(row) {
-    this.#storage.del(this.#makeSizeStorageKey(row));
+  #delSize(node) {
+    this.#storage.del(this.#makeSizeStorageKey(node));
     if (!this.#skipCache) {
-      const cacheKey = this.#makeCacheStorageKey(row);
+      const cacheKey = this.#makeCacheStorageKey(node);
       if (first(this.#storage.scan({ prefix: `${cacheKey}/` })) === void 0) {
         this.#storage.del(cacheKey);
       }
     }
   }
-  #getOrFetchSize(row) {
-    const size = this.#getSize(row);
+  #getOrFetchSize(node) {
+    const size = this.#getSize(node);
     if (size !== void 0) {
       return size;
     }
-    return this.#fetchSize(row);
+    return this.#fetchSize(node);
   }
-  #fetchSize(row) {
-    const cachedSize = this.#getCachedSize(row);
+  #fetchSize(node) {
+    const cachedSize = this.#getCachedSize(node);
     if (cachedSize !== void 0) {
-      this.#setSize(row, cachedSize);
+      this.#setSize(node, cachedSize);
       return cachedSize;
     }
-    const relationship = this.#fetchNodeForRow(row).relationships[this.#relationshipName];
+    const relationship = node.relationships[this.#relationshipName];
     assert(relationship);
     let size = 0;
-    for (const _relatedNode of relationship) {
+    for (const _relatedNode of relationship()) {
       size++;
     }
-    this.#setCachedSize(row, size);
-    this.#setSize(row, size);
+    this.#setCachedSize(node, size);
+    this.#setSize(node, size);
     return size;
   }
-  #fetchNodeForRow(row) {
-    const fetched = must(
-      first(
-        this.#input.fetch({
-          start: { row, basis: "at" }
-        })
-      )
-    );
-    assert(
-      this.getSchema().compareRows(row, fetched.row) === 0,
-      () => `fetchNodeForRow returned unexpected row, expected ${JSON.stringify(
-        row
-      )}, received ${JSON.stringify(fetched.row)}`
-    );
-    return fetched;
-  }
-  #makeCacheStorageKey(row) {
+  #makeCacheStorageKey(node) {
     return `row/${JSON.stringify(
-      this.#getKeyValues(row, this.#parentJoinKey)
+      this.#getKeyValues(node, this.#parentJoinKey)
     )}`;
   }
-  #makeSizeStorageKey(row) {
-    return `row/${this.#skipCache ? "" : JSON.stringify(this.#getKeyValues(row, this.#parentJoinKey))}/${JSON.stringify(
-      this.#getKeyValues(row, this.#input.getSchema().primaryKey)
+  #makeSizeStorageKey(node) {
+    return `row/${this.#skipCache ? "" : JSON.stringify(this.#getKeyValues(node, this.#parentJoinKey))}/${JSON.stringify(
+      this.#getKeyValues(node, this.#input.getSchema().primaryKey)
     )}`;
   }
-  #getKeyValues(row, def) {
+  #getKeyValues(node, def) {
     const values = [];
     for (const key of def) {
-      values.push(normalizeUndefined(row[key]));
+      values.push(normalizeUndefined(node.row[key]));
     }
     return values;
   }
@@ -9383,7 +9317,7 @@ function filterPush(change, output, predicate) {
       }
       break;
     case "child":
-      if (predicate(change.row)) {
+      if (predicate(change.node.row)) {
         output.push(change);
       }
       break;
@@ -9414,16 +9348,19 @@ var Filter = class {
   getSchema() {
     return this.#input.getSchema();
   }
-  fetch(req) {
-    return this.#filter(this.#input.fetch(req));
-  }
-  cleanup(req) {
-    return this.#filter(this.#input.cleanup(req));
+  *fetch(req) {
+    for (const node of this.#input.fetch(req)) {
+      if (this.#predicate(node.row)) {
+        yield node;
+      }
+    }
   }
-  *#filter(stream) {
-    for (const node of stream) {
+  *cleanup(req) {
+    for (const node of this.#input.cleanup(req)) {
       if (this.#predicate(node.row)) {
         yield node;
+      } else {
+        drainStreams(node);
       }
     }
   }
@@ -9581,7 +9518,11 @@ var Join = class {
       for (const parentNode of parentNodes) {
         const childChange = {
           type: "child",
-          row: parentNode.row,
+          node: this.#processParentNode(
+            parentNode.row,
+            parentNode.relationships,
+            "fetch"
+          ),
           child: {
             relationshipName: this.#relationshipName,
             change: change2
@@ -9596,7 +9537,7 @@ var Join = class {
         pushChildChange(change.node.row, change);
         break;
       case "child":
-        pushChildChange(change.row, change);
+        pushChildChange(change.node.row, change);
         break;
       case "edit": {
         const childRow = change.node.row;
@@ -9620,35 +9561,49 @@ var Join = class {
     }
   }
   #processParentNode(parentNodeRow, parentNodeRelations, mode) {
-    const storageKey = makeStorageKey(
-      this.#parentKey,
-      this.#parent.getSchema().primaryKey,
-      parentNodeRow
-    );
     let method = mode;
-    if (mode === "cleanup") {
-      const [, second] = take(
-        this.#storage.scan({
-          prefix: makeStorageKeyPrefix(parentNodeRow, this.#parentKey)
-        }),
-        2
-      );
-      method = second ? "fetch" : "cleanup";
-    }
-    const childStream = this.#child[method]({
-      constraint: Object.fromEntries(
-        this.#childKey.map((key, i) => [
-          key,
-          parentNodeRow[this.#parentKey[i]]
-        ])
-      )
-    });
-    if (mode === "fetch") {
-      this.#storage.set(storageKey, true);
-    } else {
-      mode;
-      this.#storage.del(storageKey);
-    }
+    let storageUpdated = false;
+    const childStream = () => {
+      if (!storageUpdated) {
+        if (mode === "cleanup") {
+          this.#storage.del(
+            makeStorageKey(
+              this.#parentKey,
+              this.#parent.getSchema().primaryKey,
+              parentNodeRow
+            )
+          );
+          const empty = [
+            ...take(
+              this.#storage.scan({
+                prefix: makeStorageKeyPrefix(parentNodeRow, this.#parentKey)
+              }),
+              1
+            )
+          ].length === 0;
+          method = empty ? "cleanup" : "fetch";
+        }
+        storageUpdated = true;
+        if (mode === "fetch") {
+          this.#storage.set(
+            makeStorageKey(
+              this.#parentKey,
+              this.#parent.getSchema().primaryKey,
+              parentNodeRow
+            ),
+            true
+          );
+        }
+      }
+      return this.#child[method]({
+        constraint: Object.fromEntries(
+          this.#childKey.map((key, i) => [
+            key,
+            parentNodeRow[this.#parentKey[i]]
+          ])
+        )
+      });
+    };
     return {
       row: parentNodeRow,
       relationships: {
@@ -9736,8 +9691,7 @@ var Skip = class {
       return;
     }
     change;
-    const changeRow = change.type === "child" ? change.row : change.node.row;
-    if (shouldBePresent(changeRow)) {
+    if (shouldBePresent(change.node.row)) {
       this.#output.push(change);
     }
   }
@@ -9917,7 +9871,7 @@ var Take = class {
       this.#pushEditChange(change);
       return;
     }
-    const { takeState, takeStateKey, maxBound, constraint } = this.#getStateAndConstraint(rowForChange(change));
+    const { takeState, takeStateKey, maxBound, constraint } = this.#getStateAndConstraint(change.node.row);
     if (!takeState) {
       return;
     }
@@ -10042,7 +9996,7 @@ var Take = class {
       );
       this.#output.push(change);
     } else if (change.type === "child") {
-      if (takeState.bound && compareRows(change.row, takeState.bound) <= 0) {
+      if (takeState.bound && compareRows(change.node.row, takeState.bound) <= 0) {
         this.#output.push(change);
       }
     }
@@ -12793,9 +12747,9 @@ function* generateRows(data, scanStart, reverse) {
 }
 
 // ../zql/src/ivm/memory-storage.ts
-import { compareUTF8 as compareUTF85 } from "compare-utf8";
+import { compareUTF8 as compareUTF84 } from "compare-utf8";
 function comparator(a, b) {
-  return compareUTF85(a[0], b[0]);
+  return compareUTF84(a[0], b[0]);
 }
 var MemoryStorage = class {
   #data = new BTreeSet(comparator);
@@ -13418,7 +13372,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.12.2025012902";
+var version2 = "0.12.2025013000";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -15485,4 +15439,4 @@ export {
   escapeLike,
   Zero
 };
-//# sourceMappingURL=chunk-HQA4Z25K.js.map
+//# sourceMappingURL=chunk-UEPZPKPV.js.map