@rocicorp/zero 0.24.2025091200 → 0.24.2025092400

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

@@ -0,0 +1,341 @@
+import { assert, unreachable } from "../../../shared/src/asserts.js";
+import { binarySearch } from "../../../shared/src/binary-search.js";
+import { generateWithOverlay, isJoinMatch, rowEqualsForCompoundKey, } from "./join-utils.js";
+import { throwOutput, } from "./operator.js";
+import { first } from "./stream.js";
+/**
+ * An *inner* join which fetches nodes from its child input first and then
+ * fetches their related nodes from its parent input.  Output nodes are the
+ * nodes from parent input (in parent input order), which have at least one
+ * related child.  These output nodes have a new relationship added to them,
+ * which has the name `relationshipName`. The value of the relationship is a
+ * stream of related nodes from the child input (in child input order).
+ */
+export class FlippedJoin {
+    #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.#child.destroy();
+        this.#parent.destroy();
+    }
+    setOutput(output) {
+        this.#output = output;
+    }
+    getSchema() {
+        return this.#schema;
+    }
+    // TODO: When parentKey is the parent's primary key (or more
+    // generally when the parent cardinality is expected to be small) a different
+    // algorithm should be used:  For each child node, fetch all parent nodes
+    // eagerly and then sort using quicksort.
+    *fetch(req) {
+        const childNodes = [...this.#child.fetch({})];
+        // FlippedJoin's split-push change overlay logic is largely
+        // the same as Join's with the exception of remove.  For remove,
+        // the change is undone here, and then re-applied to parents with order
+        // less than or equal to change.position below.  This is necessary
+        // because if the removed node was the last related child, the
+        // related parents with position greater than change.position
+        // (which should not yet have the node removed), would not even
+        // be fetched here, and would be absent from the output all together.
+        if (this.#inprogressChildChange?.change.type === 'remove') {
+            const removedNode = this.#inprogressChildChange.change.node;
+            const compare = this.#child.getSchema().compareRows;
+            const insertPos = binarySearch(childNodes.length, i => compare(childNodes[i].row, removedNode.row));
+            childNodes.splice(insertPos, 0, removedNode);
+        }
+        const parentIterators = [];
+        let threw = false;
+        try {
+            for (const childNode of childNodes) {
+                // TODO: consider adding the ability to pass a set of
+                // ids to fetch, and have them applied to sqlite using IN.
+                // TODO: Can there be a conflict between req constraint and
+                // the join constraint?
+                const stream = this.#parent.fetch({
+                    ...req,
+                    constraint: {
+                        ...req.constraint,
+                        ...Object.fromEntries(this.#parentKey.map((key, i) => [
+                            key,
+                            childNode.row[this.#childKey[i]],
+                        ])),
+                    },
+                });
+                const iterator = stream[Symbol.iterator]();
+                parentIterators.push(iterator);
+            }
+            const nextParentNodes = [];
+            for (let i = 0; i < parentIterators.length; i++) {
+                const iter = parentIterators[i];
+                const result = iter.next();
+                nextParentNodes[i] = result.done ? null : result.value;
+            }
+            while (true) {
+                let minParentNode = null;
+                let minParentNodeChildIndexes = [];
+                for (let i = 0; i < nextParentNodes.length; i++) {
+                    const parentNode = nextParentNodes[i];
+                    if (parentNode === null) {
+                        continue;
+                    }
+                    if (minParentNode === null) {
+                        minParentNode = parentNode;
+                        minParentNodeChildIndexes.push(i);
+                    }
+                    else {
+                        const compareResult = this.#schema.compareRows(parentNode.row, minParentNode.row) *
+                            (req.reverse ? -1 : 1);
+                        if (compareResult === 0) {
+                            minParentNodeChildIndexes.push(i);
+                        }
+                        else if (compareResult < 0) {
+                            minParentNode = parentNode;
+                            minParentNodeChildIndexes = [i];
+                        }
+                    }
+                }
+                if (minParentNode === null) {
+                    return;
+                }
+                const relatedChildNodes = [];
+                for (const minParentNodeChildIndex of minParentNodeChildIndexes) {
+                    relatedChildNodes.push(childNodes[minParentNodeChildIndex]);
+                    const iter = parentIterators[minParentNodeChildIndex];
+                    const result = iter.next();
+                    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)) {
+                    if (this.#inprogressChildChange.change.type === 'remove') {
+                        if (this.#parent
+                            .getSchema()
+                            .compareRows(minParentNode.row, this.#inprogressChildChange.position) <= 0) {
+                            overlaidRelatedChildNodes = relatedChildNodes.filter(n => n !== this.#inprogressChildChange?.change.node);
+                        }
+                    }
+                    else if (this.#parent
+                        .getSchema()
+                        .compareRows(minParentNode.row, this.#inprogressChildChange.position) > 0) {
+                        overlaidRelatedChildNodes = [
+                            ...generateWithOverlay(relatedChildNodes, this.#inprogressChildChange.change, this.#child.getSchema()),
+                        ];
+                    }
+                }
+                // yield node if after the overlay it still has relationship nodes
+                if (overlaidRelatedChildNodes.length > 0) {
+                    yield {
+                        ...minParentNode,
+                        relationships: {
+                            ...minParentNode.relationships,
+                            [this.#relationshipName]: () => overlaidRelatedChildNodes,
+                        },
+                    };
+                }
+            }
+        }
+        catch (e) {
+            threw = true;
+            for (const iter of parentIterators) {
+                try {
+                    iter.throw?.(e);
+                }
+                catch (_cleanupError) {
+                    // error in the iter.throw cleanup,
+                    // catch so other iterators are cleaned up
+                }
+            }
+            throw e;
+        }
+        finally {
+            if (!threw) {
+                for (const iter of parentIterators) {
+                    try {
+                        iter.return?.();
+                    }
+                    catch (_cleanupError) {
+                        // error in the iter.return cleanup,
+                        // catch so other iterators are cleaned up
+                    }
+                }
+            }
+        }
+    }
+    *cleanup(_req) { }
+    #pushChild(change) {
+        const pushChildChange = (exists) => {
+            this.#inprogressChildChange = {
+                change,
+                position: undefined,
+            };
+            try {
+                const parentNodeStream = this.#parent.fetch({
+                    constraint: Object.fromEntries(this.#parentKey.map((key, i) => [
+                        key,
+                        change.node.row[this.#childKey[i]],
+                    ])),
+                });
+                for (const parentNode of parentNodeStream) {
+                    this.#inprogressChildChange = {
+                        change,
+                        position: parentNode.row,
+                    };
+                    const childNodeStream = () => this.#child.fetch({
+                        constraint: Object.fromEntries(this.#childKey.map((key, i) => [
+                            key,
+                            parentNode.row[this.#parentKey[i]],
+                        ])),
+                    });
+                    if (!exists) {
+                        for (const childNode of childNodeStream()) {
+                            if (this.#child
+                                .getSchema()
+                                .compareRows(childNode.row, change.node.row) !== 0) {
+                                exists = true;
+                                break;
+                            }
+                        }
+                    }
+                    if (exists) {
+                        this.#output.push({
+                            type: 'child',
+                            node: {
+                                ...parentNode,
+                                relationships: {
+                                    ...parentNode.relationships,
+                                    [this.#relationshipName]: childNodeStream,
+                                },
+                            },
+                            child: {
+                                relationshipName: this.#relationshipName,
+                                change,
+                            },
+                        });
+                    }
+                    else {
+                        this.#output.push({
+                            ...change,
+                            node: {
+                                ...parentNode,
+                                relationships: {
+                                    ...parentNode.relationships,
+                                    [this.#relationshipName]: () => [change.node],
+                                },
+                            },
+                        });
+                    }
+                }
+            }
+            finally {
+                this.#inprogressChildChange = undefined;
+            }
+        };
+        switch (change.type) {
+            case 'add':
+            case 'remove':
+                pushChildChange();
+                break;
+            case 'edit': {
+                assert(rowEqualsForCompoundKey(change.oldNode.row, change.node.row, this.#childKey), `Child edit must not change relationship.`);
+                pushChildChange(true);
+                break;
+            }
+            case 'child':
+                pushChildChange(true);
+                break;
+        }
+    }
+    #pushParent(change) {
+        const childNodeStream = (node) => () => this.#child.fetch({
+            constraint: Object.fromEntries(this.#childKey.map((key, i) => [key, node.row[this.#parentKey[i]]])),
+        });
+        const flip = (node) => ({
+            ...node,
+            relationships: {
+                ...node.relationships,
+                [this.#relationshipName]: childNodeStream(node),
+            },
+        });
+        switch (change.type) {
+            case 'add':
+            case 'remove':
+            case 'child': {
+                if (first(childNodeStream(change.node)()) === undefined) {
+                    return;
+                }
+                this.#output.push({
+                    ...change,
+                    node: flip(change.node),
+                });
+                break;
+            }
+            case 'edit': {
+                const oldHasChild = first(childNodeStream(change.oldNode)()) !== undefined;
+                const hasChild = first(childNodeStream(change.node)()) !== undefined;
+                assert(rowEqualsForCompoundKey(change.oldNode.row, change.node.row, this.#parentKey), `Parent edit must not change relationship.`);
+                if (oldHasChild && hasChild) {
+                    this.#output.push({
+                        type: 'edit',
+                        oldNode: flip(change.oldNode),
+                        node: flip(change.node),
+                    });
+                    break;
+                }
+                if (oldHasChild) {
+                    this.#output.push({
+                        type: 'remove',
+                        node: flip(change.node),
+                    });
+                }
+                if (hasChild) {
+                    this.#output.push({
+                        type: 'add',
+                        node: flip(change.node),
+                    });
+                }
+                break;
+            }
+            default:
+                unreachable(change);
+        }
+    }
+}
+//# sourceMappingURL=flipped-join.js.map

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

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

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

@@ -0,0 +1,14 @@
+import type { Row } from '../../../zero-protocol/src/data.ts';
+import type { Change } from './change.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 generateWithOverlay(stream: Stream<Node>, overlay: Change, schema: SourceSchema): Stream<Node>;
+export declare function rowEqualsForCompoundKey(a: Row, b: Row, key: CompoundKey): boolean;
+export declare function isJoinMatch(parent: Row, parentKey: CompoundKey, child: Row, childKey: CompoundKey): boolean;
+//# sourceMappingURL=join-utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"join-utils.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/join-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,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,wBAAiB,mBAAmB,CAClC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,YAAY,GACnB,MAAM,CAAC,IAAI,CAAC,CAmFd;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"}

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

@@ -0,0 +1,94 @@
+import { compareValues, valuesEqual } from "./data.js";
+import { assert } from "../../../shared/src/asserts.js";
+export function* generateWithOverlay(stream, overlay, schema) {
+    let applied = false;
+    let editOldApplied = false;
+    let editNewApplied = false;
+    for (const node of stream) {
+        let yieldNode = true;
+        if (!applied) {
+            switch (overlay.type) {
+                case 'add': {
+                    if (schema.compareRows(overlay.node.row, node.row) === 0) {
+                        applied = true;
+                        yieldNode = false;
+                    }
+                    break;
+                }
+                case 'remove': {
+                    if (schema.compareRows(overlay.node.row, node.row) < 0) {
+                        applied = true;
+                        yield overlay.node;
+                    }
+                    break;
+                }
+                case 'edit': {
+                    if (!editOldApplied &&
+                        schema.compareRows(overlay.oldNode.row, node.row) < 0) {
+                        editOldApplied = true;
+                        if (editNewApplied) {
+                            applied = true;
+                        }
+                        yield overlay.oldNode;
+                    }
+                    if (!editNewApplied &&
+                        schema.compareRows(overlay.node.row, node.row) === 0) {
+                        editNewApplied = true;
+                        if (editOldApplied) {
+                            applied = true;
+                        }
+                        yieldNode = false;
+                    }
+                    break;
+                }
+                case 'child': {
+                    if (schema.compareRows(overlay.node.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]),
+                            },
+                        };
+                        yieldNode = false;
+                    }
+                    break;
+                }
+            }
+        }
+        if (yieldNode) {
+            yield node;
+        }
+    }
+    if (!applied) {
+        if (overlay.type === 'remove') {
+            applied = true;
+            yield overlay.node;
+        }
+        else if (overlay.type === 'edit') {
+            assert(editNewApplied);
+            editOldApplied = true;
+            applied = true;
+            yield overlay.oldNode;
+        }
+    }
+    assert(applied);
+}
+export function rowEqualsForCompoundKey(a, b, key) {
+    for (let i = 0; i < key.length; i++) {
+        if (compareValues(a[key[i]], b[key[i]]) !== 0) {
+            return false;
+        }
+    }
+    return true;
+}
+export function isJoinMatch(parent, parentKey, child, childKey) {
+    for (let i = 0; i < parentKey.length; i++) {
+        if (!valuesEqual(parent[parentKey[i]], child[childKey[i]])) {
+            return false;
+        }
+    }
+    return true;
+}
+//# sourceMappingURL=join-utils.js.map

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

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

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

@@ -1,7 +1,7 @@
 import type { CompoundKey, System } from '../../../zero-protocol/src/ast.ts';
 import type { Row, Value } from '../../../zero-protocol/src/data.ts';
 import type { PrimaryKey } from '../../../zero-protocol/src/primary-key.ts';
-import { type Node } from './data.ts';
+import type { Node } from './data.ts';
 import { type FetchRequest, type Input, type Output, type Storage } from './operator.ts';
 import type { SourceSchema } from './schema.ts';
 import { type Stream } from './stream.ts';

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;AAC3E,OAAO,KAAK,EAAC,GAAG,EAAE,KAAK,EAAC,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAE1E,OAAO,EAA6B,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAChE,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,OAAO,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAO,KAAK,MAAM,EAAC,MAAM,aAAa,CAAC;AAE9C,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IAGjB,SAAS,EAAE,WAAW,CAAC;IACvB,QAAQ,EAAE,WAAW,CAAC;IAItB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAOF;;;;;;;;;GASG;AACH,qBAAa,IAAK,YAAW,KAAK;;gBAapB,EACV,MAAM,EACN,KAAK,EACL,OAAO,EACP,SAAS,EACT,QAAQ,EACR,gBAAgB,EAChB,MAAM,EACN,MAAM,GACP,EAAE,IAAI;IAmCP,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,CAAC;IAUtC,OAAO,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC;CAkU1C;AAID,4BAA4B;AAC5B,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,SAAS,KAAK,EAAE,GAAG,MAAM,CAGxE;AAED,4BAA4B;AAC5B,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,GAAG,MAAM,CAEvE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,WAAW,EAChB,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,GAAG,GACP,MAAM,CAMR"}
+{"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;AAC3E,OAAO,KAAK,EAAC,GAAG,EAAE,KAAK,EAAC,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAE1E,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAOpC,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,OAAO,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAO,KAAK,MAAM,EAAC,MAAM,aAAa,CAAC;AAE9C,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IAGjB,SAAS,EAAE,WAAW,CAAC;IACvB,QAAQ,EAAE,WAAW,CAAC;IAItB,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,OAAO,EACP,SAAS,EACT,QAAQ,EACR,gBAAgB,EAChB,MAAM,EACN,MAAM,GACP,EAAE,IAAI;IAmCP,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,CAAC;IAUtC,OAAO,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC;CAwN1C;AAID,4BAA4B;AAC5B,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,SAAS,KAAK,EAAE,GAAG,MAAM,CAGxE;AAED,4BAA4B;AAC5B,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,GAAG,MAAM,CAEvE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,WAAW,EAChB,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,GAAG,GACP,MAAM,CAMR"}

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

@@ -1,5 +1,5 @@
 import { assert, unreachable } from "../../../shared/src/asserts.js";
-import { compareValues, valuesEqual } from "./data.js";
+import { generateWithOverlay, isJoinMatch, rowEqualsForCompoundKey, } from "./join-utils.js";
 import { throwOutput, } from "./operator.js";
 import { take } from "./stream.js";
 /**
@@ -153,88 +153,6 @@ export class Join {
                 unreachable(change);
         }
     }
-    *#generateChildStreamWithOverlay(stream, overlay) {
-        let applied = false;
-        let editOldApplied = false;
-        let editNewApplied = false;
-        for (const child of stream) {
-            let yieldChild = true;
-            if (!applied) {
-                switch (overlay.type) {
-                    case 'add': {
-                        if (this.#child
-                            .getSchema()
-                            .compareRows(overlay.node.row, child.row) === 0) {
-                            applied = true;
-                            yieldChild = false;
-                        }
-                        break;
-                    }
-                    case 'remove': {
-                        if (this.#child.getSchema().compareRows(overlay.node.row, child.row) <
-                            0) {
-                            applied = true;
-                            yield overlay.node;
-                        }
-                        break;
-                    }
-                    case 'edit': {
-                        if (this.#child
-                            .getSchema()
-                            .compareRows(overlay.oldNode.row, child.row) < 0) {
-                            editOldApplied = true;
-                            if (editNewApplied) {
-                                applied = true;
-                            }
-                            yield overlay.oldNode;
-                        }
-                        if (this.#child
-                            .getSchema()
-                            .compareRows(overlay.node.row, child.row) === 0) {
-                            editNewApplied = true;
-                            if (editOldApplied) {
-                                applied = true;
-                            }
-                            yieldChild = false;
-                        }
-                        break;
-                    }
-                    case 'child': {
-                        if (this.#child
-                            .getSchema()
-                            .compareRows(overlay.node.row, child.row) === 0) {
-                            applied = true;
-                            yield {
-                                row: child.row,
-                                relationships: {
-                                    ...child.relationships,
-                                    [overlay.child.relationshipName]: () => this.#generateChildStreamWithOverlay(child.relationships[overlay.child.relationshipName](), overlay.child.change),
-                                },
-                            };
-                            yieldChild = false;
-                        }
-                        break;
-                    }
-                }
-            }
-            if (yieldChild) {
-                yield child;
-            }
-        }
-        if (!applied) {
-            if (overlay.type === 'remove') {
-                applied = true;
-                yield overlay.node;
-            }
-            else if (overlay.type === 'edit') {
-                assert(editNewApplied);
-                editOldApplied = true;
-                applied = true;
-                yield overlay.oldNode;
-            }
-        }
-        assert(applied);
-    }
     #processParentNode(parentNodeRow, parentNodeRelations, mode) {
         let method = mode;
         let storageUpdated = false;
@@ -263,10 +181,10 @@ export class Join {
                 ])),
             });
             if (this.#inprogressChildChange &&
-                this.#isJoinMatch(parentNodeRow, this.#inprogressChildChange.change.node.row) &&
+                isJoinMatch(parentNodeRow, this.#parentKey, this.#inprogressChildChange.change.node.row, this.#childKey) &&
                 this.#inprogressChildChange.position &&
                 this.#schema.compareRows(parentNodeRow, this.#inprogressChildChange.position) > 0) {
-                return this.#generateChildStreamWithOverlay(stream, this.#inprogressChildChange.change);
+                return generateWithOverlay(stream, this.#inprogressChildChange.change, this.#child.getSchema());
             }
             return stream;
         };
@@ -278,14 +196,6 @@ export class Join {
             },
         };
     }
-    #isJoinMatch(parent, child) {
-        for (let i = 0; i < this.#parentKey.length; i++) {
-            if (!valuesEqual(parent[this.#parentKey[i]], child[this.#childKey[i]])) {
-                return false;
-            }
-        }
-        return true;
-    }
 }
 /** Exported for testing. */
 export function makeStorageKeyForValues(values) {
@@ -307,12 +217,4 @@ export function makeStorageKey(key, primaryKey, row) {
     }
     return makeStorageKeyForValues(values);
 }
-function rowEqualsForCompoundKey(a, b, key) {
-    for (let i = 0; i < key.length; i++) {
-        if (compareValues(a[key[i]], b[key[i]]) !== 0) {
-            return false;
-        }
-    }
-    return true;
-}
 //# sourceMappingURL=join.js.map