@rocicorp/zero 0.3.2024102502 → 0.3.2024102600

package/out/zql/src/zql/ivm/array-view.d.ts

@@ -1,11 +1,7 @@
-import type { Value } from '../../../../zero-protocol/src/data.js';
 import type { Listener, TypedView } from '../query/typed-view.js';
 import type { Change } from './change.js';
 import type { Input, Output } from './operator.js';
-export type Format = {
-    singular: boolean;
-    relationships: Record<string, Format>;
-};
+import type { Format, View } from './view.js';
 /**
  * Implements a materialized view of the output of an operator.
  *
@@ -27,9 +23,4 @@ export declare class ArrayView<V extends View> implements Output, TypedView<V> {
     push(change: Change): void;
     flush(): void;
 }
-export type View = EntryList | Entry | undefined;
-export type EntryList = Entry[];
-export type Entry = {
-    [key: string]: Value | View;
-};
 //# sourceMappingURL=array-view.d.ts.map

package/out/zql/src/zql/ivm/array-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array-view.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/array-view.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAM,KAAK,EAAC,MAAM,uCAAuC,CAAC;AAEtE,OAAO,KAAK,EAAC,QAAQ,EAAE,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAExC,OAAO,KAAK,EAAC,KAAK,EAAE,MAAM,EAAC,MAAM,eAAe,CAAC;AAGjD,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,IAAI,CAAE,YAAW,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;;IAUpE,SAAS,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;gBAKlC,KAAK,EAAE,KAAK,EACZ,MAAM,GAAE,MAA6C;IAYvD,IAAI,IAAI,IACmB,CAAC,CAC3B;IAED,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAiBjC,OAAO;IAmBP,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK1B,KAAK;CAON;AAED,MAAM,MAAM,IAAI,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,CAAC;AACjD,MAAM,MAAM,SAAS,GAAG,KAAK,EAAE,CAAC;AAChC,MAAM,MAAM,KAAK,GAAG;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI,CAAA;CAAC,CAAC"}
+{"version":3,"file":"array-view.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/array-view.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,QAAQ,EAAE,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,KAAK,EAAE,MAAM,EAAC,MAAM,eAAe,CAAC;AAGjD,OAAO,KAAK,EAAQ,MAAM,EAAE,IAAI,EAAC,MAAM,WAAW,CAAC;AAEnD;;;;;;;;;;GAUG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,IAAI,CAAE,YAAW,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;;IAUpE,SAAS,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;gBAKlC,KAAK,EAAE,KAAK,EACZ,MAAM,GAAE,MAA6C;IAWvD,IAAI,IAAI,IACmB,CAAC,CAC3B;IAED,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAiBjC,OAAO;IAkBP,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK1B,KAAK;CAON"}

package/out/zql/src/zql/ivm/array-view.js

@@ -1,6 +1,5 @@
-import { assert, assertArray, assertObject, assertUndefined, unreachable, } from '../../../../shared/src/asserts.js';
-import { must } from '../../../../shared/src/must.js';
-import { assertOrderingIncludesPK } from '../builder/builder.js';
+import { assert } from '../../../../shared/src/asserts.js';
+import { applyChange } from './view-apply-change.js';
 /**
  * Implements a materialized view of the output of an operator.
  *
@@ -28,7 +27,6 @@ export class ArrayView {
         this.#format = format;
         this.#input.setOutput(this);
         this.#root = { '': format.singular ? undefined : [] };
-        assertOrderingIncludesPK(this.#schema.sort, this.#schema.primaryKey);
         this.#hydrate();
     }
     get data() {
@@ -48,7 +46,6 @@ export class ArrayView {
         }
     }
     destroy() {
-        this.#input.destroy();
         this.onDestroy?.();
     }
     #hydrate() {
@@ -70,157 +67,4 @@ export class ArrayView {
         this.#fireListeners();
     }
 }
-function applyChange(parentEntry, change, schema, relationship, format) {
-    if (schema.isHidden) {
-        switch (change.type) {
-            case 'add':
-            case 'remove':
-                for (const [relationship, children] of Object.entries(change.node.relationships)) {
-                    const childSchema = must(schema.relationships[relationship]);
-                    for (const node of children) {
-                        applyChange(parentEntry, { type: change.type, node }, childSchema, relationship, format);
-                    }
-                }
-                return;
-            case 'edit':
-                // If hidden at this level it means that the hidden row was changed. If
-                // the row was changed in such a way that it would change the
-                // relationships then the edit would have been split into remove and
-                // add.
-                return;
-            case 'child': {
-                const childSchema = must(schema.relationships[change.child.relationshipName]);
-                applyChange(parentEntry, change.child.change, childSchema, relationship, format);
-                return;
-            }
-            default:
-                unreachable(change);
-        }
-    }
-    const { singular, relationships: childFormats } = format;
-    switch (change.type) {
-        case 'add': {
-            // TODO: Only create a new entry if we need to mutate the existing one.
-            const newEntry = {
-                ...change.node.row,
-            };
-            if (singular) {
-                assertUndefined(parentEntry[relationship], 'single output already exists');
-                parentEntry[relationship] = newEntry;
-            }
-            else {
-                const view = parentEntry[relationship];
-                assertArray(view);
-                const { pos, found } = binarySearch(view, newEntry, schema.compareRows);
-                assert(!found, 'node already exists');
-                view.splice(pos, 0, newEntry);
-            }
-            for (const [relationship, children] of Object.entries(change.node.relationships)) {
-                // TODO: Is there a flag to make TypeScript complain that dictionary access might be undefined?
-                const childSchema = must(schema.relationships[relationship]);
-                const childFormat = must(childFormats[relationship]);
-                const newView = childFormat.singular ? undefined : [];
-                newEntry[relationship] = newView;
-                for (const node of children) {
-                    applyChange(newEntry, { type: 'add', node }, childSchema, relationship, childFormat);
-                }
-            }
-            break;
-        }
-        case 'remove': {
-            if (singular) {
-                assertObject(parentEntry[relationship]);
-                parentEntry[relationship] = undefined;
-            }
-            else {
-                assertArray(parentEntry[relationship]);
-                const view = parentEntry[relationship];
-                const { pos, found } = binarySearch(view, change.node.row, schema.compareRows);
-                assert(found, 'node does not exist');
-                view.splice(pos, 1);
-            }
-            break;
-        }
-        case 'child': {
-            let existing;
-            if (singular) {
-                assertObject(parentEntry[relationship]);
-                existing = parentEntry[relationship];
-            }
-            else {
-                assertArray(parentEntry[relationship]);
-                const list = parentEntry[relationship];
-                const { pos, found } = binarySearch(list, change.row, schema.compareRows);
-                assert(found, 'node does not exist');
-                existing = list[pos];
-            }
-            const childSchema = must(schema.relationships[change.child.relationshipName]);
-            const childFormat = must(format.relationships[change.child.relationshipName]);
-            applyChange(existing, change.child.change, childSchema, change.child.relationshipName, childFormat);
-            break;
-        }
-        case 'edit': {
-            if (singular) {
-                assertObject(parentEntry[relationship]);
-                parentEntry[relationship] = {
-                    ...parentEntry[relationship],
-                    ...change.row,
-                };
-            }
-            else {
-                assertArray(parentEntry[relationship]);
-                const view = parentEntry[relationship];
-                // If the order changed due to the edit, we need to remove and reinsert.
-                if (schema.compareRows(change.oldRow, change.row) === 0) {
-                    const { pos, found } = binarySearch(view, change.oldRow, schema.compareRows);
-                    assert(found, 'node does not exists');
-                    view[pos] = makeEntryPreserveRelationships(change.row, view[pos], schema.relationships);
-                }
-                else {
-                    // Remove
-                    const { pos, found } = binarySearch(view, change.oldRow, schema.compareRows);
-                    assert(found, 'node does not exists');
-                    const oldEntry = view[pos];
-                    view.splice(pos, 1);
-                    // Insert
-                    {
-                        const { pos, found } = binarySearch(view, change.row, schema.compareRows);
-                        assert(!found, 'node already exists');
-                        view.splice(pos, 0, makeEntryPreserveRelationships(change.row, oldEntry, schema.relationships));
-                    }
-                }
-            }
-            break;
-        }
-        default:
-            unreachable(change);
-    }
-}
-// TODO: Do not return an object. It puts unnecessary pressure on the GC.
-function binarySearch(view, target, comparator) {
-    let low = 0;
-    let high = view.length - 1;
-    while (low <= high) {
-        const mid = (low + high) >>> 1;
-        const comparison = comparator(view[mid], target);
-        if (comparison < 0) {
-            low = mid + 1;
-        }
-        else if (comparison > 0) {
-            high = mid - 1;
-        }
-        else {
-            return { pos: mid, found: true };
-        }
-    }
-    return { pos: low, found: false };
-}
-function makeEntryPreserveRelationships(row, entry, relationships) {
-    const result = { ...row };
-    for (const relationship in relationships) {
-        assert(!(relationship in row), 'Relationship already exists');
-        result[relationship] = entry[relationship];
-    }
-    return result;
-}
 //# sourceMappingURL=array-view.js.map

package/out/zql/src/zql/ivm/array-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"array-view.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/array-view.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"array-view.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/array-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAMzD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAGnD;;;;;;;;;;GAUG;AACH,MAAM,OAAO,SAAS;IACX,MAAM,CAAQ;IACd,UAAU,GAAG,IAAI,GAAG,EAAe,CAAC;IACpC,OAAO,CAAc;IACrB,OAAO,CAAS;IAEzB,2EAA2E;IAC3E,6DAA6D;IACpD,KAAK,CAAQ;IAEtB,SAAS,CAA2B;IAEpC,MAAM,GAAG,KAAK,CAAC;IAEf,YACE,KAAY,EACZ,SAAiB,EAAC,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE,EAAC;QAErD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,CAAC,KAAK,GAAG,EAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAC,CAAC;QAEpD,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAM,CAAC;IAC7B,CAAC;IAED,WAAW,CAAC,QAAqB;QAC/B,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,6BAA6B,CAAC,CAAC;QACtE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE9B,QAAQ,CAAC,IAAI,CAAC,IAAoB,CAAC,CAAC;QAEpC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC,CAAC;IACJ,CAAC;IAED,cAAc;QACZ,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACvC,QAAQ,CAAC,IAAI,CAAC,IAAoB,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;IACrB,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;YACzC,WAAW,CACT,IAAI,CAAC,KAAK,EACV,EAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC,EACnB,IAAI,CAAC,OAAO,EACZ,EAAE,EACF,IAAI,CAAC,OAAO,CACb,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,IAAI,CAAC,MAAc;QACjB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,KAAK;QACH,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC;CACF"}

package/out/zql/src/zql/ivm/view-apply-change.d.ts

@@ -0,0 +1,5 @@
+import type { Change } from './change.js';
+import type { TableSchema } from './schema.js';
+import type { Entry, Format } from './view.js';
+export declare function applyChange(parentEntry: Entry, change: Change, schema: TableSchema, relationship: string, format: Format): void;
+//# sourceMappingURL=view-apply-change.d.ts.map

package/out/zql/src/zql/ivm/view-apply-change.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"view-apply-change.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/view-apply-change.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAExC,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAC,KAAK,EAAa,MAAM,EAAC,MAAM,WAAW,CAAC;AAExD,wBAAgB,WAAW,CACzB,WAAW,EAAE,KAAK,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,WAAW,EACnB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,QA6Lf"}

package/out/zql/src/zql/ivm/view-apply-change.js

@@ -0,0 +1,156 @@
+import { assert, assertArray, assertObject, assertUndefined, unreachable, } from '../../../../shared/src/asserts.js';
+import { must } from '../../../../shared/src/must.js';
+export function applyChange(parentEntry, change, schema, relationship, format) {
+    if (schema.isHidden) {
+        switch (change.type) {
+            case 'add':
+            case 'remove':
+                for (const [relationship, children] of Object.entries(change.node.relationships)) {
+                    const childSchema = must(schema.relationships[relationship]);
+                    for (const node of children) {
+                        applyChange(parentEntry, { type: change.type, node }, childSchema, relationship, format);
+                    }
+                }
+                return;
+            case 'edit':
+                // If hidden at this level it means that the hidden row was changed. If
+                // the row was changed in such a way that it would change the
+                // relationships then the edit would have been split into remove and
+                // add.
+                return;
+            case 'child': {
+                const childSchema = must(schema.relationships[change.child.relationshipName]);
+                applyChange(parentEntry, change.child.change, childSchema, relationship, format);
+                return;
+            }
+            default:
+                unreachable(change);
+        }
+    }
+    const { singular, relationships: childFormats } = format;
+    switch (change.type) {
+        case 'add': {
+            // TODO: Only create a new entry if we need to mutate the existing one.
+            const newEntry = {
+                ...change.node.row,
+            };
+            if (singular) {
+                assertUndefined(parentEntry[relationship], 'single output already exists');
+                parentEntry[relationship] = newEntry;
+            }
+            else {
+                const view = parentEntry[relationship];
+                assertArray(view);
+                const { pos, found } = binarySearch(view, newEntry, schema.compareRows);
+                assert(!found, 'node already exists');
+                view.splice(pos, 0, newEntry);
+            }
+            for (const [relationship, children] of Object.entries(change.node.relationships)) {
+                // TODO: Is there a flag to make TypeScript complain that dictionary access might be undefined?
+                const childSchema = must(schema.relationships[relationship]);
+                const childFormat = must(childFormats[relationship]);
+                const newView = childFormat.singular ? undefined : [];
+                newEntry[relationship] = newView;
+                for (const node of children) {
+                    applyChange(newEntry, { type: 'add', node }, childSchema, relationship, childFormat);
+                }
+            }
+            break;
+        }
+        case 'remove': {
+            if (singular) {
+                assertObject(parentEntry[relationship]);
+                parentEntry[relationship] = undefined;
+            }
+            else {
+                assertArray(parentEntry[relationship]);
+                const view = parentEntry[relationship];
+                const { pos, found } = binarySearch(view, change.node.row, schema.compareRows);
+                assert(found, 'node does not exist');
+                view.splice(pos, 1);
+            }
+            break;
+        }
+        case 'child': {
+            let existing;
+            if (singular) {
+                assertObject(parentEntry[relationship]);
+                existing = parentEntry[relationship];
+            }
+            else {
+                assertArray(parentEntry[relationship]);
+                const list = parentEntry[relationship];
+                const { pos, found } = binarySearch(list, change.row, schema.compareRows);
+                assert(found, 'node does not exist');
+                existing = list[pos];
+            }
+            const childSchema = must(schema.relationships[change.child.relationshipName]);
+            const childFormat = must(format.relationships[change.child.relationshipName]);
+            applyChange(existing, change.child.change, childSchema, change.child.relationshipName, childFormat);
+            break;
+        }
+        case 'edit': {
+            if (singular) {
+                assertObject(parentEntry[relationship]);
+                parentEntry[relationship] = {
+                    ...parentEntry[relationship],
+                    ...change.row,
+                };
+            }
+            else {
+                assertArray(parentEntry[relationship]);
+                const view = parentEntry[relationship];
+                // If the order changed due to the edit, we need to remove and reinsert.
+                if (schema.compareRows(change.oldRow, change.row) === 0) {
+                    const { pos, found } = binarySearch(view, change.oldRow, schema.compareRows);
+                    assert(found, 'node does not exists');
+                    view[pos] = makeEntryPreserveRelationships(change.row, view[pos], schema.relationships);
+                }
+                else {
+                    // Remove
+                    const { pos, found } = binarySearch(view, change.oldRow, schema.compareRows);
+                    assert(found, 'node does not exists');
+                    const oldEntry = view[pos];
+                    view.splice(pos, 1);
+                    // Insert
+                    {
+                        const { pos, found } = binarySearch(view, change.row, schema.compareRows);
+                        assert(!found, 'node already exists');
+                        view.splice(pos, 0, makeEntryPreserveRelationships(change.row, oldEntry, schema.relationships));
+                    }
+                }
+            }
+            break;
+        }
+        default:
+            unreachable(change);
+    }
+}
+// TODO: Do not return an object. It puts unnecessary pressure on the GC.
+function binarySearch(view, target, comparator) {
+    let low = 0;
+    let high = view.length - 1;
+    while (low <= high) {
+        const mid = (low + high) >>> 1;
+        const comparison = comparator(view[mid], target);
+        if (comparison < 0) {
+            low = mid + 1;
+        }
+        else if (comparison > 0) {
+            high = mid - 1;
+        }
+        else {
+            return { pos: mid, found: true };
+        }
+    }
+    return { pos: low, found: false };
+}
+function makeEntryPreserveRelationships(row, entry, relationships) {
+    const result = { ...row };
+    for (const relationship in relationships) {
+        assert(!(relationship in row), 'Relationship already exists');
+        result[relationship] = entry[relationship];
+    }
+    return result;
+}
+//# sourceMappingURL=view-apply-change.js.map

package/out/zql/src/zql/ivm/view-apply-change.js.map

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

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

@@ -0,0 +1,15 @@
+import type { Value } from '../../../../zero-protocol/src/data.js';
+import type { Input } from './operator.js';
+import type { Query, QueryType } from '../query/query.js';
+import type { TableSchema } from '../query/schema.js';
+export type View = EntryList | Entry | undefined;
+export type EntryList = Entry[];
+export type Entry = {
+    [key: string]: Value | View;
+};
+export type Format = {
+    singular: boolean;
+    relationships: Record<string, Format>;
+};
+export type ViewFactory<TSchema extends TableSchema, TReturn extends QueryType, T> = (query: Query<TSchema, TReturn>, input: Input, format: Format, onDestroy: () => void, onTransactionCommit: (cb: () => void) => void) => T;
+//# sourceMappingURL=view.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,uCAAuC,CAAC;AACjE,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,EAAC,KAAK,EAAE,SAAS,EAAC,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAEpD,MAAM,MAAM,IAAI,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,CAAC;AACjD,MAAM,MAAM,SAAS,GAAG,KAAK,EAAE,CAAC;AAChC,MAAM,MAAM,KAAK,GAAG;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI,CAAA;CAAC,CAAC;AAElD,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,WAAW,CACrB,OAAO,SAAS,WAAW,EAC3B,OAAO,SAAS,SAAS,EACzB,CAAC,IACC,CACF,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,EAC9B,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,IAAI,EACrB,mBAAmB,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,KAC1C,CAAC,CAAC"}

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=view.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/view.ts"],"names":[],"mappings":""}

package/out/zql/src/zql/query/query-impl.d.ts

@@ -1,11 +1,11 @@
 import type { AST } from '../../../../zero-protocol/src/ast.js';
 import { type BuilderDelegate } from '../builder/builder.js';
-import { type Format } from '../ivm/array-view.js';
-import type { Input } from '../ivm/operator.js';
 import { type NormalizedTableSchema } from './normalize-table-schema.js';
 import type { AddSelections, AddSubselect, DefaultQueryResultRow, GetFieldTypeNoNullOrUndefined, MakeSingular, Operator, Parameter, Query, QueryType, SchemaToRow, Selector, Smash } from './query.js';
 import { type PullSchemaForRelationship, type TableSchema } from './schema.js';
 import type { TypedView } from './typed-view.js';
+import type { Format } from '../ivm/view.js';
+import type { ViewFactory } from '../ivm/view.js';
 export declare function newQuery<TSchema extends TableSchema, TReturn extends QueryType = DefaultQueryResultRow<TSchema>>(delegate: QueryDelegate, tableSchema: TSchema): Query<TSchema, TReturn>;
 export type CommitListener = () => void;
 export type GotCallback = (got: boolean) => void;
@@ -30,7 +30,7 @@ export declare abstract class AbstractQuery<TSchema extends TableSchema, TReturn
     orderBy<TSelector extends keyof TSchema['columns']>(field: TSelector, direction: 'asc' | 'desc'): Query<TSchema, TReturn>;
     protected _completeAst(): AST;
     abstract materialize(): TypedView<Smash<TReturn>>;
-    abstract materialize<T>(factory: MaterializeFactory<TSchema, TReturn, T>): T;
+    abstract materialize<T>(factory: ViewFactory<TSchema, TReturn, T>): T;
     abstract preload(): {
         cleanup: () => void;
         complete: Promise<void>;
@@ -43,11 +43,10 @@ export declare class QueryImpl<TSchema extends TableSchema, TReturn extends Quer
     get singular(): TReturn['singular'];
     protected _newQuery<TSchema extends TableSchema, TReturn extends QueryType>(schema: NormalizedTableSchema, ast: AST, format: Format | undefined): Query<TSchema, TReturn>;
     materialize(): TypedView<Smash<TReturn>>;
-    materialize<T>(factory: MaterializeFactory<TSchema, TReturn, T>): T;
+    materialize<T>(factory: ViewFactory<TSchema, TReturn, T>): T;
     preload(): {
         cleanup: () => void;
         complete: Promise<void>;
     };
 }
-export type MaterializeFactory<TSchema extends TableSchema, TReturn extends QueryType, T> = (query: Query<TSchema, TReturn>, input: Input, format: Format, onDestroy: () => void, onTransactionCommit: (cb: () => void) => void) => T;
 //# sourceMappingURL=query-impl.d.ts.map

package/out/zql/src/zql/query/query-impl.d.ts.map

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

package/out/zql/src/zql/query/query-impl.js

@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { resolver } from '@rocicorp/resolver';
 import { assert } from '../../../../shared/src/asserts.js';
-import { buildPipeline } from '../builder/builder.js';
+import { assertOrderingIncludesPK, buildPipeline, } from '../builder/builder.js';
 import { ArrayView } from '../ivm/array-view.js';
 import { normalizeTableSchema, } from './normalize-table-schema.js';
 import { isFieldRelationship, isJunctionRelationship, } from './schema.js';
@@ -216,12 +216,17 @@ export class QueryImpl extends AbstractQuery {
         const ast = this._completeAst();
         const removeServerQuery = this.#delegate.addServerQuery(ast);
         const input = buildPipeline(ast, this.#delegate, undefined);
+        const schema = input.getSchema();
+        // TODO: Can this assert be removed this._completeAst above ensures this is
+        // true.
+        assertOrderingIncludesPK(schema.sort, schema.primaryKey);
         let removeCommitObserver;
         const onDestroy = () => {
+            input.destroy();
             removeCommitObserver?.();
             removeServerQuery();
         };
-        const view = (factory ?? defaultMaterializeFactory)(this, input, this.#format, onDestroy, cb => {
+        const view = (factory ?? arrayViewFactory)(this, input, this.#format, onDestroy, cb => {
             removeCommitObserver = this.#delegate.onTransactionCommit(cb);
         });
         return view;
@@ -261,7 +266,7 @@ function addPrimaryKeysToAst(schema, ast) {
         orderBy: addPrimaryKeys(schema, ast.orderBy),
     };
 }
-function defaultMaterializeFactory(_query, input, format, onDestroy, onTransactionCommit) {
+function arrayViewFactory(_query, input, format, onDestroy, onTransactionCommit) {
     const v = new ArrayView(input, format);
     v.onDestroy = onDestroy;
     onTransactionCommit(() => {

package/out/zql/src/zql/query/query-impl.js.map

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

package/out/zql/src/zql/query/query.d.ts

@@ -1,7 +1,7 @@
 import type { Row } from '../../../../zero-protocol/src/data.js';
 import type { SchemaValue } from '../ivm/schema.js';
 import type { Source } from '../ivm/source.js';
-import type { MaterializeFactory } from './query-impl.js';
+import type { ViewFactory } from '../ivm/view.js';
 import type { PullSchemaForRelationship, TableSchema } from './schema.js';
 import type { TypedView } from './typed-view.js';
 /**
@@ -123,7 +123,7 @@ export interface Query<TSchema extends TableSchema, TReturn extends QueryType =
     orderBy<TSelector extends Selector<TSchema>>(field: TSelector, direction: 'asc' | 'desc'): Query<TSchema, TReturn>;
     one(): Query<TSchema, MakeSingular<TReturn>>;
     materialize(): TypedView<Smash<TReturn>>;
-    materialize<T>(factory: MaterializeFactory<TSchema, TReturn, T>): T;
+    materialize<T>(factory: ViewFactory<TSchema, TReturn, T>): T;
     preload(): {
         cleanup: () => void;
         complete: Promise<void>;