@rocicorp/zero 0.25.0-canary.9 → 0.25.1

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 {\n  applyChange,\n  type AnyViewFactory,\n  type Change,\n  type Entry,\n  type Format,\n  type Input,\n  type Node,\n  type Output,\n  type Query,\n  type Schema,\n  type Stream,\n  type TTL,\n  type ViewChange,\n} from '../../zero-client/src/mod.js';\nimport type {\n  QueryErrorDetails,\n  QueryResultDetails,\n} from '../../zero-client/src/types/query-result.ts';\nimport type {ErroredQuery} from '../../zero-protocol/src/custom-queries.ts';\nimport {idSymbol} from '../../zql/src/ivm/view-apply-change.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      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): void {\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  }\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 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    TSchema extends Schema,\n    TTable extends keyof TSchema['tables'] & string,\n    TReturn,\n  >(\n    _query: Query<TSchema, TTable, 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","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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"}

package/out/zero-solid/src/{use-zero-connection-state.d.ts → use-connection-state.d.ts}

@@ -1,10 +1,10 @@
 import { type Accessor } from 'solid-js';
-import type { ConnectionState } from '../../zero-client/src/client/connection.ts';
+import type { ConnectionState } from './zero.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.
  */
-export declare function useZeroConnectionState(): Accessor<ConnectionState>;
-//# sourceMappingURL=use-zero-connection-state.d.ts.map
+export declare function useConnectionState(): Accessor<ConnectionState>;
+//# sourceMappingURL=use-connection-state.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"use-connection-state.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-connection-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,KAAK,QAAQ,EAAC,MAAM,UAAU,CAAC;AAE9E,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,WAAW,CAAC;AAE/C;;;;;GAKG;AACH,wBAAgB,kBAAkB,IAAI,QAAQ,CAAC,eAAe,CAAC,CAc9D"}

package/out/zero-solid/src/{use-zero-connection-state.js → use-connection-state.js}

@@ -1,6 +1,6 @@
 import { createSignal, createEffect, onCleanup } from "solid-js";
 import { useZero } from "./use-zero.js";
-function useZeroConnectionState() {
+function useConnectionState() {
   const zero = useZero();
   const [connectionState, setConnectionState] = createSignal(
     zero().connection.state.current
@@ -12,6 +12,6 @@ function useZeroConnectionState() {
   return connectionState;
 }
 export {
-  useZeroConnectionState
+  useConnectionState
 };
-//# sourceMappingURL=use-zero-connection-state.js.map
+//# sourceMappingURL=use-connection-state.js.map

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

@@ -0,0 +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;"}

package/out/zero-solid/src/use-query.d.ts

@@ -1,8 +1,5 @@
 import { type Accessor } from 'solid-js';
-import type { QueryResultDetails } from '../../zero-client/src/types/query-result.ts';
-import type { Schema } from '../../zero-types/src/schema.ts';
-import type { HumanReadable, ToQuery } from '../../zql/src/query/query.ts';
-import { type TTL } from '../../zql/src/query/ttl.ts';
+import { type DefaultContext, type DefaultSchema, type HumanReadable, type PullRow, type QueryOrQueryRequest, type QueryResultDetails, type ReadonlyJSONValue, type Schema, type TTL } from './zero.ts';
 export type QueryResult<TReturn> = readonly [
     Accessor<HumanReadable<TReturn>>,
     Accessor<QueryResultDetails & {}>
@@ -19,6 +16,6 @@ export type UseQueryOptions = {
 /**
  * @deprecated Use {@linkcode useQuery} instead.
  */
-export declare function createQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext>(querySignal: Accessor<ToQuery<TSchema, TTable, TReturn, TContext>>, options?: CreateQueryOptions | Accessor<CreateQueryOptions>): QueryResult<TReturn>;
-export declare function useQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext>(querySignal: Accessor<ToQuery<TSchema, TTable, TReturn, TContext>>, options?: UseQueryOptions | Accessor<UseQueryOptions>): QueryResult<TReturn>;
+export declare function createQuery<TTable extends keyof TSchema['tables'] & string, TInput extends ReadonlyJSONValue | undefined, TOutput extends ReadonlyJSONValue | undefined, TSchema extends Schema = DefaultSchema, TReturn = PullRow<TTable, TSchema>, TContext = DefaultContext>(querySignal: Accessor<QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>>, options?: CreateQueryOptions | Accessor<CreateQueryOptions>): QueryResult<TReturn>;
+export declare function useQuery<TTable extends keyof TSchema['tables'] & string, TInput extends ReadonlyJSONValue | undefined, TOutput extends ReadonlyJSONValue | undefined, TSchema extends Schema = DefaultSchema, TReturn = PullRow<TTable, TSchema>, TContext = DefaultContext>(querySignal: Accessor<QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>>, options?: UseQueryOptions | Accessor<UseQueryOptions>): QueryResult<TReturn>;
 //# sourceMappingURL=use-query.d.ts.map

package/out/zero-solid/src/use-query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-query.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,QAAQ,EACd,MAAM,UAAU,CAAC;AAGlB,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,6CAA6C,CAAC;AACpF,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,aAAa,EAAE,OAAO,EAAC,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAiB,KAAK,GAAG,EAAC,MAAM,4BAA4B,CAAC;AAIpE,MAAM,MAAM,WAAW,CAAC,OAAO,IAAI,SAAS;IAC1C,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAChC,QAAQ,CAAC,kBAAkB,GAAG,EAAE,CAAC;CAClC,CAAC;AAGF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CACvB,CAAC;AAGF;;GAEG;AACH,wBAAgB,WAAW,CACzB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EACP,QAAQ,EAER,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,EAClE,OAAO,CAAC,EAAE,kBAAkB,GAAG,QAAQ,CAAC,kBAAkB,CAAC,GAC1D,WAAW,CAAC,OAAO,CAAC,CAEtB;AAED,wBAAgB,QAAQ,CACtB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EACP,QAAQ,EAER,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,EAClE,OAAO,CAAC,EAAE,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC,GACpD,WAAW,CAAC,OAAO,CAAC,CAsDtB"}
+{"version":3,"file":"use-query.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,QAAQ,EACd,MAAM,UAAU,CAAC;AASlB,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,OAAO,EACZ,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,MAAM,EACX,KAAK,GAAG,EACT,MAAM,WAAW,CAAC;AAEnB,MAAM,MAAM,WAAW,CAAC,OAAO,IAAI,SAAS;IAC1C,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAChC,QAAQ,CAAC,kBAAkB,GAAG,EAAE,CAAC;CAClC,CAAC;AAGF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CACvB,CAAC;AAGF;;GAEG;AACH,wBAAgB,WAAW,CACzB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,MAAM,SAAS,iBAAiB,GAAG,SAAS,EAC5C,OAAO,SAAS,iBAAiB,GAAG,SAAS,EAC7C,OAAO,SAAS,MAAM,GAAG,aAAa,EACtC,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,QAAQ,GAAG,cAAc,EAEzB,WAAW,EAAE,QAAQ,CACnB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CACzE,EACD,OAAO,CAAC,EAAE,kBAAkB,GAAG,QAAQ,CAAC,kBAAkB,CAAC,GAC1D,WAAW,CAAC,OAAO,CAAC,CAEtB;AAED,wBAAgB,QAAQ,CACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,MAAM,SAAS,iBAAiB,GAAG,SAAS,EAC5C,OAAO,SAAS,iBAAiB,GAAG,SAAS,EAC7C,OAAO,SAAS,MAAM,GAAG,aAAa,EACtC,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,QAAQ,GAAG,cAAc,EAEzB,WAAW,EAAE,QAAQ,CACnB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CACzE,EACD,OAAO,CAAC,EAAE,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC,GACpD,WAAW,CAAC,OAAO,CAAC,CAsDtB"}

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

@@ -1,9 +1,41 @@
 import { createSignal, createMemo, untrack, onCleanup, createEffect, on } from "solid-js";
 import { createStore } from "solid-js/store";
-import { bindingsForZero } from "../../zero-client/src/client/bindings.js";
+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 { 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 "../../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";
 function createQuery(querySignal, options) {
   return useQuery(querySignal, options);
 }
@@ -20,21 +52,22 @@ function useQuery(querySignal, options) {
     setRefetchKey((k) => k + 1);
   };
   const zero = useZero();
-  const query = createMemo(
-    () => querySignal().toQuery(zero().context)
-  );
-  const bindings = createMemo(() => bindingsForZero(zero()));
-  const hash = createMemo(() => bindings().hash(query()));
+  const q = createMemo(() => addContextToQuery(querySignal(), zero().context));
+  const qi = createMemo(() => asQueryInternals(q()));
+  const hash = createMemo(() => qi().hash());
   const ttl = createMemo(() => normalize(options)?.ttl ?? DEFAULT_TTL_MS);
   const initialTTL = ttl();
   const view = createMemo(() => {
     hash();
     refetchKey();
-    const b = bindings();
-    const q = untrack(query);
-    const v = b.materialize(q, createSolidViewFactory(setState, refetch), {
-      ttl: initialTTL
-    });
+    const untrackedQuery = untrack(q);
+    const v = zero().materialize(
+      untrackedQuery,
+      createSolidViewFactory(setState, refetch),
+      {
+        ttl: initialTTL
+      }
+    );
     onCleanup(() => v.destroy());
     return v;
   });

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

@@ -1 +1 @@
-{"version":3,"file":"use-query.js","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 {bindingsForZero} from '../../zero-client/src/client/bindings.ts';\nimport type {QueryResultDetails} from '../../zero-client/src/types/query-result.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {HumanReadable, ToQuery} from '../../zql/src/query/query.ts';\nimport {DEFAULT_TTL_MS, type TTL} from '../../zql/src/query/ttl.ts';\nimport {createSolidViewFactory, UNKNOWN, type State} from './solid-view.ts';\nimport {useZero} from './use-zero.ts';\n\nexport type QueryResult<TReturn> = readonly [\n  Accessor<HumanReadable<TReturn>>,\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  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TReturn,\n  TContext,\n>(\n  querySignal: Accessor<ToQuery<TSchema, TTable, TReturn, TContext>>,\n  options?: CreateQueryOptions | Accessor<CreateQueryOptions>,\n): QueryResult<TReturn> {\n  return useQuery(querySignal, options);\n}\n\nexport function useQuery<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TReturn,\n  TContext,\n>(\n  querySignal: Accessor<ToQuery<TSchema, TTable, TReturn, TContext>>,\n  options?: UseQueryOptions | Accessor<UseQueryOptions>,\n): QueryResult<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();\n\n  const query = createMemo(() =>\n    querySignal().toQuery(zero().context as TContext),\n  );\n  const bindings = createMemo(() => bindingsForZero(zero()));\n  const hash = createMemo(() => bindings().hash(query()));\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    hash();\n    refetchKey();\n    const b = bindings();\n    const q = untrack(query);\n\n    const v = b.materialize(q, createSolidViewFactory(setState, refetch), {\n      ttl: initialTTL,\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"],"names":[],"mappings":";;;;;;AAuCO,SAAS,YAMd,aACA,SACsB;AACtB,SAAO,SAAS,aAAa,OAAO;AACtC;AAEO,SAAS,SAMd,aACA,SACsB;AACtB,QAAM,CAAC,OAAO,QAAQ,IAAI,YAAmB;AAAA,IAC3C;AAAA,MACE,IAAI;AAAA,IAAA;AAAA,IAEN;AAAA,EAAA,CACD;AACD,QAAM,oBAAoB;AAC1B,QAAM,CAAC,YAAY,aAAa,IAAI,aAAa,iBAAiB;AAElE,QAAM,UAAU,MAAM;AACpB,kBAAc,CAAA,MAAK,IAAI,CAAC;AAAA,EAC1B;AAEA,QAAM,OAAO,QAAA;AAEb,QAAM,QAAQ;AAAA,IAAW,MACvB,YAAA,EAAc,QAAQ,KAAA,EAAO,OAAmB;AAAA,EAAA;AAElD,QAAM,WAAW,WAAW,MAAM,gBAAgB,KAAA,CAAM,CAAC;AACzD,QAAM,OAAO,WAAW,MAAM,SAAA,EAAW,KAAK,MAAA,CAAO,CAAC;AACtD,QAAM,MAAM,WAAW,MAAM,UAAU,OAAO,GAAG,OAAO,cAAc;AAEtE,QAAM,aAAa,IAAA;AAEnB,QAAM,OAAO,WAAW,MAAM;AAG5B,SAAA;AACA,eAAA;AACA,UAAM,IAAI,SAAA;AACV,UAAM,IAAI,QAAQ,KAAK;AAEvB,UAAM,IAAI,EAAE,YAAY,GAAG,uBAAuB,UAAU,OAAO,GAAG;AAAA,MACpE,KAAK;AAAA,IAAA,CACN;AAED,cAAU,MAAM,EAAE,SAAS;AAE3B,WAAO;AAAA,EACT,CAAC;AAGD;AAAA,IACE;AAAA,MACE;AAAA,MACA,CAAA,eAAc;AACZ,aAAA,EAAO,UAAU,UAAU;AAAA,MAC7B;AAAA,MACA,EAAC,OAAO,KAAA;AAAA,IAAI;AAAA,EACd;AAGF,SAAO,CAAC,MAAM,MAAM,CAAC,EAAE,EAAE,GAA6B,MAAM,MAAM,CAAC,CAAC;AACtE;AAEA,SAAS,UAAa,SAAsD;AAC1E,SAAO,OAAO,YAAY,aAAc,QAAA,IAA4B;AACtE;"}
+{"version":3,"file":"use-query.js","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 DefaultContext,\n  type DefaultSchema,\n  type HumanReadable,\n  type PullRow,\n  type QueryOrQueryRequest,\n  type QueryResultDetails,\n  type ReadonlyJSONValue,\n  type Schema,\n  type TTL,\n} from './zero.ts';\n\nexport type QueryResult<TReturn> = readonly [\n  Accessor<HumanReadable<TReturn>>,\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 Schema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext = 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\nexport function useQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends Schema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext = DefaultContext,\n>(\n  querySignal: Accessor<\n    QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n  >,\n  options?: UseQueryOptions | Accessor<UseQueryOptions>,\n): QueryResult<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  const q = createMemo(() => addContextToQuery(querySignal(), zero().context));\n  const qi = createMemo(() => asQueryInternals(q()));\n  const hash = createMemo(() => qi().hash());\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    hash();\n    refetchKey();\n    const untrackedQuery = untrack(q);\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"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkDO,SAAS,YAQd,aAGA,SACsB;AACtB,SAAO,SAAS,aAAa,OAAO;AACtC;AAEO,SAAS,SAQd,aAGA,SACsB;AACtB,QAAM,CAAC,OAAO,QAAQ,IAAI,YAAmB;AAAA,IAC3C;AAAA,MACE,IAAI;AAAA,IAAA;AAAA,IAEN;AAAA,EAAA,CACD;AACD,QAAM,oBAAoB;AAC1B,QAAM,CAAC,YAAY,aAAa,IAAI,aAAa,iBAAiB;AAElE,QAAM,UAAU,MAAM;AACpB,kBAAc,CAAA,MAAK,IAAI,CAAC;AAAA,EAC1B;AAEA,QAAM,OAAO,QAAA;AACb,QAAM,IAAI,WAAW,MAAM,kBAAkB,eAAe,KAAA,EAAO,OAAO,CAAC;AAC3E,QAAM,KAAK,WAAW,MAAM,iBAAiB,EAAA,CAAG,CAAC;AACjD,QAAM,OAAO,WAAW,MAAM,GAAA,EAAK,MAAM;AACzC,QAAM,MAAM,WAAW,MAAM,UAAU,OAAO,GAAG,OAAO,cAAc;AAEtE,QAAM,aAAa,IAAA;AAEnB,QAAM,OAAO,WAAW,MAAM;AAG5B,SAAA;AACA,eAAA;AACA,UAAM,iBAAiB,QAAQ,CAAC;AAEhC,UAAM,IAAI,OAAO;AAAA,MACf;AAAA,MACA,uBAAuB,UAAU,OAAO;AAAA,MACxC;AAAA,QACE,KAAK;AAAA,MAAA;AAAA,IACP;AAGF,cAAU,MAAM,EAAE,SAAS;AAE3B,WAAO;AAAA,EACT,CAAC;AAGD;AAAA,IACE;AAAA,MACE;AAAA,MACA,CAAA,eAAc;AACZ,aAAA,EAAO,UAAU,UAAU;AAAA,MAC7B;AAAA,MACA,EAAC,OAAO,KAAA;AAAA,IAAI;AAAA,EACd;AAGF,SAAO,CAAC,MAAM,MAAM,CAAC,EAAE,EAAE,GAA6B,MAAM,MAAM,CAAC,CAAC;AACtE;AAEA,SAAS,UAAa,SAAsD;AAC1E,SAAO,OAAO,YAAY,aAAc,QAAA,IAA4B;AACtE;"}

package/out/zero-solid/src/use-zero-online.d.ts

@@ -3,7 +3,7 @@ import { type Accessor } from 'solid-js';
  * Tracks the online status of the current Zero instance.
  *
  * @returns An accessor — call `online()` to get a reactive `boolean`.
- * @deprecated Use {@linkcode useZeroConnectionState} instead, which provides more detailed connection state.
+ * @deprecated Use {@linkcode useConnectionState} instead, which provides more detailed connection state.
  */
 export declare function useZeroOnline(): Accessor<boolean>;
 //# sourceMappingURL=use-zero-online.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"use-zero-online.js","sources":["../../../../zero-solid/src/use-zero-online.ts"],"sourcesContent":["import {createEffect, createSignal, onCleanup, type Accessor} from 'solid-js';\nimport {useZero} from './use-zero.ts';\n\n/**\n * Tracks the online status of the current Zero instance.\n *\n * @returns An accessor — call `online()` to get a reactive `boolean`.\n * @deprecated Use {@linkcode useZeroConnectionState} instead, which provides more detailed connection state.\n */\nexport function useZeroOnline(): Accessor<boolean> {\n  const zero = useZero();\n\n  const [online, setOnline] = createSignal<boolean>(zero().online);\n\n  createEffect(() => {\n    const unsubscribe = zero().onOnline(setOnline);\n\n    onCleanup(unsubscribe);\n  });\n\n  return online;\n}\n"],"names":[],"mappings":";;AASO,SAAS,gBAAmC;AACjD,QAAM,OAAO,QAAA;AAEb,QAAM,CAAC,QAAQ,SAAS,IAAI,aAAsB,KAAA,EAAO,MAAM;AAE/D,eAAa,MAAM;AACjB,UAAM,cAAc,OAAO,SAAS,SAAS;AAE7C,cAAU,WAAW;AAAA,EACvB,CAAC;AAED,SAAO;AACT;"}
+{"version":3,"file":"use-zero-online.js","sources":["../../../../zero-solid/src/use-zero-online.ts"],"sourcesContent":["import {createEffect, createSignal, onCleanup, type Accessor} from 'solid-js';\nimport {useZero} from './use-zero.ts';\n\n/**\n * Tracks the online status of the current Zero instance.\n *\n * @returns An accessor — call `online()` to get a reactive `boolean`.\n * @deprecated Use {@linkcode useConnectionState} instead, which provides more detailed connection state.\n */\nexport function useZeroOnline(): Accessor<boolean> {\n  const zero = useZero();\n\n  const [online, setOnline] = createSignal<boolean>(zero().online);\n\n  createEffect(() => {\n    const unsubscribe = zero().onOnline(setOnline);\n\n    onCleanup(unsubscribe);\n  });\n\n  return online;\n}\n"],"names":[],"mappings":";;AASO,SAAS,gBAAmC;AACjD,QAAM,OAAO,QAAA;AAEb,QAAM,CAAC,QAAQ,SAAS,IAAI,aAAsB,KAAA,EAAO,MAAM;AAE/D,eAAa,MAAM;AACjB,UAAM,cAAc,OAAO,SAAS,SAAS;AAE7C,cAAU,WAAW;AAAA,EACvB,CAAC;AAED,SAAO;AACT;"}

package/out/zero-solid/src/use-zero.d.ts

@@ -1,13 +1,23 @@
 import { type JSX } from 'solid-js';
-import type { CustomMutatorDefs } from '../../zero-client/src/client/custom.ts';
-import type { ZeroOptions } from '../../zero-client/src/client/options.ts';
-import { Zero } from '../../zero-client/src/client/zero.ts';
-import type { Schema } from '../../zero-types/src/schema.ts';
-import type { AnyMutatorRegistry } from '../../zql/src/mutate/mutator-registry.ts';
-export declare function createZero<S extends Schema, MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined = undefined, Context = unknown>(options: ZeroOptions<S, MD, Context>): Zero<S, MD, Context>;
-export declare function useZero<S extends Schema, MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined = undefined, Context = unknown>(): () => Zero<S, MD, Context>;
-export declare function createUseZero<S extends Schema, MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined = undefined, Context = unknown>(): () => () => Zero<S, MD, Context>;
-export declare function ZeroProvider<S extends Schema, MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined, Context>(props: {
+import { Zero, type CustomMutatorDefs, type DefaultContext, type DefaultSchema, type Schema, type ZeroOptions } from './zero.ts';
+/**
+ * @deprecated Use {@linkcode ZeroProvider} instead of managing your own Zero instance.
+ */
+export declare function createZero<S extends Schema = DefaultSchema, MD extends CustomMutatorDefs | undefined = undefined, Context = DefaultContext>(options: ZeroOptions<S, MD, Context>): Zero<S, MD, Context>;
+export declare function useZero<S extends Schema = DefaultSchema, MD extends CustomMutatorDefs | undefined = undefined, Context = DefaultContext>(): () => Zero<S, MD, Context>;
+/**
+ * @deprecated Use {@linkcode useZero} instead, alongside default types defined with:
+ *
+ * ```ts
+ * declare module '@rocicorp/zero' {
+ *   interface DefaultTypes {
+ *     schema: typeof schema;
+ *     context: Context;
+ *   }
+ * }
+ */
+export declare function createUseZero<S extends Schema = DefaultSchema, MD extends CustomMutatorDefs | undefined = undefined, Context = DefaultContext>(): () => () => Zero<S, MD, Context>;
+export declare function ZeroProvider<S extends Schema = DefaultSchema, MD extends CustomMutatorDefs | undefined = undefined, Context = DefaultContext>(props: {
     children: JSX.Element;
     init?: (zero: Zero<S, MD, Context>) => void;
 } & ({

package/out/zero-solid/src/use-zero.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-zero.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-zero.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,KAAK,GAAG,EACT,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,wCAAwC,CAAC;AAC9E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAC,IAAI,EAAC,MAAM,sCAAsC,CAAC;AAC1D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,0CAA0C,CAAC;AASjF,wBAAgB,UAAU,CACxB,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,kBAAkB,GAAG,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACzE,OAAO,GAAG,OAAO,EACjB,OAAO,EAAE,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAM5D;AAED,wBAAgB,OAAO,CACrB,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,kBAAkB,GAAG,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACzE,OAAO,GAAG,OAAO,KACd,MAAM,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAO9B;AAED,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,kBAAkB,GAAG,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACzE,OAAO,GAAG,OAAO,sCAGlB;AAED,wBAAgB,YAAY,CAC1B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,kBAAkB,GAAG,iBAAiB,GAAG,SAAS,EAC7D,OAAO,EAEP,KAAK,EAAE;IACL,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CAC7C,GAAG,CACA;IACE,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;CAC5B,GACD,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAC9B,eAsDF"}
+{"version":3,"file":"use-zero.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-zero.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,KAAK,GAAG,EACT,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,IAAI,EACJ,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,MAAM,EACX,KAAK,WAAW,EACjB,MAAM,WAAW,CAAC;AAOnB;;GAEG;AACH,wBAAgB,UAAU,CACxB,CAAC,SAAS,MAAM,GAAG,aAAa,EAChC,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACpD,OAAO,GAAG,cAAc,EACxB,OAAO,EAAE,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAM5D;AAED,wBAAgB,OAAO,CACrB,CAAC,SAAS,MAAM,GAAG,aAAa,EAChC,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACpD,OAAO,GAAG,cAAc,KACrB,MAAM,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAO9B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,GAAG,aAAa,EAChC,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACpD,OAAO,GAAG,cAAc,sCAGzB;AAID,wBAAgB,YAAY,CAC1B,CAAC,SAAS,MAAM,GAAG,aAAa,EAChC,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACpD,OAAO,GAAG,cAAc,EAExB,KAAK,EAAE;IACL,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CAC7C,GAAG,CACA;IACE,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;CAC5B,GACD,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAC9B,eAsDF"}

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

@@ -1,7 +1,22 @@
 import { createContext, batch, useContext, createMemo, splitProps, untrack, onCleanup, createEffect } from "solid-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 "js-xxhash";
+import "../../zero-protocol/src/client-schema.js";
+import "../../zero-schema/src/permissions.js";
+import "../../zero-protocol/src/ast.js";
 import { Zero } from "../../zero-client/src/client/zero.js";
 const ZeroContext = createContext(void 0);
-const NO_AUTH_SET = Symbol();
 function createZero(options) {
   const opts = {
     ...options,
@@ -19,6 +34,7 @@ function useZero() {
 function createUseZero() {
   return () => useZero();
 }
+const NO_AUTH_SET = Symbol();
 function ZeroProvider(props) {
   const zero = createMemo(() => {
     if ("zero" in props) {

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

@@ -1 +1 @@
-{"version":3,"file":"use-zero.js","sources":["../../../../zero-solid/src/use-zero.ts"],"sourcesContent":["import {\n  batch,\n  createContext,\n  createEffect,\n  createMemo,\n  onCleanup,\n  splitProps,\n  untrack,\n  useContext,\n  type Accessor,\n  type JSX,\n} from 'solid-js';\nimport type {CustomMutatorDefs} from '../../zero-client/src/client/custom.ts';\nimport type {ZeroOptions} from '../../zero-client/src/client/options.ts';\nimport {Zero} from '../../zero-client/src/client/zero.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {AnyMutatorRegistry} from '../../zql/src/mutate/mutator-registry.ts';\n\nconst ZeroContext = createContext<\n  // oxlint-disable-next-line no-explicit-any\n  Accessor<Zero<any, any, any>> | undefined\n>(undefined);\n\nconst NO_AUTH_SET = Symbol();\n\nexport function createZero<\n  S extends Schema,\n  MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined = undefined,\n  Context = unknown,\n>(options: ZeroOptions<S, MD, Context>): Zero<S, MD, Context> {\n  const opts = {\n    ...options,\n    batchViewUpdates: batch,\n  };\n  return new Zero(opts);\n}\n\nexport function useZero<\n  S extends Schema,\n  MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined = undefined,\n  Context = unknown,\n>(): () => Zero<S, MD, Context> {\n  const zero = useContext(ZeroContext);\n\n  if (zero === undefined) {\n    throw new Error('useZero must be used within a ZeroProvider');\n  }\n  return zero;\n}\n\nexport function createUseZero<\n  S extends Schema,\n  MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined = undefined,\n  Context = unknown,\n>() {\n  return () => useZero<S, MD, Context>();\n}\n\nexport function ZeroProvider<\n  S extends Schema,\n  MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined,\n  Context,\n>(\n  props: {\n    children: JSX.Element;\n    init?: (zero: Zero<S, MD, Context>) => void;\n  } & (\n    | {\n        zero: Zero<S, MD, Context>;\n      }\n    | ZeroOptions<S, MD, Context>\n  ),\n) {\n  const zero = createMemo(() => {\n    if ('zero' in props) {\n      return props.zero;\n    }\n\n    const [, options] = splitProps(props, ['children', 'auth']);\n\n    const authValue = untrack(() => props.auth);\n    const createdZero = new Zero({\n      ...options,\n      ...(authValue !== undefined ? {auth: authValue} : {}),\n      batchViewUpdates: batch,\n    });\n    options.init?.(createdZero);\n    onCleanup(() => createdZero.close());\n    return createdZero;\n  });\n\n  const auth = createMemo<\n    typeof NO_AUTH_SET | ZeroOptions<S, MD, Context>['auth']\n  >(() => ('auth' in props ? props.auth : NO_AUTH_SET));\n\n  let prevAuth: typeof NO_AUTH_SET | ZeroOptions<S, MD, Context>['auth'] =\n    NO_AUTH_SET;\n\n  createEffect(() => {\n    const currentZero = zero();\n    if (!currentZero) {\n      return;\n    }\n\n    const currentAuth = auth();\n\n    if (prevAuth === NO_AUTH_SET) {\n      prevAuth = currentAuth;\n      return;\n    }\n\n    if (currentAuth !== prevAuth) {\n      prevAuth = currentAuth;\n      void currentZero.connection.connect({\n        auth: currentAuth === NO_AUTH_SET ? undefined : currentAuth,\n      });\n    }\n  });\n\n  return ZeroContext.Provider({\n    value: zero,\n    get children() {\n      return props.children;\n    },\n  });\n}\n"],"names":[],"mappings":";;AAkBA,MAAM,cAAc,cAGlB,MAAS;AAEX,MAAM,cAAc,OAAA;AAEb,SAAS,WAId,SAA4D;AAC5D,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,kBAAkB;AAAA,EAAA;AAEpB,SAAO,IAAI,KAAK,IAAI;AACtB;AAEO,SAAS,UAIgB;AAC9B,QAAM,OAAO,WAAW,WAAW;AAEnC,MAAI,SAAS,QAAW;AACtB,UAAM,IAAI,MAAM,4CAA4C;AAAA,EAC9D;AACA,SAAO;AACT;AAEO,SAAS,gBAIZ;AACF,SAAO,MAAM,QAAA;AACf;AAEO,SAAS,aAKd,OASA;AACA,QAAM,OAAO,WAAW,MAAM;AAC5B,QAAI,UAAU,OAAO;AACnB,aAAO,MAAM;AAAA,IACf;AAEA,UAAM,CAAA,EAAG,OAAO,IAAI,WAAW,OAAO,CAAC,YAAY,MAAM,CAAC;AAE1D,UAAM,YAAY,QAAQ,MAAM,MAAM,IAAI;AAC1C,UAAM,cAAc,IAAI,KAAK;AAAA,MAC3B,GAAG;AAAA,MACH,GAAI,cAAc,SAAY,EAAC,MAAM,UAAA,IAAa,CAAA;AAAA,MAClD,kBAAkB;AAAA,IAAA,CACnB;AACD,YAAQ,OAAO,WAAW;AAC1B,cAAU,MAAM,YAAY,OAAO;AACnC,WAAO;AAAA,EACT,CAAC;AAED,QAAM,OAAO,WAEX,MAAO,UAAU,QAAQ,MAAM,OAAO,WAAY;AAEpD,MAAI,WACF;AAEF,eAAa,MAAM;AACjB,UAAM,cAAc,KAAA;AACpB,QAAI,CAAC,aAAa;AAChB;AAAA,IACF;AAEA,UAAM,cAAc,KAAA;AAEpB,QAAI,aAAa,aAAa;AAC5B,iBAAW;AACX;AAAA,IACF;AAEA,QAAI,gBAAgB,UAAU;AAC5B,iBAAW;AACX,WAAK,YAAY,WAAW,QAAQ;AAAA,QAClC,MAAM,gBAAgB,cAAc,SAAY;AAAA,MAAA,CACjD;AAAA,IACH;AAAA,EACF,CAAC;AAED,SAAO,YAAY,SAAS;AAAA,IAC1B,OAAO;AAAA,IACP,IAAI,WAAW;AACb,aAAO,MAAM;AAAA,IACf;AAAA,EAAA,CACD;AACH;"}
+{"version":3,"file":"use-zero.js","sources":["../../../../zero-solid/src/use-zero.ts"],"sourcesContent":["import {\n  batch,\n  createContext,\n  createEffect,\n  createMemo,\n  onCleanup,\n  splitProps,\n  untrack,\n  useContext,\n  type Accessor,\n  type JSX,\n} from 'solid-js';\nimport {\n  Zero,\n  type CustomMutatorDefs,\n  type DefaultContext,\n  type DefaultSchema,\n  type Schema,\n  type ZeroOptions,\n} from './zero.ts';\n\nconst ZeroContext = createContext<\n  // oxlint-disable-next-line no-explicit-any\n  Accessor<Zero<any, any, any>> | undefined\n>(undefined);\n\n/**\n * @deprecated Use {@linkcode ZeroProvider} instead of managing your own Zero instance.\n */\nexport function createZero<\n  S extends Schema = DefaultSchema,\n  MD extends CustomMutatorDefs | undefined = undefined,\n  Context = DefaultContext,\n>(options: ZeroOptions<S, MD, Context>): Zero<S, MD, Context> {\n  const opts = {\n    ...options,\n    batchViewUpdates: batch,\n  };\n  return new Zero(opts);\n}\n\nexport function useZero<\n  S extends Schema = DefaultSchema,\n  MD extends CustomMutatorDefs | undefined = undefined,\n  Context = DefaultContext,\n>(): () => Zero<S, MD, Context> {\n  const zero = useContext(ZeroContext);\n\n  if (zero === undefined) {\n    throw new Error('useZero must be used within a ZeroProvider');\n  }\n  return zero;\n}\n\n/**\n * @deprecated Use {@linkcode useZero} instead, alongside default types defined with:\n *\n * ```ts\n * declare module '@rocicorp/zero' {\n *   interface DefaultTypes {\n *     schema: typeof schema;\n *     context: Context;\n *   }\n * }\n */\nexport function createUseZero<\n  S extends Schema = DefaultSchema,\n  MD extends CustomMutatorDefs | undefined = undefined,\n  Context = DefaultContext,\n>() {\n  return () => useZero<S, MD, Context>();\n}\n\nconst NO_AUTH_SET = Symbol();\n\nexport function ZeroProvider<\n  S extends Schema = DefaultSchema,\n  MD extends CustomMutatorDefs | undefined = undefined,\n  Context = DefaultContext,\n>(\n  props: {\n    children: JSX.Element;\n    init?: (zero: Zero<S, MD, Context>) => void;\n  } & (\n    | {\n        zero: Zero<S, MD, Context>;\n      }\n    | ZeroOptions<S, MD, Context>\n  ),\n) {\n  const zero = createMemo(() => {\n    if ('zero' in props) {\n      return props.zero;\n    }\n\n    const [, options] = splitProps(props, ['children', 'auth']);\n\n    const authValue = untrack(() => props.auth);\n    const createdZero = new Zero({\n      ...options,\n      ...(authValue !== undefined ? {auth: authValue} : {}),\n      batchViewUpdates: batch,\n    });\n    options.init?.(createdZero);\n    onCleanup(() => createdZero.close());\n    return createdZero;\n  });\n\n  const auth = createMemo<\n    typeof NO_AUTH_SET | ZeroOptions<S, MD, Context>['auth']\n  >(() => ('auth' in props ? props.auth : NO_AUTH_SET));\n\n  let prevAuth: typeof NO_AUTH_SET | ZeroOptions<S, MD, Context>['auth'] =\n    NO_AUTH_SET;\n\n  createEffect(() => {\n    const currentZero = zero();\n    if (!currentZero) {\n      return;\n    }\n\n    const currentAuth = auth();\n\n    if (prevAuth === NO_AUTH_SET) {\n      prevAuth = currentAuth;\n      return;\n    }\n\n    if (currentAuth !== prevAuth) {\n      prevAuth = currentAuth;\n      void currentZero.connection.connect({\n        auth: currentAuth === NO_AUTH_SET ? undefined : currentAuth,\n      });\n    }\n  });\n\n  return ZeroContext.Provider({\n    value: zero,\n    get children() {\n      return props.children;\n    },\n  });\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAqBA,MAAM,cAAc,cAGlB,MAAS;AAKJ,SAAS,WAId,SAA4D;AAC5D,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,kBAAkB;AAAA,EAAA;AAEpB,SAAO,IAAI,KAAK,IAAI;AACtB;AAEO,SAAS,UAIgB;AAC9B,QAAM,OAAO,WAAW,WAAW;AAEnC,MAAI,SAAS,QAAW;AACtB,UAAM,IAAI,MAAM,4CAA4C;AAAA,EAC9D;AACA,SAAO;AACT;AAaO,SAAS,gBAIZ;AACF,SAAO,MAAM,QAAA;AACf;AAEA,MAAM,cAAc,OAAA;AAEb,SAAS,aAKd,OASA;AACA,QAAM,OAAO,WAAW,MAAM;AAC5B,QAAI,UAAU,OAAO;AACnB,aAAO,MAAM;AAAA,IACf;AAEA,UAAM,CAAA,EAAG,OAAO,IAAI,WAAW,OAAO,CAAC,YAAY,MAAM,CAAC;AAE1D,UAAM,YAAY,QAAQ,MAAM,MAAM,IAAI;AAC1C,UAAM,cAAc,IAAI,KAAK;AAAA,MAC3B,GAAG;AAAA,MACH,GAAI,cAAc,SAAY,EAAC,MAAM,UAAA,IAAa,CAAA;AAAA,MAClD,kBAAkB;AAAA,IAAA,CACnB;AACD,YAAQ,OAAO,WAAW;AAC1B,cAAU,MAAM,YAAY,OAAO;AACnC,WAAO;AAAA,EACT,CAAC;AAED,QAAM,OAAO,WAEX,MAAO,UAAU,QAAQ,MAAM,OAAO,WAAY;AAEpD,MAAI,WACF;AAEF,eAAa,MAAM;AACjB,UAAM,cAAc,KAAA;AACpB,QAAI,CAAC,aAAa;AAChB;AAAA,IACF;AAEA,UAAM,cAAc,KAAA;AAEpB,QAAI,aAAa,aAAa;AAC5B,iBAAW;AACX;AAAA,IACF;AAEA,QAAI,gBAAgB,UAAU;AAC5B,iBAAW;AACX,WAAK,YAAY,WAAW,QAAQ;AAAA,QAClC,MAAM,gBAAgB,cAAc,SAAY;AAAA,MAAA,CACjD;AAAA,IACH;AAAA,EACF,CAAC;AAED,SAAO,YAAY,SAAS;AAAA,IAC1B,OAAO;AAAA,IACP,IAAI,WAAW;AACb,aAAO,MAAM;AAAA,IACf;AAAA,EAAA,CACD;AACH;"}

package/out/zero-solid/src/zero.d.ts

@@ -0,0 +1,2 @@
+export * from '../../zero-client/src/mod.ts';
+//# sourceMappingURL=zero.d.ts.map

package/out/zero-solid/src/zero.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"zero.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/zero.ts"],"names":[],"mappings":"AACA,cAAc,8BAA8B,CAAC"}

package/out/zero-types/src/default-types.d.ts

@@ -0,0 +1,38 @@
+import type { Expand } from '../../shared/src/expand.ts';
+import type { Schema } from './schema.ts';
+/**
+ * Applications can augment this interface to register their Zero types via
+ * declaration merging:
+ *
+ * ```ts
+ * declare module '@rocicorp/zero' {
+ *   interface DefaultTypes {
+ *     schema: typeof schema;
+ *     context: AuthData | undefined;
+ *     dbProvider: typeof dbProvider;
+ *   }
+ * }
+ * ```
+ */
+export interface DefaultTypes {
+}
+export type DefaultSchema<TDefaultTypes = DefaultTypes> = TDefaultTypes extends {
+    readonly schema: infer S extends Schema;
+} ? S : Schema;
+export type DefaultContext<TDefaultTypes = DefaultTypes> = TDefaultTypes extends {
+    readonly context: infer C;
+} ? Expand<Readonly<C>> : unknown;
+export type InferTransactionFromDbProvider<TDbProvider> = TDbProvider extends {
+    transaction: <R>(callback: (tx: infer TTransaction, ...args: any[]) => any, ...args: any[]) => Promise<R>;
+} ? TTransaction : unknown;
+export type DefaultWrappedTransaction<TDefaultTypes = DefaultTypes> = TDefaultTypes extends {
+    readonly dbProvider: infer DbProvider;
+} ? InferTransactionFromDbProvider<DbProvider> extends infer TTransaction ? TTransaction extends {
+    readonly dbTransaction: {
+        readonly wrappedTransaction: infer TWrappedTransaction;
+    };
+} ? TWrappedTransaction : {
+    error: `The \`dbProvider\` type you have registered with \`declare module '@rocicorp/zero'\` is incorrect.`;
+    registeredDbProvider: DbProvider;
+} : never : unknown;
+//# sourceMappingURL=default-types.d.ts.map

package/out/zero-types/src/default-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"default-types.d.ts","sourceRoot":"","sources":["../../../../zero-types/src/default-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAExC;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,YAAY;CAAG;AAEhC,MAAM,MAAM,aAAa,CAAC,aAAa,GAAG,YAAY,IACpD,aAAa,SAAS;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,MAAM,CAAC;CACzC,GACG,CAAC,GACD,MAAM,CAAC;AAEb,MAAM,MAAM,cAAc,CAAC,aAAa,GAAG,YAAY,IACrD,aAAa,SAAS;IACpB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;CAC3B,GACG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC;AAEd,MAAM,MAAM,8BAA8B,CAAC,WAAW,IAAI,WAAW,SAAS;IAC5E,WAAW,EAAE,CAAC,CAAC,EAEb,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,YAAY,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAEzD,GAAG,IAAI,EAAE,GAAG,EAAE,KACX,OAAO,CAAC,CAAC,CAAC,CAAC;CACjB,GACG,YAAY,GACZ,OAAO,CAAC;AAEZ,MAAM,MAAM,yBAAyB,CAAC,aAAa,GAAG,YAAY,IAChE,aAAa,SAAS;IACpB,QAAQ,CAAC,UAAU,EAAE,MAAM,UAAU,CAAC;CACvC,GACG,8BAA8B,CAAC,UAAU,CAAC,SAAS,MAAM,YAAY,GACnE,YAAY,SAAS;IACnB,QAAQ,CAAC,aAAa,EAAE;QACtB,QAAQ,CAAC,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;KACxD,CAAC;CACH,GACC,mBAAmB,GACnB;IACE,KAAK,EAAE,oGAAoG,CAAC;IAC5G,oBAAoB,EAAE,UAAU,CAAC;CAClC,GACH,KAAK,GACP,OAAO,CAAC"}

package/out/zero-types/src/schema.d.ts

@@ -36,17 +36,17 @@ export type Schema = {
     /**
      * Enables legacy query support.
      * When this is true, old-style queries that do not require server side implementations will be enabled.
-     * This will flip to false in the future and what we currently call "custom queries" will become "queries" and
+     * What we currently call "custom queries" will become "queries" and
      * the only option for reading data.
-     * The default is true, but will flip to false in the future.
+     * The default is false.
      */
     readonly enableLegacyQueries?: boolean | undefined;
     /**
      * Enables legacy mutator support.
      * When this is true, old-style mutations that do not require server side implementations will be enabled.
-     * This will flip to false in the future and what we currently call "custom mutations" will become "mutations" and
+     * What we currently call "custom mutations" will become "mutations" and
      * the only option for writing data.
-     * The default is true, but will flip to false in the future.
+     * The default is false.
      */
     readonly enableLegacyMutators?: boolean | undefined;
 };

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;AAI1E,OAAO,EAEL,KAAK,WAAW,EACjB,MAAM,4BAA4B,CAAC;AAIpC,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,KAAK,EAAC,mBAAmB,EAAC,MAAM,kCAAkC,CAAC;AAE1E,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAkB,KAAK,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAEtE,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;;;;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;;;;;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,CAUP;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,GAAG,EACR,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,OAqDzD;AAyBD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAsB5D;AA+PD,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;AAmHD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,UAAU,GACb,IAAI,CAgBN;AA8CD,wBAAgB,0CAA0C,CACxD,IAAI,EAAE,SAAS,GACd,OAAO,CAUT;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

@@ -1,6 +1,5 @@
 import { unreachable, assert } from "../../../shared/src/asserts.js";
 import { must } from "../../../shared/src/must.js";
-import { PlannerException } from "../error.js";
 import { Exists } from "../ivm/exists.js";
 import { FanIn } from "../ivm/fan-in.js";
 import { FanOut } from "../ivm/fan-out.js";
@@ -22,16 +21,7 @@ function buildPipeline(ast, delegate, queryID, costModel, lc, planDebugger) {
     (tableName) => must(delegate.getSource(tableName)).tableSchema.primaryKey
   );
   if (costModel) {
-    try {
-      ast = planQuery(ast, costModel, planDebugger);
-    } catch (e) {
-      if (e instanceof PlannerException) {
-        const message = `Query planner failed (${e.kind}), falling back to unoptimized query: ${e.message}`;
-        lc?.warn?.(message);
-      } else {
-        throw e;
-      }
-    }
+    ast = planQuery(ast, costModel, planDebugger, lc);
   }
   return buildPipelineInternal(ast, delegate, queryID, "");
 }
@@ -411,7 +401,6 @@ function applyCorrelatedSubQuery(sq, delegate, queryID, end, name, fromCondition
   const join = new Join({
     parent: end,
     child,
-    storage: delegate.createStorage(joinName),
     parentKey: sq.correlation.parentField,
     childKey: sq.correlation.childField,
     relationshipName: sq.subquery.alias,
@@ -437,7 +426,6 @@ function applyCorrelatedSubqueryCondition(input, condition, delegate, name) {
   const existsName = `${name}:exists(${condition.related.subquery.alias})`;
   const exists = new Exists(
     input,
-    delegate.createStorage(existsName),
     must(condition.related.subquery.alias),
     condition.related.correlation.parentField,
     condition.op