@rocicorp/zero 0.25.0-canary.2 → 0.25.0-canary.4

package/out/zql/src/planner/planner-join.js

@@ -83,8 +83,10 @@ export class PlannerJoin {
     #output; // Set once during graph construction
     // Reset between planning attempts
     #type;
-    constructor(parent, child, parentConstraint, childConstraint, flippable, planId) {
-        this.#type = 'semi';
+    #initialType;
+    constructor(parent, child, parentConstraint, childConstraint, flippable, planId, initialType = 'semi') {
+        this.#type = initialType;
+        this.#initialType = initialType;
         this.#parent = parent;
         this.#child = child;
         this.#childConstraint = childConstraint;
@@ -185,7 +187,7 @@ export class PlannerJoin {
         }
     }
     reset() {
-        this.#type = 'semi';
+        this.#type = this.#initialType;
     }
     estimateCost(
     /**
@@ -253,7 +255,8 @@ export class PlannerJoin {
                 scanEst: parent.limit === undefined
                     ? parent.returnedRows
                     : Math.min(parent.returnedRows, parent.limit / downstreamChildSelectivity),
-                cost: parent.cost + parent.scanEst * (child.startupCost + child.scanEst),
+                cost: parent.cost +
+                    parent.scanEst * (child.startupCost + child.cost + child.scanEst),
                 returnedRows: parent.returnedRows * child.selectivity,
                 selectivity: child.selectivity * parent.selectivity,
                 limit: parent.limit,
@@ -265,7 +268,8 @@ export class PlannerJoin {
                 scanEst: parent.limit === undefined
                     ? parent.returnedRows
                     : Math.min(parent.returnedRows * child.returnedRows, parent.limit / downstreamChildSelectivity),
-                cost: child.cost + child.scanEst * (parent.startupCost + parent.scanEst),
+                cost: child.cost +
+                    child.scanEst * (parent.startupCost + parent.cost + parent.scanEst),
                 returnedRows: parent.returnedRows * child.returnedRows * child.selectivity,
                 selectivity: parent.selectivity * child.selectivity,
                 limit: parent.limit,

package/out/zql/src/planner/planner-join.js.map

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

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

@@ -0,0 +1,35 @@
+import type { SimpleOperator } from '../../../zero-protocol/src/ast.ts';
+import type { Schema } from '../../../zero-types/src/schema.ts';
+import type { ExpressionFactory, ParameterReference } from './expression.ts';
+import type { AvailableRelationships, DestTableName, ExistsOptions, GetFilterType, NoCompoundTypeSelector, PullRow, PullTableSchema, Query } from './query.ts';
+/**
+ * Function type for chaining one query to another.
+ */
+type ChainQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn1, TReturn2, TContext> = (q: Query<TSchema, TTable, TReturn1, TContext>) => Query<TSchema, TTable, TReturn2, TContext>;
+export type AnyChainQuery = ChainQuery<Schema, string, PullRow<string, Schema>, PullRow<string, Schema>, unknown>;
+/**
+ * Chained query that applies a transformation function to a parent query.
+ * This represents a query operation that builds on top of another query.
+ */
+export declare class ChainedQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext> implements Query<TSchema, TTable, TReturn, TContext> {
+    #private;
+    constructor(parent: {
+        withContext(ctx: TContext): Query<TSchema, TTable, unknown>;
+    }, chainFn: AnyChainQuery);
+    withContext(ctx: TContext): Query<TSchema, TTable, TReturn>;
+    one(): ChainedQuery<TSchema, TTable, TReturn | undefined, TContext>;
+    whereExists<TRelationship extends AvailableRelationships<TTable, TSchema>>(relationship: TRelationship, options?: ExistsOptions): ChainedQuery<TSchema, TTable, TReturn, TContext>;
+    whereExists<TRelationship extends AvailableRelationships<TTable, TSchema>>(relationship: TRelationship, cb: (q: Query<TSchema, DestTableName<TTable, TSchema, TRelationship>, TContext>) => Query<TSchema, string, TContext>, options?: ExistsOptions): ChainedQuery<TSchema, TTable, TReturn, TContext>;
+    related<TRelationship extends AvailableRelationships<TTable, TSchema>>(relationship: TRelationship): ChainedQuery<TSchema, TTable, TReturn & Record<string, unknown>, TContext>;
+    related<TRelationship extends AvailableRelationships<TTable, TSchema>, TSub extends Query<TSchema, string, unknown>>(relationship: TRelationship, cb: (q: Query<TSchema, DestTableName<TTable, TSchema, TRelationship>, TContext>) => TSub): ChainedQuery<TSchema, TTable, TReturn & Record<string, unknown>, TContext>;
+    where<TSelector extends NoCompoundTypeSelector<PullTableSchema<TTable, TSchema>>, TOperator extends SimpleOperator>(field: TSelector, op: TOperator, value: GetFilterType<PullTableSchema<TTable, TSchema>, TSelector, TOperator> | ParameterReference): ChainedQuery<TSchema, TTable, TReturn, TContext>;
+    where<TSelector extends NoCompoundTypeSelector<PullTableSchema<TTable, TSchema>>>(field: TSelector, value: GetFilterType<PullTableSchema<TTable, TSchema>, TSelector, '='> | ParameterReference): ChainedQuery<TSchema, TTable, TReturn, TContext>;
+    where(expressionFactory: ExpressionFactory<TSchema, TTable>): ChainedQuery<TSchema, TTable, TReturn, TContext>;
+    start(row: Partial<PullRow<TTable, TSchema>>, opts?: {
+        inclusive: boolean;
+    }): ChainedQuery<TSchema, TTable, TReturn, TContext>;
+    limit(limit: number): ChainedQuery<TSchema, TTable, TReturn, TContext>;
+    orderBy<TSelector extends keyof PullTableSchema<TTable, TSchema>['columns']>(field: TSelector, direction: 'asc' | 'desc'): ChainedQuery<TSchema, TTable, TReturn, TContext>;
+}
+export {};
+//# sourceMappingURL=chained-query.d.ts.map

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

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

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

@@ -0,0 +1,66 @@
+var _a;
+/**
+ * Chained query that applies a transformation function to a parent query.
+ * This represents a query operation that builds on top of another query.
+ */
+export class ChainedQuery {
+    #parent;
+    #chainFn;
+    #q;
+    constructor(parent, chainFn) {
+        this.#parent = parent;
+        this.#chainFn = chainFn;
+    }
+    withContext(ctx) {
+        if (this.#q) {
+            return this.#q;
+        }
+        // This is a chained query - get the parent query and apply the chain function
+        const parentQuery = this.#parent.withContext(ctx);
+        this.#q = this.#chainFn(parentQuery);
+        return this.#q;
+    }
+    #withChain(fn) {
+        return new _a(this, fn);
+    }
+    // Query interface methods
+    one() {
+        return this.#withChain(q => q.one());
+    }
+    whereExists(relationship, cbOrOptions, options) {
+        if (typeof cbOrOptions === 'function') {
+            return this.#withChain(q => q.whereExists(relationship, cbOrOptions, options));
+        }
+        return this.#withChain(q => q.whereExists(relationship, cbOrOptions));
+    }
+    related(relationship, cb) {
+        if (cb) {
+            return this.#withChain(q => q.related(relationship, cb));
+        }
+        return this.#withChain(q => q.related(relationship));
+    }
+    where(fieldOrExpressionFactory, opOrValue, value) {
+        if (typeof fieldOrExpressionFactory === 'function') {
+            return this.#withChain(q => q.where(fieldOrExpressionFactory));
+        }
+        if (value !== undefined) {
+            return this.#withChain(q => 
+            // Cast to bypass TypeScript's strict type checking - this proxy method needs runtime flexibility
+            q.where(fieldOrExpressionFactory, opOrValue, value));
+        }
+        return this.#withChain(q => 
+        // Cast to bypass TypeScript's strict type checking - this proxy method needs runtime flexibility
+        q.where(fieldOrExpressionFactory, opOrValue));
+    }
+    start(row, opts) {
+        return this.#withChain(q => q.start(row, opts));
+    }
+    limit(limit) {
+        return this.#withChain(q => q.limit(limit));
+    }
+    orderBy(field, direction) {
+        return this.#withChain(q => q.orderBy(field, direction));
+    }
+}
+_a = ChainedQuery;
+//# sourceMappingURL=chained-query.js.map

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

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

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

@@ -0,0 +1,51 @@
+import type { StandardSchemaV1 } from '@standard-schema/spec';
+import type { ReadonlyJSONValue } from '../../../shared/src/json.ts';
+import type { Schema } from '../../../zero-types/src/schema.ts';
+import type { Query } from './query.ts';
+export type DefineQueryOptions<Input, Output> = {
+    validator?: StandardSchemaV1<Input, Output> | undefined;
+};
+/**
+ * Function type for root query functions that take context and args.
+ */
+export type DefineQueryFunc<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext, TArgs> = (options: {
+    ctx: TContext;
+    args: TArgs;
+}) => Query<TSchema, TTable, TReturn, TContext>;
+export type NamedQueryFunction<TName extends string, TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext, TOutput extends ReadonlyJSONValue | undefined, TInput extends ReadonlyJSONValue | undefined> = ([TOutput] extends [undefined] ? (() => Query<TSchema, TTable, TReturn, TContext>) & ((args: undefined) => Query<TSchema, TTable, TReturn, TContext>) : undefined extends TOutput ? (args?: TInput) => Query<TSchema, TTable, TReturn, TContext> : (args: TInput) => Query<TSchema, TTable, TReturn, TContext>) & {
+    queryName: TName;
+};
+export type AnyNamedQueryFunction = NamedQueryFunction<string, Schema, string, any, any, ReadonlyJSONValue | undefined, ReadonlyJSONValue | undefined>;
+export declare function defineQuery<TName extends string, TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext, TArgs extends ReadonlyJSONValue | undefined>(name: TName, queryFn: DefineQueryFunc<TSchema, TTable, TReturn, TContext, TArgs>): NamedQueryFunction<TName, TSchema, TTable, TReturn, TContext, TArgs, TArgs>;
+export declare function defineQuery<TName extends string, TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext, TOutput extends ReadonlyJSONValue | undefined, TInput extends ReadonlyJSONValue | undefined = TOutput>(name: TName, options: DefineQueryOptions<TInput, TOutput>, queryFn: DefineQueryFunc<TSchema, TTable, TReturn, TContext, TOutput>): NamedQueryFunction<TName, TSchema, TTable, TReturn, TContext, TOutput, TInput>;
+export declare function defineQuery<TName extends string, TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext, TArgs extends ReadonlyJSONValue | undefined>(name: TName, options: {}, queryFn: DefineQueryFunc<TSchema, TTable, TReturn, TContext, TArgs>): NamedQueryFunction<TName, TSchema, TTable, TReturn, TContext, TArgs, TArgs>;
+/**
+ * Creates a type-safe query definition function that is parameterized by a
+ * custom context type.
+ *
+ * This utility allows you to define queries with explicit context typing,
+ * ensuring that the query function receives the correct context type. It
+ * returns a function that can be used to define named queries with schema,
+ * table, input, and output types.
+ *
+ * @typeParam TContext - The type of the context object that will be passed to
+ * the query function.
+ *
+ * @returns A function for defining named queries with the specified context
+ * type.
+ *
+ * @example
+ * ```ts
+ * const defineQuery = defineQueryWithContextType<MyContext>();
+ * const myQuery = defineQuery(
+ *   "getUser",
+ *   {validator: z.string()},
+ *   ({ctx, args}) => {
+ *     ctx satisfies MyContext;
+ *     ...
+ *   },
+ * );
+ * ```
+ */
+export declare function defineQueryWithContextType<TContext>(): <TName extends string, TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TOutput extends ReadonlyJSONValue | undefined, TInput extends ReadonlyJSONValue | undefined = TOutput>(name: TName, optionsOrQueryFn: DefineQueryOptions<TInput, TOutput> | DefineQueryFunc<TSchema, TTable, TReturn, TContext, TOutput>, queryFn?: DefineQueryFunc<TSchema, TTable, TReturn, TContext, TOutput>) => NamedQueryFunction<TName, TSchema, TTable, TReturn, TContext, TOutput, TInput>;
+//# sourceMappingURL=define-query.d.ts.map

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

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

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

@@ -0,0 +1,53 @@
+import { RootNamedQuery } from "./root-named-query.js";
+// Implementation
+export function defineQuery(name, optionsOrQueryFn, queryFn) {
+    // Handle different parameter patterns
+    let defineOptions;
+    let actualQueryFn;
+    if (typeof optionsOrQueryFn === 'function') {
+        // defineQuery(name, queryFn) - no options
+        defineOptions = undefined;
+        actualQueryFn = optionsOrQueryFn;
+    }
+    else {
+        // defineQuery(name, options, queryFn) - with options
+        defineOptions = optionsOrQueryFn;
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        actualQueryFn = queryFn;
+    }
+    const f = ((args) => new RootNamedQuery(name, actualQueryFn, args, defineOptions?.validator));
+    f.queryName = name;
+    return f;
+}
+/**
+ * Creates a type-safe query definition function that is parameterized by a
+ * custom context type.
+ *
+ * This utility allows you to define queries with explicit context typing,
+ * ensuring that the query function receives the correct context type. It
+ * returns a function that can be used to define named queries with schema,
+ * table, input, and output types.
+ *
+ * @typeParam TContext - The type of the context object that will be passed to
+ * the query function.
+ *
+ * @returns A function for defining named queries with the specified context
+ * type.
+ *
+ * @example
+ * ```ts
+ * const defineQuery = defineQueryWithContextType<MyContext>();
+ * const myQuery = defineQuery(
+ *   "getUser",
+ *   {validator: z.string()},
+ *   ({ctx, args}) => {
+ *     ctx satisfies MyContext;
+ *     ...
+ *   },
+ * );
+ * ```
+ */
+export function defineQueryWithContextType() {
+    return defineQuery;
+}
+//# sourceMappingURL=define-query.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"define-query.js","sourceRoot":"","sources":["../../../../../zql/src/query/define-query.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAmGrD,iBAAiB;AACjB,MAAM,UAAU,WAAW,CASzB,IAAW,EACX,gBAEgE,EAChE,OAAsE;IAUtE,sCAAsC;IACtC,IAAI,aAA8D,CAAC;IACnE,IAAI,aAMH,CAAC;IAEF,IAAI,OAAO,gBAAgB,KAAK,UAAU,EAAE,CAAC;QAC3C,0CAA0C;QAC1C,aAAa,GAAG,SAAS,CAAC;QAC1B,aAAa,GAAG,gBAAgB,CAAC;IACnC,CAAC;SAAM,CAAC;QACN,qDAAqD;QACrD,aAAa,GAAG,gBAAgB,CAAC;QACjC,oEAAoE;QACpE,aAAa,GAAG,OAAQ,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,CAAC,IAAa,EAAE,EAAE,CAC3B,IAAI,cAAc,CAChB,IAAI,EACJ,aAAa,EACb,IAAI,EACJ,aAAa,EAAE,SAAS,CACzB,CAQF,CAAC;IACF,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC;IACnB,OAAO,CAAC,CAAC;AACX,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,UAAU,0BAA0B;IAsBxC,OAAO,WAqBN,CAAC;AACJ,CAAC"}

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

@@ -1,20 +1,30 @@
 import type { ReadonlyJSONValue } from '../../../shared/src/json.ts';
 import type { Schema } from '../../../zero-types/src/schema.ts';
 import type { SchemaQuery } from '../mutate/custom.ts';
-import type { Query } from './query.ts';
-export type QueryFn<TContext, TTakesContext extends boolean, TArg extends ReadonlyJSONValue[], TReturnQuery extends Query<any, any, any>> = TTakesContext extends false ? {
+import type { NamedQueryFunction } from './define-query.ts';
+import { type AnyQuery } from './query.ts';
+export type QueryFn<TContext, TTakesContext extends boolean, TArg extends ReadonlyJSONValue[], TReturnQuery extends AnyQuery> = TTakesContext extends false ? {
     (...args: TArg): TReturnQuery;
 } : {
     (context: TContext, ...args: TArg): TReturnQuery;
 };
-export type SyncedQuery<TName extends string, TContext, TTakesContext extends boolean, TArg extends ReadonlyJSONValue[], TReturnQuery extends Query<any, any, any>> = QueryFn<TContext, TTakesContext, TArg, TReturnQuery> & {
+export type SyncedQuery<TName extends string, TContext, TTakesContext extends boolean, TArg extends ReadonlyJSONValue[], TReturnQuery extends AnyQuery> = QueryFn<TContext, TTakesContext, TArg, TReturnQuery> & {
     queryName: TName;
     parse: ParseFn<TArg> | undefined;
     takesContext: TTakesContext;
 };
-export declare function syncedQuery<TName extends string, TArg extends ReadonlyJSONValue[], TReturnQuery extends Query<any, any, any>>(name: TName, parser: ParseFn<TArg> | HasParseFn<TArg> | undefined, fn: QueryFn<unknown, false, TArg, TReturnQuery>): SyncedQuery<TName, unknown, false, TArg, TReturnQuery>;
-export declare function syncedQueryWithContext<TName extends string, TContext, TArg extends ReadonlyJSONValue[], TReturnQuery extends Query<any, any, any>>(name: TName, parser: ParseFn<TArg> | HasParseFn<TArg> | undefined, fn: QueryFn<TContext, true, TArg, TReturnQuery>): SyncedQuery<TName, TContext, true, TArg, TReturnQuery>;
-export declare function withValidation<T extends SyncedQuery<any, any, any, any, any>>(fn: T): T extends SyncedQuery<infer N, infer C, any, any, infer R> ? SyncedQuery<N, C, true, ReadonlyJSONValue[], R> : never;
+/**
+ * @deprecated Use {@linkcode defineQuery} instead.
+ */
+export declare function syncedQuery<TName extends string, TArg extends ReadonlyJSONValue[], TReturnQuery extends AnyQuery>(name: TName, parser: ParseFn<TArg> | HasParseFn<TArg> | undefined, fn: QueryFn<unknown, false, TArg, TReturnQuery>): SyncedQuery<TName, unknown, false, TArg, TReturnQuery>;
+/**
+ * @deprecated Use {@linkcode defineQuery} instead.
+ */
+export declare function syncedQueryWithContext<TName extends string, TContext, TArg extends ReadonlyJSONValue[], TReturnQuery extends AnyQuery>(name: TName, parser: ParseFn<TArg> | HasParseFn<TArg> | undefined, fn: QueryFn<TContext, true, TArg, TReturnQuery>): SyncedQuery<TName, TContext, true, TArg, TReturnQuery>;
+type AnySyncedQuery = SyncedQuery<any, any, any, any, any>;
+type AnyNamedQueryFunction = NamedQueryFunction<any, any, any, any, any, any, any>;
+export declare function withValidation<F extends AnySyncedQuery>(fn: F): F extends SyncedQuery<infer N, infer C, any, infer A, infer R> ? SyncedQuery<N, C, true, A, R> : never;
+export declare function withValidation<F extends AnyNamedQueryFunction>(fn: F): F;
 export type ParseFn<T extends ReadonlyJSONValue[]> = (args: unknown[]) => T;
 export type HasParseFn<T extends ReadonlyJSONValue[]> = {
     parse: ParseFn<T>;
@@ -27,5 +37,6 @@ export type CustomQueryID = {
 /**
  * Returns a set of query builders for the given schema.
  */
-export declare function createBuilder<S extends Schema>(s: S): SchemaQuery<S>;
+export declare function createBuilder<S extends Schema, TContext>(s: S): SchemaQuery<S, TContext>;
+export {};
 //# sourceMappingURL=named.d.ts.map

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

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

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

@@ -1,5 +1,7 @@
 import { QueryParseError } from "./error.js";
 import { newQuery } from "./query-impl.js";
+import { queryWithContext } from "./query-internals.js";
+import {} from "./query.js";
 function normalizeParser(parser) {
     if (parser) {
         if ('parse' in parser) {
@@ -9,16 +11,24 @@ function normalizeParser(parser) {
     }
     return undefined;
 }
+/**
+ * @deprecated Use {@linkcode defineQuery} instead.
+ */
 export function syncedQuery(name, parser, fn) {
     const impl = syncedQueryImpl(name, fn, false);
+    // oxlint-disable-next-line no-explicit-any
     const ret = (...args) => impl(undefined, args);
     ret.queryName = name;
     ret.parse = normalizeParser(parser);
     ret.takesContext = false;
     return ret;
 }
+/**
+ * @deprecated Use {@linkcode defineQuery} instead.
+ */
 export function syncedQueryWithContext(name, parser, fn) {
     const impl = syncedQueryImpl(name, fn, true);
+    // oxlint-disable-next-line no-explicit-any
     const ret = (context, ...args) => impl(context, args);
     ret.queryName = name;
     ret.parse = normalizeParser(parser);
@@ -28,29 +38,36 @@ export function syncedQueryWithContext(name, parser, fn) {
 function syncedQueryImpl(name, fn, takesContext) {
     return (context, args) => {
         const q = takesContext ? fn(context, ...args) : fn(...args);
-        return q.nameAndArgs(name, args);
+        return queryWithContext(q, context).nameAndArgs(name, args);
     };
 }
 export function withValidation(fn) {
-    if (!fn.parse) {
-        throw new Error('ret does not have a parse function defined');
-    }
-    const ret = (context, ...args) => {
-        const f = fn;
-        // oxlint-disable-next-line no-explicit-any
-        let parsed;
-        try {
-            parsed = f.parse(args);
+    // If we have a parse function this is a SyncedQuery
+    if ('parse' in fn) {
+        const { parse } = fn;
+        if (!parse) {
+            throw new Error('ret does not have a parse function defined');
         }
-        catch (error) {
-            throw new QueryParseError({ cause: error });
-        }
-        return f.takesContext ? f(context, ...parsed) : f(...parsed);
-    };
-    ret.queryName = fn.queryName;
-    ret.parse = fn.parse;
-    ret.takesContext = true;
-    return ret;
+        // oxlint-disable-next-line no-explicit-any
+        const ret = (context, ...args) => {
+            let parsed;
+            try {
+                parsed = parse(args);
+            }
+            catch (error) {
+                throw new QueryParseError({ cause: error });
+            }
+            // oxlint-disable-next-line no-explicit-any
+            return fn.takesContext ? fn(context, ...parsed) : fn(...parsed);
+        };
+        ret.queryName = fn.queryName;
+        ret.parse = fn.parse;
+        ret.takesContext = true;
+        return ret;
+    }
+    // Otherwise this is a NamedQueryFunction which always validates.
+    // oxlint-disable-next-line no-explicit-any
+    return fn;
 }
 /**
  * Returns a set of query builders for the given schema.
@@ -64,6 +81,7 @@ export function createBuilder(s) {
  */
 function makeQueryBuilders(schema) {
     return new Proxy({}, {
+        // oxlint-disable-next-line no-explicit-any
         get: (target, prop) => {
             if (prop in target) {
                 return target[prop];
@@ -71,7 +89,7 @@ function makeQueryBuilders(schema) {
             if (!(prop in schema.tables)) {
                 throw new Error(`Table ${prop} does not exist in schema`);
             }
-            const q = newQuery(undefined, schema, prop);
+            const q = newQuery(schema, prop);
             target[prop] = q;
             return q;
         },

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

@@ -1 +1 @@
-{"version":3,"file":"named.js","sourceRoot":"","sources":["../../../../../zql/src/query/named.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,eAAe,EAAC,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAC,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAwBzC,SAAS,eAAe,CACtB,MAA8C;IAE9C,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;YACtB,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,WAAW,CAKzB,IAAW,EACX,MAAoD,EACpD,EAA+C;IAE/C,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAQ,CAAC,GAAG,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC1D,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC;IACrB,GAAG,CAAC,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACpC,GAAG,CAAC,YAAY,GAAG,KAAK,CAAC;IACzB,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,sBAAsB,CAMpC,IAAW,EACX,MAAoD,EACpD,EAA+C;IAE/C,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;IAC7C,MAAM,GAAG,GAAQ,CAAC,OAAiB,EAAE,GAAG,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3E,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC;IACrB,GAAG,CAAC,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACpC,GAAG,CAAC,YAAY,GAAG,IAAI,CAAC;IACxB,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,eAAe,CAKtB,IAAW,EAAE,EAAO,EAAE,YAAqB;IAC3C,OAAO,CAAC,OAAiB,EAAE,IAAU,EAAE,EAAE;QACvC,MAAM,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;QAC5D,OAAO,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAiB,CAAC;IACnD,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,EAAK;IAIL,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,CAAC;IACD,MAAM,GAAG,GAAQ,CAAC,OAAgB,EAAE,GAAG,IAAe,EAAE,EAAE;QACxD,MAAM,CAAC,GAAG,EAAS,CAAC;QAEpB,2CAA2C;QAC3C,IAAI,MAAW,CAAC;QAChB,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,eAAe,CAAC,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;IAC/D,CAAC,CAAC;IACF,GAAG,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC;IAC7B,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC;IACrB,GAAG,CAAC,YAAY,GAAG,IAAI,CAAC;IAExB,OAAO,GAAG,CAAC;AACb,CAAC;AAeD;;GAEG;AACH,MAAM,UAAU,aAAa,CAAmB,CAAI;IAClD,OAAO,iBAAiB,CAAC,CAAC,CAAmB,CAAC;AAChD,CAAC;AAED;;;GAGG;AACH,SAAS,iBAAiB,CAAmB,MAAS;IACpD,OAAO,IAAI,KAAK,CACd,EAAE,EACF;QACE,GAAG,EAAE,CACH,MAGC,EACD,IAAY,EACZ,EAAE;YACF,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;gBACnB,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;YACtB,CAAC;YAED,IAAI,CAAC,CAAC,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC7B,MAAM,IAAI,KAAK,CAAC,SAAS,IAAI,2BAA2B,CAAC,CAAC;YAC5D,CAAC;YAED,MAAM,CAAC,GAAG,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAC5C,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,CAAC;QACX,CAAC;KACF,CACgB,CAAC;AACtB,CAAC"}
+{"version":3,"file":"named.js","sourceRoot":"","sources":["../../../../../zql/src/query/named.ts"],"names":[],"mappings":"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"}

package/out/zql/src/query/query-delegate-base.d.ts

@@ -0,0 +1,122 @@
+import type { AST } from '../../../zero-protocol/src/ast.ts';
+import type { Schema } from '../../../zero-types/src/schema.ts';
+import type { FilterInput } from '../ivm/filter-operators.ts';
+import type { Input, InputBase, Storage } from '../ivm/operator.ts';
+import type { Source, SourceInput } from '../ivm/source.ts';
+import type { ViewFactory } from '../ivm/view.ts';
+import type { MetricMap } from './metrics-delegate.ts';
+import type { CustomQueryID } from './named.ts';
+import type { CommitListener, GotCallback, QueryDelegate } from './query-delegate.ts';
+import { type QueryInternals } from './query-internals.ts';
+import type { HumanReadable, MaterializeOptions, PreloadOptions, Query, RunOptions } from './query.ts';
+import type { TTL } from './ttl.ts';
+import type { TypedView } from './typed-view.ts';
+/**
+ * Base class that provides default implementations for common QueryDelegate methods.
+ * Subclasses can override specific methods as needed.
+ */
+export declare abstract class QueryDelegateBase<TContext> implements QueryDelegate<TContext> {
+    #private;
+    constructor(context: TContext);
+    /**
+     * Default implementation that calls queryWithContext.
+     * Override if you need custom context handling.
+     */
+    withContext<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn, TContext>): QueryInternals<TSchema, TTable, TReturn, TContext>;
+    /**
+     * Default implementation that just calls applyViewUpdates synchronously.
+     * Override if you need custom batching behavior (e.g., SolidJS).
+     */
+    batchViewUpdates<T>(applyViewUpdates: () => T): T;
+    /**
+     * Default implementation returns MemoryStorage.
+     * Override if you need custom storage.
+     */
+    createStorage(): Storage;
+    /**
+     * Default implementation calls materializeImpl.
+     * Override if you need custom materialization behavior.
+     */
+    materialize<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn, TContext>, factory?: undefined, options?: MaterializeOptions): TypedView<HumanReadable<TReturn>>;
+    materialize<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, T>(query: Query<TSchema, TTable, TReturn, TContext>, factory?: ViewFactory<TSchema, TTable, TReturn, TContext, T>, options?: MaterializeOptions): T;
+    /**
+     * Materialize a query into a custom view using a provided factory function.
+     */
+    materialize<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, T>(query: Query<TSchema, TTable, TReturn, TContext>, factory?: ViewFactory<TSchema, TTable, TReturn, TContext, T>, options?: MaterializeOptions): T;
+    /**
+     * Default implementation calls runImpl.
+     * Override if you need custom query execution (e.g., TestPGQueryDelegate).
+     */
+    run<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn, TContext>, options?: RunOptions): Promise<HumanReadable<TReturn>>;
+    /**
+     * Default implementation calls preloadImpl.
+     * Override if you need custom preload behavior.
+     */
+    preload<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn, TContext>, options?: PreloadOptions): {
+        cleanup: () => void;
+        complete: Promise<void>;
+    };
+    /**
+     * Default no-op implementation for decorateSourceInput.
+     * Override if you need to wrap or instrument source inputs.
+     */
+    decorateSourceInput(input: SourceInput, _queryID: string): Input;
+    /**
+     * Default no-op implementation for decorateInput.
+     * Override if you need to wrap or instrument inputs.
+     */
+    decorateInput(input: Input, _name: string): Input;
+    /**
+     * Default no-op implementation for decorateFilterInput.
+     * Override if you need to wrap or instrument filter inputs.
+     */
+    decorateFilterInput(input: FilterInput, _name: string): FilterInput;
+    /**
+     * Default no-op implementation for addEdge.
+     * Override if you need to track graph edges (e.g., visualization).
+     */
+    addEdge(_source: InputBase, _dest: InputBase): void;
+    /**
+     * Default no-op implementation for addMetric.
+     * Override if you need to collect metrics.
+     */
+    addMetric<K extends keyof MetricMap>(_metric: K, _value: number, ..._args: MetricMap[K]): void;
+    /**
+     * Default no-op implementation.
+     * Override if you need to track server queries (e.g., ZeroContext, test delegates).
+     */
+    addServerQuery(_ast: AST, _ttl: TTL, _gotCallback?: GotCallback): () => void;
+    /**
+     * Default no-op implementation.
+     * Override if you need to track custom queries (e.g., ZeroContext, test delegates).
+     */
+    addCustomQuery(_ast: AST, _customQueryID: CustomQueryID, _ttl: TTL, _gotCallback?: GotCallback): () => void;
+    /**
+     * Default no-op implementation.
+     * Override if you need to handle query updates.
+     */
+    updateServerQuery(_ast: AST, _ttl: TTL): void;
+    /**
+     * Default no-op implementation.
+     * Override if you need to handle custom query updates.
+     */
+    updateCustomQuery(_customQueryID: CustomQueryID, _ttl: TTL): void;
+    /**
+     * Default no-op implementation.
+     * Override if you need to flush query changes.
+     */
+    flushQueryChanges(): void;
+    /**
+     * Called when a transaction commits. Override to add custom behavior.
+     * Default implementation returns a no-op cleanup function.
+     */
+    onTransactionCommit(_cb: CommitListener): () => void;
+    /**
+     * Validates run options. Override to add custom validation.
+     * Default implementation is a no-op.
+     */
+    assertValidRunOptions(_options?: RunOptions): void;
+    abstract readonly defaultQueryComplete: boolean;
+    abstract getSource(name: string): Source | undefined;
+}
+//# sourceMappingURL=query-delegate-base.d.ts.map