@rocicorp/zero 0.3.2024102600 → 0.4.2024103000

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

@@ -0,0 +1,115 @@
+export function cmp(field, opOrValue, value) {
+    let op;
+    if (value === undefined) {
+        value = opOrValue;
+        op = '=';
+    }
+    else {
+        op = opOrValue;
+    }
+    return {
+        type: 'simple',
+        field,
+        op,
+        value,
+    };
+}
+export function and(...conditions) {
+    // If any internal conditions are `or` then we distribute `or` over the `and`.
+    // This allows the graph and pipeline builder to remain simple and not have to deal with
+    // nested conditions.
+    // In other words, conditions are in [DNF](https://en.wikipedia.org/wiki/Disjunctive_normal_form).
+    const ands = conditions.flatMap(c => {
+        if (c.type === 'and') {
+            return c.conditions;
+        }
+        else if (c.type === 'simple') {
+            return [c];
+        }
+        return [];
+    });
+    const ors = conditions.filter(c => c.type === 'or');
+    if (ors.length === 0) {
+        return { type: 'and', conditions: ands };
+    }
+    const flatOrs = flatten('or', ors);
+    const flatAnds = flatten('and', ands);
+    return {
+        type: 'or',
+        conditions: flatOrs.conditions.map(part => ({
+            type: 'and',
+            conditions: [
+                ...(part.type === 'and' ? part.conditions : [part]),
+                ...flatAnds.conditions,
+            ],
+        })),
+    };
+}
+export function or(...conditions) {
+    return flatten('or', conditions);
+}
+export function not(expr) {
+    switch (expr.type) {
+        case 'and':
+            return {
+                type: 'or',
+                conditions: expr.conditions.map(not),
+            };
+        case 'or':
+            return {
+                type: 'and',
+                conditions: expr.conditions.map(not),
+            };
+        default:
+            return {
+                type: 'simple',
+                op: negateOperator(expr.op),
+                field: expr.field,
+                value: expr.value,
+            };
+    }
+}
+function flatten(type, conditions) {
+    const flattened = [];
+    for (const c of conditions) {
+        if (c.type === type) {
+            flattened.push(...c.conditions);
+        }
+        else {
+            flattened.push(c);
+        }
+    }
+    return {
+        type,
+        conditions: flattened,
+    };
+}
+function negateOperator(op) {
+    switch (op) {
+        case '=':
+            return '!=';
+        case '!=':
+            return '=';
+        case '<':
+            return '>=';
+        case '>':
+            return '<=';
+        case '>=':
+            return '<';
+        case '<=':
+            return '>';
+        case 'IN':
+            return 'NOT IN';
+        case 'NOT IN':
+            return 'IN';
+        case 'LIKE':
+            return 'NOT LIKE';
+        case 'NOT LIKE':
+            return 'LIKE';
+        case 'ILIKE':
+            return 'NOT ILIKE';
+        case 'NOT ILIKE':
+            return 'ILIKE';
+    }
+}
+//# sourceMappingURL=expression.js.map

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

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

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

@@ -1,28 +1,31 @@
 import type { AST } from '../../../../zero-protocol/src/ast.js';
 import { type BuilderDelegate } from '../builder/builder.js';
+import type { Format, ViewFactory } from '../ivm/view.js';
 import { type NormalizedTableSchema } from './normalize-table-schema.js';
+import type { AdvancedQuery } from './query-internal.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';
+import { type GenericCondition } from './expression.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;
 export interface QueryDelegate extends BuilderDelegate {
     addServerQuery(ast: AST, gotCallback?: GotCallback | undefined): () => void;
     onTransactionCommit(cb: CommitListener): () => void;
+    batchViewUpdates<T>(applyViewUpdates: () => T): T;
 }
 export declare function staticParam<TAnchor, TField extends keyof TAnchor>(anchorClass: 'authData' | 'preMutationRow', field: TField): Parameter<TAnchor, TField, TAnchor[TField]>;
-export declare abstract class AbstractQuery<TSchema extends TableSchema, TReturn extends QueryType = DefaultQueryResultRow<TSchema>> implements Query<TSchema, TReturn> {
+export declare abstract class AbstractQuery<TSchema extends TableSchema, TReturn extends QueryType = DefaultQueryResultRow<TSchema>> implements AdvancedQuery<TSchema, TReturn> {
     #private;
-    constructor(schema: NormalizedTableSchema, ast?: AST | undefined, format?: Format | undefined);
-    get ast(): AST;
+    constructor(schema: NormalizedTableSchema, ast: AST, format?: Format | undefined);
+    get format(): Format;
+    hash(): string;
     select<TFields extends Selector<TSchema>[]>(..._fields: TFields): Query<TSchema, AddSelections<TSchema, TFields, TReturn>>;
     protected abstract _newQuery<TSchema extends TableSchema, TReturn extends QueryType>(schema: NormalizedTableSchema, ast: AST, format: Format | undefined): Query<TSchema, TReturn>;
     one(): Query<TSchema, MakeSingular<TReturn>>;
     related<TRelationship extends keyof TSchema['relationships']>(relationship: TRelationship): Query<TSchema, AddSubselect<Query<PullSchemaForRelationship<TSchema, TRelationship>, DefaultQueryResultRow<PullSchemaForRelationship<TSchema, TRelationship>>>, TReturn, TRelationship & string>>;
-    where(field: any, opOrValue: Operator | GetFieldTypeNoNullOrUndefined<any, any, any> | Parameter<any, any, any>, value?: GetFieldTypeNoNullOrUndefined<any, any, any> | Parameter<any, any, any>): Query<TSchema, TReturn>;
+    where(field: string | GenericCondition<TSchema>, opOrValue?: Operator | GetFieldTypeNoNullOrUndefined<any, any, any> | Parameter<any, any, any>, value?: GetFieldTypeNoNullOrUndefined<any, any, any> | Parameter<any, any, any>): Query<TSchema, TReturn>;
     start(row: Partial<SchemaToRow<TSchema>>, opts?: {
         inclusive: boolean;
     } | undefined): Query<TSchema, TReturn>;
@@ -31,19 +34,20 @@ export declare abstract class AbstractQuery<TSchema extends TableSchema, TReturn
     protected _completeAst(): AST;
     abstract materialize(): TypedView<Smash<TReturn>>;
     abstract materialize<T>(factory: ViewFactory<TSchema, TReturn, T>): T;
+    abstract run(): Smash<TReturn>;
     abstract preload(): {
         cleanup: () => void;
         complete: Promise<void>;
     };
 }
+export declare const astForTestingSymbol: unique symbol;
 export declare class QueryImpl<TSchema extends TableSchema, TReturn extends QueryType = DefaultQueryResultRow<TSchema>> extends AbstractQuery<TSchema, TReturn> {
     #private;
-    constructor(delegate: QueryDelegate, schema: NormalizedTableSchema, ast?: AST | undefined, format?: Format | undefined);
-    get format(): Format;
-    get singular(): TReturn['singular'];
+    constructor(delegate: QueryDelegate, schema: NormalizedTableSchema, ast?: AST, format?: Format | undefined);
+    get [astForTestingSymbol](): AST;
     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: ViewFactory<TSchema, TReturn, T>): T;
+    materialize<T>(factory?: ViewFactory<TSchema, TReturn, T>): T;
+    run(): Smash<TReturn>;
     preload(): {
         cleanup: () => void;
         complete: Promise<void>;

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,10 +2,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { resolver } from '@rocicorp/resolver';
 import { assert } from '../../../../shared/src/asserts.js';
-import { assertOrderingIncludesPK, buildPipeline, } from '../builder/builder.js';
+import { hashOfAST } from '../../../../zero-protocol/src/ast-hash.js';
+import { 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';
+import { and, cmp } from './expression.js';
 export function newQuery(delegate, tableSchema) {
     return new QueryImpl(delegate, normalizeTableSchema(tableSchema));
 }
@@ -23,15 +25,22 @@ export class AbstractQuery {
     #ast;
     #schema;
     #format;
+    #hash = '';
     constructor(schema, ast, format) {
-        this.#ast = ast ?? {
-            table: schema.tableName,
-        };
+        this.#ast = ast;
         this.#format = format ?? { singular: false, relationships: {} };
         this.#schema = schema;
     }
-    get ast() {
-        return this.#ast;
+    get format() {
+        return this.#format;
+    }
+    hash() {
+        if (!this.#hash) {
+            const ast = this._completeAst();
+            const hash = hashOfAST(ast);
+            this.#hash = hash;
+        }
+        return this.#hash;
     }
     select(..._fields) {
         // we return all columns for now so we ignore the selection set and only use it for type inference
@@ -67,14 +76,14 @@ export class AbstractQuery {
                             childField: related1.dest.field,
                             op: '=',
                         },
-                        subquery: addPrimaryKeysToAst(destSchema, sq.ast),
+                        subquery: addPrimaryKeysToAst(destSchema, sq.#ast),
                     },
                 ],
             }, {
                 ...this.#format,
                 relationships: {
                     ...this.#format.relationships,
-                    [relationship]: sq.format,
+                    [relationship]: sq.#format,
                 },
             });
         }
@@ -107,7 +116,7 @@ export class AbstractQuery {
                                         op: '=',
                                     },
                                     hidden: true,
-                                    subquery: addPrimaryKeysToAst(destSchema, sq.ast),
+                                    subquery: addPrimaryKeysToAst(destSchema, sq.#ast),
                                 },
                             ],
                         },
@@ -117,32 +126,28 @@ export class AbstractQuery {
                 ...this.#format,
                 relationships: {
                     ...this.#format.relationships,
-                    [relationship]: sq.format,
+                    [relationship]: sq.#format,
                 },
             });
         }
         throw new Error(`Invalid relationship ${relationship}`);
     }
     where(field, opOrValue, value) {
-        let op;
-        if (value === undefined) {
-            value = opOrValue;
-            op = '=';
+        let cond;
+        if (opOrValue === undefined && value === undefined) {
+            assert(typeof field !== 'string', `Invalid condition: ${field}`);
+            cond = field;
         }
         else {
-            op = opOrValue;
+            cond = cmp(field, opOrValue, value);
+        }
+        const existingWhere = this.#ast.where;
+        if (existingWhere) {
+            cond = and(existingWhere, cond);
         }
         return this._newQuery(this.#schema, {
             ...this.#ast,
-            where: [
-                ...(this.#ast.where ?? []),
-                {
-                    type: 'simple',
-                    op,
-                    field: field,
-                    value,
-                },
-            ],
+            where: cond,
         }, this.#format);
     }
     start(row, opts) {
@@ -172,42 +177,47 @@ export class AbstractQuery {
             orderBy: [...(this.#ast.orderBy ?? []), [field, direction]],
         }, this.#format);
     }
+    #completedAST;
     _completeAst() {
-        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];
+        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.#ast,
-                start: {
-                    ...this.#ast.start,
-                    row: narrowedRow,
-                },
-                orderBy: finalOrderBy,
-            };
         }
-        return {
-            ...this.#ast,
-            orderBy: addPrimaryKeys(this.#schema, this.#ast.orderBy),
-        };
+        return this.#completedAST;
     }
 }
+export const astForTestingSymbol = Symbol();
 export class QueryImpl extends AbstractQuery {
     #delegate;
-    #format;
-    constructor(delegate, schema, ast, format) {
+    #ast;
+    constructor(delegate, schema, ast = { table: schema.tableName }, format) {
         super(schema, ast, format);
-        this.#format = format ?? { singular: false, relationships: {} };
         this.#delegate = delegate;
+        this.#ast = ast;
     }
-    get format() {
-        return this.#format;
-    }
-    get singular() {
-        return this.#format.singular;
+    // Not part of Query or QueryInternal interface
+    get [astForTestingSymbol]() {
+        return this.#ast;
     }
     _newQuery(schema, ast, format) {
         return newQueryWithDetails(this.#delegate, schema, ast, format);
@@ -216,21 +226,23 @@ 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 ?? arrayViewFactory)(this, input, this.#format, onDestroy, cb => {
+        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();

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-internal.d.ts

@@ -0,0 +1,11 @@
+import type { Format, ViewFactory } from '../ivm/view.js';
+import type { DefaultQueryResultRow, Query, QueryType, Smash } from './query.js';
+import type { TableSchema } from './schema.js';
+import type { TypedView } from './typed-view.js';
+export interface AdvancedQuery<TSchema extends TableSchema, TReturn extends QueryType = DefaultQueryResultRow<TSchema>> extends Query<TSchema, TReturn> {
+    materialize(): TypedView<Smash<TReturn>>;
+    materialize<T>(factory: ViewFactory<TSchema, TReturn, T>): T;
+    get format(): Format;
+    hash(): string;
+}
+//# sourceMappingURL=query-internal.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"query-internal.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/query/query-internal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAC,qBAAqB,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAC,MAAM,YAAY,CAAC;AAC/E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE/C,MAAM,WAAW,aAAa,CAC5B,OAAO,SAAS,WAAW,EAC3B,OAAO,SAAS,SAAS,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAC1D,SAAQ,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC;IAC/B,WAAW,IAAI,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACzC,WAAW,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;IAC7D,IAAI,MAAM,IAAI,MAAM,CAAC;IACrB,IAAI,IAAI,MAAM,CAAC;CAChB"}

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

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

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

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

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 { ViewFactory } from '../ivm/view.js';
+import type { GenericCondition } from './expression.js';
 import type { PullSchemaForRelationship, TableSchema } from './schema.js';
 import type { TypedView } from './typed-view.js';
 /**
@@ -112,18 +112,27 @@ export interface Query<TSchema extends TableSchema, TReturn extends QueryType =
     select<TFields extends Selector<TSchema>[]>(...columnName: Expand<TFields>): Query<TSchema, AddSelections<TSchema, TFields, TReturn>>;
     related<TRelationship extends keyof TSchema['relationships']>(relationship: TRelationship): Query<TSchema, AddSubselect<Query<PullSchemaForRelationship<TSchema, TRelationship>, DefaultQueryResultRow<PullSchemaForRelationship<TSchema, TRelationship>>>, TReturn, TRelationship & string>>;
     related<TRelationship extends keyof TSchema['relationships'], TSub extends Query<any, any>>(relationship: TRelationship, cb: (query: Query<PullSchemaForRelationship<TSchema, TRelationship>, DefaultQueryResultRow<PullSchemaForRelationship<TSchema, TRelationship>>>) => TSub): Query<TSchema, AddSubselect<TSub, TReturn, TRelationship & string>>;
-    where<TSelector extends Selector<TSchema>, TOperator extends Operator>(field: TSelector, op: TOperator, value: GetFieldTypeNoNullOrUndefined<TSchema, TSelector, TOperator>): Query<TSchema, TReturn>;
-    where<TSelector extends Selector<TSchema>>(field: TSelector, value: GetFieldTypeNoNullOrUndefined<TSchema, TSelector, '='>): Query<TSchema, TReturn>;
-    where<TSelector extends Selector<TSchema>, TOperator extends Operator, TParamAnchor, TParamField extends keyof TParamAnchor, TParamTypeBound extends GetFieldTypeNoNullOrUndefined<TSchema, TSelector, TOperator>>(field: TSelector, op: TOperator, value: Parameter<TParamAnchor, TParamField, TParamTypeBound>): Query<TSchema, TReturn>;
-    where<TSelector extends Selector<TSchema>, TParamAnchor, TParamField extends keyof TParamAnchor, TParamTypeBound extends GetFieldTypeNoNullOrUndefined<TSchema, TSelector, '='>>(field: TSelector, value: Parameter<TParamAnchor, TParamField, TParamTypeBound>): Query<TSchema, TReturn>;
+    where<TSelector extends Selector<TSchema>, TOperator extends Operator, TParamAnchor = never, TParamField extends keyof TParamAnchor = never, TParamTypeBound extends GetFieldTypeNoNullOrUndefined<TSchema, TSelector, TOperator> = never>(field: TSelector, op: TOperator, value: GetFieldTypeNoNullOrUndefined<TSchema, TSelector, TOperator> | Parameter<TParamAnchor, TParamField, TParamTypeBound>): Query<TSchema, TReturn>;
+    where<TSelector extends Selector<TSchema>, TParamAnchor = never, TParamField extends keyof TParamAnchor = never, TParamTypeBound extends GetFieldTypeNoNullOrUndefined<TSchema, TSelector, '='> = never>(field: TSelector, value: GetFieldTypeNoNullOrUndefined<TSchema, TSelector, '='> | Parameter<TParamAnchor, TParamField, TParamTypeBound>): Query<TSchema, TReturn>;
+    where(condition: GenericCondition<TSchema>): Query<TSchema, TReturn>;
     start(row: Partial<SchemaToRow<TSchema>>, opts?: {
         inclusive: boolean;
     } | undefined): Query<TSchema, TReturn>;
     limit(limit: number): Query<TSchema, TReturn>;
     orderBy<TSelector extends Selector<TSchema>>(field: TSelector, direction: 'asc' | 'desc'): Query<TSchema, TReturn>;
     one(): Query<TSchema, MakeSingular<TReturn>>;
+    /**
+     * Materialize the query. This will run the query and return a view that
+     * will update as the query updates. Incremental updates are typically very
+     * cheap.
+     */
     materialize(): TypedView<Smash<TReturn>>;
-    materialize<T>(factory: ViewFactory<TSchema, TReturn, T>): T;
+    /**
+     * Run the query one time and return the result. This should only be used
+     * when a query is indeed needed only once. If the query will be run multiple
+     * times, use `materialize()` instead, as it is far cheaper for the updates.
+     */
+    run(): Smash<TReturn>;
     preload(): {
         cleanup: () => void;
         complete: Promise<void>;

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

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

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

@@ -1,4 +1,4 @@
-import type { 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 { SchemaValue } from '../../zql/src/zql/ivm/schema.js';
 import type { Source, SourceChange, SourceInput } from '../../zql/src/zql/ivm/source.js';
@@ -27,7 +27,7 @@ export declare class TableSource implements Source {
      * algorithm for concurrent traversal of historic timelines.
      */
     setDB(db: Database): void;
-    connect(sort: Ordering, optionalFilters?: SimpleCondition[] | undefined): SourceInput;
+    connect(sort: Ordering, optionalFilters?: Condition | undefined): SourceInput;
     push(change: SourceChange): void;
     /**
      * Retrieves a row from the backing DB by its primary key, or `undefined` if such a

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":"AAGA,OAAO,KAAK,EAAC,QAAQ,EAAE,eAAe,EAAC,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAC,GAAG,EAAQ,MAAM,iCAAiC,CAAC;AAoBhE,OAAO,KAAK,EACV,WAAW,EAGZ,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EACV,MAAM,EACN,YAAY,EACZ,WAAW,EACZ,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAC,QAAQ,EAAY,MAAM,SAAS,CAAC;AAqB5C;;;;;;;;;;;;;;;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,eAAe,EAAE,GAAG,SAAS;IAqIvE,IAAI,CAAC,MAAM,EAAE,YAAY;IAmFzB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,EAAE,GAAG,GAAG,GAAG,GAAG,SAAS;CAyEjC;AAyID,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,GAAG,EAAE,MAAM;CAGxB"}
+{"version":3,"file":"table-source.d.ts","sourceRoot":"","sources":["../../../../zqlite/src/table-source.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EAET,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAC,GAAG,EAAQ,MAAM,iCAAiC,CAAC;AAqBhE,OAAO,KAAK,EACV,WAAW,EAGZ,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EACV,MAAM,EACN,YAAY,EACZ,WAAW,EACZ,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAC,QAAQ,EAAY,MAAM,SAAS,CAAC;AAqB5C;;;;;;;;;;;;;;;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;IAsI/D,IAAI,CAAC,MAAM,EAAE,YAAY;IAmFzB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,EAAE,GAAG,GAAG,GAAG,GAAG,SAAS;CAyEjC;AAyID,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,GAAG,EAAE,MAAM;CAGxB"}

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

@@ -2,7 +2,7 @@ import { assert, unreachable } from '../../shared/src/asserts.js';
 import { must } from '../../shared/src/must.js';
 import { assertOrderingIncludesPK } from '../../zql/src/zql/builder/builder.js';
 import { makeComparator, } from '../../zql/src/zql/ivm/data.js';
-import { generateWithOverlay, generateWithStart, } from '../../zql/src/zql/ivm/memory-source.js';
+import { filteredOptionalFilters, generateWithOverlay, generateWithStart, } from '../../zql/src/zql/ivm/memory-source.js';
 import { Database, Statement } from './db.js';
 import { compile, format, sql } from './internal/sql.js';
 import { StatementCache } from './internal/statement-cache.js';
@@ -80,6 +80,7 @@ export class TableSource {
         };
     }
     connect(sort, optionalFilters) {
+        const filters = filteredOptionalFilters(optionalFilters);
         const input = {
             getSchema: () => this.#getSchema(connection),
             fetch: req => this.#fetch(req, connection),
@@ -92,13 +93,13 @@ export class TableSource {
                 assert(idx !== -1, 'Connection not found');
                 this.#connections.splice(idx, 1);
             },
-            appliedFilters: true,
+            appliedFilters: filters.allApplied,
         };
         const connection = {
             input,
             output: undefined,
             sort,
-            filters: optionalFilters ?? [],
+            filters: filters.filters,
             compareRows: makeComparator(sort),
         };
         assertOrderingIncludesPK(sort, this.#primaryKey);