@rocicorp/zero 1.11.0-canary.2 → 1.11.0-canary.20

package/out/zero-solid/src/solid-view.js

@@ -7,6 +7,7 @@ import { produce, reconcile } from "solid-js/store";
 //#region ../zero-solid/src/solid-view.ts
 var COMPLETE = Object.freeze({ type: "complete" });
 var UNKNOWN = Object.freeze({ type: "unknown" });
+var CACHED = Object.freeze({ type: "cached" });
 /**
 * SolidView bridges Zero's incremental view updates with Solid's reactive
 * store.
@@ -57,6 +58,8 @@ var SolidView = class {
 	#setState;
 	#builderRoot;
 	#pendingChanges = [];
+	#pendingResultType;
+	#held = false;
 	#updateTTL;
 	constructor(input, onTransactionCommit, format, onDestroy, queryComplete, updateTTL, setState, retry) {
 		this.#input = input;
@@ -77,7 +80,7 @@ var SolidView = class {
 		if (queryComplete !== true && !("error" in queryComplete)) queryComplete.then(() => {
 			this.#setState((prev) => [prev[0], COMPLETE]);
 		}).catch((error) => {
-			this.#setState((prev) => [prev[0], this.#makeError(error)]);
+			this.#transitionResultType((prev) => [prev[0], this.#makeError(error)]);
 		});
 	}
 	#makeError(error) {
@@ -96,7 +99,37 @@ var SolidView = class {
 	destroy() {
 		this.#onDestroy();
 	}
+	/**
+	* The store holds the server-confirmed result of this query from a
+	* previous connection. Never downgrades 'complete'/'error'; freshness stays
+	* a promise only the connection can keep, so nothing that waits on
+	* 'complete' resolves here.
+	*/
+	markCached() {
+		this.#transitionResultType((prev) => prev[1].type === "unknown" ? [prev[0], CACHED] : prev);
+	}
+	/** The got key was deleted (eviction) before this connection confirmed it. */
+	unmarkCached() {
+		this.#transitionResultType((prev) => prev[1].type === "cached" ? [prev[0], UNKNOWN] : prev);
+	}
+	/**
+	* Called before a deferred pipeline hydrates this view over several tasks
+	* (see `ViewFactory`). Rows already only reach the store at commit; this
+	* makes result type transitions wait for that commit too, including when
+	* the hydration produced no rows.
+	*/
+	holdData() {
+		this.#held = true;
+	}
+	#transitionResultType(transition) {
+		if (this.#held || this.#hasUncommittedChanges()) this.#pendingResultType = transition;
+		else this.#setState(transition);
+	}
+	#hasUncommittedChanges() {
+		return this.#builderRoot !== void 0 && !isEmptyRoot(this.#builderRoot) || this.#pendingChanges.length > 0;
+	}
 	#onTransactionCommit = () => {
+		this.#held = false;
 		const builderRoot = this.#builderRoot;
 		if (builderRoot) {
 			if (!isEmptyRoot(builderRoot)) {
@@ -108,6 +141,11 @@ var SolidView = class {
 		} finally {
 			this.#pendingChanges = [];
 		}
+		const pendingResultType = this.#pendingResultType;
+		if (pendingResultType) {
+			this.#pendingResultType = void 0;
+			this.#setState(pendingResultType);
+		}
 	};
 	push(change) {
 		if (this.#builderRoot) this.#applyChangeToRoot(materializeRelationships(change), this.#builderRoot);

package/out/zero-solid/src/solid-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"solid-view.js","names":["#input","#format","#onDestroy","#retry","#updateTTL","#onTransactionCommit","#createEmptyRoot","#applyChangesToRoot","#setState","#makeError","#builderRoot","#applyChanges","#pendingChanges","#applyChangeToRoot"],"sources":["../../../../zero-solid/src/solid-view.ts"],"sourcesContent":["import {produce, reconcile, type SetStoreFunction} from 'solid-js/store';\nimport {emptyArray} from '../../shared/src/sentinels.ts';\nimport {ChangeIndex} from '../../zql/src/ivm/change-index.ts';\nimport {ChangeType} from '../../zql/src/ivm/change-type.ts';\nimport {\n  applyChange,\n  idSymbol,\n  skipYields,\n  type ViewChange,\n} from './bindings.ts';\nimport {\n  type AnyViewFactory,\n  type Change,\n  type Entry,\n  type ErroredQuery,\n  type Format,\n  type Input,\n  type Node,\n  type Output,\n  type Query,\n  type QueryErrorDetails,\n  type QueryResultDetails,\n  type Schema,\n  type Stream,\n  type TTL,\n} from './zero.ts';\n\nexport type State = [Entry, QueryResultDetails];\n\nexport const COMPLETE: QueryResultDetails = Object.freeze({type: 'complete'});\nexport const UNKNOWN: QueryResultDetails = Object.freeze({type: 'unknown'});\n\n/**\n * SolidView bridges Zero's incremental view updates with Solid's reactive\n * store.\n *\n * The challenge: Zero pushes individual row changes (add/remove/edit) as they\n * arrive, but updating Solid's store on each push is expensive. We batch\n * changes until transaction commit, then apply them all at once.\n *\n * Two code paths optimize for different scenarios:\n *\n *   1. BULK INSERT (builderRoot path): When building from empty, we skip\n *      Solid's reactive tracking entirely and build a plain JS object. This is\n *      5x faster for large initial loads. Uses reconcile() to diff the final\n *      result into Solid.\n *\n *   2. INCREMENTAL UPDATE (#pendingChanges path): For existing views, we queue\n *      changes and apply them in-place within a produce() draft. produce()\n *      creates a mutable draft, applyChange mutates it directly, then produce()\n *      handles diffing and reactivity.\n *\n *\n *   push(change)\n *       │\n *       ▼\n *   ┌─────────────────────────────────┐\n *   │ builderRoot defined?            │\n *   │ (building from empty)           │\n *   └─────────────────────────────────┘\n *       │yes                │no\n *       ▼                   ▼\n *   Build plain JS      Queue in\n *   object (fast)       #pendingChanges\n *       │                   │\n *       └───────┬───────────┘\n *               ▼\n *         onTransactionCommit()\n *               │\n *       ┌───────┴──────────┐\n *       │                  │\n *   builderRoot      produce(draft =>\n *   → reconcile()      applyChange(draft, ..., mutate: true))\n */\nexport class SolidView implements Output {\n  readonly #input: Input;\n  readonly #format: Format;\n  readonly #onDestroy: () => void;\n  readonly #retry: () => void;\n\n  #setState: SetStoreFunction<State>;\n\n  // Optimization: if the store is currently empty we build up\n  // the view on a plain old JS object stored at #builderRoot, and return\n  // that for the new state on transaction commit.  This avoids building up\n  // large views from scratch via solid produce.  The proxy object used by\n  // solid produce is slow and in this case we don't care about solid tracking\n  // the fine grained changes (everything has changed, it's all new).  For a\n  // test case with a view with 3000 rows, each row having 2 children, this\n  // optimization reduced #applyChanges time from 743ms to 133ms.\n  #builderRoot: Entry | undefined;\n  #pendingChanges: ViewChange[] = [];\n  readonly #updateTTL: (ttl: TTL) => void;\n\n  constructor(\n    input: Input,\n    onTransactionCommit: (cb: () => void) => void,\n    format: Format,\n    onDestroy: () => void,\n    queryComplete: true | ErroredQuery | Promise<true>,\n    updateTTL: (ttl: TTL) => void,\n    setState: SetStoreFunction<State>,\n    retry: () => void,\n  ) {\n    this.#input = input;\n    onTransactionCommit(this.#onTransactionCommit);\n    this.#format = format;\n    this.#onDestroy = onDestroy;\n    this.#updateTTL = updateTTL;\n    this.#retry = retry;\n\n    input.setOutput(this);\n\n    const initialRoot = this.#createEmptyRoot();\n    this.#applyChangesToRoot(\n      skipYields(input.fetch({})),\n      node => ({type: 'add', node}),\n      initialRoot,\n    );\n\n    this.#setState = setState;\n    this.#setState(\n      reconcile(\n        [\n          initialRoot,\n          queryComplete === true\n            ? COMPLETE\n            : 'error' in queryComplete\n              ? this.#makeError(queryComplete)\n              : UNKNOWN,\n        ],\n        {\n          // solidjs's types want a string, but a symbol works\n          key: idSymbol as unknown as string,\n        },\n      ),\n    );\n\n    if (isEmptyRoot(initialRoot)) {\n      this.#builderRoot = this.#createEmptyRoot();\n    }\n\n    if (queryComplete !== true && !('error' in queryComplete)) {\n      void queryComplete\n        .then(() => {\n          this.#setState(prev => [prev[0], COMPLETE]);\n        })\n        .catch((error: ErroredQuery) => {\n          this.#setState(prev => [prev[0], this.#makeError(error)]);\n        });\n    }\n  }\n\n  #makeError(error: ErroredQuery): QueryErrorDetails {\n    const message = error.message ?? 'An unknown error occurred';\n    return {\n      type: 'error',\n      retry: this.#retry,\n      refetch: this.#retry,\n      error: {\n        type: error.error,\n        message,\n        ...(error.details ? {details: error.details} : {}),\n      },\n    };\n  }\n\n  destroy(): void {\n    this.#onDestroy();\n  }\n\n  #onTransactionCommit = () => {\n    const builderRoot = this.#builderRoot;\n    if (builderRoot) {\n      if (!isEmptyRoot(builderRoot)) {\n        this.#setState(\n          0,\n          reconcile(builderRoot, {\n            // solidjs's types want a string, but a symbol works\n            key: idSymbol as unknown as string,\n          }),\n        );\n        this.#builderRoot = undefined;\n      }\n    } else {\n      try {\n        this.#applyChanges(this.#pendingChanges, c => c);\n      } finally {\n        this.#pendingChanges = [];\n      }\n    }\n  };\n\n  push(change: Change) {\n    // Delay updating the solid store state until the transaction commit\n    // (because each update of the solid store is quite expensive).  If\n    // this.#builderRoot is defined apply the changes to it (we are building\n    // from an empty root), otherwise queue the changes to be applied\n    // using produce at the end of the transaction but read the relationships\n    // now as they are only valid to read when the push is received.\n    if (this.#builderRoot) {\n      this.#applyChangeToRoot(\n        materializeRelationships(change),\n        this.#builderRoot,\n      );\n    } else {\n      this.#pendingChanges.push(materializeRelationships(change));\n    }\n    return emptyArray;\n  }\n\n  #applyChanges<T>(changes: Iterable<T>, mapper: (v: T) => ViewChange): void {\n    this.#setState(\n      produce((draftState: State) => {\n        this.#applyChangesToRoot<T>(changes, mapper, draftState[0]);\n        if (isEmptyRoot(draftState[0])) {\n          this.#builderRoot = this.#createEmptyRoot();\n        }\n      }),\n    );\n  }\n\n  #applyChangesToRoot<T>(\n    changes: Iterable<T>,\n    mapper: (v: T) => ViewChange,\n    root: Entry,\n  ) {\n    for (const change of changes) {\n      this.#applyChangeToRoot(mapper(change), root);\n    }\n  }\n\n  #applyChangeToRoot(change: ViewChange, root: Entry) {\n    applyChange(\n      root,\n      change,\n      this.#input.getSchema(),\n      '',\n      this.#format,\n      true /* withIDs */,\n      true /* mutate */,\n    );\n  }\n\n  #createEmptyRoot(): Entry {\n    return {\n      '': this.#format.singular ? undefined : [],\n    };\n  }\n\n  updateTTL(ttl: TTL): void {\n    this.#updateTTL(ttl);\n  }\n}\n\nfunction materializeRelationships(change: Change): ViewChange {\n  switch (change[ChangeIndex.TYPE]) {\n    case ChangeType.ADD:\n      return {\n        type: 'add',\n        node: materializeNodeRelationships(change[ChangeIndex.NODE]),\n      };\n    case ChangeType.REMOVE:\n      return {\n        type: 'remove',\n        node: materializeNodeRelationships(change[ChangeIndex.NODE]),\n      };\n    case ChangeType.CHILD:\n      return {\n        type: 'child',\n        node: {row: change[ChangeIndex.NODE].row},\n        child: {\n          relationshipName: change[ChangeIndex.CHILD_DATA].relationshipName,\n          change: materializeRelationships(\n            change[ChangeIndex.CHILD_DATA].change,\n          ),\n        },\n      };\n    case ChangeType.EDIT:\n      return {\n        type: 'edit',\n        node: {row: change[ChangeIndex.NODE].row},\n        oldNode: {row: change[ChangeIndex.OLD_NODE].row},\n      };\n  }\n}\n\nfunction materializeNodeRelationships(node: Node): Node {\n  const relationships: Record<string, () => Stream<Node>> = {};\n  for (const relationship in node.relationships) {\n    const materialized: Node[] = [];\n    for (const n of skipYields(node.relationships[relationship]())) {\n      materialized.push(materializeNodeRelationships(n));\n    }\n    relationships[relationship] = () => materialized;\n  }\n  return {\n    row: node.row,\n    relationships,\n  };\n}\n\nfunction isEmptyRoot(entry: Entry) {\n  const data = entry[''];\n  return data === undefined || (Array.isArray(data) && data.length === 0);\n}\n\nexport function createSolidViewFactory(\n  setState: SetStoreFunction<State>,\n  retry?: () => void,\n) {\n  function solidViewFactory<\n    TTable extends keyof TSchema['tables'] & string,\n    TSchema extends Schema,\n    TReturn,\n  >(\n    _query: Query<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  ) {\n    return new SolidView(\n      input,\n      onTransactionCommit,\n      format,\n      onDestroy,\n      queryComplete,\n      updateTTL,\n      setState,\n      retry || (() => {}),\n    );\n  }\n\n  solidViewFactory satisfies AnyViewFactory;\n\n  return solidViewFactory;\n}\n"],"mappings":"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"}
+{"version":3,"file":"solid-view.js","names":["#input","#format","#onDestroy","#retry","#updateTTL","#onTransactionCommit","#createEmptyRoot","#applyChangesToRoot","#setState","#makeError","#builderRoot","#transitionResultType","#held","#hasUncommittedChanges","#pendingResultType","#pendingChanges","#applyChanges","#applyChangeToRoot"],"sources":["../../../../zero-solid/src/solid-view.ts"],"sourcesContent":["import {produce, reconcile, type SetStoreFunction} from 'solid-js/store';\nimport {emptyArray} from '../../shared/src/sentinels.ts';\nimport {ChangeIndex} from '../../zql/src/ivm/change-index.ts';\nimport {ChangeType} from '../../zql/src/ivm/change-type.ts';\nimport {\n  applyChange,\n  idSymbol,\n  skipYields,\n  type ViewChange,\n} from './bindings.ts';\nimport {\n  type AnyViewFactory,\n  type Change,\n  type Entry,\n  type ErroredQuery,\n  type Format,\n  type Input,\n  type Node,\n  type Output,\n  type Query,\n  type QueryErrorDetails,\n  type QueryResultDetails,\n  type Schema,\n  type Stream,\n  type TTL,\n} from './zero.ts';\n\nexport type State = [Entry, QueryResultDetails];\n\nexport const COMPLETE: QueryResultDetails = Object.freeze({type: 'complete'});\nexport const UNKNOWN: QueryResultDetails = Object.freeze({type: 'unknown'});\nexport const CACHED: QueryResultDetails = Object.freeze({type: 'cached'});\n\n/**\n * SolidView bridges Zero's incremental view updates with Solid's reactive\n * store.\n *\n * The challenge: Zero pushes individual row changes (add/remove/edit) as they\n * arrive, but updating Solid's store on each push is expensive. We batch\n * changes until transaction commit, then apply them all at once.\n *\n * Two code paths optimize for different scenarios:\n *\n *   1. BULK INSERT (builderRoot path): When building from empty, we skip\n *      Solid's reactive tracking entirely and build a plain JS object. This is\n *      5x faster for large initial loads. Uses reconcile() to diff the final\n *      result into Solid.\n *\n *   2. INCREMENTAL UPDATE (#pendingChanges path): For existing views, we queue\n *      changes and apply them in-place within a produce() draft. produce()\n *      creates a mutable draft, applyChange mutates it directly, then produce()\n *      handles diffing and reactivity.\n *\n *\n *   push(change)\n *       │\n *       ▼\n *   ┌─────────────────────────────────┐\n *   │ builderRoot defined?            │\n *   │ (building from empty)           │\n *   └─────────────────────────────────┘\n *       │yes                │no\n *       ▼                   ▼\n *   Build plain JS      Queue in\n *   object (fast)       #pendingChanges\n *       │                   │\n *       └───────┬───────────┘\n *               ▼\n *         onTransactionCommit()\n *               │\n *       ┌───────┴──────────┐\n *       │                  │\n *   builderRoot      produce(draft =>\n *   → reconcile()      applyChange(draft, ..., mutate: true))\n */\nexport class SolidView implements Output {\n  readonly #input: Input;\n  readonly #format: Format;\n  readonly #onDestroy: () => void;\n  readonly #retry: () => void;\n\n  #setState: SetStoreFunction<State>;\n\n  // Optimization: if the store is currently empty we build up\n  // the view on a plain old JS object stored at #builderRoot, and return\n  // that for the new state on transaction commit.  This avoids building up\n  // large views from scratch via solid produce.  The proxy object used by\n  // solid produce is slow and in this case we don't care about solid tracking\n  // the fine grained changes (everything has changed, it's all new).  For a\n  // test case with a view with 3000 rows, each row having 2 children, this\n  // optimization reduced #applyChanges time from 743ms to 133ms.\n  #builderRoot: Entry | undefined;\n  #pendingChanges: ViewChange[] = [];\n  // A result type transition requested while row changes are waiting for the\n  // next commit. It is applied with them, so a cached claim never reaches the\n  // store before the rows it is about.\n  #pendingResultType: ((prev: State) => State) | undefined;\n  #held = false;\n  readonly #updateTTL: (ttl: TTL) => void;\n\n  constructor(\n    input: Input,\n    onTransactionCommit: (cb: () => void) => void,\n    format: Format,\n    onDestroy: () => void,\n    queryComplete: true | ErroredQuery | Promise<true>,\n    updateTTL: (ttl: TTL) => void,\n    setState: SetStoreFunction<State>,\n    retry: () => void,\n  ) {\n    this.#input = input;\n    onTransactionCommit(this.#onTransactionCommit);\n    this.#format = format;\n    this.#onDestroy = onDestroy;\n    this.#updateTTL = updateTTL;\n    this.#retry = retry;\n\n    input.setOutput(this);\n\n    const initialRoot = this.#createEmptyRoot();\n    this.#applyChangesToRoot(\n      skipYields(input.fetch({})),\n      node => ({type: 'add', node}),\n      initialRoot,\n    );\n\n    this.#setState = setState;\n    this.#setState(\n      reconcile(\n        [\n          initialRoot,\n          queryComplete === true\n            ? COMPLETE\n            : 'error' in queryComplete\n              ? this.#makeError(queryComplete)\n              : UNKNOWN,\n        ],\n        {\n          // solidjs's types want a string, but a symbol works\n          key: idSymbol as unknown as string,\n        },\n      ),\n    );\n\n    if (isEmptyRoot(initialRoot)) {\n      this.#builderRoot = this.#createEmptyRoot();\n    }\n\n    if (queryComplete !== true && !('error' in queryComplete)) {\n      void queryComplete\n        .then(() => {\n          this.#setState(prev => [prev[0], COMPLETE]);\n        })\n        .catch((error: ErroredQuery) => {\n          // Through the pending path: a deferred attach that fails is\n          // published with the commit of its batch, not during it.\n          this.#transitionResultType(prev => [prev[0], this.#makeError(error)]);\n        });\n    }\n  }\n\n  #makeError(error: ErroredQuery): QueryErrorDetails {\n    const message = error.message ?? 'An unknown error occurred';\n    return {\n      type: 'error',\n      retry: this.#retry,\n      refetch: this.#retry,\n      error: {\n        type: error.error,\n        message,\n        ...(error.details ? {details: error.details} : {}),\n      },\n    };\n  }\n\n  destroy(): void {\n    this.#onDestroy();\n  }\n\n  /**\n   * The store holds the server-confirmed result of this query from a\n   * previous connection. Never downgrades 'complete'/'error'; freshness stays\n   * a promise only the connection can keep, so nothing that waits on\n   * 'complete' resolves here.\n   */\n  markCached(): void {\n    this.#transitionResultType(prev =>\n      prev[1].type === 'unknown' ? [prev[0], CACHED] : prev,\n    );\n  }\n\n  /** The got key was deleted (eviction) before this connection confirmed it. */\n  unmarkCached(): void {\n    this.#transitionResultType(prev =>\n      prev[1].type === 'cached' ? [prev[0], UNKNOWN] : prev,\n    );\n  }\n\n  /**\n   * Called before a deferred pipeline hydrates this view over several tasks\n   * (see `ViewFactory`). Rows already only reach the store at commit; this\n   * makes result type transitions wait for that commit too, including when\n   * the hydration produced no rows.\n   */\n  holdData(): void {\n    this.#held = true;\n  }\n\n  #transitionResultType(transition: (prev: State) => State): void {\n    if (this.#held || this.#hasUncommittedChanges()) {\n      // The last requested transition wins; each is a no-op unless the state\n      // it expects is current, so the net effect at commit is correct.\n      this.#pendingResultType = transition;\n    } else {\n      this.#setState(transition);\n    }\n  }\n\n  #hasUncommittedChanges(): boolean {\n    return (\n      (this.#builderRoot !== undefined && !isEmptyRoot(this.#builderRoot)) ||\n      this.#pendingChanges.length > 0\n    );\n  }\n\n  #onTransactionCommit = () => {\n    this.#held = false;\n    const builderRoot = this.#builderRoot;\n    if (builderRoot) {\n      if (!isEmptyRoot(builderRoot)) {\n        this.#setState(\n          0,\n          reconcile(builderRoot, {\n            // solidjs's types want a string, but a symbol works\n            key: idSymbol as unknown as string,\n          }),\n        );\n        this.#builderRoot = undefined;\n      }\n    } else {\n      try {\n        this.#applyChanges(this.#pendingChanges, c => c);\n      } finally {\n        this.#pendingChanges = [];\n      }\n    }\n    const pendingResultType = this.#pendingResultType;\n    if (pendingResultType) {\n      this.#pendingResultType = undefined;\n      this.#setState(pendingResultType);\n    }\n  };\n\n  push(change: Change) {\n    // Delay updating the solid store state until the transaction commit\n    // (because each update of the solid store is quite expensive).  If\n    // this.#builderRoot is defined apply the changes to it (we are building\n    // from an empty root), otherwise queue the changes to be applied\n    // using produce at the end of the transaction but read the relationships\n    // now as they are only valid to read when the push is received.\n    if (this.#builderRoot) {\n      this.#applyChangeToRoot(\n        materializeRelationships(change),\n        this.#builderRoot,\n      );\n    } else {\n      this.#pendingChanges.push(materializeRelationships(change));\n    }\n    return emptyArray;\n  }\n\n  #applyChanges<T>(changes: Iterable<T>, mapper: (v: T) => ViewChange): void {\n    this.#setState(\n      produce((draftState: State) => {\n        this.#applyChangesToRoot<T>(changes, mapper, draftState[0]);\n        if (isEmptyRoot(draftState[0])) {\n          this.#builderRoot = this.#createEmptyRoot();\n        }\n      }),\n    );\n  }\n\n  #applyChangesToRoot<T>(\n    changes: Iterable<T>,\n    mapper: (v: T) => ViewChange,\n    root: Entry,\n  ) {\n    for (const change of changes) {\n      this.#applyChangeToRoot(mapper(change), root);\n    }\n  }\n\n  #applyChangeToRoot(change: ViewChange, root: Entry) {\n    applyChange(\n      root,\n      change,\n      this.#input.getSchema(),\n      '',\n      this.#format,\n      true /* withIDs */,\n      true /* mutate */,\n    );\n  }\n\n  #createEmptyRoot(): Entry {\n    return {\n      '': this.#format.singular ? undefined : [],\n    };\n  }\n\n  updateTTL(ttl: TTL): void {\n    this.#updateTTL(ttl);\n  }\n}\n\nfunction materializeRelationships(change: Change): ViewChange {\n  switch (change[ChangeIndex.TYPE]) {\n    case ChangeType.ADD:\n      return {\n        type: 'add',\n        node: materializeNodeRelationships(change[ChangeIndex.NODE]),\n      };\n    case ChangeType.REMOVE:\n      return {\n        type: 'remove',\n        node: materializeNodeRelationships(change[ChangeIndex.NODE]),\n      };\n    case ChangeType.CHILD:\n      return {\n        type: 'child',\n        node: {row: change[ChangeIndex.NODE].row},\n        child: {\n          relationshipName: change[ChangeIndex.CHILD_DATA].relationshipName,\n          change: materializeRelationships(\n            change[ChangeIndex.CHILD_DATA].change,\n          ),\n        },\n      };\n    case ChangeType.EDIT:\n      return {\n        type: 'edit',\n        node: {row: change[ChangeIndex.NODE].row},\n        oldNode: {row: change[ChangeIndex.OLD_NODE].row},\n      };\n  }\n}\n\nfunction materializeNodeRelationships(node: Node): Node {\n  const relationships: Record<string, () => Stream<Node>> = {};\n  for (const relationship in node.relationships) {\n    const materialized: Node[] = [];\n    for (const n of skipYields(node.relationships[relationship]())) {\n      materialized.push(materializeNodeRelationships(n));\n    }\n    relationships[relationship] = () => materialized;\n  }\n  return {\n    row: node.row,\n    relationships,\n  };\n}\n\nfunction isEmptyRoot(entry: Entry) {\n  const data = entry[''];\n  return data === undefined || (Array.isArray(data) && data.length === 0);\n}\n\nexport function createSolidViewFactory(\n  setState: SetStoreFunction<State>,\n  retry?: () => void,\n) {\n  function solidViewFactory<\n    TTable extends keyof TSchema['tables'] & string,\n    TSchema extends Schema,\n    TReturn,\n  >(\n    _query: Query<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  ) {\n    return new SolidView(\n      input,\n      onTransactionCommit,\n      format,\n      onDestroy,\n      queryComplete,\n      updateTTL,\n      setState,\n      retry || (() => {}),\n    );\n  }\n\n  solidViewFactory satisfies AnyViewFactory;\n\n  return solidViewFactory;\n}\n"],"mappings":"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"}

package/out/zero-solid/src/use-query.js

@@ -36,7 +36,6 @@ function useQuery(querySignal, options) {
 		return internals === void 0 ? void 0 : internals.hash() + zero().clientID;
 	});
 	const ttl = createMemo(() => normalize(options)?.ttl ?? 3e5);
-	const initialTTL = ttl();
 	const view = createMemo(() => {
 		const currentHash = hash();
 		refetchKey();
@@ -49,7 +48,7 @@ function useQuery(querySignal, options) {
 			setState([{ "": void 0 }, UNKNOWN]);
 			return;
 		}
-		const v = zero().materialize(untrackedQuery, createSolidViewFactory(setState, refetch), { ttl: initialTTL });
+		const v = zero().materialize(untrackedQuery, createSolidViewFactory(setState, refetch), { ttl: untrack(ttl) });
 		onCleanup(() => v.destroy());
 		return v;
 	});

package/out/zero-solid/src/use-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-query.js","names":[],"sources":["../../../../zero-solid/src/use-query.ts"],"sourcesContent":["import {\n  createEffect,\n  createMemo,\n  createSignal,\n  on,\n  onCleanup,\n  untrack,\n  type Accessor,\n} from 'solid-js';\nimport {createStore} from 'solid-js/store';\nimport {\n  addContextToQuery,\n  asQueryInternals,\n  DEFAULT_TTL_MS,\n} from './bindings.ts';\nimport {createSolidViewFactory, UNKNOWN, type State} from './solid-view.ts';\nimport {useZero} from './use-zero.ts';\nimport {\n  type BaseDefaultContext,\n  type BaseDefaultSchema,\n  type DefaultContext,\n  type DefaultSchema,\n  type Falsy,\n  type HumanReadable,\n  type PullRow,\n  type QueryOrQueryRequest,\n  type QueryResultDetails,\n  type ReadonlyJSONValue,\n  type TTL,\n} from './zero.ts';\n\nexport type QueryResult<TReturn> = readonly [\n  Accessor<HumanReadable<TReturn>>,\n  Accessor<QueryResultDetails & {}>,\n];\n\n/**\n * Result type for \"maybe queries\" - queries that may be falsy.\n * The data value can be undefined when the query is falsy/disabled.\n */\nexport type MaybeQueryResult<TReturn> = readonly [\n  Accessor<HumanReadable<TReturn> | undefined>,\n  Accessor<QueryResultDetails & {}>,\n];\n\n// Deprecated in 0.22\n/**\n * @deprecated Use {@linkcode UseQueryOptions} instead.\n */\nexport type CreateQueryOptions = {\n  ttl?: TTL | undefined;\n};\n\nexport type UseQueryOptions = {\n  ttl?: TTL | undefined;\n};\n\n// Deprecated in 0.22\n/**\n * @deprecated Use {@linkcode useQuery} instead.\n */\nexport function createQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  querySignal: Accessor<\n    QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n  >,\n  options?: CreateQueryOptions | Accessor<CreateQueryOptions>,\n): QueryResult<TReturn> {\n  return useQuery(querySignal, options);\n}\n\n// Overload 1: Query - returns QueryResult<TReturn>\nexport function useQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  querySignal: Accessor<\n    QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n  >,\n  options?: UseQueryOptions | Accessor<UseQueryOptions>,\n): QueryResult<TReturn>;\n\n// Overload 2: Maybe query\nexport function useQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  querySignal: Accessor<\n    | QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n    | Falsy\n  >,\n  options?: UseQueryOptions | Accessor<UseQueryOptions>,\n): MaybeQueryResult<TReturn>;\n\n// Implementation\nexport function useQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  querySignal: Accessor<\n    | QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n    | Falsy\n  >,\n  options?: UseQueryOptions | Accessor<UseQueryOptions>,\n): QueryResult<TReturn> | MaybeQueryResult<TReturn> {\n  const [state, setState] = createStore<State>([\n    {\n      '': undefined,\n    },\n    UNKNOWN,\n  ]);\n  const initialRefetchKey = 0;\n  const [refetchKey, setRefetchKey] = createSignal(initialRefetchKey);\n\n  const refetch = () => {\n    setRefetchKey(k => k + 1);\n  };\n\n  const zero = useZero<TSchema, undefined, TContext>();\n\n  // Handle possibly falsy queries\n  const q = createMemo(() => {\n    const query = querySignal();\n    if (!query) return undefined;\n    return addContextToQuery(query, zero().context);\n  });\n\n  const qi = createMemo(() => {\n    const query = q();\n    if (!query) return undefined;\n    return asQueryInternals(query);\n  });\n\n  // Undefined rather than the string `undefined` + the client id: this feeds\n  // the guard below, and concatenating a missing hash produced a string that\n  // was never equal to undefined, leaving that guard unreachable.\n  const hash = createMemo(() => {\n    const internals = qi();\n    return internals === undefined\n      ? undefined\n      : internals.hash() + zero().clientID;\n  });\n  const ttl = createMemo(() => normalize(options)?.ttl ?? DEFAULT_TTL_MS);\n\n  const initialTTL = ttl();\n\n  const view = createMemo(() => {\n    // Depend on hash instead of query to avoid recreating the view when the\n    // query object changes but the hash is the same.\n    const currentHash = hash();\n    refetchKey();\n\n    // If query is falsy, don't create a view and reset state to undefined\n    if (currentHash === undefined) {\n      setState([{'': undefined}, UNKNOWN]);\n      return undefined;\n    }\n\n    const untrackedQuery = untrack(q);\n    if (!untrackedQuery) {\n      setState([{'': undefined}, UNKNOWN]);\n      return undefined;\n    }\n\n    const v = zero().materialize(\n      untrackedQuery,\n      createSolidViewFactory(setState, refetch),\n      {\n        ttl: initialTTL,\n      },\n    );\n\n    onCleanup(() => v.destroy());\n\n    return v;\n  });\n\n  // Update TTL on existing view when it changes.\n  createEffect(\n    on(\n      ttl,\n      currentTTL => {\n        view()?.updateTTL(currentTTL);\n      },\n      {defer: true},\n    ),\n  );\n\n  return [() => state[0][''] as HumanReadable<TReturn>, () => state[1]];\n}\n\nfunction normalize<T>(options?: T | Accessor<T | undefined>): T | undefined {\n  return typeof options === 'function' ? (options as Accessor<T>)() : options;\n}\n"],"mappings":";;;;;;;;;;;;;AA6DA,SAAgB,YAQd,aAGA,SACsB;CACtB,OAAO,SAAS,aAAa,OAAO;AACtC;AAkCA,SAAgB,SAQd,aAIA,SACkD;CAClD,MAAM,CAAC,OAAO,YAAY,YAAmB,CAC3C,EACE,IAAI,KAAA,EACN,GACA,OACF,CAAC;CAED,MAAM,CAAC,YAAY,iBAAiB,aAAa,CAAiB;CAElE,MAAM,gBAAgB;EACpB,eAAc,MAAK,IAAI,CAAC;CAC1B;CAEA,MAAM,OAAO,QAAsC;CAGnD,MAAM,IAAI,iBAAiB;EACzB,MAAM,QAAQ,YAAY;EAC1B,IAAI,CAAC,OAAO,OAAO,KAAA;EACnB,OAAO,kBAAkB,OAAO,KAAK,EAAE,OAAO;CAChD,CAAC;CAED,MAAM,KAAK,iBAAiB;EAC1B,MAAM,QAAQ,EAAE;EAChB,IAAI,CAAC,OAAO,OAAO,KAAA;EACnB,OAAO,iBAAiB,KAAK;CAC/B,CAAC;CAKD,MAAM,OAAO,iBAAiB;EAC5B,MAAM,YAAY,GAAG;EACrB,OAAO,cAAc,KAAA,IACjB,KAAA,IACA,UAAU,KAAK,IAAI,KAAK,EAAE;CAChC,CAAC;CACD,MAAM,MAAM,iBAAiB,UAAU,OAAO,GAAG,OAAA,GAAqB;CAEtE,MAAM,aAAa,IAAI;CAEvB,MAAM,OAAO,iBAAiB;EAG5B,MAAM,cAAc,KAAK;EACzB,WAAW;EAGX,IAAI,gBAAgB,KAAA,GAAW;GAC7B,SAAS,CAAC,EAAC,IAAI,KAAA,EAAS,GAAG,OAAO,CAAC;GACnC;EACF;EAEA,MAAM,iBAAiB,QAAQ,CAAC;EAChC,IAAI,CAAC,gBAAgB;GACnB,SAAS,CAAC,EAAC,IAAI,KAAA,EAAS,GAAG,OAAO,CAAC;GACnC;EACF;EAEA,MAAM,IAAI,KAAK,EAAE,YACf,gBACA,uBAAuB,UAAU,OAAO,GACxC,EACE,KAAK,WACP,CACF;EAEA,gBAAgB,EAAE,QAAQ,CAAC;EAE3B,OAAO;CACT,CAAC;CAGD,aACE,GACE,MACA,eAAc;EACZ,KAAK,GAAG,UAAU,UAAU;CAC9B,GACA,EAAC,OAAO,KAAI,CACd,CACF;CAEA,OAAO,OAAO,MAAM,GAAG,WAAqC,MAAM,EAAE;AACtE;AAEA,SAAS,UAAa,SAAsD;CAC1E,OAAO,OAAO,YAAY,aAAc,QAAwB,IAAI;AACtE"}
+{"version":3,"file":"use-query.js","names":[],"sources":["../../../../zero-solid/src/use-query.ts"],"sourcesContent":["import {\n  createEffect,\n  createMemo,\n  createSignal,\n  on,\n  onCleanup,\n  untrack,\n  type Accessor,\n} from 'solid-js';\nimport {createStore} from 'solid-js/store';\nimport {\n  addContextToQuery,\n  asQueryInternals,\n  DEFAULT_TTL_MS,\n} from './bindings.ts';\nimport {createSolidViewFactory, UNKNOWN, type State} from './solid-view.ts';\nimport {useZero} from './use-zero.ts';\nimport {\n  type BaseDefaultContext,\n  type BaseDefaultSchema,\n  type DefaultContext,\n  type DefaultSchema,\n  type Falsy,\n  type HumanReadable,\n  type PullRow,\n  type QueryOrQueryRequest,\n  type QueryResultDetails,\n  type ReadonlyJSONValue,\n  type TTL,\n} from './zero.ts';\n\nexport type QueryResult<TReturn> = readonly [\n  Accessor<HumanReadable<TReturn>>,\n  Accessor<QueryResultDetails & {}>,\n];\n\n/**\n * Result type for \"maybe queries\" - queries that may be falsy.\n * The data value can be undefined when the query is falsy/disabled.\n */\nexport type MaybeQueryResult<TReturn> = readonly [\n  Accessor<HumanReadable<TReturn> | undefined>,\n  Accessor<QueryResultDetails & {}>,\n];\n\n// Deprecated in 0.22\n/**\n * @deprecated Use {@linkcode UseQueryOptions} instead.\n */\nexport type CreateQueryOptions = {\n  ttl?: TTL | undefined;\n};\n\nexport type UseQueryOptions = {\n  ttl?: TTL | undefined;\n};\n\n// Deprecated in 0.22\n/**\n * @deprecated Use {@linkcode useQuery} instead.\n */\nexport function createQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  querySignal: Accessor<\n    QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n  >,\n  options?: CreateQueryOptions | Accessor<CreateQueryOptions>,\n): QueryResult<TReturn> {\n  return useQuery(querySignal, options);\n}\n\n// Overload 1: Query - returns QueryResult<TReturn>\nexport function useQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  querySignal: Accessor<\n    QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n  >,\n  options?: UseQueryOptions | Accessor<UseQueryOptions>,\n): QueryResult<TReturn>;\n\n// Overload 2: Maybe query\nexport function useQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  querySignal: Accessor<\n    | QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n    | Falsy\n  >,\n  options?: UseQueryOptions | Accessor<UseQueryOptions>,\n): MaybeQueryResult<TReturn>;\n\n// Implementation\nexport function useQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  querySignal: Accessor<\n    | QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n    | Falsy\n  >,\n  options?: UseQueryOptions | Accessor<UseQueryOptions>,\n): QueryResult<TReturn> | MaybeQueryResult<TReturn> {\n  const [state, setState] = createStore<State>([\n    {\n      '': undefined,\n    },\n    UNKNOWN,\n  ]);\n  const initialRefetchKey = 0;\n  const [refetchKey, setRefetchKey] = createSignal(initialRefetchKey);\n\n  const refetch = () => {\n    setRefetchKey(k => k + 1);\n  };\n\n  const zero = useZero<TSchema, undefined, TContext>();\n\n  // Handle possibly falsy queries\n  const q = createMemo(() => {\n    const query = querySignal();\n    if (!query) return undefined;\n    return addContextToQuery(query, zero().context);\n  });\n\n  const qi = createMemo(() => {\n    const query = q();\n    if (!query) return undefined;\n    return asQueryInternals(query);\n  });\n\n  // Undefined rather than the string `undefined` + the client id: this feeds\n  // the guard below, and concatenating a missing hash produced a string that\n  // was never equal to undefined, leaving that guard unreachable.\n  const hash = createMemo(() => {\n    const internals = qi();\n    return internals === undefined\n      ? undefined\n      : internals.hash() + zero().clientID;\n  });\n  const ttl = createMemo(() => normalize(options)?.ttl ?? DEFAULT_TTL_MS);\n\n  const view = createMemo(() => {\n    // Depend on hash instead of query to avoid recreating the view when the\n    // query object changes but the hash is the same.\n    const currentHash = hash();\n    refetchKey();\n\n    // If query is falsy, don't create a view and reset state to undefined\n    if (currentHash === undefined) {\n      setState([{'': undefined}, UNKNOWN]);\n      return undefined;\n    }\n\n    const untrackedQuery = untrack(q);\n    if (!untrackedQuery) {\n      setState([{'': undefined}, UNKNOWN]);\n      return undefined;\n    }\n\n    const v = zero().materialize(\n      untrackedQuery,\n      createSolidViewFactory(setState, refetch),\n      {\n        // Untracked: a ttl change updates the live view through the effect\n        // below, and depending on it here would tear the view down and build\n        // a new one instead. Read at materialize time rather than once at\n        // setup, so a view built later -- because the query changed -- gets\n        // the ttl in effect by then rather than the one this hook started\n        // with.\n        ttl: untrack(ttl),\n      },\n    );\n\n    onCleanup(() => v.destroy());\n\n    return v;\n  });\n\n  // Update TTL on existing view when it changes.\n  createEffect(\n    on(\n      ttl,\n      currentTTL => {\n        view()?.updateTTL(currentTTL);\n      },\n      {defer: true},\n    ),\n  );\n\n  return [() => state[0][''] as HumanReadable<TReturn>, () => state[1]];\n}\n\nfunction normalize<T>(options?: T | Accessor<T | undefined>): T | undefined {\n  return typeof options === 'function' ? (options as Accessor<T>)() : options;\n}\n"],"mappings":";;;;;;;;;;;;;AA6DA,SAAgB,YAQd,aAGA,SACsB;CACtB,OAAO,SAAS,aAAa,OAAO;AACtC;AAkCA,SAAgB,SAQd,aAIA,SACkD;CAClD,MAAM,CAAC,OAAO,YAAY,YAAmB,CAC3C,EACE,IAAI,KAAA,EACN,GACA,OACF,CAAC;CAED,MAAM,CAAC,YAAY,iBAAiB,aAAa,CAAiB;CAElE,MAAM,gBAAgB;EACpB,eAAc,MAAK,IAAI,CAAC;CAC1B;CAEA,MAAM,OAAO,QAAsC;CAGnD,MAAM,IAAI,iBAAiB;EACzB,MAAM,QAAQ,YAAY;EAC1B,IAAI,CAAC,OAAO,OAAO,KAAA;EACnB,OAAO,kBAAkB,OAAO,KAAK,EAAE,OAAO;CAChD,CAAC;CAED,MAAM,KAAK,iBAAiB;EAC1B,MAAM,QAAQ,EAAE;EAChB,IAAI,CAAC,OAAO,OAAO,KAAA;EACnB,OAAO,iBAAiB,KAAK;CAC/B,CAAC;CAKD,MAAM,OAAO,iBAAiB;EAC5B,MAAM,YAAY,GAAG;EACrB,OAAO,cAAc,KAAA,IACjB,KAAA,IACA,UAAU,KAAK,IAAI,KAAK,EAAE;CAChC,CAAC;CACD,MAAM,MAAM,iBAAiB,UAAU,OAAO,GAAG,OAAA,GAAqB;CAEtE,MAAM,OAAO,iBAAiB;EAG5B,MAAM,cAAc,KAAK;EACzB,WAAW;EAGX,IAAI,gBAAgB,KAAA,GAAW;GAC7B,SAAS,CAAC,EAAC,IAAI,KAAA,EAAS,GAAG,OAAO,CAAC;GACnC;EACF;EAEA,MAAM,iBAAiB,QAAQ,CAAC;EAChC,IAAI,CAAC,gBAAgB;GACnB,SAAS,CAAC,EAAC,IAAI,KAAA,EAAS,GAAG,OAAO,CAAC;GACnC;EACF;EAEA,MAAM,IAAI,KAAK,EAAE,YACf,gBACA,uBAAuB,UAAU,OAAO,GACxC,EAOE,KAAK,QAAQ,GAAG,EAClB,CACF;EAEA,gBAAgB,EAAE,QAAQ,CAAC;EAE3B,OAAO;CACT,CAAC;CAGD,aACE,GACE,MACA,eAAc;EACZ,KAAK,GAAG,UAAU,UAAU;CAC9B,GACA,EAAC,OAAO,KAAI,CACd,CACF;CAEA,OAAO,OAAO,MAAM,GAAG,WAAqC,MAAM,EAAE;AACtE;AAEA,SAAS,UAAa,SAAsD;CAC1E,OAAO,OAAO,YAAY,aAAc,QAAwB,IAAI;AACtE"}

package/out/zero-solid/src/zero.js

@@ -1,4 +1,5 @@
 import "../../replicache/src/get-default-puller.js";
+import "../../replicache/src/storage-failure.js";
 import "../../replicache/src/kv/idb-store.js";
 import "../../replicache/src/make-idb-name.js";
 import "../../replicache/src/persist/collect-idb-databases.js";

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

@@ -6,6 +6,7 @@ import type { PrimaryKey } from '../../../zero-protocol/src/primary-key.ts';
 import { type FilterInput } from '../ivm/filter-operators.ts';
 import type { Input, InputBase, Storage } from '../ivm/operator.ts';
 import type { Source, SourceInput } from '../ivm/source.ts';
+import { type PlanWarningSink } from '../planner/planner-builder.ts';
 import type { ConnectionCostModel } from '../planner/planner-connection.ts';
 import type { PlanDebugger } from '../planner/planner-debug.ts';
 import type { DebugDelegate } from './debug-delegate.ts';
@@ -33,6 +34,25 @@ export interface BuilderDelegate {
      * 3. NOT EXISTS requires complete knowledge of what doesn't exist
      */
     readonly enableNotExists?: boolean | undefined;
+    /**
+     * When true, does not copy a parent's conditions on correlation columns
+     * into its subqueries (see {@link pushDownCorrelatedPredicates}).
+     * Defaults to false.
+     *
+     * Only zero-cache sets this, as a kill switch.
+     */
+    readonly disableCorrelatedPredicatePushdown?: boolean | undefined;
+    /**
+     * When true, copies a parent's conditions into its subqueries before
+     * planning instead of after, and tells the planner which conditions it
+     * copied. The planner then sees when a copied condition makes a flipped
+     * join cheap. Has no effect when `disableCorrelatedPredicatePushdown` is
+     * true. Defaults to false.
+     *
+     * Only zero-cache sets this. This changes plans, and the pushdown alone
+     * does not.
+     */
+    readonly enablePlannerAwarePushdown?: boolean | undefined;
     /**
      * Called once for each source needed by the AST.
      * Might be called multiple times with same tableName. It is OK to return
@@ -48,6 +68,11 @@ export interface BuilderDelegate {
     addEdge(source: InputBase, dest: InputBase): void;
     decorateFilterInput(input: FilterInput, name: string): FilterInput;
     decorateSourceInput(input: SourceInput, queryID: string): Input;
+    /**
+     * Receives warnings about the plan the planner chose for the query, when
+     * there is a cost model to plan with. Only zero-cache sets this.
+     */
+    readonly planWarnings?: PlanWarningSink | undefined;
     /**
      * The AST is mapped on-the-wire between client and server names.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../../zql/src/builder/builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../../zql/src/builder/builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAE3D,OAAO,KAAK,EACV,GAAG,EAGH,SAAS,EAIT,WAAW,EAEX,QAAQ,EAIT,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAK1E,OAAO,EAEL,KAAK,WAAW,EACjB,MAAM,4BAA4B,CAAC;AAMpC,OAAO,KAAK,EAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAElE,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAK1D,OAAO,EAAY,KAAK,eAAe,EAAC,MAAM,+BAA+B,CAAC;AAC9E,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,kCAAkC,CAAC;AAC1E,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAG9D,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAGL,KAAK,mBAAmB,EACzB,MAAM,aAAa,CAAC;AAErB,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,cAAc,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClD,KAAK,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAElC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAE/C;;;;;;OAMG;IACH,QAAQ,CAAC,kCAAkC,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAElE;;;;;;;;;OASG;IACH,QAAQ,CAAC,0BAA0B,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAE1D;;;;OAIG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAEjD;;;OAGG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAErC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAEjD,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;IAElD,mBAAmB,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAEnE,mBAAmB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC;IAEhE;;;OAGG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IAEpD;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC;CAC1C;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,mBAAmB,EAC/B,EAAE,CAAC,EAAE,UAAU,EACf,YAAY,CAAC,EAAE,YAAY,GAC1B,KAAK,CA2CP;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,GAAG,EACR,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,OAsDzD;AAyBD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAsB5D;AAoYD,wBAAgB,OAAO,CACrB,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,WAAW,EACtB,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,MAAM,GACX,WAAW,CAsCb;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,WAAW,6EAa7D;AAED,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,SAAS,GACnB,SAAS,IAAI,mBAAmB,CAQlC;AA6HD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,UAAU,GACb,IAAI,CAgBN;AA8CD,wBAAgB,0CAA0C,CACxD,IAAI,EAAE,SAAS,GACd,OAAO,CAWT;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,SAAS,SAAS,EAAE,EAChC,SAAS,EAAE,CAAC,CAAC,EAAE,SAAS,KAAK,OAAO,uCAYrC"}

package/out/zql/src/builder/builder.js

@@ -8,13 +8,17 @@ import { Exists } from "../ivm/exists.js";
 import { FanIn } from "../ivm/fan-in.js";
 import { FanOut } from "../ivm/fan-out.js";
 import { Filter } from "../ivm/filter.js";
+import { JoinIndex } from "../ivm/join-index.js";
 import { createPredicate, transformFilters } from "./filter.js";
+import { TakeGate } from "../ivm/take-gate.js";
 import { FlippedJoin } from "../ivm/flipped-join.js";
+import { JoinIndexTap } from "../ivm/join-index-tap.js";
 import { Join } from "../ivm/join.js";
 import { Skip } from "../ivm/skip.js";
 import { UnionFanIn } from "../ivm/union-fan-in.js";
 import { UnionFanOut } from "../ivm/union-fan-out.js";
 import { planQuery } from "../planner/planner-builder.js";
+import { pushDownCorrelatedPredicates } from "./correlated-predicate-pushdown.js";
 //#region ../zql/src/builder/builder.ts
 /**
 * Builds a pipeline from an AST. Caller must provide a delegate to create source
@@ -43,7 +47,18 @@ import { planQuery } from "../planner/planner-builder.js";
 function buildPipeline(ast, delegate, queryID, costModel, lc, planDebugger) {
 	ast = delegate.mapAst ? delegate.mapAst(ast) : ast;
 	ast = completeOrdering(ast, (tableName) => must(delegate.getSource(tableName)).tableSchema.primaryKey);
-	if (costModel) ast = planQuery(ast, costModel, planDebugger, lc);
+	const columnsOf = (tableName) => must(delegate.getSource(tableName)).tableSchema.columns;
+	const { planWarnings } = delegate;
+	if (delegate.disableCorrelatedPredicatePushdown) {
+		if (costModel) ast = planQuery(ast, costModel, planDebugger, lc, void 0, planWarnings);
+	} else if (delegate.enablePlannerAwarePushdown) {
+		const pushed = /* @__PURE__ */ new Set();
+		ast = pushDownCorrelatedPredicates(ast, columnsOf, pushed);
+		if (costModel) ast = planQuery(ast, costModel, planDebugger, lc, pushed, planWarnings);
+	} else {
+		if (costModel) ast = planQuery(ast, costModel, planDebugger, lc, void 0, planWarnings);
+		ast = pushDownCorrelatedPredicates(ast, columnsOf);
+	}
 	return buildPipelineInternal(ast, delegate, queryID, "");
 }
 function bindStaticParameters(ast, staticQueryParameters) {
@@ -140,14 +155,29 @@ function buildPipelineInternal(ast, delegate, queryID, name, partitionKey, isNon
 		delegate.addEdge(end, skip);
 		end = delegate.decorateInput(skip, `${name}:skip)`);
 	}
-	for (const csqCondition of csqConditions) if (!csqCondition.flip) end = applyCorrelatedSubQuery({
-		...csqCondition.related,
-		subquery: {
-			...csqCondition.related.subquery,
-			limit: csqCondition.related.system === "permissions" ? PERMISSIONS_EXISTS_LIMIT : EXISTS_LIMIT
-		}
-	}, delegate, queryID, end, name, true);
-	if (ast.where && (!fullyAppliedFilters || delegate.applyFiltersAnyway)) end = applyWhere(end, ast.where, delegate, name);
+	let takeGate;
+	if (ast.limit !== void 0 && !useCap) {
+		const takeGateName = `${name}:take-gate`;
+		takeGate = new TakeGate(end);
+		delegate.addEdge(end, takeGate);
+		end = delegate.decorateInput(takeGate, takeGateName);
+	}
+	const existsParentIndexes = [];
+	for (const csqCondition of csqConditions) if (!csqCondition.flip) {
+		const parentIndex = new JoinIndex(csqCondition.related.correlation.parentField, end.getSchema().primaryKey);
+		existsParentIndexes.push(parentIndex);
+		end = applyCorrelatedSubQuery({
+			...csqCondition.related,
+			subquery: {
+				...csqCondition.related.subquery,
+				limit: csqCondition.related.system === "permissions" ? PERMISSIONS_EXISTS_LIMIT : EXISTS_LIMIT
+			}
+		}, delegate, queryID, end, name, true, void 0, takeGate, {
+			op: csqCondition.op,
+			parentIndex
+		});
+	}
+	if (ast.where && (!fullyAppliedFilters || delegate.applyFiltersAnyway)) end = applyWhere(end, ast.where, delegate, name, partitionKey, takeGate, existsParentIndexes);
 	if (ast.limit !== void 0) if (useCap) {
 		const capName = `${name}:cap`;
 		const cap = new Cap(end, delegate.createStorage(capName), ast.limit, partitionKey);
@@ -158,19 +188,27 @@ function buildPipelineInternal(ast, delegate, queryID, name, partitionKey, isNon
 		const take = new Take(end, delegate.createStorage(takeName), ast.limit, partitionKey);
 		delegate.addEdge(end, take);
 		end = delegate.decorateInput(take, takeName);
+		takeGate?.setBoundProvider(take);
+		if (takeGate) take.setTakeGate(takeGate);
+	}
+	if (existsParentIndexes.length > 0) {
+		const tapName = `${name}:join-index`;
+		const tap = new JoinIndexTap(end, existsParentIndexes);
+		delegate.addEdge(end, tap);
+		end = delegate.decorateInput(tap, tapName);
 	}
 	if (ast.related) {
 		const byAlias = /* @__PURE__ */ new Map();
 		for (const csq of ast.related) byAlias.set(csq.subquery.alias ?? "", csq);
-		for (const csq of byAlias.values()) end = applyCorrelatedSubQuery(csq, delegate, queryID, end, name, false);
+		for (const csq of byAlias.values()) end = applyCorrelatedSubQuery(csq, delegate, queryID, end, name, false, partitionKey);
 	}
 	return end;
 }
-function applyWhere(input, condition, delegate, name) {
+function applyWhere(input, condition, delegate, name, parentPartitionKey, boundProvider, existsParentIndexes) {
 	if (!conditionIncludesFlippedSubqueryAtAnyLevel(condition)) return buildFilterPipeline(input, delegate, (filterInput) => applyFilter(filterInput, condition, delegate, name), transformFilters(condition).filters);
-	return applyFilterWithFlips(input, condition, delegate, name);
+	return applyFilterWithFlips(input, condition, delegate, name, parentPartitionKey, boundProvider, existsParentIndexes);
 }
-function applyFilterWithFlips(input, condition, delegate, name) {
+function applyFilterWithFlips(input, condition, delegate, name, parentPartitionKey, boundProvider, existsParentIndexes) {
 	let end = input;
 	assert(condition.type !== "simple", "Simple conditions cannot have flips");
 	switch (condition.type) {
@@ -184,7 +222,7 @@ function applyFilterWithFlips(input, condition, delegate, name) {
 				end = buildFilterPipeline(input, delegate, (filterInput) => applyAnd(filterInput, andCondition, delegate, name), transformFilters(andCondition).filters);
 			}
 			assert(withFlipped.length > 0, "Impossible to have no flips here");
-			for (const cond of withFlipped) end = applyFilterWithFlips(end, cond, delegate, name);
+			for (const cond of withFlipped) end = applyFilterWithFlips(end, cond, delegate, name, parentPartitionKey, boundProvider, existsParentIndexes);
 			break;
 		}
 		case "or": {
@@ -201,7 +239,7 @@ function applyFilterWithFlips(input, condition, delegate, name) {
 				};
 				branches.push(buildFilterPipeline(end, delegate, (filterInput) => applyOr(filterInput, orCondition, delegate, name), transformFilters(orCondition).filters));
 			}
-			for (const cond of withFlipped) branches.push(applyFilterWithFlips(end, cond, delegate, name));
+			for (const cond of withFlipped) branches.push(applyFilterWithFlips(end, cond, delegate, name, parentPartitionKey, boundProvider, existsParentIndexes));
 			const ufi = new UnionFanIn(ufo, branches);
 			for (const branch of branches) delegate.addEdge(branch, ufi);
 			end = delegate.decorateInput(ufi, `${name}:ufi`);
@@ -210,6 +248,12 @@ function applyFilterWithFlips(input, condition, delegate, name) {
 		case "correlatedSubquery": {
 			const sq = condition.related;
 			const child = buildPipelineInternal(sq.subquery, delegate, "", `${name}.${sq.subquery.alias}`, sq.correlation.childField, false);
+			let parentIndex;
+			if (existsParentIndexes) {
+				parentIndex = new JoinIndex(sq.correlation.parentField, end.getSchema().primaryKey, parentPartitionKey);
+				existsParentIndexes.push(parentIndex);
+			}
+			const flippedJoinName = `${name}:flipped-join(${sq.subquery.alias})`;
 			const flippedJoin = new FlippedJoin({
 				parent: end,
 				child,
@@ -217,11 +261,14 @@ function applyFilterWithFlips(input, condition, delegate, name) {
 				childKey: sq.correlation.childField,
 				relationshipName: must(sq.subquery.alias, "Subquery must have an alias"),
 				hidden: sq.hidden ?? false,
-				system: sq.system ?? "client"
+				system: sq.system ?? "client",
+				parentPartitionKey,
+				boundProvider,
+				parentIndex
 			});
 			delegate.addEdge(end, flippedJoin);
 			delegate.addEdge(child, flippedJoin);
-			end = delegate.decorateInput(flippedJoin, `${name}:flipped-join(${sq.subquery.alias})`);
+			end = delegate.decorateInput(flippedJoin, flippedJoinName);
 			break;
 		}
 	}
@@ -289,7 +336,7 @@ function valuePosName(left) {
 		case "column": return left.name;
 	}
 }
-function applyCorrelatedSubQuery(sq, delegate, queryID, end, name, fromCondition) {
+function applyCorrelatedSubQuery(sq, delegate, queryID, end, name, fromCondition, parentPartitionKey, boundProvider, exists) {
 	if (sq.subquery.limit === 0 && fromCondition) return end;
 	assert(sq.subquery.alias, "Subquery must have an alias");
 	const child = buildPipelineInternal(sq.subquery, delegate, queryID, `${name}.${sq.subquery.alias}`, sq.correlation.childField, fromCondition);
@@ -301,7 +348,10 @@ function applyCorrelatedSubQuery(sq, delegate, queryID, end, name, fromCondition
 		childKey: sq.correlation.childField,
 		relationshipName: sq.subquery.alias,
 		hidden: sq.hidden ?? false,
-		system: sq.system ?? "client"
+		system: sq.system ?? "client",
+		parentPartitionKey: fromCondition ? void 0 : parentPartitionKey,
+		boundProvider,
+		exists
 	});
 	delegate.addEdge(end, join);
 	delegate.addEdge(child, join);