@rocicorp/zero 0.2.2024101101 → 0.3.2024102500

package/out/zql/src/zql/query/normalize-table-schema.js

@@ -0,0 +1,116 @@
+import { assert } from '../../../../shared/src/asserts.js';
+import { sortedEntries } from '../../../../shared/src/sorted-entries.js';
+import { isFieldRelationship, } from './schema.js';
+export class NormalizedTableSchema {
+    tableName;
+    primaryKey;
+    columns;
+    relationships;
+    constructor(tableSchema, tableSchemaCache) {
+        this.tableName = tableSchema.tableName;
+        const primaryKey = normalizePrimaryKey(tableSchema.primaryKey);
+        this.primaryKey = primaryKey;
+        this.columns = normalizeColumns(tableSchema.columns, primaryKey);
+        tableSchemaCache.set(tableSchema, this);
+        this.relationships = normalizeRelationships(tableSchema.relationships, tableSchemaCache);
+    }
+}
+export function normalizeTableSchema(tableSchema) {
+    return normalizeTableSchemaWithCache(tableSchema, tableSchema.tableName, new Map());
+}
+export function normalizeTableSchemaWithCache(tableSchema, expectedName, tableSchemaCache) {
+    if (tableSchema instanceof NormalizedTableSchema) {
+        return tableSchema;
+    }
+    assert(tableSchema.tableName === expectedName, `Table name mismatch: "${tableSchema.tableName}" !== "${expectedName}"`);
+    let normalizedTableSchema = tableSchemaCache.get(tableSchema);
+    if (normalizedTableSchema) {
+        return normalizedTableSchema;
+    }
+    normalizedTableSchema = new NormalizedTableSchema(tableSchema, tableSchemaCache);
+    return normalizedTableSchema;
+}
+function isSorted(arr) {
+    for (let i = 1; i < arr.length; i++) {
+        if (arr[i - 1] >= arr[i]) {
+            return false;
+        }
+    }
+    return true;
+}
+function assertNoDuplicates(arr) {
+    // arr is already sorted.
+    for (let i = 1; i < arr.length; i++) {
+        assert(arr[i - 1] !== arr[i], 'Primary key must not contain duplicates');
+    }
+}
+export function normalizePrimaryKey(arr) {
+    if (isSorted(arr)) {
+        return arr;
+    }
+    arr = [...arr].sort();
+    assertNoDuplicates(arr);
+    return arr;
+}
+function normalizeColumns(columns, primaryKey) {
+    const rv = {};
+    for (const pk of primaryKey) {
+        const schemaValue = columns[pk];
+        assert(schemaValue, `Primary key column "${pk}" not found`);
+        const { type, optional } = schemaValue;
+        assert(!optional, `Primary key column "${pk}" cannot be optional`);
+        assert(type === 'string' || type === 'number' || type === 'boolean', `Primary key column "${pk}" must be a string, number, or boolean. Got ${type}`);
+    }
+    for (const [name, column] of sortedEntries(columns)) {
+        rv[name] = normalizeSchemaValue(column);
+    }
+    return rv;
+}
+function normalizeSchemaValue(value) {
+    return {
+        type: value.type,
+        optional: value.optional ?? false,
+    };
+}
+function normalizeRelationships(relationships, tableSchemaCache) {
+    const rv = {};
+    for (const [name, relationship] of sortedEntries(relationships)) {
+        rv[name] = normalizeRelationship(relationship, tableSchemaCache);
+    }
+    return rv;
+}
+function normalizeRelationship(relationship, tableSchemaCache) {
+    if (isFieldRelationship(relationship)) {
+        return normalizeFieldRelationship(relationship, tableSchemaCache);
+    }
+    return normalizeJunctionRelationship(relationship, tableSchemaCache);
+}
+function normalizeFieldRelationship(relationship, tableSchemaCache) {
+    return {
+        source: relationship.source,
+        dest: {
+            field: relationship.dest.field,
+            schema: normalizeLazyTableSchema(relationship.dest.schema, tableSchemaCache),
+        },
+    };
+}
+function normalizeJunctionRelationship(relationship, tableSchemaCache) {
+    return {
+        source: relationship.source,
+        junction: {
+            sourceField: relationship.junction.sourceField,
+            destField: relationship.junction.destField,
+            schema: normalizeLazyTableSchema(relationship.junction.schema, tableSchemaCache),
+        },
+        dest: {
+            field: relationship.dest.field,
+            schema: normalizeLazyTableSchema(relationship.dest.schema, tableSchemaCache),
+        },
+    };
+}
+function normalizeLazyTableSchema(tableSchema, buildCache) {
+    const tableSchemaInstance = typeof tableSchema === 'function' ? tableSchema() : tableSchema;
+    return normalizeTableSchemaWithCache(tableSchemaInstance, tableSchemaInstance.tableName, // Don't care about name here.
+    buildCache);
+}
+//# sourceMappingURL=normalize-table-schema.js.map

package/out/zql/src/zql/query/normalize-table-schema.js.map

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

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

@@ -1,6 +1,7 @@
-import type { AST } from '../ast/ast.js';
+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 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';
@@ -14,10 +15,10 @@ export interface QueryDelegate extends BuilderDelegate {
 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> {
     #private;
-    constructor(schema: TSchema, ast?: AST | undefined, format?: Format | undefined);
+    constructor(schema: NormalizedTableSchema, ast?: AST | undefined, format?: Format | undefined);
     get ast(): AST;
     select<TFields extends Selector<TSchema>[]>(..._fields: TFields): Query<TSchema, AddSelections<TSchema, TFields, TReturn>>;
-    protected abstract _newQuery<TSchema extends TableSchema, TReturn extends QueryType>(schema: TSchema, ast: AST, format: Format | undefined): Query<TSchema, 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>;
@@ -35,10 +36,10 @@ export declare abstract class AbstractQuery<TSchema extends TableSchema, TReturn
 }
 export declare class QueryImpl<TSchema extends TableSchema, TReturn extends QueryType = DefaultQueryResultRow<TSchema>> extends AbstractQuery<TSchema, TReturn> {
     #private;
-    constructor(delegate: QueryDelegate, schema: TSchema, ast?: AST | undefined, format?: Format | undefined);
+    constructor(delegate: QueryDelegate, schema: NormalizedTableSchema, ast?: AST | undefined, format?: Format | undefined);
     get format(): Format;
     get singular(): TReturn['singular'];
-    protected _newQuery<TSchema extends TableSchema, TReturn extends QueryType>(schema: TSchema, ast: AST, format: Format | undefined): Query<TSchema, TReturn>;
+    protected _newQuery<TSchema extends TableSchema, TReturn extends QueryType>(schema: NormalizedTableSchema, ast: AST, format: Format | undefined): Query<TSchema, TReturn>;
     materialize(): TypedView<Smash<TReturn>>;
     preload(): {
         cleanup: () => 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

@@ -0,0 +1,263 @@
+/* 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 { 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';
+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 class AbstractQuery {
+    #ast;
+    #schema;
+    #format;
+    constructor(schema, ast, format) {
+        this.#ast = ast ?? {
+            table: schema.tableName,
+        };
+        this.#format = format ?? { singular: false, relationships: {} };
+        this.#schema = schema;
+    }
+    get ast() {
+        return this.#ast;
+    }
+    select(..._fields) {
+        // we return all columns for now so we ignore the selection set and only use it for type inference
+        return this._newQuery(this.#schema, this.#ast, this.#format);
+    }
+    one() {
+        return this._newQuery(this.#schema, {
+            ...this.#ast,
+            limit: 1,
+        }, {
+            ...this.#format,
+            singular: true,
+        });
+    }
+    related(relationship, cb = q => q) {
+        const related = this.#schema.relationships[relationship];
+        assert(related, 'Invalid relationship');
+        const related1 = related;
+        const related2 = related;
+        if (isFieldRelationship(related1)) {
+            const destSchema = related1.dest.schema;
+            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: related1.source,
+                            childField: related1.dest.field,
+                            op: '=',
+                        },
+                        subquery: addPrimaryKeysToAst(destSchema, sq.ast),
+                    },
+                ],
+            }, {
+                ...this.#format,
+                relationships: {
+                    ...this.#format.relationships,
+                    [relationship]: sq.format,
+                },
+            });
+        }
+        if (isJunctionRelationship(related2)) {
+            const destSchema = related2.dest.schema;
+            const junctionSchema = related2.junction.schema;
+            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: related2.source,
+                            childField: related2.junction.sourceField,
+                            op: '=',
+                        },
+                        subquery: {
+                            table: junctionSchema.tableName,
+                            alias: relationship,
+                            orderBy: addPrimaryKeys(junctionSchema, undefined),
+                            related: [
+                                {
+                                    correlation: {
+                                        parentField: related2.junction.destField,
+                                        childField: related2.dest.field,
+                                        op: '=',
+                                    },
+                                    hidden: true,
+                                    subquery: addPrimaryKeysToAst(destSchema, sq.ast),
+                                },
+                            ],
+                        },
+                    },
+                ],
+            }, {
+                ...this.#format,
+                relationships: {
+                    ...this.#format.relationships,
+                    [relationship]: sq.format,
+                },
+            });
+        }
+        throw new Error(`Invalid relationship ${relationship}`);
+    }
+    where(field, opOrValue, value) {
+        let op;
+        if (value === undefined) {
+            value = opOrValue;
+            op = '=';
+        }
+        else {
+            op = opOrValue;
+        }
+        return this._newQuery(this.#schema, {
+            ...this.#ast,
+            where: [
+                ...(this.#ast.where ?? []),
+                {
+                    type: 'simple',
+                    op,
+                    field: field,
+                    value,
+                },
+            ],
+        }, 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);
+    }
+    _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];
+            }
+            return {
+                ...this.#ast,
+                start: {
+                    ...this.#ast.start,
+                    row: narrowedRow,
+                },
+                orderBy: finalOrderBy,
+            };
+        }
+        return {
+            ...this.#ast,
+            orderBy: addPrimaryKeys(this.#schema, this.#ast.orderBy),
+        };
+    }
+}
+export class QueryImpl extends AbstractQuery {
+    #delegate;
+    #format;
+    constructor(delegate, schema, ast, format) {
+        super(schema, ast, format);
+        this.#format = format ?? { singular: false, relationships: {} };
+        this.#delegate = delegate;
+    }
+    get format() {
+        return this.#format;
+    }
+    get singular() {
+        return this.#format.singular;
+    }
+    _newQuery(schema, ast, format) {
+        return newQueryWithDetails(this.#delegate, schema, ast, format);
+    }
+    materialize() {
+        const ast = this._completeAst();
+        const removeServerQuery = this.#delegate.addServerQuery(ast);
+        const view = new ArrayView(buildPipeline(ast, this.#delegate, undefined), this.#format);
+        const removeCommitObserver = this.#delegate.onTransactionCommit(() => {
+            view.flush();
+        });
+        view.onDestroy = () => {
+            removeCommitObserver();
+            removeServerQuery();
+        };
+        return view;
+    }
+    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),
+    };
+}
+//# sourceMappingURL=query-impl.js.map

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

@@ -0,0 +1 @@
+{"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,4 +1,4 @@
-import type { Row } from '../ivm/data.js';
+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 { PullSchemaForRelationship, TableSchema } from './schema.js';

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/zql/src/zql/query/query.js

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

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

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

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

@@ -4,18 +4,28 @@ export type TableSchema = TableSchemaBase & {
         readonly [name: string]: Relationship;
     };
 };
+export type Supertype<TSchemas extends TableSchema[]> = {
+    tableName: TSchemas[number]['tableName'];
+    primaryKey: TSchemas[number]['primaryKey'];
+    columns: {
+        [K in keyof TSchemas[number]['columns']]: TSchemas[number]['columns'][K];
+    };
+    relationships: {
+        [K in keyof TSchemas[number]['relationships']]: TSchemas[number]['relationships'][K];
+    };
+};
 /**
  * A schema might have a relationship to itself.
  * Given we cannot reference a variable in the same statement we initialize
  * the variable, we use a function to get around this.
  */
 export type Lazy<T> = () => T;
-type Relationship = FieldRelationship<TableSchema, TableSchema> | JunctionRelationship<TableSchema, TableSchema, TableSchema>;
+export type Relationship = FieldRelationship<TableSchema, TableSchema> | JunctionRelationship<TableSchema, TableSchema, TableSchema>;
 /**
  * A relationship between two entities where
  * that relationship is defined via fields on both entities.
  */
-type FieldRelationship<TSourceSchema extends TableSchema, TDestSchema extends TableSchema> = {
+export type FieldRelationship<TSourceSchema extends TableSchema, TDestSchema extends TableSchema> = {
     source: keyof TSourceSchema['columns'];
     dest: {
         field: keyof TDestSchema['columns'];
@@ -26,7 +36,7 @@ type FieldRelationship<TSourceSchema extends TableSchema, TDestSchema extends Ta
  * A relationship between two entities where
  * that relationship is defined via a junction table.
  */
-type JunctionRelationship<TSourceSchema extends TableSchema, TJunctionSchema extends TableSchema, TDestSchema extends TableSchema> = {
+export type JunctionRelationship<TSourceSchema extends TableSchema, TJunctionSchema extends TableSchema, TDestSchema extends TableSchema> = {
     source: keyof TSourceSchema['columns'];
     junction: {
         sourceField: keyof TJunctionSchema['columns'];
@@ -49,5 +59,4 @@ export declare function isJunctionRelationship(relationship: Relationship): rela
  * relationship.
  */
 export type PullSchemaForRelationship<TSchema extends TableSchema, TRelationship extends keyof TSchema['relationships']> = TSchema['relationships'][TRelationship] extends FieldRelationship<TableSchema, infer TSchema> ? TSchema : TSchema['relationships'][TRelationship] extends JunctionRelationship<TableSchema, TableSchema, infer TSchema> ? TSchema : never;
-export {};
 //# sourceMappingURL=schema.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/query/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAEtD,MAAM,MAAM,WAAW,GAAG,eAAe,GAAG;IAC1C,QAAQ,CAAC,aAAa,EAAE;QAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;KAAC,CAAC;CACjE,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,IAAI,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC;AAE9B,KAAK,YAAY,GACb,iBAAiB,CAAC,WAAW,EAAE,WAAW,CAAC,GAC3C,oBAAoB,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;AAEhE;;;GAGG;AACH,KAAK,iBAAiB,CACpB,aAAa,SAAS,WAAW,EACjC,WAAW,SAAS,WAAW,IAC7B;IACF,MAAM,EAAE,MAAM,aAAa,CAAC,SAAS,CAAC,CAAC;IACvC,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,WAAW,CAAC,SAAS,CAAC,CAAC;QACpC,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;KACzC,CAAC;CACH,CAAC;AAEF;;;GAGG;AACH,KAAK,oBAAoB,CACvB,aAAa,SAAS,WAAW,EACjC,eAAe,SAAS,WAAW,EACnC,WAAW,SAAS,WAAW,IAC7B;IACF,MAAM,EAAE,MAAM,aAAa,CAAC,SAAS,CAAC,CAAC;IACvC,QAAQ,EAAE;QACR,WAAW,EAAE,MAAM,eAAe,CAAC,SAAS,CAAC,CAAC;QAC9C,SAAS,EAAE,MAAM,eAAe,CAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC;KAC7C,CAAC;IACF,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,WAAW,CAAC,SAAS,CAAC,CAAC;QACpC,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC;KAC7C,CAAC;CACH,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,YAAY,GACzB,YAAY,IAAI,iBAAiB,CAAC,WAAW,EAAE,WAAW,CAAC,CAU7D;AAED,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,YAAY,GACzB,YAAY,IAAI,oBAAoB,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAE7E;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,yBAAyB,CACnC,OAAO,SAAS,WAAW,EAC3B,aAAa,SAAS,MAAM,OAAO,CAAC,eAAe,CAAC,IAClD,OAAO,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC,SAAS,iBAAiB,CACnE,WAAW,EACX,MAAM,OAAO,CACd,GACG,OAAO,GACP,OAAO,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC,SAAS,oBAAoB,CAClE,WAAW,EACX,WAAW,EACX,MAAM,OAAO,CACd,GACD,OAAO,GACP,KAAK,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/query/schema.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,7 @@
+export function isFieldRelationship(relationship) {
+    return (relationship.junction === undefined);
+}
+export function isJunctionRelationship(relationship) {
+    return !isFieldRelationship(relationship);
+}
+//# sourceMappingURL=schema.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/query/schema.ts"],"names":[],"mappings":"AAgEA,MAAM,UAAU,mBAAmB,CACjC,YAA0B;IAE1B,OAAO,CAEH,YAKD,CAAC,QAAQ,KAAK,SAAS,CACzB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,YAA0B;IAE1B,OAAO,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;AAC5C,CAAC"}

package/out/zql/src/zql/query/typed-view.d.ts

@@ -1,10 +1,13 @@
 import type { Immutable } from '../../../../shared/src/immutable.js';
+/**
+ * Called when the view changes. The received data should be considered
+ * immutable. Caller must not modify it. Passed data is valid until next
+ * time listener is called.
+ */
 export type Listener<T> = (data: Immutable<T>) => void;
 export type TypedView<T> = {
     addListener(listener: Listener<T>): () => void;
     destroy(): void;
-    hydrate(): void;
-    onCommit(): void;
     readonly data: T;
 };
 //# sourceMappingURL=typed-view.d.ts.map

package/out/zql/src/zql/query/typed-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typed-view.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/query/typed-view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,qCAAqC,CAAC;AAEnE,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;AAEvD,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACzB,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,CAAC;IAC/C,OAAO,IAAI,IAAI,CAAC;IAChB,OAAO,IAAI,IAAI,CAAC;IAChB,QAAQ,IAAI,IAAI,CAAC;IACjB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;CAClB,CAAC"}
+{"version":3,"file":"typed-view.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/query/typed-view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,qCAAqC,CAAC;AAEnE;;;;GAIG;AACH,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;AAEvD,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACzB,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,CAAC;IAC/C,OAAO,IAAI,IAAI,CAAC;IAChB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;CAClB,CAAC"}

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

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

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

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

package/out/zqlite/src/db.d.ts

@@ -1,5 +1,5 @@
 import type { LogContext } from '@rocicorp/logger';
-import SQLite3Database, { type RunResult, type Statement as SQLite3Statement } from 'better-sqlite3';
+import SQLite3Database, { type RunResult, type Statement as SQLite3Statement } from 'better-sqlite3-bedrock';
 export declare class Database {
     #private;
     constructor(lc: LogContext, path: string, options?: SQLite3Database.Options, slowQueryThreshold?: number);

package/out/zqlite/src/db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../../../zqlite/src/db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,eAAe,EAAE,EACtB,KAAK,SAAS,EACd,KAAK,SAAS,IAAI,gBAAgB,EACnC,MAAM,gBAAgB,CAAC;AAExB,qBAAa,QAAQ;;gBAMjB,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,eAAe,CAAC,OAAO,EACjC,kBAAkB,SAAM;IAO1B,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS;IAQ/B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAUvB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI5B,KAAK,IAAI,IAAI;IAIb,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAI9B,IAAI,IAAI,WAEP;IAED,IAAI,aAAa,YAEhB;CACF;AAED,qBAAa,SAAS;;gBAKR,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM;IAMrE,YAAY,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAKtC,GAAG,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS;IAWpC,GAAG,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC;IAW/B,GAAG,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE;IAWjC,OAAO,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC;CAOtD"}
+{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../../../zqlite/src/db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,eAAe,EAAE,EACtB,KAAK,SAAS,EACd,KAAK,SAAS,IAAI,gBAAgB,EACnC,MAAM,wBAAwB,CAAC;AAEhC,qBAAa,QAAQ;;gBAMjB,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,eAAe,CAAC,OAAO,EACjC,kBAAkB,SAAM;IAO1B,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS;IAQ/B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAUvB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAI5B,KAAK,IAAI,IAAI;IAIb,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAI9B,IAAI,IAAI,WAEP;IAED,IAAI,aAAa,YAEhB;CACF;AAED,qBAAa,SAAS;;gBAKR,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM;IAMrE,YAAY,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAKtC,GAAG,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS;IAWpC,GAAG,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC;IAW/B,GAAG,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE;IAWjC,OAAO,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC;CAOtD"}

package/out/zqlite/src/db.js

@@ -1,4 +1,4 @@
-import SQLite3Database, {} from 'better-sqlite3';
+import SQLite3Database, {} from 'better-sqlite3-bedrock';
 export class Database {
     #db;
     #lc;