@rocicorp/zero 1.3.0-canary.0 → 1.3.0-canary.2

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

@@ -2,6 +2,7 @@ import { assert, unreachable } from "../../../shared/src/asserts.js";
 import { binarySearch } from "../../../shared/src/binary-search.js";
 import { emptyArray } from "../../../shared/src/sentinels.js";
 import { throwOutput } from "./operator.js";
+import { makeAddChange, makeChildChange, makeEditChange, makeRemoveChange } from "./change.js";
 import { constraintsAreCompatible } from "./constraint.js";
 import { buildJoinConstraint, generateWithOverlayNoYield, isJoinMatch, rowEqualsForCompoundKey } from "./join-utils.js";
 //#region ../zql/src/ivm/flipped-join.ts
@@ -22,6 +23,7 @@ var FlippedJoin = class {
 	#schema;
 	#output = throwOutput;
 	#inprogressChildChange;
+	#inprogressChildChangePosition;
 	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");
@@ -74,8 +76,8 @@ var FlippedJoin = class {
 			}
 			childNodes.push(node);
 		}
-		if (this.#inprogressChildChange?.change.type === "remove") {
-			const removedNode = this.#inprogressChildChange.change.node;
+		if (this.#inprogressChildChange?.[0] === 1) {
+			const removedNode = this.#inprogressChildChange[1];
 			const compare = this.#child.getSchema().compareRows;
 			const insertPos = binarySearch(childNodes.length, (i) => compare(removedNode.row, childNodes[i].row));
 			childNodes.splice(insertPos, 0, removedNode);
@@ -138,11 +140,11 @@ var FlippedJoin = class {
 					nextParentNodes[minParentNodeChildIndex] = result.done ? null : result.value;
 				}
 				let overlaidRelatedChildNodes = relatedChildNodes;
-				if (this.#inprogressChildChange && this.#inprogressChildChange.position && isJoinMatch(this.#inprogressChildChange.change.node.row, this.#childKey, minParentNode.row, this.#parentKey)) {
-					const hasInprogressChildChangeBeenPushedForMinParentNode = this.#parent.getSchema().compareRows(minParentNode.row, this.#inprogressChildChange.position) <= 0;
-					if (this.#inprogressChildChange.change.type === "remove") {
-						if (hasInprogressChildChangeBeenPushedForMinParentNode) overlaidRelatedChildNodes = relatedChildNodes.filter((n) => n !== this.#inprogressChildChange?.change.node);
-					} else if (!hasInprogressChildChangeBeenPushedForMinParentNode) overlaidRelatedChildNodes = [...generateWithOverlayNoYield(relatedChildNodes, this.#inprogressChildChange.change, this.#child.getSchema())];
+				if (this.#inprogressChildChange && this.#inprogressChildChangePosition && isJoinMatch(this.#inprogressChildChange[1].row, this.#childKey, minParentNode.row, this.#parentKey)) {
+					const hasInprogressChildChangeBeenPushedForMinParentNode = this.#parent.getSchema().compareRows(minParentNode.row, this.#inprogressChildChangePosition) <= 0;
+					if (this.#inprogressChildChange[0] === 1) {
+						if (hasInprogressChildChangeBeenPushedForMinParentNode) overlaidRelatedChildNodes = relatedChildNodes.filter((n) => n !== this.#inprogressChildChange?.[1]);
+					} else if (!hasInprogressChildChangeBeenPushedForMinParentNode) overlaidRelatedChildNodes = [...generateWithOverlayNoYield(relatedChildNodes, this.#inprogressChildChange, this.#child.getSchema())];
 				}
 				if (overlaidRelatedChildNodes.length > 0) yield {
 					...minParentNode,
@@ -165,37 +167,33 @@ var FlippedJoin = class {
 		}
 	}
 	*#pushChild(change) {
-		switch (change.type) {
-			case "add":
-			case "remove":
+		switch (change[0]) {
+			case 0:
+			case 1:
 				yield* this.#pushChildChange(change);
 				break;
-			case "edit":
-				assert(rowEqualsForCompoundKey(change.oldNode.row, change.node.row, this.#childKey), `Child edit must not change relationship.`);
+			case 2:
+				assert(rowEqualsForCompoundKey(change[2].row, change[1].row, this.#childKey), `Child edit must not change relationship.`);
 				yield* this.#pushChildChange(change, true);
 				break;
-			case "child":
+			case 3:
 				yield* this.#pushChildChange(change, true);
 				break;
 		}
 	}
 	*#pushChildChange(change, exists) {
-		this.#inprogressChildChange = {
-			change,
-			position: void 0
-		};
+		this.#inprogressChildChange = change;
+		this.#inprogressChildChangePosition = void 0;
 		try {
-			const constraint = buildJoinConstraint(change.node.row, this.#childKey, this.#parentKey);
+			const constraint = buildJoinConstraint(change[1].row, this.#childKey, this.#parentKey);
 			const parentNodeStream = constraint ? this.#parent.fetch({ constraint }) : [];
 			for (const parentNode of parentNodeStream) {
 				if (parentNode === "yield") {
 					yield "yield";
 					continue;
 				}
-				this.#inprogressChildChange = {
-					change,
-					position: parentNode.row
-				};
+				this.#inprogressChildChange = change;
+				this.#inprogressChildChangePosition = parentNode.row;
 				const childNodeStream = () => {
 					const constraint = buildJoinConstraint(parentNode.row, this.#parentKey, this.#childKey);
 					return constraint ? this.#child.fetch({ constraint }) : [];
@@ -205,35 +203,31 @@ var FlippedJoin = class {
 						yield "yield";
 						continue;
 					}
-					if (this.#child.getSchema().compareRows(childNode.row, change.node.row) !== 0) {
+					if (this.#child.getSchema().compareRows(childNode.row, change[1].row) !== 0) {
 						exists = true;
 						break;
 					}
 				}
-				if (exists) yield* this.#output.push({
-					type: "child",
-					node: {
-						...parentNode,
-						relationships: {
-							...parentNode.relationships,
-							[this.#relationshipName]: childNodeStream
-						}
-					},
-					child: {
-						relationshipName: this.#relationshipName,
-						change
+				if (exists) yield* this.#output.push(makeChildChange({
+					...parentNode,
+					relationships: {
+						...parentNode.relationships,
+						[this.#relationshipName]: childNodeStream
 					}
-				}, this);
-				else yield* this.#output.push({
-					...change,
-					node: {
+				}, {
+					relationshipName: this.#relationshipName,
+					change
+				}), this);
+				else {
+					const newNode = {
 						...parentNode,
 						relationships: {
 							...parentNode.relationships,
-							[this.#relationshipName]: () => [change.node]
+							[this.#relationshipName]: () => [change[1]]
 						}
-					}
-				}, this);
+					};
+					yield* this.#output.push(change[0] === 0 ? makeAddChange(newNode) : makeRemoveChange(newNode), this);
+				}
 			}
 		} finally {
 			this.#inprogressChildChange = void 0;
@@ -252,7 +246,7 @@ var FlippedJoin = class {
 			}
 		});
 		let hasRelatedChild = false;
-		for (const node of childNodeStream(change.node)()) if (node === "yield") {
+		for (const node of childNodeStream(change[1])()) if (node === "yield") {
 			yield "yield";
 			continue;
 		} else {
@@ -260,22 +254,19 @@ var FlippedJoin = class {
 			break;
 		}
 		if (!hasRelatedChild) return;
-		switch (change.type) {
-			case "add":
-			case "remove":
-			case "child":
-				yield* this.#output.push({
-					...change,
-					node: flip(change.node)
-				}, this);
+		switch (change[0]) {
+			case 0:
+				yield* this.#output.push(makeAddChange(flip(change[1])), this);
+				break;
+			case 1:
+				yield* this.#output.push(makeRemoveChange(flip(change[1])), this);
+				break;
+			case 3:
+				yield* this.#output.push(makeChildChange(flip(change[1]), change[2]), 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: flip(change.oldNode),
-					node: flip(change.node)
-				}, this);
+			case 2:
+				assert(rowEqualsForCompoundKey(change[2].row, change[1].row, this.#parentKey), `Parent edit must not change relationship.`);
+				yield* this.#output.push(makeEditChange(flip(change[1]), flip(change[2])), this);
 				break;
 			default: unreachable(change);
 		}

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

@@ -1 +1 @@
-{"version":3,"file":"flipped-join.js","names":["#parent","#child","#parentKey","#childKey","#relationshipName","#schema","#pushParent","#pushChild","#output","#inprogressChildChange","#pushChildChange"],"sources":["../../../../../zql/src/ivm/flipped-join.ts"],"sourcesContent":["import {assert, unreachable} from '../../../shared/src/asserts.ts';\nimport {binarySearch} from '../../../shared/src/binary-search.ts';\nimport {emptyArray} from '../../../shared/src/sentinels.ts';\nimport type {CompoundKey, System} from '../../../zero-protocol/src/ast.ts';\nimport type {Value} from '../../../zero-protocol/src/data.ts';\nimport type {Change} from './change.ts';\nimport {constraintsAreCompatible} from './constraint.ts';\nimport type {Node} from './data.ts';\nimport {\n  buildJoinConstraint,\n  generateWithOverlayNoYield,\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 childKey corresponds to the nth key in parentKey.\n  parentKey: CompoundKey;\n  childKey: CompoundKey;\n\n  relationshipName: string;\n  hidden: boolean;\n  system: System;\n};\n\n/**\n * An *inner* join which fetches nodes from its child input first and then\n * fetches their related nodes from its parent input.  Output nodes are the\n * nodes from parent input (in parent input order), which have at least one\n * related child.  These output nodes have a new relationship added to them,\n * which has the name `relationshipName`. The value of the relationship is a\n * stream of related nodes from the child input (in child input order).\n */\nexport class FlippedJoin 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.#child.destroy();\n    this.#parent.destroy();\n  }\n\n  setOutput(output: Output): void {\n    this.#output = output;\n  }\n\n  getSchema(): SourceSchema {\n    return this.#schema;\n  }\n\n  // TODO: When parentKey is the parent's primary key (or more\n  // generally when the parent cardinality is expected to be small) a different\n  // algorithm should be used:  For each child node, fetch all parent nodes\n  // eagerly and then sort using quicksort.\n  *fetch(req: FetchRequest): Stream<Node | 'yield'> {\n    // Translate constraints for the parent on parts of the join key to\n    // constraints for the child.\n    const childConstraint: Record<string, Value> = {};\n    let hasChildConstraint = false;\n    if (req.constraint) {\n      for (const [key, value] of Object.entries(req.constraint)) {\n        const index = this.#parentKey.indexOf(key);\n        if (index !== -1) {\n          hasChildConstraint = true;\n          childConstraint[this.#childKey[index]] = value;\n        }\n      }\n    }\n\n    const childNodes: Node[] = [];\n    for (const node of this.#child.fetch(\n      hasChildConstraint ? {constraint: childConstraint} : {},\n    )) {\n      if (node === 'yield') {\n        yield node;\n        continue;\n      }\n      childNodes.push(node);\n    }\n\n    // FlippedJoin's split-push change overlay logic is largely\n    // the same as Join's with the exception of remove.  For remove,\n    // the change is undone here, and then re-applied to parents with order\n    // less than or equal to change.position below.  This is necessary\n    // because if the removed node was the last related child, the\n    // related parents with position greater than change.position\n    // (which should not yet have the node removed), would not even\n    // be fetched here, and would be absent from the output all together.\n    if (this.#inprogressChildChange?.change.type === 'remove') {\n      const removedNode = this.#inprogressChildChange.change.node;\n      const compare = this.#child.getSchema().compareRows;\n      const insertPos = binarySearch(childNodes.length, i =>\n        compare(removedNode.row, childNodes[i].row),\n      );\n      childNodes.splice(insertPos, 0, removedNode);\n    }\n    const parentIterators: Iterator<Node | 'yield'>[] = [];\n    let threw = false;\n    try {\n      for (const childNode of childNodes) {\n        // TODO: consider adding the ability to pass a set of\n        // ids to fetch, and have them applied to sqlite using IN.\n        const constraintFromChild = buildJoinConstraint(\n          childNode.row,\n          this.#childKey,\n          this.#parentKey,\n        );\n        if (\n          !constraintFromChild ||\n          (req.constraint &&\n            !constraintsAreCompatible(constraintFromChild, req.constraint))\n        ) {\n          parentIterators.push(emptyArray[Symbol.iterator]());\n        } else {\n          const stream = this.#parent.fetch({\n            ...req,\n            constraint: {\n              ...req.constraint,\n              ...constraintFromChild,\n            },\n          });\n          const iterator = stream[Symbol.iterator]();\n          parentIterators.push(iterator);\n        }\n      }\n      const nextParentNodes: (Node | null)[] = [];\n      for (let i = 0; i < parentIterators.length; i++) {\n        const iter = parentIterators[i];\n        let result = iter.next();\n        // yield yields when initializing\n        while (!result.done && result.value === 'yield') {\n          yield result.value;\n          result = iter.next();\n        }\n        nextParentNodes[i] = result.done ? null : (result.value as Node);\n      }\n\n      while (true) {\n        let minParentNode = null;\n        let minParentNodeChildIndexes: number[] = [];\n        for (let i = 0; i < nextParentNodes.length; i++) {\n          const parentNode = nextParentNodes[i];\n          if (parentNode === null) {\n            continue;\n          }\n          if (minParentNode === null) {\n            minParentNode = parentNode;\n            minParentNodeChildIndexes.push(i);\n          } else {\n            const compareResult =\n              this.#schema.compareRows(parentNode.row, minParentNode.row) *\n              (req.reverse ? -1 : 1);\n            if (compareResult === 0) {\n              minParentNodeChildIndexes.push(i);\n            } else if (compareResult < 0) {\n              minParentNode = parentNode;\n              minParentNodeChildIndexes = [i];\n            }\n          }\n        }\n        if (minParentNode === null) {\n          return;\n        }\n        const relatedChildNodes: Node[] = [];\n        for (const minParentNodeChildIndex of minParentNodeChildIndexes) {\n          relatedChildNodes.push(childNodes[minParentNodeChildIndex]);\n          const iter = parentIterators[minParentNodeChildIndex];\n          let result = iter.next();\n          // yield yields when advancing\n          while (!result.done && result.value === 'yield') {\n            yield result.value;\n            result = iter.next();\n          }\n          nextParentNodes[minParentNodeChildIndex] = result.done\n            ? null\n            : (result.value as Node);\n        }\n        let overlaidRelatedChildNodes = relatedChildNodes;\n        if (\n          this.#inprogressChildChange &&\n          this.#inprogressChildChange.position &&\n          isJoinMatch(\n            this.#inprogressChildChange.change.node.row,\n            this.#childKey,\n            minParentNode.row,\n            this.#parentKey,\n          )\n        ) {\n          const hasInprogressChildChangeBeenPushedForMinParentNode =\n            this.#parent\n              .getSchema()\n              .compareRows(\n                minParentNode.row,\n                this.#inprogressChildChange.position,\n              ) <= 0;\n          if (this.#inprogressChildChange.change.type === 'remove') {\n            if (hasInprogressChildChangeBeenPushedForMinParentNode) {\n              // Remove form relatedChildNodes since the removed child\n              // was inserted into childNodes above.\n              overlaidRelatedChildNodes = relatedChildNodes.filter(\n                n => n !== this.#inprogressChildChange?.change.node,\n              );\n            }\n          } else if (!hasInprogressChildChangeBeenPushedForMinParentNode) {\n            overlaidRelatedChildNodes = [\n              ...generateWithOverlayNoYield(\n                relatedChildNodes,\n                this.#inprogressChildChange.change,\n                this.#child.getSchema(),\n              ),\n            ];\n          }\n        }\n\n        // yield node if after the overlay it still has relationship nodes\n        if (overlaidRelatedChildNodes.length > 0) {\n          yield {\n            ...minParentNode,\n            relationships: {\n              ...minParentNode.relationships,\n              [this.#relationshipName]: () => overlaidRelatedChildNodes,\n            },\n          };\n        }\n      }\n    } catch (e) {\n      threw = true;\n      for (const iter of parentIterators) {\n        try {\n          iter.throw?.(e);\n        } catch (_cleanupError) {\n          // error in the iter.throw cleanup,\n          // catch so other iterators are cleaned up\n        }\n      }\n      throw e;\n    } finally {\n      if (!threw) {\n        for (const iter of parentIterators) {\n          try {\n            iter.return?.();\n          } catch (_cleanupError) {\n            // error in the iter.return cleanup,\n            // catch so other iterators are cleaned up\n          }\n        }\n      }\n    }\n  }\n\n  *#pushChild(change: Change): Stream<'yield'> {\n    switch (change.type) {\n      case 'add':\n      case 'remove':\n        yield* this.#pushChildChange(change);\n        break;\n      case 'edit': {\n        assert(\n          rowEqualsForCompoundKey(\n            change.oldNode.row,\n            change.node.row,\n            this.#childKey,\n          ),\n          `Child edit must not change relationship.`,\n        );\n        yield* this.#pushChildChange(change, true);\n        break;\n      }\n      case 'child':\n        yield* this.#pushChildChange(change, true);\n        break;\n    }\n  }\n\n  *#pushChildChange(change: Change, exists?: boolean): Stream<'yield'> {\n    this.#inprogressChildChange = {\n      change,\n      position: undefined,\n    };\n    try {\n      const constraint = buildJoinConstraint(\n        change.node.row,\n        this.#childKey,\n        this.#parentKey,\n      );\n      const parentNodeStream = constraint\n        ? this.#parent.fetch({constraint})\n        : [];\n      for (const parentNode of parentNodeStream) {\n        if (parentNode === 'yield') {\n          yield 'yield';\n          continue;\n        }\n        this.#inprogressChildChange = {\n          change,\n          position: parentNode.row,\n        };\n        const childNodeStream = () => {\n          const constraint = buildJoinConstraint(\n            parentNode.row,\n            this.#parentKey,\n            this.#childKey,\n          );\n          return constraint ? this.#child.fetch({constraint}) : [];\n        };\n        if (!exists) {\n          for (const childNode of childNodeStream()) {\n            if (childNode === 'yield') {\n              yield 'yield';\n              continue;\n            }\n            if (\n              this.#child\n                .getSchema()\n                .compareRows(childNode.row, change.node.row) !== 0\n            ) {\n              exists = true;\n              break;\n            }\n          }\n        }\n        if (exists) {\n          yield* this.#output.push(\n            {\n              type: 'child',\n              node: {\n                ...parentNode,\n                relationships: {\n                  ...parentNode.relationships,\n                  [this.#relationshipName]: childNodeStream,\n                },\n              },\n              child: {\n                relationshipName: this.#relationshipName,\n                change,\n              },\n            },\n            this,\n          );\n        } else {\n          yield* this.#output.push(\n            {\n              ...change,\n              node: {\n                ...parentNode,\n                relationships: {\n                  ...parentNode.relationships,\n                  [this.#relationshipName]: () => [change.node],\n                },\n              },\n            },\n            this,\n          );\n        }\n      }\n    } finally {\n      this.#inprogressChildChange = undefined;\n    }\n  }\n\n  *#pushParent(change: Change): Stream<'yield'> {\n    const childNodeStream = (node: Node) => () => {\n      const constraint = buildJoinConstraint(\n        node.row,\n        this.#parentKey,\n        this.#childKey,\n      );\n      return constraint ? this.#child.fetch({constraint}) : [];\n    };\n\n    const flip = (node: Node) => ({\n      ...node,\n      relationships: {\n        ...node.relationships,\n        [this.#relationshipName]: childNodeStream(node),\n      },\n    });\n\n    // If no related child don't push as this is an inner join.\n    let hasRelatedChild = false;\n    for (const node of childNodeStream(change.node)()) {\n      if (node === 'yield') {\n        yield 'yield';\n        continue;\n      } else {\n        hasRelatedChild = true;\n        break;\n      }\n    }\n    if (!hasRelatedChild) {\n      return;\n    }\n\n    switch (change.type) {\n      case 'add':\n      case 'remove':\n      case 'child': {\n        yield* this.#output.push(\n          {\n            ...change,\n            node: flip(change.node),\n          },\n          this,\n        );\n        break;\n      }\n      case 'edit': {\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: flip(change.oldNode),\n            node: flip(change.node),\n          },\n          this,\n        );\n        break;\n      }\n      default:\n        unreachable(change);\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"flipped-join.js","names":["#parent","#child","#parentKey","#childKey","#relationshipName","#schema","#pushParent","#pushChild","#output","#inprogressChildChange","#inprogressChildChangePosition","#pushChildChange"],"sources":["../../../../../zql/src/ivm/flipped-join.ts"],"sourcesContent":["import {assert, unreachable} from '../../../shared/src/asserts.ts';\nimport {binarySearch} from '../../../shared/src/binary-search.ts';\nimport {emptyArray} from '../../../shared/src/sentinels.ts';\nimport type {CompoundKey, System} from '../../../zero-protocol/src/ast.ts';\nimport type {Row, Value} from '../../../zero-protocol/src/data.ts';\nimport {ChangeIndex} from './change-index.ts';\nimport {ChangeType} from './change-type.ts';\nimport {\n  makeAddChange,\n  makeChildChange,\n  makeEditChange,\n  makeRemoveChange,\n  type Change,\n} from './change.ts';\nimport {constraintsAreCompatible} from './constraint.ts';\nimport type {Node} from './data.ts';\nimport {\n  buildJoinConstraint,\n  generateWithOverlayNoYield,\n  isJoinMatch,\n  rowEqualsForCompoundKey,\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 childKey corresponds to the nth key in parentKey.\n  parentKey: CompoundKey;\n  childKey: CompoundKey;\n\n  relationshipName: string;\n  hidden: boolean;\n  system: System;\n};\n\n/**\n * An *inner* join which fetches nodes from its child input first and then\n * fetches their related nodes from its parent input.  Output nodes are the\n * nodes from parent input (in parent input order), which have at least one\n * related child.  These output nodes have a new relationship added to them,\n * which has the name `relationshipName`. The value of the relationship is a\n * stream of related nodes from the child input (in child input order).\n */\nexport class FlippedJoin 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: Change | undefined;\n  #inprogressChildChangePosition: Row | 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.#child.destroy();\n    this.#parent.destroy();\n  }\n\n  setOutput(output: Output): void {\n    this.#output = output;\n  }\n\n  getSchema(): SourceSchema {\n    return this.#schema;\n  }\n\n  // TODO: When parentKey is the parent's primary key (or more\n  // generally when the parent cardinality is expected to be small) a different\n  // algorithm should be used:  For each child node, fetch all parent nodes\n  // eagerly and then sort using quicksort.\n  *fetch(req: FetchRequest): Stream<Node | 'yield'> {\n    // Translate constraints for the parent on parts of the join key to\n    // constraints for the child.\n    const childConstraint: Record<string, Value> = {};\n    let hasChildConstraint = false;\n    if (req.constraint) {\n      for (const [key, value] of Object.entries(req.constraint)) {\n        const index = this.#parentKey.indexOf(key);\n        if (index !== -1) {\n          hasChildConstraint = true;\n          childConstraint[this.#childKey[index]] = value;\n        }\n      }\n    }\n\n    const childNodes: Node[] = [];\n    for (const node of this.#child.fetch(\n      hasChildConstraint ? {constraint: childConstraint} : {},\n    )) {\n      if (node === 'yield') {\n        yield node;\n        continue;\n      }\n      childNodes.push(node);\n    }\n\n    // FlippedJoin's split-push change overlay logic is largely\n    // the same as Join's with the exception of remove.  For remove,\n    // the change is undone here, and then re-applied to parents with order\n    // less than or equal to change.position below.  This is necessary\n    // because if the removed node was the last related child, the\n    // related parents with position greater than change.position\n    // (which should not yet have the node removed), would not even\n    // be fetched here, and would be absent from the output all together.\n    if (this.#inprogressChildChange?.[ChangeIndex.TYPE] === ChangeType.REMOVE) {\n      const removedNode = this.#inprogressChildChange[ChangeIndex.NODE];\n      const compare = this.#child.getSchema().compareRows;\n      const insertPos = binarySearch(childNodes.length, i =>\n        compare(removedNode.row, childNodes[i].row),\n      );\n      childNodes.splice(insertPos, 0, removedNode);\n    }\n    const parentIterators: Iterator<Node | 'yield'>[] = [];\n    let threw = false;\n    try {\n      for (const childNode of childNodes) {\n        // TODO: consider adding the ability to pass a set of\n        // ids to fetch, and have them applied to sqlite using IN.\n        const constraintFromChild = buildJoinConstraint(\n          childNode.row,\n          this.#childKey,\n          this.#parentKey,\n        );\n        if (\n          !constraintFromChild ||\n          (req.constraint &&\n            !constraintsAreCompatible(constraintFromChild, req.constraint))\n        ) {\n          parentIterators.push(emptyArray[Symbol.iterator]());\n        } else {\n          const stream = this.#parent.fetch({\n            ...req,\n            constraint: {\n              ...req.constraint,\n              ...constraintFromChild,\n            },\n          });\n          const iterator = stream[Symbol.iterator]();\n          parentIterators.push(iterator);\n        }\n      }\n      const nextParentNodes: (Node | null)[] = [];\n      for (let i = 0; i < parentIterators.length; i++) {\n        const iter = parentIterators[i];\n        let result = iter.next();\n        // yield yields when initializing\n        while (!result.done && result.value === 'yield') {\n          yield result.value;\n          result = iter.next();\n        }\n        nextParentNodes[i] = result.done ? null : (result.value as Node);\n      }\n\n      while (true) {\n        let minParentNode = null;\n        let minParentNodeChildIndexes: number[] = [];\n        for (let i = 0; i < nextParentNodes.length; i++) {\n          const parentNode = nextParentNodes[i];\n          if (parentNode === null) {\n            continue;\n          }\n          if (minParentNode === null) {\n            minParentNode = parentNode;\n            minParentNodeChildIndexes.push(i);\n          } else {\n            const compareResult =\n              this.#schema.compareRows(parentNode.row, minParentNode.row) *\n              (req.reverse ? -1 : 1);\n            if (compareResult === 0) {\n              minParentNodeChildIndexes.push(i);\n            } else if (compareResult < 0) {\n              minParentNode = parentNode;\n              minParentNodeChildIndexes = [i];\n            }\n          }\n        }\n        if (minParentNode === null) {\n          return;\n        }\n        const relatedChildNodes: Node[] = [];\n        for (const minParentNodeChildIndex of minParentNodeChildIndexes) {\n          relatedChildNodes.push(childNodes[minParentNodeChildIndex]);\n          const iter = parentIterators[minParentNodeChildIndex];\n          let result = iter.next();\n          // yield yields when advancing\n          while (!result.done && result.value === 'yield') {\n            yield result.value;\n            result = iter.next();\n          }\n          nextParentNodes[minParentNodeChildIndex] = result.done\n            ? null\n            : (result.value as Node);\n        }\n        let overlaidRelatedChildNodes = relatedChildNodes;\n        if (\n          this.#inprogressChildChange &&\n          this.#inprogressChildChangePosition &&\n          isJoinMatch(\n            this.#inprogressChildChange[ChangeIndex.NODE].row,\n            this.#childKey,\n            minParentNode.row,\n            this.#parentKey,\n          )\n        ) {\n          const hasInprogressChildChangeBeenPushedForMinParentNode =\n            this.#parent\n              .getSchema()\n              .compareRows(\n                minParentNode.row,\n                this.#inprogressChildChangePosition,\n              ) <= 0;\n          if (\n            this.#inprogressChildChange[ChangeIndex.TYPE] === ChangeType.REMOVE\n          ) {\n            if (hasInprogressChildChangeBeenPushedForMinParentNode) {\n              // Remove form relatedChildNodes since the removed child\n              // was inserted into childNodes above.\n              overlaidRelatedChildNodes = relatedChildNodes.filter(\n                n => n !== this.#inprogressChildChange?.[ChangeIndex.NODE],\n              );\n            }\n          } else if (!hasInprogressChildChangeBeenPushedForMinParentNode) {\n            overlaidRelatedChildNodes = [\n              ...generateWithOverlayNoYield(\n                relatedChildNodes,\n                this.#inprogressChildChange,\n                this.#child.getSchema(),\n              ),\n            ];\n          }\n        }\n\n        // yield node if after the overlay it still has relationship nodes\n        if (overlaidRelatedChildNodes.length > 0) {\n          yield {\n            ...minParentNode,\n            relationships: {\n              ...minParentNode.relationships,\n              [this.#relationshipName]: () => overlaidRelatedChildNodes,\n            },\n          };\n        }\n      }\n    } catch (e) {\n      threw = true;\n      for (const iter of parentIterators) {\n        try {\n          iter.throw?.(e);\n        } catch (_cleanupError) {\n          // error in the iter.throw cleanup,\n          // catch so other iterators are cleaned up\n        }\n      }\n      throw e;\n    } finally {\n      if (!threw) {\n        for (const iter of parentIterators) {\n          try {\n            iter.return?.();\n          } catch (_cleanupError) {\n            // error in the iter.return cleanup,\n            // catch so other iterators are cleaned up\n          }\n        }\n      }\n    }\n  }\n\n  *#pushChild(change: Change): Stream<'yield'> {\n    switch (change[ChangeIndex.TYPE]) {\n      case ChangeType.ADD:\n      case ChangeType.REMOVE:\n        yield* this.#pushChildChange(change);\n        break;\n      case ChangeType.EDIT: {\n        assert(\n          rowEqualsForCompoundKey(\n            change[ChangeIndex.OLD_NODE].row,\n            change[ChangeIndex.NODE].row,\n            this.#childKey,\n          ),\n          `Child edit must not change relationship.`,\n        );\n        yield* this.#pushChildChange(change, true);\n        break;\n      }\n      case ChangeType.CHILD:\n        yield* this.#pushChildChange(change, true);\n        break;\n    }\n  }\n\n  *#pushChildChange(change: Change, exists?: boolean): Stream<'yield'> {\n    this.#inprogressChildChange = change;\n    this.#inprogressChildChangePosition = undefined;\n    try {\n      const constraint = buildJoinConstraint(\n        change[ChangeIndex.NODE].row,\n        this.#childKey,\n        this.#parentKey,\n      );\n      const parentNodeStream = constraint\n        ? this.#parent.fetch({constraint})\n        : [];\n      for (const parentNode of parentNodeStream) {\n        if (parentNode === 'yield') {\n          yield 'yield';\n          continue;\n        }\n        this.#inprogressChildChange = change;\n        this.#inprogressChildChangePosition = parentNode.row;\n        const childNodeStream = () => {\n          const constraint = buildJoinConstraint(\n            parentNode.row,\n            this.#parentKey,\n            this.#childKey,\n          );\n          return constraint ? this.#child.fetch({constraint}) : [];\n        };\n        if (!exists) {\n          for (const childNode of childNodeStream()) {\n            if (childNode === 'yield') {\n              yield 'yield';\n              continue;\n            }\n            if (\n              this.#child\n                .getSchema()\n                .compareRows(childNode.row, change[ChangeIndex.NODE].row) !== 0\n            ) {\n              exists = true;\n              break;\n            }\n          }\n        }\n        if (exists) {\n          yield* this.#output.push(\n            makeChildChange(\n              {\n                ...parentNode,\n                relationships: {\n                  ...parentNode.relationships,\n                  [this.#relationshipName]: childNodeStream,\n                },\n              },\n              {\n                relationshipName: this.#relationshipName,\n                change,\n              },\n            ),\n            this,\n          );\n        } else {\n          const newNode = {\n            ...parentNode,\n            relationships: {\n              ...parentNode.relationships,\n              [this.#relationshipName]: () => [change[ChangeIndex.NODE]],\n            },\n          };\n          yield* this.#output.push(\n            change[ChangeIndex.TYPE] === ChangeType.ADD\n              ? makeAddChange(newNode)\n              : makeRemoveChange(newNode),\n            this,\n          );\n        }\n      }\n    } finally {\n      this.#inprogressChildChange = undefined;\n    }\n  }\n\n  *#pushParent(change: Change): Stream<'yield'> {\n    const childNodeStream = (node: Node) => () => {\n      const constraint = buildJoinConstraint(\n        node.row,\n        this.#parentKey,\n        this.#childKey,\n      );\n      return constraint ? this.#child.fetch({constraint}) : [];\n    };\n\n    const flip = (node: Node) => ({\n      ...node,\n      relationships: {\n        ...node.relationships,\n        [this.#relationshipName]: childNodeStream(node),\n      },\n    });\n\n    // If no related child don't push as this is an inner join.\n    let hasRelatedChild = false;\n    for (const node of childNodeStream(change[ChangeIndex.NODE])()) {\n      if (node === 'yield') {\n        yield 'yield';\n        continue;\n      } else {\n        hasRelatedChild = true;\n        break;\n      }\n    }\n    if (!hasRelatedChild) {\n      return;\n    }\n\n    switch (change[ChangeIndex.TYPE]) {\n      case ChangeType.ADD:\n        yield* this.#output.push(\n          makeAddChange(flip(change[ChangeIndex.NODE])),\n          this,\n        );\n        break;\n      case ChangeType.REMOVE:\n        yield* this.#output.push(\n          makeRemoveChange(flip(change[ChangeIndex.NODE])),\n          this,\n        );\n        break;\n      case ChangeType.CHILD: {\n        yield* this.#output.push(\n          makeChildChange(\n            flip(change[ChangeIndex.NODE]),\n            change[ChangeIndex.CHILD_DATA],\n          ),\n          this,\n        );\n        break;\n      }\n      case ChangeType.EDIT: {\n        assert(\n          rowEqualsForCompoundKey(\n            change[ChangeIndex.OLD_NODE].row,\n            change[ChangeIndex.NODE].row,\n            this.#parentKey,\n          ),\n          `Parent edit must not change relationship.`,\n        );\n        yield* this.#output.push(\n          makeEditChange(\n            flip(change[ChangeIndex.NODE]),\n            flip(change[ChangeIndex.OLD_NODE]),\n          ),\n          this,\n        );\n        break;\n      }\n      default:\n        unreachable(change);\n    }\n  }\n}\n"],"mappings":"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"}

package/out/zql/src/ivm/join-utils.d.ts

@@ -1,13 +1,9 @@
+import type { CompoundKey } from '../../../zero-protocol/src/ast.ts';
 import type { Row, Value } from '../../../zero-protocol/src/data.ts';
 import type { Change } from './change.ts';
+import { type Node } from './data.ts';
 import type { SourceSchema } from './schema.ts';
 import type { Stream } from './stream.ts';
-import { type Node } from './data.ts';
-import type { CompoundKey } from '../../../zero-protocol/src/ast.ts';
-export type JoinChangeOverlay = {
-    change: Change;
-    position: Row | undefined;
-};
 export declare function generateWithOverlayNoYield(stream: Stream<Node>, overlay: Change, schema: SourceSchema): Stream<Node>;
 export declare function generateWithOverlay(stream: Stream<Node | 'yield'>, overlay: Change, schema: SourceSchema): Stream<Node | 'yield'>;
 export declare function generateWithOverlayNoYieldUnordered(stream: Stream<Node>, overlay: Change, schema: SourceSchema): Stream<Node>;

package/out/zql/src/ivm/join-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"join-utils.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/join-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAE,KAAK,EAAC,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAA6B,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAEhE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mCAAmC,CAAC;AAEnE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,GAAG,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,YAAY,GACnB,MAAM,CAAC,IAAI,CAAC,CAEd;AAED,wBAAiB,mBAAmB,CAClC,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,EAC9B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,YAAY,GACnB,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,CA6FxB;AAED,wBAAgB,mCAAmC,CACjD,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,YAAY,GACnB,MAAM,CAAC,IAAI,CAAC,CAEd;AAED,wBAAiB,4BAA4B,CAC3C,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,EAC9B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,YAAY,GACnB,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,CAmDxB;AAED,wBAAgB,uBAAuB,CACrC,CAAC,EAAE,GAAG,EACN,CAAC,EAAE,GAAG,EACN,GAAG,EAAE,WAAW,GACf,OAAO,CAOT;AAED,wBAAgB,WAAW,CACzB,MAAM,EAAE,GAAG,EACX,SAAS,EAAE,WAAW,EACtB,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,WAAW,WAQtB;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,WAAW,EACtB,SAAS,EAAE,WAAW,GACrB,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,SAAS,CAUnC"}
+{"version":3,"file":"join-utils.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/join-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAC,GAAG,EAAE,KAAK,EAAC,MAAM,oCAAoC,CAAC;AAGnE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAA6B,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAChE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAExC,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,YAAY,GACnB,MAAM,CAAC,IAAI,CAAC,CAEd;AAED,wBAAiB,mBAAmB,CAClC,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,EAC9B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,YAAY,GACnB,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,CAqGxB;AAED,wBAAgB,mCAAmC,CACjD,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,YAAY,GACnB,MAAM,CAAC,IAAI,CAAC,CAEd;AAED,wBAAiB,4BAA4B,CAC3C,MAAM,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,EAC9B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,YAAY,GACnB,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,CAkExB;AAED,wBAAgB,uBAAuB,CACrC,CAAC,EAAE,GAAG,EACN,CAAC,EAAE,GAAG,EACN,GAAG,EAAE,WAAW,GACf,OAAO,CAOT;AAED,wBAAgB,WAAW,CACzB,MAAM,EAAE,GAAG,EACX,SAAS,EAAE,WAAW,EACtB,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,WAAW,WAQtB;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,WAAW,EACtB,SAAS,EAAE,WAAW,GACrB,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,SAAS,CAUnC"}

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

@@ -14,39 +14,39 @@ function* generateWithOverlay(stream, overlay, schema) {
 			continue;
 		}
 		let yieldNode = true;
-		if (!applied) switch (overlay.type) {
-			case "add":
-				if (schema.compareRows(overlay.node.row, node.row) === 0) {
+		if (!applied) switch (overlay[0]) {
+			case 0:
+				if (schema.compareRows(overlay[1].row, node.row) === 0) {
 					applied = true;
 					yieldNode = false;
 				}
 				break;
-			case "remove":
-				if (schema.compareRows(overlay.node.row, node.row) < 0) {
+			case 1:
+				if (schema.compareRows(overlay[1].row, node.row) < 0) {
 					applied = true;
-					yield overlay.node;
+					yield overlay[1];
 				}
 				break;
-			case "edit":
-				if (!editOldApplied && schema.compareRows(overlay.oldNode.row, node.row) < 0) {
+			case 2:
+				if (!editOldApplied && schema.compareRows(overlay[2].row, node.row) < 0) {
 					editOldApplied = true;
 					if (editNewApplied) applied = true;
-					yield overlay.oldNode;
+					yield overlay[2];
 				}
-				if (!editNewApplied && schema.compareRows(overlay.node.row, node.row) === 0) {
+				if (!editNewApplied && schema.compareRows(overlay[1].row, node.row) === 0) {
 					editNewApplied = true;
 					if (editOldApplied) applied = true;
 					yieldNode = false;
 				}
 				break;
-			case "child":
-				if (schema.compareRows(overlay.node.row, node.row) === 0) {
+			case 3:
+				if (schema.compareRows(overlay[1].row, node.row) === 0) {
 					applied = true;
 					yield {
 						row: node.row,
 						relationships: {
 							...node.relationships,
-							[overlay.child.relationshipName]: () => generateWithOverlay(node.relationships[overlay.child.relationshipName](), overlay.child.change, schema.relationships[overlay.child.relationshipName])
+							[overlay[2].relationshipName]: () => generateWithOverlay(node.relationships[overlay[2].relationshipName](), overlay[2].change, schema.relationships[overlay[2].relationshipName])
 						}
 					};
 					yieldNode = false;
@@ -56,21 +56,21 @@ function* generateWithOverlay(stream, overlay, schema) {
 		if (yieldNode) yield node;
 	}
 	if (!applied) {
-		if (overlay.type === "remove") {
+		if (overlay[0] === 1) {
 			applied = true;
-			yield overlay.node;
-		} else if (overlay.type === "edit") {
+			yield overlay[1];
+		} else if (overlay[0] === 2) {
 			assert(editNewApplied, "edit overlay: new node must be applied before old node");
 			editOldApplied = true;
 			applied = true;
-			yield overlay.oldNode;
+			yield overlay[2];
 		}
 	}
 	assert(applied, "overlayGenerator: overlay was never applied to any fetched node");
 }
 function* generateWithOverlayUnordered(stream, overlay, schema) {
-	if (overlay.type === "remove") yield overlay.node;
-	else if (overlay.type === "edit") yield overlay.oldNode;
+	if (overlay[0] === 1) yield overlay[1];
+	else if (overlay[0] === 2) yield overlay[2];
 	let suppressed = false;
 	for (const node of stream) {
 		if (node === "yield") {
@@ -78,20 +78,20 @@ function* generateWithOverlayUnordered(stream, overlay, schema) {
 			continue;
 		}
 		if (!suppressed) {
-			if (overlay.type === "add" || overlay.type === "edit") {
-				if (rowEqualsForCompoundKey(overlay.node.row, node.row, schema.primaryKey)) {
+			if (overlay[0] === 0 || overlay[0] === 2) {
+				if (rowEqualsForCompoundKey(overlay[1].row, node.row, schema.primaryKey)) {
 					suppressed = true;
 					continue;
 				}
 			}
-			if (overlay.type === "child") {
-				if (rowEqualsForCompoundKey(overlay.node.row, node.row, schema.primaryKey)) {
+			if (overlay[0] === 3) {
+				if (rowEqualsForCompoundKey(overlay[1].row, node.row, schema.primaryKey)) {
 					suppressed = true;
 					yield {
 						row: node.row,
 						relationships: {
 							...node.relationships,
-							[overlay.child.relationshipName]: () => generateWithOverlay(node.relationships[overlay.child.relationshipName](), overlay.child.change, schema.relationships[overlay.child.relationshipName])
+							[overlay[2].relationshipName]: () => generateWithOverlay(node.relationships[overlay[2].relationshipName](), overlay[2].change, schema.relationships[overlay[2].relationshipName])
 						}
 					};
 					continue;
@@ -100,7 +100,7 @@ function* generateWithOverlayUnordered(stream, overlay, schema) {
 		}
 		yield node;
 	}
-	assert(suppressed || overlay.type === "remove", "overlayGenerator: overlay was never applied to any fetched node");
+	assert(suppressed || overlay[0] === 1, "overlayGenerator: overlay was never applied to any fetched node");
 }
 function rowEqualsForCompoundKey(a, b, key) {
 	for (let i = 0; i < key.length; i++) if (compareValues(a[key[i]], b[key[i]]) !== 0) return false;

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

@@ -1 +1 @@
-{"version":3,"file":"join-utils.js","names":[],"sources":["../../../../../zql/src/ivm/join-utils.ts"],"sourcesContent":["import type {Row, Value} from '../../../zero-protocol/src/data.ts';\nimport type {Change} from './change.ts';\nimport type {SourceSchema} from './schema.ts';\nimport type {Stream} from './stream.ts';\nimport {compareValues, valuesEqual, type Node} from './data.ts';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport type {CompoundKey} from '../../../zero-protocol/src/ast.ts';\n\nexport type JoinChangeOverlay = {\n  change: Change;\n  position: Row | undefined;\n};\n\nexport function generateWithOverlayNoYield(\n  stream: Stream<Node>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node> {\n  return generateWithOverlay(stream, overlay, schema) as Stream<Node>;\n}\n\nexport function* generateWithOverlay(\n  stream: Stream<Node | 'yield'>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node | 'yield'> {\n  let applied = false;\n  let editOldApplied = false;\n  let editNewApplied = false;\n  for (const node of stream) {\n    if (node === 'yield') {\n      yield node;\n      continue;\n    }\n    let yieldNode = true;\n    if (!applied) {\n      switch (overlay.type) {\n        case 'add': {\n          if (schema.compareRows(overlay.node.row, node.row) === 0) {\n            applied = true;\n            yieldNode = false;\n          }\n          break;\n        }\n        case 'remove': {\n          if (schema.compareRows(overlay.node.row, node.row) < 0) {\n            applied = true;\n            yield overlay.node;\n          }\n          break;\n        }\n        case 'edit': {\n          if (\n            !editOldApplied &&\n            schema.compareRows(overlay.oldNode.row, node.row) < 0\n          ) {\n            editOldApplied = true;\n            if (editNewApplied) {\n              applied = true;\n            }\n            yield overlay.oldNode;\n          }\n          if (\n            !editNewApplied &&\n            schema.compareRows(overlay.node.row, node.row) === 0\n          ) {\n            editNewApplied = true;\n            if (editOldApplied) {\n              applied = true;\n            }\n            yieldNode = false;\n          }\n          break;\n        }\n        case 'child': {\n          if (schema.compareRows(overlay.node.row, node.row) === 0) {\n            applied = true;\n            yield {\n              row: node.row,\n              relationships: {\n                ...node.relationships,\n                [overlay.child.relationshipName]: () =>\n                  generateWithOverlay(\n                    node.relationships[overlay.child.relationshipName](),\n                    overlay.child.change,\n                    schema.relationships[overlay.child.relationshipName],\n                  ),\n              },\n            };\n            yieldNode = false;\n          }\n          break;\n        }\n      }\n    }\n    if (yieldNode) {\n      yield node;\n    }\n  }\n  if (!applied) {\n    if (overlay.type === 'remove') {\n      applied = true;\n      yield overlay.node;\n    } else if (overlay.type === 'edit') {\n      assert(\n        editNewApplied,\n        'edit overlay: new node must be applied before old node',\n      );\n      editOldApplied = true;\n      applied = true;\n      yield overlay.oldNode;\n    }\n  }\n\n  assert(\n    applied,\n    'overlayGenerator: overlay was never applied to any fetched node',\n  );\n}\n\nexport function generateWithOverlayNoYieldUnordered(\n  stream: Stream<Node>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node> {\n  return generateWithOverlayUnordered(stream, overlay, schema) as Stream<Node>;\n}\n\nexport function* generateWithOverlayUnordered(\n  stream: Stream<Node | 'yield'>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node | 'yield'> {\n  // Eager inject\n  if (overlay.type === 'remove') {\n    yield overlay.node;\n  } else if (overlay.type === 'edit') {\n    yield overlay.oldNode;\n  }\n\n  // Stream with inline suppress\n  let suppressed = false;\n  for (const node of stream) {\n    if (node === 'yield') {\n      yield node;\n      continue;\n    }\n    if (!suppressed) {\n      if (overlay.type === 'add' || overlay.type === 'edit') {\n        if (\n          rowEqualsForCompoundKey(overlay.node.row, node.row, schema.primaryKey)\n        ) {\n          suppressed = true;\n          continue;\n        }\n      }\n      if (overlay.type === 'child') {\n        if (\n          rowEqualsForCompoundKey(overlay.node.row, node.row, schema.primaryKey)\n        ) {\n          suppressed = true;\n          yield {\n            row: node.row,\n            relationships: {\n              ...node.relationships,\n              [overlay.child.relationshipName]: () =>\n                generateWithOverlay(\n                  node.relationships[overlay.child.relationshipName](),\n                  overlay.child.change,\n                  schema.relationships[overlay.child.relationshipName],\n                ),\n            },\n          };\n          continue;\n        }\n      }\n    }\n    yield node;\n  }\n  assert(\n    suppressed || overlay.type === 'remove',\n    'overlayGenerator: overlay was never applied to any fetched node',\n  );\n}\n\nexport function rowEqualsForCompoundKey(\n  a: Row,\n  b: Row,\n  key: CompoundKey,\n): boolean {\n  for (let i = 0; i < key.length; i++) {\n    if (compareValues(a[key[i]], b[key[i]]) !== 0) {\n      return false;\n    }\n  }\n  return true;\n}\n\nexport function isJoinMatch(\n  parent: Row,\n  parentKey: CompoundKey,\n  child: Row,\n  childKey: CompoundKey,\n) {\n  for (let i = 0; i < parentKey.length; i++) {\n    if (!valuesEqual(parent[parentKey[i]], child[childKey[i]])) {\n      return false;\n    }\n  }\n  return true;\n}\n\n/**\n * Builds a constraint object by mapping values from `sourceRow` using `sourceKey`\n * to keys specified by `targetKey`. Returns `undefined` if any source value is `null`,\n * since null foreign keys cannot match any rows.\n */\nexport function buildJoinConstraint(\n  sourceRow: Row,\n  sourceKey: CompoundKey,\n  targetKey: CompoundKey,\n): Record<string, Value> | undefined {\n  const constraint: Record<string, Value> = {};\n  for (let i = 0; i < targetKey.length; i++) {\n    const value = sourceRow[sourceKey[i]];\n    if (value === null) {\n      return undefined;\n    }\n    constraint[targetKey[i]] = value;\n  }\n  return constraint;\n}\n"],"mappings":";;;AAaA,SAAgB,2BACd,QACA,SACA,QACc;AACd,QAAO,oBAAoB,QAAQ,SAAS,OAAO;;AAGrD,UAAiB,oBACf,QACA,SACA,QACwB;CACxB,IAAI,UAAU;CACd,IAAI,iBAAiB;CACrB,IAAI,iBAAiB;AACrB,MAAK,MAAM,QAAQ,QAAQ;AACzB,MAAI,SAAS,SAAS;AACpB,SAAM;AACN;;EAEF,IAAI,YAAY;AAChB,MAAI,CAAC,QACH,SAAQ,QAAQ,MAAhB;GACE,KAAK;AACH,QAAI,OAAO,YAAY,QAAQ,KAAK,KAAK,KAAK,IAAI,KAAK,GAAG;AACxD,eAAU;AACV,iBAAY;;AAEd;GAEF,KAAK;AACH,QAAI,OAAO,YAAY,QAAQ,KAAK,KAAK,KAAK,IAAI,GAAG,GAAG;AACtD,eAAU;AACV,WAAM,QAAQ;;AAEhB;GAEF,KAAK;AACH,QACE,CAAC,kBACD,OAAO,YAAY,QAAQ,QAAQ,KAAK,KAAK,IAAI,GAAG,GACpD;AACA,sBAAiB;AACjB,SAAI,eACF,WAAU;AAEZ,WAAM,QAAQ;;AAEhB,QACE,CAAC,kBACD,OAAO,YAAY,QAAQ,KAAK,KAAK,KAAK,IAAI,KAAK,GACnD;AACA,sBAAiB;AACjB,SAAI,eACF,WAAU;AAEZ,iBAAY;;AAEd;GAEF,KAAK;AACH,QAAI,OAAO,YAAY,QAAQ,KAAK,KAAK,KAAK,IAAI,KAAK,GAAG;AACxD,eAAU;AACV,WAAM;MACJ,KAAK,KAAK;MACV,eAAe;OACb,GAAG,KAAK;QACP,QAAQ,MAAM,yBACb,oBACE,KAAK,cAAc,QAAQ,MAAM,mBAAmB,EACpD,QAAQ,MAAM,QACd,OAAO,cAAc,QAAQ,MAAM,kBACpC;OACJ;MACF;AACD,iBAAY;;AAEd;;AAIN,MAAI,UACF,OAAM;;AAGV,KAAI,CAAC;MACC,QAAQ,SAAS,UAAU;AAC7B,aAAU;AACV,SAAM,QAAQ;aACL,QAAQ,SAAS,QAAQ;AAClC,UACE,gBACA,yDACD;AACD,oBAAiB;AACjB,aAAU;AACV,SAAM,QAAQ;;;AAIlB,QACE,SACA,kEACD;;AAWH,UAAiB,6BACf,QACA,SACA,QACwB;AAExB,KAAI,QAAQ,SAAS,SACnB,OAAM,QAAQ;UACL,QAAQ,SAAS,OAC1B,OAAM,QAAQ;CAIhB,IAAI,aAAa;AACjB,MAAK,MAAM,QAAQ,QAAQ;AACzB,MAAI,SAAS,SAAS;AACpB,SAAM;AACN;;AAEF,MAAI,CAAC,YAAY;AACf,OAAI,QAAQ,SAAS,SAAS,QAAQ,SAAS;QAE3C,wBAAwB,QAAQ,KAAK,KAAK,KAAK,KAAK,OAAO,WAAW,EACtE;AACA,kBAAa;AACb;;;AAGJ,OAAI,QAAQ,SAAS;QAEjB,wBAAwB,QAAQ,KAAK,KAAK,KAAK,KAAK,OAAO,WAAW,EACtE;AACA,kBAAa;AACb,WAAM;MACJ,KAAK,KAAK;MACV,eAAe;OACb,GAAG,KAAK;QACP,QAAQ,MAAM,yBACb,oBACE,KAAK,cAAc,QAAQ,MAAM,mBAAmB,EACpD,QAAQ,MAAM,QACd,OAAO,cAAc,QAAQ,MAAM,kBACpC;OACJ;MACF;AACD;;;;AAIN,QAAM;;AAER,QACE,cAAc,QAAQ,SAAS,UAC/B,kEACD;;AAGH,SAAgB,wBACd,GACA,GACA,KACS;AACT,MAAK,IAAI,IAAI,GAAG,IAAI,IAAI,QAAQ,IAC9B,KAAI,cAAc,EAAE,IAAI,KAAK,EAAE,IAAI,IAAI,KAAK,EAC1C,QAAO;AAGX,QAAO;;AAGT,SAAgB,YACd,QACA,WACA,OACA,UACA;AACA,MAAK,IAAI,IAAI,GAAG,IAAI,UAAU,QAAQ,IACpC,KAAI,CAAC,YAAY,OAAO,UAAU,KAAK,MAAM,SAAS,IAAI,CACxD,QAAO;AAGX,QAAO;;;;;;;AAQT,SAAgB,oBACd,WACA,WACA,WACmC;CACnC,MAAM,aAAoC,EAAE;AAC5C,MAAK,IAAI,IAAI,GAAG,IAAI,UAAU,QAAQ,KAAK;EACzC,MAAM,QAAQ,UAAU,UAAU;AAClC,MAAI,UAAU,KACZ;AAEF,aAAW,UAAU,MAAM;;AAE7B,QAAO"}
+{"version":3,"file":"join-utils.js","names":[],"sources":["../../../../../zql/src/ivm/join-utils.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport type {CompoundKey} from '../../../zero-protocol/src/ast.ts';\nimport type {Row, Value} from '../../../zero-protocol/src/data.ts';\nimport {ChangeIndex} from './change-index.ts';\nimport {ChangeType} from './change-type.ts';\nimport type {Change} from './change.ts';\nimport {compareValues, valuesEqual, type Node} from './data.ts';\nimport type {SourceSchema} from './schema.ts';\nimport type {Stream} from './stream.ts';\n\nexport function generateWithOverlayNoYield(\n  stream: Stream<Node>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node> {\n  return generateWithOverlay(stream, overlay, schema) as Stream<Node>;\n}\n\nexport function* generateWithOverlay(\n  stream: Stream<Node | 'yield'>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node | 'yield'> {\n  let applied = false;\n  let editOldApplied = false;\n  let editNewApplied = false;\n  for (const node of stream) {\n    if (node === 'yield') {\n      yield node;\n      continue;\n    }\n    let yieldNode = true;\n    if (!applied) {\n      switch (overlay[ChangeIndex.TYPE]) {\n        case ChangeType.ADD: {\n          if (\n            schema.compareRows(overlay[ChangeIndex.NODE].row, node.row) === 0\n          ) {\n            applied = true;\n            yieldNode = false;\n          }\n          break;\n        }\n        case ChangeType.REMOVE: {\n          if (schema.compareRows(overlay[ChangeIndex.NODE].row, node.row) < 0) {\n            applied = true;\n            yield overlay[ChangeIndex.NODE];\n          }\n          break;\n        }\n        case ChangeType.EDIT: {\n          if (\n            !editOldApplied &&\n            schema.compareRows(overlay[ChangeIndex.OLD_NODE].row, node.row) < 0\n          ) {\n            editOldApplied = true;\n            if (editNewApplied) {\n              applied = true;\n            }\n            yield overlay[ChangeIndex.OLD_NODE];\n          }\n          if (\n            !editNewApplied &&\n            schema.compareRows(overlay[ChangeIndex.NODE].row, node.row) === 0\n          ) {\n            editNewApplied = true;\n            if (editOldApplied) {\n              applied = true;\n            }\n            yieldNode = false;\n          }\n          break;\n        }\n        case ChangeType.CHILD: {\n          if (\n            schema.compareRows(overlay[ChangeIndex.NODE].row, node.row) === 0\n          ) {\n            applied = true;\n            yield {\n              row: node.row,\n              relationships: {\n                ...node.relationships,\n                [overlay[ChangeIndex.CHILD_DATA].relationshipName]: () =>\n                  generateWithOverlay(\n                    node.relationships[\n                      overlay[ChangeIndex.CHILD_DATA].relationshipName\n                    ](),\n                    overlay[ChangeIndex.CHILD_DATA].change,\n                    schema.relationships[\n                      overlay[ChangeIndex.CHILD_DATA].relationshipName\n                    ],\n                  ),\n              },\n            };\n            yieldNode = false;\n          }\n          break;\n        }\n      }\n    }\n    if (yieldNode) {\n      yield node;\n    }\n  }\n  if (!applied) {\n    if (overlay[ChangeIndex.TYPE] === ChangeType.REMOVE) {\n      applied = true;\n      yield overlay[ChangeIndex.NODE];\n    } else if (overlay[ChangeIndex.TYPE] === ChangeType.EDIT) {\n      assert(\n        editNewApplied,\n        'edit overlay: new node must be applied before old node',\n      );\n      editOldApplied = true;\n      applied = true;\n      yield overlay[ChangeIndex.OLD_NODE];\n    }\n  }\n\n  assert(\n    applied,\n    'overlayGenerator: overlay was never applied to any fetched node',\n  );\n}\n\nexport function generateWithOverlayNoYieldUnordered(\n  stream: Stream<Node>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node> {\n  return generateWithOverlayUnordered(stream, overlay, schema) as Stream<Node>;\n}\n\nexport function* generateWithOverlayUnordered(\n  stream: Stream<Node | 'yield'>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node | 'yield'> {\n  // Eager inject\n  if (overlay[ChangeIndex.TYPE] === ChangeType.REMOVE) {\n    yield overlay[ChangeIndex.NODE];\n  } else if (overlay[ChangeIndex.TYPE] === ChangeType.EDIT) {\n    yield overlay[ChangeIndex.OLD_NODE];\n  }\n\n  // Stream with inline suppress\n  let suppressed = false;\n  for (const node of stream) {\n    if (node === 'yield') {\n      yield node;\n      continue;\n    }\n    if (!suppressed) {\n      if (\n        overlay[ChangeIndex.TYPE] === ChangeType.ADD ||\n        overlay[ChangeIndex.TYPE] === ChangeType.EDIT\n      ) {\n        if (\n          rowEqualsForCompoundKey(\n            overlay[ChangeIndex.NODE].row,\n            node.row,\n            schema.primaryKey,\n          )\n        ) {\n          suppressed = true;\n          continue;\n        }\n      }\n      if (overlay[ChangeIndex.TYPE] === ChangeType.CHILD) {\n        if (\n          rowEqualsForCompoundKey(\n            overlay[ChangeIndex.NODE].row,\n            node.row,\n            schema.primaryKey,\n          )\n        ) {\n          suppressed = true;\n          yield {\n            row: node.row,\n            relationships: {\n              ...node.relationships,\n              [overlay[ChangeIndex.CHILD_DATA].relationshipName]: () =>\n                generateWithOverlay(\n                  node.relationships[\n                    overlay[ChangeIndex.CHILD_DATA].relationshipName\n                  ](),\n                  overlay[ChangeIndex.CHILD_DATA].change,\n                  schema.relationships[\n                    overlay[ChangeIndex.CHILD_DATA].relationshipName\n                  ],\n                ),\n            },\n          };\n          continue;\n        }\n      }\n    }\n    yield node;\n  }\n  assert(\n    suppressed || overlay[ChangeIndex.TYPE] === ChangeType.REMOVE,\n    'overlayGenerator: overlay was never applied to any fetched node',\n  );\n}\n\nexport function rowEqualsForCompoundKey(\n  a: Row,\n  b: Row,\n  key: CompoundKey,\n): boolean {\n  for (let i = 0; i < key.length; i++) {\n    if (compareValues(a[key[i]], b[key[i]]) !== 0) {\n      return false;\n    }\n  }\n  return true;\n}\n\nexport function isJoinMatch(\n  parent: Row,\n  parentKey: CompoundKey,\n  child: Row,\n  childKey: CompoundKey,\n) {\n  for (let i = 0; i < parentKey.length; i++) {\n    if (!valuesEqual(parent[parentKey[i]], child[childKey[i]])) {\n      return false;\n    }\n  }\n  return true;\n}\n\n/**\n * Builds a constraint object by mapping values from `sourceRow` using `sourceKey`\n * to keys specified by `targetKey`. Returns `undefined` if any source value is `null`,\n * since null foreign keys cannot match any rows.\n */\nexport function buildJoinConstraint(\n  sourceRow: Row,\n  sourceKey: CompoundKey,\n  targetKey: CompoundKey,\n): Record<string, Value> | undefined {\n  const constraint: Record<string, Value> = {};\n  for (let i = 0; i < targetKey.length; i++) {\n    const value = sourceRow[sourceKey[i]];\n    if (value === null) {\n      return undefined;\n    }\n    constraint[targetKey[i]] = value;\n  }\n  return constraint;\n}\n"],"mappings":"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"}

package/out/zql/src/ivm/join.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/join.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAE,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAG3E,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AASpC,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,MAAM,EACZ,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAC,KAAK,MAAM,EAAC,MAAM,aAAa,CAAC;AAExC,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IAEb,SAAS,EAAE,WAAW,CAAC;IACvB,QAAQ,EAAE,WAAW,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;;;GASG;AACH,qBAAa,IAAK,YAAW,KAAK;;gBAYpB,EACV,MAAM,EACN,KAAK,EACL,SAAS,EACT,QAAQ,EACR,gBAAgB,EAChB,MAAM,EACN,MAAM,GACP,EAAE,IAAI;IAkCP,OAAO,IAAI,IAAI;IAKf,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B,SAAS,IAAI,YAAY;IAIxB,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC;CAkMlD"}
+{"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/join.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAE,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAW3E,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAQpC,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,MAAM,EACZ,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAC,KAAK,MAAM,EAAC,MAAM,aAAa,CAAC;AAExC,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IAEb,SAAS,EAAE,WAAW,CAAC;IACvB,QAAQ,EAAE,WAAW,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;;;GASG;AACH,qBAAa,IAAK,YAAW,KAAK;;gBAapB,EACV,MAAM,EACN,KAAK,EACL,SAAS,EACT,QAAQ,EACR,gBAAgB,EAChB,MAAM,EACN,MAAM,GACP,EAAE,IAAI;IAkCP,OAAO,IAAI,IAAI;IAKf,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B,SAAS,IAAI,YAAY;IAIxB,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC;CAwLlD"}

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

@@ -1,5 +1,6 @@
 import { assert, unreachable } from "../../../shared/src/asserts.js";
 import { throwOutput } from "./operator.js";
+import { makeAddChange, makeChildChange, makeEditChange, makeRemoveChange } from "./change.js";
 import { buildJoinConstraint, generateWithOverlay, generateWithOverlayUnordered, isJoinMatch, rowEqualsForCompoundKey } from "./join-utils.js";
 //#region ../zql/src/ivm/join.ts
 /**
@@ -21,6 +22,7 @@ var Join = class {
 	#schema;
 	#output = throwOutput;
 	#inprogressChildChange;
+	#inprogressChildChangePosition;
 	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");
@@ -65,49 +67,35 @@ var Join = class {
 		}
 	}
 	*#pushParent(change) {
-		switch (change.type) {
-			case "add":
-				yield* this.#output.push({
-					type: "add",
-					node: this.#processParentNode(change.node.row, change.node.relationships)
-				}, this);
+		switch (change[0]) {
+			case 0:
+				yield* this.#output.push(makeAddChange(this.#processParentNode(change[1].row, change[1].relationships)), this);
 				break;
-			case "remove":
-				yield* this.#output.push({
-					type: "remove",
-					node: this.#processParentNode(change.node.row, change.node.relationships)
-				}, this);
+			case 1:
+				yield* this.#output.push(makeRemoveChange(this.#processParentNode(change[1].row, change[1].relationships)), this);
 				break;
-			case "child":
-				yield* this.#output.push({
-					type: "child",
-					node: this.#processParentNode(change.node.row, change.node.relationships),
-					child: change.child
-				}, this);
+			case 3:
+				yield* this.#output.push(makeChildChange(this.#processParentNode(change[1].row, change[1].relationships), change[2]), 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);
+			case 2:
+				assert(rowEqualsForCompoundKey(change[2].row, change[1].row, this.#parentKey), `Parent edit must not change relationship.`);
+				yield* this.#output.push(makeEditChange(this.#processParentNode(change[1].row, change[1].relationships), this.#processParentNode(change[2].row, change[2].relationships)), this);
 				break;
 			default: unreachable(change);
 		}
 	}
 	*#pushChild(change) {
-		switch (change.type) {
-			case "add":
-			case "remove":
-				yield* this.#pushChildChange(change.node.row, change);
+		switch (change[0]) {
+			case 0:
+			case 1:
+				yield* this.#pushChildChange(change[1].row, change);
 				break;
-			case "child":
-				yield* this.#pushChildChange(change.node.row, change);
+			case 3:
+				yield* this.#pushChildChange(change[1].row, change);
 				break;
-			case "edit": {
-				const childRow = change.node.row;
-				const oldChildRow = change.oldNode.row;
+			case 2: {
+				const childRow = change[1].row;
+				const oldChildRow = change[2].row;
 				assert(rowEqualsForCompoundKey(oldChildRow, childRow, this.#childKey), "Child edit must not change relationship.");
 				yield* this.#pushChildChange(childRow, change);
 				break;
@@ -116,27 +104,20 @@ var Join = class {
 		}
 	}
 	*#pushChildChange(childRow, change) {
-		this.#inprogressChildChange = {
-			change,
-			position: void 0
-		};
+		this.#inprogressChildChange = change;
+		this.#inprogressChildChangePosition = void 0;
 		try {
 			const constraint = buildJoinConstraint(childRow, this.#childKey, this.#parentKey);
-			const parentNodes = constraint ? this.#parent.fetch({ constraint }) : [];
-			for (const parentNode of parentNodes) {
+			if (constraint) for (const parentNode of this.#parent.fetch({ constraint })) {
 				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
-					}
-				};
+				this.#inprogressChildChangePosition = parentNode.row;
+				const childChange = makeChildChange(this.#processParentNode(parentNode.row, parentNode.relationships), {
+					relationshipName: this.#relationshipName,
+					change
+				});
 				yield* this.#output.push(childChange, this);
 			}
 		} finally {
@@ -147,10 +128,10 @@ var Join = class {
 		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) {
+			if (this.#inprogressChildChange && isJoinMatch(parentNodeRow, this.#parentKey, this.#inprogressChildChange[1].row, this.#childKey) && this.#inprogressChildChangePosition && this.#schema.compareRows(parentNodeRow, this.#inprogressChildChangePosition) > 0) {
 				const childSchema = this.#child.getSchema();
-				if (childSchema.sort === void 0) return generateWithOverlayUnordered(stream, this.#inprogressChildChange.change, childSchema);
-				return generateWithOverlay(stream, this.#inprogressChildChange.change, childSchema);
+				if (childSchema.sort === void 0) return generateWithOverlayUnordered(stream, this.#inprogressChildChange, childSchema);
+				return generateWithOverlay(stream, this.#inprogressChildChange, childSchema);
 			}
 			return stream;
 		};