@rocicorp/zero 0.26.1 → 0.26.2-canary.4

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

@@ -1,237 +1,145 @@
-import { reconcile, produce } from "solid-js/store";
 import { emptyArray } from "../../shared/src/sentinels.js";
 import { skipYields } from "../../zql/src/ivm/operator.js";
-import { idSymbol, applyChange } from "../../zql/src/ivm/view-apply-change.js";
-import "../../zero-protocol/src/ast.js";
-import "js-xxhash";
-import "../../shared/src/config.js";
-import "@rocicorp/resolver";
-import "../../shared/src/resolved-promises.js";
-import "../../shared/src/sleep.js";
-import "../../replicache/src/hash.js";
-import "../../replicache/src/deleted-clients.js";
-import "@rocicorp/lock";
-import "@rocicorp/logger";
-import "../../replicache/src/persist/client-groups.js";
-import "../../replicache/src/persist/clients.js";
-import "../../shared/src/json-schema.js";
-import "../../zero-protocol/src/custom-queries.js";
-import "../../zero-protocol/src/client-schema.js";
-import "../../zero-schema/src/permissions.js";
-import "../../shared/src/document-visible.js";
-import "../../shared/src/iterables.js";
-import "../../replicache/src/btree/node.js";
-import "compare-utf8";
-import "../../replicache/src/sync/push.js";
-import "../../shared/src/valita.js";
-import "../../zero-protocol/src/connect.js";
-import "../../zero-protocol/src/down.js";
-import "../../zero-protocol/src/error.js";
-import "../../zero-protocol/src/protocol-version.js";
-import "../../zero-protocol/src/push.js";
-import "../../zero-protocol/src/version.js";
-import "../../shared/src/btree-set.js";
-import "../../zero-protocol/src/primary-key.js";
-import "../../datadog/src/datadog-log-sink.js";
-import "../../zero-client/src/client/reload-error-handler.js";
-const COMPLETE = Object.freeze({ type: "complete" });
-const UNKNOWN = Object.freeze({ type: "unknown" });
-class SolidView {
-  #input;
-  #format;
-  #onDestroy;
-  #retry;
-  #setState;
-  // Optimization: if the store is currently empty we build up
-  // the view on a plain old JS object stored at #builderRoot, and return
-  // that for the new state on transaction commit.  This avoids building up
-  // large views from scratch via solid produce.  The proxy object used by
-  // solid produce is slow and in this case we don't care about solid tracking
-  // the fine grained changes (everything has changed, it's all new).  For a
-  // test case with a view with 3000 rows, each row having 2 children, this
-  // optimization reduced #applyChanges time from 743ms to 133ms.
-  #builderRoot;
-  #pendingChanges = [];
-  #updateTTL;
-  constructor(input, onTransactionCommit, format, onDestroy, queryComplete, updateTTL, setState, retry) {
-    this.#input = input;
-    onTransactionCommit(this.#onTransactionCommit);
-    this.#format = format;
-    this.#onDestroy = onDestroy;
-    this.#updateTTL = updateTTL;
-    this.#retry = retry;
-    input.setOutput(this);
-    const initialRoot = this.#createEmptyRoot();
-    this.#applyChangesToRoot(
-      skipYields(input.fetch({})),
-      (node) => ({ type: "add", node }),
-      initialRoot
-    );
-    this.#setState = setState;
-    this.#setState(
-      reconcile(
-        [
-          initialRoot,
-          queryComplete === true ? COMPLETE : "error" in queryComplete ? this.#makeError(queryComplete) : UNKNOWN
-        ],
-        {
-          // solidjs's types want a string, but a symbol works
-          key: idSymbol
-        }
-      )
-    );
-    if (isEmptyRoot(initialRoot)) {
-      this.#builderRoot = this.#createEmptyRoot();
-    }
-    if (queryComplete !== true && !("error" in queryComplete)) {
-      void queryComplete.then(() => {
-        this.#setState((prev) => [prev[0], COMPLETE]);
-      }).catch((error) => {
-        this.#setState((prev) => [prev[0], this.#makeError(error)]);
-      });
-    }
-  }
-  #makeError(error) {
-    const message = error.message ?? "An unknown error occurred";
-    return {
-      type: "error",
-      retry: this.#retry,
-      refetch: this.#retry,
-      error: {
-        type: error.error,
-        message,
-        ...error.details ? { details: error.details } : {}
-      }
-    };
-  }
-  destroy() {
-    this.#onDestroy();
-  }
-  #onTransactionCommit = () => {
-    const builderRoot = this.#builderRoot;
-    if (builderRoot) {
-      if (!isEmptyRoot(builderRoot)) {
-        this.#setState(
-          0,
-          reconcile(builderRoot, {
-            // solidjs's types want a string, but a symbol works
-            key: idSymbol
-          })
-        );
-        this.#setState((prev) => [builderRoot, prev[1]]);
-        this.#builderRoot = void 0;
-      }
-    } else {
-      try {
-        this.#applyChanges(this.#pendingChanges, (c) => c);
-      } finally {
-        this.#pendingChanges = [];
-      }
-    }
-  };
-  push(change) {
-    if (this.#builderRoot) {
-      this.#applyChangeToRoot(change, this.#builderRoot);
-    } else {
-      this.#pendingChanges.push(materializeRelationships(change));
-    }
-    return emptyArray;
-  }
-  #applyChanges(changes, mapper) {
-    this.#setState(
-      produce((draftState) => {
-        this.#applyChangesToRoot(changes, mapper, draftState[0]);
-        if (isEmptyRoot(draftState[0])) {
-          this.#builderRoot = this.#createEmptyRoot();
-        }
-      })
-    );
-  }
-  #applyChangesToRoot(changes, mapper, root) {
-    for (const change of changes) {
-      this.#applyChangeToRoot(mapper(change), root);
-    }
-  }
-  #applyChangeToRoot(change, root) {
-    applyChange(
-      root,
-      change,
-      this.#input.getSchema(),
-      "",
-      this.#format,
-      true
-    );
-  }
-  #createEmptyRoot() {
-    return {
-      "": this.#format.singular ? void 0 : []
-    };
-  }
-  updateTTL(ttl) {
-    this.#updateTTL(ttl);
-  }
-}
+import { applyChange, idSymbol } from "../../zql/src/ivm/view-apply-change.js";
+import "./zero.js";
+import "./bindings.js";
+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 SolidView = class {
+	#input;
+	#format;
+	#onDestroy;
+	#retry;
+	#setState;
+	#builderRoot;
+	#pendingChanges = [];
+	#updateTTL;
+	constructor(input, onTransactionCommit, format, onDestroy, queryComplete, updateTTL, setState, retry) {
+		this.#input = input;
+		onTransactionCommit(this.#onTransactionCommit);
+		this.#format = format;
+		this.#onDestroy = onDestroy;
+		this.#updateTTL = updateTTL;
+		this.#retry = retry;
+		input.setOutput(this);
+		const initialRoot = this.#createEmptyRoot();
+		this.#applyChangesToRoot(skipYields(input.fetch({})), (node) => ({
+			type: "add",
+			node
+		}), initialRoot);
+		this.#setState = setState;
+		this.#setState(reconcile([initialRoot, queryComplete === true ? COMPLETE : "error" in queryComplete ? this.#makeError(queryComplete) : UNKNOWN], { key: idSymbol }));
+		if (isEmptyRoot(initialRoot)) this.#builderRoot = this.#createEmptyRoot();
+		if (queryComplete !== true && !("error" in queryComplete)) queryComplete.then(() => {
+			this.#setState((prev) => [prev[0], COMPLETE]);
+		}).catch((error) => {
+			this.#setState((prev) => [prev[0], this.#makeError(error)]);
+		});
+	}
+	#makeError(error) {
+		const message = error.message ?? "An unknown error occurred";
+		return {
+			type: "error",
+			retry: this.#retry,
+			refetch: this.#retry,
+			error: {
+				type: error.error,
+				message,
+				...error.details ? { details: error.details } : {}
+			}
+		};
+	}
+	destroy() {
+		this.#onDestroy();
+	}
+	#onTransactionCommit = () => {
+		const builderRoot = this.#builderRoot;
+		if (builderRoot) {
+			if (!isEmptyRoot(builderRoot)) {
+				this.#setState(0, reconcile(builderRoot, { key: idSymbol }));
+				this.#setState((prev) => [builderRoot, prev[1]]);
+				this.#builderRoot = void 0;
+			}
+		} else try {
+			this.#applyChanges(this.#pendingChanges, (c) => c);
+		} finally {
+			this.#pendingChanges = [];
+		}
+	};
+	push(change) {
+		if (this.#builderRoot) this.#applyChangeToRoot(change, this.#builderRoot);
+		else this.#pendingChanges.push(materializeRelationships(change));
+		return emptyArray;
+	}
+	#applyChanges(changes, mapper) {
+		this.#setState(produce((draftState) => {
+			this.#applyChangesToRoot(changes, mapper, draftState[0]);
+			if (isEmptyRoot(draftState[0])) this.#builderRoot = this.#createEmptyRoot();
+		}));
+	}
+	#applyChangesToRoot(changes, mapper, root) {
+		for (const change of changes) this.#applyChangeToRoot(mapper(change), root);
+	}
+	#applyChangeToRoot(change, root) {
+		applyChange(root, change, this.#input.getSchema(), "", this.#format, true);
+	}
+	#createEmptyRoot() {
+		return { "": this.#format.singular ? void 0 : [] };
+	}
+	updateTTL(ttl) {
+		this.#updateTTL(ttl);
+	}
+};
 function materializeRelationships(change) {
-  switch (change.type) {
-    case "add":
-      return { type: "add", node: materializeNodeRelationships(change.node) };
-    case "remove":
-      return { type: "remove", node: materializeNodeRelationships(change.node) };
-    case "child":
-      return {
-        type: "child",
-        node: { row: change.node.row },
-        child: {
-          relationshipName: change.child.relationshipName,
-          change: materializeRelationships(change.child.change)
-        }
-      };
-    case "edit":
-      return {
-        type: "edit",
-        node: { row: change.node.row },
-        oldNode: { row: change.oldNode.row }
-      };
-  }
+	switch (change.type) {
+		case "add": return {
+			type: "add",
+			node: materializeNodeRelationships(change.node)
+		};
+		case "remove": return {
+			type: "remove",
+			node: materializeNodeRelationships(change.node)
+		};
+		case "child": return {
+			type: "child",
+			node: { row: change.node.row },
+			child: {
+				relationshipName: change.child.relationshipName,
+				change: materializeRelationships(change.child.change)
+			}
+		};
+		case "edit": return {
+			type: "edit",
+			node: { row: change.node.row },
+			oldNode: { row: change.oldNode.row }
+		};
+	}
 }
 function materializeNodeRelationships(node) {
-  const relationships = {};
-  for (const relationship in node.relationships) {
-    const materialized = [];
-    for (const n of skipYields(node.relationships[relationship]())) {
-      materialized.push(materializeNodeRelationships(n));
-    }
-    relationships[relationship] = () => materialized;
-  }
-  return {
-    row: node.row,
-    relationships
-  };
+	const relationships = {};
+	for (const relationship in node.relationships) {
+		const materialized = [];
+		for (const n of skipYields(node.relationships[relationship]())) materialized.push(materializeNodeRelationships(n));
+		relationships[relationship] = () => materialized;
+	}
+	return {
+		row: node.row,
+		relationships
+	};
 }
 function isEmptyRoot(entry) {
-  const data = entry[""];
-  return data === void 0 || Array.isArray(data) && data.length === 0;
+	const data = entry[""];
+	return data === void 0 || Array.isArray(data) && data.length === 0;
 }
 function createSolidViewFactory(setState, retry) {
-  function solidViewFactory(_query, input, format, onDestroy, onTransactionCommit, queryComplete, updateTTL) {
-    return new SolidView(
-      input,
-      onTransactionCommit,
-      format,
-      onDestroy,
-      queryComplete,
-      updateTTL,
-      setState,
-      retry || (() => {
-      })
-    );
-  }
-  return solidViewFactory;
+	function solidViewFactory(_query, input, format, onDestroy, onTransactionCommit, queryComplete, updateTTL) {
+		return new SolidView(input, onTransactionCommit, format, onDestroy, queryComplete, updateTTL, setState, retry || (() => {}));
+	}
+	return solidViewFactory;
 }
-export {
-  COMPLETE,
-  SolidView,
-  UNKNOWN,
-  createSolidViewFactory
-};
-//# sourceMappingURL=solid-view.js.map
+//#endregion
+export { UNKNOWN, createSolidViewFactory };
+
+//# sourceMappingURL=solid-view.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"solid-view.js","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 {\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\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.#setState(prev => [builderRoot, prev[1]]);\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(change, this.#builderRoot);\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    );\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.type) {\n    case 'add':\n      return {type: 'add', node: materializeNodeRelationships(change.node)};\n    case 'remove':\n      return {type: 'remove', node: materializeNodeRelationships(change.node)};\n    case 'child':\n      return {\n        type: 'child',\n        node: {row: change.node.row},\n        child: {\n          relationshipName: change.child.relationshipName,\n          change: materializeRelationships(change.child.change),\n        },\n      };\n    case 'edit':\n      return {\n        type: 'edit',\n        node: {row: change.node.row},\n        oldNode: {row: change.oldNode.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"],"names":[],"mappings":"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"}
+{"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 {\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\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.#setState(prev => [builderRoot, prev[1]]);\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(change, this.#builderRoot);\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    );\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.type) {\n    case 'add':\n      return {type: 'add', node: materializeNodeRelationships(change.node)};\n    case 'remove':\n      return {type: 'remove', node: materializeNodeRelationships(change.node)};\n    case 'child':\n      return {\n        type: 'child',\n        node: {row: change.node.row},\n        child: {\n          relationshipName: change.child.relationshipName,\n          change: materializeRelationships(change.child.change),\n        },\n      };\n    case 'edit':\n      return {\n        type: 'edit',\n        node: {row: change.node.row},\n        oldNode: {row: change.oldNode.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-connection-state.js

@@ -1,17 +1,21 @@
-import { createSignal, createEffect, onCleanup } from "solid-js";
 import { useZero } from "./use-zero.js";
+import { createEffect, createSignal, onCleanup } from "solid-js";
+//#region ../zero-solid/src/use-connection-state.ts
+/**
+* Tracks the connection status of the current Zero instance.
+*
+* @returns The connection status of the Zero instance.
+* @see {@link ConnectionState} for more details on the connection state.
+*/
 function useConnectionState() {
-  const zero = useZero();
-  const [connectionState, setConnectionState] = createSignal(
-    zero().connection.state.current
-  );
-  createEffect(() => {
-    const unsubscribe = zero().connection.state.subscribe(setConnectionState);
-    onCleanup(unsubscribe);
-  });
-  return connectionState;
+	const zero = useZero();
+	const [connectionState, setConnectionState] = createSignal(zero().connection.state.current);
+	createEffect(() => {
+		onCleanup(zero().connection.state.subscribe(setConnectionState));
+	});
+	return connectionState;
 }
-export {
-  useConnectionState
-};
-//# sourceMappingURL=use-connection-state.js.map
+//#endregion
+export { useConnectionState };
+
+//# sourceMappingURL=use-connection-state.js.map

package/out/zero-solid/src/use-connection-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-connection-state.js","sources":["../../../../zero-solid/src/use-connection-state.ts"],"sourcesContent":["import {createEffect, createSignal, onCleanup, type Accessor} from 'solid-js';\nimport {useZero} from './use-zero.ts';\nimport type {ConnectionState} from './zero.ts';\n\n/**\n * Tracks the connection status of the current Zero instance.\n *\n * @returns The connection status of the Zero instance.\n * @see {@link ConnectionState} for more details on the connection state.\n */\nexport function useConnectionState(): Accessor<ConnectionState> {\n  const zero = useZero();\n\n  const [connectionState, setConnectionState] = createSignal<ConnectionState>(\n    zero().connection.state.current,\n  );\n\n  createEffect(() => {\n    const unsubscribe = zero().connection.state.subscribe(setConnectionState);\n\n    onCleanup(unsubscribe);\n  });\n\n  return connectionState;\n}\n"],"names":[],"mappings":";;AAUO,SAAS,qBAAgD;AAC9D,QAAM,OAAO,QAAA;AAEb,QAAM,CAAC,iBAAiB,kBAAkB,IAAI;AAAA,IAC5C,KAAA,EAAO,WAAW,MAAM;AAAA,EAAA;AAG1B,eAAa,MAAM;AACjB,UAAM,cAAc,KAAA,EAAO,WAAW,MAAM,UAAU,kBAAkB;AAExE,cAAU,WAAW;AAAA,EACvB,CAAC;AAED,SAAO;AACT;"}
+{"version":3,"file":"use-connection-state.js","names":[],"sources":["../../../../zero-solid/src/use-connection-state.ts"],"sourcesContent":["import {createEffect, createSignal, onCleanup, type Accessor} from 'solid-js';\nimport {useZero} from './use-zero.ts';\nimport type {ConnectionState} from './zero.ts';\n\n/**\n * Tracks the connection status of the current Zero instance.\n *\n * @returns The connection status of the Zero instance.\n * @see {@link ConnectionState} for more details on the connection state.\n */\nexport function useConnectionState(): Accessor<ConnectionState> {\n  const zero = useZero();\n\n  const [connectionState, setConnectionState] = createSignal<ConnectionState>(\n    zero().connection.state.current,\n  );\n\n  createEffect(() => {\n    const unsubscribe = zero().connection.state.subscribe(setConnectionState);\n\n    onCleanup(unsubscribe);\n  });\n\n  return connectionState;\n}\n"],"mappings":";;;;;;;;;AAUA,SAAgB,qBAAgD;CAC9D,MAAM,OAAO,SAAS;CAEtB,MAAM,CAAC,iBAAiB,sBAAsB,aAC5C,MAAM,CAAC,WAAW,MAAM,QACzB;AAED,oBAAmB;AAGjB,YAFoB,MAAM,CAAC,WAAW,MAAM,UAAU,mBAAmB,CAEnD;GACtB;AAEF,QAAO"}

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

@@ -1,109 +1,64 @@
-import { createSignal, createMemo, untrack, onCleanup, createEffect, on } from "solid-js";
-import { createStore } from "solid-js/store";
-import "compare-utf8";
-import "../../zero-protocol/src/ast.js";
-import "js-xxhash";
 import { asQueryInternals } from "../../zql/src/query/query-internals.js";
 import { addContextToQuery } from "../../zql/src/query/query-registry.js";
-import { DEFAULT_TTL_MS } from "../../zql/src/query/ttl.js";
-import { UNKNOWN, createSolidViewFactory } from "./solid-view.js";
+import "../../zql/src/query/ttl.js";
+import "./zero.js";
 import { useZero } from "./use-zero.js";
-import "../../shared/src/config.js";
-import "@rocicorp/resolver";
-import "../../shared/src/resolved-promises.js";
-import "../../shared/src/sleep.js";
-import "../../replicache/src/hash.js";
-import "../../replicache/src/deleted-clients.js";
-import "@rocicorp/lock";
-import "@rocicorp/logger";
-import "../../replicache/src/persist/client-groups.js";
-import "../../replicache/src/persist/clients.js";
-import "../../shared/src/json-schema.js";
-import "../../zero-protocol/src/custom-queries.js";
-import "../../zero-protocol/src/client-schema.js";
-import "../../zero-schema/src/permissions.js";
-import "../../shared/src/document-visible.js";
-import "../../shared/src/iterables.js";
-import "../../replicache/src/btree/node.js";
-import "../../replicache/src/sync/push.js";
-import "../../shared/src/valita.js";
-import "../../zero-protocol/src/connect.js";
-import "../../zero-protocol/src/down.js";
-import "../../zero-protocol/src/error.js";
-import "../../zero-protocol/src/protocol-version.js";
-import "../../zero-protocol/src/push.js";
-import "../../zero-protocol/src/version.js";
-import "../../shared/src/btree-set.js";
-import "../../zero-protocol/src/primary-key.js";
-import "../../datadog/src/datadog-log-sink.js";
-import "../../zero-client/src/client/reload-error-handler.js";
+import "./bindings.js";
+import { UNKNOWN, createSolidViewFactory } from "./solid-view.js";
+import { createEffect, createMemo, createSignal, on, onCleanup, untrack } from "solid-js";
+import { createStore } from "solid-js/store";
+//#region ../zero-solid/src/use-query.ts
+/**
+* @deprecated Use {@linkcode useQuery} instead.
+*/
 function createQuery(querySignal, options) {
-  return useQuery(querySignal, options);
+	return useQuery(querySignal, options);
 }
 function useQuery(querySignal, options) {
-  const [state, setState] = createStore([
-    {
-      "": void 0
-    },
-    UNKNOWN
-  ]);
-  const initialRefetchKey = 0;
-  const [refetchKey, setRefetchKey] = createSignal(initialRefetchKey);
-  const refetch = () => {
-    setRefetchKey((k) => k + 1);
-  };
-  const zero = useZero();
-  const q = createMemo(() => {
-    const query = querySignal();
-    if (!query) return void 0;
-    return addContextToQuery(query, zero().context);
-  });
-  const qi = createMemo(() => {
-    const query = q();
-    if (!query) return void 0;
-    return asQueryInternals(query);
-  });
-  const hash = createMemo(() => qi()?.hash());
-  const ttl = createMemo(() => normalize(options)?.ttl ?? DEFAULT_TTL_MS);
-  const initialTTL = ttl();
-  const view = createMemo(() => {
-    const currentHash = hash();
-    refetchKey();
-    if (currentHash === void 0) {
-      setState([{ "": void 0 }, UNKNOWN]);
-      return void 0;
-    }
-    const untrackedQuery = untrack(q);
-    if (!untrackedQuery) {
-      setState([{ "": void 0 }, UNKNOWN]);
-      return void 0;
-    }
-    const v = zero().materialize(
-      untrackedQuery,
-      createSolidViewFactory(setState, refetch),
-      {
-        ttl: initialTTL
-      }
-    );
-    onCleanup(() => v.destroy());
-    return v;
-  });
-  createEffect(
-    on(
-      ttl,
-      (currentTTL) => {
-        view()?.updateTTL(currentTTL);
-      },
-      { defer: true }
-    )
-  );
-  return [() => state[0][""], () => state[1]];
+	const [state, setState] = createStore([{ "": void 0 }, UNKNOWN]);
+	const [refetchKey, setRefetchKey] = createSignal(0);
+	const refetch = () => {
+		setRefetchKey((k) => k + 1);
+	};
+	const zero = useZero();
+	const q = createMemo(() => {
+		const query = querySignal();
+		if (!query) return void 0;
+		return addContextToQuery(query, zero().context);
+	});
+	const qi = createMemo(() => {
+		const query = q();
+		if (!query) return void 0;
+		return asQueryInternals(query);
+	});
+	const hash = createMemo(() => qi()?.hash());
+	const ttl = createMemo(() => normalize(options)?.ttl ?? 3e5);
+	const initialTTL = ttl();
+	const view = createMemo(() => {
+		const currentHash = hash();
+		refetchKey();
+		if (currentHash === void 0) {
+			setState([{ "": void 0 }, UNKNOWN]);
+			return;
+		}
+		const untrackedQuery = untrack(q);
+		if (!untrackedQuery) {
+			setState([{ "": void 0 }, UNKNOWN]);
+			return;
+		}
+		const v = zero().materialize(untrackedQuery, createSolidViewFactory(setState, refetch), { ttl: initialTTL });
+		onCleanup(() => v.destroy());
+		return v;
+	});
+	createEffect(on(ttl, (currentTTL) => {
+		view()?.updateTTL(currentTTL);
+	}, { defer: true }));
+	return [() => state[0][""], () => state[1]];
 }
 function normalize(options) {
-  return typeof options === "function" ? options() : options;
+	return typeof options === "function" ? options() : options;
 }
-export {
-  createQuery,
-  useQuery
-};
-//# sourceMappingURL=use-query.js.map
+//#endregion
+export { createQuery, useQuery };
+
+//# sourceMappingURL=use-query.js.map