@rocicorp/zero 0.25.0-canary.9 → 0.25.1

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

@@ -1,16 +1,17 @@
-import { deepMerge } from "../../../shared/src/deep-merge.js";
+import { deepMerge, isPlainObject } from "../../../shared/src/deep-merge.js";
 import { must } from "../../../shared/src/must.js";
 import { getValueAtPath } from "../../../shared/src/object-traversal.js";
 import { asQueryInternals } from "./query-internals.js";
 import { validateInput } from "./validate-input.js";
-const customQueryTag = Symbol();
-const queryRegistryTag = Symbol();
+function isQuery(value) {
+  return typeof value === "function" && typeof value.queryName === "string" && typeof value.fn === "function";
+}
+const addContextToQuery = (query, context) => "query" in query ? query.query.fn({ ctx: context, args: query.args }) : query;
 function isQueryRegistry(obj) {
-  return typeof obj === "object" && obj !== null && obj[queryRegistryTag] === true;
+  return typeof obj === "object" && obj !== null && obj?.["~"] === "QueryRegistry";
 }
-const defineQueryTag = Symbol();
 function isQueryDefinition(f) {
-  return typeof f === "function" && f[defineQueryTag];
+  return typeof f === "object" && f !== null && f["~"] === "QueryDefinition";
 }
 function defineQuery(validatorOrQueryFn, queryFn) {
   let validator;
@@ -22,69 +23,54 @@ function defineQuery(validatorOrQueryFn, queryFn) {
     validator = validatorOrQueryFn;
     actualQueryFn = must(queryFn);
   }
-  const f = (options) => actualQueryFn(options);
-  f.validator = validator;
-  f[defineQueryTag] = true;
-  return f;
+  const queryDefinition = {
+    "fn": actualQueryFn,
+    "validator": validator,
+    "~": "QueryDefinition"
+  };
+  return queryDefinition;
 }
 function defineQueryWithType() {
   return defineQuery;
 }
-function createCustomQueryBuilder(queryDef, name, inputArgs, validatedArgs, hasArgs) {
-  const { validator } = queryDef;
-  const builder = (args) => {
-    if (hasArgs) {
-      throw new Error("args already set");
-    }
-    const validated = validateInput(name, args, validator, "query");
-    return createCustomQueryBuilder(
-      queryDef,
-      name,
-      args,
-      validated,
-      true
-    );
-  };
-  builder.toQuery = (ctx) => {
-    if (!hasArgs) {
-      throw new Error("args not set");
-    }
+function createQuery(name, definition) {
+  const { validator } = definition;
+  const fn = (options) => {
+    const validatedArgs = validator ? validateInput(name, options.args, validator, "query") : options.args;
     return asQueryInternals(
-      queryDef({
+      definition.fn({
         args: validatedArgs,
-        ctx
+        ctx: options.ctx
       })
     ).nameAndArgs(
       name,
       // TODO(arv): Get rid of the array?
       // Send original input args to server (not transformed output)
-      inputArgs === void 0 ? [] : [inputArgs]
+      options.args === void 0 ? [] : [options.args]
     );
   };
-  builder[customQueryTag] = true;
-  return builder;
+  const query = (args) => ({
+    args,
+    "~": "QueryRequest",
+    "query": query
+  });
+  query.queryName = name;
+  query.fn = fn;
+  query["~"] = "Query";
+  return query;
 }
 function defineQueries(defsOrBase, overrides) {
   function processDefinitions(definitions, path) {
     const result = {
-      [queryRegistryTag]: true
+      ["~"]: "QueryRegistry"
     };
     for (const [key, value] of Object.entries(definitions)) {
       path.push(key);
       const defaultName = path.join(".");
       if (isQueryDefinition(value)) {
-        result[key] = createCustomQueryBuilder(
-          value,
-          defaultName,
-          void 0,
-          void 0,
-          false
-        );
+        result[key] = createQuery(defaultName, value);
       } else {
-        result[key] = processDefinitions(
-          value,
-          path
-        );
+        result[key] = processDefinitions(value, path);
       }
       path.pop();
     }
@@ -98,32 +84,36 @@ function defineQueries(defsOrBase, overrides) {
       base = defsOrBase;
     }
     const processed = processDefinitions(overrides, []);
-    const merged = deepMerge(base, processed);
-    merged[queryRegistryTag] = true;
+    const merged = deepMerge(base, processed, isQueryLeaf);
+    merged["~"] = "QueryRegistry";
     return merged;
   }
   return processDefinitions(defsOrBase, []);
 }
+const isQueryLeaf = (value) => !isPlainObject(value) || isQuery(value);
 function defineQueriesWithType() {
   return defineQueries;
 }
 function getQuery(queries, name) {
-  return getValueAtPath(queries, name, /[.|]/);
+  const q = getValueAtPath(queries, name, /[.|]/);
+  return q;
 }
 function mustGetQuery(queries, name) {
-  const v = getQuery(queries, name);
-  if (!v) {
+  const query = getQuery(queries, name);
+  if (query === void 0) {
     throw new Error(`Query not found: ${name}`);
   }
-  return v;
+  return query;
 }
 export {
+  addContextToQuery,
+  createQuery,
   defineQueries,
   defineQueriesWithType,
   defineQuery,
-  defineQueryTag,
   defineQueryWithType,
   getQuery,
+  isQuery,
   isQueryDefinition,
   isQueryRegistry,
   mustGetQuery

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

@@ -1 +1 @@
-{"version":3,"file":"query-registry.js","sources":["../../../../../zql/src/query/query-registry.ts"],"sourcesContent":["// oxlint-disable no-explicit-any\nimport type {StandardSchemaV1} from '@standard-schema/spec';\nimport {deepMerge, type DeepMerge} from '../../../shared/src/deep-merge.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport {getValueAtPath} from '../../../shared/src/object-traversal.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {asQueryInternals} from './query-internals.ts';\nimport type {Query} from './query.ts';\nimport {validateInput} from './validate-input.ts';\n\nconst customQueryTag = Symbol();\n\n/**\n * CustomQuery is what is returned from defineQueries. It supports a builder\n * pattern where args is set before calling toQuery(context).\n *\n * const queries = defineQueries(...);\n * queries.foo.bar satisfies CustomQuery<...>\n *\n * Usage:\n *   queries.foo(args).toQuery(ctx)\n */\nexport type CustomQuery<\n  S extends Schema,\n  T extends keyof S['tables'] & string,\n  R,\n  C,\n  Args extends ReadonlyJSONValue | undefined,\n  HasArgs extends boolean = false,\n> = {\n  readonly [customQueryTag]: true;\n} & (HasArgs extends true\n  ? unknown\n  : undefined extends Args\n    ? {\n        (): CustomQuery<S, T, R, C, Args, true>;\n        (args?: Args): CustomQuery<S, T, R, C, Args, true>;\n      }\n    : {\n        (args: Args): CustomQuery<S, T, R, C, Args, true>;\n      }) &\n  (HasArgs extends true ? {toQuery(ctx: C): Query<S, T, R>} : unknown);\n\nconst queryRegistryTag = Symbol();\n\nexport function isQueryRegistry<Q extends QueryDefinitions<Schema, any>>(\n  obj: unknown,\n): obj is QueryRegistry<Q> {\n  return (\n    typeof obj === 'object' &&\n    obj !== null &&\n    (obj as any)[queryRegistryTag] === true\n  );\n}\n\ntype SchemaFromQueryDefinitions<QD extends QueryDefinitions<Schema, any>> =\n  QD extends QueryDefinitions<infer S, any> ? S : never;\n\nexport type QueryRegistry<QD extends QueryDefinitions<Schema, any>> =\n  CustomQueriesInner<QD, SchemaFromQueryDefinitions<QD>>;\n\ntype CustomQueriesInner<\n  QD extends QueryDefinitions<Schema, any>,\n  S extends Schema,\n> = {\n  readonly [K in keyof QD]: QD[K] extends QueryDefinition<\n    S,\n    infer TTable,\n    infer TReturn,\n    infer TContext,\n    infer TInput,\n    any\n  >\n    ? CustomQuery<S, TTable, TReturn, TContext, TInput>\n    : QD[K] extends QueryDefinitions<S, any>\n      ? CustomQueriesInner<QD[K], S>\n      : never;\n} & {\n  [queryRegistryTag]: true;\n};\n\nexport type ContextTypeOfQueryRegistry<CQ> =\n  CQ extends QueryRegistry<infer QD>\n    ? QD extends QueryDefinitions<Schema, infer C>\n      ? C\n      : never\n    : never;\n\nexport const defineQueryTag = Symbol();\n\ntype QueryDefinitionFunction<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TReturn,\n  TContext,\n  Args extends ReadonlyJSONValue | undefined,\n> = (options: {args: Args; ctx: TContext}) => Query<TSchema, TTable, TReturn>;\n\n/**\n * A query definition is the return type of `defineQuery()`.\n */\nexport type QueryDefinition<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TReturn,\n  TContext,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n> = QueryDefinitionFunction<TSchema, TTable, TReturn, TContext, TOutput> & {\n  [defineQueryTag]: true;\n  validator: StandardSchemaV1<TInput, TOutput> | undefined;\n};\n\nexport function isQueryDefinition<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TReturn,\n  TContext,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n>(\n  f: unknown,\n): f is QueryDefinition<TSchema, TTable, TReturn, TContext, TInput, TOutput> {\n  return typeof f === 'function' && (f as any)[defineQueryTag];\n}\n\nexport type QueryDefinitions<S extends Schema, Context> = {\n  readonly [key: string]:\n    | QueryDefinition<S, any, any, Context, any, any>\n    | QueryDefinitions<S, Context>;\n};\n\n/**\n * Defines a query to be used with {@link defineQueries}.\n *\n * The query function receives an object with `args` (the query arguments) and\n * `ctx` (the context). It should return a {@link Query} built using a builder\n * created from {@link createBuilder}.\n *\n * Note: A query defined with `defineQuery` must be passed to\n * {@link defineQueries} to be usable. The query name is derived from its\n * position in the `defineQueries` object.\n *\n * @example\n * ```ts\n * const builder = createBuilder(schema);\n *\n * const queries = defineQueries({\n *   // Simple query with no arguments\n *   allIssues: defineQuery(() => builder.issue.orderBy('created', 'desc')),\n *\n *   // Query with typed arguments\n *   issueById: defineQuery(({args}: {args: {id: string}}) =>\n *     builder.issue.where('id', args.id).one(),\n *   ),\n *\n *   // Query with validation using a Standard Schema validator (e.g., Zod)\n *   issuesByStatus: defineQuery(\n *     z.object({status: z.enum(['open', 'closed'])}),\n *     ({args}) => builder.issue.where('status', args.status),\n *   ),\n *\n *   // Query using context\n *   myIssues: defineQuery(({ctx}: {ctx: {userID: string}}) =>\n *     builder.issue.where('creatorID', ctx.userID),\n *   ),\n * });\n * ```\n *\n * @param queryFn - A function that receives `{args, ctx}` and returns a Query.\n * @returns A {@link QueryDefinition} that can be passed to {@link defineQueries}.\n *\n * @overload\n * @param validator - A Standard Schema validator for the arguments.\n * @param queryFn - A function that receives `{args, ctx}` and returns a Query.\n * @returns A {@link QueryDefinition} with validated arguments.\n */\n// Overload for no validator parameter with default inference for untyped functions\nexport function defineQuery<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TReturn,\n  TContext,\n  TArgs extends ReadonlyJSONValue | undefined,\n>(\n  queryFn: QueryDefinitionFunction<TSchema, TTable, TReturn, TContext, TArgs>,\n): QueryDefinition<TSchema, TTable, TReturn, TContext, TArgs, TArgs>;\n\n// Overload for validator parameter - Input and Output can be different\nexport function defineQuery<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TReturn,\n  TContext,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n>(\n  validator: StandardSchemaV1<TInput, TOutput>,\n  queryFn: QueryDefinitionFunction<TSchema, TTable, TReturn, TContext, TOutput>,\n): QueryDefinition<TSchema, TTable, TReturn, TContext, TInput, TOutput>;\n\n// Implementation\nexport function defineQuery<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TReturn,\n  TContext,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n>(\n  validatorOrQueryFn:\n    | StandardSchemaV1<TInput, TOutput>\n    | QueryDefinitionFunction<TSchema, TTable, TReturn, TContext, TOutput>,\n  queryFn?: QueryDefinitionFunction<\n    TSchema,\n    TTable,\n    TReturn,\n    TContext,\n    TOutput\n  >,\n): QueryDefinition<TSchema, TTable, TReturn, TContext, TInput, TOutput> {\n  // Handle different parameter patterns\n  let validator: StandardSchemaV1<TInput, TOutput> | undefined;\n  let actualQueryFn: QueryDefinitionFunction<\n    TSchema,\n    TTable,\n    TReturn,\n    TContext,\n    TOutput\n  >;\n\n  if (typeof validatorOrQueryFn === 'function') {\n    // defineQuery(queryFn) - no validator\n    validator = undefined;\n    actualQueryFn = validatorOrQueryFn;\n  } else {\n    // defineQuery(validator, queryFn) - with validator\n    validator = validatorOrQueryFn;\n    actualQueryFn = must(queryFn);\n  }\n\n  // We wrap the function to add the tag and validator and ensure we do not mutate it in place.\n  const f = (options: {args: TOutput; ctx: TContext}) => actualQueryFn(options);\n  f.validator = validator;\n  f[defineQueryTag] = true as const;\n  return f;\n}\n\n/**\n * Returns a typed version of {@link defineQuery} with the schema and context\n * types pre-specified. This enables better type inference when defining\n * queries.\n *\n * @example\n * ```ts\n * const builder = createBuilder(schema);\n *\n * // With both Schema and Context types\n * const defineAppQuery = defineQueryWithType<AppSchema, AppContext>();\n * const myQuery = defineAppQuery(({ctx}) =>\n *   builder.issue.where('userID', ctx.userID),\n * );\n *\n * // With just Context type (Schema inferred)\n * const defineAppQuery = defineQueryWithType<AppContext>();\n * ```\n *\n * @typeParam S - The Zero schema type.\n * @typeParam C - The context type passed to query functions.\n * @returns A function equivalent to {@link defineQuery} but with types\n *   pre-bound.\n */\nexport function defineQueryWithType<\n  S extends Schema,\n  C = unknown,\n>(): TypedDefineQuery<S, C>;\n\n/**\n * Returns a typed version of {@link defineQuery} with the context type\n * pre-specified.\n *\n * @typeParam C - The context type passed to query functions.\n * @returns A function equivalent to {@link defineQuery} but with the context\n *   type pre-bound.\n */\nexport function defineQueryWithType<C>(): TypedDefineQuery<Schema, C>;\n\nexport function defineQueryWithType() {\n  return defineQuery;\n}\n\n/**\n * The return type of defineQueryWithType. A function matching the\n * defineQuery overloads but with Schema and Context pre-bound.\n */\ntype TypedDefineQuery<TSchema extends Schema, TContext> = {\n  // Without validator\n  <\n    TTable extends keyof TSchema['tables'] & string,\n    TReturn,\n    TArgs extends ReadonlyJSONValue | undefined,\n  >(\n    queryFn: QueryDefinitionFunction<TSchema, TTable, TReturn, TContext, TArgs>,\n  ): QueryDefinition<TSchema, TTable, TReturn, TContext, TArgs, TArgs>;\n\n  // With validator\n  <\n    TTable extends keyof TSchema['tables'] & string,\n    TReturn,\n    TInput extends ReadonlyJSONValue | undefined,\n    TOutput extends ReadonlyJSONValue | undefined,\n  >(\n    validator: StandardSchemaV1<TInput, TOutput>,\n    queryFn: QueryDefinitionFunction<\n      TSchema,\n      TTable,\n      TReturn,\n      TContext,\n      TOutput\n    >,\n  ): QueryDefinition<TSchema, TTable, TReturn, TContext, TInput, TOutput>;\n};\n\nfunction createCustomQueryBuilder<\n  S extends Schema,\n  T extends keyof S['tables'] & string,\n  R,\n  C,\n  ArgsInput extends ReadonlyJSONValue | undefined,\n  ArgsOutput extends ReadonlyJSONValue | undefined,\n  HasArgs extends boolean,\n>(\n  queryDef: QueryDefinition<S, T, R, C, ArgsInput, ArgsOutput>,\n  name: string,\n  inputArgs: ArgsInput,\n  validatedArgs: ArgsOutput,\n  hasArgs: HasArgs,\n): CustomQuery<S, T, R, C, ArgsInput, HasArgs> {\n  const {validator} = queryDef;\n\n  // The callable function that sets args\n  const builder = (args: ArgsInput) => {\n    if (hasArgs) {\n      throw new Error('args already set');\n    }\n    const validated = validateInput(name, args, validator, 'query');\n    return createCustomQueryBuilder<S, T, R, C, ArgsInput, ArgsOutput, true>(\n      queryDef,\n      name,\n      args,\n      validated,\n      true,\n    );\n  };\n\n  // Add create method\n  builder.toQuery = (ctx: C) => {\n    if (!hasArgs) {\n      throw new Error('args not set');\n    }\n\n    return asQueryInternals(\n      queryDef({\n        args: validatedArgs,\n        ctx,\n      }),\n    ).nameAndArgs(\n      name,\n      // TODO(arv): Get rid of the array?\n      // Send original input args to server (not transformed output)\n      inputArgs === undefined\n        ? []\n        : [inputArgs as unknown as ReadonlyJSONValue],\n    );\n  };\n\n  // Add the tag\n  builder[customQueryTag] = true;\n\n  return builder as unknown as CustomQuery<S, T, R, C, ArgsInput, HasArgs>;\n}\n\n/**\n * Converts query definitions created with {@link defineQuery} into callable\n * {@link CustomQuery} objects that can be invoked with arguments and a context.\n *\n * Query definitions can be nested for organization. The resulting query names\n * are dot-separated paths (e.g., `users.byId`).\n *\n * @example\n * ```ts\n * const builder = createBuilder(schema);\n *\n * const queries = defineQueries({\n *   issues: defineQuery(() => builder.issue.orderBy('created', 'desc')),\n *   users: {\n *     byId: defineQuery(({args}: {args: {id: string}}) =>\n *       builder.user.where('id', args.id),\n *     ),\n *   },\n * });\n *\n * // Usage:\n * const q = queries.issues().toQuery(ctx);\n * const q2 = queries.users.byId({id: '123'}).toQuery(ctx);\n * ```\n *\n * @param defs - An object containing query definitions or nested objects of\n *   query definitions.\n * @returns An object with the same structure where each query definition is\n *   converted to a {@link CustomQuery}.\n */\nexport function defineQueries<QD extends QueryDefinitions<Schema, any>>(\n  defs: QD,\n): QueryRegistry<QD>;\n\n/**\n * Extends an existing query registry with additional or overriding query\n * definitions. Properties from overrides replace properties from base with\n * the same key.\n *\n * @param base - An existing query registry to extend.\n * @param overrides - New query definitions to add or override.\n * @returns A merged query registry with all queries from both base and overrides.\n */\nexport function defineQueries<\n  TBase extends QueryDefinitions<Schema, any>,\n  TOverrides extends QueryDefinitions<Schema, any>,\n>(\n  base: QueryRegistry<TBase>,\n  overrides: TOverrides,\n): QueryRegistry<DeepMerge<TBase, TOverrides>>;\n\n/**\n * Merges two query definition objects into a single query registry.\n * Properties from the second parameter replace properties from the first\n * with the same key.\n *\n * @param base - The base query definitions to start with.\n * @param overrides - Additional query definitions to merge in, overriding any\n *   existing definitions with the same key.\n * @returns A merged query registry with all queries from both parameters.\n */\nexport function defineQueries<\n  TBase extends QueryDefinitions<Schema, any>,\n  TOverrides extends QueryDefinitions<Schema, any>,\n>(\n  base: TBase,\n  overrides: TOverrides,\n): QueryRegistry<DeepMerge<TBase, TOverrides>>;\n\nexport function defineQueries<QD extends QueryDefinitions<Schema, any>>(\n  defsOrBase: QD | QueryRegistry<QD>,\n  overrides?: QueryDefinitions<Schema, unknown>,\n): QueryRegistry<any> {\n  function processDefinitions(\n    definitions: QueryDefinitions<Schema, unknown>,\n    path: string[],\n  ): Record<string | symbol, any> {\n    const result: Record<string | symbol, any> = {\n      [queryRegistryTag]: true,\n    };\n\n    for (const [key, value] of Object.entries(definitions)) {\n      path.push(key);\n      const defaultName = path.join('.');\n\n      if (isQueryDefinition(value)) {\n        result[key] = createCustomQueryBuilder(\n          value,\n          defaultName,\n          undefined,\n          undefined,\n          false,\n        );\n      } else {\n        // Nested definitions\n        result[key] = processDefinitions(\n          value as QueryDefinitions<Schema, unknown>,\n          path,\n        );\n      }\n      path.pop();\n    }\n\n    return result;\n  }\n\n  if (overrides !== undefined) {\n    // Merge base and overrides\n\n    let base: Record<string | symbol, any>;\n    if (!isQueryRegistry(defsOrBase)) {\n      base = processDefinitions(defsOrBase as QD, []);\n    } else {\n      base = defsOrBase;\n    }\n\n    const processed = processDefinitions(overrides, []);\n\n    const merged = deepMerge(base, processed) as QueryRegistry<any>;\n    merged[queryRegistryTag] = true;\n    return merged;\n  }\n\n  return processDefinitions(defsOrBase as QD, []) as QueryRegistry<QD>;\n}\n\n/**\n * Returns a typed version of {@link defineQueries} with the schema and context\n * types pre-specified. This enables better type inference when defining\n * queries.\n *\n * @example\n * ```ts\n * const builder = createBuilder(schema);\n *\n * // With both Schema and Context types\n * const defineAppQueries = defineQueriesWithType<AppSchema, AppContext>();\n * const queries = defineAppQueries({\n *   issues: defineQuery(({ctx}) => builder.issue.where('userID', ctx.userID)),\n * });\n *\n * // Extend an existing registry\n * const serverQueries = defineAppQueries(queries, {\n *   admin: defineQuery(...),  // add new query\n * });\n *\n * // With just Context type (Schema inferred)\n * const defineAppQueries = defineQueriesWithType<AppContext>();\n * ```\n *\n * @typeParam S - The Zero schema type.\n * @typeParam C - The context type passed to query functions.\n * @returns A function equivalent to {@link defineQueries} but with types\n *   pre-bound.\n */\nexport function defineQueriesWithType<\n  S extends Schema,\n  C = unknown,\n>(): TypedDefineQueries<S, C>;\n\n/**\n * Returns a typed version of {@link defineQueries} with the context type\n * pre-specified.\n *\n * @typeParam C - The context type passed to query functions.\n * @returns A function equivalent to {@link defineQueries} but with the context\n *   type pre-bound.\n */\nexport function defineQueriesWithType<C>(): TypedDefineQueries<Schema, C>;\n\nexport function defineQueriesWithType() {\n  return defineQueries;\n}\n\n/**\n * The return type of defineQueriesWithType. A function matching the\n * defineQueries overloads but with Schema and Context pre-bound.\n */\ntype TypedDefineQueries<S extends Schema, C> = {\n  <QD extends QueryDefinitions<S, C>>(defs: QD): QueryRegistry<QD>;\n  <\n    TBase extends QueryDefinitions<S, C>,\n    TOverrides extends QueryDefinitions<S, C>,\n  >(\n    base: QueryRegistry<TBase>,\n    overrides: TOverrides,\n  ): QueryRegistry<DeepMerge<TBase, TOverrides>>;\n  <\n    TBase extends QueryDefinitions<S, C>,\n    TOverrides extends QueryDefinitions<S, C>,\n  >(\n    base: TBase,\n    overrides: TOverrides,\n  ): QueryRegistry<DeepMerge<TBase, TOverrides>>;\n};\n\nexport function getQuery<S extends Schema, QD extends QueryDefinitions<S, any>>(\n  queries: QueryRegistry<QD>,\n  name: string,\n):\n  | CustomQuery<\n      S,\n      keyof S['tables'] & string,\n      unknown, // return\n      unknown, // context\n      ReadonlyJSONValue | undefined, // ArgsInput\n      false\n    >\n  | undefined {\n  return getValueAtPath(queries, name, /[.|]/) as\n    | CustomQuery<\n        S,\n        keyof S['tables'] & string,\n        unknown, // return\n        unknown, // context\n        ReadonlyJSONValue | undefined, // ArgsInput\n        false\n      >\n    | undefined;\n}\n\nexport function mustGetQuery<\n  S extends Schema,\n  QD extends QueryDefinitions<S, any>,\n>(\n  queries: QueryRegistry<QD>,\n  name: string,\n): CustomQuery<\n  S,\n  keyof S['tables'] & string,\n  unknown, // return\n  unknown, // context\n  ReadonlyJSONValue | undefined, // ArgsInput\n  false\n> {\n  const v = getQuery(queries, name);\n  if (!v) {\n    throw new Error(`Query not found: ${name}`);\n  }\n  return v;\n}\n"],"names":[],"mappings":";;;;;AAWA,MAAM,iBAAiB,OAAA;AAiCvB,MAAM,mBAAmB,OAAA;AAElB,SAAS,gBACd,KACyB;AACzB,SACE,OAAO,QAAQ,YACf,QAAQ,QACP,IAAY,gBAAgB,MAAM;AAEvC;AAmCO,MAAM,iBAAiB,OAAA;AAyBvB,SAAS,kBAQd,GAC2E;AAC3E,SAAO,OAAO,MAAM,cAAe,EAAU,cAAc;AAC7D;AA8EO,SAAS,YAQd,oBAGA,SAOsE;AAEtE,MAAI;AACJ,MAAI;AAQJ,MAAI,OAAO,uBAAuB,YAAY;AAE5C,gBAAY;AACZ,oBAAgB;AAAA,EAClB,OAAO;AAEL,gBAAY;AACZ,oBAAgB,KAAK,OAAO;AAAA,EAC9B;AAGA,QAAM,IAAI,CAAC,YAA4C,cAAc,OAAO;AAC5E,IAAE,YAAY;AACd,IAAE,cAAc,IAAI;AACpB,SAAO;AACT;AAyCO,SAAS,sBAAsB;AACpC,SAAO;AACT;AAkCA,SAAS,yBASP,UACA,MACA,WACA,eACA,SAC6C;AAC7C,QAAM,EAAC,cAAa;AAGpB,QAAM,UAAU,CAAC,SAAoB;AACnC,QAAI,SAAS;AACX,YAAM,IAAI,MAAM,kBAAkB;AAAA,IACpC;AACA,UAAM,YAAY,cAAc,MAAM,MAAM,WAAW,OAAO;AAC9D,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,EAEJ;AAGA,UAAQ,UAAU,CAAC,QAAW;AAC5B,QAAI,CAAC,SAAS;AACZ,YAAM,IAAI,MAAM,cAAc;AAAA,IAChC;AAEA,WAAO;AAAA,MACL,SAAS;AAAA,QACP,MAAM;AAAA,QACN;AAAA,MAAA,CACD;AAAA,IAAA,EACD;AAAA,MACA;AAAA;AAAA;AAAA,MAGA,cAAc,SACV,CAAA,IACA,CAAC,SAAyC;AAAA,IAAA;AAAA,EAElD;AAGA,UAAQ,cAAc,IAAI;AAE1B,SAAO;AACT;AAuEO,SAAS,cACd,YACA,WACoB;AACpB,WAAS,mBACP,aACA,MAC8B;AAC9B,UAAM,SAAuC;AAAA,MAC3C,CAAC,gBAAgB,GAAG;AAAA,IAAA;AAGtB,eAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,WAAW,GAAG;AACtD,WAAK,KAAK,GAAG;AACb,YAAM,cAAc,KAAK,KAAK,GAAG;AAEjC,UAAI,kBAAkB,KAAK,GAAG;AAC5B,eAAO,GAAG,IAAI;AAAA,UACZ;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QAAA;AAAA,MAEJ,OAAO;AAEL,eAAO,GAAG,IAAI;AAAA,UACZ;AAAA,UACA;AAAA,QAAA;AAAA,MAEJ;AACA,WAAK,IAAA;AAAA,IACP;AAEA,WAAO;AAAA,EACT;AAEA,MAAI,cAAc,QAAW;AAG3B,QAAI;AACJ,QAAI,CAAC,gBAAgB,UAAU,GAAG;AAChC,aAAO,mBAAmB,YAAkB,EAAE;AAAA,IAChD,OAAO;AACL,aAAO;AAAA,IACT;AAEA,UAAM,YAAY,mBAAmB,WAAW,EAAE;AAElD,UAAM,SAAS,UAAU,MAAM,SAAS;AACxC,WAAO,gBAAgB,IAAI;AAC3B,WAAO;AAAA,EACT;AAEA,SAAO,mBAAmB,YAAkB,EAAE;AAChD;AA8CO,SAAS,wBAAwB;AACtC,SAAO;AACT;AAwBO,SAAS,SACd,SACA,MAUY;AACZ,SAAO,eAAe,SAAS,MAAM,MAAM;AAU7C;AAEO,SAAS,aAId,SACA,MAQA;AACA,QAAM,IAAI,SAAS,SAAS,IAAI;AAChC,MAAI,CAAC,GAAG;AACN,UAAM,IAAI,MAAM,oBAAoB,IAAI,EAAE;AAAA,EAC5C;AACA,SAAO;AACT;"}
+{"version":3,"file":"query-registry.js","sources":["../../../../../zql/src/query/query-registry.ts"],"sourcesContent":["import type {StandardSchemaV1} from '@standard-schema/spec';\nimport {\n  deepMerge,\n  isPlainObject,\n  type DeepMerge,\n} from '../../../shared/src/deep-merge.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport {getValueAtPath} from '../../../shared/src/object-traversal.ts';\nimport type {\n  DefaultContext,\n  DefaultSchema,\n} from '../../../zero-types/src/default-types.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {asQueryInternals} from './query-internals.ts';\nimport type {PullRow, Query} from './query.ts';\nimport {validateInput} from './validate-input.ts';\n\n// ----------------------------------------------------------------------------\n// CustomQuery and QueryRequest types\n// ----------------------------------------------------------------------------\n\nexport type CustomQueryTypes<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TSchema extends Schema,\n  TReturn,\n  TContext,\n> = 'Query' & {\n  readonly $tableName: TTable;\n  readonly $input: TInput;\n  readonly $schema: TSchema;\n  readonly $return: TReturn;\n  readonly $context: TContext;\n};\n\n/**\n * CustomQuery is returned from defineQueries. It is a callable that captures\n * args and can be turned into a Query via {@link QueryRequest}.\n */\nexport type CustomQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined = TInput,\n  TSchema extends Schema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext = DefaultContext,\n> = {\n  readonly 'queryName': string;\n  readonly 'fn': QueryDefinitionFunction<TTable, TInput, TReturn, TContext>;\n  readonly '~': CustomQueryTypes<TTable, TInput, TSchema, TReturn, TContext>;\n} & CustomQueryCallable<TTable, TInput, TOutput, TSchema, TReturn, TContext>;\n\ntype CustomQueryCallable<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends Schema,\n  TReturn,\n  TContext,\n> = [TInput] extends [undefined]\n  ? () => QueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n  : undefined extends TInput\n    ? {\n        (): QueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>;\n        (\n          args?: TInput,\n        ): QueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>;\n      }\n    : {\n        (\n          args: TInput,\n        ): QueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>;\n      };\n\n// oxlint-disable-next-line no-explicit-any\nexport type AnyCustomQuery = CustomQuery<string, any, any, Schema, any, any>;\n\nexport function isQuery<S extends Schema>(\n  value: unknown,\n  // oxlint-disable-next-line no-explicit-any\n): value is CustomQuery<string, any, any, S, any, any> {\n  return (\n    typeof value === 'function' &&\n    typeof (value as {queryName?: unknown}).queryName === 'string' &&\n    typeof (value as {fn?: unknown}).fn === 'function'\n  );\n}\n\nexport type QueryRequestTypes<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends Schema,\n  TReturn,\n  TContext,\n> = 'QueryRequest' & {\n  readonly $tableName: TTable;\n  readonly $input: TInput;\n  readonly $output: TOutput;\n  readonly $schema: TSchema;\n  readonly $return: TReturn;\n  readonly $context: TContext;\n};\n\nexport type QueryRequest<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends Schema,\n  TReturn,\n  TContext,\n> = {\n  readonly 'query': CustomQuery<\n    TTable,\n    TInput,\n    TOutput,\n    TSchema,\n    TReturn,\n    TContext\n  >;\n  readonly 'args': TInput;\n  readonly '~': QueryRequestTypes<\n    TTable,\n    TInput,\n    TOutput,\n    TSchema,\n    TReturn,\n    TContext\n  >;\n};\n\n/**\n * A shared type that can be a query request or a query builder.\n *\n * If it is a query request, it will be converted to a {@link Query} using the context.\n * Otherwise, it will be returned as is.\n */\nexport type QueryOrQueryRequest<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends Schema,\n  TReturn,\n  TContext,\n> =\n  | QueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n  | Query<TTable, TSchema, TReturn>;\n\n/**\n * Converts a query request to a {@link Query} using the context,\n * or returns the query as is.\n *\n * @param query - The query request or query builder to convert\n * @param context - The context to use to convert the query request\n */\nexport const addContextToQuery = <\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends Schema,\n  TReturn,\n  TContext,\n>(\n  query: QueryOrQueryRequest<\n    TTable,\n    TInput,\n    TOutput,\n    TSchema,\n    TReturn,\n    TContext\n  >,\n  context: TContext,\n): Query<TTable, TSchema, TReturn> =>\n  'query' in query ? query.query.fn({ctx: context, args: query.args}) : query;\n\n// ----------------------------------------------------------------------------\n// QueryRegistry types\n// ----------------------------------------------------------------------------\n\nexport function isQueryRegistry(obj: unknown): obj is AnyQueryRegistry {\n  return (\n    typeof obj === 'object' &&\n    obj !== null &&\n    (obj as unknown as {['~']: string})?.['~'] === 'QueryRegistry'\n  );\n}\n\nexport type QueryRegistryTypes<TSchema extends Schema> = 'QueryRegistry' & {\n  readonly $schema: TSchema;\n};\n\nexport type QueryRegistry<\n  QD extends QueryDefinitions,\n  S extends Schema,\n> = ToQueryTree<QD, S> & {\n  ['~']: QueryRegistryTypes<S>;\n};\n\nexport type AnyQueryRegistry = {\n  ['~']: QueryRegistryTypes<Schema>;\n  [key: string]: unknown;\n};\n\ntype ToQueryTree<QD extends QueryDefinitions, S extends Schema> = {\n  readonly [K in keyof QD]: QD[K] extends AnyQueryDefinition\n    ? // pull types from the phantom property\n      CustomQuery<\n        QD[K]['~']['$tableName'],\n        QD[K]['~']['$input'],\n        QD[K]['~']['$output'],\n        S,\n        QD[K]['~']['$return'],\n        QD[K]['~']['$context']\n      >\n    : QD[K] extends QueryDefinitions\n      ? ToQueryTree<QD[K], S>\n      : never;\n};\n\nexport type FromQueryTree<QD extends QueryDefinitions, S extends Schema> = {\n  readonly [K in keyof QD]: QD[K] extends AnyQueryDefinition\n    ? CustomQuery<\n        QD[K]['~']['$tableName'],\n        // intentionally left as generic to avoid variance issues\n        ReadonlyJSONValue | undefined,\n        ReadonlyJSONValue | undefined,\n        S,\n        QD[K]['~']['$return'],\n        QD[K]['~']['$context']\n      >\n    : QD[K] extends QueryDefinitions\n      ? FromQueryTree<QD[K], S>\n      : never;\n}[keyof QD];\n\nexport type QueryDefinitions = {\n  readonly [key: string]: AnyQueryDefinition | QueryDefinitions;\n};\n\n// ----------------------------------------------------------------------------\n// defineQuery\n// ----------------------------------------------------------------------------\n\nexport type QueryDefinitionTypes<\n  TTable extends string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput,\n  TReturn,\n  TContext,\n> = 'QueryDefinition' & {\n  readonly $tableName: TTable;\n  readonly $input: TInput;\n  readonly $output: TOutput;\n  readonly $return: TReturn;\n  readonly $context: TContext;\n};\n\n/**\n * A query definition is the return type of `defineQuery()`.\n */\nexport type QueryDefinition<\n  TTable extends string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TReturn,\n  TContext = DefaultContext,\n> = {\n  readonly 'fn': QueryDefinitionFunction<TTable, TOutput, TReturn, TContext>;\n  readonly 'validator': StandardSchemaV1<TInput, TOutput> | undefined;\n  readonly '~': QueryDefinitionTypes<\n    TTable,\n    TInput,\n    TOutput,\n    TReturn,\n    TContext\n  >;\n};\n\n// oxlint-disable-next-line no-explicit-any\nexport type AnyQueryDefinition = QueryDefinition<any, any, any, any, any>;\n\nexport function isQueryDefinition(f: unknown): f is AnyQueryDefinition {\n  return (\n    typeof f === 'object' &&\n    f !== null &&\n    (f as {['~']?: unknown})['~'] === 'QueryDefinition'\n  );\n}\n\nexport type QueryDefinitionFunction<\n  TTable extends string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TReturn,\n  TContext,\n> = (options: {args: TInput; ctx: TContext}) => Query<TTable, Schema, TReturn>;\n\n/**\n * Defines a query to be used with {@link defineQueries}.\n *\n * The query function receives an object with `args` (the query arguments) and\n * `ctx` (the context). It should return a {@link Query} built using a builder\n * created from {@link createBuilder}.\n *\n * Note: A query defined with `defineQuery` must be passed to\n * {@link defineQueries} to be usable. The query name is derived from its\n * position in the `defineQueries` object.\n *\n * @example\n * ```ts\n * const builder = createBuilder(schema);\n *\n * const queries = defineQueries({\n *   // Simple query with no arguments\n *   allIssues: defineQuery(() => builder.issue.orderBy('created', 'desc')),\n *\n *   // Query with typed arguments\n *   issueById: defineQuery(({args}: {args: {id: string}}) =>\n *     builder.issue.where('id', args.id).one(),\n *   ),\n *\n *   // Query with validation using a Standard Schema validator (e.g., Zod)\n *   issuesByStatus: defineQuery(\n *     z.object({status: z.enum(['open', 'closed'])}),\n *     ({args}) => builder.issue.where('status', args.status),\n *   ),\n *\n *   // Query using context\n *   myIssues: defineQuery(({ctx}: {ctx: {userID: string}}) =>\n *     builder.issue.where('creatorID', ctx.userID),\n *   ),\n * });\n * ```\n *\n * @param queryFn - A function that receives `{args, ctx}` and returns a Query.\n * @returns A {@link QueryDefinition} that can be passed to {@link defineQueries}.\n *\n * @overload\n * @param validator - A Standard Schema validator for the arguments.\n * @param queryFn - A function that receives `{args, ctx}` and returns a Query.\n * @returns A {@link QueryDefinition} with validated arguments.\n */\n// Overload for no validator parameter with default inference for untyped functions\nexport function defineQuery<\n  TInput extends ReadonlyJSONValue | undefined,\n  TContext = DefaultContext,\n  TSchema extends Schema = DefaultSchema,\n  TTable extends keyof TSchema['tables'] & string = keyof TSchema['tables'] &\n    string,\n  TReturn = PullRow<TTable, TSchema>,\n>(\n  queryFn: QueryDefinitionFunction<TTable, TInput, TReturn, TContext>,\n): QueryDefinition<TTable, TInput, TInput, TReturn, TContext>;\n\n// Overload for validator parameter - Input and Output can be different\nexport function defineQuery<\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TContext = DefaultContext,\n  TSchema extends Schema = DefaultSchema,\n  TTable extends keyof TSchema['tables'] & string = keyof TSchema['tables'] &\n    string,\n  TReturn = PullRow<TTable, TSchema>,\n>(\n  validator: StandardSchemaV1<TInput, TOutput>,\n  queryFn: QueryDefinitionFunction<TTable, TOutput, TReturn, TContext>,\n): QueryDefinition<TTable, TInput, TOutput, TReturn, TContext>;\n\n// Implementation\nexport function defineQuery<\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TContext = DefaultContext,\n  TSchema extends Schema = DefaultSchema,\n  TTable extends keyof TSchema['tables'] & string = keyof TSchema['tables'] &\n    string,\n  TReturn = PullRow<TTable, TSchema>,\n>(\n  validatorOrQueryFn:\n    | StandardSchemaV1<TInput, TOutput>\n    | QueryDefinitionFunction<TTable, TOutput, TReturn, TContext>,\n  queryFn?: QueryDefinitionFunction<TTable, TOutput, TReturn, TContext>,\n): QueryDefinition<TTable, TInput, TOutput, TReturn, TContext> {\n  // Handle different parameter patterns\n  let validator: StandardSchemaV1<TInput, TOutput> | undefined;\n  let actualQueryFn: QueryDefinitionFunction<\n    TTable,\n    TOutput,\n    TReturn,\n    TContext\n  >;\n\n  if (typeof validatorOrQueryFn === 'function') {\n    // defineQuery(queryFn) - no validator\n    validator = undefined;\n    actualQueryFn = validatorOrQueryFn;\n  } else {\n    // defineQuery(validator, queryFn) - with validator\n    validator = validatorOrQueryFn;\n    actualQueryFn = must(queryFn);\n  }\n\n  const queryDefinition: QueryDefinition<\n    TTable,\n    TInput,\n    TOutput,\n    TReturn,\n    TContext\n  > = {\n    'fn': actualQueryFn,\n    'validator': validator,\n    '~': 'QueryDefinition' as unknown as QueryDefinitionTypes<\n      TTable,\n      TInput,\n      TOutput,\n      TReturn,\n      TContext\n    >,\n  };\n  return queryDefinition;\n}\n\n/**\n * Returns a typed version of {@link defineQuery} with the schema and context\n * types pre-specified. This enables better type inference when defining\n * queries.\n *\n * @example\n * ```ts\n * const zql = createBuilder(schema);\n *\n * // With both Schema and Context types\n * const defineAppQuery = defineQueryWithType<AppSchema, AppContext>();\n * const myQuery = defineAppQuery(({ctx}) =>\n *   zql.issue.where('userID', ctx.userID),\n * );\n *\n * // With just Context type (Schema inferred)\n * const defineAppQuery = defineQueryWithType<AppContext>();\n * ```\n *\n * @typeParam S - The Zero schema type.\n * @typeParam C - The context type passed to query functions.\n * @returns A function equivalent to {@link defineQuery} but with types\n *   pre-bound.\n */\nexport function defineQueryWithType<\n  S extends Schema,\n  C = unknown,\n>(): TypedDefineQuery<S, C>;\n\n/**\n * Returns a typed version of {@link defineQuery} with the context type\n * pre-specified.\n *\n * @typeParam C - The context type passed to query functions.\n * @returns A function equivalent to {@link defineQuery} but with the context\n *   type pre-bound.\n */\nexport function defineQueryWithType<C>(): TypedDefineQuery<Schema, C>;\n\nexport function defineQueryWithType() {\n  return defineQuery;\n}\n\n/**\n * The return type of defineQueryWithType. A function matching the\n * defineQuery overloads but with Schema and Context pre-bound.\n */\ntype TypedDefineQuery<TSchema extends Schema, TContext> = {\n  // Without validator\n  <\n    TArgs extends ReadonlyJSONValue | undefined,\n    TReturn,\n    TTable extends keyof TSchema['tables'] & string = keyof TSchema['tables'] &\n      string,\n  >(\n    queryFn: QueryDefinitionFunction<TTable, TArgs, TReturn, TContext>,\n  ): QueryDefinition<TTable, TArgs, TArgs, TReturn, TContext>;\n\n  // With validator\n  <\n    TInput extends ReadonlyJSONValue | undefined,\n    TOutput extends ReadonlyJSONValue | undefined,\n    TReturn,\n    TTable extends keyof TSchema['tables'] & string = keyof TSchema['tables'] &\n      string,\n  >(\n    validator: StandardSchemaV1<TInput, TOutput>,\n    queryFn: QueryDefinitionFunction<TTable, TOutput, TReturn, TContext>,\n  ): QueryDefinition<TTable, TInput, TOutput, TReturn, TContext>;\n};\n\n// ----------------------------------------------------------------------------\n// createQuery\n// ----------------------------------------------------------------------------\n\nexport function createQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends Schema,\n  TReturn,\n  TContext,\n>(\n  name: string,\n  definition: QueryDefinition<TTable, TInput, TOutput, TReturn, TContext>,\n): CustomQuery<TTable, TInput, TOutput, TSchema, TReturn, TContext> {\n  const {validator} = definition;\n\n  const fn: QueryDefinitionFunction<\n    TTable,\n    TInput,\n    TReturn,\n    TContext\n  > = options => {\n    const validatedArgs = validator\n      ? validateInput(name, options.args, validator, 'query')\n      : (options.args as unknown as TOutput);\n\n    return asQueryInternals(\n      definition.fn({\n        args: validatedArgs,\n        ctx: options.ctx,\n      }),\n    ).nameAndArgs(\n      name,\n      // TODO(arv): Get rid of the array?\n      // Send original input args to server (not transformed output)\n      options.args === undefined ? [] : [options.args],\n    );\n  };\n\n  const query = (\n    args: TInput,\n  ): QueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext> => ({\n    args,\n    '~': 'QueryRequest' as QueryRequestTypes<\n      TTable,\n      TInput,\n      TOutput,\n      TSchema,\n      TReturn,\n      TContext\n    >,\n    'query': query as unknown as CustomQuery<\n      TTable,\n      TInput,\n      TOutput,\n      TSchema,\n      TReturn,\n      TContext\n    >,\n  });\n\n  query.queryName = name;\n  query.fn = fn;\n  query['~'] = 'Query' as CustomQueryTypes<\n    TTable,\n    TInput,\n    TSchema,\n    TReturn,\n    TContext\n  >;\n\n  return query as unknown as CustomQuery<\n    TTable,\n    TInput,\n    TOutput,\n    TSchema,\n    TReturn,\n    TContext\n  >;\n}\n\n// ----------------------------------------------------------------------------\n// defineQueries\n// ----------------------------------------------------------------------------\n\n/**\n * Converts query definitions created with {@link defineQuery} into callable\n * {@link Query} objects that can be invoked with arguments and a context.\n *\n * Query definitions can be nested for organization. The resulting query names\n * are dot-separated paths (e.g., `users.byId`).\n *\n * @example\n * ```ts\n * const builder = createBuilder(schema);\n *\n * const queries = defineQueries({\n *   issues: defineQuery(() => builder.issue.orderBy('created', 'desc')),\n *   users: {\n *     byId: defineQuery(({args}: {args: {id: string}}) =>\n *       builder.user.where('id', args.id),\n *     ),\n *   },\n * });\n *\n * // Usage:\n * const request = queries.issues.byId({id: '123'});\n * const [data] = zero.useQuery(request);\n * ```\n *\n * @param defs - An object containing query definitions or nested objects of\n *   query definitions.\n * @returns An object with the same structure where each query definition is\n *   converted to a {@link CustomQuery}.\n */\nexport function defineQueries<\n  // let QD infer freely so defaults aren't erased by a QueryDefinitions<any, any> constraint\n  const QD,\n  S extends Schema = DefaultSchema,\n>(\n  defs: QD & AssertQueryDefinitions<QD>,\n): QueryRegistry<EnsureQueryDefinitions<QD>, S>;\n\nexport function defineQueries<\n  const TBase,\n  const TOverrides,\n  S extends Schema = DefaultSchema,\n>(\n  base:\n    | QueryRegistry<EnsureQueryDefinitions<TBase>, S>\n    | (TBase & AssertQueryDefinitions<TBase>),\n  overrides: TOverrides & AssertQueryDefinitions<TOverrides>,\n): QueryRegistry<\n  DeepMerge<\n    EnsureQueryDefinitions<TBase>,\n    EnsureQueryDefinitions<TOverrides>,\n    AnyQueryDefinition\n  >,\n  S\n>;\n\nexport function defineQueries<QD extends QueryDefinitions, S extends Schema>(\n  defsOrBase: QD | QueryRegistry<QD, S>,\n  overrides?: QueryDefinitions,\n): QueryRegistry<QD, S> {\n  function processDefinitions(\n    definitions: QueryDefinitions,\n    path: string[],\n  ): Record<string | symbol, unknown> {\n    const result: Record<string | symbol, unknown> = {\n      ['~']: 'QueryRegistry',\n    };\n\n    for (const [key, value] of Object.entries(definitions)) {\n      path.push(key);\n      const defaultName = path.join('.');\n\n      if (isQueryDefinition(value)) {\n        result[key] = createQuery(defaultName, value);\n      } else {\n        // Nested definitions\n        result[key] = processDefinitions(value, path);\n      }\n      path.pop();\n    }\n\n    return result;\n  }\n\n  if (overrides !== undefined) {\n    // Merge base and overrides\n\n    let base: Record<string | symbol, unknown>;\n    if (!isQueryRegistry(defsOrBase)) {\n      base = processDefinitions(defsOrBase, []);\n    } else {\n      base = defsOrBase;\n    }\n\n    const processed = processDefinitions(overrides, []);\n\n    const merged = deepMerge(base, processed, isQueryLeaf);\n    merged['~'] = 'QueryRegistry';\n    return merged as QueryRegistry<QD, S>;\n  }\n\n  return processDefinitions(defsOrBase as QD, []) as QueryRegistry<QD, S>;\n}\n\nconst isQueryLeaf = (value: unknown): boolean =>\n  !isPlainObject(value) || isQuery(value);\n\nexport type AssertQueryDefinitions<QD> = QD extends QueryDefinitions\n  ? unknown\n  : never;\n\nexport type EnsureQueryDefinitions<QD> = QD extends QueryDefinitions\n  ? QD\n  : QD extends QueryRegistry<infer InnerQD, infer _S>\n    ? InnerQD\n    : never;\n\n/**\n * Creates a function that can be used to define queries with a specific schema.\n */\nexport function defineQueriesWithType<\n  TSchema extends Schema,\n>(): TypedDefineQueries<TSchema> {\n  return defineQueries;\n}\n\n/**\n * The return type of defineQueriesWithType. A function matching the\n * defineQueries overloads but with Schema pre-bound.\n */\ntype TypedDefineQueries<S extends Schema> = {\n  // Single definitions\n  <QD>(\n    definitions: QD & AssertQueryDefinitions<QD>,\n  ): QueryRegistry<EnsureQueryDefinitions<QD>, S>;\n\n  // Base and overrides\n  <TBase, TOverrides>(\n    base:\n      | QueryRegistry<EnsureQueryDefinitions<TBase>, S>\n      | (TBase & AssertQueryDefinitions<TBase>),\n    overrides: TOverrides & AssertQueryDefinitions<TOverrides>,\n  ): QueryRegistry<\n    DeepMerge<\n      EnsureQueryDefinitions<TBase>,\n      EnsureQueryDefinitions<TOverrides>,\n      AnyQueryDefinition\n    >,\n    S\n  >;\n};\n\n// ----------------------------------------------------------------------------\n// getQuery / mustGetQuery\n// ----------------------------------------------------------------------------\n\nexport function getQuery<QD extends QueryDefinitions, S extends Schema>(\n  queries: QueryRegistry<QD, S>,\n  name: string,\n): FromQueryTree<QD, S> | undefined {\n  const q = getValueAtPath(queries, name, /[.|]/);\n  return q as FromQueryTree<QD, S> | undefined;\n}\n\nexport function mustGetQuery<QD extends QueryDefinitions, S extends Schema>(\n  queries: QueryRegistry<QD, S>,\n  name: string,\n): FromQueryTree<QD, S> {\n  const query = getQuery(queries, name);\n  if (query === undefined) {\n    throw new Error(`Query not found: ${name}`);\n  }\n  return query;\n}\n"],"names":[],"mappings":"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"}

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

@@ -1,9 +1,12 @@
 import type { Expand, ExpandRecursive } from '../../../shared/src/expand.ts';
 import { type SimpleOperator } from '../../../zero-protocol/src/ast.ts';
+import type { DefaultSchema } from '../../../zero-types/src/default-types.ts';
 import type { SchemaValueToTSType, SchemaValueWithCustomType } from '../../../zero-types/src/schema-value.ts';
 import type { LastInTuple, Schema, TableSchema, Schema as ZeroSchema } from '../../../zero-types/src/schema.ts';
+import type { ViewFactory } from '../ivm/view.ts';
 import type { ExpressionFactory, ParameterReference } from './expression.ts';
 import type { TTL } from './ttl.ts';
+import type { TypedView } from './typed-view.ts';
 type Selector<E extends TableSchema> = keyof E['columns'];
 export type NoCompoundTypeSelector<T extends TableSchema> = Exclude<Selector<T>, JsonSelectors<T> | ArraySelectors<T>>;
 type JsonSelectors<E extends TableSchema> = {
@@ -15,7 +18,7 @@ type ArraySelectors<E extends TableSchema> = {
     [K in keyof E['columns']]: E['columns'][K] extends SchemaValueWithCustomType<any[]> ? K : never;
 }[keyof E['columns']];
 export type QueryReturn<Q> = Q extends Query<any, any, infer R> ? R : never;
-export type QueryTable<Q> = Q extends Query<any, infer T, any> ? T : never;
+export type QueryTable<Q> = Q extends Query<infer T, any, any> ? T : never;
 export type ExistsOptions = {
     flip: boolean;
 };
@@ -27,16 +30,35 @@ type DestRow<TTable extends string, TSchema extends ZeroSchema, TRelationship ex
 type AddSubreturn<TExistingReturn, TSubselectReturn, TAs extends string> = {
     readonly [K in TAs]: undefined extends TSubselectReturn ? TSubselectReturn : readonly TSubselectReturn[];
 } extends infer TNewRelationship ? undefined extends TExistingReturn ? (Exclude<TExistingReturn, undefined> & TNewRelationship) | undefined : TExistingReturn & TNewRelationship : never;
-export type PullTableSchema<TTable extends string, TSchemas extends ZeroSchema> = TSchemas['tables'][TTable];
-export type PullRow<TTable extends string, TSchema extends ZeroSchema> = {
+export type PullTableSchema<TTable extends keyof ZeroSchema['tables'] & string, TSchemas extends ZeroSchema> = TSchemas['tables'][TTable];
+export type PullRow<TTable extends keyof ZeroSchema['tables'] & string, TSchema extends ZeroSchema = DefaultSchema> = {
     readonly [K in keyof PullTableSchema<TTable, TSchema>['columns']]: SchemaValueToTSType<PullTableSchema<TTable, TSchema>['columns'][K]>;
 } & {};
-export type Row<T extends TableSchema | Query<ZeroSchema, string, any> | ((...args: any) => Query<ZeroSchema, string, any>)> = T extends TableSchema ? {
+type RowNamespace<S extends Schema | TypeError> = S extends Schema ? {
+    readonly [K in keyof S['tables'] & string]: S['tables'][K] extends TableSchema ? Row<S['tables'][K]> : {
+        error: `The table schema for table ${K & string} you have registered with \`declare module '@rocicorp/zero'\` is incorrect.`;
+        registeredTableSchema: S['tables'][K];
+    };
+} : S;
+export type Row<T extends Schema | TableSchema | AnyQueryLike = DefaultSchema> = T extends Schema ? RowNamespace<T> : T extends TableSchema ? {
     readonly [K in keyof T['columns']]: SchemaValueToTSType<T['columns'][K]>;
-} : T extends Query<ZeroSchema, string, any> | ((...args: any) => Query<ZeroSchema, string, any>) ? QueryRowType<T> : never;
-export type QueryRowType<Q> = Q extends (...args: any) => Query<any, any, infer R> ? R : Q extends Query<any, any, infer R> ? R : never;
-export type ZeRow<Q> = QueryRowType<Q>;
-export type QueryResultType<Q> = Q extends Query<ZeroSchema, string, any> | ((...args: any) => Query<ZeroSchema, string, any>) ? HumanReadable<QueryRowType<Q>> : never;
+} : T extends AnyQueryLike ? QueryRowType<T> : never;
+/**
+ * The shape of a CustomQuery's phantom type property.
+ * CustomQuery has '~' containing CustomQueryTypes which extends 'Query' & {...}
+ */
+type CustomQueryPhantom = {
+    readonly '~': {
+        readonly $return: unknown;
+    };
+};
+/**
+ * A Query, CustomQuery, or a function returning either.
+ */
+export type AnyQueryLike = Query<string, ZeroSchema, any> | ((...args: any) => Query<string, ZeroSchema, any>) | CustomQueryPhantom;
+export type QueryRowType<Q extends AnyQueryLike> = Q extends (...args: any) => Query<any, any, infer R> ? R : Q extends Query<any, any, infer R> ? R : Q extends CustomQueryPhantom ? Q['~']['$return'] : never;
+export type ZeRow<Q extends AnyQueryLike> = QueryRowType<Q>;
+export type QueryResultType<Q extends AnyQueryLike> = Q extends Query<string, ZeroSchema, any> | ((...args: any) => Query<string, ZeroSchema, any>) ? HumanReadable<QueryRowType<Q>> : Q extends CustomQueryPhantom ? HumanReadable<Q['~']['$return']> : never;
 /**
  * A hybrid query that runs on both client and server.
  * Results are returned immediately from the client followed by authoritative
@@ -63,24 +85,43 @@ export type QueryResultType<Q> = Q extends Query<ZeroSchema, string, any> | ((..
  * For more information on how to use queries, see the documentation:
  * https://zero.rocicorp.dev/docs/reading-data
  *
- * @typeParam TSchema The database schema type extending ZeroSchema
  * @typeParam TTable The name of the table being queried, must be a key of TSchema['tables']
+ * @typeParam TSchema The database schema type extending ZeroSchema
  * @typeParam TReturn The return type of the query, defaults to PullRow<TTable, TSchema>
  */
-export interface Query<TSchema extends ZeroSchema, TTable extends keyof TSchema['tables'] & string, TReturn = PullRow<TTable, TSchema>> extends ToQuery<TSchema, TTable, TReturn, unknown> {
-    related<TRelationship extends AvailableRelationships<TTable, TSchema>>(relationship: TRelationship): Query<TSchema, TTable, AddSubreturn<TReturn, DestRow<TTable, TSchema, TRelationship>, TRelationship>>;
-    related<TRelationship extends AvailableRelationships<TTable, TSchema>, TSub extends Query<TSchema, string, any>>(relationship: TRelationship, cb: (q: Query<TSchema, DestTableName<TTable, TSchema, TRelationship>, DestRow<TTable, TSchema, TRelationship>>) => TSub): Query<TSchema, TTable, AddSubreturn<TReturn, TSub extends Query<TSchema, string, infer TSubReturn> ? TSubReturn : never, TRelationship>>;
-    where<TSelector extends NoCompoundTypeSelector<PullTableSchema<TTable, TSchema>>, TOperator extends SimpleOperator>(field: TSelector, op: TOperator, value: GetFilterType<PullTableSchema<TTable, TSchema>, TSelector, TOperator> | ParameterReference): Query<TSchema, TTable, TReturn>;
-    where<TSelector extends NoCompoundTypeSelector<PullTableSchema<TTable, TSchema>>>(field: TSelector, value: GetFilterType<PullTableSchema<TTable, TSchema>, TSelector, '='> | ParameterReference): Query<TSchema, TTable, TReturn>;
-    where(expressionFactory: ExpressionFactory<TSchema, TTable>): Query<TSchema, TTable, TReturn>;
-    whereExists(relationship: AvailableRelationships<TTable, TSchema>, options?: ExistsOptions): Query<TSchema, TTable, TReturn>;
-    whereExists<TRelationship extends AvailableRelationships<TTable, TSchema>>(relationship: TRelationship, cb: (q: Query<TSchema, DestTableName<TTable, TSchema, TRelationship>>) => Query<TSchema, string>, options?: ExistsOptions): Query<TSchema, TTable, TReturn>;
+export interface Query<TTable extends keyof TSchema['tables'] & string, TSchema extends ZeroSchema = DefaultSchema, TReturn = PullRow<TTable, TSchema>> {
+    related<TRelationship extends AvailableRelationships<TTable, TSchema>>(relationship: TRelationship): Query<TTable, TSchema, AddSubreturn<TReturn, DestRow<TTable, TSchema, TRelationship>, TRelationship>>;
+    related<TRelationship extends AvailableRelationships<TTable, TSchema>, TSub extends Query<string, TSchema, any>>(relationship: TRelationship, cb: (q: Query<DestTableName<TTable, TSchema, TRelationship>, TSchema, DestRow<TTable, TSchema, TRelationship>>) => TSub): Query<TTable, TSchema, AddSubreturn<TReturn, TSub extends Query<string, TSchema, infer TSubReturn> ? TSubReturn : never, TRelationship>>;
+    where<TSelector extends NoCompoundTypeSelector<PullTableSchema<TTable, TSchema>>, TOperator extends SimpleOperator>(field: TSelector, op: TOperator, value: GetFilterType<PullTableSchema<TTable, TSchema>, TSelector, TOperator> | ParameterReference): Query<TTable, TSchema, TReturn>;
+    where<TSelector extends NoCompoundTypeSelector<PullTableSchema<TTable, TSchema>>>(field: TSelector, value: GetFilterType<PullTableSchema<TTable, TSchema>, TSelector, '='> | ParameterReference): Query<TTable, TSchema, TReturn>;
+    where(expressionFactory: ExpressionFactory<TTable, TSchema>): Query<TTable, TSchema, TReturn>;
+    whereExists(relationship: AvailableRelationships<TTable, TSchema>, options?: ExistsOptions): Query<TTable, TSchema, TReturn>;
+    whereExists<TRelationship extends AvailableRelationships<TTable, TSchema>>(relationship: TRelationship, cb: (q: Query<DestTableName<TTable, TSchema, TRelationship>, TSchema>) => Query<string, TSchema>, options?: ExistsOptions): Query<TTable, TSchema, TReturn>;
     start(row: Partial<PullRow<TTable, TSchema>>, opts?: {
         inclusive: boolean;
-    }): Query<TSchema, TTable, TReturn>;
-    limit(limit: number): Query<TSchema, TTable, TReturn>;
-    orderBy<TSelector extends Selector<PullTableSchema<TTable, TSchema>>>(field: TSelector, direction: 'asc' | 'desc'): Query<TSchema, TTable, TReturn>;
-    one(): Query<TSchema, TTable, TReturn | undefined>;
+    }): Query<TTable, TSchema, TReturn>;
+    limit(limit: number): Query<TTable, TSchema, TReturn>;
+    orderBy<TSelector extends Selector<PullTableSchema<TTable, TSchema>>>(field: TSelector, direction: 'asc' | 'desc'): Query<TTable, TSchema, TReturn>;
+    one(): Query<TTable, TSchema, TReturn | undefined>;
+    /**
+     * @deprecated Use {@linkcode RunOptions} with {@linkcode zero.run} instead.
+     */
+    run(options?: RunOptions): Promise<HumanReadable<TReturn>>;
+    /**
+     * @deprecated Use {@linkcode PreloadOptions} with {@linkcode zero.preload} instead.
+     */
+    preload(options?: PreloadOptions): {
+        cleanup: () => void;
+        complete: Promise<void>;
+    };
+    /**
+     * @deprecated Use {@linkcode MaterializeOptions} with {@linkcode zero.materialize} instead.
+     */
+    materialize(ttl?: TTL): TypedView<HumanReadable<TReturn>>;
+    /**
+     * @deprecated Use {@linkcode MaterializeOptions} with {@linkcode zero.materialize} instead.
+     */
+    materialize<T>(factory: ViewFactory<TTable, TSchema, TReturn, T>, ttl?: TTL): T;
 }
 export type PreloadOptions = {
     /**
@@ -124,21 +165,6 @@ export declare const DEFAULT_RUN_OPTIONS_UNKNOWN: {
 export declare const DEFAULT_RUN_OPTIONS_COMPLETE: {
     readonly type: "complete";
 };
-export type AnyQuery = Query<Schema, string, any>;
-/**
- * An interface for objects that can be converted to a {@link Query}.
- *
- * This is useful for creating lazy or deferred queries that are only
- * materialized when needed, allowing the query to be constructed with
- * runtime context.
- *
- * @template S - The schema type
- * @template T - The table name (must be a key of S['tables'])
- * @template R - The return type of the query
- * @template C - The context type passed to {@link toQuery}
- */
-export interface ToQuery<S extends Schema, T extends keyof S['tables'] & string, R, C> {
-    toQuery(context: C): Query<S, T, R>;
-}
+export type AnyQuery = Query<string, Schema, any>;
 export {};
 //# sourceMappingURL=query.d.ts.map

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

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

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

@@ -0,0 +1,22 @@
+import type { AST, System } from '../../../zero-protocol/src/ast.ts';
+import type { Schema } from '../../../zero-types/src/schema.ts';
+import type { Format, ViewFactory } from '../ivm/view.ts';
+import type { CustomQueryID } from './named.ts';
+import type { QueryDelegate } from './query-delegate.ts';
+import { QueryImpl } from './query-impl.ts';
+import type { HumanReadable, PreloadOptions, PullRow, Query, RunOptions } from './query.ts';
+import type { TTL } from './ttl.ts';
+import type { TypedView } from './typed-view.ts';
+export declare function newRunnableQuery<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema>(delegate: QueryDelegate, schema: TSchema, table: TTable): Query<TTable, TSchema>;
+export declare class RunnableQueryImpl<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema, TReturn = PullRow<TTable, TSchema>> extends QueryImpl<TTable, TSchema, TReturn> implements Query<TTable, TSchema, TReturn> {
+    #private;
+    constructor(delegate: QueryDelegate, schema: TSchema, tableName: TTable, ast?: AST, format?: Format, system?: System, customQueryID?: CustomQueryID, currentJunction?: string);
+    run(options?: RunOptions): Promise<HumanReadable<TReturn>>;
+    preload(options?: PreloadOptions): {
+        cleanup: () => void;
+        complete: Promise<void>;
+    };
+    materialize(ttl?: TTL): TypedView<HumanReadable<TReturn>>;
+    materialize<T>(factory: ViewFactory<TTable, TSchema, TReturn, T>, ttl?: TTL): T;
+}
+//# sourceMappingURL=runnable-query-impl.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"runnable-query-impl.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/runnable-query-impl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAE,MAAM,EAAC,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAE9D,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EACV,aAAa,EAEb,cAAc,EACd,OAAO,EACP,KAAK,EACL,UAAU,EACX,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,UAAU,CAAC;AAClC,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE/C,wBAAgB,gBAAgB,CAC9B,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,SAAS,MAAM,EAEtB,QAAQ,EAAE,aAAa,EACvB,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,MAAM,GACZ,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CASxB;AAED,qBAAa,iBAAiB,CAC1B,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,SAAS,MAAM,EACtB,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAEpC,SAAQ,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAC1C,YAAW,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC;;gBAKxC,QAAQ,EAAE,aAAa,EACvB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,GAAG,GAAE,GAAwB,EAC7B,MAAM,GAAE,MAAsB,EAC9B,MAAM,GAAE,MAAiB,EACzB,aAAa,CAAC,EAAE,aAAa,EAC7B,eAAe,CAAC,EAAE,MAAM;IAyBjB,GAAG,CAAC,OAAO,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAI1D,OAAO,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG;QAC1C,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;KACzB;IAIQ,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IACzD,WAAW,CAAC,CAAC,EACpB,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,EACjD,GAAG,CAAC,EAAE,GAAG,GACR,CAAC;CAkBL"}

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

@@ -0,0 +1,60 @@
+import { defaultFormat } from "../../../zero-types/src/format.js";
+import { QueryImpl } from "./query-impl.js";
+function newRunnableQuery(delegate, schema, table) {
+  return new RunnableQueryImpl(
+    delegate,
+    schema,
+    table,
+    { table },
+    defaultFormat,
+    void 0
+  );
+}
+class RunnableQueryImpl extends QueryImpl {
+  #delegate;
+  constructor(delegate, schema, tableName, ast = { table: tableName }, format = defaultFormat, system = "client", customQueryID, currentJunction) {
+    super(
+      schema,
+      tableName,
+      ast,
+      format,
+      system,
+      customQueryID,
+      currentJunction,
+      (tableName2, ast2, format2, customQueryID2, currentJunction2) => new RunnableQueryImpl(
+        delegate,
+        schema,
+        tableName2,
+        ast2,
+        format2,
+        system,
+        customQueryID2,
+        currentJunction2
+      )
+    );
+    this.#delegate = delegate;
+  }
+  run(options) {
+    return this.#delegate.run(this, options);
+  }
+  preload(options) {
+    return this.#delegate.preload(this, options);
+  }
+  materialize(factory, ttl) {
+    let actualFactory;
+    let options;
+    if (typeof factory === "function") {
+      actualFactory = factory;
+      options = { ttl };
+    } else {
+      actualFactory = void 0;
+      options = { ttl: factory };
+    }
+    return this.#delegate.materialize(this, actualFactory, options);
+  }
+}
+export {
+  RunnableQueryImpl,
+  newRunnableQuery
+};
+//# sourceMappingURL=runnable-query-impl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"runnable-query-impl.js","sources":["../../../../../zql/src/query/runnable-query-impl.ts"],"sourcesContent":["import type {AST, System} from '../../../zero-protocol/src/ast.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {defaultFormat} from '../ivm/default-format.ts';\nimport type {Format, ViewFactory} from '../ivm/view.ts';\nimport type {CustomQueryID} from './named.ts';\nimport type {QueryDelegate} from './query-delegate.ts';\nimport {QueryImpl} from './query-impl.ts';\nimport type {\n  HumanReadable,\n  MaterializeOptions,\n  PreloadOptions,\n  PullRow,\n  Query,\n  RunOptions,\n} from './query.ts';\nimport type {TTL} from './ttl.ts';\nimport type {TypedView} from './typed-view.ts';\n\nexport function newRunnableQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TSchema extends Schema,\n>(\n  delegate: QueryDelegate,\n  schema: TSchema,\n  table: TTable,\n): Query<TTable, TSchema> {\n  return new RunnableQueryImpl(\n    delegate,\n    schema,\n    table,\n    {table},\n    defaultFormat,\n    undefined,\n  );\n}\n\nexport class RunnableQueryImpl<\n    TTable extends keyof TSchema['tables'] & string,\n    TSchema extends Schema,\n    TReturn = PullRow<TTable, TSchema>,\n  >\n  extends QueryImpl<TTable, TSchema, TReturn>\n  implements Query<TTable, TSchema, TReturn>\n{\n  readonly #delegate: QueryDelegate;\n\n  constructor(\n    delegate: QueryDelegate,\n    schema: TSchema,\n    tableName: TTable,\n    ast: AST = {table: tableName},\n    format: Format = defaultFormat,\n    system: System = 'client',\n    customQueryID?: CustomQueryID,\n    currentJunction?: string,\n  ) {\n    super(\n      schema,\n      tableName,\n      ast,\n      format,\n      system,\n      customQueryID,\n      currentJunction,\n      (tableName, ast, format, customQueryID, currentJunction) =>\n        new RunnableQueryImpl(\n          delegate,\n          schema,\n          tableName,\n          ast,\n          format,\n          system,\n          customQueryID,\n          currentJunction,\n        ),\n    );\n    this.#delegate = delegate;\n  }\n\n  override run(options?: RunOptions): Promise<HumanReadable<TReturn>> {\n    return this.#delegate.run(this, options);\n  }\n\n  override preload(options?: PreloadOptions): {\n    cleanup: () => void;\n    complete: Promise<void>;\n  } {\n    return this.#delegate.preload(this, options);\n  }\n\n  override materialize(ttl?: TTL): TypedView<HumanReadable<TReturn>>;\n  override materialize<T>(\n    factory: ViewFactory<TTable, TSchema, TReturn, T>,\n    ttl?: TTL,\n  ): T;\n  override materialize<T>(\n    factory?: unknown,\n    ttl?: unknown,\n  ): T | TypedView<HumanReadable<TReturn>> {\n    let actualFactory: ViewFactory<TTable, TSchema, TReturn, T> | undefined;\n    let options: MaterializeOptions | undefined;\n\n    if (typeof factory === 'function') {\n      actualFactory = factory as ViewFactory<TTable, TSchema, TReturn, T>;\n      options = {ttl: ttl as TTL | undefined};\n    } else {\n      actualFactory = undefined;\n      options = {ttl: factory as TTL | undefined};\n    }\n\n    return this.#delegate.materialize(this, actualFactory, options);\n  }\n}\n"],"names":["tableName","ast","format","customQueryID","currentJunction"],"mappings":";;AAkBO,SAAS,iBAId,UACA,QACA,OACwB;AACxB,SAAO,IAAI;AAAA,IACT;AAAA,IACA;AAAA,IACA;AAAA,IACA,EAAC,MAAA;AAAA,IACD;AAAA,IACA;AAAA,EAAA;AAEJ;AAEO,MAAM,0BAKH,UAEV;AAAA,EACW;AAAA,EAET,YACE,UACA,QACA,WACA,MAAW,EAAC,OAAO,UAAA,GACnB,SAAiB,eACjB,SAAiB,UACjB,eACA,iBACA;AACA;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,CAACA,YAAWC,MAAKC,SAAQC,gBAAeC,qBACtC,IAAI;AAAA,QACF;AAAA,QACA;AAAA,QACAJ;AAAAA,QACAC;AAAAA,QACAC;AAAAA,QACA;AAAA,QACAC;AAAAA,QACAC;AAAAA,MAAA;AAAA,IACF;AAEJ,SAAK,YAAY;AAAA,EACnB;AAAA,EAES,IAAI,SAAuD;AAClE,WAAO,KAAK,UAAU,IAAI,MAAM,OAAO;AAAA,EACzC;AAAA,EAES,QAAQ,SAGf;AACA,WAAO,KAAK,UAAU,QAAQ,MAAM,OAAO;AAAA,EAC7C;AAAA,EAOS,YACP,SACA,KACuC;AACvC,QAAI;AACJ,QAAI;AAEJ,QAAI,OAAO,YAAY,YAAY;AACjC,sBAAgB;AAChB,gBAAU,EAAC,IAAA;AAAA,IACb,OAAO;AACL,sBAAgB;AAChB,gBAAU,EAAC,KAAK,QAAA;AAAA,IAClB;AAEA,WAAO,KAAK,UAAU,YAAY,MAAM,eAAe,OAAO;AAAA,EAChE;AACF;"}

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

@@ -1,6 +1,7 @@
 import type { Schema } from '../../../zero-types/src/schema.ts';
 import type { Query } from './query.ts';
 export type SchemaQuery<S extends Schema> = {
-    readonly [K in keyof S['tables'] & string]: Query<S, K>;
+    readonly [K in keyof S['tables'] & string]: Query<K, S>;
 };
+export type ConditionalSchemaQuery<S extends Schema> = S['enableLegacyQueries'] extends true ? SchemaQuery<S> : undefined;
 //# sourceMappingURL=schema-query.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema-query.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/schema-query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,YAAY,CAAC;AAEtC,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI;IAK1C,QAAQ,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;CACxD,CAAC"}
+{"version":3,"file":"schema-query.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/schema-query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,YAAY,CAAC;AAMtC,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI;IAC1C,QAAQ,EAAE,CAAC,IAAI,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;CACxD,CAAC;AAEF,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,MAAM,IACjD,CAAC,CAAC,qBAAqB,CAAC,SAAS,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC"}

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

@@ -1,18 +1,5 @@
-import type { AST, System } from '../../../zero-protocol/src/ast.ts';
 import type { Schema } from '../../../zero-types/src/schema.ts';
-import type { Format } from '../ivm/view.ts';
-import { ExpressionBuilder } from './expression.ts';
-import type { CustomQueryID } from './named.ts';
-import { AbstractQuery } from './query-impl.ts';
 import type { PullRow, Query } from './query.ts';
-export declare function staticQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn = PullRow<TTable, TSchema>>(schema: TSchema, tableName: TTable): Query<TSchema, TTable, TReturn>;
-/**
- * A query that cannot be run.
- * Only serves to generate ASTs.
- */
-export declare class StaticQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn = PullRow<TTable, TSchema>> extends AbstractQuery<TSchema, TTable, TReturn> {
-    constructor(schema: TSchema, tableName: TTable, ast: AST, format: Format, system?: System, customQueryID?: CustomQueryID, currentJunction?: string);
-    expressionBuilder(): ExpressionBuilder<Schema, string>;
-}
-export declare function asStaticQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(q: Query<TSchema, TTable, TReturn>): StaticQuery<TSchema, TTable, TReturn>;
+export declare function newStaticQuery<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema, TReturn = PullRow<TTable, TSchema>>(schema: TSchema, tableName: TTable): Query<TTable, TSchema, TReturn>;
+export declare function newExpressionBuilder<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema>(schema: TSchema, tableName: TTable): import("./expression.ts").ExpressionBuilder<string, Schema>;
 //# sourceMappingURL=static-query.d.ts.map