@rocicorp/zero 0.12.2025012902 → 0.12.2025013001

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-QAAJZ32T.js → chunk-ZVLXEWWB.js}

@@ -64,6 +64,64 @@ function must(v, msg) {
   return v;
 }
 
+// ../zql/src/ivm/data.ts
+import { compareUTF8 } 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 compareUTF8(a, b);
+  }
+  throw new Error(`Unsupported type: ${a}`);
+}
+function normalizeUndefined(v) {
+  return v ?? 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;
+}
+function drainStreams(node) {
+  for (const stream of Object.values(node.relationships)) {
+    for (const node2 of stream()) {
+      drainStreams(node2);
+    }
+  }
+}
+
 // ../zql/src/ivm/view-apply-change.ts
 function applyChange(parentEntry, change, schema, relationship, format) {
   if (schema.isHidden) {
@@ -74,7 +132,7 @@ function applyChange(parentEntry, change, schema, relationship, format) {
           change.node.relationships
         )) {
           const childSchema = must(schema.relationships[relationship2]);
-          for (const node of children) {
+          for (const node of children()) {
             applyChange(
               parentEntry,
               { type: change.type, node },
@@ -132,7 +190,7 @@ function applyChange(parentEntry, change, schema, relationship, format) {
         }
         const newView = childFormat.singular ? void 0 : [];
         newEntry[relationship2] = newView;
-        for (const node of children) {
+        for (const node of children()) {
           applyChange(
             newEntry,
             { type: "add", node },
@@ -168,7 +226,11 @@ function applyChange(parentEntry, change, schema, relationship, format) {
         existing = parentEntry[relationship];
       } else {
         const view = getChildEntryList(parentEntry, relationship);
-        const { pos, found } = binarySearch(view, change.row, schema.compareRows);
+        const { pos, found } = binarySearch(
+          view,
+          change.node.row,
+          schema.compareRows
+        );
         assert(found, "node does not exist");
         existing = view[pos];
       }
@@ -267,13 +329,6 @@ function makeEntryPreserveRelationships(row, entry, relationships) {
   }
   return result;
 }
-function drainStreams(node) {
-  for (const stream of Object.values(node.relationships)) {
-    for (const node2 of stream) {
-      drainStreams(node2);
-    }
-  }
-}
 function getChildEntryList(parentEntry, relationship) {
   const view = parentEntry[relationship];
   assertArray(view);
@@ -291,6 +346,11 @@ export {
   assertNotNull,
   unreachable,
   must,
+  compareValues,
+  normalizeUndefined,
+  makeComparator,
+  valuesEqual,
+  drainStreams,
   applyChange
 };
-//# sourceMappingURL=chunk-QAAJZ32T.js.map
+//# sourceMappingURL=chunk-ZVLXEWWB.js.map

package/out/chunk-ZVLXEWWB.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../shared/src/asserts.ts", "../../shared/src/must.ts", "../../zql/src/ivm/data.ts", "../../zql/src/ivm/view-apply-change.ts"],
+  "sourcesContent": ["export function assert(\n  b: unknown,\n  msg: string | (() => string) = 'Assertion failed',\n): asserts b {\n  if (!b) {\n    const msgStr = typeof msg === 'string' ? msg : msg();\n    throw new Error(msgStr);\n  }\n}\n\nexport function assertString(v: unknown): asserts v is string {\n  assertType(v, 'string');\n}\n\nexport function assertNumber(v: unknown): asserts v is number {\n  assertType(v, 'number');\n}\n\nexport function assertBoolean(v: unknown): asserts v is boolean {\n  assertType(v, 'boolean');\n}\n\nfunction assertType(v: unknown, t: string) {\n  if (typeof v !== t) {\n    throwInvalidType(v, t);\n  }\n}\n\nexport function assertObject(v: unknown): asserts v is Record<string, unknown> {\n  if (v === null) {\n    throwInvalidType(v, 'object');\n  }\n  assertType(v, 'object');\n}\n\nexport function assertArray(v: unknown): asserts v is unknown[] {\n  if (!Array.isArray(v)) {\n    throwInvalidType(v, 'array');\n  }\n}\n\nexport function invalidType(v: unknown, t: string): string {\n  let s = 'Invalid type: ';\n  if (v === null || v === undefined) {\n    s += v;\n  } else {\n    s += `${typeof v} \\`${v}\\``;\n  }\n  return s + `, expected ${t}`;\n}\n\nexport function throwInvalidType(v: unknown, t: string): never {\n  throw new Error(invalidType(v, t));\n}\n\nexport function assertNotNull<T>(v: T | null): asserts v is T {\n  if (v === null) {\n    throw new Error('Expected non-null value');\n  }\n}\n\nexport function assertUndefined<T>(\n  v: T | undefined,\n  msg = 'Expected undefined value',\n): asserts v is T {\n  if (v !== undefined) {\n    throw new Error(msg);\n  }\n}\n\nexport function assertNotUndefined<T>(\n  v: T | undefined,\n  msg = 'Expected non undefined value',\n): asserts v is T {\n  if (v === undefined) {\n    throw new Error(msg);\n  }\n}\n\nexport function assertInstanceof<T>(\n  v: unknown,\n  t: new (...args: unknown[]) => T,\n): asserts v is T {\n  if (!(v instanceof t)) {\n    throw new Error(`Expected instanceof ${t.name}`);\n  }\n}\n\nexport function assertUint8Array(v: unknown): asserts v is Uint8Array {\n  assertInstanceof(v, Uint8Array);\n}\n\nexport function unreachable(): never;\nexport function unreachable(v: never): never;\nexport function unreachable(_?: never): never {\n  throw new Error('Unreachable');\n}\n\nexport function notImplemented(): never {\n  throw new Error('Not implemented');\n}\n", "export function must<T>(v: T | undefined | null, msg?: string): T {\n  // eslint-disable-next-line eqeqeq\n  if (v == null) {\n    throw new Error(msg ?? `Unexpected ${v} value`);\n  }\n  return v;\n}\n", "import {compareUTF8} from 'compare-utf8';\nimport {\n  assertBoolean,\n  assertNumber,\n  assertString,\n} from '../../../shared/src/asserts.ts';\nimport type {Ordering} from '../../../zero-protocol/src/ast.ts';\nimport type {Row, Value} from '../../../zero-protocol/src/data.ts';\nimport type {Stream} from './stream.ts';\n\n/**\n * A row flowing through the pipeline, plus its relationships.\n * Relationships are generated lazily as read.\n */\nexport type Node = {\n  row: Row;\n  relationships: Record<string, () => Stream<Node>>;\n};\n\n/**\n * Compare two values. The values must be of the same type. This function\n * throws at runtime if the types differ.\n *\n * Note, this function considers `null === null` and\n * `undefined === undefined`. This is different than SQL. In join code,\n * null must be treated separately.\n *\n * See: https://github.com/rocicorp/mono/pull/2116/files#r1704811479\n *\n * @returns < 0 if a < b, 0 if a === b, > 0 if a > b\n */\nexport function compareValues(a: Value, b: Value): number {\n  a = normalizeUndefined(a);\n  b = normalizeUndefined(b);\n\n  if (a === b) {\n    return 0;\n  }\n  if (a === null) {\n    return -1;\n  }\n  if (b === null) {\n    return 1;\n  }\n  if (typeof a === 'boolean') {\n    assertBoolean(b);\n    return a ? 1 : -1;\n  }\n  if (typeof a === 'number') {\n    assertNumber(b);\n    return a - b;\n  }\n  if (typeof a === 'string') {\n    assertString(b);\n    // We compare all strings in Zero as UTF-8. This is the default on SQLite\n    // and we need to match it. See:\n    // https://blog.replicache.dev/blog/replicache-11-adventures-in-text-encoding.\n    //\n    // TODO: We could change this since SQLite supports UTF-16. Microbenchmark\n    // to see if there's a big win.\n    //\n    // https://www.sqlite.org/c3ref/create_collation.html\n    return compareUTF8(a, b);\n  }\n  throw new Error(`Unsupported type: ${a}`);\n}\n\nexport type NormalizedValue = Exclude<Value, undefined>;\n\n/**\n * We allow undefined to be passed for the convenience of developers, but we\n * treat it equivalently to null. It's better for perf to not create an copy\n * of input values, so we just normalize at use when necessary.\n */\nexport function normalizeUndefined(v: Value): NormalizedValue {\n  return v ?? null;\n}\n\nexport type Comparator = (r1: Row, r2: Row) => number;\n\nexport function makeComparator(\n  order: Ordering,\n  reverse?: boolean | undefined,\n): Comparator {\n  return (a, b) => {\n    // Skip destructuring here since it is hot code.\n    for (const ord of order) {\n      const field = ord[0];\n      const comp = compareValues(a[field], b[field]);\n      if (comp !== 0) {\n        const result = ord[1] === 'asc' ? comp : -comp;\n        return reverse ? -result : result;\n      }\n    }\n    return 0;\n  };\n}\n\n/**\n * Determine if two values are equal. Note that unlike compareValues() above,\n * this function treats `null` as unequal to itself (and same for `undefined`).\n * This is required to make joins work correctly, but may not be the right\n * semantic for your application.\n */\nexport function valuesEqual(a: Value, b: Value): boolean {\n  // eslint-disable-next-line eqeqeq\n  if (a == null || b == null) {\n    return false;\n  }\n  return a === b;\n}\n\nexport function drainStreams(node: Node) {\n  for (const stream of Object.values(node.relationships)) {\n    for (const node of stream()) {\n      drainStreams(node);\n    }\n  }\n}\n", "import {\n  assert,\n  assertArray,\n  assertObject,\n  assertUndefined,\n  unreachable,\n} from '../../../shared/src/asserts.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport type {Row} from '../../../zero-protocol/src/data.ts';\nimport type {Change} from './change.ts';\nimport {drainStreams, type Comparator} from './data.ts';\nimport type {SourceSchema} from './schema.ts';\nimport type {Entry, EntryList, Format} from './view.ts';\n\nexport function applyChange(\n  parentEntry: Entry,\n  change: Change,\n  schema: SourceSchema,\n  relationship: string,\n  format: Format,\n) {\n  if (schema.isHidden) {\n    switch (change.type) {\n      case 'add':\n      case 'remove':\n        for (const [relationship, children] of Object.entries(\n          change.node.relationships,\n        )) {\n          const childSchema = must(schema.relationships[relationship]);\n          for (const node of children()) {\n            applyChange(\n              parentEntry,\n              {type: change.type, node},\n              childSchema,\n              relationship,\n              format,\n            );\n          }\n        }\n        return;\n      case 'edit':\n        // If hidden at this level it means that the hidden row was changed. If\n        // the row was changed in such a way that it would change the\n        // relationships then the edit would have been split into remove and\n        // add.\n        return;\n      case 'child': {\n        const childSchema = must(\n          schema.relationships[change.child.relationshipName],\n        );\n        applyChange(\n          parentEntry,\n          change.child.change,\n          childSchema,\n          relationship,\n          format,\n        );\n        return;\n      }\n      default:\n        unreachable(change);\n    }\n  }\n\n  const {singular, relationships: childFormats} = format;\n  switch (change.type) {\n    case 'add': {\n      // TODO: Only create a new entry if we need to mutate the existing one.\n      const newEntry: Entry = {\n        ...change.node.row,\n      };\n      if (singular) {\n        assertUndefined(\n          parentEntry[relationship],\n          'single output already exists',\n        );\n        parentEntry[relationship] = newEntry;\n      } else {\n        const view = getChildEntryList(parentEntry, relationship);\n        const {pos, found} = binarySearch(view, newEntry, schema.compareRows);\n        assert(!found, 'node already exists');\n        // @ts-expect-error view is readonly\n        view.splice(pos, 0, newEntry);\n      }\n      for (const [relationship, children] of Object.entries(\n        change.node.relationships,\n      )) {\n        // TODO: Is there a flag to make TypeScript complain that dictionary access might be undefined?\n        const childSchema = must(schema.relationships[relationship]);\n        const childFormat = childFormats[relationship];\n        if (childFormat === undefined) {\n          continue;\n        }\n\n        const newView = childFormat.singular ? undefined : ([] as EntryList);\n        newEntry[relationship] = newView;\n        for (const node of children()) {\n          applyChange(\n            newEntry,\n            {type: 'add', node},\n            childSchema,\n            relationship,\n            childFormat,\n          );\n        }\n      }\n      break;\n    }\n    case 'remove': {\n      if (singular) {\n        assertObject(parentEntry[relationship]);\n        parentEntry[relationship] = undefined;\n      } else {\n        const view = getChildEntryList(parentEntry, relationship);\n        const {pos, found} = binarySearch(\n          view,\n          change.node.row,\n          schema.compareRows,\n        );\n        assert(found, 'node does not exist');\n        // @ts-expect-error view is readonly\n        view.splice(pos, 1);\n      }\n      // Needed to ensure cleanup of operator state is fully done.\n      drainStreams(change.node);\n      break;\n    }\n    case 'child': {\n      let existing: Entry;\n      if (singular) {\n        assertObject(parentEntry[relationship]);\n        existing = parentEntry[relationship];\n      } else {\n        const view = getChildEntryList(parentEntry, relationship);\n        const {pos, found} = binarySearch(\n          view,\n          change.node.row,\n          schema.compareRows,\n        );\n        assert(found, 'node does not exist');\n        existing = view[pos];\n      }\n\n      const childSchema = must(\n        schema.relationships[change.child.relationshipName],\n      );\n      const childFormat = format.relationships[change.child.relationshipName];\n      if (childFormat !== undefined) {\n        applyChange(\n          existing,\n          change.child.change,\n          childSchema,\n          change.child.relationshipName,\n          childFormat,\n        );\n      }\n      break;\n    }\n    case 'edit': {\n      if (singular) {\n        assertObject(parentEntry[relationship]);\n        parentEntry[relationship] = {\n          ...parentEntry[relationship],\n          ...change.node.row,\n        };\n      } else {\n        const view = parentEntry[relationship] as EntryList | undefined;\n        assertArray(view);\n        // If the order changed due to the edit, we need to remove and reinsert.\n        if (schema.compareRows(change.oldNode.row, change.node.row) === 0) {\n          const {pos, found} = binarySearch(\n            view,\n            change.oldNode.row,\n            schema.compareRows,\n          );\n          assert(found, 'node does not exists');\n          view[pos] = makeEntryPreserveRelationships(\n            change.node.row,\n            view[pos],\n            schema.relationships,\n          );\n        } else {\n          // Remove\n          const {pos, found} = binarySearch(\n            view,\n            change.oldNode.row,\n            schema.compareRows,\n          );\n          assert(found, 'node does not exists');\n          const oldEntry = view[pos];\n          view.splice(pos, 1);\n\n          // Insert\n          {\n            const {pos, found} = binarySearch(\n              view,\n              change.node.row,\n              schema.compareRows,\n            );\n            assert(!found, 'node already exists');\n            view.splice(\n              pos,\n              0,\n              makeEntryPreserveRelationships(\n                change.node.row,\n                oldEntry,\n                schema.relationships,\n              ),\n            );\n          }\n        }\n      }\n      break;\n    }\n    default:\n      unreachable(change);\n  }\n}\n\n// TODO: Do not return an object. It puts unnecessary pressure on the GC.\nfunction binarySearch(view: EntryList, target: Entry, comparator: Comparator) {\n  let low = 0;\n  let high = view.length - 1;\n  while (low <= high) {\n    const mid = (low + high) >>> 1;\n    const comparison = comparator(view[mid] as Row, target as Row);\n    if (comparison < 0) {\n      low = mid + 1;\n    } else if (comparison > 0) {\n      high = mid - 1;\n    } else {\n      return {pos: mid, found: true};\n    }\n  }\n  return {pos: low, found: false};\n}\n\nfunction makeEntryPreserveRelationships(\n  row: Row,\n  entry: Entry,\n  relationships: {[key: string]: SourceSchema},\n): Entry {\n  const result: Entry = {...row};\n  for (const relationship in relationships) {\n    assert(!(relationship in row), 'Relationship already exists');\n    result[relationship] = entry[relationship];\n  }\n  return result;\n}\n\nfunction getChildEntryList(\n  parentEntry: Entry,\n  relationship: string,\n): EntryList {\n  const view = parentEntry[relationship] as unknown;\n  assertArray(view);\n  return view as EntryList;\n}\n"],
+  "mappings": "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",
+  "names": ["node", "relationship", "pos", "found"]
+}

package/out/{chunk-HQA4Z25K.js → chunk-ZXVUJVVO.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.2025013001";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -15485,4 +15439,4 @@ export {
   escapeLike,
   Zero
 };
-//# sourceMappingURL=chunk-HQA4Z25K.js.map
+//# sourceMappingURL=chunk-ZXVUJVVO.js.map