@rocicorp/zero 1.11.0-canary.0 → 1.11.0-canary.10

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

@@ -1 +1 @@
-{"version":3,"file":"use-query.js","names":["#views","#onDematerialized","#query","#reactInternals","#zero","#singular","#ttl","#snapshot","#materializeIfNeeded","#retry","#complete","#completeResolver","#nonEmpty","#nonEmptyResolver","#view","#onData","#destroyTimer"],"sources":["../../../../zero-react/src/use-query.tsx"],"sourcesContent":["import {resolver} from '@rocicorp/resolver';\nimport React, {useSyncExternalStore} from 'react';\nimport {TESTING} from '../../shared/src/testing.ts';\nimport {\n  type Immutable,\n  addContextToQuery,\n  asQueryInternals,\n  DEFAULT_TTL_MS,\n} from './bindings.ts';\nimport {useZero} from './zero-provider.tsx';\nimport type {\n  AnyMutatorRegistry,\n  BaseDefaultContext,\n  BaseDefaultSchema,\n  CustomMutatorDefs,\n  DefaultContext,\n  DefaultSchema,\n  ErroredQuery,\n  Falsy,\n  HumanReadable,\n  PullRow,\n  Query,\n  QueryErrorDetails,\n  QueryOrQueryRequest,\n  QueryResultDetails,\n  ReadonlyJSONValue,\n  ResultType,\n  TTL,\n  TypedView,\n  Zero,\n} from './zero.ts';\n\nexport type QueryResult<TReturn> = readonly [\n  HumanReadable<TReturn>,\n  QueryResultDetails & {},\n];\n\n/**\n * Result type for \"maybe queries\" - queries that may be falsy.\n * The data value can be undefined when the query is falsy/disabled.\n */\nexport type MaybeQueryResult<TReturn> = readonly [\n  HumanReadable<TReturn> | undefined,\n  QueryResultDetails & {},\n];\n\nexport type UseQueryOptions = {\n  enabled?: boolean | undefined;\n  /**\n   * Time to live (TTL) in seconds. Controls how long query results are cached\n   * after the query is removed. During this time, Zero continues to sync the query.\n   * Default is 'never'.\n   */\n  ttl?: TTL | undefined;\n};\n\nexport type UseSuspenseQueryOptions = UseQueryOptions & {\n  /**\n   * Whether to suspend until:\n   * - 'partial': the query has partial results (partial array or defined\n   *   value for singular results) which may be of result type 'unknown',\n   *   or the query result type is 'complete' (in which case results may be\n   *   empty).  This is useful for suspending until there are partial\n   *   optimistic local results, or the query has completed loading from the\n   *   server.\n   * - 'complete': the query result type is 'complete'.\n   *\n   * Default is 'partial'.\n   */\n  suspendUntil?: 'complete' | 'partial';\n};\n\nconst reactUse = (React as {use?: (p: Promise<unknown>) => void}).use;\nconst suspend: (p: Promise<unknown>) => void = reactUse\n  ? reactUse\n  : p => {\n      throw p;\n    };\n\n// Overload 1: Query\nexport function useQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  query: QueryOrQueryRequest<\n    TTable,\n    TInput,\n    TOutput,\n    TSchema,\n    TReturn,\n    TContext\n  >,\n  options?: UseQueryOptions | boolean,\n): QueryResult<TReturn>;\n\n// Overload 2: Maybe query\nexport function useQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  query:\n    | QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n    | Falsy,\n  options?: UseQueryOptions | boolean,\n): MaybeQueryResult<TReturn>;\n\n// Implementation\nexport function useQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  query:\n    | QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n    | Falsy,\n  options?: UseQueryOptions | boolean,\n): QueryResult<TReturn> | MaybeQueryResult<TReturn> {\n  let enabled = true;\n  let ttl: TTL = DEFAULT_TTL_MS;\n  if (typeof options === 'boolean') {\n    enabled = options;\n  } else if (options) {\n    ({enabled = true, ttl = DEFAULT_TTL_MS} = options);\n  }\n\n  const zero = useZero<TSchema, undefined, TContext>();\n\n  // When query is falsy, use disabled subscriber/snapshot to maintain hook order\n  const q = query ? addContextToQuery(query, zero.context) : undefined;\n  const view = q ? viewStore.getView(zero, q, enabled, ttl) : undefined;\n\n  // https://react.dev/reference/react/useSyncExternalStore\n  // Always call useSyncExternalStore to maintain consistent hook order\n  return useSyncExternalStore(\n    view?.subscribeReactInternals ?? disabledSubscriber,\n    view?.getSnapshot ??\n      (getDisabledSnapshot as () => MaybeQueryResult<TReturn>),\n    view?.getSnapshot ??\n      (getDisabledSnapshot as () => MaybeQueryResult<TReturn>),\n  );\n}\n\n// Overload 1: Query\nexport function useSuspenseQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  query: QueryOrQueryRequest<\n    TTable,\n    TInput,\n    TOutput,\n    TSchema,\n    TReturn,\n    TContext\n  >,\n  options?: UseSuspenseQueryOptions | boolean,\n): QueryResult<TReturn>;\n\n// Overload 2: Maybe query\nexport function useSuspenseQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  query:\n    | QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n    | Falsy,\n  options?: UseSuspenseQueryOptions | boolean,\n): MaybeQueryResult<TReturn>;\n\n// Implementation\nexport function useSuspenseQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  query:\n    | QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n    | Falsy,\n  options?: UseSuspenseQueryOptions | boolean,\n): QueryResult<TReturn> | MaybeQueryResult<TReturn> {\n  let enabled = true;\n  let ttl: TTL = DEFAULT_TTL_MS;\n  let suspendUntil: 'complete' | 'partial' = 'partial';\n  if (typeof options === 'boolean') {\n    enabled = options;\n  } else if (options) {\n    ({\n      enabled = true,\n      ttl = DEFAULT_TTL_MS,\n      suspendUntil = 'complete',\n    } = options);\n  }\n\n  const zero = useZero<TSchema, undefined, TContext>();\n\n  // When query is falsy, use disabled subscriber/snapshot to maintain hook order\n  const q = query ? addContextToQuery(query, zero.context) : undefined;\n  const view = q ? viewStore.getView(zero, q, enabled, ttl) : undefined;\n\n  // https://react.dev/reference/react/useSyncExternalStore\n  // Always call useSyncExternalStore to maintain consistent hook order\n  const snapshot = useSyncExternalStore(\n    view?.subscribeReactInternals ?? disabledSubscriber,\n    view?.getSnapshot ??\n      (getDisabledSnapshot as () => MaybeQueryResult<TReturn>),\n    view?.getSnapshot ??\n      (getDisabledSnapshot as () => MaybeQueryResult<TReturn>),\n  );\n\n  if (view && enabled) {\n    if (suspendUntil === 'complete' && !view.complete) {\n      suspend(view.waitForComplete());\n    }\n\n    if (suspendUntil === 'partial' && !view.nonEmpty) {\n      suspend(view.waitForNonEmpty());\n    }\n  }\n\n  return snapshot;\n}\n\nconst emptyArray: unknown[] = [];\nconst disabledSubscriber = () => () => {};\n\nconst resultTypeUnknown = {type: 'unknown'} as const;\nconst resultTypeComplete = {type: 'complete'} as const;\nconst resultTypeError = {type: 'error'} as const;\n\nconst disabledQuerySnapshot = [undefined, resultTypeUnknown] as const;\nconst getDisabledSnapshot = () => disabledQuerySnapshot;\n\nconst emptySnapshotSingularUnknown = [undefined, resultTypeUnknown] as const;\nconst emptySnapshotSingularComplete = [undefined, resultTypeComplete] as const;\nconst emptySnapshotSingularErrorUnknown = [undefined, resultTypeError] as const;\nconst emptySnapshotPluralUnknown = [emptyArray, resultTypeUnknown] as const;\nconst emptySnapshotPluralComplete = [emptyArray, resultTypeComplete] as const;\nconst emptySnapshotErrorUnknown = [emptyArray, resultTypeError] as const;\n\nfunction getDefaultSnapshot<TReturn>(singular: boolean): QueryResult<TReturn> {\n  return (\n    singular ? emptySnapshotSingularUnknown : emptySnapshotPluralUnknown\n  ) as QueryResult<TReturn>;\n}\n\n/**\n * Returns a new snapshot or one of the empty predefined ones. Returning the\n * predefined ones is important to prevent unnecessary re-renders in React.\n */\nfunction getSnapshot<TReturn>(\n  singular: boolean,\n  data: HumanReadable<TReturn>,\n  resultType: ResultType,\n  retryFn: () => void,\n  error?: ErroredQuery,\n): QueryResult<TReturn> {\n  if (singular && data === undefined) {\n    switch (resultType) {\n      case 'error':\n        if (error) {\n          return [\n            undefined,\n            makeError(retryFn, error),\n          ] as unknown as QueryResult<TReturn>;\n        }\n        return emptySnapshotSingularErrorUnknown as unknown as QueryResult<TReturn>;\n      case 'complete':\n        return emptySnapshotSingularComplete as unknown as QueryResult<TReturn>;\n      case 'unknown':\n        return emptySnapshotSingularUnknown as unknown as QueryResult<TReturn>;\n    }\n  }\n\n  if (!singular && (data as unknown[]).length === 0) {\n    switch (resultType) {\n      case 'error':\n        if (error) {\n          return [\n            emptyArray,\n            makeError(retryFn, error),\n          ] as unknown as QueryResult<TReturn>;\n        }\n        return emptySnapshotErrorUnknown as unknown as QueryResult<TReturn>;\n      case 'complete':\n        return emptySnapshotPluralComplete as unknown as QueryResult<TReturn>;\n      case 'unknown':\n        return emptySnapshotPluralUnknown as unknown as QueryResult<TReturn>;\n    }\n  }\n\n  switch (resultType) {\n    case 'error':\n      if (error) {\n        return [data, makeError(retryFn, error)];\n      }\n      return [\n        data,\n        makeError(retryFn, {\n          error: 'app',\n          id: 'unknown',\n          name: 'unknown',\n          message: 'An unknown error occurred',\n        }),\n      ];\n    case 'complete':\n      return [data, resultTypeComplete];\n    case 'unknown':\n      return [data, resultTypeUnknown];\n  }\n}\n\nfunction makeError(retry: () => void, error: ErroredQuery): QueryErrorDetails {\n  const message = error.message ?? 'An unknown error occurred';\n  return {\n    type: 'error',\n    retry,\n    refetch: retry,\n    error: {\n      type: error.error,\n      message,\n      ...(error.details ? {details: error.details} : {}),\n    },\n  };\n}\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\ntype AnyViewWrapper = ViewWrapper<any, any, any, any, any>;\n\nconst allViews = new WeakMap<ViewStore, Map<string, AnyViewWrapper>>();\n\nexport function getAllViewsSizeForTesting(store: ViewStore): number {\n  if (TESTING) {\n    return allViews.get(store)?.size ?? 0;\n  }\n  return 0;\n}\n\n/**\n * A global store of all active views.\n *\n * React subscribes and unsubscribes to these views\n * via `useSyncExternalStore`.\n *\n * Managing views through `useEffect` or `useLayoutEffect` causes\n * inconsistencies because effects run after render.\n *\n * For example, if useQuery used use*Effect in the component below:\n * ```ts\n * function Foo({issueID}) {\n *   const issue = useQuery(z.query.issue.where('id', issueID).one());\n *   if (issue?.id !== undefined && issue.id !== issueID) {\n *     console.log('MISMATCH!', issue.id, issueID);\n *   }\n * }\n * ```\n *\n * `MISMATCH` will be printed whenever the `issueID` prop changes.\n *\n * This is because the component will render once with\n * the old state returned from `useQuery`. Then the effect inside\n * `useQuery` will run. The component will render again with the new\n * state. This inconsistent transition can cause unexpected results.\n *\n * Emulating `useEffect` via `useState` and `if` causes resource leaks.\n * That is:\n *\n * ```ts\n * function useQuery(q) {\n *   const [oldHash, setOldHash] = useState();\n *   if (hash(q) !== oldHash) {\n *      // make new view\n *   }\n *\n *   useEffect(() => {\n *     return () => view.destroy();\n *   }, []);\n * }\n * ```\n *\n * I'm not sure why but in strict mode the cleanup function\n * fails to be called for the first instance of the view and only\n * cleans up later instances.\n *\n * Swapping `useState` to `useRef` has similar problems.\n */\nexport class ViewStore {\n  #views = new Map<string, AnyViewWrapper>();\n\n  constructor() {\n    if (TESTING) {\n      allViews.set(this, this.#views);\n    }\n  }\n\n  getView<\n    TTable extends keyof TSchema['tables'] & string,\n    TSchema extends BaseDefaultSchema,\n    TReturn,\n    MD extends CustomMutatorDefs | undefined,\n    TContext extends BaseDefaultContext,\n  >(\n    zero: Zero<TSchema, MD, TContext>,\n    q: Query<TTable, TSchema, TReturn>,\n    enabled: boolean,\n    ttl: TTL,\n  ): {\n    getSnapshot: () => QueryResult<TReturn>;\n    subscribeReactInternals: (internals: () => void) => () => void;\n    updateTTL: (ttl: TTL) => void;\n    waitForComplete: () => Promise<void>;\n    waitForNonEmpty: () => Promise<void>;\n    complete: boolean;\n    nonEmpty: boolean;\n  } {\n    const qi = asQueryInternals(q);\n\n    if (!enabled) {\n      return {\n        getSnapshot: () => getDefaultSnapshot(qi.format.singular),\n        subscribeReactInternals: disabledSubscriber,\n        updateTTL: () => {},\n        waitForComplete: () => Promise.resolve(),\n        waitForNonEmpty: () => Promise.resolve(),\n        complete: false,\n        nonEmpty: false,\n      };\n    }\n\n    const hash = qi.hash() + zero.clientID;\n    let existing = this.#views.get(hash);\n    if (!existing) {\n      existing = new ViewWrapper(q, zero, ttl, view => {\n        const currentView = this.#views.get(hash);\n        if (currentView && currentView !== view) {\n          // we replaced the view with a new one already.\n          return;\n        }\n        this.#views.delete(hash);\n      });\n      this.#views.set(hash, existing);\n    } else {\n      existing.updateTTL(ttl);\n    }\n    return existing as ViewWrapper<TTable, TSchema, TReturn, MD, TContext>;\n  }\n}\n\nconst viewStore = new ViewStore();\n\n/**\n * This wraps and ref counts a view.\n *\n * The only signal we have from React as to whether or not it is\n * done with a view is when it calls `unsubscribe`.\n *\n * In non-strict-mode we can clean up the view as soon\n * as the listener count goes to 0.\n *\n * In strict-mode, the listener count will go to 0 then a\n * new listener for the same view is immediately added back.\n *\n * This is why the `onMaterialized` and `onDematerialized` callbacks exist --\n * they allow a view which React is still referencing to be added\n * back into the store when React re-subscribes to it.\n *\n * This wrapper also exists to deal with the various\n * `useSyncExternalStore` caveats that cause excessive\n * re-renders and materializations.\n *\n * See: https://react.dev/reference/react/useSyncExternalStore#caveats\n * Especially:\n * 1. The store snapshot returned by getSnapshot must be immutable. If the underlying store has mutable data, return a new immutable snapshot if the data has changed. Otherwise, return a cached last snapshot.\n * 2. If a different subscribe function is passed during a re-render, React will re-subscribe to the store using the newly passed subscribe function. You can prevent this by declaring subscribe outside the component.\n */\nclass ViewWrapper<\n  TTable extends keyof TSchema['tables'] & string,\n  TSchema extends BaseDefaultSchema,\n  TReturn,\n  MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined,\n  TContext extends BaseDefaultContext,\n> {\n  #view: TypedView<HumanReadable<TReturn>> | undefined;\n  readonly #onDematerialized;\n  readonly #query: Query<TTable, TSchema, TReturn>;\n  #snapshot: QueryResult<TReturn>;\n  readonly #reactInternals: Set<() => void> = new Set();\n  #ttl: TTL;\n  #complete = false;\n  #completeResolver = resolver<void>();\n  #nonEmpty = false;\n  #nonEmptyResolver = resolver<void>();\n  readonly #zero: Pick<Zero<TSchema, undefined, TContext>, 'materialize'>;\n  readonly #singular: boolean;\n  #destroyTimer: ReturnType<typeof setTimeout> | undefined;\n\n  constructor(\n    query: Query<TTable, TSchema, TReturn>,\n    zero: Pick<Zero<TSchema, undefined, TContext>, 'materialize'>,\n    ttl: TTL,\n    onDematerialized: (\n      view: ViewWrapper<TTable, TSchema, TReturn, MD, TContext>,\n    ) => void,\n  ) {\n    this.#query = query;\n    this.#zero = zero;\n    this.#ttl = ttl;\n    this.#onDematerialized = onDematerialized;\n    const {singular} = asQueryInternals(query).format;\n    this.#singular = singular;\n    this.#snapshot = getDefaultSnapshot(singular);\n    this.#materializeIfNeeded();\n  }\n\n  #onData = (\n    snap: Immutable<HumanReadable<TReturn>>,\n    resultType: ResultType,\n    error?: ErroredQuery,\n  ) => {\n    // applyChange now returns immutable data structures, so no deep clone needed.\n    // Unchanged rows preserve their object identity for React.memo optimization.\n    const data = snap as HumanReadable<TReturn>;\n    this.#snapshot = getSnapshot(\n      this.#singular,\n      data,\n      resultType,\n      this.#retry,\n      error,\n    );\n    if (resultType === 'complete' || resultType === 'error') {\n      this.#complete = true;\n      this.#completeResolver.resolve();\n      this.#nonEmpty = true;\n      this.#nonEmptyResolver.resolve();\n    }\n\n    if (\n      this.#singular\n        ? this.#snapshot[0] !== undefined\n        : (this.#snapshot[0] as unknown[]).length !== 0\n    ) {\n      this.#nonEmpty = true;\n      this.#nonEmptyResolver.resolve();\n    }\n\n    for (const internals of this.#reactInternals) {\n      internals();\n    }\n  };\n\n  /**\n   * Called by the user to force a retry of the query\n   * in the case the query errored.\n   */\n  #retry = () => {\n    this.#view?.destroy();\n    this.#view = undefined;\n    this.#materializeIfNeeded();\n  };\n\n  #materializeIfNeeded = () => {\n    if (this.#view) {\n      return;\n    }\n    this.#view = this.#zero.materialize(this.#query, {\n      ttl: this.#ttl,\n    });\n    this.#view.addListener(this.#onData);\n  };\n\n  getSnapshot = () => this.#snapshot;\n\n  subscribeReactInternals = (internals: () => void): (() => void) => {\n    this.#reactInternals.add(internals);\n    // Cancel any pending destroy timer from a previous unsubscribe.\n    // Without this, rapid unsub/resub cycles accumulate stale timers\n    // that can fire during a gap between unsubscribe and resubscribe,\n    // destroying the view even though it was actively used.\n    if (this.#destroyTimer !== undefined) {\n      clearTimeout(this.#destroyTimer);\n      this.#destroyTimer = undefined;\n    }\n    this.#materializeIfNeeded();\n    return () => {\n      this.#reactInternals.delete(internals);\n\n      // only schedule a cleanup task if we have no listeners left\n      if (this.#reactInternals.size === 0) {\n        this.#destroyTimer = setTimeout(() => {\n          this.#destroyTimer = undefined;\n\n          // We already destroyed the view\n          if (this.#view === undefined) {\n            return;\n          }\n\n          // Someone re-registered a listener on this view before the timeout elapsed.\n          // This happens often in strict-mode which forces a component\n          // to mount, unmount, remount.\n          if (this.#reactInternals.size > 0) {\n            return;\n          }\n\n          this.#view.destroy();\n          this.#view = undefined;\n          this.#complete = false;\n          this.#completeResolver = resolver();\n          this.#nonEmpty = false;\n          this.#nonEmptyResolver = resolver();\n          this.#onDematerialized(this);\n        }, 10);\n      }\n    };\n  };\n\n  updateTTL(ttl: TTL): void {\n    this.#ttl = ttl;\n    this.#view?.updateTTL(ttl);\n  }\n\n  get complete() {\n    return this.#complete;\n  }\n\n  waitForComplete(): Promise<void> {\n    return this.#completeResolver.promise;\n  }\n\n  get nonEmpty() {\n    return this.#nonEmpty;\n  }\n\n  waitForNonEmpty(): Promise<void> {\n    return this.#nonEmptyResolver.promise;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"use-query.js","names":["#views","#onDematerialized","#query","#reactInternals","#zero","#singular","#ttl","#snapshot","#materializeIfNeeded","#retry","#complete","#completeResolver","#nonEmpty","#nonEmptyResolver","#view","#onData","#destroyTimer"],"sources":["../../../../zero-react/src/use-query.tsx"],"sourcesContent":["import {resolver} from '@rocicorp/resolver';\nimport React, {useRef, useSyncExternalStore} from 'react';\nimport {deepEqual} from '../../shared/src/json.ts';\nimport {TESTING} from '../../shared/src/testing.ts';\nimport {\n  type Immutable,\n  addContextToQuery,\n  asQueryInternals,\n  DEFAULT_TTL_MS,\n} from './bindings.ts';\nimport {useZero} from './zero-provider.tsx';\nimport type {\n  AnyMutatorRegistry,\n  BaseDefaultContext,\n  BaseDefaultSchema,\n  CustomMutatorDefs,\n  DefaultContext,\n  DefaultSchema,\n  ErroredQuery,\n  Falsy,\n  HumanReadable,\n  PullRow,\n  Query,\n  QueryErrorDetails,\n  QueryOrQueryRequest,\n  QueryResultDetails,\n  ReadonlyJSONValue,\n  ResultType,\n  TTL,\n  TypedView,\n  Zero,\n} from './zero.ts';\n\ntype StableQueryCache = {\n  zero: unknown;\n  context: unknown;\n  /** The last input, so an unchanged one is an identity compare and nothing else. */\n  rawQuery: object;\n  /** The `CustomQuery` a query request names; undefined for a plain query. */\n  customQuery: unknown;\n  args: ReadonlyJSONValue | undefined;\n  // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n  q: Query<any, any, any>;\n};\n\n/**\n * Resolves a query request against the Zero context, reusing the previous\n * result while the request means the same thing.\n *\n * Interning already makes an unchanged *plain* query come back as the same\n * object, so this is aimed at the query-request form -- `queries.issue({id})`\n * -- where every render allocates a fresh request and `addContextToQuery`\n * re-runs the definition. That costs argument validation (a zod parse of\n * byte-identical args) plus a walk of the builder chain, neither of which\n * interning removes: it makes rebuilding the chain cheap and gives the same\n * object back, but only after the work has been done again.\n *\n * A request resolves to the previous query when it names the same\n * `CustomQuery`, the same context, and deep-equal args. Those are exactly the\n * inputs the definition is allowed to depend on: a named query is re-derived\n * on the server from its name and args, so it has to be a pure function of\n * them, or client and server would build different queries.\n *\n * The ref is written during render. That is safe here because it is a pure\n * cache: an entry is derived only from the inputs, so a StrictMode double\n * render or a discarded concurrent render leaves it valid either way.\n */\nfunction useStableQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema,\n  TReturn,\n  TContext extends BaseDefaultContext,\n>(\n  query:\n    | QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n    | Falsy,\n  zero: Zero<TSchema, undefined, TContext>,\n): Query<TTable, TSchema, TReturn> | undefined {\n  const cacheRef = useRef<StableQueryCache | undefined>(undefined);\n\n  // Deliberately kept rather than cleared: a query toggled off and back on\n  // reuses what it had.\n  if (!query) {\n    return undefined;\n  }\n\n  const cache = cacheRef.current;\n  if (cache && cache.zero === zero) {\n    if (cache.rawQuery === query) {\n      return cache.q as Query<TTable, TSchema, TReturn>;\n    }\n    if (\n      'query' in query &&\n      cache.customQuery === query.query &&\n      cache.context === zero.context &&\n      deepEqual(cache.args, query.args)\n    ) {\n      // Same meaning, new wrapper object: remember it so the next render is\n      // the identity compare above.\n      cache.rawQuery = query;\n      return cache.q as Query<TTable, TSchema, TReturn>;\n    }\n  }\n\n  const q = addContextToQuery(query, zero.context);\n  const isRequest = 'query' in query;\n  cacheRef.current = {\n    zero: zero,\n    context: zero.context,\n    rawQuery: query,\n    customQuery: isRequest ? query.query : undefined,\n    args: isRequest ? query.args : undefined,\n    q,\n  };\n  return q;\n}\n\nexport type QueryResult<TReturn> = readonly [\n  HumanReadable<TReturn>,\n  QueryResultDetails & {},\n];\n\n/**\n * Result type for \"maybe queries\" - queries that may be falsy.\n * The data value can be undefined when the query is falsy/disabled.\n */\nexport type MaybeQueryResult<TReturn> = readonly [\n  HumanReadable<TReturn> | undefined,\n  QueryResultDetails & {},\n];\n\nexport type UseQueryOptions = {\n  enabled?: boolean | undefined;\n  /**\n   * Time to live (TTL) in seconds. Controls how long query results are cached\n   * after the query is removed. During this time, Zero continues to sync the query.\n   * Default is 'never'.\n   */\n  ttl?: TTL | undefined;\n};\n\nexport type UseSuspenseQueryOptions = UseQueryOptions & {\n  /**\n   * Whether to suspend until:\n   * - 'partial': the query has partial results (partial array or defined\n   *   value for singular results) which may be of result type 'unknown',\n   *   or the query result type is 'complete' or 'cached' (in which case\n   *   results may be empty: a server-confirmed empty answer, from this\n   *   connection or a previous one, is something to render). This is useful\n   *   for suspending until there are partial optimistic local results, or\n   *   the query has completed loading from the server.\n   * - 'complete': the query result type is 'complete'.\n   *\n   * Default is 'partial'.\n   */\n  suspendUntil?: 'complete' | 'partial';\n};\n\nconst reactUse = (React as {use?: (p: Promise<unknown>) => void}).use;\nconst suspend: (p: Promise<unknown>) => void = reactUse\n  ? reactUse\n  : p => {\n      throw p;\n    };\n\n// Overload 1: Query\nexport function useQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  query: QueryOrQueryRequest<\n    TTable,\n    TInput,\n    TOutput,\n    TSchema,\n    TReturn,\n    TContext\n  >,\n  options?: UseQueryOptions | boolean,\n): QueryResult<TReturn>;\n\n// Overload 2: Maybe query\nexport function useQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  query:\n    | QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n    | Falsy,\n  options?: UseQueryOptions | boolean,\n): MaybeQueryResult<TReturn>;\n\n// Implementation\nexport function useQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  query:\n    | QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n    | Falsy,\n  options?: UseQueryOptions | boolean,\n): QueryResult<TReturn> | MaybeQueryResult<TReturn> {\n  let enabled = true;\n  let ttl: TTL = DEFAULT_TTL_MS;\n  if (typeof options === 'boolean') {\n    enabled = options;\n  } else if (options) {\n    ({enabled = true, ttl = DEFAULT_TTL_MS} = options);\n  }\n\n  const zero = useZero<TSchema, undefined, TContext>();\n\n  // When query is falsy, use disabled subscriber/snapshot to maintain hook order\n  const q = useStableQuery(query, zero);\n  const view = q ? viewStore.getView(zero, q, enabled, ttl) : undefined;\n\n  // https://react.dev/reference/react/useSyncExternalStore\n  // Always call useSyncExternalStore to maintain consistent hook order\n  return useSyncExternalStore(\n    view?.subscribeReactInternals ?? disabledSubscriber,\n    view?.getSnapshot ??\n      (getDisabledSnapshot as () => MaybeQueryResult<TReturn>),\n    view?.getSnapshot ??\n      (getDisabledSnapshot as () => MaybeQueryResult<TReturn>),\n  );\n}\n\n// Overload 1: Query\nexport function useSuspenseQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  query: QueryOrQueryRequest<\n    TTable,\n    TInput,\n    TOutput,\n    TSchema,\n    TReturn,\n    TContext\n  >,\n  options?: UseSuspenseQueryOptions | boolean,\n): QueryResult<TReturn>;\n\n// Overload 2: Maybe query\nexport function useSuspenseQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  query:\n    | QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n    | Falsy,\n  options?: UseSuspenseQueryOptions | boolean,\n): MaybeQueryResult<TReturn>;\n\n// Implementation\nexport function useSuspenseQuery<\n  TTable extends keyof TSchema['tables'] & string,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n  TSchema extends BaseDefaultSchema = DefaultSchema,\n  TReturn = PullRow<TTable, TSchema>,\n  TContext extends BaseDefaultContext = DefaultContext,\n>(\n  query:\n    | QueryOrQueryRequest<TTable, TInput, TOutput, TSchema, TReturn, TContext>\n    | Falsy,\n  options?: UseSuspenseQueryOptions | boolean,\n): QueryResult<TReturn> | MaybeQueryResult<TReturn> {\n  let enabled = true;\n  let ttl: TTL = DEFAULT_TTL_MS;\n  let suspendUntil: 'complete' | 'partial' = 'partial';\n  if (typeof options === 'boolean') {\n    enabled = options;\n  } else if (options) {\n    ({\n      enabled = true,\n      ttl = DEFAULT_TTL_MS,\n      suspendUntil = 'complete',\n    } = options);\n  }\n\n  const zero = useZero<TSchema, undefined, TContext>();\n\n  // When query is falsy, use disabled subscriber/snapshot to maintain hook order\n  const q = useStableQuery(query, zero);\n  const view = q ? viewStore.getView(zero, q, enabled, ttl) : undefined;\n\n  // https://react.dev/reference/react/useSyncExternalStore\n  // Always call useSyncExternalStore to maintain consistent hook order\n  const snapshot = useSyncExternalStore(\n    view?.subscribeReactInternals ?? disabledSubscriber,\n    view?.getSnapshot ??\n      (getDisabledSnapshot as () => MaybeQueryResult<TReturn>),\n    view?.getSnapshot ??\n      (getDisabledSnapshot as () => MaybeQueryResult<TReturn>),\n  );\n\n  if (view && enabled) {\n    if (suspendUntil === 'complete' && !view.complete) {\n      suspend(view.waitForComplete());\n    }\n\n    if (suspendUntil === 'partial' && !view.nonEmpty) {\n      suspend(view.waitForNonEmpty());\n    }\n  }\n\n  return snapshot;\n}\n\nconst emptyArray: unknown[] = [];\nconst disabledSubscriber = () => () => {};\n\nconst resultTypeUnknown = {type: 'unknown'} as const;\nconst resultTypeCached = {type: 'cached'} as const;\nconst resultTypeComplete = {type: 'complete'} as const;\nconst resultTypeError = {type: 'error'} as const;\n\nconst disabledQuerySnapshot = [undefined, resultTypeUnknown] as const;\nconst getDisabledSnapshot = () => disabledQuerySnapshot;\n\nconst emptySnapshotSingularUnknown = [undefined, resultTypeUnknown] as const;\nconst emptySnapshotSingularCached = [undefined, resultTypeCached] as const;\nconst emptySnapshotSingularComplete = [undefined, resultTypeComplete] as const;\nconst emptySnapshotSingularErrorUnknown = [undefined, resultTypeError] as const;\nconst emptySnapshotPluralUnknown = [emptyArray, resultTypeUnknown] as const;\nconst emptySnapshotPluralCached = [emptyArray, resultTypeCached] as const;\nconst emptySnapshotPluralComplete = [emptyArray, resultTypeComplete] as const;\nconst emptySnapshotErrorUnknown = [emptyArray, resultTypeError] as const;\n\nfunction getDefaultSnapshot<TReturn>(singular: boolean): QueryResult<TReturn> {\n  return (\n    singular ? emptySnapshotSingularUnknown : emptySnapshotPluralUnknown\n  ) as QueryResult<TReturn>;\n}\n\n/**\n * Returns a new snapshot or one of the empty predefined ones. Returning the\n * predefined ones is important to prevent unnecessary re-renders in React.\n */\nfunction getSnapshot<TReturn>(\n  singular: boolean,\n  data: HumanReadable<TReturn>,\n  resultType: ResultType,\n  retryFn: () => void,\n  error?: ErroredQuery,\n): QueryResult<TReturn> {\n  if (singular && data === undefined) {\n    switch (resultType) {\n      case 'error':\n        if (error) {\n          return [\n            undefined,\n            makeError(retryFn, error),\n          ] as unknown as QueryResult<TReturn>;\n        }\n        return emptySnapshotSingularErrorUnknown as unknown as QueryResult<TReturn>;\n      case 'complete':\n        return emptySnapshotSingularComplete as unknown as QueryResult<TReturn>;\n      case 'unknown':\n        return emptySnapshotSingularUnknown as unknown as QueryResult<TReturn>;\n      case 'cached':\n        return emptySnapshotSingularCached as unknown as QueryResult<TReturn>;\n    }\n  }\n\n  if (!singular && (data as unknown[]).length === 0) {\n    switch (resultType) {\n      case 'error':\n        if (error) {\n          return [\n            emptyArray,\n            makeError(retryFn, error),\n          ] as unknown as QueryResult<TReturn>;\n        }\n        return emptySnapshotErrorUnknown as unknown as QueryResult<TReturn>;\n      case 'complete':\n        return emptySnapshotPluralComplete as unknown as QueryResult<TReturn>;\n      case 'unknown':\n        return emptySnapshotPluralUnknown as unknown as QueryResult<TReturn>;\n      case 'cached':\n        return emptySnapshotPluralCached as unknown as QueryResult<TReturn>;\n    }\n  }\n\n  switch (resultType) {\n    case 'error':\n      if (error) {\n        return [data, makeError(retryFn, error)];\n      }\n      return [\n        data,\n        makeError(retryFn, {\n          error: 'app',\n          id: 'unknown',\n          name: 'unknown',\n          message: 'An unknown error occurred',\n        }),\n      ];\n    case 'complete':\n      return [data, resultTypeComplete];\n    case 'unknown':\n      return [data, resultTypeUnknown];\n    case 'cached':\n      return [data, resultTypeCached];\n  }\n}\n\nfunction makeError(retry: () => void, error: ErroredQuery): QueryErrorDetails {\n  const message = error.message ?? 'An unknown error occurred';\n  return {\n    type: 'error',\n    retry,\n    refetch: retry,\n    error: {\n      type: error.error,\n      message,\n      ...(error.details ? {details: error.details} : {}),\n    },\n  };\n}\n\n// oxlint-disable-next-line @typescript-eslint/no-explicit-any\ntype AnyViewWrapper = ViewWrapper<any, any, any, any, any>;\n\nconst allViews = new WeakMap<\n  ViewStore,\n  Map<string, Map<string, AnyViewWrapper>>\n>();\n\nexport function getAllViewsSizeForTesting(store: ViewStore): number {\n  if (TESTING) {\n    let size = 0;\n    for (const byHash of allViews.get(store)?.values() ?? []) {\n      size += byHash.size;\n    }\n    return size;\n  }\n  return 0;\n}\n\n/**\n * A global store of all active views.\n *\n * React subscribes and unsubscribes to these views\n * via `useSyncExternalStore`.\n *\n * Managing views through `useEffect` or `useLayoutEffect` causes\n * inconsistencies because effects run after render.\n *\n * For example, if useQuery used use*Effect in the component below:\n * ```ts\n * function Foo({issueID}) {\n *   const issue = useQuery(z.query.issue.where('id', issueID).one());\n *   if (issue?.id !== undefined && issue.id !== issueID) {\n *     console.log('MISMATCH!', issue.id, issueID);\n *   }\n * }\n * ```\n *\n * `MISMATCH` will be printed whenever the `issueID` prop changes.\n *\n * This is because the component will render once with\n * the old state returned from `useQuery`. Then the effect inside\n * `useQuery` will run. The component will render again with the new\n * state. This inconsistent transition can cause unexpected results.\n *\n * Emulating `useEffect` via `useState` and `if` causes resource leaks.\n * That is:\n *\n * ```ts\n * function useQuery(q) {\n *   const [oldHash, setOldHash] = useState();\n *   if (hash(q) !== oldHash) {\n *      // make new view\n *   }\n *\n *   useEffect(() => {\n *     return () => view.destroy();\n *   }, []);\n * }\n * ```\n *\n * I'm not sure why but in strict mode the cleanup function\n * fails to be called for the first instance of the view and only\n * cleans up later instances.\n *\n * Swapping `useState` to `useRef` has similar problems.\n */\nexport class ViewStore {\n  /**\n   * Client id, then query hash.\n   *\n   * Nested rather than keyed by the two joined together, because this is\n   * looked up on every render of every `useQuery`. Joining them builds a\n   * string that V8 has to hash from scratch, where both halves on their own\n   * are strings it has already hashed and cached -- `hash()` is memoized on an\n   * interned query, so the same string comes back each render. Measured over a\n   * rebuild-and-look-up of one chain, that is the difference between 202ns and\n   * 123ns; the join cost more than rebuilding and hashing the whole query.\n   */\n  #views = new Map<string, Map<string, AnyViewWrapper>>();\n\n  constructor() {\n    if (TESTING) {\n      allViews.set(this, this.#views);\n    }\n  }\n\n  getView<\n    TTable extends keyof TSchema['tables'] & string,\n    TSchema extends BaseDefaultSchema,\n    TReturn,\n    MD extends CustomMutatorDefs | undefined,\n    TContext extends BaseDefaultContext,\n  >(\n    zero: Zero<TSchema, MD, TContext>,\n    q: Query<TTable, TSchema, TReturn>,\n    enabled: boolean,\n    ttl: TTL,\n  ): {\n    getSnapshot: () => QueryResult<TReturn>;\n    subscribeReactInternals: (internals: () => void) => () => void;\n    updateTTL: (ttl: TTL) => void;\n    waitForComplete: () => Promise<void>;\n    waitForNonEmpty: () => Promise<void>;\n    complete: boolean;\n    nonEmpty: boolean;\n  } {\n    const qi = asQueryInternals(q);\n\n    if (!enabled) {\n      return {\n        getSnapshot: () => getDefaultSnapshot(qi.format.singular),\n        subscribeReactInternals: disabledSubscriber,\n        updateTTL: () => {},\n        waitForComplete: () => Promise.resolve(),\n        waitForNonEmpty: () => Promise.resolve(),\n        complete: false,\n        nonEmpty: false,\n      };\n    }\n\n    const {clientID} = zero;\n    const hash = qi.hash();\n    let byHash = this.#views.get(clientID);\n    let existing = byHash?.get(hash);\n    if (!existing) {\n      existing = new ViewWrapper(q, zero, ttl, view => {\n        const views = this.#views.get(clientID);\n        const currentView = views?.get(hash);\n        if (currentView && currentView !== view) {\n          // we replaced the view with a new one already.\n          return;\n        }\n        views?.delete(hash);\n        if (views?.size === 0) {\n          // Nothing is left for this client, so drop its map rather than\n          // keeping one per client id the page has ever seen.\n          this.#views.delete(clientID);\n        }\n      });\n      if (!byHash) {\n        byHash = new Map();\n        this.#views.set(clientID, byHash);\n      }\n      byHash.set(hash, existing);\n    } else {\n      existing.updateTTL(ttl);\n    }\n    return existing as ViewWrapper<TTable, TSchema, TReturn, MD, TContext>;\n  }\n}\n\nconst viewStore = new ViewStore();\n\n/**\n * This wraps and ref counts a view.\n *\n * The only signal we have from React as to whether or not it is\n * done with a view is when it calls `unsubscribe`.\n *\n * In non-strict-mode we can clean up the view as soon\n * as the listener count goes to 0.\n *\n * In strict-mode, the listener count will go to 0 then a\n * new listener for the same view is immediately added back.\n *\n * This is why the `onMaterialized` and `onDematerialized` callbacks exist --\n * they allow a view which React is still referencing to be added\n * back into the store when React re-subscribes to it.\n *\n * This wrapper also exists to deal with the various\n * `useSyncExternalStore` caveats that cause excessive\n * re-renders and materializations.\n *\n * See: https://react.dev/reference/react/useSyncExternalStore#caveats\n * Especially:\n * 1. The store snapshot returned by getSnapshot must be immutable. If the underlying store has mutable data, return a new immutable snapshot if the data has changed. Otherwise, return a cached last snapshot.\n * 2. If a different subscribe function is passed during a re-render, React will re-subscribe to the store using the newly passed subscribe function. You can prevent this by declaring subscribe outside the component.\n */\nclass ViewWrapper<\n  TTable extends keyof TSchema['tables'] & string,\n  TSchema extends BaseDefaultSchema,\n  TReturn,\n  MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined,\n  TContext extends BaseDefaultContext,\n> {\n  #view: TypedView<HumanReadable<TReturn>> | undefined;\n  readonly #onDematerialized;\n  readonly #query: Query<TTable, TSchema, TReturn>;\n  #snapshot: QueryResult<TReturn>;\n  readonly #reactInternals: Set<() => void> = new Set();\n  #ttl: TTL;\n  #complete = false;\n  #completeResolver = resolver<void>();\n  #nonEmpty = false;\n  #nonEmptyResolver = resolver<void>();\n  readonly #zero: Pick<Zero<TSchema, undefined, TContext>, 'materialize'>;\n  readonly #singular: boolean;\n  #destroyTimer: ReturnType<typeof setTimeout> | undefined;\n\n  constructor(\n    query: Query<TTable, TSchema, TReturn>,\n    zero: Pick<Zero<TSchema, undefined, TContext>, 'materialize'>,\n    ttl: TTL,\n    onDematerialized: (\n      view: ViewWrapper<TTable, TSchema, TReturn, MD, TContext>,\n    ) => void,\n  ) {\n    this.#query = query;\n    this.#zero = zero;\n    this.#ttl = ttl;\n    this.#onDematerialized = onDematerialized;\n    const {singular} = asQueryInternals(query).format;\n    this.#singular = singular;\n    this.#snapshot = getDefaultSnapshot(singular);\n    this.#materializeIfNeeded();\n  }\n\n  #onData = (\n    snap: Immutable<HumanReadable<TReturn>>,\n    resultType: ResultType,\n    error?: ErroredQuery,\n  ) => {\n    // applyChange now returns immutable data structures, so no deep clone needed.\n    // Unchanged rows preserve their object identity for React.memo optimization.\n    const data = snap as HumanReadable<TReturn>;\n    const wasCached = this.#snapshot[1].type === 'cached';\n    this.#snapshot = getSnapshot(\n      this.#singular,\n      data,\n      resultType,\n      this.#retry,\n      error,\n    );\n    if (resultType === 'complete' || resultType === 'error') {\n      this.#complete = true;\n      this.#completeResolver.resolve();\n      this.#nonEmpty = true;\n      this.#nonEmptyResolver.resolve();\n    }\n\n    const hasData = this.#singular\n      ? this.#snapshot[0] !== undefined\n      : (this.#snapshot[0] as unknown[]).length !== 0;\n    // A 'cached' result is the server-confirmed answer from a previous\n    // session, so even an empty one is something to render. It never\n    // satisfies `complete`; only a confirmation on this connection does.\n    if (resultType === 'cached' || hasData) {\n      this.#nonEmpty = true;\n      this.#nonEmptyResolver.resolve();\n    } else if (wasCached && resultType === 'unknown') {\n      // The cached claim was revoked (the got key was evicted before this\n      // connection confirmed the query) and the view is empty: there is\n      // nothing to render again until rows or a confirmation arrive.\n      this.#nonEmpty = false;\n      this.#nonEmptyResolver = resolver();\n    }\n\n    for (const internals of this.#reactInternals) {\n      internals();\n    }\n  };\n\n  /**\n   * Called by the user to force a retry of the query\n   * in the case the query errored.\n   */\n  #retry = () => {\n    this.#view?.destroy();\n    this.#view = undefined;\n    this.#materializeIfNeeded();\n  };\n\n  #materializeIfNeeded = () => {\n    if (this.#view) {\n      return;\n    }\n    this.#view = this.#zero.materialize(this.#query, {\n      ttl: this.#ttl,\n    });\n    this.#view.addListener(this.#onData);\n  };\n\n  getSnapshot = () => this.#snapshot;\n\n  subscribeReactInternals = (internals: () => void): (() => void) => {\n    this.#reactInternals.add(internals);\n    // Cancel any pending destroy timer from a previous unsubscribe.\n    // Without this, rapid unsub/resub cycles accumulate stale timers\n    // that can fire during a gap between unsubscribe and resubscribe,\n    // destroying the view even though it was actively used.\n    if (this.#destroyTimer !== undefined) {\n      clearTimeout(this.#destroyTimer);\n      this.#destroyTimer = undefined;\n    }\n    this.#materializeIfNeeded();\n    return () => {\n      this.#reactInternals.delete(internals);\n\n      // only schedule a cleanup task if we have no listeners left\n      if (this.#reactInternals.size === 0) {\n        this.#destroyTimer = setTimeout(() => {\n          this.#destroyTimer = undefined;\n\n          // We already destroyed the view\n          if (this.#view === undefined) {\n            return;\n          }\n\n          // Someone re-registered a listener on this view before the timeout elapsed.\n          // This happens often in strict-mode which forces a component\n          // to mount, unmount, remount.\n          if (this.#reactInternals.size > 0) {\n            return;\n          }\n\n          this.#view.destroy();\n          this.#view = undefined;\n          this.#complete = false;\n          this.#completeResolver = resolver();\n          this.#nonEmpty = false;\n          this.#nonEmptyResolver = resolver();\n          this.#onDematerialized(this);\n        }, 10);\n      }\n    };\n  };\n\n  updateTTL(ttl: TTL): void {\n    // `getView` calls this on every render, and forwarding an unchanged TTL\n    // reaches the query manager, which re-derives the query's id from its AST\n    // to find the entry. Nothing downstream distinguishes a repeat, so skip\n    // it. A change in how the same duration is spelled ('60s' vs 60000) is\n    // still a change here and still propagates, as it did before.\n    if (this.#ttl === ttl) {\n      return;\n    }\n    this.#ttl = ttl;\n    this.#view?.updateTTL(ttl);\n  }\n\n  get complete() {\n    return this.#complete;\n  }\n\n  waitForComplete(): Promise<void> {\n    return this.#completeResolver.promise;\n  }\n\n  get nonEmpty() {\n    return this.#nonEmpty;\n  }\n\n  waitForNonEmpty(): Promise<void> {\n    return this.#nonEmptyResolver.promise;\n  }\n}\n"],"mappings":"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"}

package/out/zero-server/src/adapters/drizzle.d.ts

@@ -25,7 +25,7 @@ type DrizzleTransactionFromSchema<TSchema> = DrizzleTransactionLike & {
         };
     };
 };
-export type DrizzleDatabase<TTransaction extends DrizzleTransactionLike = DrizzleTransactionLike> = {
+export type DrizzleDatabase<TTransaction extends DrizzleTransactionLike = DrizzleTransactionLike> = DrizzleTransactionLike & {
     transaction<T>(transaction: (tx: TTransaction) => Promise<T>, config?: never): Promise<T>;
 };
 /**
@@ -37,6 +37,7 @@ export type DrizzleTransaction<TDbOrSchema = Record<string, unknown>> = TDbOrSch
 export declare class DrizzleConnection<TDrizzle, TTransaction extends DrizzleTransactionLike = DrizzleTransaction<TDrizzle>> implements DBConnection<TTransaction> {
     #private;
     constructor(drizzle: TDrizzle & DrizzleDatabase<TTransaction>);
+    query(sql: string, params: unknown[]): Promise<Iterable<Row>>;
     transaction<T>(fn: (tx: DBTransaction<TTransaction>) => Promise<T>): Promise<T>;
 }
 export declare function toIterableRows(result: unknown): Iterable<Row>;

package/out/zero-server/src/adapters/drizzle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drizzle.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/drizzle.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAE9D,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,GAAG,EACJ,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAmB1B,KAAK,cAAc,GAAG;IACpB,YAAY,EAAE;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,CAAC;CAChC,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,CAAC,EAAE;QAAC,OAAO,EAAE,cAAc,CAAA;KAAC,CAAC;CAC9B,CAAC;AAEF,KAAK,kBAAkB,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,GAAG;IACxD,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7B,CAAC;AAEF,KAAK,kBAAkB,CAAC,MAAM,IAAI,MAAM,SAAS;IAAC,YAAY,EAAE,MAAM,OAAO,CAAA;CAAC,GAC1E,OAAO,GACP,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE5B,KAAK,4BAA4B,CAAC,OAAO,IAAI,sBAAsB,GAAG;IACpE,KAAK,EAAE;SACJ,MAAM,IAAI,MAAM,OAAO,GAAG;YACzB,SAAS,CACP,IAAI,CAAC,EAAE,OAAO,GACb,kBAAkB,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;SACxE;KACF,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,eAAe,CACzB,YAAY,SAAS,sBAAsB,GAAG,sBAAsB,IAClE;IACF,WAAW,CAAC,CAAC,EACX,WAAW,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,OAAO,CAAC,CAAC,CAAC,EAC7C,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,CAAC,CAAC,CAAC;CACf,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAClE,WAAW,SAAS,eAAe,CAAC,MAAM,YAAY,CAAC,GACnD,YAAY,GACZ,4BAA4B,CAAC,WAAW,CAAC,CAAC;AAEhD,qBAAa,iBAAiB,CAC5B,QAAQ,EACR,YAAY,SAAS,sBAAsB,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAC1E,YAAW,YAAY,CAAC,YAAY,CAAC;;IAGrC,YAAY,OAAO,EAAE,QAAQ,GAAG,eAAe,CAAC,YAAY,CAAC,EAE5D;IAED,WAAW,CAAC,CAAC,EACX,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,YAAY,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAClD,OAAO,CAAC,CAAC,CAAC,CAQZ;CACF;AAwDD,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAuB7D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAgB,WAAW,CACzB,OAAO,SAAS,MAAM,EACtB,QAAQ,EACR,YAAY,SAAS,sBAAsB,GAAG,kBAAkB,CAAC,QAAQ,CAAC,EAE1E,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,QAAQ,GAAG,eAAe,CAAC,YAAY,CAAC,GAC/C,WAAW,CAAC,OAAO,EAAE,YAAY,CAAC,CAKpC"}
+{"version":3,"file":"drizzle.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/drizzle.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAE9D,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,GAAG,EACJ,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAmB1B,KAAK,cAAc,GAAG;IACpB,YAAY,EAAE;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,CAAC;CAChC,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,CAAC,EAAE;QAAC,OAAO,EAAE,cAAc,CAAA;KAAC,CAAC;CAC9B,CAAC;AAEF,KAAK,kBAAkB,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,GAAG;IACxD,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7B,CAAC;AAEF,KAAK,kBAAkB,CAAC,MAAM,IAAI,MAAM,SAAS;IAAC,YAAY,EAAE,MAAM,OAAO,CAAA;CAAC,GAC1E,OAAO,GACP,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE5B,KAAK,4BAA4B,CAAC,OAAO,IAAI,sBAAsB,GAAG;IACpE,KAAK,EAAE;SACJ,MAAM,IAAI,MAAM,OAAO,GAAG;YACzB,SAAS,CACP,IAAI,CAAC,EAAE,OAAO,GACb,kBAAkB,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;SACxE;KACF,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,eAAe,CACzB,YAAY,SAAS,sBAAsB,GAAG,sBAAsB,IAClE,sBAAsB,GAAG;IAC3B,WAAW,CAAC,CAAC,EACX,WAAW,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,OAAO,CAAC,CAAC,CAAC,EAC7C,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,CAAC,CAAC,CAAC;CACf,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAClE,WAAW,SAAS,eAAe,CAAC,MAAM,YAAY,CAAC,GACnD,YAAY,GACZ,4BAA4B,CAAC,WAAW,CAAC,CAAC;AAEhD,qBAAa,iBAAiB,CAC5B,QAAQ,EACR,YAAY,SAAS,sBAAsB,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAC1E,YAAW,YAAY,CAAC,YAAY,CAAC;;IAGrC,YAAY,OAAO,EAAE,QAAQ,GAAG,eAAe,CAAC,YAAY,CAAC,EAE5D;IAED,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAE5D;IAED,WAAW,CAAC,CAAC,EACX,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,YAAY,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAClD,OAAO,CAAC,CAAC,CAAC,CAQZ;CACF;AA+DD,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAuB7D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAgB,WAAW,CACzB,OAAO,SAAS,MAAM,EACtB,QAAQ,EACR,YAAY,SAAS,sBAAsB,GAAG,kBAAkB,CAAC,QAAQ,CAAC,EAE1E,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,QAAQ,GAAG,eAAe,CAAC,YAAY,CAAC,GAC/C,WAAW,CAAC,OAAO,EAAE,YAAY,CAAC,CAKpC"}

package/out/zero-server/src/adapters/drizzle.js

@@ -6,6 +6,9 @@ var DrizzleConnection = class {
 	constructor(drizzle) {
 		this.#drizzle = drizzle;
 	}
+	query(sql, params) {
+		return runDrizzleQuery(this.#drizzle._.session, sql, params);
+	}
 	transaction(fn) {
 		return this.#drizzle.transaction((drizzleTx) => fn(new DrizzleInternalTransaction(drizzleTx)));
 	}
@@ -18,15 +21,17 @@ var DrizzleInternalTransaction = class {
 	runQuery(ast, format, schema, serverSchema) {
 		return executePostgresQuery(this, ast, format, schema, serverSchema);
 	}
-	async query(sql, params) {
-		const { session } = this.wrappedTransaction._;
-		const query = {
-			sql,
-			params
-		};
-		return toIterableRows(await (session.prepareQuery.length < 7 ? session.prepareQuery(query, "objects", void 0, void 0) : session.prepareQuery(query, void 0, void 0, false)).execute());
+	query(sql, params) {
+		return runDrizzleQuery(this.wrappedTransaction._.session, sql, params);
 	}
 };
+async function runDrizzleQuery(session, sql, params) {
+	const query = {
+		sql,
+		params
+	};
+	return toIterableRows(await (session.prepareQuery.length < 7 ? session.prepareQuery(query, "objects", void 0, void 0) : session.prepareQuery(query, void 0, void 0, false)).execute());
+}
 function isIterable(value) {
 	return value != null && typeof value[Symbol.iterator] === "function";
 }

package/out/zero-server/src/adapters/drizzle.js.map

@@ -1 +1 @@
-{"version":3,"file":"drizzle.js","names":["#drizzle"],"sources":["../../../../../zero-server/src/adapters/drizzle.ts"],"sourcesContent":["import type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {Format} from '../../../zero-types/src/format.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../../zero-types/src/server-schema.ts';\nimport type {\n  DBConnection,\n  DBTransaction,\n  Row,\n} from '../../../zql/src/mutate/custom.ts';\nimport type {HumanReadable} from '../../../zql/src/query/query.ts';\nimport {executePostgresQuery} from '../pg-query-executor.ts';\nimport {ZQLDatabase} from '../zql-database.ts';\n\nexport type {ZQLDatabase};\n\ntype DrizzleQuery = {sql: string; params: unknown[]};\ntype DrizzlePreparedQuery = {execute(): Promise<unknown>};\n\ntype DrizzlePrepareQueryV0 = (\n  query: DrizzleQuery,\n  fields: undefined,\n  name: undefined,\n  isResponseInArrayMode: false,\n) => DrizzlePreparedQuery;\n\ntype DrizzlePrepareQueryV1 = (\n  query: DrizzleQuery,\n  mode: 'objects',\n  name: undefined,\n  mapper: undefined,\n) => DrizzlePreparedQuery;\n\ntype DrizzleSession = {\n  prepareQuery: {length: number};\n};\n\ntype DrizzleTransactionLike = {\n  _: {session: DrizzleSession};\n};\n\ntype DrizzleQueryResult<TResult> = PromiseLike<TResult> & {\n  execute(): Promise<TResult>;\n};\n\ntype DrizzleInferSelect<TTable> = TTable extends {$inferSelect: infer TSelect}\n  ? TSelect\n  : Record<string, unknown>;\n\ntype DrizzleTransactionFromSchema<TSchema> = DrizzleTransactionLike & {\n  query: {\n    [TTable in keyof TSchema]: {\n      findFirst(\n        args?: unknown,\n      ): DrizzleQueryResult<DrizzleInferSelect<TSchema[TTable]> | undefined>;\n    };\n  };\n};\n\nexport type DrizzleDatabase<\n  TTransaction extends DrizzleTransactionLike = DrizzleTransactionLike,\n> = {\n  transaction<T>(\n    transaction: (tx: TTransaction) => Promise<T>,\n    config?: never,\n  ): Promise<T>;\n};\n\n/**\n * Helper type for the wrapped transaction used by drizzle-orm.\n *\n * @remarks Use with `ServerTransaction` as `ServerTransaction<Schema, DrizzleTransaction<typeof drizzleDb>>`.\n */\nexport type DrizzleTransaction<TDbOrSchema = Record<string, unknown>> =\n  TDbOrSchema extends DrizzleDatabase<infer TTransaction>\n    ? TTransaction\n    : DrizzleTransactionFromSchema<TDbOrSchema>;\n\nexport class DrizzleConnection<\n  TDrizzle,\n  TTransaction extends DrizzleTransactionLike = DrizzleTransaction<TDrizzle>,\n> implements DBConnection<TTransaction> {\n  readonly #drizzle: DrizzleDatabase<TTransaction>;\n\n  constructor(drizzle: TDrizzle & DrizzleDatabase<TTransaction>) {\n    this.#drizzle = drizzle;\n  }\n\n  transaction<T>(\n    fn: (tx: DBTransaction<TTransaction>) => Promise<T>,\n  ): Promise<T> {\n    return this.#drizzle.transaction(drizzleTx =>\n      fn(\n        new DrizzleInternalTransaction(\n          drizzleTx,\n        ) as DBTransaction<TTransaction>,\n      ),\n    );\n  }\n}\n\nclass DrizzleInternalTransaction<\n  TTransaction extends DrizzleTransactionLike,\n> implements DBTransaction<TTransaction> {\n  readonly wrappedTransaction: TTransaction;\n\n  constructor(drizzleTx: TTransaction) {\n    this.wrappedTransaction = drizzleTx;\n  }\n\n  runQuery<TReturn>(\n    ast: AST,\n    format: Format,\n    schema: Schema,\n    serverSchema: ServerSchema,\n  ): Promise<HumanReadable<TReturn>> {\n    return executePostgresQuery<TReturn>(\n      this,\n      ast,\n      format,\n      schema,\n      serverSchema,\n    );\n  }\n\n  async query(sql: string, params: unknown[]): Promise<Iterable<Row>> {\n    const {session} = this.wrappedTransaction._;\n    const query = {sql, params};\n    const prepared =\n      session.prepareQuery.length < 7\n        ? (session.prepareQuery as DrizzlePrepareQueryV1)(\n            query,\n            'objects',\n            undefined,\n            undefined,\n          )\n        : (session.prepareQuery as DrizzlePrepareQueryV0)(\n            query,\n            undefined,\n            undefined,\n            false,\n          );\n    const result = await prepared.execute();\n    return toIterableRows(result);\n  }\n}\n\nfunction isIterable(value: unknown): value is Iterable<unknown> {\n  return (\n    // oxlint-disable-next-line eqeqeq\n    value != null &&\n    typeof (value as Iterable<unknown>)[Symbol.iterator] === 'function'\n  );\n}\n\nexport function toIterableRows(result: unknown): Iterable<Row> {\n  if (result === null || result === undefined) {\n    return [] as Row[];\n  }\n  if (Array.isArray(result)) {\n    return result as Row[];\n  }\n  if (isIterable(result)) {\n    return result as Iterable<Row>;\n  }\n  if (typeof result === 'object') {\n    const rows = (result as {rows?: unknown}).rows;\n    if (rows === null || rows === undefined) {\n      return [] as Row[];\n    }\n    if (Array.isArray(rows)) {\n      return rows as Row[];\n    }\n    if (isIterable(rows)) {\n      return rows as Iterable<Row>;\n    }\n  }\n  throw new TypeError('Drizzle query result is not iterable');\n}\n\n/**\n * Wrap a `drizzle-orm` database for Zero ZQL.\n *\n * Provides ZQL querying plus access to the underlying drizzle transaction.\n * Use {@link DrizzleTransaction} to type your server mutator transaction.\n *\n * @param schema - Zero schema.\n * @param client - Drizzle database.\n *\n * @example\n * ```ts\n * import {Pool} from 'pg';\n * import {drizzle} from 'drizzle-orm/node-postgres';\n * import {defineMutator, defineMutators} from '@rocicorp/zero';\n * import {zeroDrizzle} from '@rocicorp/zero/server/adapters/drizzle';\n * import {z} from 'zod/mini';\n *\n * const pool = new Pool({connectionString: process.env.ZERO_UPSTREAM_DB!});\n * const drizzleDb = drizzle(pool, {schema: drizzleSchema});\n * const zql = zeroDrizzle(schema, drizzleDb);\n *\n * export const serverMutators = defineMutators({\n *   user: {\n *     create: defineMutator(\n *       z.object({id: z.string(), name: z.string()}),\n *       async ({tx, args}) => {\n *         if (tx.location !== 'server') {\n *           throw new Error('Server-only mutator');\n *         }\n *         await tx.dbTransaction.wrappedTransaction\n *           .insert(drizzleSchema.user)\n *           .values({id: args.id, name: args.name, status: 'active'});\n *       },\n *     ),\n *   },\n * });\n * ```\n */\nexport function zeroDrizzle<\n  TSchema extends Schema,\n  TDrizzle,\n  TTransaction extends DrizzleTransactionLike = DrizzleTransaction<TDrizzle>,\n>(\n  schema: TSchema,\n  client: TDrizzle & DrizzleDatabase<TTransaction>,\n): ZQLDatabase<TSchema, TTransaction> {\n  return new ZQLDatabase(\n    new DrizzleConnection<TDrizzle, TTransaction>(client),\n    schema,\n  );\n}\n"],"mappings":";;;AA6EA,IAAa,oBAAb,MAGwC;CACtC;CAEA,YAAY,SAAmD;EAC7D,KAAKA,WAAW;CAClB;CAEA,YACE,IACY;EACZ,OAAO,KAAKA,SAAS,aAAY,cAC/B,GACE,IAAI,2BACF,SACF,CACF,CACF;CACF;AACF;AAEA,IAAM,6BAAN,MAEyC;CACvC;CAEA,YAAY,WAAyB;EACnC,KAAK,qBAAqB;CAC5B;CAEA,SACE,KACA,QACA,QACA,cACiC;EACjC,OAAO,qBACL,MACA,KACA,QACA,QACA,YACF;CACF;CAEA,MAAM,MAAM,KAAa,QAA2C;EAClE,MAAM,EAAC,YAAW,KAAK,mBAAmB;EAC1C,MAAM,QAAQ;GAAC;GAAK;EAAM;EAgB1B,OAAO,eAAe,OAdpB,QAAQ,aAAa,SAAS,IACzB,QAAQ,aACP,OACA,WACA,KAAA,GACA,KAAA,CACF,IACC,QAAQ,aACP,OACA,KAAA,GACA,KAAA,GACA,KACF,GACwB,QAAQ,CACV;CAC9B;AACF;AAEA,SAAS,WAAW,OAA4C;CAC9D,OAEE,SAAS,QACT,OAAQ,MAA4B,OAAO,cAAc;AAE7D;AAEA,SAAgB,eAAe,QAAgC;CAC7D,IAAI,WAAW,QAAQ,WAAW,KAAA,GAChC,OAAO,CAAC;CAEV,IAAI,MAAM,QAAQ,MAAM,GACtB,OAAO;CAET,IAAI,WAAW,MAAM,GACnB,OAAO;CAET,IAAI,OAAO,WAAW,UAAU;EAC9B,MAAM,OAAQ,OAA4B;EAC1C,IAAI,SAAS,QAAQ,SAAS,KAAA,GAC5B,OAAO,CAAC;EAEV,IAAI,MAAM,QAAQ,IAAI,GACpB,OAAO;EAET,IAAI,WAAW,IAAI,GACjB,OAAO;CAEX;CACA,MAAM,IAAI,UAAU,sCAAsC;AAC5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAwCA,SAAgB,YAKd,QACA,QACoC;CACpC,OAAO,IAAI,YACT,IAAI,kBAA0C,MAAM,GACpD,MACF;AACF"}
+{"version":3,"file":"drizzle.js","names":["#drizzle"],"sources":["../../../../../zero-server/src/adapters/drizzle.ts"],"sourcesContent":["import type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {Format} from '../../../zero-types/src/format.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../../zero-types/src/server-schema.ts';\nimport type {\n  DBConnection,\n  DBTransaction,\n  Row,\n} from '../../../zql/src/mutate/custom.ts';\nimport type {HumanReadable} from '../../../zql/src/query/query.ts';\nimport {executePostgresQuery} from '../pg-query-executor.ts';\nimport {ZQLDatabase} from '../zql-database.ts';\n\nexport type {ZQLDatabase};\n\ntype DrizzleQuery = {sql: string; params: unknown[]};\ntype DrizzlePreparedQuery = {execute(): Promise<unknown>};\n\ntype DrizzlePrepareQueryV0 = (\n  query: DrizzleQuery,\n  fields: undefined,\n  name: undefined,\n  isResponseInArrayMode: false,\n) => DrizzlePreparedQuery;\n\ntype DrizzlePrepareQueryV1 = (\n  query: DrizzleQuery,\n  mode: 'objects',\n  name: undefined,\n  mapper: undefined,\n) => DrizzlePreparedQuery;\n\ntype DrizzleSession = {\n  prepareQuery: {length: number};\n};\n\ntype DrizzleTransactionLike = {\n  _: {session: DrizzleSession};\n};\n\ntype DrizzleQueryResult<TResult> = PromiseLike<TResult> & {\n  execute(): Promise<TResult>;\n};\n\ntype DrizzleInferSelect<TTable> = TTable extends {$inferSelect: infer TSelect}\n  ? TSelect\n  : Record<string, unknown>;\n\ntype DrizzleTransactionFromSchema<TSchema> = DrizzleTransactionLike & {\n  query: {\n    [TTable in keyof TSchema]: {\n      findFirst(\n        args?: unknown,\n      ): DrizzleQueryResult<DrizzleInferSelect<TSchema[TTable]> | undefined>;\n    };\n  };\n};\n\nexport type DrizzleDatabase<\n  TTransaction extends DrizzleTransactionLike = DrizzleTransactionLike,\n> = DrizzleTransactionLike & {\n  transaction<T>(\n    transaction: (tx: TTransaction) => Promise<T>,\n    config?: never,\n  ): Promise<T>;\n};\n\n/**\n * Helper type for the wrapped transaction used by drizzle-orm.\n *\n * @remarks Use with `ServerTransaction` as `ServerTransaction<Schema, DrizzleTransaction<typeof drizzleDb>>`.\n */\nexport type DrizzleTransaction<TDbOrSchema = Record<string, unknown>> =\n  TDbOrSchema extends DrizzleDatabase<infer TTransaction>\n    ? TTransaction\n    : DrizzleTransactionFromSchema<TDbOrSchema>;\n\nexport class DrizzleConnection<\n  TDrizzle,\n  TTransaction extends DrizzleTransactionLike = DrizzleTransaction<TDrizzle>,\n> implements DBConnection<TTransaction> {\n  readonly #drizzle: DrizzleDatabase<TTransaction>;\n\n  constructor(drizzle: TDrizzle & DrizzleDatabase<TTransaction>) {\n    this.#drizzle = drizzle;\n  }\n\n  query(sql: string, params: unknown[]): Promise<Iterable<Row>> {\n    return runDrizzleQuery(this.#drizzle._.session, sql, params);\n  }\n\n  transaction<T>(\n    fn: (tx: DBTransaction<TTransaction>) => Promise<T>,\n  ): Promise<T> {\n    return this.#drizzle.transaction(drizzleTx =>\n      fn(\n        new DrizzleInternalTransaction(\n          drizzleTx,\n        ) as DBTransaction<TTransaction>,\n      ),\n    );\n  }\n}\n\nclass DrizzleInternalTransaction<\n  TTransaction extends DrizzleTransactionLike,\n> implements DBTransaction<TTransaction> {\n  readonly wrappedTransaction: TTransaction;\n\n  constructor(drizzleTx: TTransaction) {\n    this.wrappedTransaction = drizzleTx;\n  }\n\n  runQuery<TReturn>(\n    ast: AST,\n    format: Format,\n    schema: Schema,\n    serverSchema: ServerSchema,\n  ): Promise<HumanReadable<TReturn>> {\n    return executePostgresQuery<TReturn>(\n      this,\n      ast,\n      format,\n      schema,\n      serverSchema,\n    );\n  }\n\n  query(sql: string, params: unknown[]): Promise<Iterable<Row>> {\n    return runDrizzleQuery(this.wrappedTransaction._.session, sql, params);\n  }\n}\n\nasync function runDrizzleQuery(\n  session: DrizzleSession,\n  sql: string,\n  params: unknown[],\n): Promise<Iterable<Row>> {\n  const query = {sql, params};\n  const prepared =\n    session.prepareQuery.length < 7\n      ? (session.prepareQuery as DrizzlePrepareQueryV1)(\n          query,\n          'objects',\n          undefined,\n          undefined,\n        )\n      : (session.prepareQuery as DrizzlePrepareQueryV0)(\n          query,\n          undefined,\n          undefined,\n          false,\n        );\n  const result = await prepared.execute();\n  return toIterableRows(result);\n}\n\nfunction isIterable(value: unknown): value is Iterable<unknown> {\n  return (\n    // oxlint-disable-next-line eqeqeq\n    value != null &&\n    typeof (value as Iterable<unknown>)[Symbol.iterator] === 'function'\n  );\n}\n\nexport function toIterableRows(result: unknown): Iterable<Row> {\n  if (result === null || result === undefined) {\n    return [] as Row[];\n  }\n  if (Array.isArray(result)) {\n    return result as Row[];\n  }\n  if (isIterable(result)) {\n    return result as Iterable<Row>;\n  }\n  if (typeof result === 'object') {\n    const rows = (result as {rows?: unknown}).rows;\n    if (rows === null || rows === undefined) {\n      return [] as Row[];\n    }\n    if (Array.isArray(rows)) {\n      return rows as Row[];\n    }\n    if (isIterable(rows)) {\n      return rows as Iterable<Row>;\n    }\n  }\n  throw new TypeError('Drizzle query result is not iterable');\n}\n\n/**\n * Wrap a `drizzle-orm` database for Zero ZQL.\n *\n * Provides ZQL querying plus access to the underlying drizzle transaction.\n * Use {@link DrizzleTransaction} to type your server mutator transaction.\n *\n * @param schema - Zero schema.\n * @param client - Drizzle database.\n *\n * @example\n * ```ts\n * import {Pool} from 'pg';\n * import {drizzle} from 'drizzle-orm/node-postgres';\n * import {defineMutator, defineMutators} from '@rocicorp/zero';\n * import {zeroDrizzle} from '@rocicorp/zero/server/adapters/drizzle';\n * import {z} from 'zod/mini';\n *\n * const pool = new Pool({connectionString: process.env.ZERO_UPSTREAM_DB!});\n * const drizzleDb = drizzle(pool, {schema: drizzleSchema});\n * const zql = zeroDrizzle(schema, drizzleDb);\n *\n * export const serverMutators = defineMutators({\n *   user: {\n *     create: defineMutator(\n *       z.object({id: z.string(), name: z.string()}),\n *       async ({tx, args}) => {\n *         if (tx.location !== 'server') {\n *           throw new Error('Server-only mutator');\n *         }\n *         await tx.dbTransaction.wrappedTransaction\n *           .insert(drizzleSchema.user)\n *           .values({id: args.id, name: args.name, status: 'active'});\n *       },\n *     ),\n *   },\n * });\n * ```\n */\nexport function zeroDrizzle<\n  TSchema extends Schema,\n  TDrizzle,\n  TTransaction extends DrizzleTransactionLike = DrizzleTransaction<TDrizzle>,\n>(\n  schema: TSchema,\n  client: TDrizzle & DrizzleDatabase<TTransaction>,\n): ZQLDatabase<TSchema, TTransaction> {\n  return new ZQLDatabase(\n    new DrizzleConnection<TDrizzle, TTransaction>(client),\n    schema,\n  );\n}\n"],"mappings":";;;AA6EA,IAAa,oBAAb,MAGwC;CACtC;CAEA,YAAY,SAAmD;EAC7D,KAAKA,WAAW;CAClB;CAEA,MAAM,KAAa,QAA2C;EAC5D,OAAO,gBAAgB,KAAKA,SAAS,EAAE,SAAS,KAAK,MAAM;CAC7D;CAEA,YACE,IACY;EACZ,OAAO,KAAKA,SAAS,aAAY,cAC/B,GACE,IAAI,2BACF,SACF,CACF,CACF;CACF;AACF;AAEA,IAAM,6BAAN,MAEyC;CACvC;CAEA,YAAY,WAAyB;EACnC,KAAK,qBAAqB;CAC5B;CAEA,SACE,KACA,QACA,QACA,cACiC;EACjC,OAAO,qBACL,MACA,KACA,QACA,QACA,YACF;CACF;CAEA,MAAM,KAAa,QAA2C;EAC5D,OAAO,gBAAgB,KAAK,mBAAmB,EAAE,SAAS,KAAK,MAAM;CACvE;AACF;AAEA,eAAe,gBACb,SACA,KACA,QACwB;CACxB,MAAM,QAAQ;EAAC;EAAK;CAAM;CAgB1B,OAAO,eAAe,OAdpB,QAAQ,aAAa,SAAS,IACzB,QAAQ,aACP,OACA,WACA,KAAA,GACA,KAAA,CACF,IACC,QAAQ,aACP,OACA,KAAA,GACA,KAAA,GACA,KACF,GACwB,QAAQ,CACV;AAC9B;AAEA,SAAS,WAAW,OAA4C;CAC9D,OAEE,SAAS,QACT,OAAQ,MAA4B,OAAO,cAAc;AAE7D;AAEA,SAAgB,eAAe,QAAgC;CAC7D,IAAI,WAAW,QAAQ,WAAW,KAAA,GAChC,OAAO,CAAC;CAEV,IAAI,MAAM,QAAQ,MAAM,GACtB,OAAO;CAET,IAAI,WAAW,MAAM,GACnB,OAAO;CAET,IAAI,OAAO,WAAW,UAAU;EAC9B,MAAM,OAAQ,OAA4B;EAC1C,IAAI,SAAS,QAAQ,SAAS,KAAA,GAC5B,OAAO,CAAC;EAEV,IAAI,MAAM,QAAQ,IAAI,GACpB,OAAO;EAET,IAAI,WAAW,IAAI,GACjB,OAAO;CAEX;CACA,MAAM,IAAI,UAAU,sCAAsC;AAC5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAwCA,SAAgB,YAKd,QACA,QACoC;CACpC,OAAO,IAAI,YACT,IAAI,kBAA0C,MAAM,GACpD,MACF;AACF"}

package/out/zero-server/src/adapters/kysely.d.ts

@@ -1,6 +1,6 @@
 import type { Kysely, Transaction as WrappedKyselyTransaction } from 'kysely';
 import type { Schema } from '../../../zero-types/src/schema.ts';
-import type { DBConnection, DBTransaction } from '../../../zql/src/mutate/custom.ts';
+import type { DBConnection, DBTransaction, Row } from '../../../zql/src/mutate/custom.ts';
 import { ZQLDatabase } from '../zql-database.ts';
 export type { ZQLDatabase };
 export type KyselyDatabase<TDatabase = unknown> = Kysely<TDatabase>;
@@ -13,6 +13,7 @@ export type KyselyTransaction<TDbOrSchema = KyselyDatabase> = TDbOrSchema extend
 export declare class KyselyConnection<TDatabase> implements DBConnection<WrappedKyselyTransaction<TDatabase>> {
     #private;
     constructor(client: Kysely<TDatabase>);
+    query(sql: string, params: unknown[]): Promise<Row[]>;
     transaction<T>(fn: (tx: DBTransaction<WrappedKyselyTransaction<TDatabase>>) => Promise<T>): Promise<T>;
 }
 /**

package/out/zero-server/src/adapters/kysely.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kysely.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/kysely.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,IAAI,wBAAwB,EAAC,MAAM,QAAQ,CAAC;AAG5E,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAE9D,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EAEd,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAE1B,MAAM,MAAM,cAAc,CAAC,SAAS,GAAG,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC;AAEpE;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,CAAC,WAAW,GAAG,cAAc,IACxD,WAAW,SAAS,MAAM,CAAC,MAAM,iBAAiB,CAAC,GAC/C,wBAAwB,CAAC,iBAAiB,CAAC,GAC3C,wBAAwB,CAAC,WAAW,CAAC,CAAC;AAE5C,qBAAa,gBAAgB,CAAC,SAAS,CAAE,YAAW,YAAY,CAC9D,wBAAwB,CAAC,SAAS,CAAC,CACpC;;IAGC,YAAY,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,EAEpC;IAED,WAAW,CAAC,CAAC,EACX,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GACzE,OAAO,CAAC,CAAC,CAAC,CAIZ;CACF;AAkCD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,wBAAgB,UAAU,CAAC,OAAO,SAAS,MAAM,EAAE,SAAS,EAC1D,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,GACxB,WAAW,CAAC,OAAO,EAAE,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAE3D"}
+{"version":3,"file":"kysely.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/kysely.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,IAAI,wBAAwB,EAAC,MAAM,QAAQ,CAAC;AAG5E,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAE9D,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,GAAG,EACJ,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAE1B,MAAM,MAAM,cAAc,CAAC,SAAS,GAAG,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC;AAEpE;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,CAAC,WAAW,GAAG,cAAc,IACxD,WAAW,SAAS,MAAM,CAAC,MAAM,iBAAiB,CAAC,GAC/C,wBAAwB,CAAC,iBAAiB,CAAC,GAC3C,wBAAwB,CAAC,WAAW,CAAC,CAAC;AAE5C,qBAAa,gBAAgB,CAAC,SAAS,CAAE,YAAW,YAAY,CAC9D,wBAAwB,CAAC,SAAS,CAAC,CACpC;;IAGC,YAAY,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,EAEpC;IAED,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAEpD;IAED,WAAW,CAAC,CAAC,EACX,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GACzE,OAAO,CAAC,CAAC,CAAC,CAIZ;CACF;AA0CD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,wBAAgB,UAAU,CAAC,OAAO,SAAS,MAAM,EAAE,SAAS,EAC1D,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,GACxB,WAAW,CAAC,OAAO,EAAE,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAE3D"}

package/out/zero-server/src/adapters/kysely.js

@@ -7,6 +7,9 @@ var KyselyConnection = class {
 	constructor(client) {
 		this.#client = client;
 	}
+	query(sql, params) {
+		return kyselyQuery(this.#client, sql, params);
+	}
 	transaction(fn) {
 		return this.#client.transaction().execute((kyselyTx) => fn(new KyselyInternalTransaction(kyselyTx)));
 	}
@@ -19,10 +22,13 @@ var KyselyInternalTransaction = class {
 	runQuery(ast, format, schema, serverSchema) {
 		return executePostgresQuery(this, ast, format, schema, serverSchema);
 	}
-	async query(sql, params) {
-		return (await this.wrappedTransaction.executeQuery(CompiledQuery.raw(sql, params))).rows;
+	query(sql, params) {
+		return kyselyQuery(this.wrappedTransaction, sql, params);
 	}
 };
+async function kyselyQuery(executor, sql, params) {
+	return (await executor.executeQuery(CompiledQuery.raw(sql, params))).rows;
+}
 /**
 * Wrap a Postgres-backed Kysely client for Zero ZQL.
 *

package/out/zero-server/src/adapters/kysely.js.map

@@ -1 +1 @@
-{"version":3,"file":"kysely.js","names":["#client"],"sources":["../../../../../zero-server/src/adapters/kysely.ts"],"sourcesContent":["import {CompiledQuery} from 'kysely';\nimport type {Kysely, Transaction as WrappedKyselyTransaction} from 'kysely';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {Format} from '../../../zero-types/src/format.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../../zero-types/src/server-schema.ts';\nimport type {\n  DBConnection,\n  DBTransaction,\n  Row,\n} from '../../../zql/src/mutate/custom.ts';\nimport type {HumanReadable} from '../../../zql/src/query/query.ts';\nimport {executePostgresQuery} from '../pg-query-executor.ts';\nimport {ZQLDatabase} from '../zql-database.ts';\n\nexport type {ZQLDatabase};\n\nexport type KyselyDatabase<TDatabase = unknown> = Kysely<TDatabase>;\n\n/**\n * Helper type for the wrapped transaction used by Kysely.\n *\n * @remarks Use with `ServerTransaction` as `ServerTransaction<Schema, KyselyTransaction<typeof db>>`.\n */\nexport type KyselyTransaction<TDbOrSchema = KyselyDatabase> =\n  TDbOrSchema extends Kysely<infer TInferredDatabase>\n    ? WrappedKyselyTransaction<TInferredDatabase>\n    : WrappedKyselyTransaction<TDbOrSchema>;\n\nexport class KyselyConnection<TDatabase> implements DBConnection<\n  WrappedKyselyTransaction<TDatabase>\n> {\n  readonly #client: Kysely<TDatabase>;\n\n  constructor(client: Kysely<TDatabase>) {\n    this.#client = client;\n  }\n\n  transaction<T>(\n    fn: (tx: DBTransaction<WrappedKyselyTransaction<TDatabase>>) => Promise<T>,\n  ): Promise<T> {\n    return this.#client\n      .transaction()\n      .execute(kyselyTx => fn(new KyselyInternalTransaction(kyselyTx)));\n  }\n}\n\nclass KyselyInternalTransaction<TDatabase> implements DBTransaction<\n  WrappedKyselyTransaction<TDatabase>\n> {\n  readonly wrappedTransaction: WrappedKyselyTransaction<TDatabase>;\n\n  constructor(kyselyTx: WrappedKyselyTransaction<TDatabase>) {\n    this.wrappedTransaction = kyselyTx;\n  }\n\n  runQuery<TReturn>(\n    ast: AST,\n    format: Format,\n    schema: Schema,\n    serverSchema: ServerSchema,\n  ): Promise<HumanReadable<TReturn>> {\n    return executePostgresQuery<TReturn>(\n      this,\n      ast,\n      format,\n      schema,\n      serverSchema,\n    );\n  }\n\n  async query(sql: string, params: unknown[]): Promise<Row[]> {\n    const result = await this.wrappedTransaction.executeQuery<Row>(\n      CompiledQuery.raw(sql, params),\n    );\n    return result.rows;\n  }\n}\n\n/**\n * Wrap a Postgres-backed Kysely client for Zero ZQL.\n *\n * Provides ZQL querying plus access to the underlying Kysely transaction.\n * Use {@link KyselyTransaction} to type your server mutator transaction.\n *\n * @param schema - Zero schema.\n * @param client - Kysely client.\n *\n * @example\n * ```ts\n * import {Pool} from 'pg';\n * import {Kysely, PostgresDialect} from 'kysely';\n * import {defineMutator, defineMutators} from '@rocicorp/zero';\n * import {zeroKysely} from '@rocicorp/zero/server/adapters/kysely';\n * import {z} from 'zod/mini';\n *\n * interface Database {\n *   user: {\n *     id: string;\n *     name: string | null;\n *     status: 'active' | 'inactive';\n *   };\n * }\n *\n * const db = new Kysely<Database>({\n *   dialect: new PostgresDialect({\n *     pool: new Pool({connectionString: process.env.ZERO_UPSTREAM_DB!}),\n *   }),\n * });\n * const zql = zeroKysely(schema, db);\n *\n * export const serverMutators = defineMutators({\n *   user: {\n *     create: defineMutator(\n *       z.object({id: z.string(), name: z.string()}),\n *       async ({tx, args}) => {\n *         if (tx.location !== 'server') {\n *           throw new Error('Server-only mutator');\n *         }\n *         await tx.dbTransaction.wrappedTransaction\n *           .insertInto('user')\n *           .values({id: args.id, name: args.name, status: 'active'})\n *           .execute();\n *       },\n *     ),\n *   },\n * });\n * ```\n */\nexport function zeroKysely<TSchema extends Schema, TDatabase>(\n  schema: TSchema,\n  client: Kysely<TDatabase>,\n): ZQLDatabase<TSchema, WrappedKyselyTransaction<TDatabase>> {\n  return new ZQLDatabase(new KyselyConnection(client), schema);\n}\n"],"mappings":";;;;AA6BA,IAAa,mBAAb,MAEE;CACA;CAEA,YAAY,QAA2B;EACrC,KAAKA,UAAU;CACjB;CAEA,YACE,IACY;EACZ,OAAO,KAAKA,QACT,YAAY,EACZ,SAAQ,aAAY,GAAG,IAAI,0BAA0B,QAAQ,CAAC,CAAC;CACpE;AACF;AAEA,IAAM,4BAAN,MAEE;CACA;CAEA,YAAY,UAA+C;EACzD,KAAK,qBAAqB;CAC5B;CAEA,SACE,KACA,QACA,QACA,cACiC;EACjC,OAAO,qBACL,MACA,KACA,QACA,QACA,YACF;CACF;CAEA,MAAM,MAAM,KAAa,QAAmC;EAI1D,QAAO,MAHc,KAAK,mBAAmB,aAC3C,cAAc,IAAI,KAAK,MAAM,CAC/B,GACc;CAChB;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoDA,SAAgB,WACd,QACA,QAC2D;CAC3D,OAAO,IAAI,YAAY,IAAI,iBAAiB,MAAM,GAAG,MAAM;AAC7D"}
+{"version":3,"file":"kysely.js","names":["#client"],"sources":["../../../../../zero-server/src/adapters/kysely.ts"],"sourcesContent":["import {CompiledQuery} from 'kysely';\nimport type {Kysely, Transaction as WrappedKyselyTransaction} from 'kysely';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {Format} from '../../../zero-types/src/format.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../../zero-types/src/server-schema.ts';\nimport type {\n  DBConnection,\n  DBTransaction,\n  Row,\n} from '../../../zql/src/mutate/custom.ts';\nimport type {HumanReadable} from '../../../zql/src/query/query.ts';\nimport {executePostgresQuery} from '../pg-query-executor.ts';\nimport {ZQLDatabase} from '../zql-database.ts';\n\nexport type {ZQLDatabase};\n\nexport type KyselyDatabase<TDatabase = unknown> = Kysely<TDatabase>;\n\n/**\n * Helper type for the wrapped transaction used by Kysely.\n *\n * @remarks Use with `ServerTransaction` as `ServerTransaction<Schema, KyselyTransaction<typeof db>>`.\n */\nexport type KyselyTransaction<TDbOrSchema = KyselyDatabase> =\n  TDbOrSchema extends Kysely<infer TInferredDatabase>\n    ? WrappedKyselyTransaction<TInferredDatabase>\n    : WrappedKyselyTransaction<TDbOrSchema>;\n\nexport class KyselyConnection<TDatabase> implements DBConnection<\n  WrappedKyselyTransaction<TDatabase>\n> {\n  readonly #client: Kysely<TDatabase>;\n\n  constructor(client: Kysely<TDatabase>) {\n    this.#client = client;\n  }\n\n  query(sql: string, params: unknown[]): Promise<Row[]> {\n    return kyselyQuery(this.#client, sql, params);\n  }\n\n  transaction<T>(\n    fn: (tx: DBTransaction<WrappedKyselyTransaction<TDatabase>>) => Promise<T>,\n  ): Promise<T> {\n    return this.#client\n      .transaction()\n      .execute(kyselyTx => fn(new KyselyInternalTransaction(kyselyTx)));\n  }\n}\n\nclass KyselyInternalTransaction<TDatabase> implements DBTransaction<\n  WrappedKyselyTransaction<TDatabase>\n> {\n  readonly wrappedTransaction: WrappedKyselyTransaction<TDatabase>;\n\n  constructor(kyselyTx: WrappedKyselyTransaction<TDatabase>) {\n    this.wrappedTransaction = kyselyTx;\n  }\n\n  runQuery<TReturn>(\n    ast: AST,\n    format: Format,\n    schema: Schema,\n    serverSchema: ServerSchema,\n  ): Promise<HumanReadable<TReturn>> {\n    return executePostgresQuery<TReturn>(\n      this,\n      ast,\n      format,\n      schema,\n      serverSchema,\n    );\n  }\n\n  query(sql: string, params: unknown[]): Promise<Row[]> {\n    return kyselyQuery(this.wrappedTransaction, sql, params);\n  }\n}\n\nasync function kyselyQuery<TDatabase>(\n  executor: Kysely<TDatabase>,\n  sql: string,\n  params: unknown[],\n): Promise<Row[]> {\n  const result = await executor.executeQuery<Row>(\n    CompiledQuery.raw(sql, params),\n  );\n  return result.rows;\n}\n\n/**\n * Wrap a Postgres-backed Kysely client for Zero ZQL.\n *\n * Provides ZQL querying plus access to the underlying Kysely transaction.\n * Use {@link KyselyTransaction} to type your server mutator transaction.\n *\n * @param schema - Zero schema.\n * @param client - Kysely client.\n *\n * @example\n * ```ts\n * import {Pool} from 'pg';\n * import {Kysely, PostgresDialect} from 'kysely';\n * import {defineMutator, defineMutators} from '@rocicorp/zero';\n * import {zeroKysely} from '@rocicorp/zero/server/adapters/kysely';\n * import {z} from 'zod/mini';\n *\n * interface Database {\n *   user: {\n *     id: string;\n *     name: string | null;\n *     status: 'active' | 'inactive';\n *   };\n * }\n *\n * const db = new Kysely<Database>({\n *   dialect: new PostgresDialect({\n *     pool: new Pool({connectionString: process.env.ZERO_UPSTREAM_DB!}),\n *   }),\n * });\n * const zql = zeroKysely(schema, db);\n *\n * export const serverMutators = defineMutators({\n *   user: {\n *     create: defineMutator(\n *       z.object({id: z.string(), name: z.string()}),\n *       async ({tx, args}) => {\n *         if (tx.location !== 'server') {\n *           throw new Error('Server-only mutator');\n *         }\n *         await tx.dbTransaction.wrappedTransaction\n *           .insertInto('user')\n *           .values({id: args.id, name: args.name, status: 'active'})\n *           .execute();\n *       },\n *     ),\n *   },\n * });\n * ```\n */\nexport function zeroKysely<TSchema extends Schema, TDatabase>(\n  schema: TSchema,\n  client: Kysely<TDatabase>,\n): ZQLDatabase<TSchema, WrappedKyselyTransaction<TDatabase>> {\n  return new ZQLDatabase(new KyselyConnection(client), schema);\n}\n"],"mappings":";;;;AA6BA,IAAa,mBAAb,MAEE;CACA;CAEA,YAAY,QAA2B;EACrC,KAAKA,UAAU;CACjB;CAEA,MAAM,KAAa,QAAmC;EACpD,OAAO,YAAY,KAAKA,SAAS,KAAK,MAAM;CAC9C;CAEA,YACE,IACY;EACZ,OAAO,KAAKA,QACT,YAAY,EACZ,SAAQ,aAAY,GAAG,IAAI,0BAA0B,QAAQ,CAAC,CAAC;CACpE;AACF;AAEA,IAAM,4BAAN,MAEE;CACA;CAEA,YAAY,UAA+C;EACzD,KAAK,qBAAqB;CAC5B;CAEA,SACE,KACA,QACA,QACA,cACiC;EACjC,OAAO,qBACL,MACA,KACA,QACA,QACA,YACF;CACF;CAEA,MAAM,KAAa,QAAmC;EACpD,OAAO,YAAY,KAAK,oBAAoB,KAAK,MAAM;CACzD;AACF;AAEA,eAAe,YACb,UACA,KACA,QACgB;CAIhB,QAAO,MAHc,SAAS,aAC5B,cAAc,IAAI,KAAK,MAAM,CAC/B,GACc;AAChB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoDA,SAAgB,WACd,QACA,QAC2D;CAC3D,OAAO,IAAI,YAAY,IAAI,iBAAiB,MAAM,GAAG,MAAM;AAC7D"}

package/out/zero-server/src/adapters/pg.d.ts

@@ -17,6 +17,7 @@ export type NodePgTransaction = Pool | PoolClient | Client;
 export declare class NodePgConnection implements DBConnection<NodePgTransaction> {
     #private;
     constructor(pool: NodePgTransaction);
+    query(sql: string, params: unknown[]): Promise<Row[]>;
     transaction<TRet>(fn: (tx: DBTransaction<NodePgTransaction>) => Promise<TRet>): Promise<TRet>;
 }
 export declare class NodePgTransactionInternal implements DBTransaction<NodePgTransaction> {

package/out/zero-server/src/adapters/pg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pg.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/pg.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,IAAI,CAAC;AAC/B,OAAO,EAAC,IAAI,EAAE,KAAK,UAAU,EAAC,MAAM,IAAI,CAAC;AACzC,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,mCAAmC,CAAC;AAC3D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0CAA0C,CAAC;AAC3E,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,GAAG,EACJ,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAE1B;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAE3D,qBAAa,gBAAiB,YAAW,YAAY,CAAC,iBAAiB,CAAC;;IAGtE,YAAY,IAAI,EAAE,iBAAiB,EAElC;IAEK,WAAW,CAAC,IAAI,EACpB,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,iBAAiB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAC1D,OAAO,CAAC,IAAI,CAAC,CAoBf;CACF;AAED,qBAAa,yBAA0B,YAAW,aAAa,CAAC,iBAAiB,CAAC;IAChF,QAAQ,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;IAE/C,YAAY,MAAM,EAAE,iBAAiB,EAEpC;IAED,QAAQ,CAAC,OAAO,EACd,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAQjC;IAEK,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAG1D;CACF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACzC,MAAM,EAAE,CAAC,EACT,EAAE,EAAE,iBAAiB,GAAG,MAAM,qCAM/B"}
+{"version":3,"file":"pg.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/pg.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,IAAI,CAAC;AAC/B,OAAO,EAAC,IAAI,EAAE,KAAK,UAAU,EAAC,MAAM,IAAI,CAAC;AACzC,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,mCAAmC,CAAC;AAC3D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0CAA0C,CAAC;AAC3E,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,GAAG,EACJ,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAE1B;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAE3D,qBAAa,gBAAiB,YAAW,YAAY,CAAC,iBAAiB,CAAC;;IAGtE,YAAY,IAAI,EAAE,iBAAiB,EAElC;IAED,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAEpD;IAEK,WAAW,CAAC,IAAI,EACpB,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,iBAAiB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAC1D,OAAO,CAAC,IAAI,CAAC,CAoBf;CACF;AAED,qBAAa,yBAA0B,YAAW,aAAa,CAAC,iBAAiB,CAAC;IAChF,QAAQ,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;IAE/C,YAAY,MAAM,EAAE,iBAAiB,EAEpC;IAED,QAAQ,CAAC,OAAO,EACd,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAQjC;IAED,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAEpD;CACF;AAWD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACzC,MAAM,EAAE,CAAC,EACT,EAAE,EAAE,iBAAiB,GAAG,MAAM,qCAM/B"}

package/out/zero-server/src/adapters/pg.js

@@ -7,6 +7,9 @@ var NodePgConnection = class {
 	constructor(pool) {
 		this.#pool = pool;
 	}
+	query(sql, params) {
+		return nodePgQuery(this.#pool, sql, params);
+	}
 	async transaction(fn) {
 		const client = this.#pool instanceof Pool ? await this.#pool.connect() : this.#pool;
 		try {
@@ -32,10 +35,13 @@ var NodePgTransactionInternal = class {
 	runQuery(ast, format, schema, serverSchema) {
 		return executePostgresQuery(this, ast, format, schema, serverSchema);
 	}
-	async query(sql, params) {
-		return (await this.wrappedTransaction.query(sql, params)).rows;
+	query(sql, params) {
+		return nodePgQuery(this.wrappedTransaction, sql, params);
 	}
 };
+async function nodePgQuery(client, sql, params) {
+	return (await client.query(sql, params)).rows;
+}
 /**
 * Wrap a `pg` Pool for Zero ZQL.
 *

package/out/zero-server/src/adapters/pg.js.map

@@ -1 +1 @@
-{"version":3,"file":"pg.js","names":["#pool"],"sources":["../../../../../zero-server/src/adapters/pg.ts"],"sourcesContent":["import type {Client} from 'pg';\nimport {Pool, type PoolClient} from 'pg';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {Format} from '../../../zero-types/src/format.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../../zero-types/src/server-schema.ts';\nimport type {\n  DBConnection,\n  DBTransaction,\n  Row,\n} from '../../../zql/src/mutate/custom.ts';\nimport type {HumanReadable} from '../../../zql/src/query/query.ts';\nimport {executePostgresQuery} from '../pg-query-executor.ts';\nimport {ZQLDatabase} from '../zql-database.ts';\n\nexport type {ZQLDatabase};\n\n/**\n * Helper type for the wrapped transaction used by node-postgres.\n *\n * @remarks Use with `ServerTransaction` as `ServerTransaction<Schema, NodePgTransaction>`.\n */\nexport type NodePgTransaction = Pool | PoolClient | Client;\n\nexport class NodePgConnection implements DBConnection<NodePgTransaction> {\n  readonly #pool: NodePgTransaction;\n\n  constructor(pool: NodePgTransaction) {\n    this.#pool = pool;\n  }\n\n  async transaction<TRet>(\n    fn: (tx: DBTransaction<NodePgTransaction>) => Promise<TRet>,\n  ): Promise<TRet> {\n    const client =\n      this.#pool instanceof Pool ? await this.#pool.connect() : this.#pool;\n    try {\n      await client.query('BEGIN');\n      const result = await fn(new NodePgTransactionInternal(client));\n      await client.query('COMMIT');\n      return result;\n    } catch (error) {\n      try {\n        await client.query('ROLLBACK');\n      } catch {\n        // ignore rollback error; original error will be thrown\n      }\n      throw error;\n    } finally {\n      if (this.#pool instanceof Pool && 'release' in client) {\n        client.release();\n      }\n    }\n  }\n}\n\nexport class NodePgTransactionInternal implements DBTransaction<NodePgTransaction> {\n  readonly wrappedTransaction: NodePgTransaction;\n\n  constructor(client: NodePgTransaction) {\n    this.wrappedTransaction = client;\n  }\n\n  runQuery<TReturn>(\n    ast: AST,\n    format: Format,\n    schema: Schema,\n    serverSchema: ServerSchema,\n  ): Promise<HumanReadable<TReturn>> {\n    return executePostgresQuery<TReturn>(\n      this,\n      ast,\n      format,\n      schema,\n      serverSchema,\n    );\n  }\n\n  async query(sql: string, params: unknown[]): Promise<Row[]> {\n    const res = await this.wrappedTransaction.query(sql, params as unknown[]);\n    return res.rows as Row[];\n  }\n}\n\n/**\n * Wrap a `pg` Pool for Zero ZQL.\n *\n * Provides ZQL querying plus access to the underlying node-postgres client.\n * Use {@link NodePgTransaction} to type your server mutator transaction.\n *\n * @param schema - Zero schema.\n * @param pg - `pg` Pool or connection string.\n *\n * @example\n * ```ts\n * import {Pool} from 'pg';\n * import {defineMutator, defineMutators} from '@rocicorp/zero';\n * import {zeroNodePg} from '@rocicorp/zero/server/adapters/pg';\n * import {z} from 'zod/mini';\n *\n * const pool = new Pool({connectionString: process.env.ZERO_UPSTREAM_DB!});\n * const zql = zeroNodePg(schema, pool);\n *\n * export const serverMutators = defineMutators({\n *   user: {\n *     create: defineMutator(\n *       z.object({id: z.string(), name: z.string()}),\n *       async ({tx, args}) => {\n *         if (tx.location !== 'server') {\n *           throw new Error('Server-only mutator');\n *         }\n *         await tx.dbTransaction.wrappedTransaction.query(\n *           'INSERT INTO \"user\" (id, name, status) VALUES ($1, $2, $3)',\n *           [args.id, args.name, 'active'],\n *         );\n *       },\n *     ),\n *   },\n * });\n * ```\n */\nexport function zeroNodePg<S extends Schema>(\n  schema: S,\n  pg: NodePgTransaction | string,\n) {\n  if (typeof pg === 'string') {\n    pg = new Pool({connectionString: pg});\n  }\n  return new ZQLDatabase(new NodePgConnection(pg), schema);\n}\n"],"mappings":";;;;AAwBA,IAAa,mBAAb,MAAyE;CACvE;CAEA,YAAY,MAAyB;EACnC,KAAKA,QAAQ;CACf;CAEA,MAAM,YACJ,IACe;EACf,MAAM,SACJ,KAAKA,iBAAiB,OAAO,MAAM,KAAKA,MAAM,QAAQ,IAAI,KAAKA;EACjE,IAAI;GACF,MAAM,OAAO,MAAM,OAAO;GAC1B,MAAM,SAAS,MAAM,GAAG,IAAI,0BAA0B,MAAM,CAAC;GAC7D,MAAM,OAAO,MAAM,QAAQ;GAC3B,OAAO;EACT,SAAS,OAAO;GACd,IAAI;IACF,MAAM,OAAO,MAAM,UAAU;GAC/B,QAAQ,CAER;GACA,MAAM;EACR,UAAU;GACR,IAAI,KAAKA,iBAAiB,QAAQ,aAAa,QAC7C,OAAO,QAAQ;EAEnB;CACF;AACF;AAEA,IAAa,4BAAb,MAAmF;CACjF;CAEA,YAAY,QAA2B;EACrC,KAAK,qBAAqB;CAC5B;CAEA,SACE,KACA,QACA,QACA,cACiC;EACjC,OAAO,qBACL,MACA,KACA,QACA,QACA,YACF;CACF;CAEA,MAAM,MAAM,KAAa,QAAmC;EAE1D,QAAO,MADW,KAAK,mBAAmB,MAAM,KAAK,MAAmB,GAC7D;CACb;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuCA,SAAgB,WACd,QACA,IACA;CACA,IAAI,OAAO,OAAO,UAChB,KAAK,IAAI,KAAK,EAAC,kBAAkB,GAAE,CAAC;CAEtC,OAAO,IAAI,YAAY,IAAI,iBAAiB,EAAE,GAAG,MAAM;AACzD"}
+{"version":3,"file":"pg.js","names":["#pool"],"sources":["../../../../../zero-server/src/adapters/pg.ts"],"sourcesContent":["import type {Client} from 'pg';\nimport {Pool, type PoolClient} from 'pg';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {Format} from '../../../zero-types/src/format.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../../zero-types/src/server-schema.ts';\nimport type {\n  DBConnection,\n  DBTransaction,\n  Row,\n} from '../../../zql/src/mutate/custom.ts';\nimport type {HumanReadable} from '../../../zql/src/query/query.ts';\nimport {executePostgresQuery} from '../pg-query-executor.ts';\nimport {ZQLDatabase} from '../zql-database.ts';\n\nexport type {ZQLDatabase};\n\n/**\n * Helper type for the wrapped transaction used by node-postgres.\n *\n * @remarks Use with `ServerTransaction` as `ServerTransaction<Schema, NodePgTransaction>`.\n */\nexport type NodePgTransaction = Pool | PoolClient | Client;\n\nexport class NodePgConnection implements DBConnection<NodePgTransaction> {\n  readonly #pool: NodePgTransaction;\n\n  constructor(pool: NodePgTransaction) {\n    this.#pool = pool;\n  }\n\n  query(sql: string, params: unknown[]): Promise<Row[]> {\n    return nodePgQuery(this.#pool, sql, params);\n  }\n\n  async transaction<TRet>(\n    fn: (tx: DBTransaction<NodePgTransaction>) => Promise<TRet>,\n  ): Promise<TRet> {\n    const client =\n      this.#pool instanceof Pool ? await this.#pool.connect() : this.#pool;\n    try {\n      await client.query('BEGIN');\n      const result = await fn(new NodePgTransactionInternal(client));\n      await client.query('COMMIT');\n      return result;\n    } catch (error) {\n      try {\n        await client.query('ROLLBACK');\n      } catch {\n        // ignore rollback error; original error will be thrown\n      }\n      throw error;\n    } finally {\n      if (this.#pool instanceof Pool && 'release' in client) {\n        client.release();\n      }\n    }\n  }\n}\n\nexport class NodePgTransactionInternal implements DBTransaction<NodePgTransaction> {\n  readonly wrappedTransaction: NodePgTransaction;\n\n  constructor(client: NodePgTransaction) {\n    this.wrappedTransaction = client;\n  }\n\n  runQuery<TReturn>(\n    ast: AST,\n    format: Format,\n    schema: Schema,\n    serverSchema: ServerSchema,\n  ): Promise<HumanReadable<TReturn>> {\n    return executePostgresQuery<TReturn>(\n      this,\n      ast,\n      format,\n      schema,\n      serverSchema,\n    );\n  }\n\n  query(sql: string, params: unknown[]): Promise<Row[]> {\n    return nodePgQuery(this.wrappedTransaction, sql, params);\n  }\n}\n\nasync function nodePgQuery(\n  client: NodePgTransaction,\n  sql: string,\n  params: unknown[],\n): Promise<Row[]> {\n  const res = await client.query(sql, params);\n  return res.rows as Row[];\n}\n\n/**\n * Wrap a `pg` Pool for Zero ZQL.\n *\n * Provides ZQL querying plus access to the underlying node-postgres client.\n * Use {@link NodePgTransaction} to type your server mutator transaction.\n *\n * @param schema - Zero schema.\n * @param pg - `pg` Pool or connection string.\n *\n * @example\n * ```ts\n * import {Pool} from 'pg';\n * import {defineMutator, defineMutators} from '@rocicorp/zero';\n * import {zeroNodePg} from '@rocicorp/zero/server/adapters/pg';\n * import {z} from 'zod/mini';\n *\n * const pool = new Pool({connectionString: process.env.ZERO_UPSTREAM_DB!});\n * const zql = zeroNodePg(schema, pool);\n *\n * export const serverMutators = defineMutators({\n *   user: {\n *     create: defineMutator(\n *       z.object({id: z.string(), name: z.string()}),\n *       async ({tx, args}) => {\n *         if (tx.location !== 'server') {\n *           throw new Error('Server-only mutator');\n *         }\n *         await tx.dbTransaction.wrappedTransaction.query(\n *           'INSERT INTO \"user\" (id, name, status) VALUES ($1, $2, $3)',\n *           [args.id, args.name, 'active'],\n *         );\n *       },\n *     ),\n *   },\n * });\n * ```\n */\nexport function zeroNodePg<S extends Schema>(\n  schema: S,\n  pg: NodePgTransaction | string,\n) {\n  if (typeof pg === 'string') {\n    pg = new Pool({connectionString: pg});\n  }\n  return new ZQLDatabase(new NodePgConnection(pg), schema);\n}\n"],"mappings":";;;;AAwBA,IAAa,mBAAb,MAAyE;CACvE;CAEA,YAAY,MAAyB;EACnC,KAAKA,QAAQ;CACf;CAEA,MAAM,KAAa,QAAmC;EACpD,OAAO,YAAY,KAAKA,OAAO,KAAK,MAAM;CAC5C;CAEA,MAAM,YACJ,IACe;EACf,MAAM,SACJ,KAAKA,iBAAiB,OAAO,MAAM,KAAKA,MAAM,QAAQ,IAAI,KAAKA;EACjE,IAAI;GACF,MAAM,OAAO,MAAM,OAAO;GAC1B,MAAM,SAAS,MAAM,GAAG,IAAI,0BAA0B,MAAM,CAAC;GAC7D,MAAM,OAAO,MAAM,QAAQ;GAC3B,OAAO;EACT,SAAS,OAAO;GACd,IAAI;IACF,MAAM,OAAO,MAAM,UAAU;GAC/B,QAAQ,CAER;GACA,MAAM;EACR,UAAU;GACR,IAAI,KAAKA,iBAAiB,QAAQ,aAAa,QAC7C,OAAO,QAAQ;EAEnB;CACF;AACF;AAEA,IAAa,4BAAb,MAAmF;CACjF;CAEA,YAAY,QAA2B;EACrC,KAAK,qBAAqB;CAC5B;CAEA,SACE,KACA,QACA,QACA,cACiC;EACjC,OAAO,qBACL,MACA,KACA,QACA,QACA,YACF;CACF;CAEA,MAAM,KAAa,QAAmC;EACpD,OAAO,YAAY,KAAK,oBAAoB,KAAK,MAAM;CACzD;AACF;AAEA,eAAe,YACb,QACA,KACA,QACgB;CAEhB,QAAO,MADW,OAAO,MAAM,KAAK,MAAM,GAC/B;AACb;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuCA,SAAgB,WACd,QACA,IACA;CACA,IAAI,OAAO,OAAO,UAChB,KAAK,IAAI,KAAK,EAAC,kBAAkB,GAAE,CAAC;CAEtC,OAAO,IAAI,YAAY,IAAI,iBAAiB,EAAE,GAAG,MAAM;AACzD"}

package/out/zero-server/src/adapters/postgresjs.d.ts

@@ -17,6 +17,7 @@ export type PostgresJsTransaction<T extends Record<string, unknown> = Record<str
 export declare class PostgresJSConnection<T extends Record<string, unknown>> implements DBConnection<PostgresJsTransaction<T>> {
     #private;
     constructor(pg: postgres.Sql<T>);
+    query(sql: string, params: unknown[]): Promise<Row[]>;
     transaction<TRet>(fn: (tx: DBTransaction<PostgresJsTransaction<T>>) => Promise<TRet>): Promise<TRet>;
 }
 export declare class PostgresJsTransactionInternal<T extends Record<string, unknown>> implements DBTransaction<PostgresJsTransaction<T>> {

package/out/zero-server/src/adapters/postgresjs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postgresjs.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/postgresjs.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,mCAAmC,CAAC;AAC3D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0CAA0C,CAAC;AAC3E,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,GAAG,EACJ,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAE1B;;;;;GAKG;AACH,MAAM,MAAM,qBAAqB,CAC/B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IACzD,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;AAE/B,qBAAa,oBAAoB,CAC/B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CACjC,YAAW,YAAY,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;;IAEjD,YAAY,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAE9B;IAED,WAAW,CAAC,IAAI,EACd,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GACjE,OAAO,CAAC,IAAI,CAAC,CAIf;CACF;AAED,qBAAa,6BAA6B,CACxC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CACjC,YAAW,aAAa,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAClD,QAAQ,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACtD,YAAY,IAAI,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAEzC;IAED,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAEpD;IAED,QAAQ,CAAC,OAAO,EACd,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAQjC;CACF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,wBAAgB,cAAc,CAC5B,CAAC,SAAS,MAAM,EAChB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,4CAOxC"}
+{"version":3,"file":"postgresjs.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/postgresjs.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,mCAAmC,CAAC;AAC3D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0CAA0C,CAAC;AAC3E,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,GAAG,EACJ,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAE1B;;;;;GAKG;AACH,MAAM,MAAM,qBAAqB,CAC/B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IACzD,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;AAE/B,qBAAa,oBAAoB,CAC/B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CACjC,YAAW,YAAY,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;;IAEjD,YAAY,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAE9B;IAED,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAEpD;IAED,WAAW,CAAC,IAAI,EACd,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GACjE,OAAO,CAAC,IAAI,CAAC,CAIf;CACF;AAED,qBAAa,6BAA6B,CACxC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CACjC,YAAW,aAAa,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAClD,QAAQ,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACtD,YAAY,IAAI,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAEzC;IAED,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAEpD;IAED,QAAQ,CAAC,OAAO,EACd,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAQjC;CACF;AAUD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,wBAAgB,cAAc,CAC5B,CAAC,SAAS,MAAM,EAChB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,4CAOxC"}

package/out/zero-server/src/adapters/postgresjs.js

@@ -7,6 +7,9 @@ var PostgresJSConnection = class {
 	constructor(pg) {
 		this.#pg = pg;
 	}
+	query(sql, params) {
+		return postgresJsQuery(this.#pg, sql, params);
+	}
 	transaction(fn) {
 		return this.#pg.begin((pgTx) => fn(new PostgresJsTransactionInternal(pgTx)));
 	}
@@ -17,12 +20,15 @@ var PostgresJsTransactionInternal = class {
 		this.wrappedTransaction = pgTx;
 	}
 	query(sql, params) {
-		return this.wrappedTransaction.unsafe(sql, params);
+		return postgresJsQuery(this.wrappedTransaction, sql, params);
 	}
 	runQuery(ast, format, schema, serverSchema) {
 		return executePostgresQuery(this, ast, format, schema, serverSchema);
 	}
 };
+function postgresJsQuery(sql, text, params) {
+	return sql.unsafe(text, params);
+}
 /**
 * Wrap a `postgres` client for Zero ZQL.
 *

package/out/zero-server/src/adapters/postgresjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"postgresjs.js","names":["#pg"],"sources":["../../../../../zero-server/src/adapters/postgresjs.ts"],"sourcesContent":["import postgres from 'postgres';\nimport type {JSONValue} from '../../../shared/src/json.ts';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {Format} from '../../../zero-types/src/format.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../../zero-types/src/server-schema.ts';\nimport type {\n  DBConnection,\n  DBTransaction,\n  Row,\n} from '../../../zql/src/mutate/custom.ts';\nimport type {HumanReadable} from '../../../zql/src/query/query.ts';\nimport {executePostgresQuery} from '../pg-query-executor.ts';\nimport {ZQLDatabase} from '../zql-database.ts';\n\nexport type {ZQLDatabase};\n\n/**\n * Helper type for the wrapped transaction used by postgres.js.\n *\n * @typeParam T - The row-shape context bound to the postgres.js client.\n * @remarks Use with `ServerTransaction` as `ServerTransaction<Schema, PostgresJsTransaction>`.\n */\nexport type PostgresJsTransaction<\n  T extends Record<string, unknown> = Record<string, unknown>,\n> = postgres.TransactionSql<T>;\n\nexport class PostgresJSConnection<\n  T extends Record<string, unknown>,\n> implements DBConnection<PostgresJsTransaction<T>> {\n  readonly #pg: postgres.Sql<T>;\n  constructor(pg: postgres.Sql<T>) {\n    this.#pg = pg;\n  }\n\n  transaction<TRet>(\n    fn: (tx: DBTransaction<PostgresJsTransaction<T>>) => Promise<TRet>,\n  ): Promise<TRet> {\n    return this.#pg.begin(pgTx =>\n      fn(new PostgresJsTransactionInternal(pgTx)),\n    ) as Promise<TRet>;\n  }\n}\n\nexport class PostgresJsTransactionInternal<\n  T extends Record<string, unknown>,\n> implements DBTransaction<PostgresJsTransaction<T>> {\n  readonly wrappedTransaction: PostgresJsTransaction<T>;\n  constructor(pgTx: PostgresJsTransaction<T>) {\n    this.wrappedTransaction = pgTx;\n  }\n\n  query(sql: string, params: unknown[]): Promise<Row[]> {\n    return this.wrappedTransaction.unsafe(sql, params as JSONValue[]);\n  }\n\n  runQuery<TReturn>(\n    ast: AST,\n    format: Format,\n    schema: Schema,\n    serverSchema: ServerSchema,\n  ): Promise<HumanReadable<TReturn>> {\n    return executePostgresQuery<TReturn>(\n      this,\n      ast,\n      format,\n      schema,\n      serverSchema,\n    );\n  }\n}\n\n/**\n * Wrap a `postgres` client for Zero ZQL.\n *\n * Provides ZQL querying plus access to the underlying postgres.js transaction.\n * Use {@link PostgresJsTransaction} to type your server mutator transaction.\n *\n * @param schema - Zero schema.\n * @param pg - `postgres` client or connection string.\n *\n * @example\n * ```ts\n * import postgres from 'postgres';\n * import {defineMutator, defineMutators} from '@rocicorp/zero';\n * import {zeroPostgresJS} from '@rocicorp/zero/server/adapters/postgresjs';\n * import {z} from 'zod/mini';\n *\n * const sql = postgres(process.env.ZERO_UPSTREAM_DB!);\n * const zql = zeroPostgresJS(schema, sql);\n *\n * export const serverMutators = defineMutators({\n *   user: {\n *     create: defineMutator(\n *       z.object({id: z.string(), name: z.string()}),\n *       async ({tx, args}) => {\n *         if (tx.location !== 'server') {\n *           throw new Error('Server-only mutator');\n *         }\n *         await tx.dbTransaction.wrappedTransaction`\n *           INSERT INTO \"user\" (id, name, status)\n *           VALUES (${args.id}, ${args.name}, ${'active'})\n *         `;\n *       },\n *     ),\n *   },\n * });\n * ```\n */\nexport function zeroPostgresJS<\n  S extends Schema,\n  T extends Record<string, unknown> = Record<string, unknown>,\n>(schema: S, pg: postgres.Sql<T> | string) {\n  if (typeof pg === 'string') {\n    pg = postgres(pg, {\n      connection: {['application_name']: 'zero-server'},\n    }) as postgres.Sql<T>;\n  }\n  return new ZQLDatabase(new PostgresJSConnection(pg), schema);\n}\n"],"mappings":";;;;AA2BA,IAAa,uBAAb,MAEoD;CAClD;CACA,YAAY,IAAqB;EAC/B,KAAKA,MAAM;CACb;CAEA,YACE,IACe;EACf,OAAO,KAAKA,IAAI,OAAM,SACpB,GAAG,IAAI,8BAA8B,IAAI,CAAC,CAC5C;CACF;AACF;AAEA,IAAa,gCAAb,MAEqD;CACnD;CACA,YAAY,MAAgC;EAC1C,KAAK,qBAAqB;CAC5B;CAEA,MAAM,KAAa,QAAmC;EACpD,OAAO,KAAK,mBAAmB,OAAO,KAAK,MAAqB;CAClE;CAEA,SACE,KACA,QACA,QACA,cACiC;EACjC,OAAO,qBACL,MACA,KACA,QACA,QACA,YACF;CACF;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuCA,SAAgB,eAGd,QAAW,IAA8B;CACzC,IAAI,OAAO,OAAO,UAChB,KAAK,SAAS,IAAI,EAChB,YAAY,GAAE,qBAAqB,cAAa,EAClD,CAAC;CAEH,OAAO,IAAI,YAAY,IAAI,qBAAqB,EAAE,GAAG,MAAM;AAC7D"}
+{"version":3,"file":"postgresjs.js","names":["#pg"],"sources":["../../../../../zero-server/src/adapters/postgresjs.ts"],"sourcesContent":["import postgres from 'postgres';\nimport type {JSONValue} from '../../../shared/src/json.ts';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {Format} from '../../../zero-types/src/format.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../../zero-types/src/server-schema.ts';\nimport type {\n  DBConnection,\n  DBTransaction,\n  Row,\n} from '../../../zql/src/mutate/custom.ts';\nimport type {HumanReadable} from '../../../zql/src/query/query.ts';\nimport {executePostgresQuery} from '../pg-query-executor.ts';\nimport {ZQLDatabase} from '../zql-database.ts';\n\nexport type {ZQLDatabase};\n\n/**\n * Helper type for the wrapped transaction used by postgres.js.\n *\n * @typeParam T - The row-shape context bound to the postgres.js client.\n * @remarks Use with `ServerTransaction` as `ServerTransaction<Schema, PostgresJsTransaction>`.\n */\nexport type PostgresJsTransaction<\n  T extends Record<string, unknown> = Record<string, unknown>,\n> = postgres.TransactionSql<T>;\n\nexport class PostgresJSConnection<\n  T extends Record<string, unknown>,\n> implements DBConnection<PostgresJsTransaction<T>> {\n  readonly #pg: postgres.Sql<T>;\n  constructor(pg: postgres.Sql<T>) {\n    this.#pg = pg;\n  }\n\n  query(sql: string, params: unknown[]): Promise<Row[]> {\n    return postgresJsQuery(this.#pg, sql, params);\n  }\n\n  transaction<TRet>(\n    fn: (tx: DBTransaction<PostgresJsTransaction<T>>) => Promise<TRet>,\n  ): Promise<TRet> {\n    return this.#pg.begin(pgTx =>\n      fn(new PostgresJsTransactionInternal(pgTx)),\n    ) as Promise<TRet>;\n  }\n}\n\nexport class PostgresJsTransactionInternal<\n  T extends Record<string, unknown>,\n> implements DBTransaction<PostgresJsTransaction<T>> {\n  readonly wrappedTransaction: PostgresJsTransaction<T>;\n  constructor(pgTx: PostgresJsTransaction<T>) {\n    this.wrappedTransaction = pgTx;\n  }\n\n  query(sql: string, params: unknown[]): Promise<Row[]> {\n    return postgresJsQuery(this.wrappedTransaction, sql, params);\n  }\n\n  runQuery<TReturn>(\n    ast: AST,\n    format: Format,\n    schema: Schema,\n    serverSchema: ServerSchema,\n  ): Promise<HumanReadable<TReturn>> {\n    return executePostgresQuery<TReturn>(\n      this,\n      ast,\n      format,\n      schema,\n      serverSchema,\n    );\n  }\n}\n\nfunction postgresJsQuery<T extends Record<string, unknown>>(\n  sql: postgres.Sql<T>,\n  text: string,\n  params: unknown[],\n): Promise<Row[]> {\n  return sql.unsafe(text, params as JSONValue[]);\n}\n\n/**\n * Wrap a `postgres` client for Zero ZQL.\n *\n * Provides ZQL querying plus access to the underlying postgres.js transaction.\n * Use {@link PostgresJsTransaction} to type your server mutator transaction.\n *\n * @param schema - Zero schema.\n * @param pg - `postgres` client or connection string.\n *\n * @example\n * ```ts\n * import postgres from 'postgres';\n * import {defineMutator, defineMutators} from '@rocicorp/zero';\n * import {zeroPostgresJS} from '@rocicorp/zero/server/adapters/postgresjs';\n * import {z} from 'zod/mini';\n *\n * const sql = postgres(process.env.ZERO_UPSTREAM_DB!);\n * const zql = zeroPostgresJS(schema, sql);\n *\n * export const serverMutators = defineMutators({\n *   user: {\n *     create: defineMutator(\n *       z.object({id: z.string(), name: z.string()}),\n *       async ({tx, args}) => {\n *         if (tx.location !== 'server') {\n *           throw new Error('Server-only mutator');\n *         }\n *         await tx.dbTransaction.wrappedTransaction`\n *           INSERT INTO \"user\" (id, name, status)\n *           VALUES (${args.id}, ${args.name}, ${'active'})\n *         `;\n *       },\n *     ),\n *   },\n * });\n * ```\n */\nexport function zeroPostgresJS<\n  S extends Schema,\n  T extends Record<string, unknown> = Record<string, unknown>,\n>(schema: S, pg: postgres.Sql<T> | string) {\n  if (typeof pg === 'string') {\n    pg = postgres(pg, {\n      connection: {['application_name']: 'zero-server'},\n    }) as postgres.Sql<T>;\n  }\n  return new ZQLDatabase(new PostgresJSConnection(pg), schema);\n}\n"],"mappings":";;;;AA2BA,IAAa,uBAAb,MAEoD;CAClD;CACA,YAAY,IAAqB;EAC/B,KAAKA,MAAM;CACb;CAEA,MAAM,KAAa,QAAmC;EACpD,OAAO,gBAAgB,KAAKA,KAAK,KAAK,MAAM;CAC9C;CAEA,YACE,IACe;EACf,OAAO,KAAKA,IAAI,OAAM,SACpB,GAAG,IAAI,8BAA8B,IAAI,CAAC,CAC5C;CACF;AACF;AAEA,IAAa,gCAAb,MAEqD;CACnD;CACA,YAAY,MAAgC;EAC1C,KAAK,qBAAqB;CAC5B;CAEA,MAAM,KAAa,QAAmC;EACpD,OAAO,gBAAgB,KAAK,oBAAoB,KAAK,MAAM;CAC7D;CAEA,SACE,KACA,QACA,QACA,cACiC;EACjC,OAAO,qBACL,MACA,KACA,QACA,QACA,YACF;CACF;AACF;AAEA,SAAS,gBACP,KACA,MACA,QACgB;CAChB,OAAO,IAAI,OAAO,MAAM,MAAqB;AAC/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuCA,SAAgB,eAGd,QAAW,IAA8B;CACzC,IAAI,OAAO,OAAO,UAChB,KAAK,SAAS,IAAI,EAChB,YAAY,GAAE,qBAAqB,cAAa,EAClD,CAAC;CAEH,OAAO,IAAI,YAAY,IAAI,qBAAqB,EAAE,GAAG,MAAM;AAC7D"}

package/out/zero-server/src/adapters/prisma.d.ts

@@ -1,11 +1,11 @@
 import type { Schema } from '../../../zero-types/src/schema.ts';
-import type { DBConnection, DBTransaction } from '../../../zql/src/mutate/custom.ts';
+import type { DBConnection, DBTransaction, Row } from '../../../zql/src/mutate/custom.ts';
 import { ZQLDatabase } from '../zql-database.ts';
 export type { ZQLDatabase };
 export type PrismaTransactionLike = {
     $queryRawUnsafe: (query: string, ...params: unknown[]) => Promise<unknown>;
 };
-export type PrismaClientLike<TTransaction extends PrismaTransactionLike = PrismaTransactionLike> = {
+export type PrismaClientLike<TTransaction extends PrismaTransactionLike = PrismaTransactionLike> = PrismaTransactionLike & {
     $transaction: <T>(fn: (tx: TTransaction) => Promise<T>) => Promise<T>;
 };
 /**
@@ -17,6 +17,7 @@ export type PrismaTransaction<TClient extends PrismaClientLike = PrismaClientLik
 export declare class PrismaConnection<TClient extends PrismaClientLike> implements DBConnection<PrismaTransaction<TClient>> {
     #private;
     constructor(client: TClient);
+    query(sql: string, params: unknown[]): Promise<Iterable<Row>>;
     transaction<T>(fn: (tx: DBTransaction<PrismaTransaction<TClient>>) => Promise<T>): Promise<T>;
 }
 /**

package/out/zero-server/src/adapters/prisma.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prisma.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/prisma.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAE9D,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EAEd,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAE1B,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC5E,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAC1B,YAAY,SAAS,qBAAqB,GAAG,qBAAqB,IAChE;IACF,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;CACvE,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,CAC3B,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,IAEnD,OAAO,SAAS,gBAAgB,CAAC,MAAM,YAAY,CAAC,GAChD,YAAY,GACZ,qBAAqB,CAAC;AAE5B,qBAAa,gBAAgB,CAC3B,OAAO,SAAS,gBAAgB,CAChC,YAAW,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;;IAGnD,YAAY,MAAM,EAAE,OAAO,EAE1B;IAED,WAAW,CAAC,CAAC,EACX,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAChE,OAAO,CAAC,CAAC,CAAC,CAQZ;CACF;AAwDD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAgB,UAAU,CACxB,OAAO,SAAS,MAAM,EACtB,OAAO,SAAS,gBAAgB,EAEhC,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,OAAO,GACd,WAAW,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAElD"}
+{"version":3,"file":"prisma.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/adapters/prisma.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAE9D,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,GAAG,EACJ,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE/C,YAAY,EAAC,WAAW,EAAC,CAAC;AAE1B,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC5E,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAC1B,YAAY,SAAS,qBAAqB,GAAG,qBAAqB,IAChE,qBAAqB,GAAG;IAC1B,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;CACvE,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,CAC3B,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,IAEnD,OAAO,SAAS,gBAAgB,CAAC,MAAM,YAAY,CAAC,GAChD,YAAY,GACZ,qBAAqB,CAAC;AAE5B,qBAAa,gBAAgB,CAC3B,OAAO,SAAS,gBAAgB,CAChC,YAAW,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;;IAGnD,YAAY,MAAM,EAAE,OAAO,EAE1B;IAED,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAE5D;IAED,WAAW,CAAC,CAAC,EACX,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAChE,OAAO,CAAC,CAAC,CAAC,CAQZ;CACF;AA6DD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAgB,UAAU,CACxB,OAAO,SAAS,MAAM,EACtB,OAAO,SAAS,gBAAgB,EAEhC,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,OAAO,GACd,WAAW,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAElD"}

package/out/zero-server/src/adapters/prisma.js

@@ -6,6 +6,9 @@ var PrismaConnection = class {
 	constructor(client) {
 		this.#client = client;
 	}
+	query(sql, params) {
+		return prismaQuery(this.#client, sql, params);
+	}
 	transaction(fn) {
 		return this.#client.$transaction((prismaTx) => fn(new PrismaInternalTransaction(prismaTx)));
 	}
@@ -18,10 +21,13 @@ var PrismaInternalTransaction = class {
 	runQuery(ast, format, schema, serverSchema) {
 		return executePostgresQuery(this, ast, format, schema, serverSchema);
 	}
-	async query(sql, params) {
-		return toIterableRows(await this.wrappedTransaction.$queryRawUnsafe(sql, ...params));
+	query(sql, params) {
+		return prismaQuery(this.wrappedTransaction, sql, params);
 	}
 };
+async function prismaQuery(client, sql, params) {
+	return toIterableRows(await client.$queryRawUnsafe(sql, ...params));
+}
 function isIterable(value) {
 	return value != null && typeof value[Symbol.iterator] === "function";
 }

package/out/zero-server/src/adapters/prisma.js.map

@@ -1 +1 @@
-{"version":3,"file":"prisma.js","names":["#client"],"sources":["../../../../../zero-server/src/adapters/prisma.ts"],"sourcesContent":["import type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {Format} from '../../../zero-types/src/format.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../../zero-types/src/server-schema.ts';\nimport type {\n  DBConnection,\n  DBTransaction,\n  Row,\n} from '../../../zql/src/mutate/custom.ts';\nimport type {HumanReadable} from '../../../zql/src/query/query.ts';\nimport {executePostgresQuery} from '../pg-query-executor.ts';\nimport {ZQLDatabase} from '../zql-database.ts';\n\nexport type {ZQLDatabase};\n\nexport type PrismaTransactionLike = {\n  $queryRawUnsafe: (query: string, ...params: unknown[]) => Promise<unknown>;\n};\n\nexport type PrismaClientLike<\n  TTransaction extends PrismaTransactionLike = PrismaTransactionLike,\n> = {\n  $transaction: <T>(fn: (tx: TTransaction) => Promise<T>) => Promise<T>;\n};\n\n/**\n * Helper type for the wrapped transaction used by Prisma.\n *\n * @remarks Use with `ServerTransaction` as `ServerTransaction<Schema, PrismaTransaction<typeof prisma>>`.\n */\nexport type PrismaTransaction<\n  TClient extends PrismaClientLike = PrismaClientLike,\n> =\n  TClient extends PrismaClientLike<infer TTransaction>\n    ? TTransaction\n    : PrismaTransactionLike;\n\nexport class PrismaConnection<\n  TClient extends PrismaClientLike,\n> implements DBConnection<PrismaTransaction<TClient>> {\n  readonly #client: TClient;\n\n  constructor(client: TClient) {\n    this.#client = client;\n  }\n\n  transaction<T>(\n    fn: (tx: DBTransaction<PrismaTransaction<TClient>>) => Promise<T>,\n  ): Promise<T> {\n    return this.#client.$transaction(prismaTx =>\n      fn(\n        new PrismaInternalTransaction(prismaTx) as DBTransaction<\n          PrismaTransaction<TClient>\n        >,\n      ),\n    );\n  }\n}\n\nclass PrismaInternalTransaction<\n  TTransaction extends PrismaTransactionLike,\n> implements DBTransaction<TTransaction> {\n  readonly wrappedTransaction: TTransaction;\n\n  constructor(prismaTx: TTransaction) {\n    this.wrappedTransaction = prismaTx;\n  }\n\n  runQuery<TReturn>(\n    ast: AST,\n    format: Format,\n    schema: Schema,\n    serverSchema: ServerSchema,\n  ): Promise<HumanReadable<TReturn>> {\n    return executePostgresQuery<TReturn>(\n      this,\n      ast,\n      format,\n      schema,\n      serverSchema,\n    );\n  }\n\n  async query(sql: string, params: unknown[]): Promise<Iterable<Row>> {\n    const result = await this.wrappedTransaction.$queryRawUnsafe(\n      sql,\n      ...params,\n    );\n    return toIterableRows(result);\n  }\n}\n\nfunction isIterable(value: unknown): value is Iterable<unknown> {\n  return (\n    // oxlint-disable-next-line eqeqeq\n    value != null &&\n    typeof (value as Iterable<unknown>)[Symbol.iterator] === 'function'\n  );\n}\n\nfunction toIterableRows(result: unknown): Iterable<Row> {\n  if (result === null || result === undefined) {\n    return [] as Row[];\n  }\n  if (Array.isArray(result)) {\n    return result as Row[];\n  }\n  if (isIterable(result)) {\n    return result as Iterable<Row>;\n  }\n  return [] as Row[];\n}\n\n/**\n * Wrap a Prisma client for Zero ZQL.\n *\n * Provides ZQL querying plus access to the underlying Prisma transaction.\n * Use {@link PrismaTransaction} to type your server mutator transaction.\n *\n * @param schema - Zero schema.\n * @param client - Prisma client.\n *\n * @example\n * ```ts\n * import {PrismaPg} from '@prisma/adapter-pg';\n * import {PrismaClient} from '@prisma/client';\n * import {defineMutator, defineMutators} from '@rocicorp/zero';\n * import {zeroPrisma} from '@rocicorp/zero/server/adapters/prisma';\n * import {z} from 'zod/mini';\n *\n * const prisma = new PrismaClient({\n *   adapter: new PrismaPg({connectionString: process.env.ZERO_UPSTREAM_DB!}),\n * });\n * const zql = zeroPrisma(schema, prisma);\n *\n * export const serverMutators = defineMutators({\n *   user: {\n *     create: defineMutator(\n *       z.object({id: z.string(), name: z.string()}),\n *       async ({tx, args}) => {\n *         if (tx.location !== 'server') {\n *           throw new Error('Server-only mutator');\n *         }\n *         await tx.dbTransaction.wrappedTransaction.user.create({\n *           data: {\n *             id: args.id,\n *             name: args.name,\n *             status: 'active',\n *           },\n *         });\n *       },\n *     ),\n *   },\n * });\n * ```\n */\nexport function zeroPrisma<\n  TSchema extends Schema,\n  TClient extends PrismaClientLike,\n>(\n  schema: TSchema,\n  client: TClient,\n): ZQLDatabase<TSchema, PrismaTransaction<TClient>> {\n  return new ZQLDatabase(new PrismaConnection(client), schema);\n}\n"],"mappings":";;;AAqCA,IAAa,mBAAb,MAEsD;CACpD;CAEA,YAAY,QAAiB;EAC3B,KAAKA,UAAU;CACjB;CAEA,YACE,IACY;EACZ,OAAO,KAAKA,QAAQ,cAAa,aAC/B,GACE,IAAI,0BAA0B,QAAQ,CAGxC,CACF;CACF;AACF;AAEA,IAAM,4BAAN,MAEyC;CACvC;CAEA,YAAY,UAAwB;EAClC,KAAK,qBAAqB;CAC5B;CAEA,SACE,KACA,QACA,QACA,cACiC;EACjC,OAAO,qBACL,MACA,KACA,QACA,QACA,YACF;CACF;CAEA,MAAM,MAAM,KAAa,QAA2C;EAKlE,OAAO,eAAe,MAJD,KAAK,mBAAmB,gBAC3C,KACA,GAAG,MACL,CAC4B;CAC9B;AACF;AAEA,SAAS,WAAW,OAA4C;CAC9D,OAEE,SAAS,QACT,OAAQ,MAA4B,OAAO,cAAc;AAE7D;AAEA,SAAS,eAAe,QAAgC;CACtD,IAAI,WAAW,QAAQ,WAAW,KAAA,GAChC,OAAO,CAAC;CAEV,IAAI,MAAM,QAAQ,MAAM,GACtB,OAAO;CAET,IAAI,WAAW,MAAM,GACnB,OAAO;CAET,OAAO,CAAC;AACV;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6CA,SAAgB,WAId,QACA,QACkD;CAClD,OAAO,IAAI,YAAY,IAAI,iBAAiB,MAAM,GAAG,MAAM;AAC7D"}
+{"version":3,"file":"prisma.js","names":["#client"],"sources":["../../../../../zero-server/src/adapters/prisma.ts"],"sourcesContent":["import type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {Format} from '../../../zero-types/src/format.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../../zero-types/src/server-schema.ts';\nimport type {\n  DBConnection,\n  DBTransaction,\n  Row,\n} from '../../../zql/src/mutate/custom.ts';\nimport type {HumanReadable} from '../../../zql/src/query/query.ts';\nimport {executePostgresQuery} from '../pg-query-executor.ts';\nimport {ZQLDatabase} from '../zql-database.ts';\n\nexport type {ZQLDatabase};\n\nexport type PrismaTransactionLike = {\n  $queryRawUnsafe: (query: string, ...params: unknown[]) => Promise<unknown>;\n};\n\nexport type PrismaClientLike<\n  TTransaction extends PrismaTransactionLike = PrismaTransactionLike,\n> = PrismaTransactionLike & {\n  $transaction: <T>(fn: (tx: TTransaction) => Promise<T>) => Promise<T>;\n};\n\n/**\n * Helper type for the wrapped transaction used by Prisma.\n *\n * @remarks Use with `ServerTransaction` as `ServerTransaction<Schema, PrismaTransaction<typeof prisma>>`.\n */\nexport type PrismaTransaction<\n  TClient extends PrismaClientLike = PrismaClientLike,\n> =\n  TClient extends PrismaClientLike<infer TTransaction>\n    ? TTransaction\n    : PrismaTransactionLike;\n\nexport class PrismaConnection<\n  TClient extends PrismaClientLike,\n> implements DBConnection<PrismaTransaction<TClient>> {\n  readonly #client: TClient;\n\n  constructor(client: TClient) {\n    this.#client = client;\n  }\n\n  query(sql: string, params: unknown[]): Promise<Iterable<Row>> {\n    return prismaQuery(this.#client, sql, params);\n  }\n\n  transaction<T>(\n    fn: (tx: DBTransaction<PrismaTransaction<TClient>>) => Promise<T>,\n  ): Promise<T> {\n    return this.#client.$transaction(prismaTx =>\n      fn(\n        new PrismaInternalTransaction(prismaTx) as DBTransaction<\n          PrismaTransaction<TClient>\n        >,\n      ),\n    );\n  }\n}\n\nclass PrismaInternalTransaction<\n  TTransaction extends PrismaTransactionLike,\n> implements DBTransaction<TTransaction> {\n  readonly wrappedTransaction: TTransaction;\n\n  constructor(prismaTx: TTransaction) {\n    this.wrappedTransaction = prismaTx;\n  }\n\n  runQuery<TReturn>(\n    ast: AST,\n    format: Format,\n    schema: Schema,\n    serverSchema: ServerSchema,\n  ): Promise<HumanReadable<TReturn>> {\n    return executePostgresQuery<TReturn>(\n      this,\n      ast,\n      format,\n      schema,\n      serverSchema,\n    );\n  }\n\n  query(sql: string, params: unknown[]): Promise<Iterable<Row>> {\n    return prismaQuery(this.wrappedTransaction, sql, params);\n  }\n}\n\nasync function prismaQuery(\n  client: PrismaTransactionLike,\n  sql: string,\n  params: unknown[],\n): Promise<Iterable<Row>> {\n  const result = await client.$queryRawUnsafe(sql, ...params);\n  return toIterableRows(result);\n}\n\nfunction isIterable(value: unknown): value is Iterable<unknown> {\n  return (\n    // oxlint-disable-next-line eqeqeq\n    value != null &&\n    typeof (value as Iterable<unknown>)[Symbol.iterator] === 'function'\n  );\n}\n\nfunction toIterableRows(result: unknown): Iterable<Row> {\n  if (result === null || result === undefined) {\n    return [] as Row[];\n  }\n  if (Array.isArray(result)) {\n    return result as Row[];\n  }\n  if (isIterable(result)) {\n    return result as Iterable<Row>;\n  }\n  return [] as Row[];\n}\n\n/**\n * Wrap a Prisma client for Zero ZQL.\n *\n * Provides ZQL querying plus access to the underlying Prisma transaction.\n * Use {@link PrismaTransaction} to type your server mutator transaction.\n *\n * @param schema - Zero schema.\n * @param client - Prisma client.\n *\n * @example\n * ```ts\n * import {PrismaPg} from '@prisma/adapter-pg';\n * import {PrismaClient} from '@prisma/client';\n * import {defineMutator, defineMutators} from '@rocicorp/zero';\n * import {zeroPrisma} from '@rocicorp/zero/server/adapters/prisma';\n * import {z} from 'zod/mini';\n *\n * const prisma = new PrismaClient({\n *   adapter: new PrismaPg({connectionString: process.env.ZERO_UPSTREAM_DB!}),\n * });\n * const zql = zeroPrisma(schema, prisma);\n *\n * export const serverMutators = defineMutators({\n *   user: {\n *     create: defineMutator(\n *       z.object({id: z.string(), name: z.string()}),\n *       async ({tx, args}) => {\n *         if (tx.location !== 'server') {\n *           throw new Error('Server-only mutator');\n *         }\n *         await tx.dbTransaction.wrappedTransaction.user.create({\n *           data: {\n *             id: args.id,\n *             name: args.name,\n *             status: 'active',\n *           },\n *         });\n *       },\n *     ),\n *   },\n * });\n * ```\n */\nexport function zeroPrisma<\n  TSchema extends Schema,\n  TClient extends PrismaClientLike,\n>(\n  schema: TSchema,\n  client: TClient,\n): ZQLDatabase<TSchema, PrismaTransaction<TClient>> {\n  return new ZQLDatabase(new PrismaConnection(client), schema);\n}\n"],"mappings":";;;AAqCA,IAAa,mBAAb,MAEsD;CACpD;CAEA,YAAY,QAAiB;EAC3B,KAAKA,UAAU;CACjB;CAEA,MAAM,KAAa,QAA2C;EAC5D,OAAO,YAAY,KAAKA,SAAS,KAAK,MAAM;CAC9C;CAEA,YACE,IACY;EACZ,OAAO,KAAKA,QAAQ,cAAa,aAC/B,GACE,IAAI,0BAA0B,QAAQ,CAGxC,CACF;CACF;AACF;AAEA,IAAM,4BAAN,MAEyC;CACvC;CAEA,YAAY,UAAwB;EAClC,KAAK,qBAAqB;CAC5B;CAEA,SACE,KACA,QACA,QACA,cACiC;EACjC,OAAO,qBACL,MACA,KACA,QACA,QACA,YACF;CACF;CAEA,MAAM,KAAa,QAA2C;EAC5D,OAAO,YAAY,KAAK,oBAAoB,KAAK,MAAM;CACzD;AACF;AAEA,eAAe,YACb,QACA,KACA,QACwB;CAExB,OAAO,eAAe,MADD,OAAO,gBAAgB,KAAK,GAAG,MAAM,CAC9B;AAC9B;AAEA,SAAS,WAAW,OAA4C;CAC9D,OAEE,SAAS,QACT,OAAQ,MAA4B,OAAO,cAAc;AAE7D;AAEA,SAAS,eAAe,QAAgC;CACtD,IAAI,WAAW,QAAQ,WAAW,KAAA,GAChC,OAAO,CAAC;CAEV,IAAI,MAAM,QAAQ,MAAM,GACtB,OAAO;CAET,IAAI,WAAW,MAAM,GACnB,OAAO;CAET,OAAO,CAAC;AACV;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6CA,SAAgB,WAId,QACA,QACkD;CAClD,OAAO,IAAI,YAAY,IAAI,iBAAiB,MAAM,GAAG,MAAM;AAC7D"}