@rocicorp/zero 0.6.2024112102 → 0.7.2024120100

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

@@ -0,0 +1,353 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { resolver } from '@rocicorp/resolver';
+import { assert } from '../../../shared/src/asserts.js';
+import { hashOfAST } from '../../../zero-protocol/src/ast-hash.js';
+import { normalizeTableSchema, } from '../../../zero-schema/src/normalize-table-schema.js';
+import { isFieldRelationship, isJunctionRelationship, } from '../../../zero-schema/src/table-schema.js';
+import { buildPipeline } from '../builder/builder.js';
+import { ArrayView } from '../ivm/array-view.js';
+import { dnf } from './dnf.js';
+import { and, cmp, ExpressionBuilder, } from './expression.js';
+export function newQuery(delegate, tableSchema) {
+    return new QueryImpl(delegate, normalizeTableSchema(tableSchema));
+}
+function newQueryWithDetails(delegate, schema, ast, format) {
+    return new QueryImpl(delegate, schema, ast, format);
+}
+export function staticParam(anchorClass, field) {
+    return {
+        type: 'static',
+        anchor: anchorClass,
+        field,
+    };
+}
+export const SUBQ_PREFIX = 'zsubq_';
+export class AbstractQuery {
+    #ast;
+    #schema;
+    #format;
+    #hash = '';
+    constructor(schema, ast, format) {
+        this.#ast = ast;
+        this.#format = format ?? { singular: false, relationships: {} };
+        this.#schema = schema;
+    }
+    get format() {
+        return this.#format;
+    }
+    hash() {
+        if (!this.#hash) {
+            const ast = this._completeAst();
+            const hash = hashOfAST(ast);
+            this.#hash = hash;
+        }
+        return this.#hash;
+    }
+    one() {
+        return this._newQuery(this.#schema, {
+            ...this.#ast,
+            limit: 1,
+        }, {
+            ...this.#format,
+            singular: true,
+        });
+    }
+    whereExists(relationship, cb = q => q) {
+        return this.where(({ exists }) => exists(relationship, cb));
+    }
+    related(relationship, cb = q => q) {
+        if (relationship.startsWith(SUBQ_PREFIX)) {
+            throw new Error(`Relationship names may not start with "${SUBQ_PREFIX}". That is a reserved prefix.`);
+        }
+        const related = this.#schema.relationships[relationship];
+        assert(related, 'Invalid relationship');
+        if (isFieldRelationship(related)) {
+            const { destSchema } = related;
+            const sq = cb(this._newQuery(destSchema, {
+                table: destSchema.tableName,
+                alias: relationship,
+            }, undefined));
+            return this._newQuery(this.#schema, {
+                ...this.#ast,
+                related: [
+                    ...(this.#ast.related ?? []),
+                    {
+                        correlation: {
+                            parentField: related.sourceField,
+                            childField: related.destField,
+                        },
+                        subquery: addPrimaryKeysToAst(destSchema, sq.#ast),
+                    },
+                ],
+            }, {
+                ...this.#format,
+                relationships: {
+                    ...this.#format.relationships,
+                    [relationship]: sq.#format,
+                },
+            });
+        }
+        if (isJunctionRelationship(related)) {
+            assert(related.length === 2, 'Invalid relationship');
+            const [firstRelation, secondRelation] = related;
+            const { destSchema } = secondRelation;
+            const junctionSchema = firstRelation.destSchema;
+            const sq = cb(this._newQuery(destSchema, {
+                table: destSchema.tableName,
+                alias: relationship,
+            }, undefined));
+            return this._newQuery(this.#schema, {
+                ...this.#ast,
+                related: [
+                    ...(this.#ast.related ?? []),
+                    {
+                        correlation: {
+                            parentField: firstRelation.sourceField,
+                            childField: firstRelation.destField,
+                        },
+                        subquery: {
+                            table: junctionSchema.tableName,
+                            alias: relationship,
+                            orderBy: addPrimaryKeys(junctionSchema, undefined),
+                            related: [
+                                {
+                                    correlation: {
+                                        parentField: secondRelation.sourceField,
+                                        childField: secondRelation.destField,
+                                    },
+                                    hidden: true,
+                                    subquery: addPrimaryKeysToAst(destSchema, sq.#ast),
+                                },
+                            ],
+                        },
+                    },
+                ],
+            }, {
+                ...this.#format,
+                relationships: {
+                    ...this.#format.relationships,
+                    [relationship]: sq.#format,
+                },
+            });
+        }
+        throw new Error(`Invalid relationship ${relationship}`);
+    }
+    where(fieldOrExpressionFactory, opOrValue, value) {
+        let cond;
+        if (typeof fieldOrExpressionFactory === 'function') {
+            cond = fieldOrExpressionFactory(new ExpressionBuilder(this._exists));
+        }
+        else {
+            assert(opOrValue !== undefined, 'Invalid condition');
+            cond = cmp(fieldOrExpressionFactory, opOrValue, value);
+        }
+        const existingWhere = this.#ast.where;
+        if (existingWhere) {
+            cond = and(existingWhere, cond);
+        }
+        return this._newQuery(this.#schema, {
+            ...this.#ast,
+            where: dnf(cond),
+        }, this.#format);
+    }
+    start(row, opts) {
+        return this._newQuery(this.#schema, {
+            ...this.#ast,
+            start: {
+                row,
+                exclusive: !opts?.inclusive,
+            },
+        }, this.#format);
+    }
+    limit(limit) {
+        if (limit < 0) {
+            throw new Error('Limit must be non-negative');
+        }
+        if ((limit | 0) !== limit) {
+            throw new Error('Limit must be an integer');
+        }
+        return this._newQuery(this.#schema, {
+            ...this.#ast,
+            limit,
+        }, this.#format);
+    }
+    orderBy(field, direction) {
+        return this._newQuery(this.#schema, {
+            ...this.#ast,
+            orderBy: [...(this.#ast.orderBy ?? []), [field, direction]],
+        }, this.#format);
+    }
+    _exists = (relationship, cb = q => q) => {
+        const related = this.#schema.relationships[relationship];
+        assert(related, 'Invalid relationship');
+        if (isFieldRelationship(related)) {
+            const { destSchema } = related;
+            const sq = cb(this._newQuery(destSchema, {
+                table: destSchema.tableName,
+                alias: `${SUBQ_PREFIX}${relationship}`,
+            }, undefined));
+            return {
+                type: 'correlatedSubquery',
+                related: {
+                    correlation: {
+                        parentField: related.sourceField,
+                        childField: related.destField,
+                    },
+                    subquery: addPrimaryKeysToAst(destSchema, sq.#ast),
+                },
+                op: 'EXISTS',
+            };
+        }
+        if (isJunctionRelationship(related)) {
+            assert(related.length === 2, 'Invalid relationship');
+            const [firstRelation, secondRelation] = related;
+            const { destSchema } = secondRelation;
+            const junctionSchema = firstRelation.destSchema;
+            const queryToDest = cb(this._newQuery(destSchema, {
+                table: destSchema.tableName,
+                alias: `${SUBQ_PREFIX}${relationship}`,
+            }, undefined));
+            return {
+                type: 'correlatedSubquery',
+                related: {
+                    correlation: {
+                        parentField: firstRelation.sourceField,
+                        childField: firstRelation.destField,
+                    },
+                    subquery: {
+                        table: junctionSchema.tableName,
+                        alias: `${SUBQ_PREFIX}${relationship}`,
+                        orderBy: addPrimaryKeys(junctionSchema, undefined),
+                        where: {
+                            type: 'correlatedSubquery',
+                            related: {
+                                correlation: {
+                                    parentField: secondRelation.sourceField,
+                                    childField: secondRelation.destField,
+                                },
+                                subquery: addPrimaryKeysToAst(destSchema, queryToDest.#ast),
+                            },
+                            op: 'EXISTS',
+                        },
+                    },
+                },
+                op: 'EXISTS',
+            };
+        }
+        throw new Error(`Invalid relationship ${relationship}`);
+    };
+    #completedAST;
+    _completeAst() {
+        if (!this.#completedAST) {
+            const finalOrderBy = addPrimaryKeys(this.#schema, this.#ast.orderBy);
+            if (this.#ast.start) {
+                const { row } = this.#ast.start;
+                const narrowedRow = {};
+                for (const [field] of finalOrderBy) {
+                    narrowedRow[field] = row[field];
+                }
+                this.#completedAST = {
+                    ...this.#ast,
+                    start: {
+                        ...this.#ast.start,
+                        row: narrowedRow,
+                    },
+                    orderBy: finalOrderBy,
+                };
+            }
+            else {
+                this.#completedAST = {
+                    ...this.#ast,
+                    orderBy: addPrimaryKeys(this.#schema, this.#ast.orderBy),
+                };
+            }
+        }
+        return this.#completedAST;
+    }
+}
+export const astForTestingSymbol = Symbol();
+export const completedAstSymbol = Symbol();
+export class QueryImpl extends AbstractQuery {
+    #delegate;
+    #ast;
+    constructor(delegate, schema, ast = { table: schema.tableName }, format) {
+        super(schema, ast, format);
+        this.#delegate = delegate;
+        this.#ast = ast;
+    }
+    // Not part of Query or QueryInternal interface
+    get [astForTestingSymbol]() {
+        return this.#ast;
+    }
+    get [completedAstSymbol]() {
+        return this._completeAst();
+    }
+    _newQuery(schema, ast, format) {
+        return newQueryWithDetails(this.#delegate, schema, ast, format);
+    }
+    materialize(factory) {
+        const ast = this._completeAst();
+        const removeServerQuery = this.#delegate.addServerQuery(ast);
+        const input = buildPipeline(ast, this.#delegate);
+        let removeCommitObserver;
+        const onDestroy = () => {
+            input.destroy();
+            removeCommitObserver?.();
+            removeServerQuery();
+        };
+        const view = this.#delegate.batchViewUpdates(() => (factory ?? arrayViewFactory)(this, input, this.format, onDestroy, cb => {
+            removeCommitObserver = this.#delegate.onTransactionCommit(cb);
+        }));
+        return view;
+    }
+    run() {
+        const v = this.materialize();
+        const ret = v.data;
+        v.destroy();
+        return ret;
+    }
+    preload() {
+        const { resolve, promise: complete } = resolver();
+        const ast = this._completeAst();
+        const unsub = this.#delegate.addServerQuery(ast, got => {
+            if (got) {
+                resolve();
+            }
+        });
+        return {
+            cleanup: unsub,
+            complete,
+        };
+    }
+}
+function addPrimaryKeys(schema, orderBy) {
+    orderBy = orderBy ?? [];
+    const { primaryKey } = schema;
+    const primaryKeysToAdd = new Set(primaryKey);
+    for (const [field] of orderBy) {
+        primaryKeysToAdd.delete(field);
+    }
+    if (primaryKeysToAdd.size === 0) {
+        return orderBy;
+    }
+    return [
+        ...orderBy,
+        ...[...primaryKeysToAdd].map(key => [key, 'asc']),
+    ];
+}
+function addPrimaryKeysToAst(schema, ast) {
+    return {
+        ...ast,
+        orderBy: addPrimaryKeys(schema, ast.orderBy),
+    };
+}
+function arrayViewFactory(_query, input, format, onDestroy, onTransactionCommit) {
+    const v = new ArrayView(input, format);
+    v.onDestroy = onDestroy;
+    onTransactionCommit(() => {
+        v.flush();
+    });
+    return v;
+}
+//# sourceMappingURL=query-impl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"query-impl.js","sourceRoot":"","sources":["../../../../../zql/src/query/query-impl.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,uDAAuD;AACvD,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AACtD,OAAO,EAAC,SAAS,EAAC,MAAM,wCAAwC,CAAC;AAGjE,OAAO,EACL,oBAAoB,GAErB,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EACL,mBAAmB,EACnB,sBAAsB,GAIvB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAC,aAAa,EAAuB,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAG/C,OAAO,EAAC,GAAG,EAAC,MAAM,UAAU,CAAC;AAC7B,OAAO,EACL,GAAG,EACH,GAAG,EACH,iBAAiB,GAElB,MAAM,iBAAiB,CAAC;AAezB,MAAM,UAAU,QAAQ,CAGtB,QAAuB,EAAE,WAAoB;IAC7C,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,oBAAoB,CAAC,WAAW,CAAC,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,mBAAmB,CAI1B,QAAuB,EACvB,MAA6B,EAC7B,GAAQ,EACR,MAA0B;IAE1B,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAUD,MAAM,UAAU,WAAW,CACzB,WAA0C,EAC1C,KAAa;IAEb,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,WAAW;QACnB,KAAK;KACN,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC;AAEpC,MAAM,OAAgB,aAAa;IAKxB,IAAI,CAAM;IACV,OAAO,CAAwB;IAC/B,OAAO,CAAS;IACzB,KAAK,GAAW,EAAE,CAAC;IAEnB,YACE,MAA6B,EAC7B,GAAQ,EACR,MAA2B;QAE3B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,EAAC,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE,EAAC,CAAC;QAC9D,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;YAC5B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACpB,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAWD,GAAG;QACD,OAAO,IAAI,CAAC,SAAS,CACnB,IAAI,CAAC,OAAO,EACZ;YACE,GAAG,IAAI,CAAC,IAAI;YACZ,KAAK,EAAE,CAAC;SACT,EACD;YACE,GAAG,IAAI,CAAC,OAAO;YACf,QAAQ,EAAE,IAAI;SACf,CACF,CAAC;IACJ,CAAC;IAKD,WAAW,CACT,YAA2B,EAC3B,KAKqC,CAAC,CAAC,EAAE,CAAC,CAAQ;QAElD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;IAC5D,CAAC;IAeD,OAAO,CAKL,YAA2B,EAC3B,KAKY,CAAC,CAAC,EAAE,CAAC,CAAQ;QAEzB,IAAI,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACb,0CAA0C,WAAW,+BAA+B,CACrF,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QACzD,MAAM,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC;QACxC,IAAI,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,MAAM,EAAC,UAAU,EAAC,GAAG,OAAO,CAAC;YAC7B,MAAM,EAAE,GAAG,EAAE,CACX,IAAI,CAAC,SAAS,CACZ,UAAU,EACV;gBACE,KAAK,EAAE,UAAU,CAAC,SAAS;gBAC3B,KAAK,EAAE,YAAY;aACpB,EACD,SAAS,CACV,CACgC,CAAC;YAEpC,OAAO,IAAI,CAAC,SAAS,CACnB,IAAI,CAAC,OAAO,EACZ;gBACE,GAAG,IAAI,CAAC,IAAI;gBACZ,OAAO,EAAE;oBACP,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;oBAC5B;wBACE,WAAW,EAAE;4BACX,WAAW,EAAE,OAAO,CAAC,WAAW;4BAChC,UAAU,EAAE,OAAO,CAAC,SAAS;yBAC9B;wBACD,QAAQ,EAAE,mBAAmB,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC;qBACnD;iBACF;aACF,EACD;gBACE,GAAG,IAAI,CAAC,OAAO;gBACf,aAAa,EAAE;oBACb,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa;oBAC7B,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,OAAO;iBAC3B;aACF,CACF,CAAC;QACJ,CAAC;QAED,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC;YACpC,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,sBAAsB,CAAC,CAAC;YACrD,MAAM,CAAC,aAAa,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC;YAChD,MAAM,EAAC,UAAU,EAAC,GAAG,cAAc,CAAC;YACpC,MAAM,cAAc,GAAG,aAAa,CAAC,UAAU,CAAC;YAChD,MAAM,EAAE,GAAG,EAAE,CACX,IAAI,CAAC,SAAS,CACZ,UAAU,EACV;gBACE,KAAK,EAAE,UAAU,CAAC,SAAS;gBAC3B,KAAK,EAAE,YAAY;aACpB,EACD,SAAS,CACV,CAC8C,CAAC;YAElD,OAAO,IAAI,CAAC,SAAS,CACnB,IAAI,CAAC,OAAO,EACZ;gBACE,GAAG,IAAI,CAAC,IAAI;gBACZ,OAAO,EAAE;oBACP,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;oBAC5B;wBACE,WAAW,EAAE;4BACX,WAAW,EAAE,aAAa,CAAC,WAAW;4BACtC,UAAU,EAAE,aAAa,CAAC,SAAS;yBACpC;wBACD,QAAQ,EAAE;4BACR,KAAK,EAAE,cAAc,CAAC,SAAS;4BAC/B,KAAK,EAAE,YAAY;4BACnB,OAAO,EAAE,cAAc,CAAC,cAAc,EAAE,SAAS,CAAC;4BAClD,OAAO,EAAE;gCACP;oCACE,WAAW,EAAE;wCACX,WAAW,EAAE,cAAc,CAAC,WAAW;wCACvC,UAAU,EAAE,cAAc,CAAC,SAAS;qCACrC;oCACD,MAAM,EAAE,IAAI;oCACZ,QAAQ,EAAE,mBAAmB,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC;iCACnD;6BACF;yBACF;qBACF;iBACF;aACF,EACD;gBACE,GAAG,IAAI,CAAC,OAAO;gBACf,aAAa,EAAE;oBACb,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa;oBAC7B,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,OAAO;iBAC3B;aACF,CACF,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,wBAAwB,YAAY,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CACH,wBAA6D,EAC7D,SAG4B,EAC5B,KAAyE;QAEzE,IAAI,IAAe,CAAC;QAEpB,IAAI,OAAO,wBAAwB,KAAK,UAAU,EAAE,CAAC;YACnD,IAAI,GAAG,wBAAwB,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QACvE,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,mBAAmB,CAAC,CAAC;YACrD,IAAI,GAAG,GAAG,CAAC,wBAAwB,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QACzD,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QACtC,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,GAAG,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAClC,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CACnB,IAAI,CAAC,OAAO,EACZ;YACE,GAAG,IAAI,CAAC,IAAI;YACZ,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC;SACjB,EACD,IAAI,CAAC,OAAO,CACb,CAAC;IACJ,CAAC;IAED,KAAK,CACH,GAAuC,EACvC,IAAuC;QAEvC,OAAO,IAAI,CAAC,SAAS,CACnB,IAAI,CAAC,OAAO,EACZ;YACE,GAAG,IAAI,CAAC,IAAI;YACZ,KAAK,EAAE;gBACL,GAAG;gBACH,SAAS,EAAE,CAAC,IAAI,EAAE,SAAS;aAC5B;SACF,EACD,IAAI,CAAC,OAAO,CACb,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAa;QACjB,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CACnB,IAAI,CAAC,OAAO,EACZ;YACE,GAAG,IAAI,CAAC,IAAI;YACZ,KAAK;SACN,EACD,IAAI,CAAC,OAAO,CACb,CAAC;IACJ,CAAC;IAED,OAAO,CACL,KAAgB,EAChB,SAAyB;QAEzB,OAAO,IAAI,CAAC,SAAS,CACnB,IAAI,CAAC,OAAO,EACZ;YACE,GAAG,IAAI,CAAC,IAAI;YACZ,OAAO,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC,KAAe,EAAE,SAAS,CAAC,CAAC;SACtE,EACD,IAAI,CAAC,OAAO,CACb,CAAC;IACJ,CAAC;IAES,OAAO,GAAG,CAClB,YAAoB,EACpB,KAEqC,CAAC,CAAC,EAAE,CAAC,CAAC,EAChC,EAAE;QACb,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QACzD,MAAM,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC;QAExC,IAAI,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,MAAM,EAAC,UAAU,EAAC,GAAG,OAAO,CAAC;YAC7B,MAAM,EAAE,GAAG,EAAE,CACX,IAAI,CAAC,SAAS,CACZ,UAAU,EACV;gBACE,KAAK,EAAE,UAAU,CAAC,SAAS;gBAC3B,KAAK,EAAE,GAAG,WAAW,GAAG,YAAY,EAAE;aACvC,EACD,SAAS,CACV,CACgC,CAAC;YACpC,OAAO;gBACL,IAAI,EAAE,oBAAoB;gBAC1B,OAAO,EAAE;oBACP,WAAW,EAAE;wBACX,WAAW,EAAE,OAAO,CAAC,WAAW;wBAChC,UAAU,EAAE,OAAO,CAAC,SAAS;qBAC9B;oBACD,QAAQ,EAAE,mBAAmB,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC;iBACnD;gBACD,EAAE,EAAE,QAAQ;aACb,CAAC;QACJ,CAAC;QAED,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC;YACpC,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,sBAAsB,CAAC,CAAC;YACrD,MAAM,CAAC,aAAa,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC;YAChD,MAAM,EAAC,UAAU,EAAC,GAAG,cAAc,CAAC;YACpC,MAAM,cAAc,GAAG,aAAa,CAAC,UAAU,CAAC;YAChD,MAAM,WAAW,GAAG,EAAE,CACpB,IAAI,CAAC,SAAS,CACZ,UAAU,EACV;gBACE,KAAK,EAAE,UAAU,CAAC,SAAS;gBAC3B,KAAK,EAAE,GAAG,WAAW,GAAG,YAAY,EAAE;aACvC,EACD,SAAS,CACV,CACmC,CAAC;YAEvC,OAAO;gBACL,IAAI,EAAE,oBAAoB;gBAC1B,OAAO,EAAE;oBACP,WAAW,EAAE;wBACX,WAAW,EAAE,aAAa,CAAC,WAAW;wBACtC,UAAU,EAAE,aAAa,CAAC,SAAS;qBACpC;oBACD,QAAQ,EAAE;wBACR,KAAK,EAAE,cAAc,CAAC,SAAS;wBAC/B,KAAK,EAAE,GAAG,WAAW,GAAG,YAAY,EAAE;wBACtC,OAAO,EAAE,cAAc,CAAC,cAAc,EAAE,SAAS,CAAC;wBAClD,KAAK,EAAE;4BACL,IAAI,EAAE,oBAAoB;4BAC1B,OAAO,EAAE;gCACP,WAAW,EAAE;oCACX,WAAW,EAAE,cAAc,CAAC,WAAW;oCACvC,UAAU,EAAE,cAAc,CAAC,SAAS;iCACrC;gCAED,QAAQ,EAAE,mBAAmB,CAAC,UAAU,EAAE,WAAW,CAAC,IAAI,CAAC;6BAC5D;4BACD,EAAE,EAAE,QAAQ;yBACb;qBACF;iBACF;gBACD,EAAE,EAAE,QAAQ;aACb,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,wBAAwB,YAAY,EAAE,CAAC,CAAC;IAC1D,CAAC,CAAC;IAEF,aAAa,CAAkB;IAErB,YAAY;QACpB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACrE,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpB,MAAM,EAAC,GAAG,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC9B,MAAM,WAAW,GAAQ,EAAE,CAAC;gBAC5B,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,YAAY,EAAE,CAAC;oBACnC,WAAW,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC;gBAClC,CAAC;gBACD,IAAI,CAAC,aAAa,GAAG;oBACnB,GAAG,IAAI,CAAC,IAAI;oBACZ,KAAK,EAAE;wBACL,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK;wBAClB,GAAG,EAAE,WAAW;qBACjB;oBACD,OAAO,EAAE,YAAY;iBACtB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,aAAa,GAAG;oBACnB,GAAG,IAAI,CAAC,IAAI;oBACZ,OAAO,EAAE,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;iBACzD,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;CASF;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,EAAE,CAAC;AAC5C,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,EAAE,CAAC;AAE3C,MAAM,OAAO,SAGX,SAAQ,aAA+B;IAC9B,SAAS,CAAgB;IACzB,IAAI,CAAM;IAEnB,YACE,QAAuB,EACvB,MAA6B,EAC7B,MAAW,EAAC,KAAK,EAAE,MAAM,CAAC,SAAS,EAAC,EACpC,MAA2B;QAE3B,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IAClB,CAAC;IAED,+CAA+C;IAC/C,IAAI,CAAC,mBAAmB,CAAC;QACvB,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,kBAAkB,CAAC;QACtB,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;IAC7B,CAAC;IAES,SAAS,CACjB,MAA6B,EAC7B,GAAQ,EACR,MAA0B;QAE1B,OAAO,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;IAClE,CAAC;IAED,WAAW,CAAI,OAA0C;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAChC,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAE7D,MAAM,KAAK,GAAG,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,oBAA8C,CAAC;QAEnD,MAAM,SAAS,GAAG,GAAG,EAAE;YACrB,KAAK,CAAC,OAAO,EAAE,CAAC;YAChB,oBAAoB,EAAE,EAAE,CAAC;YACzB,iBAAiB,EAAE,CAAC;QACtB,CAAC,CAAC;QAEF,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAChD,CAAC,OAAO,IAAI,gBAAgB,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE;YACtE,oBAAoB,GAAG,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QAChE,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,IAAS,CAAC;IACnB,CAAC;IAED,GAAG;QACD,MAAM,CAAC,GAA8B,IAAI,CAAC,WAAW,EAAE,CAAC;QACxD,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC;QACnB,CAAC,CAAC,OAAO,EAAE,CAAC;QACZ,OAAO,GAAG,CAAC;IACb,CAAC;IAED,OAAO;QAIL,MAAM,EAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAC,GAAG,QAAQ,EAAQ,CAAC;QACtD,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;YACrD,IAAI,GAAG,EAAE,CAAC;gBACR,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO;YACL,OAAO,EAAE,KAAK;YACd,QAAQ;SACT,CAAC;IACJ,CAAC;CACF;AAED,SAAS,cAAc,CACrB,MAA6B,EAC7B,OAA6B;IAE7B,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;IACxB,MAAM,EAAC,UAAU,EAAC,GAAG,MAAM,CAAC;IAC5B,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IAE7C,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,OAAO,EAAE,CAAC;QAC9B,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,gBAAgB,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO;QACL,GAAG,OAAO;QACV,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAoB,CAAC;KACrE,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,MAA6B,EAAE,GAAQ;IAClE,OAAO;QACL,GAAG,GAAG;QACN,OAAO,EAAE,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC;KAC7C,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAIvB,MAA+B,EAC/B,KAAY,EACZ,MAAc,EACd,SAAqB,EACrB,mBAA6C;IAE7C,MAAM,CAAC,GAAG,IAAI,SAAS,CAAiB,KAAK,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC,CAAC,SAAS,GAAG,SAAS,CAAC;IACxB,mBAAmB,CAAC,GAAG,EAAE;QACvB,CAAC,CAAC,KAAK,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,CAAC;AACX,CAAC"}

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

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

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

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

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

@@ -0,0 +1,3 @@
+/* eslint-disable @typescript-eslint/ban-types */
+export {};
+//# sourceMappingURL=query.js.map

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

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

package/out/zql/src/query/typed-view.js

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

package/out/zql/src/query/typed-view.js.map

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

package/out/zqlite/src/table-source.d.ts

@@ -1,15 +1,14 @@
 import type { SQLQuery } from '@databases/sql';
-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 { Source, SourceChange, SourceInput } from '../../zql/src/ivm/source.js';
 import { Database } from './db.js';
 import type { SchemaValue, ValueType } from '../../zero-schema/src/table-schema.js';
+import { type NoSubqueryCondition } from '../../zql/src/builder/filter.js';
 /**
  * A source that is backed by a SQLite table.
  *
  * Values are written to the backing table _after_ being vended by the source.
- * An overlay index (not yet implemented) is used such that
- * `fetches` made after a `push` will see the new values.
  *
  * This ordering of events is to ensure self joins function properly. That is,
  * we can't reveal a value to an output before it has been pushed to that output.
@@ -53,12 +52,4 @@ export declare function toSQLiteTypeName(type: ValueType): "INTEGER" | "REAL" |
 export declare class UnsupportedValueError extends Error {
     constructor(msg: string);
 }
-type NoSubqueryCondition = SimpleCondition | {
-    type: 'and';
-    conditions: readonly NoSubqueryCondition[];
-} | {
-    type: 'or';
-    conditions: readonly NoSubqueryCondition[];
-};
-export {};
 //# sourceMappingURL=table-source.d.ts.map

package/out/zqlite/src/table-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table-source.d.ts","sourceRoot":"","sources":["../../../../zqlite/src/table-source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAG7C,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EACR,eAAe,EAEhB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAC,GAAG,EAAQ,MAAM,iCAAiC,CAAC;AAqBhE,OAAO,KAAK,EACV,MAAM,EACN,YAAY,EACZ,WAAW,EACZ,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAC,QAAQ,EAAY,MAAM,SAAS,CAAC;AAG5C,OAAO,KAAK,EACV,WAAW,EACX,SAAS,EACV,MAAM,uCAAuC,CAAC;AAmB/C;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,WAAY,YAAW,MAAM;;gBAUtC,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACpC,UAAU,EAAE,SAAS,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;IAQ5C;;;OAGG;IACH,KAAK,CAAC,EAAE,EAAE,QAAQ;IA8FlB,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,SAAS;IAuI/D,IAAI,CAAC,MAAM,EAAE,YAAY;IAqGzB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,EAAE,GAAG,GAAG,GAAG,GAAG,SAAS;CA6DjC;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,GAAG,QAAQ,CAe3E;AA0MD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,wCAa/C;AAuCD,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,GAAG,EAAE,MAAM;CAGxB;AAiCD,KAAK,mBAAmB,GACpB,eAAe,GACf;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,UAAU,EAAE,SAAS,mBAAmB,EAAE,CAAC;CAC5C,GACD;IACE,IAAI,EAAE,IAAI,CAAC;IACX,UAAU,EAAE,SAAS,mBAAmB,EAAE,CAAC;CAC5C,CAAC"}
+{"version":3,"file":"table-source.d.ts","sourceRoot":"","sources":["../../../../zqlite/src/table-source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAG7C,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EAGT,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAC,GAAG,EAAQ,MAAM,iCAAiC,CAAC;AAsBhE,OAAO,KAAK,EACV,MAAM,EACN,YAAY,EACZ,WAAW,EACZ,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAC,QAAQ,EAAY,MAAM,SAAS,CAAC;AAG5C,OAAO,KAAK,EACV,WAAW,EACX,SAAS,EACV,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAGL,KAAK,mBAAmB,EACzB,MAAM,iCAAiC,CAAC;AAwBzC;;;;;;;;;;;;;GAaG;AACH,qBAAa,WAAY,YAAW,MAAM;;gBAUtC,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACpC,UAAU,EAAE,SAAS,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;IAQ5C;;;OAGG;IACH,KAAK,CAAC,EAAE,EAAE,QAAQ;IA8FlB,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,SAAS;IA4I/D,IAAI,CAAC,MAAM,EAAE,YAAY;IA+GzB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,EAAE,GAAG,GAAG,GAAG,GAAG,SAAS;CA+DjC;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,GAAG,QAAQ,CAe3E;AAsMD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,wCAa/C;AAuCD,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,GAAG,EAAE,MAAM;CAGxB"}

package/out/zqlite/src/table-source.js

@@ -6,12 +6,11 @@ import { generateWithOverlay, generateWithStart, } from '../../zql/src/ivm/memor
 import { Database, Statement } from './db.js';
 import { compile, format, sql } from './internal/sql.js';
 import { StatementCache } from './internal/statement-cache.js';
+import { createPredicate, transformFilters, } from '../../zql/src/builder/filter.js';
 /**
  * A source that is backed by a SQLite table.
  *
  * Values are written to the backing table _after_ being vended by the source.
- * An overlay index (not yet implemented) is used such that
- * `fetches` made after a `push` will see the new values.
  *
  * This ordering of events is to ensure self joins function properly. That is,
  * we can't reveal a value to an output before it has been pushed to that output.
@@ -99,7 +98,12 @@ export class TableSource {
             input,
             output: undefined,
             sort,
-            filters: transformedFilters.filters,
+            filters: transformedFilters.filters
+                ? {
+                    condition: transformedFilters.filters,
+                    predicate: createPredicate(transformedFilters.filters),
+                }
+                : undefined,
             compareRows: makeComparator(sort),
         };
         const schema = this.#getSchema(connection);
@@ -112,7 +116,6 @@ export class TableSource {
     }
     *#fetch(req, connection, beforeRequest) {
         const { start } = req;
-        let newReq = req;
         const { sort } = connection;
         /**
          * Before isn't quite "before".
@@ -132,16 +135,16 @@ export class TableSource {
                     direction: req.start.basis === 'before' ? 'before' : 'after',
                     inclusive: req.start.basis === 'at',
                 }
-                : undefined, connection.filters, sort);
+                : undefined, connection.filters?.condition, sort);
             const sqlAndBindings = format(preSql);
-            newReq = { ...req, start: undefined };
+            let start;
             this.#stmts.cache.use(sqlAndBindings.text, cachedStatement => {
                 for (const beforeRow of cachedStatement.statement.iterate(...sqlAndBindings.values)) {
-                    newReq.start = { row: beforeRow, basis: 'at' };
+                    start = { row: beforeRow, basis: 'at' };
                     break;
                 }
             });
-            yield* this.#fetch(newReq, connection, req);
+            yield* this.#fetch({ ...req, start }, connection, req);
         }
         else {
             const query = this.#requestToSQL(req.constraint, req.start !== undefined
@@ -150,7 +153,7 @@ export class TableSource {
                     direction: req.start.basis === 'before' ? 'before' : 'after',
                     inclusive: req.start.basis === 'at',
                 }
-                : undefined, connection.filters, sort);
+                : undefined, connection.filters?.condition, sort);
             const sqlAndBindings = format(query);
             const cachedStatement = this.#stmts.cache.get(sqlAndBindings.text);
             try {
@@ -165,7 +168,7 @@ export class TableSource {
                         overlay = this.#overlay;
                     }
                 }
-                yield* generateWithStart(generateWithOverlay(req.start?.row, mapFromSQLiteTypes(this.#columns, rowIterator), req.constraint, overlay, comparator), beforeRequest ?? req, comparator);
+                yield* generateWithStart(generateWithOverlay(req.start?.row, mapFromSQLiteTypes(this.#columns, rowIterator), req.constraint, overlay, comparator, connection.filters?.predicate), beforeRequest ?? req, comparator);
             }
             finally {
                 this.#stmts.cache.return(cachedStatement);
@@ -173,18 +176,18 @@ export class TableSource {
         }
     }
     push(change) {
-        const exists = (row) => this.#stmts.checkExists.get(...pickColumns(this.#primaryKey, row))?.exists === 1;
+        const exists = (row) => this.#stmts.checkExists.get(...toSQLiteTypes(this.#primaryKey, row, this.#columns))?.exists === 1;
         // need to check for the existence of the row before modifying
         // the db so we don't push it to outputs if it does/doest not exist.
         switch (change.type) {
             case 'add':
-                assert(!exists(change.row), 'Row already exists');
+                assert(!exists(change.row), `Row already exists ${stringify(change)}`);
                 break;
             case 'remove':
-                assert(exists(change.row), 'Row not found');
+                assert(exists(change.row), `Row not found ${stringify(change)}`);
                 break;
             case 'edit':
-                assert(exists(change.oldRow), 'Row not found');
+                assert(exists(change.oldRow), `Row not found ${stringify(change)}`);
                 fromSQLiteTypes(this.#columns, change.oldRow);
                 break;
             default:
@@ -201,7 +204,17 @@ export class TableSource {
         // 2. this mapping should be in pipeline driver.
         fromSQLiteTypes(this.#columns, change.row);
         const outputChange = change.type === 'edit'
-            ? change
+            ? {
+                type: change.type,
+                oldNode: {
+                    row: change.oldRow,
+                    relationships: {},
+                },
+                node: {
+                    row: change.row,
+                    relationships: {},
+                },
+            }
             : {
                 type: change.type,
                 node: {
@@ -255,7 +268,9 @@ export class TableSource {
         let query = sql `SELECT ${this.#allColumns} FROM ${sql.ident(this.#table)}`;
         const constraints = [];
         if (constraint) {
-            constraints.push(sql `${sql.ident(constraint.key)} = ${toSQLiteType(constraint.value, this.#columns[constraint.key].type)}`);
+            for (const [key, value] of Object.entries(constraint)) {
+                constraints.push(sql `${sql.ident(key)} = ${toSQLiteType(value, this.#columns[key].type)}`);
+            }
         }
         if (cursor) {
             constraints.push(gatherStartConstraints(cursor, order, this.#columns));
@@ -401,9 +416,6 @@ function assertPrimaryKeyMatch(db, tableName, primaryKey) {
 function toSQLiteTypes(columns, row, columnTypes) {
     return columns.map(col => toSQLiteType(row[col], columnTypes[col].type));
 }
-function pickColumns(columns, row) {
-    return columns.map(col => row[col]);
-}
 function toSQLiteType(v, type) {
     switch (type) {
         case 'boolean':
@@ -478,68 +490,7 @@ function nonPrimaryValues(columns, primaryKey, row) {
 function nonPrimaryKeys(columns, primaryKey) {
     return Object.keys(columns).filter(c => !primaryKey.includes(c));
 }
-/**
- * Returns a transformed condition which contains no
- * CorrelatedSubqueryCondition(s) but which will filter a subset of the rows
- * that would be filtered by the original condition, or undefined
- * if no such transformation exists.
- *
- * Assumes Condition is in DNF.
- */
-function transformFilters(filters) {
-    if (!filters) {
-        return { filters: undefined, conditionsRemoved: false };
-    }
-    switch (filters.type) {
-        case 'simple':
-            return { filters, conditionsRemoved: false };
-        case 'correlatedSubquery':
-            return { filters: undefined, conditionsRemoved: true };
-        case 'and': {
-            const transformedConditions = [];
-            for (const cond of filters.conditions) {
-                assert(cond.type === 'simple' || cond.type === 'correlatedSubquery');
-                if (cond.type === 'simple') {
-                    transformedConditions.push(cond);
-                }
-            }
-            const conditionsRemoved = transformedConditions.length !== filters.conditions.length;
-            if (transformedConditions.length === 0) {
-                return { filters: undefined, conditionsRemoved };
-            }
-            if (transformedConditions.length === 1) {
-                return {
-                    filters: transformedConditions[0],
-                    conditionsRemoved,
-                };
-            }
-            return {
-                filters: {
-                    type: 'and',
-                    conditions: transformedConditions,
-                },
-                conditionsRemoved,
-            };
-        }
-        case 'or': {
-            const transformedConditions = [];
-            let conditionsRemoved = false;
-            for (const cond of filters.conditions) {
-                assert(cond.type !== 'or');
-                const transformed = transformFilters(cond);
-                if (transformed.filters === undefined) {
-                    return { filters: undefined, conditionsRemoved: true };
-                }
-                conditionsRemoved = conditionsRemoved || transformed.conditionsRemoved;
-                transformedConditions.push(transformed.filters);
-            }
-            return {
-                filters: { type: 'or', conditions: transformedConditions },
-                conditionsRemoved,
-            };
-        }
-        default:
-            unreachable(filters);
-    }
+function stringify(change) {
+    return JSON.stringify(change, (_, v) => typeof v === 'bigint' ? v.toString() : v);
 }
 //# sourceMappingURL=table-source.js.map