@rocicorp/zero 0.25.0-canary.9 → 0.25.1

package/out/zql/src/ivm/join.js

@@ -1,11 +1,9 @@
 import { assert, unreachable } from "../../../shared/src/asserts.js";
-import { rowEqualsForCompoundKey, isJoinMatch, generateWithOverlay } from "./join-utils.js";
+import { rowEqualsForCompoundKey, buildJoinConstraint, isJoinMatch, generateWithOverlay } from "./join-utils.js";
 import { throwOutput } from "./operator.js";
-import { take } from "./stream.js";
 class Join {
   #parent;
   #child;
-  #storage;
   #parentKey;
   #childKey;
   #relationshipName;
@@ -15,7 +13,6 @@ class Join {
   constructor({
     parent,
     child,
-    storage,
     parentKey,
     childKey,
     relationshipName,
@@ -29,7 +26,6 @@ class Join {
     );
     this.#parent = parent;
     this.#child = child;
-    this.#storage = storage;
     this.#parentKey = parentKey;
     this.#childKey = childKey;
     this.#relationshipName = relationshipName;
@@ -65,58 +61,46 @@ class Join {
   }
   *fetch(req) {
     for (const parentNode of this.#parent.fetch(req)) {
-      yield this.#processParentNode(
-        parentNode.row,
-        parentNode.relationships,
-        "fetch"
-      );
-    }
-  }
-  *cleanup(req) {
-    for (const parentNode of this.#parent.cleanup(req)) {
-      yield this.#processParentNode(
-        parentNode.row,
-        parentNode.relationships,
-        "cleanup"
-      );
+      if (parentNode === "yield") {
+        yield parentNode;
+        continue;
+      }
+      yield this.#processParentNode(parentNode.row, parentNode.relationships);
     }
   }
-  #pushParent(change) {
+  *#pushParent(change) {
     switch (change.type) {
       case "add":
-        this.#output.push(
+        yield* this.#output.push(
           {
             type: "add",
             node: this.#processParentNode(
               change.node.row,
-              change.node.relationships,
-              "fetch"
+              change.node.relationships
             )
           },
           this
         );
         break;
       case "remove":
-        this.#output.push(
+        yield* this.#output.push(
           {
             type: "remove",
             node: this.#processParentNode(
               change.node.row,
-              change.node.relationships,
-              "cleanup"
+              change.node.relationships
             )
           },
           this
         );
         break;
       case "child":
-        this.#output.push(
+        yield* this.#output.push(
           {
             type: "child",
             node: this.#processParentNode(
               change.node.row,
-              change.node.relationships,
-              "fetch"
+              change.node.relationships
             ),
             child: change.child
           },
@@ -132,18 +116,16 @@ class Join {
           ),
           `Parent edit must not change relationship.`
         );
-        this.#output.push(
+        yield* this.#output.push(
           {
             type: "edit",
             oldNode: this.#processParentNode(
               change.oldNode.row,
-              change.oldNode.relationships,
-              "cleanup"
+              change.oldNode.relationships
             ),
             node: this.#processParentNode(
               change.node.row,
-              change.node.relationships,
-              "fetch"
+              change.node.relationships
             )
           },
           this
@@ -154,45 +136,14 @@ class Join {
         unreachable();
     }
   }
-  #pushChild(change) {
-    const pushChildChange = (childRow, change2) => {
-      this.#inprogressChildChange = {
-        change: change2,
-        position: void 0
-      };
-      try {
-        const parentNodes = this.#parent.fetch({
-          constraint: Object.fromEntries(
-            this.#parentKey.map((key, i) => [key, childRow[this.#childKey[i]]])
-          )
-        });
-        for (const parentNode of parentNodes) {
-          this.#inprogressChildChange.position = parentNode.row;
-          const childChange = {
-            type: "child",
-            node: this.#processParentNode(
-              parentNode.row,
-              parentNode.relationships,
-              "fetch"
-            ),
-            child: {
-              relationshipName: this.#relationshipName,
-              change: change2
-            }
-          };
-          this.#output.push(childChange, this);
-        }
-      } finally {
-        this.#inprogressChildChange = void 0;
-      }
-    };
+  *#pushChild(change) {
     switch (change.type) {
       case "add":
       case "remove":
-        pushChildChange(change.node.row, change);
+        yield* this.#pushChildChange(change.node.row, change);
         break;
       case "child":
-        pushChildChange(change.node.row, change);
+        yield* this.#pushChildChange(change.node.row, change);
         break;
       case "edit": {
         const childRow = change.node.row;
@@ -201,56 +152,56 @@ class Join {
           rowEqualsForCompoundKey(oldChildRow, childRow, this.#childKey),
           "Child edit must not change relationship."
         );
-        pushChildChange(childRow, change);
+        yield* this.#pushChildChange(childRow, change);
         break;
       }
       default:
         unreachable();
     }
   }
-  #processParentNode(parentNodeRow, parentNodeRelations, mode) {
-    let method = mode;
-    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
-          );
+  *#pushChildChange(childRow, change) {
+    this.#inprogressChildChange = {
+      change,
+      position: void 0
+    };
+    try {
+      const constraint = buildJoinConstraint(
+        childRow,
+        this.#childKey,
+        this.#parentKey
+      );
+      const parentNodes = constraint ? this.#parent.fetch({ constraint }) : [];
+      for (const parentNode of parentNodes) {
+        if (parentNode === "yield") {
+          yield parentNode;
+          continue;
         }
+        this.#inprogressChildChange.position = parentNode.row;
+        const childChange = {
+          type: "child",
+          node: this.#processParentNode(
+            parentNode.row,
+            parentNode.relationships
+          ),
+          child: {
+            relationshipName: this.#relationshipName,
+            change
+          }
+        };
+        yield* this.#output.push(childChange, this);
       }
-      const stream = this.#child[method]({
-        constraint: Object.fromEntries(
-          this.#childKey.map((key, i) => [
-            key,
-            parentNodeRow[this.#parentKey[i]]
-          ])
-        )
-      });
+    } finally {
+      this.#inprogressChildChange = void 0;
+    }
+  }
+  #processParentNode(parentNodeRow, parentNodeRelations) {
+    const childStream = () => {
+      const constraint = buildJoinConstraint(
+        parentNodeRow,
+        this.#parentKey,
+        this.#childKey
+      );
+      const stream = constraint ? this.#child.fetch({ constraint }) : [];
       if (this.#inprogressChildChange && isJoinMatch(
         parentNodeRow,
         this.#parentKey,
@@ -277,24 +228,7 @@ class Join {
     };
   }
 }
-function makeStorageKeyForValues(values) {
-  const json = JSON.stringify(["pKeySet", ...values]);
-  return json.substring(1, json.length - 1) + ",";
-}
-function makeStorageKeyPrefix(row, key) {
-  return makeStorageKeyForValues(key.map((k) => row[k]));
-}
-function makeStorageKey(key, primaryKey, row) {
-  const values = key.map((k) => row[k]);
-  for (const key2 of primaryKey) {
-    values.push(row[key2]);
-  }
-  return makeStorageKeyForValues(values);
-}
 export {
-  Join,
-  makeStorageKey,
-  makeStorageKeyForValues,
-  makeStorageKeyPrefix
+  Join
 };
 //# sourceMappingURL=join.js.map

package/out/zql/src/ivm/join.js.map

@@ -1 +1 @@
-{"version":3,"file":"join.js","sources":["../../../../../zql/src/ivm/join.ts"],"sourcesContent":["import {assert, unreachable} from '../../../shared/src/asserts.ts';\nimport type {CompoundKey, System} from '../../../zero-protocol/src/ast.ts';\nimport type {Row, Value} from '../../../zero-protocol/src/data.ts';\nimport type {PrimaryKey} from '../../../zero-protocol/src/primary-key.ts';\nimport type {Change, ChildChange} from './change.ts';\nimport type {Node} from './data.ts';\nimport {\n  generateWithOverlay,\n  isJoinMatch,\n  rowEqualsForCompoundKey,\n  type JoinChangeOverlay,\n} from './join-utils.ts';\nimport {\n  throwOutput,\n  type FetchRequest,\n  type Input,\n  type Output,\n  type Storage,\n} from './operator.ts';\nimport type {SourceSchema} from './schema.ts';\nimport {take, type Stream} from './stream.ts';\n\ntype Args = {\n  parent: Input;\n  child: Input;\n  storage: Storage;\n  // The nth key in parentKey corresponds to the nth key in childKey.\n  parentKey: CompoundKey;\n  childKey: CompoundKey;\n  relationshipName: string;\n  hidden: boolean;\n  system: System;\n};\n\n/**\n * The Join operator joins the output from two upstream inputs. Zero's join\n * is a little different from SQL's join in that we output hierarchical data,\n * not a flat table. This makes it a lot more useful for UI programming and\n * avoids duplicating tons of data like left join would.\n *\n * The Nodes output from Join have a new relationship added to them, which has\n * the name #relationshipName. The value of the relationship is a stream of\n * child nodes which are the corresponding values from the child source.\n */\nexport class Join implements Input {\n  readonly #parent: Input;\n  readonly #child: Input;\n  readonly #storage: Storage;\n  readonly #parentKey: CompoundKey;\n  readonly #childKey: CompoundKey;\n  readonly #relationshipName: string;\n  readonly #schema: SourceSchema;\n\n  #output: Output = throwOutput;\n\n  #inprogressChildChange: JoinChangeOverlay | undefined;\n\n  constructor({\n    parent,\n    child,\n    storage,\n    parentKey,\n    childKey,\n    relationshipName,\n    hidden,\n    system,\n  }: Args) {\n    assert(parent !== child, 'Parent and child must be different operators');\n    assert(\n      parentKey.length === childKey.length,\n      'The parentKey and childKey keys must have same length',\n    );\n    this.#parent = parent;\n    this.#child = child;\n    this.#storage = storage;\n    this.#parentKey = parentKey;\n    this.#childKey = childKey;\n    this.#relationshipName = relationshipName;\n\n    const parentSchema = parent.getSchema();\n    const childSchema = child.getSchema();\n    this.#schema = {\n      ...parentSchema,\n      relationships: {\n        ...parentSchema.relationships,\n        [relationshipName]: {\n          ...childSchema,\n          isHidden: hidden,\n          system,\n        },\n      },\n    };\n\n    parent.setOutput({\n      push: (change: Change) => this.#pushParent(change),\n    });\n    child.setOutput({\n      push: (change: Change) => this.#pushChild(change),\n    });\n  }\n\n  destroy(): void {\n    this.#parent.destroy();\n    this.#child.destroy();\n  }\n\n  setOutput(output: Output): void {\n    this.#output = output;\n  }\n\n  getSchema(): SourceSchema {\n    return this.#schema;\n  }\n\n  *fetch(req: FetchRequest): Stream<Node> {\n    for (const parentNode of this.#parent.fetch(req)) {\n      yield this.#processParentNode(\n        parentNode.row,\n        parentNode.relationships,\n        'fetch',\n      );\n    }\n  }\n\n  *cleanup(req: FetchRequest): Stream<Node> {\n    for (const parentNode of this.#parent.cleanup(req)) {\n      yield this.#processParentNode(\n        parentNode.row,\n        parentNode.relationships,\n        'cleanup',\n      );\n    }\n  }\n\n  #pushParent(change: Change): void {\n    switch (change.type) {\n      case 'add':\n        this.#output.push(\n          {\n            type: 'add',\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n              'fetch',\n            ),\n          },\n          this,\n        );\n        break;\n      case 'remove':\n        this.#output.push(\n          {\n            type: 'remove',\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n              'cleanup',\n            ),\n          },\n          this,\n        );\n        break;\n      case 'child':\n        this.#output.push(\n          {\n            type: 'child',\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n              'fetch',\n            ),\n            child: change.child,\n          },\n          this,\n        );\n        break;\n      case 'edit': {\n        // Assert the edit could not change the relationship.\n        assert(\n          rowEqualsForCompoundKey(\n            change.oldNode.row,\n            change.node.row,\n            this.#parentKey,\n          ),\n          `Parent edit must not change relationship.`,\n        );\n        this.#output.push(\n          {\n            type: 'edit',\n            oldNode: this.#processParentNode(\n              change.oldNode.row,\n              change.oldNode.relationships,\n              'cleanup',\n            ),\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n              'fetch',\n            ),\n          },\n          this,\n        );\n        break;\n      }\n      default:\n        unreachable(change);\n    }\n  }\n\n  #pushChild(change: Change): void {\n    const pushChildChange = (childRow: Row, change: Change) => {\n      this.#inprogressChildChange = {\n        change,\n        position: undefined,\n      };\n      try {\n        const parentNodes = this.#parent.fetch({\n          constraint: Object.fromEntries(\n            this.#parentKey.map((key, i) => [key, childRow[this.#childKey[i]]]),\n          ),\n        });\n\n        for (const parentNode of parentNodes) {\n          this.#inprogressChildChange.position = parentNode.row;\n          const childChange: ChildChange = {\n            type: 'child',\n            node: this.#processParentNode(\n              parentNode.row,\n              parentNode.relationships,\n              'fetch',\n            ),\n            child: {\n              relationshipName: this.#relationshipName,\n              change,\n            },\n          };\n          this.#output.push(childChange, this);\n        }\n      } finally {\n        this.#inprogressChildChange = undefined;\n      }\n    };\n\n    switch (change.type) {\n      case 'add':\n      case 'remove':\n        pushChildChange(change.node.row, change);\n        break;\n      case 'child':\n        pushChildChange(change.node.row, change);\n        break;\n      case 'edit': {\n        const childRow = change.node.row;\n        const oldChildRow = change.oldNode.row;\n        // Assert the edit could not change the relationship.\n        assert(\n          rowEqualsForCompoundKey(oldChildRow, childRow, this.#childKey),\n          'Child edit must not change relationship.',\n        );\n        pushChildChange(childRow, change);\n        break;\n      }\n\n      default:\n        unreachable(change);\n    }\n  }\n\n  #processParentNode(\n    parentNodeRow: Row,\n    parentNodeRelations: Record<string, () => Stream<Node>>,\n    mode: ProcessParentMode,\n  ): Node {\n    let method: ProcessParentMode = mode;\n    let storageUpdated = false;\n    const childStream = () => {\n      if (!storageUpdated) {\n        if (mode === 'cleanup') {\n          this.#storage.del(\n            makeStorageKey(\n              this.#parentKey,\n              this.#parent.getSchema().primaryKey,\n              parentNodeRow,\n            ),\n          );\n          const empty =\n            [\n              ...take(\n                this.#storage.scan({\n                  prefix: makeStorageKeyPrefix(parentNodeRow, this.#parentKey),\n                }),\n                1,\n              ),\n            ].length === 0;\n          method = empty ? 'cleanup' : 'fetch';\n        }\n\n        storageUpdated = true;\n        // Defer the work to update storage until the child stream\n        // is actually accessed\n        if (mode === 'fetch') {\n          this.#storage.set(\n            makeStorageKey(\n              this.#parentKey,\n              this.#parent.getSchema().primaryKey,\n              parentNodeRow,\n            ),\n            true,\n          );\n        }\n      }\n\n      const stream = this.#child[method]({\n        constraint: Object.fromEntries(\n          this.#childKey.map((key, i) => [\n            key,\n            parentNodeRow[this.#parentKey[i]],\n          ]),\n        ),\n      });\n\n      if (\n        this.#inprogressChildChange &&\n        isJoinMatch(\n          parentNodeRow,\n          this.#parentKey,\n          this.#inprogressChildChange.change.node.row,\n          this.#childKey,\n        ) &&\n        this.#inprogressChildChange.position &&\n        this.#schema.compareRows(\n          parentNodeRow,\n          this.#inprogressChildChange.position,\n        ) > 0\n      ) {\n        return generateWithOverlay(\n          stream,\n          this.#inprogressChildChange.change,\n          this.#child.getSchema(),\n        );\n      }\n      return stream;\n    };\n\n    return {\n      row: parentNodeRow,\n      relationships: {\n        ...parentNodeRelations,\n        [this.#relationshipName]: childStream,\n      },\n    };\n  }\n}\n\ntype ProcessParentMode = 'fetch' | 'cleanup';\n\n/** Exported for testing. */\nexport function makeStorageKeyForValues(values: readonly Value[]): string {\n  const json = JSON.stringify(['pKeySet', ...values]);\n  return json.substring(1, json.length - 1) + ',';\n}\n\n/** Exported for testing. */\nexport function makeStorageKeyPrefix(row: Row, key: CompoundKey): string {\n  return makeStorageKeyForValues(key.map(k => row[k]));\n}\n\n/** Exported for testing.\n * This storage key tracks the primary keys seen for each unique\n * value joined on. This is used to know when to cleanup a child's state.\n */\nexport function makeStorageKey(\n  key: CompoundKey,\n  primaryKey: PrimaryKey,\n  row: Row,\n): string {\n  const values: Value[] = key.map(k => row[k]);\n  for (const key of primaryKey) {\n    values.push(row[key]);\n  }\n  return makeStorageKeyForValues(values);\n}\n"],"names":["change","key"],"mappings":"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"}
+{"version":3,"file":"join.js","sources":["../../../../../zql/src/ivm/join.ts"],"sourcesContent":["import {assert, unreachable} from '../../../shared/src/asserts.ts';\nimport type {CompoundKey, System} from '../../../zero-protocol/src/ast.ts';\nimport type {Row} from '../../../zero-protocol/src/data.ts';\nimport type {Change, ChildChange} from './change.ts';\nimport type {Node} from './data.ts';\nimport {\n  buildJoinConstraint,\n  generateWithOverlay,\n  isJoinMatch,\n  rowEqualsForCompoundKey,\n  type JoinChangeOverlay,\n} from './join-utils.ts';\nimport {\n  throwOutput,\n  type FetchRequest,\n  type Input,\n  type Output,\n} from './operator.ts';\nimport type {SourceSchema} from './schema.ts';\nimport {type Stream} from './stream.ts';\n\ntype Args = {\n  parent: Input;\n  child: Input;\n  // The nth key in parentKey corresponds to the nth key in childKey.\n  parentKey: CompoundKey;\n  childKey: CompoundKey;\n  relationshipName: string;\n  hidden: boolean;\n  system: System;\n};\n\n/**\n * The Join operator joins the output from two upstream inputs. Zero's join\n * is a little different from SQL's join in that we output hierarchical data,\n * not a flat table. This makes it a lot more useful for UI programming and\n * avoids duplicating tons of data like left join would.\n *\n * The Nodes output from Join have a new relationship added to them, which has\n * the name #relationshipName. The value of the relationship is a stream of\n * child nodes which are the corresponding values from the child source.\n */\nexport class Join implements Input {\n  readonly #parent: Input;\n  readonly #child: Input;\n  readonly #parentKey: CompoundKey;\n  readonly #childKey: CompoundKey;\n  readonly #relationshipName: string;\n  readonly #schema: SourceSchema;\n\n  #output: Output = throwOutput;\n\n  #inprogressChildChange: JoinChangeOverlay | undefined;\n\n  constructor({\n    parent,\n    child,\n    parentKey,\n    childKey,\n    relationshipName,\n    hidden,\n    system,\n  }: Args) {\n    assert(parent !== child, 'Parent and child must be different operators');\n    assert(\n      parentKey.length === childKey.length,\n      'The parentKey and childKey keys must have same length',\n    );\n    this.#parent = parent;\n    this.#child = child;\n    this.#parentKey = parentKey;\n    this.#childKey = childKey;\n    this.#relationshipName = relationshipName;\n\n    const parentSchema = parent.getSchema();\n    const childSchema = child.getSchema();\n    this.#schema = {\n      ...parentSchema,\n      relationships: {\n        ...parentSchema.relationships,\n        [relationshipName]: {\n          ...childSchema,\n          isHidden: hidden,\n          system,\n        },\n      },\n    };\n\n    parent.setOutput({\n      push: (change: Change) => this.#pushParent(change),\n    });\n    child.setOutput({\n      push: (change: Change) => this.#pushChild(change),\n    });\n  }\n\n  destroy(): void {\n    this.#parent.destroy();\n    this.#child.destroy();\n  }\n\n  setOutput(output: Output): void {\n    this.#output = output;\n  }\n\n  getSchema(): SourceSchema {\n    return this.#schema;\n  }\n\n  *fetch(req: FetchRequest): Stream<Node | 'yield'> {\n    for (const parentNode of this.#parent.fetch(req)) {\n      if (parentNode === 'yield') {\n        yield parentNode;\n        continue;\n      }\n      yield this.#processParentNode(parentNode.row, parentNode.relationships);\n    }\n  }\n\n  *#pushParent(change: Change): Stream<'yield'> {\n    switch (change.type) {\n      case 'add':\n        yield* this.#output.push(\n          {\n            type: 'add',\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n            ),\n          },\n          this,\n        );\n        break;\n      case 'remove':\n        yield* this.#output.push(\n          {\n            type: 'remove',\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n            ),\n          },\n          this,\n        );\n        break;\n      case 'child':\n        yield* this.#output.push(\n          {\n            type: 'child',\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n            ),\n            child: change.child,\n          },\n          this,\n        );\n        break;\n      case 'edit': {\n        // Assert the edit could not change the relationship.\n        assert(\n          rowEqualsForCompoundKey(\n            change.oldNode.row,\n            change.node.row,\n            this.#parentKey,\n          ),\n          `Parent edit must not change relationship.`,\n        );\n        yield* this.#output.push(\n          {\n            type: 'edit',\n            oldNode: this.#processParentNode(\n              change.oldNode.row,\n              change.oldNode.relationships,\n            ),\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n            ),\n          },\n          this,\n        );\n        break;\n      }\n      default:\n        unreachable(change);\n    }\n  }\n\n  *#pushChild(change: Change): Stream<'yield'> {\n    switch (change.type) {\n      case 'add':\n      case 'remove':\n        yield* this.#pushChildChange(change.node.row, change);\n        break;\n      case 'child':\n        yield* this.#pushChildChange(change.node.row, change);\n        break;\n      case 'edit': {\n        const childRow = change.node.row;\n        const oldChildRow = change.oldNode.row;\n        // Assert the edit could not change the relationship.\n        assert(\n          rowEqualsForCompoundKey(oldChildRow, childRow, this.#childKey),\n          'Child edit must not change relationship.',\n        );\n        yield* this.#pushChildChange(childRow, change);\n        break;\n      }\n\n      default:\n        unreachable(change);\n    }\n  }\n\n  *#pushChildChange(childRow: Row, change: Change): Stream<'yield'> {\n    this.#inprogressChildChange = {\n      change,\n      position: undefined,\n    };\n    try {\n      const constraint = buildJoinConstraint(\n        childRow,\n        this.#childKey,\n        this.#parentKey,\n      );\n      const parentNodes = constraint ? this.#parent.fetch({constraint}) : [];\n\n      for (const parentNode of parentNodes) {\n        if (parentNode === 'yield') {\n          yield parentNode;\n          continue;\n        }\n        this.#inprogressChildChange.position = parentNode.row;\n        const childChange: ChildChange = {\n          type: 'child',\n          node: this.#processParentNode(\n            parentNode.row,\n            parentNode.relationships,\n          ),\n          child: {\n            relationshipName: this.#relationshipName,\n            change,\n          },\n        };\n        yield* this.#output.push(childChange, this);\n      }\n    } finally {\n      this.#inprogressChildChange = undefined;\n    }\n  }\n\n  #processParentNode(\n    parentNodeRow: Row,\n    parentNodeRelations: Record<string, () => Stream<Node | 'yield'>>,\n  ): Node {\n    const childStream = () => {\n      const constraint = buildJoinConstraint(\n        parentNodeRow,\n        this.#parentKey,\n        this.#childKey,\n      );\n      const stream = constraint ? this.#child.fetch({constraint}) : [];\n\n      if (\n        this.#inprogressChildChange &&\n        isJoinMatch(\n          parentNodeRow,\n          this.#parentKey,\n          this.#inprogressChildChange.change.node.row,\n          this.#childKey,\n        ) &&\n        this.#inprogressChildChange.position &&\n        this.#schema.compareRows(\n          parentNodeRow,\n          this.#inprogressChildChange.position,\n        ) > 0\n      ) {\n        return generateWithOverlay(\n          stream,\n          this.#inprogressChildChange.change,\n          this.#child.getSchema(),\n        );\n      }\n      return stream;\n    };\n\n    return {\n      row: parentNodeRow,\n      relationships: {\n        ...parentNodeRelations,\n        [this.#relationshipName]: childStream,\n      },\n    };\n  }\n}\n"],"names":[],"mappings":"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"}

package/out/zql/src/ivm/maybe-split-and-push-edit-change.d.ts

@@ -6,5 +6,5 @@ import type { InputBase, Output } from './operator.ts';
  * should be present based on the row's data. It then splits the change and
  * pushes the appropriate changes to the output based on the predicate.
  */
-export declare function maybeSplitAndPushEditChange(change: EditChange, predicate: (row: Row) => boolean, output: Output, pusher: InputBase): void;
+export declare function maybeSplitAndPushEditChange(change: EditChange, predicate: (row: Row) => boolean, output: Output, pusher: InputBase): Generator<"yield", void, any>;
 //# sourceMappingURL=maybe-split-and-push-edit-change.d.ts.map

package/out/zql/src/ivm/maybe-split-and-push-edit-change.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"maybe-split-and-push-edit-change.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/maybe-split-and-push-edit-change.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EAAC,SAAS,EAAE,MAAM,EAAC,MAAM,eAAe,CAAC;AAErD;;;;GAIG;AACH,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,EAChC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,QAwBlB"}
+{"version":3,"file":"maybe-split-and-push-edit-change.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/maybe-split-and-push-edit-change.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EAAC,SAAS,EAAE,MAAM,EAAC,MAAM,eAAe,CAAC;AAErD;;;;GAIG;AACH,wBAAiB,2BAA2B,CAC1C,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,EAChC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,iCAwBlB"}

package/out/zql/src/ivm/maybe-split-and-push-edit-change.js

@@ -1,10 +1,10 @@
-function maybeSplitAndPushEditChange(change, predicate, output, pusher) {
+function* maybeSplitAndPushEditChange(change, predicate, output, pusher) {
   const oldWasPresent = predicate(change.oldNode.row);
   const newIsPresent = predicate(change.node.row);
   if (oldWasPresent && newIsPresent) {
-    output.push(change, pusher);
+    yield* output.push(change, pusher);
   } else if (oldWasPresent && !newIsPresent) {
-    output.push(
+    yield* output.push(
       {
         type: "remove",
         node: change.oldNode
@@ -12,7 +12,7 @@ function maybeSplitAndPushEditChange(change, predicate, output, pusher) {
       pusher
     );
   } else if (!oldWasPresent && newIsPresent) {
-    output.push(
+    yield* output.push(
       {
         type: "add",
         node: change.node

package/out/zql/src/ivm/maybe-split-and-push-edit-change.js.map

@@ -1 +1 @@
-{"version":3,"file":"maybe-split-and-push-edit-change.js","sources":["../../../../../zql/src/ivm/maybe-split-and-push-edit-change.ts"],"sourcesContent":["import type {Row} from '../../../zero-protocol/src/data.ts';\nimport type {EditChange} from './change.ts';\nimport type {InputBase, Output} from './operator.ts';\n\n/**\n * This takes an {@linkcode EditChange} and a predicate that determines if a row\n * should be present based on the row's data. It then splits the change and\n * pushes the appropriate changes to the output based on the predicate.\n */\nexport function maybeSplitAndPushEditChange(\n  change: EditChange,\n  predicate: (row: Row) => boolean,\n  output: Output,\n  pusher: InputBase,\n) {\n  const oldWasPresent = predicate(change.oldNode.row);\n  const newIsPresent = predicate(change.node.row);\n\n  if (oldWasPresent && newIsPresent) {\n    output.push(change, pusher);\n  } else if (oldWasPresent && !newIsPresent) {\n    output.push(\n      {\n        type: 'remove',\n        node: change.oldNode,\n      },\n      pusher,\n    );\n  } else if (!oldWasPresent && newIsPresent) {\n    output.push(\n      {\n        type: 'add',\n        node: change.node,\n      },\n      pusher,\n    );\n  }\n}\n"],"names":[],"mappings":"AASO,SAAS,4BACd,QACA,WACA,QACA,QACA;AACA,QAAM,gBAAgB,UAAU,OAAO,QAAQ,GAAG;AAClD,QAAM,eAAe,UAAU,OAAO,KAAK,GAAG;AAE9C,MAAI,iBAAiB,cAAc;AACjC,WAAO,KAAK,QAAQ,MAAM;AAAA,EAC5B,WAAW,iBAAiB,CAAC,cAAc;AACzC,WAAO;AAAA,MACL;AAAA,QACE,MAAM;AAAA,QACN,MAAM,OAAO;AAAA,MAAA;AAAA,MAEf;AAAA,IAAA;AAAA,EAEJ,WAAW,CAAC,iBAAiB,cAAc;AACzC,WAAO;AAAA,MACL;AAAA,QACE,MAAM;AAAA,QACN,MAAM,OAAO;AAAA,MAAA;AAAA,MAEf;AAAA,IAAA;AAAA,EAEJ;AACF;"}
+{"version":3,"file":"maybe-split-and-push-edit-change.js","sources":["../../../../../zql/src/ivm/maybe-split-and-push-edit-change.ts"],"sourcesContent":["import type {Row} from '../../../zero-protocol/src/data.ts';\nimport type {EditChange} from './change.ts';\nimport type {InputBase, Output} from './operator.ts';\n\n/**\n * This takes an {@linkcode EditChange} and a predicate that determines if a row\n * should be present based on the row's data. It then splits the change and\n * pushes the appropriate changes to the output based on the predicate.\n */\nexport function* maybeSplitAndPushEditChange(\n  change: EditChange,\n  predicate: (row: Row) => boolean,\n  output: Output,\n  pusher: InputBase,\n) {\n  const oldWasPresent = predicate(change.oldNode.row);\n  const newIsPresent = predicate(change.node.row);\n\n  if (oldWasPresent && newIsPresent) {\n    yield* output.push(change, pusher);\n  } else if (oldWasPresent && !newIsPresent) {\n    yield* output.push(\n      {\n        type: 'remove',\n        node: change.oldNode,\n      },\n      pusher,\n    );\n  } else if (!oldWasPresent && newIsPresent) {\n    yield* output.push(\n      {\n        type: 'add',\n        node: change.node,\n      },\n      pusher,\n    );\n  }\n}\n"],"names":[],"mappings":"AASO,UAAU,4BACf,QACA,WACA,QACA,QACA;AACA,QAAM,gBAAgB,UAAU,OAAO,QAAQ,GAAG;AAClD,QAAM,eAAe,UAAU,OAAO,KAAK,GAAG;AAE9C,MAAI,iBAAiB,cAAc;AACjC,WAAO,OAAO,KAAK,QAAQ,MAAM;AAAA,EACnC,WAAW,iBAAiB,CAAC,cAAc;AACzC,WAAO,OAAO;AAAA,MACZ;AAAA,QACE,MAAM;AAAA,QACN,MAAM,OAAO;AAAA,MAAA;AAAA,MAEf;AAAA,IAAA;AAAA,EAEJ,WAAW,CAAC,iBAAiB,cAAc;AACzC,WAAO,OAAO;AAAA,MACZ;AAAA,QACE,MAAM;AAAA,QACN,MAAM,OAAO;AAAA,MAAA;AAAA,MAEf;AAAA,IAAA;AAAA,EAEJ;AACF;"}

package/out/zql/src/ivm/memory-source.d.ts

@@ -11,7 +11,7 @@ import { type Input, type Output, type Start } from './operator.ts';
 import type { Source, SourceChange, SourceInput } from './source.ts';
 import type { Stream } from './stream.ts';
 export type Overlay = {
-    outputIndex: number;
+    epoch: number;
     change: SourceChange;
 };
 export type Overlays = {
@@ -29,6 +29,7 @@ export type Connection = {
         predicate: (row: Row) => boolean;
     } | undefined;
     readonly debug?: DebugDelegate | undefined;
+    lastPushedEpoch: number;
 };
 /**
  * A `MemorySource` is a source that provides data to the pipeline from an
@@ -49,11 +50,11 @@ export declare class MemorySource implements Source {
     get data(): BTreeSet<Row>;
     connect(sort: Ordering, filters?: Condition, splitEditKeys?: Set<string>): SourceInput;
     getIndexKeys(): string[];
-    push(change: SourceChange): void;
-    genPush(change: SourceChange): Generator<undefined, void, unknown>;
+    push(change: SourceChange): Stream<'yield'>;
+    genPush(change: SourceChange): Generator<"yield" | undefined, void, unknown>;
 }
-export declare function genPushAndWriteWithSplitEdit(connections: readonly Connection[], change: SourceChange, exists: (row: Row) => boolean, setOverlay: (o: Overlay | undefined) => Overlay | undefined, writeChange: (c: SourceChange) => void): Generator<undefined, void, unknown>;
-export declare function generateWithStart(nodes: Iterable<Node>, start: Start | undefined, compare: (r1: Row, r2: Row) => number): Stream<Node>;
+export declare function genPushAndWriteWithSplitEdit(connections: readonly Connection[], change: SourceChange, exists: (row: Row) => boolean, setOverlay: (o: Overlay | undefined) => Overlay | undefined, writeChange: (c: SourceChange) => void, getNextEpoch: () => number): Generator<"yield" | undefined, void, unknown>;
+export declare function generateWithStart(nodes: Iterable<Node | 'yield'>, start: Start | undefined, compare: (r1: Row, r2: Row) => number): Stream<Node | 'yield'>;
 /**
  * Takes an iterator and overlay.
  * Splices the overlay into the iterator at the correct position.
@@ -66,7 +67,7 @@ export declare function generateWithStart(nodes: Iterable<Node>, start: Start |
  * @param overlay - the overlay values to splice in
  * @param compare - the comparator to use to find the position for the overlay
  */
-export declare function generateWithOverlay(startAt: Row | undefined, rows: Iterable<Row>, constraint: Constraint | undefined, overlay: Overlay | undefined, connectionIndex: number, compare: Comparator, filterPredicate?: (row: Row) => boolean | undefined): Generator<{
+export declare function generateWithOverlay(startAt: Row | undefined, rows: Iterable<Row>, constraint: Constraint | undefined, overlay: Overlay | undefined, lastPushedEpoch: number, compare: Comparator, filterPredicate?: (row: Row) => boolean | undefined): Generator<{
     row: Readonly<Record<string, import("../../../shared/src/json.ts").ReadonlyJSONValue | undefined>>;
     relationships: {};
 }, void, unknown>;

package/out/zql/src/ivm/memory-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory-source.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/memory-source.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"memory-source.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/memory-source.ts"],"names":[],"mappings":"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"}