@rocicorp/zero 0.26.1 → 0.26.2-canary.1

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

@@ -1,234 +1,165 @@
 import { assert, unreachable } from "../../../shared/src/asserts.js";
-import { rowEqualsForCompoundKey, buildJoinConstraint, isJoinMatch, generateWithOverlay } from "./join-utils.js";
 import { throwOutput } from "./operator.js";
-class Join {
-  #parent;
-  #child;
-  #parentKey;
-  #childKey;
-  #relationshipName;
-  #schema;
-  #output = throwOutput;
-  #inprogressChildChange;
-  constructor({
-    parent,
-    child,
-    parentKey,
-    childKey,
-    relationshipName,
-    hidden,
-    system
-  }) {
-    assert(parent !== child, "Parent and child must be different operators");
-    assert(
-      parentKey.length === childKey.length,
-      "The parentKey and childKey keys must have same length"
-    );
-    this.#parent = parent;
-    this.#child = child;
-    this.#parentKey = parentKey;
-    this.#childKey = childKey;
-    this.#relationshipName = relationshipName;
-    const parentSchema = parent.getSchema();
-    const childSchema = child.getSchema();
-    this.#schema = {
-      ...parentSchema,
-      relationships: {
-        ...parentSchema.relationships,
-        [relationshipName]: {
-          ...childSchema,
-          isHidden: hidden,
-          system
-        }
-      }
-    };
-    parent.setOutput({
-      push: (change) => this.#pushParent(change)
-    });
-    child.setOutput({
-      push: (change) => this.#pushChild(change)
-    });
-  }
-  destroy() {
-    this.#parent.destroy();
-    this.#child.destroy();
-  }
-  setOutput(output) {
-    this.#output = output;
-  }
-  getSchema() {
-    return this.#schema;
-  }
-  *fetch(req) {
-    for (const parentNode of this.#parent.fetch(req)) {
-      if (parentNode === "yield") {
-        yield parentNode;
-        continue;
-      }
-      yield this.#processParentNode(parentNode.row, parentNode.relationships);
-    }
-  }
-  *#pushParent(change) {
-    switch (change.type) {
-      case "add":
-        yield* this.#output.push(
-          {
-            type: "add",
-            node: this.#processParentNode(
-              change.node.row,
-              change.node.relationships
-            )
-          },
-          this
-        );
-        break;
-      case "remove":
-        yield* this.#output.push(
-          {
-            type: "remove",
-            node: this.#processParentNode(
-              change.node.row,
-              change.node.relationships
-            )
-          },
-          this
-        );
-        break;
-      case "child":
-        yield* this.#output.push(
-          {
-            type: "child",
-            node: this.#processParentNode(
-              change.node.row,
-              change.node.relationships
-            ),
-            child: change.child
-          },
-          this
-        );
-        break;
-      case "edit": {
-        assert(
-          rowEqualsForCompoundKey(
-            change.oldNode.row,
-            change.node.row,
-            this.#parentKey
-          ),
-          `Parent edit must not change relationship.`
-        );
-        yield* this.#output.push(
-          {
-            type: "edit",
-            oldNode: this.#processParentNode(
-              change.oldNode.row,
-              change.oldNode.relationships
-            ),
-            node: this.#processParentNode(
-              change.node.row,
-              change.node.relationships
-            )
-          },
-          this
-        );
-        break;
-      }
-      default:
-        unreachable();
-    }
-  }
-  *#pushChild(change) {
-    switch (change.type) {
-      case "add":
-      case "remove":
-        yield* this.#pushChildChange(change.node.row, change);
-        break;
-      case "child":
-        yield* this.#pushChildChange(change.node.row, change);
-        break;
-      case "edit": {
-        const childRow = change.node.row;
-        const oldChildRow = change.oldNode.row;
-        assert(
-          rowEqualsForCompoundKey(oldChildRow, childRow, this.#childKey),
-          "Child edit must not change relationship."
-        );
-        yield* this.#pushChildChange(childRow, change);
-        break;
-      }
-      default:
-        unreachable();
-    }
-  }
-  *#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);
-      }
-    } 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,
-        this.#inprogressChildChange.change.node.row,
-        this.#childKey
-      ) && this.#inprogressChildChange.position && this.#schema.compareRows(
-        parentNodeRow,
-        this.#inprogressChildChange.position
-      ) > 0) {
-        return generateWithOverlay(
-          stream,
-          this.#inprogressChildChange.change,
-          this.#child.getSchema()
-        );
-      }
-      return stream;
-    };
-    return {
-      row: parentNodeRow,
-      relationships: {
-        ...parentNodeRelations,
-        [this.#relationshipName]: childStream
-      }
-    };
-  }
-}
-export {
-  Join
+import { buildJoinConstraint, generateWithOverlay, isJoinMatch, rowEqualsForCompoundKey } from "./join-utils.js";
+//#region ../zql/src/ivm/join.ts
+/**
+* The Join operator joins the output from two upstream inputs. Zero's join
+* is a little different from SQL's join in that we output hierarchical data,
+* not a flat table. This makes it a lot more useful for UI programming and
+* avoids duplicating tons of data like left join would.
+*
+* The Nodes output from Join have a new relationship added to them, which has
+* the name #relationshipName. The value of the relationship is a stream of
+* child nodes which are the corresponding values from the child source.
+*/
+var Join = class {
+	#parent;
+	#child;
+	#parentKey;
+	#childKey;
+	#relationshipName;
+	#schema;
+	#output = throwOutput;
+	#inprogressChildChange;
+	constructor({ parent, child, parentKey, childKey, relationshipName, hidden, system }) {
+		assert(parent !== child, "Parent and child must be different operators");
+		assert(parentKey.length === childKey.length, "The parentKey and childKey keys must have same length");
+		this.#parent = parent;
+		this.#child = child;
+		this.#parentKey = parentKey;
+		this.#childKey = childKey;
+		this.#relationshipName = relationshipName;
+		const parentSchema = parent.getSchema();
+		const childSchema = child.getSchema();
+		this.#schema = {
+			...parentSchema,
+			relationships: {
+				...parentSchema.relationships,
+				[relationshipName]: {
+					...childSchema,
+					isHidden: hidden,
+					system
+				}
+			}
+		};
+		parent.setOutput({ push: (change) => this.#pushParent(change) });
+		child.setOutput({ push: (change) => this.#pushChild(change) });
+	}
+	destroy() {
+		this.#parent.destroy();
+		this.#child.destroy();
+	}
+	setOutput(output) {
+		this.#output = output;
+	}
+	getSchema() {
+		return this.#schema;
+	}
+	*fetch(req) {
+		for (const parentNode of this.#parent.fetch(req)) {
+			if (parentNode === "yield") {
+				yield parentNode;
+				continue;
+			}
+			yield this.#processParentNode(parentNode.row, parentNode.relationships);
+		}
+	}
+	*#pushParent(change) {
+		switch (change.type) {
+			case "add":
+				yield* this.#output.push({
+					type: "add",
+					node: this.#processParentNode(change.node.row, change.node.relationships)
+				}, this);
+				break;
+			case "remove":
+				yield* this.#output.push({
+					type: "remove",
+					node: this.#processParentNode(change.node.row, change.node.relationships)
+				}, this);
+				break;
+			case "child":
+				yield* this.#output.push({
+					type: "child",
+					node: this.#processParentNode(change.node.row, change.node.relationships),
+					child: change.child
+				}, this);
+				break;
+			case "edit":
+				assert(rowEqualsForCompoundKey(change.oldNode.row, change.node.row, this.#parentKey), `Parent edit must not change relationship.`);
+				yield* this.#output.push({
+					type: "edit",
+					oldNode: this.#processParentNode(change.oldNode.row, change.oldNode.relationships),
+					node: this.#processParentNode(change.node.row, change.node.relationships)
+				}, this);
+				break;
+			default: unreachable(change);
+		}
+	}
+	*#pushChild(change) {
+		switch (change.type) {
+			case "add":
+			case "remove":
+				yield* this.#pushChildChange(change.node.row, change);
+				break;
+			case "child":
+				yield* this.#pushChildChange(change.node.row, change);
+				break;
+			case "edit": {
+				const childRow = change.node.row;
+				const oldChildRow = change.oldNode.row;
+				assert(rowEqualsForCompoundKey(oldChildRow, childRow, this.#childKey), "Child edit must not change relationship.");
+				yield* this.#pushChildChange(childRow, change);
+				break;
+			}
+			default: unreachable(change);
+		}
+	}
+	*#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);
+			}
+		} 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, this.#inprogressChildChange.change.node.row, this.#childKey) && this.#inprogressChildChange.position && this.#schema.compareRows(parentNodeRow, this.#inprogressChildChange.position) > 0) return generateWithOverlay(stream, this.#inprogressChildChange.change, this.#child.getSchema());
+			return stream;
+		};
+		return {
+			row: parentNodeRow,
+			relationships: {
+				...parentNodeRelations,
+				[this.#relationshipName]: childStream
+			}
+		};
+	}
 };
-//# sourceMappingURL=join.js.map
+//#endregion
+export { 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} 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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"}
+{"version":3,"file":"join.js","names":["#parent","#child","#parentKey","#childKey","#relationshipName","#schema","#pushParent","#pushChild","#output","#processParentNode","#pushChildChange","#inprogressChildChange"],"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"],"mappings":"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"}

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

@@ -1,27 +1,23 @@
+//#region ../zql/src/ivm/maybe-split-and-push-edit-change.ts
+/**
+* This takes an {@linkcode EditChange} and a predicate that determines if a row
+* 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.
+*/
 function* maybeSplitAndPushEditChange(change, predicate, output, pusher) {
-  const oldWasPresent = predicate(change.oldNode.row);
-  const newIsPresent = predicate(change.node.row);
-  if (oldWasPresent && newIsPresent) {
-    yield* output.push(change, pusher);
-  } else if (oldWasPresent && !newIsPresent) {
-    yield* output.push(
-      {
-        type: "remove",
-        node: change.oldNode
-      },
-      pusher
-    );
-  } else if (!oldWasPresent && newIsPresent) {
-    yield* output.push(
-      {
-        type: "add",
-        node: change.node
-      },
-      pusher
-    );
-  }
+	const oldWasPresent = predicate(change.oldNode.row);
+	const newIsPresent = predicate(change.node.row);
+	if (oldWasPresent && newIsPresent) yield* output.push(change, pusher);
+	else if (oldWasPresent && !newIsPresent) yield* output.push({
+		type: "remove",
+		node: change.oldNode
+	}, pusher);
+	else if (!oldWasPresent && newIsPresent) yield* output.push({
+		type: "add",
+		node: change.node
+	}, pusher);
 }
-export {
-  maybeSplitAndPushEditChange
-};
-//# sourceMappingURL=maybe-split-and-push-edit-change.js.map
+//#endregion
+export { maybeSplitAndPushEditChange };
+
+//# sourceMappingURL=maybe-split-and-push-edit-change.js.map

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    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;"}
+{"version":3,"file":"maybe-split-and-push-edit-change.js","names":[],"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"],"mappings":";;;;;;AASA,UAAiB,4BACf,QACA,WACA,QACA,QACA;CACA,MAAM,gBAAgB,UAAU,OAAO,QAAQ,IAAI;CACnD,MAAM,eAAe,UAAU,OAAO,KAAK,IAAI;AAE/C,KAAI,iBAAiB,aACnB,QAAO,OAAO,KAAK,QAAQ,OAAO;UACzB,iBAAiB,CAAC,aAC3B,QAAO,OAAO,KACZ;EACE,MAAM;EACN,MAAM,OAAO;EACd,EACD,OACD;UACQ,CAAC,iBAAiB,aAC3B,QAAO,OAAO,KACZ;EACE,MAAM;EACN,MAAM,OAAO;EACd,EACD,OACD"}