@rocicorp/zero 0.11.2025011402 → 0.11.2025011801

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

@@ -1,7 +1,7 @@
-import type { Condition, LiteralValue } from '../../../zero-protocol/src/ast.js';
-import type { PullSchemaForRelationship, TableSchema } from '../../../zero-schema/src/table-schema.js';
-import type { DefaultQueryResultRow, GetFieldTypeNoUndefined, NoJsonSelector, Operator, Query, QueryType } from './query.js';
-import { type Parameter, toStaticParam } from '../../../zero-protocol/src/ast.js';
+import { toStaticParam, type Condition, type LiteralValue, type Parameter } from '../../../zero-protocol/src/ast.js';
+import type { Schema } from '../../../zero-schema/src/builder/schema-builder.js';
+import type { Operator } from './query.js';
+import type { AvailableRelationships, DestTableName, GetFieldTypeNoUndefined, NoJsonSelector, PullTableSchema, Query } from './query.js';
 export type ParameterReference = {
     [toStaticParam](): Parameter;
 };
@@ -21,23 +21,21 @@ export type ParameterReference = {
  * const query = z.query.user.where(condition);
  * ```
  */
-export interface ExpressionFactory<TSchema extends TableSchema> {
-    (eb: ExpressionBuilder<TSchema>): Condition;
+export interface ExpressionFactory<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string> {
+    (eb: ExpressionBuilder<TSchema, TTable>): Condition;
 }
-export declare class ExpressionBuilder<TSchema extends TableSchema> {
+export declare class ExpressionBuilder<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string> {
     #private;
-    constructor(exists: (relationship: string, cb?: (query: Query<TableSchema, QueryType>) => Query<TableSchema, QueryType>) => Condition);
+    constructor(exists: (relationship: string, cb?: (query: Query<TSchema, TTable>) => Query<TSchema, any>) => Condition);
     get eb(): this;
-    cmp<TSelector extends NoJsonSelector<TSchema>, TOperator extends Operator>(field: TSelector, op: TOperator, value: GetFieldTypeNoUndefined<TSchema, TSelector, TOperator> | ParameterReference): Condition;
-    cmp<TSelector extends NoJsonSelector<TSchema>>(field: TSelector, value: GetFieldTypeNoUndefined<TSchema, TSelector, '='> | ParameterReference): Condition;
+    cmp<TSelector extends NoJsonSelector<PullTableSchema<TTable, TSchema>>, TOperator extends Operator>(field: TSelector, op: TOperator, value: GetFieldTypeNoUndefined<PullTableSchema<TTable, TSchema>, TSelector, TOperator> | ParameterReference): Condition;
+    cmp<TSelector extends NoJsonSelector<PullTableSchema<TTable, TSchema>>>(field: TSelector, value: GetFieldTypeNoUndefined<PullTableSchema<TTable, TSchema>, TSelector, '='> | ParameterReference): Condition;
     cmpLit(left: ParameterReference | LiteralValue, op: Operator, right: ParameterReference | LiteralValue): Condition;
     and: typeof and;
     or: typeof or;
     not: typeof not;
-    exists(relationship: RelationshipName<TSchema>): Condition;
-    exists<TRelationship extends RelationshipName<TSchema>>(relationship: TRelationship, cb: (query: Query<PullSchemaForRelationship<TSchema, TRelationship>, DefaultQueryResultRow<PullSchemaForRelationship<TSchema, TRelationship>>>) => Query<TableSchema, QueryType>): Condition;
+    exists<TRelationship extends AvailableRelationships<TTable, TSchema>>(relationship: TRelationship, cb?: (query: Query<TSchema, DestTableName<TTable, TSchema, TRelationship>>) => Query<TSchema, any>): Condition;
 }
-export type RelationshipName<TSchema extends TableSchema> = keyof TSchema['relationships'] & string;
 export declare function and(...conditions: (Condition | undefined)[]): Condition;
 export declare function or(...conditions: (Condition | undefined)[]): Condition;
 export declare function not(expression: Condition): Condition;

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

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

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

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { must } from '../../../shared/src/must.js';
-import { toStaticParam } from '../../../zero-protocol/src/ast.js';
+import { toStaticParam, } from '../../../zero-protocol/src/ast.js';
 export class ExpressionBuilder {
     #exists;
     constructor(exists) {

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

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

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

@@ -1,13 +1,13 @@
 import type { AST, Condition, Parameter, System } from '../../../zero-protocol/src/ast.js';
-import { type NormalizedTableSchema } from '../../../zero-schema/src/normalize-table-schema.js';
-import { type PullSchemaForRelationship, type TableSchema } from '../../../zero-schema/src/table-schema.js';
 import { type BuilderDelegate } from '../builder/builder.js';
 import type { Format, ViewFactory } from '../ivm/view.js';
-import { type ExpressionFactory, type RelationshipName } from './expression.js';
+import { type ExpressionFactory } from './expression.js';
 import type { AdvancedQuery } from './query-internal.js';
-import type { AddSubselect, DefaultQueryResultRow, GetFieldTypeNoUndefined, MakeSingular, Operator, Query, QueryType, Row, Smash } from './query.js';
+import type { GetFieldTypeNoUndefined, HumanReadable, Operator, PullRow, Query } from './query.js';
 import type { TypedView } from './typed-view.js';
-export declare function newQuery<TSchema extends TableSchema, TReturn extends QueryType = DefaultQueryResultRow<TSchema>>(delegate: QueryDelegate, tableSchema: TSchema): Query<TSchema, TReturn>;
+import type { Schema } from '../../../zero-schema/src/builder/schema-builder.js';
+type AnyQuery = Query<Schema, string, any>;
+export declare function newQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string>(delegate: QueryDelegate, schema: TSchema, table: TTable): Query<TSchema, TTable>;
 export type CommitListener = () => void;
 export type GotCallback = (got: boolean) => void;
 export interface QueryDelegate extends BuilderDelegate {
@@ -17,27 +17,27 @@ export interface QueryDelegate extends BuilderDelegate {
 }
 export declare function staticParam(anchorClass: 'authData' | 'preMutationRow', field: string | string[]): Parameter;
 export declare const SUBQ_PREFIX = "zsubq_";
-export declare abstract class AbstractQuery<TSchema extends TableSchema, TReturn extends QueryType = DefaultQueryResultRow<TSchema>> implements AdvancedQuery<TSchema, TReturn> {
+export declare abstract class AbstractQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn = PullRow<TTable, TSchema>> implements AdvancedQuery<TSchema, TTable, TReturn> {
     #private;
-    constructor(schema: NormalizedTableSchema, ast: AST, format?: Format | undefined);
+    constructor(schema: TSchema, tableName: TTable, ast: AST, format?: Format | undefined);
     get format(): Format;
     hash(): string;
     protected abstract _system: System;
-    protected abstract _newQuery<TSchema extends TableSchema, TReturn extends QueryType>(schema: NormalizedTableSchema, ast: AST, format: Format | undefined): Query<TSchema, TReturn>;
-    one(): Query<TSchema, MakeSingular<TReturn>>;
-    whereExists(relationship: RelationshipName<TSchema>): Query<TSchema, TReturn>;
-    related<TRelationship extends keyof TSchema['relationships']>(relationship: TRelationship): Query<TSchema, AddSubselect<Query<PullSchemaForRelationship<TSchema, TRelationship>, DefaultQueryResultRow<PullSchemaForRelationship<TSchema, TRelationship>>>, TReturn, TRelationship & string>>;
-    where(fieldOrExpressionFactory: string | ExpressionFactory<TSchema>, opOrValue?: Operator | GetFieldTypeNoUndefined<any, any, any> | Parameter, value?: GetFieldTypeNoUndefined<any, any, any> | Parameter): Query<TSchema, TReturn>;
-    start(row: Partial<Row<TSchema>>, opts?: {
+    protected abstract _newQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(schema: TSchema, table: TTable, ast: AST, format: Format | undefined): Query<TSchema, TTable, TReturn>;
+    one(): Query<TSchema, TTable, TReturn | undefined>;
+    whereExists(relationship: string, cb?: (q: AnyQuery) => AnyQuery): Query<TSchema, TTable, TReturn>;
+    related(relationship: string, cb?: (q: AnyQuery) => AnyQuery): AnyQuery;
+    where(fieldOrExpressionFactory: string | ExpressionFactory<TSchema, TTable>, opOrValue?: Operator | GetFieldTypeNoUndefined<any, any, any> | Parameter, value?: GetFieldTypeNoUndefined<any, any, any> | Parameter): Query<TSchema, TTable, TReturn>;
+    start(row: Partial<PullRow<TTable, TSchema>>, opts?: {
         inclusive: boolean;
-    } | undefined): Query<TSchema, TReturn>;
-    limit(limit: number): Query<TSchema, TReturn>;
-    orderBy<TSelector extends keyof TSchema['columns']>(field: TSelector, direction: 'asc' | 'desc'): Query<TSchema, TReturn>;
-    protected _exists: (relationship: string, cb?: (query: Query<TableSchema, QueryType>) => Query<TableSchema, QueryType>) => Condition;
+    } | undefined): Query<TSchema, TTable, TReturn>;
+    limit(limit: number): Query<TSchema, TTable, TReturn>;
+    orderBy<TSelector extends keyof TSchema['tables'][TTable]['columns']>(field: TSelector, direction: 'asc' | 'desc'): Query<TSchema, TTable, TReturn>;
+    protected _exists: (relationship: string, cb?: (query: AnyQuery) => AnyQuery) => Condition;
     protected _completeAst(): AST;
-    abstract materialize(): TypedView<Smash<TReturn>>;
-    abstract materialize<T>(factory: ViewFactory<TSchema, TReturn, T>): T;
-    abstract run(): Smash<TReturn>;
+    abstract materialize(): TypedView<HumanReadable<TReturn>>;
+    abstract materialize<T>(factory: ViewFactory<TSchema, TTable, TReturn, T>): T;
+    abstract run(): HumanReadable<TReturn>;
     abstract preload(): {
         cleanup: () => void;
         complete: Promise<void>;
@@ -45,18 +45,19 @@ export declare abstract class AbstractQuery<TSchema extends TableSchema, TReturn
 }
 export declare const astForTestingSymbol: unique symbol;
 export declare const completedAstSymbol: unique symbol;
-export declare class QueryImpl<TSchema extends TableSchema, TReturn extends QueryType = DefaultQueryResultRow<TSchema>> extends AbstractQuery<TSchema, TReturn> {
+export declare class QueryImpl<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn = PullRow<TTable, TSchema>> extends AbstractQuery<TSchema, TTable, TReturn> {
     #private;
-    constructor(delegate: QueryDelegate, schema: NormalizedTableSchema, ast?: AST, format?: Format | undefined);
+    constructor(delegate: QueryDelegate, schema: TSchema, tableName: TTable, ast?: AST, format?: Format | undefined);
     protected readonly _system = "client";
     get [astForTestingSymbol](): AST;
     get [completedAstSymbol](): AST;
-    protected _newQuery<TSchema extends TableSchema, TReturn extends QueryType>(schema: NormalizedTableSchema, ast: AST, format: Format | undefined): Query<TSchema, TReturn>;
-    materialize<T>(factory?: ViewFactory<TSchema, TReturn, T>): T;
-    run(): Smash<TReturn>;
+    protected _newQuery<TSchema extends Schema, TTable extends string, TReturn>(schema: TSchema, tableName: TTable, ast: AST, format: Format | undefined): Query<TSchema, TTable, TReturn>;
+    materialize<T>(factory?: ViewFactory<TSchema, TTable, TReturn, T>): T;
+    run(): HumanReadable<TReturn>;
     preload(): {
         cleanup: () => void;
         complete: Promise<void>;
     };
 }
+export {};
 //# sourceMappingURL=query-impl.d.ts.map

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

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

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

@@ -3,17 +3,16 @@
 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 { isOneHop, isTwoHop, } 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));
+export function newQuery(delegate, schema, table) {
+    return new QueryImpl(delegate, schema, table);
 }
-function newQueryWithDetails(delegate, schema, ast, format) {
-    return new QueryImpl(delegate, schema, ast, format);
+function newQueryWithDetails(delegate, schema, tableName, ast, format) {
+    return new QueryImpl(delegate, schema, tableName, ast, format);
 }
 export function staticParam(anchorClass, field) {
     return {
@@ -27,12 +26,14 @@ export const SUBQ_PREFIX = 'zsubq_';
 export class AbstractQuery {
     #ast;
     #schema;
+    #tableName;
     #format;
     #hash = '';
-    constructor(schema, ast, format) {
+    constructor(schema, tableName, ast, format) {
         this.#ast = ast;
         this.#format = format ?? { singular: false, relationships: {} };
         this.#schema = schema;
+        this.#tableName = tableName;
     }
     get format() {
         return this.#format;
@@ -46,7 +47,7 @@ export class AbstractQuery {
         return this.#hash;
     }
     one() {
-        return this._newQuery(this.#schema, {
+        return this._newQuery(this.#schema, this.#tableName, {
             ...this.#ast,
             limit: 1,
         }, {
@@ -54,32 +55,39 @@ export class AbstractQuery {
             singular: true,
         });
     }
-    whereExists(relationship, cb = q => q) {
+    whereExists(relationship, cb) {
         return this.where(({ exists }) => exists(relationship, cb));
     }
-    related(relationship, cb = q => q) {
+    related(relationship, cb) {
         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];
+        cb = cb ?? (q => q);
+        const related = this.#schema.relationships[this.#tableName][relationship];
         assert(related, 'Invalid relationship');
-        if (isFieldRelationship(related)) {
-            const { destSchema } = related;
-            const sq = cb(this._newQuery(destSchema, {
-                table: destSchema.tableName,
+        if (isOneHop(related)) {
+            const { destSchema, destField, sourceField, cardinality } = related[0];
+            const sq = cb(this._newQuery(this.#schema, destSchema, {
+                table: destSchema,
                 alias: relationship,
-            }, undefined));
-            return this._newQuery(this.#schema, {
+            }, {
+                relationships: {},
+                singular: cardinality === 'one',
+            }));
+            assert(isCompoundKey(sourceField), 'The source of a relationship must specify at last 1 field');
+            assert(isCompoundKey(destField), 'The destination of a relationship must specify at last 1 field');
+            assert(sourceField.length === destField.length, 'The source and destination of a relationship must have the same number of fields');
+            return this._newQuery(this.#schema, this.#tableName, {
                 ...this.#ast,
                 related: [
                     ...(this.#ast.related ?? []),
                     {
                         system: this._system,
                         correlation: {
-                            parentField: related.sourceField,
-                            childField: related.destField,
+                            parentField: sourceField,
+                            childField: destField,
                         },
-                        subquery: addPrimaryKeysToAst(destSchema, sq.#ast),
+                        subquery: addPrimaryKeysToAst(this.#schema.tables[destSchema], sq.#ast),
                     },
                 ],
             }, {
@@ -90,16 +98,23 @@ export class AbstractQuery {
                 },
             });
         }
-        if (isJunctionRelationship(related)) {
+        if (isTwoHop(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,
+            const sq = cb(this._newQuery(this.#schema, destSchema, {
+                table: destSchema,
                 alias: relationship,
-            }, undefined));
-            return this._newQuery(this.#schema, {
+            }, {
+                relationships: {},
+                singular: secondRelation.cardinality === 'one',
+            }));
+            assert(isCompoundKey(firstRelation.sourceField), 'Invalid relationship');
+            assert(isCompoundKey(firstRelation.destField), 'Invalid relationship');
+            assert(isCompoundKey(secondRelation.sourceField), 'Invalid relationship');
+            assert(isCompoundKey(secondRelation.destField), 'Invalid relationship');
+            return this._newQuery(this.#schema, this.#tableName, {
                 ...this.#ast,
                 related: [
                     ...(this.#ast.related ?? []),
@@ -110,9 +125,9 @@ export class AbstractQuery {
                             childField: firstRelation.destField,
                         },
                         subquery: {
-                            table: junctionSchema.tableName,
+                            table: junctionSchema,
                             alias: relationship,
-                            orderBy: addPrimaryKeys(junctionSchema, undefined),
+                            orderBy: addPrimaryKeys(this.#schema.tables[junctionSchema], undefined),
                             related: [
                                 {
                                     system: this._system,
@@ -121,7 +136,7 @@ export class AbstractQuery {
                                         childField: secondRelation.destField,
                                     },
                                     hidden: true,
-                                    subquery: addPrimaryKeysToAst(destSchema, sq.#ast),
+                                    subquery: addPrimaryKeysToAst(this.#schema.tables[destSchema], sq.#ast),
                                 },
                             ],
                         },
@@ -150,13 +165,13 @@ export class AbstractQuery {
         if (existingWhere) {
             cond = and(existingWhere, cond);
         }
-        return this._newQuery(this.#schema, {
+        return this._newQuery(this.#schema, this.#tableName, {
             ...this.#ast,
             where: dnf(cond),
         }, this.#format);
     }
     start(row, opts) {
-        return this._newQuery(this.#schema, {
+        return this._newQuery(this.#schema, this.#tableName, {
             ...this.#ast,
             start: {
                 row,
@@ -171,24 +186,26 @@ export class AbstractQuery {
         if ((limit | 0) !== limit) {
             throw new Error('Limit must be an integer');
         }
-        return this._newQuery(this.#schema, {
+        return this._newQuery(this.#schema, this.#tableName, {
             ...this.#ast,
             limit,
         }, this.#format);
     }
     orderBy(field, direction) {
-        return this._newQuery(this.#schema, {
+        return this._newQuery(this.#schema, this.#tableName, {
             ...this.#ast,
             orderBy: [...(this.#ast.orderBy ?? []), [field, direction]],
         }, this.#format);
     }
     _exists = (relationship, cb = q => q) => {
-        const related = this.#schema.relationships[relationship];
+        const related = this.#schema.relationships[this.#tableName][relationship];
         assert(related, 'Invalid relationship');
-        if (isFieldRelationship(related)) {
-            const { destSchema } = related;
-            const sq = cb(this._newQuery(destSchema, {
-                table: destSchema.tableName,
+        if (isOneHop(related)) {
+            const { destSchema, sourceField, destField } = related[0];
+            assert(isCompoundKey(sourceField), 'Invalid relationship');
+            assert(isCompoundKey(destField), 'Invalid relationship');
+            const sq = cb(this._newQuery(this.#schema, destSchema, {
+                table: destSchema,
                 alias: `${SUBQ_PREFIX}${relationship}`,
             }, undefined));
             return {
@@ -196,21 +213,25 @@ export class AbstractQuery {
                 related: {
                     system: this._system,
                     correlation: {
-                        parentField: related.sourceField,
-                        childField: related.destField,
+                        parentField: sourceField,
+                        childField: destField,
                     },
-                    subquery: addPrimaryKeysToAst(destSchema, sq.#ast),
+                    subquery: addPrimaryKeysToAst(this.#schema.tables[destSchema], sq.#ast),
                 },
                 op: 'EXISTS',
             };
         }
-        if (isJunctionRelationship(related)) {
+        if (isTwoHop(related)) {
             assert(related.length === 2, 'Invalid relationship');
             const [firstRelation, secondRelation] = related;
+            assert(isCompoundKey(firstRelation.sourceField), 'Invalid relationship');
+            assert(isCompoundKey(firstRelation.destField), 'Invalid relationship');
+            assert(isCompoundKey(secondRelation.sourceField), 'Invalid relationship');
+            assert(isCompoundKey(secondRelation.destField), 'Invalid relationship');
             const { destSchema } = secondRelation;
             const junctionSchema = firstRelation.destSchema;
-            const queryToDest = cb(this._newQuery(destSchema, {
-                table: destSchema.tableName,
+            const queryToDest = cb(this._newQuery(this.#schema, destSchema, {
+                table: destSchema,
                 alias: `${SUBQ_PREFIX}${relationship}`,
             }, undefined));
             return {
@@ -222,9 +243,9 @@ export class AbstractQuery {
                         childField: firstRelation.destField,
                     },
                     subquery: {
-                        table: junctionSchema.tableName,
+                        table: junctionSchema,
                         alias: `${SUBQ_PREFIX}${relationship}`,
-                        orderBy: addPrimaryKeys(junctionSchema, undefined),
+                        orderBy: addPrimaryKeys(this.#schema.tables[junctionSchema], undefined),
                         where: {
                             type: 'correlatedSubquery',
                             related: {
@@ -233,7 +254,7 @@ export class AbstractQuery {
                                     parentField: secondRelation.sourceField,
                                     childField: secondRelation.destField,
                                 },
-                                subquery: addPrimaryKeysToAst(destSchema, queryToDest.#ast),
+                                subquery: addPrimaryKeysToAst(this.#schema.tables[destSchema], queryToDest.#ast),
                             },
                             op: 'EXISTS',
                         },
@@ -247,7 +268,7 @@ export class AbstractQuery {
     #completedAST;
     _completeAst() {
         if (!this.#completedAST) {
-            const finalOrderBy = addPrimaryKeys(this.#schema, this.#ast.orderBy);
+            const finalOrderBy = addPrimaryKeys(this.#schema.tables[this.#tableName], this.#ast.orderBy);
             if (this.#ast.start) {
                 const { row } = this.#ast.start;
                 const narrowedRow = {};
@@ -266,7 +287,7 @@ export class AbstractQuery {
             else {
                 this.#completedAST = {
                     ...this.#ast,
-                    orderBy: addPrimaryKeys(this.#schema, this.#ast.orderBy),
+                    orderBy: addPrimaryKeys(this.#schema.tables[this.#tableName], this.#ast.orderBy),
                 };
             }
         }
@@ -278,8 +299,8 @@ export const completedAstSymbol = Symbol();
 export class QueryImpl extends AbstractQuery {
     #delegate;
     #ast;
-    constructor(delegate, schema, ast = { table: schema.tableName }, format) {
-        super(schema, ast, format);
+    constructor(delegate, schema, tableName, ast = { table: tableName }, format) {
+        super(schema, tableName, ast, format);
         this.#delegate = delegate;
         this.#ast = ast;
     }
@@ -291,8 +312,8 @@ export class QueryImpl extends AbstractQuery {
     get [completedAstSymbol]() {
         return this._completeAst();
     }
-    _newQuery(schema, ast, format) {
-        return newQueryWithDetails(this.#delegate, schema, ast, format);
+    _newQuery(schema, tableName, ast, format) {
+        return newQueryWithDetails(this.#delegate, schema, tableName, ast, format);
     }
     materialize(factory) {
         const ast = this._completeAst();
@@ -365,4 +386,7 @@ function arrayViewFactory(_query, input, format, onDestroy, onTransactionCommit,
     });
     return v;
 }
+function isCompoundKey(field) {
+    return Array.isArray(field) && field.length >= 1;
+}
 //# sourceMappingURL=query-impl.js.map

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

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

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

@@ -1,10 +1,10 @@
+import type { Schema } from '../../../zero-schema/src/builder/schema-builder.js';
 import type { Format, ViewFactory } from '../ivm/view.js';
-import type { DefaultQueryResultRow, Query, QueryType, Smash } from './query.js';
-import type { TableSchema } from '../../../zero-schema/src/table-schema.js';
+import type { HumanReadable, PullRow, Query } from './query.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;
+export interface AdvancedQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn = PullRow<TTable, TSchema>> extends Query<TSchema, TTable, TReturn> {
+    materialize(): TypedView<HumanReadable<TReturn>>;
+    materialize<T>(factory: ViewFactory<TSchema, TTable, TReturn, T>): T;
     get format(): Format;
     hash(): string;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"query-internal.d.ts","sourceRoot":"","sources":["../../../../../zql/src/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,0CAA0C,CAAC;AAC1E,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"}
+{"version":3,"file":"query-internal.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/query-internal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,oDAAoD,CAAC;AAC/E,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAC,aAAa,EAAE,OAAO,EAAE,KAAK,EAAC,MAAM,YAAY,CAAC;AAC9D,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE/C,MAAM,WAAW,aAAa,CAC5B,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAClC,SAAQ,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;IACvC,WAAW,IAAI,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,WAAW,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;IACrE,IAAI,MAAM,IAAI,MAAM,CAAC;IACrB,IAAI,IAAI,MAAM,CAAC;CAChB"}