@rocicorp/zero 0.6.2024112102 → 0.7.2024120100

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

@@ -1,7 +1,6 @@
 import { assert, unreachable } from '../../../shared/src/asserts.js';
-import { must } from '../../../shared/src/must.js';
-import { normalizeUndefined } from './data.js';
-import { first, take } from './stream.js';
+import { valuesEqual } from './data.js';
+import { take } from './stream.js';
 /**
  * The Join operator joins the output from two upstream inputs. Zero's join
  * is a little different from SQL's join in that we output hierarchical data,
@@ -23,6 +22,7 @@ export class Join {
     #output = null;
     constructor({ parent, child, storage, parentKey, childKey, relationshipName, hidden, }) {
         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.#storage = storage;
@@ -86,64 +86,25 @@ export class Join {
                 break;
             case 'edit': {
                 // When an edit comes in we need to:
-                // - Update the parent node.
-                // - If the value of the join key changed we need to remove the old relation rows and add the new ones.
-                this.#output.push({
-                    type: 'edit',
-                    row: change.row,
-                    oldRow: change.oldRow,
-                });
-                const oldKeyValue = normalizeUndefined(change.oldRow[this.#parentKey]);
-                const newKeyValue = normalizeUndefined(change.row[this.#parentKey]);
-                if (newKeyValue !== oldKeyValue) {
-                    const childrenToRemoveStream = this.#child.cleanup({
-                        constraint: {
-                            key: this.#childKey,
-                            value: oldKeyValue,
-                        },
+                // - If the value of the join key did not change we can forward
+                //   as an edit but with relationships added
+                // - Otherwise we convert to a remove and add
+                if (rowEqualsForCompoundKey(change.oldNode.row, change.node.row, this.#parentKey)) {
+                    this.#output.push({
+                        type: 'edit',
+                        oldNode: this.#processParentNode(change.oldNode.row, change.oldNode.relationships, 'cleanup'),
+                        node: this.#processParentNode(change.node.row, change.node.relationships, 'fetch'),
                     });
-                    for (const childNode of childrenToRemoveStream) {
-                        this.#output.push({
-                            type: 'child',
-                            // This is the new row since we already changed it in the edit above.
-                            row: change.row,
-                            child: {
-                                relationshipName: this.#relationshipName,
-                                change: {
-                                    type: 'remove',
-                                    node: childNode,
-                                },
-                            },
-                        });
-                    }
-                    const childrenToAddStream = this.#child.fetch({
-                        constraint: {
-                            key: this.#childKey,
-                            value: newKeyValue,
-                        },
-                    });
-                    for (const childNode of childrenToAddStream) {
-                        this.#output.push({
-                            type: 'child',
-                            row: change.row,
-                            child: {
-                                relationshipName: this.#relationshipName,
-                                change: {
-                                    type: 'add',
-                                    node: childNode,
-                                },
-                            },
-                        });
-                    }
                 }
-                const { primaryKey } = this.#parent.getSchema();
-                const oldStorageKey = makeStorageKey(oldKeyValue, primaryKey, change.oldRow);
-                const newStorageKey = makeStorageKey(newKeyValue, primaryKey, change.row);
-                // This can be true for both cases. Even if the join key value didn't
-                // change the primary key values might have.
-                if (oldStorageKey !== newStorageKey) {
-                    this.#storage.del(oldStorageKey);
-                    this.#storage.set(newStorageKey, true);
+                else {
+                    this.#pushParent({
+                        type: 'remove',
+                        node: change.oldNode,
+                    });
+                    this.#pushParent({
+                        type: 'add',
+                        node: change.node,
+                    });
                 }
                 break;
             }
@@ -155,10 +116,7 @@ export class Join {
         const pushChildChange = (childRow, change) => {
             assert(this.#output, 'Output not set');
             const parentNodes = this.#parent.fetch({
-                constraint: {
-                    key: this.#parentKey,
-                    value: childRow[this.#childKey],
-                },
+                constraint: Object.fromEntries(this.#parentKey.map((key, i) => [key, childRow[this.#childKey[i]]])),
             });
             for (const parentNode of parentNodes) {
                 const childChange = {
@@ -181,10 +139,9 @@ export class Join {
                 pushChildChange(change.row, change);
                 break;
             case 'edit': {
-                const childRow = change.row;
-                const oldChildRow = change.oldRow;
-                if (normalizeUndefined(oldChildRow[this.#childKey]) ===
-                    normalizeUndefined(childRow[this.#childKey])) {
+                const childRow = change.node.row;
+                const oldChildRow = change.oldNode.row;
+                if (rowEqualsForCompoundKey(oldChildRow, childRow, this.#childKey)) {
                     // The child row was edited in a way that does not change the relationship.
                     // We can therefore just push the change down (wrapped in a child change).
                     pushChildChange(childRow, change);
@@ -193,25 +150,13 @@ export class Join {
                     // The child row was edited in a way that changes the relationship. We
                     // therefore treat this as a remove from the old row followed by an
                     // add to the new row.
-                    const { relationships } = must(first(this.#child.fetch({
-                        constraint: {
-                            key: this.#childKey,
-                            value: oldChildRow[this.#childKey],
-                        },
-                    })));
                     pushChildChange(oldChildRow, {
                         type: 'remove',
-                        node: {
-                            row: oldChildRow,
-                            relationships,
-                        },
+                        node: change.oldNode,
                     });
                     pushChildChange(childRow, {
                         type: 'add',
-                        node: {
-                            row: childRow,
-                            relationships,
-                        },
+                        node: change.node,
                     });
                 }
                 break;
@@ -221,22 +166,21 @@ export class Join {
         }
     }
     #processParentNode(parentNodeRow, parentNodeRelations, mode) {
-        const parentKeyValue = normalizeUndefined(parentNodeRow[this.#parentKey]);
         // This storage key tracks the primary keys seen for each unique
         // value joined on. This is used to know when to cleanup a child's state.
-        const storageKey = makeStorageKey(parentKeyValue, this.#parent.getSchema().primaryKey, parentNodeRow);
+        const storageKey = makeStorageKey(this.#parentKey, this.#parent.getSchema().primaryKey, parentNodeRow);
         let method = mode;
         if (mode === 'cleanup') {
             const [, second] = take(this.#storage.scan({
-                prefix: createPrimaryKeySetStorageKeyPrefix(parentKeyValue),
+                prefix: makeStorageKeyPrefix(parentNodeRow, this.#parentKey),
             }), 2);
             method = second ? 'fetch' : 'cleanup';
         }
         const childStream = this.#child[method]({
-            constraint: {
-                key: this.#childKey,
-                value: parentKeyValue,
-            },
+            constraint: Object.fromEntries(this.#childKey.map((key, i) => [
+                key,
+                parentNodeRow[this.#parentKey[i]],
+            ])),
         });
         if (mode === 'fetch') {
             this.#storage.set(storageKey, true);
@@ -255,18 +199,28 @@ export class Join {
     }
 }
 /** Exported for testing. */
-export function createPrimaryKeySetStorageKey(values) {
+export function makeStorageKeyForValues(values) {
     const json = JSON.stringify(['pKeySet', ...values]);
     return json.substring(1, json.length - 1) + ',';
 }
-export function createPrimaryKeySetStorageKeyPrefix(value) {
-    return createPrimaryKeySetStorageKey([value]);
+/** Exported for testing. */
+export function makeStorageKeyPrefix(row, key) {
+    return makeStorageKeyForValues(key.map(k => row[k]));
 }
-function makeStorageKey(keyValue, primaryKey, row) {
-    const parentPrimaryKey = [keyValue];
+/** Exported for testing. */
+export function makeStorageKey(key, primaryKey, row) {
+    const values = key.map(k => row[k]);
     for (const key of primaryKey) {
-        parentPrimaryKey.push(normalizeUndefined(row[key]));
+        values.push(row[key]);
+    }
+    return makeStorageKeyForValues(values);
+}
+function rowEqualsForCompoundKey(a, b, key) {
+    for (let i = 0; i < key.length; i++) {
+        if (!valuesEqual(a[key[i]], b[key[i]])) {
+            return false;
+        }
     }
-    return createPrimaryKeySetStorageKey(parentPrimaryKey);
+    return true;
 }
 //# sourceMappingURL=join.js.map

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

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

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

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

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

@@ -4,30 +4,21 @@
  * pushes the appropriate changes to the output based on the predicate.
  */
 export function maybeSplitAndPushEditChange(change, predicate, output) {
-    const oldWasPresent = predicate(change.oldRow);
-    const newIsPresent = predicate(change.row);
+    const oldWasPresent = predicate(change.oldNode.row);
+    const newIsPresent = predicate(change.node.row);
     if (oldWasPresent && newIsPresent) {
         output.push(change);
     }
     else if (oldWasPresent && !newIsPresent) {
-        // The relationships are empty at this point and that is fine since
-        // splitAndPushEditChange is only used by operators that are before the Join
-        // operator.
         output.push({
             type: 'remove',
-            node: {
-                row: change.oldRow,
-                relationships: {},
-            },
+            node: change.oldNode,
         });
     }
     else if (!oldWasPresent && newIsPresent) {
         output.push({
             type: 'add',
-            node: {
-                row: change.row,
-                relationships: {},
-            },
+            node: change.node,
         });
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"maybe-split-and-push-edit-change.js","sourceRoot":"","sources":["../../../../../zql/src/ivm/maybe-split-and-push-edit-change.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,MAAM,UAAU,2BAA2B,CACzC,MAAkB,EAClB,SAAgC,EAChC,MAAc;IAEd,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAE3C,IAAI,aAAa,IAAI,YAAY,EAAE,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;SAAM,IAAI,aAAa,IAAI,CAAC,YAAY,EAAE,CAAC;QAC1C,mEAAmE;QACnE,4EAA4E;QAC5E,YAAY;QACZ,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE;gBACJ,GAAG,EAAE,MAAM,CAAC,MAAM;gBAClB,aAAa,EAAE,EAAE;aAClB;SACF,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,CAAC,aAAa,IAAI,YAAY,EAAE,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,KAAK;YACX,IAAI,EAAE;gBACJ,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,aAAa,EAAE,EAAE;aAClB;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
+{"version":3,"file":"maybe-split-and-push-edit-change.js","sourceRoot":"","sources":["../../../../../zql/src/ivm/maybe-split-and-push-edit-change.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,MAAM,UAAU,2BAA2B,CACzC,MAAkB,EAClB,SAAgC,EAChC,MAAc;IAEd,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEhD,IAAI,aAAa,IAAI,YAAY,EAAE,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;SAAM,IAAI,aAAa,IAAI,CAAC,YAAY,EAAE,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM,CAAC,OAAO;SACrB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,CAAC,aAAa,IAAI,YAAY,EAAE,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,MAAM,CAAC,IAAI;SAClB,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}

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

@@ -1,9 +1,10 @@
-import type { Condition, Ordering, SimpleCondition } from '../../../zero-protocol/src/ast.js';
+import type { Condition, Ordering } from '../../../zero-protocol/src/ast.js';
 import type { Row } from '../../../zero-protocol/src/data.js';
 import type { PrimaryKey } from '../../../zero-protocol/src/primary-key.js';
-import { type Comparator, type Node } from './data.js';
-import type { Constraint, FetchRequest } from './operator.js';
 import type { SchemaValue } from '../../../zero-schema/src/table-schema.js';
+import { type Constraint } from './constraint.js';
+import { type Comparator, type Node } from './data.js';
+import { type FetchRequest } from './operator.js';
 import type { Source, SourceChange, SourceInput } from './source.js';
 import type { Stream } from './stream.js';
 export type Overlay = {
@@ -56,7 +57,7 @@ export declare function generateWithStart(it: Iterator<Node>, req: FetchRequest,
  * @param overlay - the overlay values to splice in
  * @param compare - the comparator to use to find the position for the overlay
  */
-export declare function generateWithOverlay(startAt: Row | undefined, rows: Iterable<Row>, constraint: Constraint | undefined, overlay: Overlay | undefined, compare: Comparator): Generator<{
+export declare function generateWithOverlay(startAt: Row | undefined, rows: Iterable<Row>, constraint: Constraint | undefined, overlay: Overlay | undefined, compare: Comparator, filterPredicate?: (row: Row) => boolean | undefined): Generator<{
     row: Record<string, import("../../../shared/src/json.js").ReadonlyJSONValue | undefined>;
     relationships: {};
 }, void, unknown>;
@@ -68,22 +69,4 @@ export declare function generateWithOverlayInner(rowIterator: Iterable<Row>, ove
     row: Record<string, import("../../../shared/src/json.js").ReadonlyJSONValue | undefined>;
     relationships: {};
 }, void, unknown>;
-/**
- * Only returns optional filters if:
- * 1. It's a simple condition
- * 2. It's an `and` condition with only simple conditions inside of it
- * 3. It's an `or` that is a no-op.
- *
- * Otherwise the filters are dropped.
- *
- * This is a short term solution until we update `fetch` to pass
- * the constraints rather than making them static in `connect`.
- *
- * The below way of doing things over-fetches as the optional filters
- * are widened to cover all branches of the pipeline.
- */
-export declare function filterOptionalFilters(optionalFilters: Condition | undefined): {
-    filters: SimpleCondition[];
-    allApplied: boolean;
-};
 //# sourceMappingURL=memory-source.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"memory-source.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/memory-source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EAER,eAAe,EAChB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,GAAG,EAAQ,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAI1E,OAAO,EACL,KAAK,UAAU,EAGf,KAAK,IAAI,EAEV,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAC,UAAU,EAAE,YAAY,EAAgB,MAAM,eAAe,CAAC;AAE3E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,0CAA0C,CAAC;AAC1E,OAAO,KAAK,EAAC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACnE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,OAAO,GAAG;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,GAAG,EAAE,GAAG,GAAG,SAAS,CAAC;IACrB,MAAM,EAAE,GAAG,GAAG,SAAS,CAAC;CACzB,CAAC;AAgBF;;;;;;GAMG;AACH,qBAAa,YAAa,YAAW,MAAM;;gBAWvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACpC,UAAU,EAAE,UAAU;IAgBxB,aAAa;;;;;IAoBb,OAAO,CACL,IAAI,EAAE,QAAQ,EACd,eAAe,CAAC,EAAE,SAAS,GAAG,SAAS,GACtC,WAAW;IAyFd,YAAY,IAAI,MAAM,EAAE;IAiJxB,IAAI,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;CAwEjC;AAyBD;;;;;;;;;GASG;AACH,wBAAiB,iBAAiB,CAChC,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAClB,GAAG,EAAE,YAAY,EACjB,OAAO,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,KAAK,MAAM,GACpC,MAAM,CAAC,IAAI,CAAC,CA0Bd;AAED;;;;;;;;;;;GAWG;AACH,wBAAiB,mBAAmB,CAClC,OAAO,EAAE,GAAG,GAAG,SAAS,EACxB,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,EACnB,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,OAAO,EAAE,UAAU;;;kBAIpB;AA4CD,OAAO,EAAC,kBAAkB,IAAI,yBAAyB,EAAC,CAAC;AAEzD,iBAAS,kBAAkB,CACzB,EAAC,GAAG,EAAE,MAAM,EAAC,EAAE,QAAQ,EACvB,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,UAAU,GAClB,QAAQ,CAOV;AAED,OAAO,EAAC,qBAAqB,IAAI,4BAA4B,EAAC,CAAC;AAE/D,iBAAS,qBAAqB,CAC5B,EAAC,GAAG,EAAE,MAAM,EAAC,EAAE,QAAQ,EACvB,UAAU,EAAE,UAAU,GACrB,QAAQ,CAUV;AAED,wBAAiB,wBAAwB,CACvC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,EAC1B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,KAAK,MAAM;;;kBA0BtC;AA+CD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CAAC,eAAe,EAAE,SAAS,GAAG,SAAS,GAAG;IAC7E,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC;CACrB,CAiCA"}
+{"version":3,"file":"memory-source.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/memory-source.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EAET,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,GAAG,EAAQ,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAC1E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,0CAA0C,CAAC;AAQ1E,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAGL,KAAK,UAAU,EACf,KAAK,IAAI,EACV,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAC,KAAK,YAAY,EAA0B,MAAM,eAAe,CAAC;AAEzE,OAAO,KAAK,EAAC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACnE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,OAAO,GAAG;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,GAAG,EAAE,GAAG,GAAG,SAAS,CAAC;IACrB,MAAM,EAAE,GAAG,GAAG,SAAS,CAAC;CACzB,CAAC;AAqBF;;;;;;GAMG;AACH,qBAAa,YAAa,YAAW,MAAM;;gBAWvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACpC,UAAU,EAAE,UAAU;IAgBxB,aAAa;;;;;IAoBb,OAAO,CACL,IAAI,EAAE,QAAQ,EACd,eAAe,CAAC,EAAE,SAAS,GAAG,SAAS,GACtC,WAAW;IA4Fd,YAAY,IAAI,MAAM,EAAE;IAuIxB,IAAI,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;CAkFjC;AAsBD;;;;;;;;;GASG;AACH,wBAAiB,iBAAiB,CAChC,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAClB,GAAG,EAAE,YAAY,EACjB,OAAO,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,KAAK,MAAM,GACpC,MAAM,CAAC,IAAI,CAAC,CA0Bd;AAED;;;;;;;;;;;GAWG;AACH,wBAAiB,mBAAmB,CAClC,OAAO,EAAE,GAAG,GAAG,SAAS,EACxB,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,EACnB,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,OAAO,EAAE,UAAU,EACnB,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,GAAG,SAAS;;;kBAUpD;AAiDD,OAAO,EAAC,kBAAkB,IAAI,yBAAyB,EAAC,CAAC;AAEzD,iBAAS,kBAAkB,CACzB,EAAC,GAAG,EAAE,MAAM,EAAC,EAAE,QAAQ,EACvB,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,UAAU,GAClB,QAAQ,CAOV;AAED,OAAO,EAAC,qBAAqB,IAAI,4BAA4B,EAAC,CAAC;AAE/D,iBAAS,qBAAqB,CAC5B,EAAC,GAAG,EAAE,MAAM,EAAC,EAAE,QAAQ,EACvB,UAAU,EAAE,UAAU,GACrB,QAAQ,CAUV;AAeD,wBAAiB,wBAAwB,CACvC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,EAC1B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,KAAK,MAAM;;;kBA0BtC"}

package/out/zql/src/ivm/memory-source.js

@@ -1,9 +1,12 @@
 import { BTree } from '../../../btree/src/mod.js';
 import { assert, unreachable } from '../../../shared/src/asserts.js';
+import { hasOwn } from '../../../shared/src/has-own.js';
 import { assertOrderingIncludesPK } from '../builder/builder.js';
-import { createPredicate } from '../builder/filter.js';
-import { compareValues, makeComparator, valuesEqual, } from './data.js';
+import { createPredicate, transformFilters, } from '../builder/filter.js';
+import { constraintMatchesPrimaryKey, constraintMatchesRow, } from './constraint.js';
+import { compareValues, makeComparator, } from './data.js';
 import { LookaheadIterator } from './lookahead-iterator.js';
+import {} from './operator.js';
 /**
  * A `MemorySource` is a source that provides data to the pipeline from an
  * in-memory data source.
@@ -52,8 +55,7 @@ export class MemorySource {
         };
     }
     connect(sort, optionalFilters) {
-        const filteredOptionalFilters = filterOptionalFilters(optionalFilters);
-        const predicates = filteredOptionalFilters.filters.map(c => createPredicate(c));
+        const transformedFilters = transformFilters(optionalFilters);
         const input = {
             getSchema: () => schema,
             fetch: req => this.#fetch(req, connection),
@@ -64,14 +66,19 @@ export class MemorySource {
             destroy: () => {
                 this.#disconnect(input);
             },
-            appliedFilters: filteredOptionalFilters.allApplied,
+            appliedFilters: !transformedFilters.conditionsRemoved,
         };
         const connection = {
             input,
             output: undefined,
             sort,
             compareRows: makeComparator(sort),
-            optionalFilters: predicates,
+            filters: transformedFilters.filters
+                ? {
+                    condition: transformedFilters.filters,
+                    predicate: createPredicate(transformedFilters.filters),
+                }
+                : undefined,
         };
         const schema = this.#getSchema(connection);
         assertOrderingIncludesPK(sort, this.#primaryKey);
@@ -139,13 +146,16 @@ export class MemorySource {
         // If there is a constraint, we need an index sorted by it first.
         const indexSort = [];
         if (req.constraint) {
-            indexSort.push([req.constraint.key, 'asc']);
+            for (const key of Object.keys(req.constraint)) {
+                indexSort.push([key, 'asc']);
+            }
         }
         // For the special case of constraining by PK, we don't need to worry about
         // any requested sort since there can only be one result. Otherwise we also
         // need the index sorted by the requested sort.
         if (this.#primaryKey.length > 1 ||
-            req.constraint?.key !== this.#primaryKey[0]) {
+            !req.constraint ||
+            !constraintMatchesPrimaryKey(req.constraint, this.#primaryKey)) {
             indexSort.push(...requestedSort);
         }
         const index = this.#getOrCreateIndex(indexSort, from);
@@ -158,23 +168,14 @@ export class MemorySource {
                 overlay = this.#overlay;
             }
         }
-        const matchesConstraint = (row) => {
-            if (!req.constraint) {
-                return true;
-            }
-            const { key, value } = req.constraint;
-            return valuesEqual(row[key], value);
-        };
-        const matchesFilters = (row) => conn.optionalFilters.every(f => f(row));
-        const matchesConstraintAndFilters = (row) => matchesConstraint(row) && matchesFilters(row);
-        // If there is an overlay for this output, does it match the requested
-        // constraints and filters?
-        if (overlay) {
-            // TODO: This looks wrong given that we can have edit changes in the overlay.
-            if (!matchesConstraintAndFilters(overlay.change.row)) {
-                overlay = undefined;
-            }
-        }
+        const { constraint } = req;
+        const matchesConstraint = constraint
+            ? (row) => constraintMatchesRow(constraint, row)
+            : (_) => true;
+        const predicate = conn.filters?.predicate;
+        const matchesConstraintAndFilters = predicate
+            ? (row) => matchesConstraint(row) && predicate(row)
+            : matchesConstraint;
         const nextLowerKey = (row) => {
             if (!row) {
                 return undefined;
@@ -202,9 +203,7 @@ export class MemorySource {
                 // There's no problem supporting startAt outside of constraints, but I
                 // don't think we have a use case for this – if we see it, it's probably
                 // a bug.
-                if (!matchesConstraint(startAt)) {
-                    assert(false, 'Start row must match constraint');
-                }
+                assert(matchesConstraint(startAt), 'Start row must match constraint');
             }
             if (req.start.basis === 'before') {
                 startAt = nextLowerKey(startAt);
@@ -224,8 +223,8 @@ export class MemorySource {
         if (req.constraint) {
             scanStart = {};
             for (const [key, dir] of indexSort) {
-                if (key === req.constraint.key) {
-                    scanStart[key] = req.constraint.value;
+                if (hasOwn(req.constraint, key)) {
+                    scanStart[key] = req.constraint[key];
                 }
                 else {
                     scanStart[key] = dir === 'asc' ? minValue : maxValue;
@@ -238,10 +237,10 @@ export class MemorySource {
         const withOverlay = generateWithOverlay(startAt, 
         // 😬 - btree library doesn't support ideas like start "before" this
         // key.
-        data.keys(scanStart), req.constraint, overlay, comparator);
+        data.keys(scanStart), req.constraint, overlay, comparator, conn.filters?.predicate);
         const withConstraint = generateWithConstraint(generateWithStart(withOverlay, req, comparator), req.constraint);
-        yield* conn.optionalFilters.length
-            ? generateWithFilter(withConstraint, matchesFilters)
+        yield* conn.filters
+            ? generateWithFilter(withConstraint, conn.filters.predicate)
             : withConstraint;
     }
     #cleanup(req, connection) {
@@ -253,24 +252,34 @@ export class MemorySource {
         switch (change.type) {
             case 'add':
                 if (data.has(change.row)) {
-                    throw new Error(`Row already exists: ` + JSON.stringify(change));
+                    throw new Error(`Row already exists ${JSON.stringify(change)}`);
                 }
                 break;
             case 'remove':
                 if (!data.has(change.row)) {
-                    throw new Error(`Row not found: ` + JSON.stringify(change));
+                    throw new Error(`Row not found ${JSON.stringify(change)}`);
                 }
                 break;
             case 'edit':
                 if (!data.has(change.oldRow)) {
-                    throw new Error(`Row not found: ` + JSON.stringify(change));
+                    throw new Error(`Row not found ${JSON.stringify(change)}`);
                 }
                 break;
             default:
                 unreachable(change);
         }
         const outputChange = change.type === 'edit'
-            ? change
+            ? {
+                type: change.type,
+                oldNode: {
+                    row: change.oldRow,
+                    relationships: {},
+                },
+                node: {
+                    row: change.row,
+                    relationships: {},
+                },
+            }
             : {
                 type: change.type,
                 node: {
@@ -318,8 +327,7 @@ export class MemorySource {
 }
 function* generateWithConstraint(it, constraint) {
     for (const node of it) {
-        if (constraint &&
-            !valuesEqual(node.row[constraint.key], constraint.value)) {
+        if (constraint && !constraintMatchesRow(constraint, node.row)) {
             break;
         }
         yield node;
@@ -382,11 +390,11 @@ export function* generateWithStart(it, req, compare) {
  * @param overlay - the overlay values to splice in
  * @param compare - the comparator to use to find the position for the overlay
  */
-export function* generateWithOverlay(startAt, rows, constraint, overlay, compare) {
-    const overlays = computeOverlays(startAt, constraint, overlay, compare);
+export function* generateWithOverlay(startAt, rows, constraint, overlay, compare, filterPredicate) {
+    const overlays = computeOverlays(startAt, constraint, overlay, compare, filterPredicate);
     yield* generateWithOverlayInner(rows, overlays, compare);
 }
-function computeOverlays(startAt, constraint, overlay, compare) {
+function computeOverlays(startAt, constraint, overlay, compare, filterPredicate) {
     let overlays = {
         add: undefined,
         remove: undefined,
@@ -417,6 +425,9 @@ function computeOverlays(startAt, constraint, overlay, compare) {
     if (constraint) {
         overlays = overlaysForConstraint(overlays, constraint);
     }
+    if (filterPredicate) {
+        overlays = overlaysForFilterPredicate(overlays, filterPredicate);
+    }
     return overlays;
 }
 export { overlaysForStartAt as overlaysForStartAtForTest };
@@ -429,7 +440,7 @@ function overlaysForStartAt({ add, remove }, startAt, compare) {
 }
 export { overlaysForConstraint as overlaysForConstraintForTest };
 function overlaysForConstraint({ add, remove }, constraint) {
-    const undefinedIfDoesntMatchConstraint = (row) => row === undefined || !valuesEqual(row[constraint.key], constraint.value)
+    const undefinedIfDoesntMatchConstraint = (row) => row === undefined || !constraintMatchesRow(constraint, row)
         ? undefined
         : row;
     return {
@@ -437,6 +448,13 @@ function overlaysForConstraint({ add, remove }, constraint) {
         remove: undefinedIfDoesntMatchConstraint(remove),
     };
 }
+function overlaysForFilterPredicate({ add, remove }, filterPredicate) {
+    const undefinedIfDoesntMatchFilter = (row) => row === undefined || !filterPredicate(row) ? undefined : row;
+    return {
+        add: undefinedIfDoesntMatchFilter(add),
+        remove: undefinedIfDoesntMatchFilter(remove),
+    };
+}
 export function* generateWithOverlayInner(rowIterator, overlays, compare) {
     let addOverlayYielded = false;
     let removeOverlaySkipped = false;
@@ -494,44 +512,4 @@ function compareBounds(a, b) {
     }
     return compareValues(a, b);
 }
-/**
- * Only returns optional filters if:
- * 1. It's a simple condition
- * 2. It's an `and` condition with only simple conditions inside of it
- * 3. It's an `or` that is a no-op.
- *
- * Otherwise the filters are dropped.
- *
- * This is a short term solution until we update `fetch` to pass
- * the constraints rather than making them static in `connect`.
- *
- * The below way of doing things over-fetches as the optional filters
- * are widened to cover all branches of the pipeline.
- */
-export function filterOptionalFilters(optionalFilters) {
-    if (optionalFilters) {
-        if (optionalFilters.type === 'or' &&
-            optionalFilters.conditions.length === 1) {
-            optionalFilters = optionalFilters.conditions[0];
-        }
-        if (optionalFilters.type === 'and') {
-            const filters = optionalFilters.conditions.filter(c => c.type === 'simple');
-            return {
-                filters,
-                allApplied: filters.length === optionalFilters.conditions.length,
-            };
-        }
-        if (optionalFilters.type === 'simple') {
-            return {
-                filters: [optionalFilters],
-                allApplied: true,
-            };
-        }
-        return { filters: [], allApplied: false };
-    }
-    return {
-        filters: [],
-        allApplied: true,
-    };
-}
 //# sourceMappingURL=memory-source.js.map