@rocicorp/zero 0.25.0-canary.9 → 0.25.1

package/out/zql/src/query/query-delegate-base.js

@@ -1,5 +1,10 @@
+import { resolver } from "@rocicorp/resolver";
+import { hashOfNameAndArgs } from "../../../zero-protocol/src/query-hash.js";
+import { buildPipeline } from "../builder/builder.js";
+import { ArrayView } from "../ivm/array-view.js";
 import { MemoryStorage } from "../ivm/memory-storage.js";
-import { materializeImpl, runImpl, preloadImpl } from "./query-impl.js";
+import { asQueryInternals } from "./query-internals.js";
+import { DEFAULT_TTL_MS, DEFAULT_PRELOAD_TTL_MS } from "./ttl.js";
 class QueryDelegateBase {
   /**
    * Default implementation that just calls applyViewUpdates synchronously.
@@ -114,7 +119,132 @@ class QueryDelegateBase {
   assertValidRunOptions(_options) {
   }
 }
+async function runImpl(query, delegate, options) {
+  delegate.assertValidRunOptions(options);
+  const v = materializeImpl(
+    query,
+    delegate,
+    void 0,
+    {
+      ttl: options?.ttl
+    }
+  );
+  if (options?.type === "complete") {
+    return new Promise((resolve) => {
+      v.addListener((data, type) => {
+        if (type === "complete") {
+          v.destroy();
+          resolve(data);
+        } else if (type === "error") {
+          v.destroy();
+          resolve(Promise.reject(data));
+        }
+      });
+    });
+  }
+  options?.type;
+  const ret = v.data;
+  v.destroy();
+  return ret;
+}
+function preloadImpl(query, delegate, options) {
+  const qi = asQueryInternals(query);
+  const ttl = options?.ttl ?? DEFAULT_PRELOAD_TTL_MS;
+  const { resolve, promise: complete } = resolver();
+  const { customQueryID, ast } = qi;
+  if (customQueryID) {
+    const cleanup2 = delegate.addCustomQuery(ast, customQueryID, ttl, (got) => {
+      if (got) {
+        resolve();
+      }
+    });
+    return {
+      cleanup: cleanup2,
+      complete
+    };
+  }
+  const cleanup = delegate.addServerQuery(ast, ttl, (got) => {
+    if (got) {
+      resolve();
+    }
+  });
+  return {
+    cleanup,
+    complete
+  };
+}
+function materializeImpl(query, delegate, factory = arrayViewFactory, options) {
+  let ttl = options?.ttl ?? DEFAULT_TTL_MS;
+  const qi = asQueryInternals(query);
+  const { ast, format, customQueryID } = qi;
+  const queryHash = qi.hash();
+  const queryID = customQueryID ? hashOfNameAndArgs(customQueryID.name, customQueryID.args) : queryHash;
+  const queryCompleteResolver = resolver();
+  let queryComplete = delegate.defaultQueryComplete;
+  const updateTTL = customQueryID ? (newTTL) => delegate.updateCustomQuery(customQueryID, newTTL) : (newTTL) => delegate.updateServerQuery(ast, newTTL);
+  const gotCallback = (got, error) => {
+    if (error) {
+      queryCompleteResolver.reject(error);
+      queryComplete = error;
+      return;
+    }
+    if (got) {
+      delegate.addMetric(
+        "query-materialization-end-to-end",
+        performance.now() - t0,
+        queryID,
+        ast
+      );
+      queryComplete = true;
+      queryCompleteResolver.resolve(true);
+    }
+  };
+  let removeCommitObserver;
+  const onDestroy = () => {
+    input.destroy();
+    removeCommitObserver?.();
+    removeAddedQuery();
+  };
+  const t0 = performance.now();
+  const removeAddedQuery = customQueryID ? delegate.addCustomQuery(ast, customQueryID, ttl, gotCallback) : delegate.addServerQuery(ast, ttl, gotCallback);
+  const input = buildPipeline(ast, delegate, queryID);
+  const view = delegate.batchViewUpdates(
+    () => (factory ?? arrayViewFactory)(
+      query,
+      input,
+      format,
+      onDestroy,
+      (cb) => {
+        removeCommitObserver = delegate.onTransactionCommit(cb);
+      },
+      queryComplete || queryCompleteResolver.promise,
+      updateTTL
+    )
+  );
+  delegate.addMetric(
+    "query-materialization-client",
+    performance.now() - t0,
+    queryID
+  );
+  return view;
+}
+function arrayViewFactory(_query, input, format, onDestroy, onTransactionCommit, queryComplete, updateTTL) {
+  const v = new ArrayView(
+    input,
+    format,
+    queryComplete,
+    updateTTL
+  );
+  v.onDestroy = onDestroy;
+  onTransactionCommit(() => {
+    v.flush();
+  });
+  return v;
+}
 export {
-  QueryDelegateBase
+  QueryDelegateBase,
+  materializeImpl,
+  preloadImpl,
+  runImpl
 };
 //# sourceMappingURL=query-delegate-base.js.map

package/out/zql/src/query/query-delegate-base.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-delegate-base.js","sources":["../../../../../zql/src/query/query-delegate-base.ts"],"sourcesContent":["import type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {FilterInput} from '../ivm/filter-operators.ts';\nimport {MemoryStorage} from '../ivm/memory-storage.ts';\nimport type {Input, InputBase, Storage} from '../ivm/operator.ts';\nimport type {Source, SourceInput} from '../ivm/source.ts';\nimport type {ViewFactory} from '../ivm/view.ts';\nimport type {MetricMap} from './metrics-delegate.ts';\nimport type {CustomQueryID} from './named.ts';\nimport type {\n  CommitListener,\n  GotCallback,\n  QueryDelegate,\n} from './query-delegate.ts';\nimport {materializeImpl, preloadImpl, runImpl} from './query-impl.ts';\nimport type {\n  HumanReadable,\n  MaterializeOptions,\n  PreloadOptions,\n  Query,\n  RunOptions,\n} from './query.ts';\nimport type {TTL} from './ttl.ts';\nimport type {TypedView} from './typed-view.ts';\n\n/**\n * Base class that provides default implementations for common QueryDelegate methods.\n * Subclasses can override specific methods as needed.\n */\nexport abstract class QueryDelegateBase implements QueryDelegate {\n  /**\n   * Default implementation that just calls applyViewUpdates synchronously.\n   * Override if you need custom batching behavior (e.g., SolidJS).\n   */\n  batchViewUpdates<T>(applyViewUpdates: () => T): T {\n    return applyViewUpdates();\n  }\n\n  /**\n   * Default implementation returns MemoryStorage.\n   * Override if you need custom storage.\n   */\n  createStorage(): Storage {\n    return new MemoryStorage();\n  }\n\n  /**\n   * Default implementation calls materializeImpl.\n   * Override if you need custom materialization behavior.\n   */\n  materialize<\n    TSchema extends Schema,\n    TTable extends keyof TSchema['tables'] & string,\n    TReturn,\n  >(\n    query: Query<TSchema, TTable, TReturn>,\n    factory?: undefined,\n    options?: MaterializeOptions,\n  ): TypedView<HumanReadable<TReturn>>;\n\n  materialize<\n    TSchema extends Schema,\n    TTable extends keyof TSchema['tables'] & string,\n    TReturn,\n    T,\n  >(\n    query: Query<TSchema, TTable, TReturn>,\n    factory?: ViewFactory<TSchema, TTable, TReturn, T>,\n    options?: MaterializeOptions,\n  ): T;\n\n  /**\n   * Materialize a query into a custom view using a provided factory function.\n   */\n  materialize<\n    TSchema extends Schema,\n    TTable extends keyof TSchema['tables'] & string,\n    TReturn,\n    T,\n  >(\n    query: Query<TSchema, TTable, TReturn>,\n    factory?: ViewFactory<TSchema, TTable, TReturn, T>,\n    options?: MaterializeOptions,\n  ): T;\n\n  materialize<\n    TSchema extends Schema,\n    TTable extends keyof TSchema['tables'] & string,\n    TReturn,\n    T,\n  >(\n    query: Query<TSchema, TTable, TReturn>,\n    factory?: ViewFactory<TSchema, TTable, TReturn, T>,\n    options?: MaterializeOptions,\n  ): T {\n    return materializeImpl(query, this, factory, options);\n  }\n\n  /**\n   * Default implementation calls runImpl.\n   * Override if you need custom query execution (e.g., TestPGQueryDelegate).\n   */\n  run<\n    TSchema extends Schema,\n    TTable extends keyof TSchema['tables'] & string,\n    TReturn,\n  >(\n    query: Query<TSchema, TTable, TReturn>,\n    options?: RunOptions,\n  ): Promise<HumanReadable<TReturn>> {\n    return runImpl(query, this, options);\n  }\n\n  /**\n   * Default implementation calls preloadImpl.\n   * Override if you need custom preload behavior.\n   */\n  preload<\n    TSchema extends Schema,\n    TTable extends keyof TSchema['tables'] & string,\n    TReturn,\n  >(\n    query: Query<TSchema, TTable, TReturn>,\n    options?: PreloadOptions,\n  ): {\n    cleanup: () => void;\n    complete: Promise<void>;\n  } {\n    return preloadImpl(query, this, options);\n  }\n\n  /**\n   * Default no-op implementation for decorateSourceInput.\n   * Override if you need to wrap or instrument source inputs.\n   */\n  decorateSourceInput(input: SourceInput, _queryID: string): Input {\n    return input;\n  }\n\n  /**\n   * Default no-op implementation for decorateInput.\n   * Override if you need to wrap or instrument inputs.\n   */\n  decorateInput(input: Input, _name: string): Input {\n    return input;\n  }\n\n  /**\n   * Default no-op implementation for decorateFilterInput.\n   * Override if you need to wrap or instrument filter inputs.\n   */\n  decorateFilterInput(input: FilterInput, _name: string): FilterInput {\n    return input;\n  }\n\n  /**\n   * Default no-op implementation for addEdge.\n   * Override if you need to track graph edges (e.g., visualization).\n   */\n  addEdge(_source: InputBase, _dest: InputBase): void {\n    // No-op\n  }\n\n  /**\n   * Default no-op implementation for addMetric.\n   * Override if you need to collect metrics.\n   */\n  addMetric<K extends keyof MetricMap>(\n    _metric: K,\n    _value: number,\n    ..._args: MetricMap[K]\n  ): void {\n    // No-op\n  }\n\n  /**\n   * Default no-op implementation.\n   * Override if you need to track server queries (e.g., ZeroContext, test delegates).\n   */\n  addServerQuery(_ast: AST, _ttl: TTL, _gotCallback?: GotCallback): () => void {\n    return () => {};\n  }\n\n  /**\n   * Default no-op implementation.\n   * Override if you need to track custom queries (e.g., ZeroContext, test delegates).\n   */\n  addCustomQuery(\n    _ast: AST,\n    _customQueryID: CustomQueryID,\n    _ttl: TTL,\n    _gotCallback?: GotCallback,\n  ): () => void {\n    return () => {};\n  }\n\n  /**\n   * Default no-op implementation.\n   * Override if you need to handle query updates.\n   */\n  updateServerQuery(_ast: AST, _ttl: TTL): void {\n    // No-op\n  }\n\n  /**\n   * Default no-op implementation.\n   * Override if you need to handle custom query updates.\n   */\n  updateCustomQuery(_customQueryID: CustomQueryID, _ttl: TTL): void {\n    // No-op\n  }\n\n  /**\n   * Default no-op implementation.\n   * Override if you need to flush query changes.\n   */\n  flushQueryChanges(): void {\n    // No-op\n  }\n\n  /**\n   * Called when a transaction commits. Override to add custom behavior.\n   * Default implementation returns a no-op cleanup function.\n   */\n  onTransactionCommit(_cb: CommitListener): () => void {\n    return () => {};\n  }\n\n  /**\n   * Validates run options. Override to add custom validation.\n   * Default implementation is a no-op.\n   */\n  assertValidRunOptions(_options?: RunOptions): void {\n    // No-op\n  }\n\n  abstract readonly defaultQueryComplete: boolean;\n\n  // BuilderDelegate methods - must be implemented\n  abstract getSource(name: string): Source | undefined;\n}\n"],"names":[],"mappings":";;AA6BO,MAAe,kBAA2C;AAAA;AAAA;AAAA;AAAA;AAAA,EAK/D,iBAAoB,kBAA8B;AAChD,WAAO,iBAAA;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,gBAAyB;AACvB,WAAO,IAAI,cAAA;AAAA,EACb;AAAA,EAyCA,YAME,OACA,SACA,SACG;AACH,WAAO,gBAAgB,OAAO,MAAM,SAAS,OAAO;AAAA,EACtD;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,IAKE,OACA,SACiC;AACjC,WAAO,QAAQ,OAAO,MAAM,OAAO;AAAA,EACrC;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,QAKE,OACA,SAIA;AACA,WAAO,YAAY,OAAO,MAAM,OAAO;AAAA,EACzC;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,oBAAoB,OAAoB,UAAyB;AAC/D,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,cAAc,OAAc,OAAsB;AAChD,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,oBAAoB,OAAoB,OAA4B;AAClE,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,QAAQ,SAAoB,OAAwB;AAAA,EAEpD;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,UACE,SACA,WACG,OACG;AAAA,EAER;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,eAAe,MAAW,MAAW,cAAwC;AAC3E,WAAO,MAAM;AAAA,IAAC;AAAA,EAChB;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,eACE,MACA,gBACA,MACA,cACY;AACZ,WAAO,MAAM;AAAA,IAAC;AAAA,EAChB;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,kBAAkB,MAAW,MAAiB;AAAA,EAE9C;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,kBAAkB,gBAA+B,MAAiB;AAAA,EAElE;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,oBAA0B;AAAA,EAE1B;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,oBAAoB,KAAiC;AACnD,WAAO,MAAM;AAAA,IAAC;AAAA,EAChB;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,sBAAsB,UAA6B;AAAA,EAEnD;AAMF;"}
+{"version":3,"file":"query-delegate-base.js","sources":["../../../../../zql/src/query/query-delegate-base.ts"],"sourcesContent":["import {resolver} from '@rocicorp/resolver';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {ErroredQuery} from '../../../zero-protocol/src/custom-queries.ts';\nimport {hashOfNameAndArgs} from '../../../zero-protocol/src/query-hash.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {buildPipeline} from '../builder/builder.ts';\nimport {ArrayView} from '../ivm/array-view.ts';\nimport type {FilterInput} from '../ivm/filter-operators.ts';\nimport {MemoryStorage} from '../ivm/memory-storage.ts';\nimport type {Input, InputBase, Storage} from '../ivm/operator.ts';\nimport type {Source, SourceInput} from '../ivm/source.ts';\nimport type {Format, ViewFactory} from '../ivm/view.ts';\nimport type {MetricMap} from './metrics-delegate.ts';\nimport type {CustomQueryID} from './named.ts';\nimport type {\n  CommitListener,\n  GotCallback,\n  QueryDelegate,\n} from './query-delegate.ts';\nimport {asQueryInternals, type QueryInternals} from './query-internals.ts';\nimport type {\n  HumanReadable,\n  MaterializeOptions,\n  PreloadOptions,\n  Query,\n  RunOptions,\n} from './query.ts';\nimport {DEFAULT_PRELOAD_TTL_MS, DEFAULT_TTL_MS, type TTL} from './ttl.ts';\nimport type {TypedView} from './typed-view.ts';\n\n/**\n * Base class that provides default implementations for common QueryDelegate methods.\n * Subclasses can override specific methods as needed.\n */\nexport abstract class QueryDelegateBase implements QueryDelegate {\n  /**\n   * Default implementation that just calls applyViewUpdates synchronously.\n   * Override if you need custom batching behavior (e.g., SolidJS).\n   */\n  batchViewUpdates<T>(applyViewUpdates: () => T): T {\n    return applyViewUpdates();\n  }\n\n  /**\n   * Default implementation returns MemoryStorage.\n   * Override if you need custom storage.\n   */\n  createStorage(): Storage {\n    return new MemoryStorage();\n  }\n\n  /**\n   * Default implementation calls materializeImpl.\n   * Override if you need custom materialization behavior.\n   */\n  materialize<\n    TTable extends keyof TSchema['tables'] & string,\n    TSchema extends Schema,\n    TReturn,\n  >(\n    query: Query<TTable, TSchema, TReturn>,\n    factory?: undefined,\n    options?: MaterializeOptions,\n  ): TypedView<HumanReadable<TReturn>>;\n\n  materialize<\n    TTable extends keyof TSchema['tables'] & string,\n    TSchema extends Schema,\n    TReturn,\n    T,\n  >(\n    query: Query<TTable, TSchema, TReturn>,\n    factory?: ViewFactory<TTable, TSchema, TReturn, T>,\n    options?: MaterializeOptions,\n  ): T;\n\n  /**\n   * Materialize a query into a custom view using a provided factory function.\n   */\n  materialize<\n    TTable extends keyof TSchema['tables'] & string,\n    TSchema extends Schema,\n    TReturn,\n    T,\n  >(\n    query: Query<TTable, TSchema, TReturn>,\n    factory?: ViewFactory<TTable, TSchema, TReturn, T>,\n    options?: MaterializeOptions,\n  ): T;\n\n  materialize<\n    TTable extends keyof TSchema['tables'] & string,\n    TSchema extends Schema,\n    TReturn,\n    T,\n  >(\n    query: Query<TTable, TSchema, TReturn>,\n    factory?: ViewFactory<TTable, TSchema, TReturn, T>,\n    options?: MaterializeOptions,\n  ): T {\n    return materializeImpl(query, this, factory, options);\n  }\n\n  /**\n   * Default implementation calls runImpl.\n   * Override if you need custom query execution (e.g., TestPGQueryDelegate).\n   */\n  run<\n    TTable extends keyof TSchema['tables'] & string,\n    TSchema extends Schema,\n    TReturn,\n  >(\n    query: Query<TTable, TSchema, TReturn>,\n    options?: RunOptions,\n  ): Promise<HumanReadable<TReturn>> {\n    return runImpl(query, this, options);\n  }\n\n  /**\n   * Default implementation calls preloadImpl.\n   * Override if you need custom preload behavior.\n   */\n  preload<\n    TTable extends keyof TSchema['tables'] & string,\n    TSchema extends Schema,\n    TReturn,\n  >(\n    query: Query<TTable, TSchema, TReturn>,\n    options?: PreloadOptions,\n  ): {\n    cleanup: () => void;\n    complete: Promise<void>;\n  } {\n    return preloadImpl(query, this, options);\n  }\n\n  /**\n   * Default no-op implementation for decorateSourceInput.\n   * Override if you need to wrap or instrument source inputs.\n   */\n  decorateSourceInput(input: SourceInput, _queryID: string): Input {\n    return input;\n  }\n\n  /**\n   * Default no-op implementation for decorateInput.\n   * Override if you need to wrap or instrument inputs.\n   */\n  decorateInput(input: Input, _name: string): Input {\n    return input;\n  }\n\n  /**\n   * Default no-op implementation for decorateFilterInput.\n   * Override if you need to wrap or instrument filter inputs.\n   */\n  decorateFilterInput(input: FilterInput, _name: string): FilterInput {\n    return input;\n  }\n\n  /**\n   * Default no-op implementation for addEdge.\n   * Override if you need to track graph edges (e.g., visualization).\n   */\n  addEdge(_source: InputBase, _dest: InputBase): void {\n    // No-op\n  }\n\n  /**\n   * Default no-op implementation for addMetric.\n   * Override if you need to collect metrics.\n   */\n  addMetric<K extends keyof MetricMap>(\n    _metric: K,\n    _value: number,\n    ..._args: MetricMap[K]\n  ): void {\n    // No-op\n  }\n\n  /**\n   * Default no-op implementation.\n   * Override if you need to track server queries (e.g., ZeroContext, test delegates).\n   */\n  addServerQuery(_ast: AST, _ttl: TTL, _gotCallback?: GotCallback): () => void {\n    return () => {};\n  }\n\n  /**\n   * Default no-op implementation.\n   * Override if you need to track custom queries (e.g., ZeroContext, test delegates).\n   */\n  addCustomQuery(\n    _ast: AST,\n    _customQueryID: CustomQueryID,\n    _ttl: TTL,\n    _gotCallback?: GotCallback,\n  ): () => void {\n    return () => {};\n  }\n\n  /**\n   * Default no-op implementation.\n   * Override if you need to handle query updates.\n   */\n  updateServerQuery(_ast: AST, _ttl: TTL): void {\n    // No-op\n  }\n\n  /**\n   * Default no-op implementation.\n   * Override if you need to handle custom query updates.\n   */\n  updateCustomQuery(_customQueryID: CustomQueryID, _ttl: TTL): void {\n    // No-op\n  }\n\n  /**\n   * Default no-op implementation.\n   * Override if you need to flush query changes.\n   */\n  flushQueryChanges(): void {\n    // No-op\n  }\n\n  /**\n   * Called when a transaction commits. Override to add custom behavior.\n   * Default implementation returns a no-op cleanup function.\n   */\n  onTransactionCommit(_cb: CommitListener): () => void {\n    return () => {};\n  }\n\n  /**\n   * Validates run options. Override to add custom validation.\n   * Default implementation is a no-op.\n   */\n  assertValidRunOptions(_options?: RunOptions): void {\n    // No-op\n  }\n\n  abstract readonly defaultQueryComplete: boolean;\n\n  // BuilderDelegate methods - must be implemented\n  abstract getSource(name: string): Source | undefined;\n}\n\n// oxlint-disable-next-line require-await\nexport async function runImpl<\n  TTable extends keyof TSchema['tables'] & string,\n  TSchema extends Schema,\n  TReturn,\n>(\n  query: Query<TTable, TSchema, TReturn>,\n  delegate: QueryDelegate,\n  options?: RunOptions,\n): Promise<HumanReadable<TReturn>> {\n  delegate.assertValidRunOptions(options);\n  const v: TypedView<HumanReadable<TReturn>> = materializeImpl(\n    query,\n    delegate,\n    undefined,\n    {\n      ttl: options?.ttl,\n    },\n  );\n  if (options?.type === 'complete') {\n    return new Promise(resolve => {\n      v.addListener((data, type) => {\n        if (type === 'complete') {\n          v.destroy();\n          resolve(data as HumanReadable<TReturn>);\n        } else if (type === 'error') {\n          v.destroy();\n          resolve(Promise.reject(data));\n        }\n      });\n    });\n  }\n\n  options?.type satisfies 'unknown' | undefined;\n\n  const ret = v.data;\n  v.destroy();\n  return ret;\n}\n\nexport function preloadImpl<\n  TTable extends keyof TSchema['tables'] & string,\n  TSchema extends Schema,\n  TReturn,\n>(\n  query: Query<TTable, TSchema, TReturn>,\n  delegate: QueryDelegate,\n  options?: PreloadOptions,\n): {\n  cleanup: () => void;\n  complete: Promise<void>;\n} {\n  const qi = asQueryInternals(query);\n  const ttl = options?.ttl ?? DEFAULT_PRELOAD_TTL_MS;\n  const {resolve, promise: complete} = resolver<void>();\n  const {customQueryID, ast} = qi;\n  if (customQueryID) {\n    const cleanup = delegate.addCustomQuery(ast, customQueryID, ttl, got => {\n      if (got) {\n        resolve();\n      }\n    });\n    return {\n      cleanup,\n      complete,\n    };\n  }\n\n  const cleanup = delegate.addServerQuery(ast, ttl, got => {\n    if (got) {\n      resolve();\n    }\n  });\n  return {\n    cleanup,\n    complete,\n  };\n}\n\nexport function materializeImpl<\n  TTable extends keyof TSchema['tables'] & string,\n  TSchema extends Schema,\n  TReturn,\n  T,\n>(\n  query: Query<TTable, TSchema, TReturn>,\n  delegate: QueryDelegate,\n  factory: ViewFactory<\n    TTable,\n    TSchema,\n    TReturn,\n    T\n    // oxlint-disable-next-line no-explicit-any\n  > = arrayViewFactory as any,\n  options?: MaterializeOptions,\n): T {\n  let ttl: TTL = options?.ttl ?? DEFAULT_TTL_MS;\n\n  const qi = asQueryInternals(query);\n  const {ast, format, customQueryID} = qi;\n  const queryHash = qi.hash();\n\n  const queryID = customQueryID\n    ? hashOfNameAndArgs(customQueryID.name, customQueryID.args)\n    : queryHash;\n  const queryCompleteResolver = resolver<true>();\n  let queryComplete: boolean | ErroredQuery = delegate.defaultQueryComplete;\n  const updateTTL = customQueryID\n    ? (newTTL: TTL) => delegate.updateCustomQuery(customQueryID, newTTL)\n    : (newTTL: TTL) => delegate.updateServerQuery(ast, newTTL);\n\n  const gotCallback: GotCallback = (got, error) => {\n    if (error) {\n      queryCompleteResolver.reject(error);\n      queryComplete = error;\n      return;\n    }\n\n    if (got) {\n      delegate.addMetric(\n        'query-materialization-end-to-end',\n        performance.now() - t0,\n        queryID,\n        ast,\n      );\n      queryComplete = true;\n      queryCompleteResolver.resolve(true);\n    }\n  };\n\n  let removeCommitObserver: (() => void) | undefined;\n  const onDestroy = () => {\n    input.destroy();\n    removeCommitObserver?.();\n    removeAddedQuery();\n  };\n\n  const t0 = performance.now();\n\n  const removeAddedQuery = customQueryID\n    ? delegate.addCustomQuery(ast, customQueryID, ttl, gotCallback)\n    : delegate.addServerQuery(ast, ttl, gotCallback);\n\n  const input = buildPipeline(ast, delegate, queryID);\n\n  const view = delegate.batchViewUpdates(() =>\n    (factory ?? arrayViewFactory)(\n      query,\n      input,\n      format,\n      onDestroy,\n      cb => {\n        removeCommitObserver = delegate.onTransactionCommit(cb);\n      },\n      queryComplete || queryCompleteResolver.promise,\n      updateTTL,\n    ),\n  );\n\n  delegate.addMetric(\n    'query-materialization-client',\n    performance.now() - t0,\n    queryID,\n  );\n\n  return view as T;\n}\n\nfunction arrayViewFactory<\n  TTable extends string,\n  TSchema extends Schema,\n  TReturn,\n>(\n  _query: QueryInternals<TTable, TSchema, TReturn>,\n  input: Input,\n  format: Format,\n  onDestroy: () => void,\n  onTransactionCommit: (cb: () => void) => void,\n  queryComplete: true | ErroredQuery | Promise<true>,\n  updateTTL: (ttl: TTL) => void,\n): TypedView<HumanReadable<TReturn>> {\n  const v = new ArrayView<HumanReadable<TReturn>>(\n    input,\n    format,\n    queryComplete,\n    updateTTL,\n  );\n  v.onDestroy = onDestroy;\n  onTransactionCommit(() => {\n    v.flush();\n  });\n  return v;\n}\n"],"names":["cleanup"],"mappings":"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"}

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

@@ -11,7 +11,7 @@ import type { TypedView } from './typed-view.ts';
 export type CommitListener = () => void;
 export type GotCallback = (got: boolean, error?: ErroredQuery) => void;
 export interface NewQueryDelegate {
-    newQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(schema: TSchema, table: TTable, ast: AST, format: Format): Query<TSchema, TTable, TReturn>;
+    newQuery<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema, TReturn>(schema: TSchema, table: TTable, ast: AST, format: Format): Query<TTable, TSchema, TReturn>;
 }
 /**
  * Interface for delegates that support materializing, running, and preloading queries.
@@ -45,20 +45,20 @@ export interface QueryDelegate extends BuilderDelegate, MetricsDelegate {
      */
     readonly defaultQueryComplete: boolean;
     /** Using the default view factory creates a TypedView */
-    materialize<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn>, factory?: undefined, options?: MaterializeOptions): TypedView<HumanReadable<TReturn>>;
-    materialize<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, T>(query: Query<TSchema, TTable, TReturn>, factory?: ViewFactory<TSchema, TTable, TReturn, T>, options?: MaterializeOptions): T;
+    materialize<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema, TReturn>(query: Query<TTable, TSchema, TReturn>, factory?: undefined, options?: MaterializeOptions): TypedView<HumanReadable<TReturn>>;
+    materialize<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema, TReturn, T>(query: Query<TTable, TSchema, TReturn>, factory?: ViewFactory<TTable, TSchema, TReturn, 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>, factory?: ViewFactory<TSchema, TTable, TReturn, T>, options?: MaterializeOptions): T;
+    materialize<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema, TReturn, T>(query: Query<TTable, TSchema, TReturn>, factory?: ViewFactory<TTable, TSchema, TReturn, T>, options?: MaterializeOptions): T;
     /**
      * Run a query and return the results as a Promise.
      */
-    run<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn>, options?: RunOptions): Promise<HumanReadable<TReturn>>;
+    run<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema, TReturn>(query: Query<TTable, TSchema, TReturn>, options?: RunOptions): Promise<HumanReadable<TReturn>>;
     /**
      * Preload a query's data without materializing a view.
      */
-    preload<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn>, options?: PreloadOptions): {
+    preload<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema, TReturn>(query: Query<TTable, TSchema, TReturn>, options?: PreloadOptions): {
         cleanup: () => void;
         complete: Promise<void>;
     };

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

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

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

@@ -1,45 +1,44 @@
 import type { ReadonlyJSONValue } from '../../../shared/src/json.ts';
-import { type AST, type Condition, type Parameter, type SimpleOperator, type System } from '../../../zero-protocol/src/ast.ts';
+import { type AST, type Parameter, type SimpleOperator, type 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 ExpressionFactory } from './expression.ts';
+import { type ExpressionFactory, ExpressionBuilder } from './expression.ts';
 import type { CustomQueryID } from './named.ts';
-import type { QueryDelegate } from './query-delegate.ts';
-import { queryInternalsTag, type QueryInternals } from './query-internals.ts';
-import { type AnyQuery, type ExistsOptions, type GetFilterType, type HumanReadable, type MaterializeOptions, type PreloadOptions, type PullRow, type Query, type RunOptions, type ToQuery } from './query.ts';
-export declare function newQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn = PullRow<TTable, TSchema>>(schema: TSchema, table: TTable): Query<TSchema, TTable, TReturn>;
-export declare function staticParam(anchorClass: 'authData' | 'preMutationRow', field: string | string[]): Parameter;
+import { type QueryInternals, queryInternalsTag } from './query-internals.ts';
+import type { AnyQuery, ExistsOptions, GetFilterType, HumanReadable, PreloadOptions, PullRow, Query, RunOptions } from './query.ts';
+import type { TTL } from './ttl.ts';
+import type { TypedView } from './typed-view.ts';
 type GetFilterTypeAny = GetFilterType<any, any, any>;
-type NewQueryFunction<TSchema extends Schema> = <TTable extends keyof TSchema['tables'] & string, TReturn>(this: unknown, tableName: TTable, ast: AST, format: Format, customQueryID: CustomQueryID | undefined, currentJunction: string | undefined) => Query<TSchema, TTable, TReturn>;
-export declare abstract class AbstractQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn = PullRow<TTable, TSchema>> implements Query<TSchema, TTable, TReturn>, QueryInternals<TSchema, TTable, TReturn>, ToQuery<TSchema, TTable, TReturn, unknown> {
+type NewQueryFunction<TSchema extends Schema> = <TTable extends keyof TSchema['tables'] & string, TReturn>(this: unknown, tableName: TTable, ast: AST, format: Format, customQueryID: CustomQueryID | undefined, currentJunction: string | undefined) => QueryImpl<TTable, TSchema, TReturn>;
+export declare function newQuery<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema>(schema: TSchema, table: TTable): Query<TTable, TSchema>;
+export declare function newQueryImpl<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema, TReturn = PullRow<TTable, TSchema>>(schema: TSchema, tableName: TTable, ast: AST, format: Format, system: System): QueryImpl<TTable, TSchema, TReturn>;
+export declare class QueryImpl<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema, TReturn = PullRow<TTable, TSchema>> implements Query<TTable, TSchema, TReturn>, QueryInternals<TTable, TSchema, TReturn> {
     #private;
     readonly [queryInternalsTag] = true;
     readonly format: Format;
     readonly customQueryID: CustomQueryID | undefined;
     constructor(schema: TSchema, tableName: TTable, ast: AST, format: Format, system: System, customQueryID: CustomQueryID | undefined, currentJunction: string | undefined, newQuery: NewQueryFunction<TSchema>);
-    nameAndArgs(name: string, args: ReadonlyArray<ReadonlyJSONValue>): Query<TSchema, TTable, TReturn>;
+    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;
+    nameAndArgs(name: string, args: ReadonlyArray<ReadonlyJSONValue>): Query<TTable, TSchema, TReturn>;
     hash(): string;
-    one: () => Query<TSchema, TTable, TReturn | undefined>;
-    whereExists: (relationship: string, cbOrOptions?: ((q: AnyQuery) => AnyQuery) | ExistsOptions, options?: ExistsOptions) => Query<TSchema, TTable, TReturn>;
-    related: (relationship: string, cb?: (q: AnyQuery) => AnyQuery) => Query<Schema, string, any>;
-    where: (fieldOrExpressionFactory: string | ExpressionFactory<TSchema, TTable>, opOrValue?: SimpleOperator | GetFilterTypeAny | Parameter, value?: GetFilterTypeAny | Parameter) => Query<TSchema, TTable, TReturn>;
+    one: () => Query<TTable, TSchema, TReturn | undefined>;
+    whereExists: (relationship: string, cbOrOptions?: ((q: AnyQuery) => AnyQuery) | ExistsOptions, options?: ExistsOptions) => Query<TTable, TSchema, TReturn>;
+    related: (relationship: string, cb?: (q: AnyQuery) => AnyQuery) => Query<TTable, TSchema, any>;
+    where: (fieldOrExpressionFactory: string | ExpressionFactory<TTable, TSchema>, opOrValue?: SimpleOperator | GetFilterTypeAny | Parameter, value?: GetFilterTypeAny | Parameter) => Query<TTable, TSchema, TReturn>;
     start: (row: Partial<Record<string, ReadonlyJSONValue | undefined>>, opts?: {
         inclusive: boolean;
-    }) => Query<TSchema, TTable, TReturn>;
-    limit: (limit: number) => Query<TSchema, TTable, TReturn>;
-    orderBy: <TSelector extends keyof TSchema["tables"][TTable]["columns"]>(field: TSelector, direction: "asc" | "desc") => Query<TSchema, TTable, TReturn>;
-    protected _exists: (relationship: string, cb: ((query: AnyQuery) => AnyQuery) | undefined, options?: ExistsOptions) => Condition;
+    }) => Query<TTable, TSchema, TReturn>;
+    limit: (limit: number) => Query<TTable, TSchema, TReturn>;
+    orderBy: <TSelector extends keyof TSchema["tables"][TTable]["columns"]>(field: TSelector, direction: "asc" | "desc") => Query<TTable, TSchema, TReturn>;
     get ast(): AST;
-    toQuery(_context: unknown): this;
-}
-export declare function materializeImpl<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, T>(query: Query<TSchema, TTable, TReturn>, delegate: QueryDelegate, factory?: ViewFactory<TSchema, TTable, TReturn, T>, options?: MaterializeOptions): T;
-export declare function runImpl<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn>, delegate: QueryDelegate, options?: RunOptions): Promise<HumanReadable<TReturn>>;
-export declare function preloadImpl<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn>, delegate: QueryDelegate, options?: PreloadOptions): {
-    cleanup: () => void;
-    complete: Promise<void>;
-};
-export declare class QueryImpl<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn = PullRow<TTable, TSchema>> extends AbstractQuery<TSchema, TTable, TReturn> implements Query<TSchema, TTable, TReturn>, ToQuery<TSchema, TTable, TReturn, unknown> {
-    constructor(schema: TSchema, tableName: TTable, ast?: AST, format?: Format, system?: System, customQueryID?: CustomQueryID, currentJunction?: string);
+    expressionBuilder(): ExpressionBuilder<string, Schema>;
 }
+export declare function asQueryImpl<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema, TReturn>(q: Query<TTable, TSchema, TReturn>): QueryImpl<TTable, TSchema, TReturn>;
 export {};
 //# sourceMappingURL=query-impl.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"query-impl.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/query-impl.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAEL,KAAK,GAAG,EAER,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,MAAM,EACZ,MAAM,mCAAmC,CAAC;AAM3C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAM9D,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAKL,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAc,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAEL,iBAAiB,EACjB,KAAK,cAAc,EACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,UAAU,EACf,KAAK,OAAO,EACb,MAAM,YAAY,CAAC;AAIpB,wBAAgB,QAAQ,CACtB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAEjE;AAED,wBAAgB,WAAW,CACzB,WAAW,EAAE,UAAU,GAAG,gBAAgB,EAC1C,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GACvB,SAAS,CAOX;AAGD,KAAK,gBAAgB,GAAG,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAErD,KAAK,gBAAgB,CAAC,OAAO,SAAS,MAAM,IAAI,CAC9C,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EAEP,IAAI,EAAE,OAAO,EACb,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,GAAG,SAAS,EACxC,eAAe,EAAE,MAAM,GAAG,SAAS,KAChC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AAErC,8BAAsB,aAAa,CAC/B,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAEpC,YACE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAC/B,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EACxC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC;;IAE5C,QAAQ,CAAC,CAAC,iBAAiB,CAAC,QAAQ;IAKpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAIxB,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;gBAIhD,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,GAAG,SAAS,EACxC,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,QAAQ,EAAE,gBAAgB,CAAC,OAAO,CAAC;IAYrC,WAAW,CACT,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,aAAa,CAAC,iBAAiB,CAAC,GACrC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;IAalC,IAAI,IAAI,MAAM;IAOd,GAAG,QAAO,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC,CAajD;IAEJ,WAAW,GACT,cAAc,MAAM,EACpB,cAAc,CAAC,CAAC,CAAC,EAAE,QAAQ,KAAK,QAAQ,CAAC,GAAG,aAAa,EACzD,UAAU,aAAa,KACtB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAWhC;IAEF,OAAO,GACL,cAAc,MAAM,EACpB,KAAK,CAAC,CAAC,EAAE,QAAQ,KAAK,QAAQ,KAE7B,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CA+I3B;IAEF,KAAK,GACH,0BAA0B,MAAM,GAAG,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,EACrE,YAAY,cAAc,GAAG,gBAAgB,GAAG,SAAS,EACzD,QAAQ,gBAAgB,GAAG,SAAS,KACnC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAgChC;IAEF,KAAK,GACH,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,SAAS,CAAC,CAAC,EAC3D,OAAO;QAAC,SAAS,EAAE,OAAO,CAAA;KAAC,KAC1B,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAa9B;IAEJ,KAAK,GAAI,OAAO,MAAM,KAAG,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAwBtD;IAEF,OAAO,GAAI,SAAS,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EACrE,OAAO,SAAS,EAChB,WAAW,KAAK,GAAG,MAAM,KACxB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAiBhC;IAEF,SAAS,CAAC,OAAO,GACf,cAAc,MAAM,EACpB,IAAI,CAAC,CAAC,KAAK,EAAE,QAAQ,KAAK,QAAQ,CAAC,GAAG,SAAS,EAC/C,UAAU,aAAa,KACtB,SAAS,CA8FV;IAEF,IAAI,GAAG,IAAI,GAAG,CAEb;IAED,OAAO,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI;CAGjC;AAWD,wBAAgB,eAAe,CAC7B,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EACP,CAAC,EAED,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EACtC,QAAQ,EAAE,aAAa,EACvB,OAAO,GAAE,WAAW,CAClB,OAAO,EACP,MAAM,EACN,OAAO,EACP,CAAC,CAEwB,EAC3B,OAAO,CAAC,EAAE,kBAAkB,GAC3B,CAAC,CAuEH;AAGD,wBAAsB,OAAO,CAC3B,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EAEP,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EACtC,QAAQ,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CA6BjC;AAED,wBAAgB,WAAW,CACzB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EAEP,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EACtC,QAAQ,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,cAAc,GACvB;IACD,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB,CA0BA;AAED,qBAAa,SAAS,CAClB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAEpC,SAAQ,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAC9C,YACE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC;gBAG1C,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;CAsB3B"}
+{"version":3,"file":"query-impl.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/query-impl.ts"],"names":[],"mappings":"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"}

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

@@ -1,18 +1,27 @@
-import { resolver } from "@rocicorp/resolver";
 import { assert } from "../../../shared/src/asserts.js";
 import { SUBQ_PREFIX } from "../../../zero-protocol/src/ast.js";
-import { hashOfAST, hashOfNameAndArgs } from "../../../zero-protocol/src/query-hash.js";
-import { buildPipeline } from "../builder/builder.js";
+import { hashOfAST } from "../../../zero-protocol/src/query-hash.js";
 import { NotImplementedError } from "../error.js";
-import { ArrayView } from "../ivm/array-view.js";
 import { defaultFormat } from "../../../zero-types/src/format.js";
-import { ExpressionBuilder, cmp, and, simplifyCondition } from "./expression.js";
-import { queryInternalsTag, asQueryInternals } from "./query-internals.js";
-import { DEFAULT_TTL_MS, DEFAULT_PRELOAD_TTL_MS } from "./ttl.js";
+import { cmp, and, simplifyCondition, ExpressionBuilder } from "./expression.js";
+import { queryInternalsTag } from "./query-internals.js";
 function newQuery(schema, table) {
-  return new QueryImpl(schema, table, { table }, defaultFormat, void 0);
+  return newQueryImpl(schema, table, { table }, defaultFormat, "client");
 }
-class AbstractQuery {
+function newQueryImpl(schema, tableName, ast, format, system) {
+  const inner = (tableName2, ast2, format2, customQueryID, currentJunction) => new QueryImpl(
+    schema,
+    tableName2,
+    ast2,
+    format2,
+    system,
+    customQueryID,
+    currentJunction,
+    inner
+  );
+  return inner(tableName, ast, format, void 0, void 0);
+}
+class QueryImpl {
   [queryInternalsTag] = true;
   #schema;
   #tableName;
@@ -33,6 +42,15 @@ class AbstractQuery {
     this.customQueryID = customQueryID;
     this.#newQuery = newQuery2;
   }
+  run(_options) {
+    throwQueryNotRunnable();
+  }
+  preload(_options) {
+    throwQueryNotRunnable();
+  }
+  materialize(_factoryOrTTL, _ttl) {
+    throwQueryNotRunnable();
+  }
   nameAndArgs(name, args) {
     return this.#newQuery(
       this.#tableName,
@@ -100,7 +118,7 @@ class AbstractQuery {
         this.customQueryID,
         void 0
       );
-      const subQuery = asAbstractQuery(cb(q));
+      const subQuery = asQueryImpl(cb(q));
       assert(
         isCompoundKey(sourceField),
         "The source of a relationship must specify at last 1 field"
@@ -144,7 +162,7 @@ class AbstractQuery {
       const [firstRelation, secondRelation] = related;
       const { destSchema } = secondRelation;
       const junctionSchema = firstRelation.destSchema;
-      const sq = asAbstractQuery(
+      const sq = asQueryImpl(
         cb(
           this.#newQuery(
             destSchema,
@@ -211,9 +229,7 @@ class AbstractQuery {
   where = (fieldOrExpressionFactory, opOrValue, value) => {
     let cond;
     if (typeof fieldOrExpressionFactory === "function") {
-      cond = fieldOrExpressionFactory(
-        new ExpressionBuilder(this._exists)
-      );
+      cond = fieldOrExpressionFactory(this.expressionBuilder());
     } else {
       assert(opOrValue !== void 0, "Invalid condition");
       cond = cmp(fieldOrExpressionFactory, opOrValue, value);
@@ -287,7 +303,7 @@ class AbstractQuery {
       this.#currentJunction
     );
   };
-  _exists = (relationship, cb, options) => {
+  #exists = (relationship, cb, options) => {
     cb = cb ?? ((q) => q);
     const flip = options?.flip;
     const related = this.#schema.relationships[this.#tableName][relationship];
@@ -296,7 +312,7 @@ class AbstractQuery {
       const { destSchema: destTableName, sourceField, destField } = related[0];
       assert(isCompoundKey(sourceField), "Invalid relationship");
       assert(isCompoundKey(destField), "Invalid relationship");
-      const subQuery = asAbstractQuery(
+      const subQuery = asQueryImpl(
         cb(
           this.#newQuery(
             destTableName,
@@ -363,7 +379,7 @@ class AbstractQuery {
                   parentField: secondRelation.sourceField,
                   childField: secondRelation.destField
                 },
-                subquery: queryToDest.#ast
+                subquery: asQueryImpl(queryToDest).#ast
               },
               op: "EXISTS",
               flip
@@ -379,157 +395,16 @@ class AbstractQuery {
   get ast() {
     return this.#ast;
   }
-  toQuery(_context) {
-    return this;
+  expressionBuilder() {
+    return new ExpressionBuilder(this.#exists);
   }
 }
-function asAbstractQuery(q) {
-  assert(q instanceof AbstractQuery);
+function asQueryImpl(q) {
+  assert(q instanceof QueryImpl);
   return q;
 }
-function materializeImpl(query, delegate, factory = arrayViewFactory, options) {
-  let ttl = options?.ttl ?? DEFAULT_TTL_MS;
-  const qi = asQueryInternals(query);
-  const { ast, format, customQueryID } = qi;
-  const queryHash = qi.hash();
-  const queryID = customQueryID ? hashOfNameAndArgs(customQueryID.name, customQueryID.args) : queryHash;
-  const queryCompleteResolver = resolver();
-  let queryComplete = delegate.defaultQueryComplete;
-  const updateTTL = customQueryID ? (newTTL) => delegate.updateCustomQuery(customQueryID, newTTL) : (newTTL) => delegate.updateServerQuery(ast, newTTL);
-  const gotCallback = (got, error) => {
-    if (error) {
-      queryCompleteResolver.reject(error);
-      queryComplete = error;
-      return;
-    }
-    if (got) {
-      delegate.addMetric(
-        "query-materialization-end-to-end",
-        performance.now() - t0,
-        queryID,
-        ast
-      );
-      queryComplete = true;
-      queryCompleteResolver.resolve(true);
-    }
-  };
-  let removeCommitObserver;
-  const onDestroy = () => {
-    input.destroy();
-    removeCommitObserver?.();
-    removeAddedQuery();
-  };
-  const t0 = performance.now();
-  const removeAddedQuery = customQueryID ? delegate.addCustomQuery(ast, customQueryID, ttl, gotCallback) : delegate.addServerQuery(ast, ttl, gotCallback);
-  const input = buildPipeline(ast, delegate, queryID);
-  const view = delegate.batchViewUpdates(
-    () => (factory ?? arrayViewFactory)(
-      query,
-      input,
-      format,
-      onDestroy,
-      (cb) => {
-        removeCommitObserver = delegate.onTransactionCommit(cb);
-      },
-      queryComplete || queryCompleteResolver.promise,
-      updateTTL
-    )
-  );
-  delegate.addMetric(
-    "query-materialization-client",
-    performance.now() - t0,
-    queryID
-  );
-  return view;
-}
-async function runImpl(query, delegate, options) {
-  delegate.assertValidRunOptions(options);
-  const v = materializeImpl(
-    query,
-    delegate,
-    void 0,
-    {
-      ttl: options?.ttl
-    }
-  );
-  if (options?.type === "complete") {
-    return new Promise((resolve) => {
-      v.addListener((data, type) => {
-        if (type === "complete") {
-          v.destroy();
-          resolve(data);
-        } else if (type === "error") {
-          v.destroy();
-          resolve(Promise.reject(data));
-        }
-      });
-    });
-  }
-  options?.type;
-  const ret = v.data;
-  v.destroy();
-  return ret;
-}
-function preloadImpl(query, delegate, options) {
-  const qi = asQueryInternals(query);
-  const ttl = options?.ttl ?? DEFAULT_PRELOAD_TTL_MS;
-  const { resolve, promise: complete } = resolver();
-  const { customQueryID, ast } = qi;
-  if (customQueryID) {
-    const cleanup2 = delegate.addCustomQuery(ast, customQueryID, ttl, (got) => {
-      if (got) {
-        resolve();
-      }
-    });
-    return {
-      cleanup: cleanup2,
-      complete
-    };
-  }
-  const cleanup = delegate.addServerQuery(ast, ttl, (got) => {
-    if (got) {
-      resolve();
-    }
-  });
-  return {
-    cleanup,
-    complete
-  };
-}
-class QueryImpl extends AbstractQuery {
-  constructor(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 QueryImpl(
-        schema,
-        tableName2,
-        ast2,
-        format2,
-        system,
-        customQueryID2,
-        currentJunction2
-      )
-    );
-  }
-}
-function arrayViewFactory(_query, input, format, onDestroy, onTransactionCommit, queryComplete, updateTTL) {
-  const v = new ArrayView(
-    input,
-    format,
-    queryComplete,
-    updateTTL
-  );
-  v.onDestroy = onDestroy;
-  onTransactionCommit(() => {
-    v.flush();
-  });
-  return v;
+function throwQueryNotRunnable() {
+  throw new Error("Query is not runnable");
 }
 function isCompoundKey(field) {
   return Array.isArray(field) && field.length >= 1;
@@ -541,11 +416,9 @@ function isTwoHop(r) {
   return r.length === 2;
 }
 export {
-  AbstractQuery,
   QueryImpl,
-  materializeImpl,
+  asQueryImpl,
   newQuery,
-  preloadImpl,
-  runImpl
+  newQueryImpl
 };
 //# sourceMappingURL=query-impl.js.map