@rocicorp/zero 1.12.0-canary.1 → 1.12.0-canary.11

package/out/zero-server/src/queries/process-queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-queries.js","names":[],"sources":["../../../../../zero-server/src/queries/process-queries.ts"],"sourcesContent":["import type {LogLevel} from '@rocicorp/logger';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {getErrorDetails, getErrorMessage} from '../../../shared/src/error.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport type {MaybePromise} from '../../../shared/src/types.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {mapAST} from '../../../zero-protocol/src/ast.ts';\nimport {\n  transformRequestMessageSchema,\n  type TransformRequestMessage,\n  type TransformResponseBody,\n} from '../../../zero-protocol/src/custom-queries.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../zero-protocol/src/error-origin.ts';\nimport {ErrorReason} from '../../../zero-protocol/src/error-reason.ts';\nimport type {QueryResponse} from '../../../zero-protocol/src/query-server.ts';\nimport {clientToServer} from '../../../zero-schema/src/name-mapper.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {QueryParseError} from '../../../zql/src/query/error.ts';\nimport {asQueryInternals} from '../../../zql/src/query/query-internals.ts';\nimport type {AnyQuery} from '../../../zql/src/query/query.ts';\nimport {createLogContext} from '../logging.ts';\n\n/**\n * Invokes the callback `cb` for each query in the request or JSON body.\n * The callback should return a Query or Promise<Query> that is the transformed result.\n *\n * This function will call `cb` in parallel for each query found in the request.\n *\n * If you need to limit concurrency, you can use a library like `p-limit` to wrap the `cb` function.\n * @deprecated Use {@link handleQueryRequest} instead.\n */\nexport function handleGetQueriesRequest<S extends Schema>(\n  cb: (\n    name: string,\n    args: readonly ReadonlyJSONValue[],\n  ) => MaybePromise<{query: AnyQuery} | AnyQuery>,\n  schema: S,\n  requestOrJsonBody: Request | ReadonlyJSONValue,\n  logLevel: LogLevel = 'info',\n): Promise<QueryResponse> {\n  return transform(\n    normalizeLegacyQueryRequestArgs(cb, schema, requestOrJsonBody, logLevel),\n    'getQueries',\n  );\n}\n\n/**\n * Invokes the callback `cb` for each query in the request or JSON body.\n * The callback should return a Query or Promise<Query> that is the transformed result.\n *\n * This function will call `cb` in parallel for each query found in the request.\n *\n * If you need to limit concurrency, you can use a library like `p-limit` to wrap the `cb` function.\n * @deprecated Use {@link handleQueryRequest} instead.\n */\nexport function handleTransformRequest<S extends Schema>(\n  cb: (\n    name: string,\n    args: readonly ReadonlyJSONValue[],\n  ) => MaybePromise<{query: AnyQuery} | AnyQuery>,\n  schema: S,\n  requestOrJsonBody: Request | ReadonlyJSONValue,\n  logLevel: LogLevel = 'info',\n): Promise<QueryResponse> {\n  return transform(\n    normalizeLegacyQueryRequestArgs(cb, schema, requestOrJsonBody, logLevel),\n    'transform',\n  );\n}\n\n/**\n * Parsed query params accepted by {@link handleQueryRequest} when the\n * incoming request URL has already been handled by your framework.\n */\nexport type QuerySearchParams = URLSearchParams | Record<string, string>;\n\nexport type HandleQueryRequestArgs<S extends Schema> = {\n  /** Callback that transforms each requested query into a `Query`. */\n  handler: QueryRequestHandler;\n  /** Schema used when building the returned ASTs. */\n  schema: S;\n  /**\n   * Authenticated user ID. Null or undefined means the user is logged out.\n   */\n  userID: string | null | undefined;\n  /** Optional log level for request parsing and execution. */\n  logLevel?: LogLevel | undefined;\n} & (\n  | {\n      /** Fetch request containing the `/query` JSON body. */\n      request: Request;\n    }\n  | {\n      /** Parsed query params from the `/query` request URL. */\n      query: QuerySearchParams;\n      /** Parsed JSON body from the `/query` request. */\n      body: ReadonlyJSONValue;\n    }\n);\n\ntype NormalizedQueryRequestArgs<S extends Schema> = {\n  readonly schema: S;\n  readonly handler: LegacyQueryRequestHandler;\n  // Note: semantics of undefined differ from HandleQueryRequestArgs.userID.\n  // Here, undefined means the app didn't provide a user ID - we do not know if\n  // the user is logged in or not. This is legacy behavior needed to support\n  // deprecated signatures of handleQueryRequest which did not receive userID\n  // from app.\n  readonly userID: string | null | undefined;\n  readonly logLevel: LogLevel;\n} & (\n  | {\n      readonly type: 'request';\n      readonly request: Request;\n    }\n  | {\n      readonly type: 'body';\n      readonly jsonBody: ReadonlyJSONValue;\n    }\n);\n\n/**\n * Process a `/query` request from a Fetch `Request`.\n */\nexport function handleQueryRequest<S extends Schema>(\n  input: HandleQueryRequestArgs<S>,\n): Promise<QueryResponse>;\n\n/**\n * @deprecated Pass a single object instead:\n * `handleQueryRequest({handler, schema, request, userID, logLevel})`.\n */\nexport function handleQueryRequest<S extends Schema>(\n  transformQuery: QueryRequestHandler,\n  schema: S,\n  request: Request,\n  logLevel?: LogLevel,\n): Promise<QueryResponse>;\n\n/**\n * @deprecated Pass a single object instead:\n * `handleQueryRequest({handler, schema, body, userID, logLevel})`.\n */\nexport function handleQueryRequest<S extends Schema>(\n  transformQuery: QueryRequestHandler,\n  schema: S,\n  jsonBody: ReadonlyJSONValue,\n  logLevel?: LogLevel,\n): Promise<QueryResponse>;\n\nexport function handleQueryRequest<S extends Schema>(\n  inputOrTransformQuery: HandleQueryRequestArgs<S> | QueryRequestHandler,\n  schema?: S,\n  requestOrJsonBody?: Request | ReadonlyJSONValue,\n  logLevel?: LogLevel,\n): Promise<QueryResponse> {\n  const normalized =\n    typeof inputOrTransformQuery === 'object' &&\n    'handler' in inputOrTransformQuery\n      ? normalizeQueryRequestInput(inputOrTransformQuery)\n      : normalizeLegacyQueryRequestArgs(\n          wrapQueryRequestHandler(inputOrTransformQuery),\n          schema,\n          requestOrJsonBody,\n          logLevel,\n        );\n\n  return transform(normalized, 'query');\n}\n\nfunction normalizeQueryRequestInput<S extends Schema>(\n  input: HandleQueryRequestArgs<S>,\n): NormalizedQueryRequestArgs<S> {\n  return 'request' in input\n    ? normalizeLegacyQueryRequestArgs(\n        wrapQueryRequestHandler(input.handler),\n        input.schema,\n        input.request,\n        input.logLevel,\n        input.userID ?? null,\n      )\n    : normalizeLegacyQueryRequestArgs(\n        wrapQueryRequestHandler(input.handler),\n        input.schema,\n        input.body,\n        input.logLevel,\n        input.userID ?? null,\n      );\n}\n\nfunction normalizeLegacyQueryRequestArgs<S extends Schema>(\n  handler: LegacyQueryRequestHandler,\n  schema: S | undefined,\n  requestOrJsonBody: Request | ReadonlyJSONValue | undefined,\n  logLevel: LogLevel | undefined,\n  userID?: string | null,\n): NormalizedQueryRequestArgs<S> {\n  assert(\n    typeof schema !== 'undefined',\n    'Schema must be provided when using handleQueryRequest',\n  );\n\n  if (requestOrJsonBody instanceof Request) {\n    return {\n      type: 'request',\n      handler,\n      schema,\n      request: requestOrJsonBody,\n      userID,\n      logLevel: logLevel ?? 'info',\n    };\n  }\n\n  assert(\n    typeof requestOrJsonBody !== 'undefined',\n    'JSON body cannot be undefined',\n  );\n\n  return {\n    type: 'body',\n    handler,\n    schema,\n    jsonBody: requestOrJsonBody,\n    userID,\n    logLevel: logLevel ?? 'info',\n  };\n}\n\nasync function transform<S extends Schema>(\n  args: NormalizedQueryRequestArgs<S>,\n  apiName: 'query' | 'transform' | 'getQueries',\n): Promise<QueryResponse> {\n  const lc = createLogContext(args.logLevel).withContext('TransformRequest');\n  let parsed: TransformRequestMessage;\n  let queryIDs: string[] = [];\n  try {\n    let body: ReadonlyJSONValue;\n    if (args.type === 'request') {\n      body = await args.request.json();\n    } else {\n      body = args.jsonBody;\n    }\n\n    // Strip, so a newer zero-cache can add fields to the request.\n    parsed = v.parse(body, transformRequestMessageSchema, 'strip');\n\n    queryIDs = parsed[1].map(r => r.id);\n  } catch (error) {\n    lc.error?.(`Failed to parse ${apiName} request`, error);\n\n    const message = `Failed to parse ${apiName} request: ${getErrorMessage(error)}`;\n    const details = getErrorDetails(error);\n\n    return {\n      kind: ErrorKind.TransformFailed,\n      origin: ErrorOrigin.Server,\n      reason: ErrorReason.Parse,\n      message,\n      queryIDs,\n      ...(details ? {details} : {}),\n    };\n  }\n\n  try {\n    const nameMapper = clientToServer(args.schema.tables);\n\n    const responses: TransformResponseBody = await Promise.all(\n      parsed[1].map(async req => {\n        let finalQuery: AnyQuery;\n        try {\n          const result = await args.handler(req.name, req.args);\n          finalQuery = 'query' in result ? result.query : result;\n        } catch (error) {\n          const message = getErrorMessage(error);\n          const details = getErrorDetails(error);\n\n          return {\n            error: error instanceof QueryParseError ? 'parse' : 'app',\n            id: req.id,\n            name: req.name,\n            message,\n            ...(details ? {details} : {}),\n          };\n        }\n\n        try {\n          const q = asQueryInternals(finalQuery);\n          const ast = mapAST(q.ast, nameMapper);\n\n          return {\n            id: req.id,\n            name: req.name,\n            ast,\n          };\n        } catch (error) {\n          lc.error?.('Failed to map AST', error);\n          throw error;\n        }\n      }),\n    );\n\n    return {\n      kind: 'QueryResponse',\n      queries: responses,\n      ...(typeof args.userID !== 'undefined' ? {userID: args.userID} : {}),\n    } as const satisfies QueryResponse;\n  } catch (e) {\n    const message = getErrorMessage(e);\n    const details = getErrorDetails(e);\n\n    return {\n      kind: ErrorKind.TransformFailed,\n      origin: ErrorOrigin.Server,\n      reason: ErrorReason.Internal,\n      message,\n      queryIDs,\n      ...(details ? {details} : {}),\n    };\n  }\n}\n\n/**\n * A function that transforms a query by name and arguments into a Query object.\n *\n * @param name - The name of the query (can be dot-separated for nested queries)\n * @param args - The arguments to pass to the query (can be undefined)\n * @returns A Query object\n */\nexport type QueryRequestHandler = (\n  name: string,\n  args: ReadonlyJSONValue | undefined,\n) => AnyQuery;\n\n/** @deprecated Use `QueryRequestHandler` instead. */\nexport type TransformQueryFunction = QueryRequestHandler;\n\nexport type LegacyQueryRequestHandler = (\n  name: string,\n  args: readonly ReadonlyJSONValue[],\n) => MaybePromise<{query: AnyQuery} | AnyQuery>;\n\nfunction wrapQueryRequestHandler(\n  handler: QueryRequestHandler,\n): LegacyQueryRequestHandler {\n  return (name, args) => handler(name, args[0]);\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAgCA,SAAgB,wBACd,IAIA,QACA,mBACA,WAAqB,QACG;CACxB,OAAO,UACL,gCAAgC,IAAI,QAAQ,mBAAmB,QAAQ,GACvE,YACF;AACF;;;;;;;;;;AAWA,SAAgB,uBACd,IAIA,QACA,mBACA,WAAqB,QACG;CACxB,OAAO,UACL,gCAAgC,IAAI,QAAQ,mBAAmB,QAAQ,GACvE,WACF;AACF;AAkFA,SAAgB,mBACd,uBACA,QACA,mBACA,UACwB;CAYxB,OAAO,UAVL,OAAO,0BAA0B,YACjC,aAAa,wBACT,2BAA2B,qBAAqB,IAChD,gCACE,wBAAwB,qBAAqB,GAC7C,QACA,mBACA,QACF,GAEuB,OAAO;AACtC;AAEA,SAAS,2BACP,OAC+B;CAC/B,OAAO,aAAa,QAChB,gCACE,wBAAwB,MAAM,OAAO,GACrC,MAAM,QACN,MAAM,SACN,MAAM,UACN,MAAM,UAAU,IAClB,IACA,gCACE,wBAAwB,MAAM,OAAO,GACrC,MAAM,QACN,MAAM,MACN,MAAM,UACN,MAAM,UAAU,IAClB;AACN;AAEA,SAAS,gCACP,SACA,QACA,mBACA,UACA,QAC+B;CAC/B,OACE,OAAO,WAAW,aAClB,uDACF;CAEA,IAAI,6BAA6B,SAC/B,OAAO;EACL,MAAM;EACN;EACA;EACA,SAAS;EACT;EACA,UAAU,YAAY;CACxB;CAGF,OACE,OAAO,sBAAsB,aAC7B,+BACF;CAEA,OAAO;EACL,MAAM;EACN;EACA;EACA,UAAU;EACV;EACA,UAAU,YAAY;CACxB;AACF;AAEA,eAAe,UACb,MACA,SACwB;CACxB,MAAM,KAAK,iBAAiB,KAAK,QAAQ,EAAE,YAAY,kBAAkB;CACzE,IAAI;CACJ,IAAI,WAAqB,CAAC;CAC1B,IAAI;EACF,IAAI;EACJ,IAAI,KAAK,SAAS,WAChB,OAAO,MAAM,KAAK,QAAQ,KAAK;OAE/B,OAAO,KAAK;EAId,SAAS,MAAQ,MAAM,+BAA+B,OAAO;EAE7D,WAAW,OAAO,GAAG,KAAI,MAAK,EAAE,EAAE;CACpC,SAAS,OAAO;EACd,GAAG,QAAQ,mBAAmB,QAAQ,WAAW,KAAK;EAEtD,MAAM,UAAU,mBAAmB,QAAQ,YAAY,gBAAgB,KAAK;EAC5E,MAAM,UAAU,gBAAgB,KAAK;EAErC,OAAO;GACL,MAAM;GACN,QAAQ;GACR,QAAQ;GACR;GACA;GACA,GAAI,UAAU,EAAC,QAAO,IAAI,CAAC;EAC7B;CACF;CAEA,IAAI;EACF,MAAM,aAAa,eAAe,KAAK,OAAO,MAAM;EAqCpD,OAAO;GACL,MAAM;GACN,SAAS,MArCoC,QAAQ,IACrD,OAAO,GAAG,IAAI,OAAM,QAAO;IACzB,IAAI;IACJ,IAAI;KACF,MAAM,SAAS,MAAM,KAAK,QAAQ,IAAI,MAAM,IAAI,IAAI;KACpD,aAAa,WAAW,SAAS,OAAO,QAAQ;IAClD,SAAS,OAAO;KACd,MAAM,UAAU,gBAAgB,KAAK;KACrC,MAAM,UAAU,gBAAgB,KAAK;KAErC,OAAO;MACL,OAAO,iBAAiB,kBAAkB,UAAU;MACpD,IAAI,IAAI;MACR,MAAM,IAAI;MACV;MACA,GAAI,UAAU,EAAC,QAAO,IAAI,CAAC;KAC7B;IACF;IAEA,IAAI;KAEF,MAAM,MAAM,OADF,iBAAiB,UACR,EAAE,KAAK,UAAU;KAEpC,OAAO;MACL,IAAI,IAAI;MACR,MAAM,IAAI;MACV;KACF;IACF,SAAS,OAAO;KACd,GAAG,QAAQ,qBAAqB,KAAK;KACrC,MAAM;IACR;GACF,CAAC,CACH;GAKE,GAAI,OAAO,KAAK,WAAW,cAAc,EAAC,QAAQ,KAAK,OAAM,IAAI,CAAC;EACpE;CACF,SAAS,GAAG;EACV,MAAM,UAAU,gBAAgB,CAAC;EACjC,MAAM,UAAU,gBAAgB,CAAC;EAEjC,OAAO;GACL,MAAM;GACN,QAAQ;GACR,QAAQ;GACR;GACA;GACA,GAAI,UAAU,EAAC,QAAO,IAAI,CAAC;EAC7B;CACF;AACF;AAsBA,SAAS,wBACP,SAC2B;CAC3B,QAAQ,MAAM,SAAS,QAAQ,MAAM,KAAK,EAAE;AAC9C"}
+{"version":3,"file":"process-queries.js","names":["v.parse","ErrorKind.TransformFailed","ErrorOrigin.Server","ErrorReason.Parse","ErrorReason.Internal"],"sources":["../../../../../zero-server/src/queries/process-queries.ts"],"sourcesContent":["import type {LogLevel} from '@rocicorp/logger';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {getErrorDetails, getErrorMessage} from '../../../shared/src/error.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport type {MaybePromise} from '../../../shared/src/types.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {mapAST} from '../../../zero-protocol/src/ast.ts';\nimport {\n  transformRequestMessageSchema,\n  type TransformRequestMessage,\n  type TransformResponseBody,\n} from '../../../zero-protocol/src/custom-queries.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../zero-protocol/src/error-origin.ts';\nimport {ErrorReason} from '../../../zero-protocol/src/error-reason.ts';\nimport type {QueryResponse} from '../../../zero-protocol/src/query-server.ts';\nimport {clientToServer} from '../../../zero-schema/src/name-mapper.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {QueryParseError} from '../../../zql/src/query/error.ts';\nimport {asQueryInternals} from '../../../zql/src/query/query-internals.ts';\nimport type {AnyQuery} from '../../../zql/src/query/query.ts';\nimport {createLogContext} from '../logging.ts';\n\n/**\n * Invokes the callback `cb` for each query in the request or JSON body.\n * The callback should return a Query or Promise<Query> that is the transformed result.\n *\n * This function will call `cb` in parallel for each query found in the request.\n *\n * If you need to limit concurrency, you can use a library like `p-limit` to wrap the `cb` function.\n * @deprecated Use {@link handleQueryRequest} instead.\n */\nexport function handleGetQueriesRequest<S extends Schema>(\n  cb: (\n    name: string,\n    args: readonly ReadonlyJSONValue[],\n  ) => MaybePromise<{query: AnyQuery} | AnyQuery>,\n  schema: S,\n  requestOrJsonBody: Request | ReadonlyJSONValue,\n  logLevel: LogLevel = 'info',\n): Promise<QueryResponse> {\n  return transform(\n    normalizeLegacyQueryRequestArgs(cb, schema, requestOrJsonBody, logLevel),\n    'getQueries',\n  );\n}\n\n/**\n * Invokes the callback `cb` for each query in the request or JSON body.\n * The callback should return a Query or Promise<Query> that is the transformed result.\n *\n * This function will call `cb` in parallel for each query found in the request.\n *\n * If you need to limit concurrency, you can use a library like `p-limit` to wrap the `cb` function.\n * @deprecated Use {@link handleQueryRequest} instead.\n */\nexport function handleTransformRequest<S extends Schema>(\n  cb: (\n    name: string,\n    args: readonly ReadonlyJSONValue[],\n  ) => MaybePromise<{query: AnyQuery} | AnyQuery>,\n  schema: S,\n  requestOrJsonBody: Request | ReadonlyJSONValue,\n  logLevel: LogLevel = 'info',\n): Promise<QueryResponse> {\n  return transform(\n    normalizeLegacyQueryRequestArgs(cb, schema, requestOrJsonBody, logLevel),\n    'transform',\n  );\n}\n\n/**\n * Parsed query params accepted by {@link handleQueryRequest} when the\n * incoming request URL has already been handled by your framework.\n */\ntype QuerySearchParams = URLSearchParams | Record<string, string>;\n\nexport type HandleQueryRequestArgs<S extends Schema> = {\n  /** Callback that transforms each requested query into a `Query`. */\n  handler: QueryRequestHandler;\n  /** Schema used when building the returned ASTs. */\n  schema: S;\n  /**\n   * Authenticated user ID. Null or undefined means the user is logged out.\n   */\n  userID: string | null | undefined;\n  /** Optional log level for request parsing and execution. */\n  logLevel?: LogLevel | undefined;\n} & (\n  | {\n      /** Fetch request containing the `/query` JSON body. */\n      request: Request;\n    }\n  | {\n      /** Parsed query params from the `/query` request URL. */\n      query: QuerySearchParams;\n      /** Parsed JSON body from the `/query` request. */\n      body: ReadonlyJSONValue;\n    }\n);\n\ntype NormalizedQueryRequestArgs<S extends Schema> = {\n  readonly schema: S;\n  readonly handler: LegacyQueryRequestHandler;\n  // Note: semantics of undefined differ from HandleQueryRequestArgs.userID.\n  // Here, undefined means the app didn't provide a user ID - we do not know if\n  // the user is logged in or not. This is legacy behavior needed to support\n  // deprecated signatures of handleQueryRequest which did not receive userID\n  // from app.\n  readonly userID: string | null | undefined;\n  readonly logLevel: LogLevel;\n} & (\n  | {\n      readonly type: 'request';\n      readonly request: Request;\n    }\n  | {\n      readonly type: 'body';\n      readonly jsonBody: ReadonlyJSONValue;\n    }\n);\n\n/**\n * Process a `/query` request from a Fetch `Request`.\n */\nexport function handleQueryRequest<S extends Schema>(\n  input: HandleQueryRequestArgs<S>,\n): Promise<QueryResponse>;\n\n/**\n * @deprecated Pass a single object instead:\n * `handleQueryRequest({handler, schema, request, userID, logLevel})`.\n */\nexport function handleQueryRequest<S extends Schema>(\n  transformQuery: QueryRequestHandler,\n  schema: S,\n  request: Request,\n  logLevel?: LogLevel,\n): Promise<QueryResponse>;\n\n/**\n * @deprecated Pass a single object instead:\n * `handleQueryRequest({handler, schema, body, userID, logLevel})`.\n */\nexport function handleQueryRequest<S extends Schema>(\n  transformQuery: QueryRequestHandler,\n  schema: S,\n  jsonBody: ReadonlyJSONValue,\n  logLevel?: LogLevel,\n): Promise<QueryResponse>;\n\nexport function handleQueryRequest<S extends Schema>(\n  inputOrTransformQuery: HandleQueryRequestArgs<S> | QueryRequestHandler,\n  schema?: S,\n  requestOrJsonBody?: Request | ReadonlyJSONValue,\n  logLevel?: LogLevel,\n): Promise<QueryResponse> {\n  const normalized =\n    typeof inputOrTransformQuery === 'object' &&\n    'handler' in inputOrTransformQuery\n      ? normalizeQueryRequestInput(inputOrTransformQuery)\n      : normalizeLegacyQueryRequestArgs(\n          wrapQueryRequestHandler(inputOrTransformQuery),\n          schema,\n          requestOrJsonBody,\n          logLevel,\n        );\n\n  return transform(normalized, 'query');\n}\n\nfunction normalizeQueryRequestInput<S extends Schema>(\n  input: HandleQueryRequestArgs<S>,\n): NormalizedQueryRequestArgs<S> {\n  return 'request' in input\n    ? normalizeLegacyQueryRequestArgs(\n        wrapQueryRequestHandler(input.handler),\n        input.schema,\n        input.request,\n        input.logLevel,\n        input.userID ?? null,\n      )\n    : normalizeLegacyQueryRequestArgs(\n        wrapQueryRequestHandler(input.handler),\n        input.schema,\n        input.body,\n        input.logLevel,\n        input.userID ?? null,\n      );\n}\n\nfunction normalizeLegacyQueryRequestArgs<S extends Schema>(\n  handler: LegacyQueryRequestHandler,\n  schema: S | undefined,\n  requestOrJsonBody: Request | ReadonlyJSONValue | undefined,\n  logLevel: LogLevel | undefined,\n  userID?: string | null,\n): NormalizedQueryRequestArgs<S> {\n  assert(\n    typeof schema !== 'undefined',\n    'Schema must be provided when using handleQueryRequest',\n  );\n\n  if (requestOrJsonBody instanceof Request) {\n    return {\n      type: 'request',\n      handler,\n      schema,\n      request: requestOrJsonBody,\n      userID,\n      logLevel: logLevel ?? 'info',\n    };\n  }\n\n  assert(\n    typeof requestOrJsonBody !== 'undefined',\n    'JSON body cannot be undefined',\n  );\n\n  return {\n    type: 'body',\n    handler,\n    schema,\n    jsonBody: requestOrJsonBody,\n    userID,\n    logLevel: logLevel ?? 'info',\n  };\n}\n\nasync function transform<S extends Schema>(\n  args: NormalizedQueryRequestArgs<S>,\n  apiName: 'query' | 'transform' | 'getQueries',\n): Promise<QueryResponse> {\n  const lc = createLogContext(args.logLevel).withContext('TransformRequest');\n  let parsed: TransformRequestMessage;\n  let queryIDs: string[] = [];\n  try {\n    let body: ReadonlyJSONValue;\n    if (args.type === 'request') {\n      body = await args.request.json();\n    } else {\n      body = args.jsonBody;\n    }\n\n    // Strip, so a newer zero-cache can add fields to the request.\n    parsed = v.parse(body, transformRequestMessageSchema, 'strip');\n\n    queryIDs = parsed[1].map(r => r.id);\n  } catch (error) {\n    lc.error?.(`Failed to parse ${apiName} request`, error);\n\n    const message = `Failed to parse ${apiName} request: ${getErrorMessage(error)}`;\n    const details = getErrorDetails(error);\n\n    return {\n      kind: ErrorKind.TransformFailed,\n      origin: ErrorOrigin.Server,\n      reason: ErrorReason.Parse,\n      message,\n      queryIDs,\n      ...(details ? {details} : {}),\n    };\n  }\n\n  try {\n    const nameMapper = clientToServer(args.schema.tables);\n\n    const responses: TransformResponseBody = await Promise.all(\n      parsed[1].map(async req => {\n        let finalQuery: AnyQuery;\n        try {\n          const result = await args.handler(req.name, req.args);\n          finalQuery = 'query' in result ? result.query : result;\n        } catch (error) {\n          const message = getErrorMessage(error);\n          const details = getErrorDetails(error);\n\n          return {\n            error: error instanceof QueryParseError ? 'parse' : 'app',\n            id: req.id,\n            name: req.name,\n            message,\n            ...(details ? {details} : {}),\n          };\n        }\n\n        try {\n          const q = asQueryInternals(finalQuery);\n          const ast = mapAST(q.ast, nameMapper);\n\n          return {\n            id: req.id,\n            name: req.name,\n            ast,\n          };\n        } catch (error) {\n          lc.error?.('Failed to map AST', error);\n          throw error;\n        }\n      }),\n    );\n\n    return {\n      kind: 'QueryResponse',\n      queries: responses,\n      ...(typeof args.userID !== 'undefined' ? {userID: args.userID} : {}),\n    } as const satisfies QueryResponse;\n  } catch (e) {\n    const message = getErrorMessage(e);\n    const details = getErrorDetails(e);\n\n    return {\n      kind: ErrorKind.TransformFailed,\n      origin: ErrorOrigin.Server,\n      reason: ErrorReason.Internal,\n      message,\n      queryIDs,\n      ...(details ? {details} : {}),\n    };\n  }\n}\n\n/**\n * A function that transforms a query by name and arguments into a Query object.\n *\n * @param name - The name of the query (can be dot-separated for nested queries)\n * @param args - The arguments to pass to the query (can be undefined)\n * @returns A Query object\n */\nexport type QueryRequestHandler = (\n  name: string,\n  args: ReadonlyJSONValue | undefined,\n) => AnyQuery;\n\n/** @deprecated Use `QueryRequestHandler` instead. */\nexport type TransformQueryFunction = QueryRequestHandler;\n\ntype LegacyQueryRequestHandler = (\n  name: string,\n  args: readonly ReadonlyJSONValue[],\n) => MaybePromise<{query: AnyQuery} | AnyQuery>;\n\nfunction wrapQueryRequestHandler(\n  handler: QueryRequestHandler,\n): LegacyQueryRequestHandler {\n  return (name, args) => handler(name, args[0]);\n}\n"],"mappings":"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"}

package/out/zero-server/src/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/schema.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AACxE,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,gCAAgC,CAAC;AAkB9D,wBAAsB,eAAe,CAAC,CAAC,SAAS,MAAM,EACpD,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,CAAC,GACR,OAAO,CAAC,YAAY,CAAC,CAoFvB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,gBAAgB,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,GACvD;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAC,CAiFnC;AAwCD,MAAM,MAAM,0BAA0B,GAClC;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,0BAA0B,EAAE,CAkD9B"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/schema.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AACxE,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,gCAAgC,CAAC;AAoB9D,wBAAsB,eAAe,CAAC,CAAC,SAAS,MAAM,EACpD,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,CAAC,GACR,OAAO,CAAC,YAAY,CAAC,CA2FvB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,gBAAgB,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,GACvD;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAC,CA0FnC;AAwCD,MAAM,MAAM,0BAA0B,GAClC;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,0BAA0B,EAAE,CAkD9B"}

package/out/zero-server/src/schema.js

@@ -32,10 +32,12 @@ async function getServerSchema(queryable, schema) {
 		if ((type === "bpchar" || type === "character" || type === "character varying" || type === "varchar") && row.length) type = `${type}(${row.length})`;
 		else if (type === "character") type = "bpchar";
 		if ((type === "numeric" || type === "decimal") && row.precision !== null && row.scale !== null) type = `${type}(${row.precision}, ${row.scale})`;
+		const typeSchema = (isArray ? row.elemTypenamespace : row.typenamespace) ?? void 0;
 		tableSchema[row.column] = {
 			type,
 			isEnum,
-			isArray
+			isArray,
+			typeSchema
 		};
 	}
 	const errors = checkSchemasAreCompatible(schema, serverSchema);
@@ -47,7 +49,8 @@ async function getServerSchema(queryable, schema) {
 * diffed against the `information_schema` query it replaced.
 */
 function serverSchemaQuery(schemaTablePairs) {
-	return formatPg(sql`
+	const inClause = sql.join(schemaTablePairs.map(([schema, table]) => sql`(${schema}::text, ${table}::text)`), ",");
+	const query = sql`
       SELECT
           n.nspname::text AS schema,
           cl.relname::text AS table,
@@ -76,8 +79,15 @@ function serverSchemaQuery(schemaTablePairs) {
           END AS scale,
           ut.typtype::text AS typtype,
           ut.typname::text AS typename,
+          -- The namespaces of the type names above. They let the SQL generator
+          -- schema-qualify casts to user-defined types, which would otherwise
+          -- not resolve outside the search_path, or would resolve to a
+          -- pg_catalog type of the same name. These are udt_schema in
+          -- information_schema terms.
+          nut.nspname::text AS "typenamespace",
           CASE WHEN ut.typelem <> 0 THEN et.typtype::text ELSE NULL END AS "elemTyptype",
-          CASE WHEN ut.typelem <> 0 THEN et.typname::text ELSE NULL END AS "elemTypname"
+          CASE WHEN ut.typelem <> 0 THEN et.typname::text ELSE NULL END AS "elemTypname",
+          CASE WHEN ut.typelem <> 0 THEN net.nspname::text ELSE NULL END AS "elemTypenamespace"
       FROM
           pg_catalog.pg_attribute a
       JOIN
@@ -92,6 +102,8 @@ function serverSchemaQuery(schemaTablePairs) {
           pg_catalog.pg_namespace nut ON nut.oid = ut.typnamespace
       LEFT JOIN
           pg_catalog.pg_type et ON et.oid = ut.typelem
+      LEFT JOIN
+          pg_catalog.pg_namespace net ON net.oid = et.typnamespace
       CROSS JOIN LATERAL
           (SELECT CASE WHEN t.typtype = 'd' THEN t.typtypmod ELSE a.atttypmod END AS typmod) tm
       WHERE
@@ -101,8 +113,9 @@ function serverSchemaQuery(schemaTablePairs) {
           AND NOT pg_catalog.pg_is_other_temp_schema(n.oid)
           AND (pg_catalog.pg_has_role(cl.relowner, 'USAGE')
                OR pg_catalog.has_column_privilege(cl.oid, a.attnum, 'SELECT, INSERT, UPDATE, REFERENCES'))
-          AND (n.nspname, cl.relname) IN (${sql.join(schemaTablePairs.map(([schema, table]) => sql`(${schema}::text, ${table}::text)`), ",")})
-    `);
+          AND (n.nspname, cl.relname) IN (${inClause})
+    `;
+	return formatPg(query);
 }
 function makeSchemaIncompatibleErrorMessage(errors) {
 	if (errors.length === 0) return "No schema incompatibilities found.";
@@ -114,9 +127,7 @@ function makeSchemaIncompatibleErrorMessage(errors) {
 		case "missingColumn":
 			messages.push(`Column "${error.column}" in table "${error.table}" is defined in your zero schema but does not exist in the database.`);
 			break;
-		case "typeError":
-			messages.push(`Type mismatch for column "${error.column}" in table "${error.table}": ${error.requiredType === void 0 ? `${error.pgType} is currently unsupported in Zero. Please file a bug at https://bugs.rocicorp.dev/` : `${error.pgType} should be mapped to ${error.requiredType} in Zero not ${error.declaredType}.`}`);
-			break;
+		case "typeError": messages.push(`Type mismatch for column "${error.column}" in table "${error.table}": ${error.requiredType === void 0 ? `${error.pgType} is currently unsupported in Zero. Please file a bug at https://bugs.rocicorp.dev/` : `${error.pgType} should be mapped to ${error.requiredType} in Zero not ${error.declaredType}.`}`);
 	}
 	return [
 		"Schema incompatibility detected between your zero schema definition and the database:",
@@ -164,6 +175,6 @@ function checkSchemasAreCompatible(schema, serverSchema) {
 	return errors;
 }
 //#endregion
-export { getServerSchema };
+export { checkSchemasAreCompatible, getServerSchema, serverSchemaQuery };
 
 //# sourceMappingURL=schema.js.map

package/out/zero-server/src/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","names":[],"sources":["../../../../zero-server/src/schema.ts"],"sourcesContent":["import {assert} from '../../shared/src/asserts.ts';\nimport type {Enum} from '../../shared/src/enum.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport * as PostgresTypeClass from '../../zero-cache/src/db/postgres-type-class-enum.ts';\nimport {dataTypeToZqlValueType} from '../../zero-cache/src/types/pg-data-type.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../zero-types/src/server-schema.ts';\nimport type {Queryable} from '../../zql/src/mutate/custom.ts';\n\ntype PostgresTypeClass = Enum<typeof PostgresTypeClass>;\n\ntype ServerSchemaRow = {\n  schema: string;\n  table: string;\n  column: string;\n  dataType: string;\n  length: string | null;\n  precision: string | null;\n  scale: string | null;\n  typtype: PostgresTypeClass;\n  typename: string;\n  elemTyptype: PostgresTypeClass | null;\n  elemTypname: string | null;\n};\n\nexport async function getServerSchema<S extends Schema>(\n  queryable: Queryable,\n  schema: S,\n): Promise<ServerSchema> {\n  const schemaTablePairs: [string, string][] = Object.values(schema.tables).map(\n    ({name, serverName}) => {\n      let schemaTablePair: [string, string] = ['public', serverName ?? name];\n      if (serverName) {\n        const firstPeriod = serverName.indexOf('.');\n        if (firstPeriod > -1) {\n          schemaTablePair = [\n            serverName.substring(0, firstPeriod),\n            serverName.substring(firstPeriod + 1, serverName.length),\n          ];\n        }\n      }\n      return schemaTablePair;\n    },\n  );\n\n  if (schemaTablePairs.length === 0) {\n    return {}; // No pairs to query for\n  }\n\n  const {text, values} = serverSchemaQuery(schemaTablePairs);\n  const results: Iterable<ServerSchemaRow> = (await queryable.query(\n    text,\n    values,\n  )) as Iterable<ServerSchemaRow>;\n\n  const serverSchema: ServerSchema = {};\n\n  for (const row of results) {\n    const tableName =\n      row.schema === 'public' ? row.table : `${row.schema}.${row.table}`;\n    let tableSchema = serverSchema[tableName];\n    if (!tableSchema) {\n      tableSchema = {};\n      serverSchema[tableName] = tableSchema;\n    }\n    const isArray = row.elemTyptype !== null;\n    const isEnum = (row.elemTyptype ?? row.typtype) === PostgresTypeClass.Enum;\n    let type = row.dataType.toLowerCase();\n    if (isArray) {\n      type = must(\n        row.elemTypname,\n        `Array column \"${row.column}\" in table \"${tableName}\" is missing element type name`,\n      );\n    } else if (isEnum) {\n      type = row.typename;\n    } else if (\n      type === 'user-defined' &&\n      dataTypeToZqlValueType(row.typename, false, false) !== undefined\n    ) {\n      type = row.typename;\n    }\n    if (\n      (type === 'bpchar' ||\n        type === 'character' ||\n        type === 'character varying' ||\n        type === 'varchar') &&\n      row.length\n    ) {\n      type = `${type}(${row.length})`;\n    } else if (type === 'character') {\n      // Without a length `character` means `character(1)`, so, like Postgres's\n      // own format_type, name an unbounded `bpchar` column `bpchar`.\n      type = 'bpchar';\n    }\n    if (\n      (type === 'numeric' || type === 'decimal') &&\n      row.precision !== null &&\n      row.scale !== null\n    ) {\n      type = `${type}(${row.precision}, ${row.scale})`;\n    }\n    tableSchema[row.column] = {\n      type,\n      isEnum,\n      isArray,\n    };\n  }\n\n  const errors = checkSchemasAreCompatible(schema, serverSchema);\n  assert(errors.length === 0, () => makeSchemaIncompatibleErrorMessage(errors));\n\n  return serverSchema;\n}\n\n/**\n * The query behind {@link getServerSchema}, exported so that it can be\n * diffed against the `information_schema` query it replaced.\n */\nexport function serverSchemaQuery(\n  schemaTablePairs: readonly (readonly [string, string])[],\n): {text: string; values: unknown[]} {\n  // Cast all inputs to text and all outputs to text to avoid\n  // any conversions customer's DBTransaction impl has on other types.\n  const inClause = sql.join(\n    schemaTablePairs.map(\n      ([schema, table]) => sql`(${schema}::text, ${table}::text)`,\n    ),\n    ',',\n  );\n  // Read pg_catalog directly instead of information_schema.columns. The view\n  // derives every column it returns through the information_schema._pg_*\n  // functions and a per column privilege check, which is several times slower\n  // than the query below. Server processes run this on the first transaction\n  // they serve, so serverless deployments pay for it on every cold start.\n  //\n  // The expressions below reproduce the parts of the view's definition that we\n  // select, down to the int4 wire types of length, precision and scale: the\n  // _pg_char_max_length / _pg_numeric_precision / _pg_numeric_scale arithmetic,\n  // the single level domain unwrap that data_type and udt_name perform (`ut`),\n  // and the view's own relkind, attnum and privilege filters. pg_type is joined\n  // by OID rather than by udt_name, which additionally avoids duplicate rows\n  // when two schemas declare a type with the same name. The types those\n  // functions special case are named through regtype, which the parser resolves\n  // while planning.\n  const query = sql`\n      SELECT\n          n.nspname::text AS schema,\n          cl.relname::text AS table,\n          a.attname::text AS column,\n          CASE\n              WHEN ut.typelem <> 0 AND ut.typlen = -1 THEN 'ARRAY'\n              WHEN nut.nspname = 'pg_catalog' THEN pg_catalog.format_type(ut.oid, NULL)\n              ELSE 'USER-DEFINED'\n          END::text AS \"dataType\",\n          CASE\n              WHEN tm.typmod = -1 THEN NULL\n              WHEN ut.oid IN ('pg_catalog.bpchar'::regtype, 'pg_catalog.varchar'::regtype) THEN tm.typmod - 4\n              WHEN ut.oid IN ('pg_catalog.bit'::regtype, 'pg_catalog.varbit'::regtype) THEN tm.typmod\n          END AS length,\n          CASE ut.oid\n              WHEN 'pg_catalog.int2'::regtype THEN 16\n              WHEN 'pg_catalog.int4'::regtype THEN 32\n              WHEN 'pg_catalog.int8'::regtype THEN 64\n              WHEN 'pg_catalog.float4'::regtype THEN 24\n              WHEN 'pg_catalog.float8'::regtype THEN 53\n              WHEN 'pg_catalog.numeric'::regtype THEN CASE WHEN tm.typmod = -1 THEN NULL ELSE ((tm.typmod - 4) >> 16) & 65535 END\n          END AS precision,\n          CASE\n              WHEN ut.oid IN ('pg_catalog.int2'::regtype, 'pg_catalog.int4'::regtype, 'pg_catalog.int8'::regtype) THEN 0\n              WHEN ut.oid = 'pg_catalog.numeric'::regtype AND tm.typmod <> -1 THEN (tm.typmod - 4) & 65535\n          END AS scale,\n          ut.typtype::text AS typtype,\n          ut.typname::text AS typename,\n          CASE WHEN ut.typelem <> 0 THEN et.typtype::text ELSE NULL END AS \"elemTyptype\",\n          CASE WHEN ut.typelem <> 0 THEN et.typname::text ELSE NULL END AS \"elemTypname\"\n      FROM\n          pg_catalog.pg_attribute a\n      JOIN\n          pg_catalog.pg_class cl ON cl.oid = a.attrelid\n      JOIN\n          pg_catalog.pg_namespace n ON n.oid = cl.relnamespace\n      JOIN\n          pg_catalog.pg_type t ON t.oid = a.atttypid\n      JOIN\n          pg_catalog.pg_type ut ON ut.oid = CASE WHEN t.typtype = 'd' THEN t.typbasetype ELSE t.oid END\n      JOIN\n          pg_catalog.pg_namespace nut ON nut.oid = ut.typnamespace\n      LEFT JOIN\n          pg_catalog.pg_type et ON et.oid = ut.typelem\n      CROSS JOIN LATERAL\n          (SELECT CASE WHEN t.typtype = 'd' THEN t.typtypmod ELSE a.atttypmod END AS typmod) tm\n      WHERE\n          a.attnum > 0\n          AND NOT a.attisdropped\n          AND cl.relkind IN ('r', 'v', 'f', 'p')\n          AND NOT pg_catalog.pg_is_other_temp_schema(n.oid)\n          AND (pg_catalog.pg_has_role(cl.relowner, 'USAGE')\n               OR pg_catalog.has_column_privilege(cl.oid, a.attnum, 'SELECT, INSERT, UPDATE, REFERENCES'))\n          AND (n.nspname, cl.relname) IN (${inClause})\n    `;\n  return formatPg(query);\n}\n\nfunction makeSchemaIncompatibleErrorMessage(\n  errors: SchemaIncompatibilityError[],\n) {\n  if (errors.length === 0) {\n    return 'No schema incompatibilities found.';\n  }\n\n  const messages: string[] = [];\n\n  for (const error of errors) {\n    switch (error.type) {\n      case 'missingTable':\n        messages.push(\n          `Table \"${error.table}\" is defined in your zero schema but does not exist in the database.`,\n        );\n        break;\n      case 'missingColumn':\n        messages.push(\n          `Column \"${error.column}\" in table \"${error.table}\" is defined in your zero schema but does not exist in the database.`,\n        );\n        break;\n      case 'typeError':\n        messages.push(\n          `Type mismatch for column \"${error.column}\" in table \"${error.table}\": ${error.requiredType === undefined ? `${error.pgType} is currently unsupported in Zero. Please file a bug at https://bugs.rocicorp.dev/` : `${error.pgType} should be mapped to ${error.requiredType} in Zero not ${error.declaredType}.`}`,\n        );\n        break;\n    }\n  }\n\n  return [\n    'Schema incompatibility detected between your zero schema definition and the database:',\n    '',\n    ...messages.map(msg => `  - ${msg}`),\n    '',\n    'Please update your schema definition to match the database or migrate your database to match the schema.',\n  ].join('\\n');\n}\n\nexport type SchemaIncompatibilityError =\n  | {\n      type: 'typeError';\n      table: string;\n      column: string;\n      pgType: string;\n      declaredType: string;\n      requiredType: string | undefined;\n    }\n  | {\n      type: 'missingColumn';\n      table: string;\n      column: string;\n    }\n  | {\n      type: 'missingTable';\n      table: string;\n    };\n\nexport function checkSchemasAreCompatible(\n  schema: Schema,\n  serverSchema: ServerSchema,\n): SchemaIncompatibilityError[] {\n  const errors: SchemaIncompatibilityError[] = [];\n  // Check that all tables in schema exist in serverSchema\n  for (const table of Object.values(schema.tables)) {\n    const serverTableName = table.serverName ?? table.name;\n\n    if (!serverSchema[serverTableName]) {\n      errors.push({\n        type: 'missingTable',\n        table: serverTableName,\n      });\n      continue;\n    }\n\n    // Check that all columns in the table exist in serverSchema\n    for (const [columnName, column] of Object.entries(table.columns)) {\n      const serverColumnName = column.serverName ?? columnName;\n\n      if (!serverSchema[serverTableName][serverColumnName]) {\n        errors.push({\n          type: 'missingColumn',\n          table: serverTableName,\n          column: serverColumnName,\n        });\n        continue;\n      }\n\n      // Check type compatibility\n      const serverColumn = serverSchema[serverTableName][serverColumnName];\n      const declaredType = column.type;\n      const pgType = serverColumn.type;\n      const requiredType = dataTypeToZqlValueType(\n        pgType,\n        serverColumn.isEnum,\n        serverColumn.isArray,\n      );\n      if (requiredType !== declaredType) {\n        errors.push({\n          type: 'typeError',\n          table: serverTableName,\n          column: serverColumnName,\n          pgType,\n          declaredType,\n          requiredType,\n        });\n      }\n    }\n  }\n\n  return errors;\n}\n"],"mappings":"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"}
+{"version":3,"file":"schema.js","names":[],"sources":["../../../../zero-server/src/schema.ts"],"sourcesContent":["import {assert} from '../../shared/src/asserts.ts';\nimport type {Enum} from '../../shared/src/enum.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport * as PostgresTypeClass from '../../zero-cache/src/db/postgres-type-class-enum.ts';\nimport {dataTypeToZqlValueType} from '../../zero-cache/src/types/pg-data-type.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../zero-types/src/server-schema.ts';\nimport type {Queryable} from '../../zql/src/mutate/custom.ts';\n\ntype PostgresTypeClass = Enum<typeof PostgresTypeClass>;\n\ntype ServerSchemaRow = {\n  schema: string;\n  table: string;\n  column: string;\n  dataType: string;\n  length: string | null;\n  precision: string | null;\n  scale: string | null;\n  typtype: PostgresTypeClass;\n  typename: string;\n  typenamespace: string;\n  elemTyptype: PostgresTypeClass | null;\n  elemTypname: string | null;\n  elemTypenamespace: string | null;\n};\n\nexport async function getServerSchema<S extends Schema>(\n  queryable: Queryable,\n  schema: S,\n): Promise<ServerSchema> {\n  const schemaTablePairs: [string, string][] = Object.values(schema.tables).map(\n    ({name, serverName}) => {\n      let schemaTablePair: [string, string] = ['public', serverName ?? name];\n      if (serverName) {\n        const firstPeriod = serverName.indexOf('.');\n        if (firstPeriod > -1) {\n          schemaTablePair = [\n            serverName.substring(0, firstPeriod),\n            serverName.substring(firstPeriod + 1, serverName.length),\n          ];\n        }\n      }\n      return schemaTablePair;\n    },\n  );\n\n  if (schemaTablePairs.length === 0) {\n    return {}; // No pairs to query for\n  }\n\n  const {text, values} = serverSchemaQuery(schemaTablePairs);\n  const results: Iterable<ServerSchemaRow> = (await queryable.query(\n    text,\n    values,\n  )) as Iterable<ServerSchemaRow>;\n\n  const serverSchema: ServerSchema = {};\n\n  for (const row of results) {\n    const tableName =\n      row.schema === 'public' ? row.table : `${row.schema}.${row.table}`;\n    let tableSchema = serverSchema[tableName];\n    if (!tableSchema) {\n      tableSchema = {};\n      serverSchema[tableName] = tableSchema;\n    }\n    const isArray = row.elemTyptype !== null;\n    const isEnum = (row.elemTyptype ?? row.typtype) === PostgresTypeClass.Enum;\n    let type = row.dataType.toLowerCase();\n    if (isArray) {\n      type = must(\n        row.elemTypname,\n        `Array column \"${row.column}\" in table \"${tableName}\" is missing element type name`,\n      );\n    } else if (isEnum) {\n      type = row.typename;\n    } else if (\n      type === 'user-defined' &&\n      dataTypeToZqlValueType(row.typename, false, false) !== undefined\n    ) {\n      type = row.typename;\n    }\n    if (\n      (type === 'bpchar' ||\n        type === 'character' ||\n        type === 'character varying' ||\n        type === 'varchar') &&\n      row.length\n    ) {\n      type = `${type}(${row.length})`;\n    } else if (type === 'character') {\n      // Without a length `character` means `character(1)`, so, like Postgres's\n      // own format_type, name an unbounded `bpchar` column `bpchar`.\n      type = 'bpchar';\n    }\n    if (\n      (type === 'numeric' || type === 'decimal') &&\n      row.precision !== null &&\n      row.scale !== null\n    ) {\n      type = `${type}(${row.precision}, ${row.scale})`;\n    }\n    // The namespace that backs `type`. For arrays `type` holds the element\n    // type name, so we record the element type's namespace; otherwise the\n    // column type's own namespace. This lets the SQL generator schema-qualify\n    // casts to user-defined types (enums, ...).\n    const typeSchema =\n      (isArray ? row.elemTypenamespace : row.typenamespace) ?? undefined;\n    tableSchema[row.column] = {\n      type,\n      isEnum,\n      isArray,\n      typeSchema,\n    };\n  }\n\n  const errors = checkSchemasAreCompatible(schema, serverSchema);\n  assert(errors.length === 0, () => makeSchemaIncompatibleErrorMessage(errors));\n\n  return serverSchema;\n}\n\n/**\n * The query behind {@link getServerSchema}, exported so that it can be\n * diffed against the `information_schema` query it replaced.\n */\nexport function serverSchemaQuery(\n  schemaTablePairs: readonly (readonly [string, string])[],\n): {text: string; values: unknown[]} {\n  // Cast all inputs to text and all outputs to text to avoid\n  // any conversions customer's DBTransaction impl has on other types.\n  const inClause = sql.join(\n    schemaTablePairs.map(\n      ([schema, table]) => sql`(${schema}::text, ${table}::text)`,\n    ),\n    ',',\n  );\n  // Read pg_catalog directly instead of information_schema.columns. The view\n  // derives every column it returns through the information_schema._pg_*\n  // functions and a per column privilege check, which is several times slower\n  // than the query below. Server processes run this on the first transaction\n  // they serve, so serverless deployments pay for it on every cold start.\n  //\n  // The expressions below reproduce the parts of the view's definition that we\n  // select, down to the int4 wire types of length, precision and scale: the\n  // _pg_char_max_length / _pg_numeric_precision / _pg_numeric_scale arithmetic,\n  // the single level domain unwrap that data_type and udt_name perform (`ut`),\n  // and the view's own relkind, attnum and privilege filters. pg_type is joined\n  // by OID rather than by udt_name, which additionally avoids duplicate rows\n  // when two schemas declare a type with the same name. The types those\n  // functions special case are named through regtype, which the parser resolves\n  // while planning.\n  const query = sql`\n      SELECT\n          n.nspname::text AS schema,\n          cl.relname::text AS table,\n          a.attname::text AS column,\n          CASE\n              WHEN ut.typelem <> 0 AND ut.typlen = -1 THEN 'ARRAY'\n              WHEN nut.nspname = 'pg_catalog' THEN pg_catalog.format_type(ut.oid, NULL)\n              ELSE 'USER-DEFINED'\n          END::text AS \"dataType\",\n          CASE\n              WHEN tm.typmod = -1 THEN NULL\n              WHEN ut.oid IN ('pg_catalog.bpchar'::regtype, 'pg_catalog.varchar'::regtype) THEN tm.typmod - 4\n              WHEN ut.oid IN ('pg_catalog.bit'::regtype, 'pg_catalog.varbit'::regtype) THEN tm.typmod\n          END AS length,\n          CASE ut.oid\n              WHEN 'pg_catalog.int2'::regtype THEN 16\n              WHEN 'pg_catalog.int4'::regtype THEN 32\n              WHEN 'pg_catalog.int8'::regtype THEN 64\n              WHEN 'pg_catalog.float4'::regtype THEN 24\n              WHEN 'pg_catalog.float8'::regtype THEN 53\n              WHEN 'pg_catalog.numeric'::regtype THEN CASE WHEN tm.typmod = -1 THEN NULL ELSE ((tm.typmod - 4) >> 16) & 65535 END\n          END AS precision,\n          CASE\n              WHEN ut.oid IN ('pg_catalog.int2'::regtype, 'pg_catalog.int4'::regtype, 'pg_catalog.int8'::regtype) THEN 0\n              WHEN ut.oid = 'pg_catalog.numeric'::regtype AND tm.typmod <> -1 THEN (tm.typmod - 4) & 65535\n          END AS scale,\n          ut.typtype::text AS typtype,\n          ut.typname::text AS typename,\n          -- The namespaces of the type names above. They let the SQL generator\n          -- schema-qualify casts to user-defined types, which would otherwise\n          -- not resolve outside the search_path, or would resolve to a\n          -- pg_catalog type of the same name. These are udt_schema in\n          -- information_schema terms.\n          nut.nspname::text AS \"typenamespace\",\n          CASE WHEN ut.typelem <> 0 THEN et.typtype::text ELSE NULL END AS \"elemTyptype\",\n          CASE WHEN ut.typelem <> 0 THEN et.typname::text ELSE NULL END AS \"elemTypname\",\n          CASE WHEN ut.typelem <> 0 THEN net.nspname::text ELSE NULL END AS \"elemTypenamespace\"\n      FROM\n          pg_catalog.pg_attribute a\n      JOIN\n          pg_catalog.pg_class cl ON cl.oid = a.attrelid\n      JOIN\n          pg_catalog.pg_namespace n ON n.oid = cl.relnamespace\n      JOIN\n          pg_catalog.pg_type t ON t.oid = a.atttypid\n      JOIN\n          pg_catalog.pg_type ut ON ut.oid = CASE WHEN t.typtype = 'd' THEN t.typbasetype ELSE t.oid END\n      JOIN\n          pg_catalog.pg_namespace nut ON nut.oid = ut.typnamespace\n      LEFT JOIN\n          pg_catalog.pg_type et ON et.oid = ut.typelem\n      LEFT JOIN\n          pg_catalog.pg_namespace net ON net.oid = et.typnamespace\n      CROSS JOIN LATERAL\n          (SELECT CASE WHEN t.typtype = 'd' THEN t.typtypmod ELSE a.atttypmod END AS typmod) tm\n      WHERE\n          a.attnum > 0\n          AND NOT a.attisdropped\n          AND cl.relkind IN ('r', 'v', 'f', 'p')\n          AND NOT pg_catalog.pg_is_other_temp_schema(n.oid)\n          AND (pg_catalog.pg_has_role(cl.relowner, 'USAGE')\n               OR pg_catalog.has_column_privilege(cl.oid, a.attnum, 'SELECT, INSERT, UPDATE, REFERENCES'))\n          AND (n.nspname, cl.relname) IN (${inClause})\n    `;\n  return formatPg(query);\n}\n\nfunction makeSchemaIncompatibleErrorMessage(\n  errors: SchemaIncompatibilityError[],\n) {\n  if (errors.length === 0) {\n    return 'No schema incompatibilities found.';\n  }\n\n  const messages: string[] = [];\n\n  for (const error of errors) {\n    switch (error.type) {\n      case 'missingTable':\n        messages.push(\n          `Table \"${error.table}\" is defined in your zero schema but does not exist in the database.`,\n        );\n        break;\n      case 'missingColumn':\n        messages.push(\n          `Column \"${error.column}\" in table \"${error.table}\" is defined in your zero schema but does not exist in the database.`,\n        );\n        break;\n      case 'typeError':\n        messages.push(\n          `Type mismatch for column \"${error.column}\" in table \"${error.table}\": ${error.requiredType === undefined ? `${error.pgType} is currently unsupported in Zero. Please file a bug at https://bugs.rocicorp.dev/` : `${error.pgType} should be mapped to ${error.requiredType} in Zero not ${error.declaredType}.`}`,\n        );\n        break;\n    }\n  }\n\n  return [\n    'Schema incompatibility detected between your zero schema definition and the database:',\n    '',\n    ...messages.map(msg => `  - ${msg}`),\n    '',\n    'Please update your schema definition to match the database or migrate your database to match the schema.',\n  ].join('\\n');\n}\n\nexport type SchemaIncompatibilityError =\n  | {\n      type: 'typeError';\n      table: string;\n      column: string;\n      pgType: string;\n      declaredType: string;\n      requiredType: string | undefined;\n    }\n  | {\n      type: 'missingColumn';\n      table: string;\n      column: string;\n    }\n  | {\n      type: 'missingTable';\n      table: string;\n    };\n\nexport function checkSchemasAreCompatible(\n  schema: Schema,\n  serverSchema: ServerSchema,\n): SchemaIncompatibilityError[] {\n  const errors: SchemaIncompatibilityError[] = [];\n  // Check that all tables in schema exist in serverSchema\n  for (const table of Object.values(schema.tables)) {\n    const serverTableName = table.serverName ?? table.name;\n\n    if (!serverSchema[serverTableName]) {\n      errors.push({\n        type: 'missingTable',\n        table: serverTableName,\n      });\n      continue;\n    }\n\n    // Check that all columns in the table exist in serverSchema\n    for (const [columnName, column] of Object.entries(table.columns)) {\n      const serverColumnName = column.serverName ?? columnName;\n\n      if (!serverSchema[serverTableName][serverColumnName]) {\n        errors.push({\n          type: 'missingColumn',\n          table: serverTableName,\n          column: serverColumnName,\n        });\n        continue;\n      }\n\n      // Check type compatibility\n      const serverColumn = serverSchema[serverTableName][serverColumnName];\n      const declaredType = column.type;\n      const pgType = serverColumn.type;\n      const requiredType = dataTypeToZqlValueType(\n        pgType,\n        serverColumn.isEnum,\n        serverColumn.isArray,\n      );\n      if (requiredType !== declaredType) {\n        errors.push({\n          type: 'typeError',\n          table: serverTableName,\n          column: serverColumnName,\n          pgType,\n          declaredType,\n          requiredType,\n        });\n      }\n    }\n  }\n\n  return errors;\n}\n"],"mappings":";;;;;AA4BA,eAAsB,gBACpB,WACA,QACuB;CACvB,MAAM,mBAAuC,OAAO,OAAO,OAAO,MAAM,CAAC,CAAC,KACvE,EAAC,MAAM,iBAAgB;EACtB,IAAI,kBAAoC,CAAC,UAAU,cAAc,IAAI;EACrE,IAAI,YAAY;GACd,MAAM,cAAc,WAAW,QAAQ,GAAG;GAC1C,IAAI,cAAc,IAChB,kBAAkB,CAChB,WAAW,UAAU,GAAG,WAAW,GACnC,WAAW,UAAU,cAAc,GAAG,WAAW,MAAM,CACzD;EAEJ;EACA,OAAO;CACT,CACF;CAEA,IAAI,iBAAiB,WAAW,GAC9B,OAAO,CAAC;CAGV,MAAM,EAAC,MAAM,WAAU,kBAAkB,gBAAgB;CACzD,MAAM,UAAsC,MAAM,UAAU,MAC1D,MACA,MACF;CAEA,MAAM,eAA6B,CAAC;CAEpC,KAAK,MAAM,OAAO,SAAS;EACzB,MAAM,YACJ,IAAI,WAAW,WAAW,IAAI,QAAQ,GAAG,IAAI,OAAO,GAAG,IAAI;EAC7D,IAAI,cAAc,aAAa;EAC/B,IAAI,CAAC,aAAa;GAChB,cAAc,CAAC;GACf,aAAa,aAAa;EAC5B;EACA,MAAM,UAAU,IAAI,gBAAgB;EACpC,MAAM,UAAU,IAAI,eAAe,IAAI,aAAa;EACpD,IAAI,OAAO,IAAI,SAAS,YAAY;EACpC,IAAI,SACF,OAAO,KACL,IAAI,aACJ,iBAAiB,IAAI,OAAO,cAAc,UAAU,+BACtD;OACK,IAAI,QACT,OAAO,IAAI;OACN,IACL,SAAS,kBACT,uBAAuB,IAAI,UAAU,OAAO,KAAK,MAAM,KAAA,GAEvD,OAAO,IAAI;EAEb,KACG,SAAS,YACR,SAAS,eACT,SAAS,uBACT,SAAS,cACX,IAAI,QAEJ,OAAO,GAAG,KAAK,GAAG,IAAI,OAAO;OACxB,IAAI,SAAS,aAGlB,OAAO;EAET,KACG,SAAS,aAAa,SAAS,cAChC,IAAI,cAAc,QAClB,IAAI,UAAU,MAEd,OAAO,GAAG,KAAK,GAAG,IAAI,UAAU,IAAI,IAAI,MAAM;EAMhD,MAAM,cACH,UAAU,IAAI,oBAAoB,IAAI,kBAAkB,KAAA;EAC3D,YAAY,IAAI,UAAU;GACxB;GACA;GACA;GACA;EACF;CACF;CAEA,MAAM,SAAS,0BAA0B,QAAQ,YAAY;CAC7D,OAAO,OAAO,WAAW,SAAS,mCAAmC,MAAM,CAAC;CAE5E,OAAO;AACT;;;;;AAMA,SAAgB,kBACd,kBACmC;CAGnC,MAAM,WAAW,IAAI,KACnB,iBAAiB,KACd,CAAC,QAAQ,WAAW,GAAG,IAAI,OAAO,UAAU,MAAM,QACrD,GACA,GACF;CAgBA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4CA+DyB,SAAS;;CAEnD,OAAO,SAAS,KAAK;AACvB;AAEA,SAAS,mCACP,QACA;CACA,IAAI,OAAO,WAAW,GACpB,OAAO;CAGT,MAAM,WAAqB,CAAC;CAE5B,KAAK,MAAM,SAAS,QAClB,QAAQ,MAAM,MAAd;EACE,KAAK;GACH,SAAS,KACP,UAAU,MAAM,MAAM,qEACxB;GACA;EACF,KAAK;GACH,SAAS,KACP,WAAW,MAAM,OAAO,cAAc,MAAM,MAAM,qEACpD;GACA;EACF,KAAK,aACH,SAAS,KACP,6BAA6B,MAAM,OAAO,cAAc,MAAM,MAAM,KAAK,MAAM,iBAAiB,KAAA,IAAY,GAAG,MAAM,OAAO,sFAAsF,GAAG,MAAM,OAAO,uBAAuB,MAAM,aAAa,eAAe,MAAM,aAAa,IAChT;CAEJ;CAGF,OAAO;EACL;EACA;EACA,GAAG,SAAS,KAAI,QAAO,OAAO,KAAK;EACnC;EACA;CACF,CAAC,CAAC,KAAK,IAAI;AACb;AAqBA,SAAgB,0BACd,QACA,cAC8B;CAC9B,MAAM,SAAuC,CAAC;CAE9C,KAAK,MAAM,SAAS,OAAO,OAAO,OAAO,MAAM,GAAG;EAChD,MAAM,kBAAkB,MAAM,cAAc,MAAM;EAElD,IAAI,CAAC,aAAa,kBAAkB;GAClC,OAAO,KAAK;IACV,MAAM;IACN,OAAO;GACT,CAAC;GACD;EACF;EAGA,KAAK,MAAM,CAAC,YAAY,WAAW,OAAO,QAAQ,MAAM,OAAO,GAAG;GAChE,MAAM,mBAAmB,OAAO,cAAc;GAE9C,IAAI,CAAC,aAAa,gBAAgB,CAAC,mBAAmB;IACpD,OAAO,KAAK;KACV,MAAM;KACN,OAAO;KACP,QAAQ;IACV,CAAC;IACD;GACF;GAGA,MAAM,eAAe,aAAa,gBAAgB,CAAC;GACnD,MAAM,eAAe,OAAO;GAC5B,MAAM,SAAS,aAAa;GAC5B,MAAM,eAAe,uBACnB,QACA,aAAa,QACb,aAAa,OACf;GACA,IAAI,iBAAiB,cACnB,OAAO,KAAK;IACV,MAAM;IACN,OAAO;IACP,QAAQ;IACR;IACA;IACA;GACF,CAAC;EAEL;CACF;CAEA,OAAO;AACT"}

package/out/zero-server/src/zql-database.js.map

@@ -1 +1 @@
-{"version":3,"file":"zql-database.js","names":["#crudFactory","#schema","#makeServerTransaction","#runOn"],"sources":["../../../../zero-server/src/zql-database.ts"],"sourcesContent":["import type {MaybePromise} from '../../shared/src/types.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport type {CleanupResultsArg} from '../../zero-protocol/src/mutation.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {\n  DBConnection,\n  DBTransaction,\n  Queryable,\n  RetryPredicate,\n} from '../../zql/src/mutate/custom.ts';\nimport {asQueryInternals} from '../../zql/src/query/query-internals.ts';\nimport type {\n  HumanReadable,\n  Query,\n  RunOptions,\n} from '../../zql/src/query/query.ts';\nimport {ClosableDBTransaction} from './closable-db-transaction.ts';\nimport {CRUDMutatorFactory, type TransactionImpl} from './custom.ts';\nimport {executePostgresQuery} from './pg-query-executor.ts';\nimport type {\n  Database,\n  TransactionProviderHooks,\n  TransactionProviderInput,\n} from './process-mutations.ts';\n\n/**\n * Implements a Database for use with PushProcessor that is backed by Postgres.\n *\n * This implementation also implements the same ZQL interfaces for reading and\n * writing data that the Zero client does, so that mutator functions can be\n * shared across client and server.\n */\nexport class ZQLDatabase<\n  TSchema extends Schema,\n  TWrappedTransaction,\n> implements Database<TransactionImpl<TSchema, TWrappedTransaction>> {\n  readonly connection: DBConnection<TWrappedTransaction>;\n  readonly #crudFactory: CRUDMutatorFactory<TSchema>;\n  readonly #schema: TSchema;\n\n  constructor(connection: DBConnection<TWrappedTransaction>, schema: TSchema) {\n    this.connection = connection;\n    this.#crudFactory = new CRUDMutatorFactory(schema);\n    this.#schema = schema;\n  }\n\n  transaction<R>(\n    callback: (\n      tx: TransactionImpl<TSchema, TWrappedTransaction>,\n      transactionHooks: TransactionProviderHooks,\n    ) => MaybePromise<R>,\n    transactionInput?: TransactionProviderInput,\n  ): Promise<R> {\n    // Icky hack. This is just here to have user not have to do this.\n    // These interfaces need to be factored better.\n    const {\n      upstreamSchema = '',\n      clientGroupID = '',\n      clientID = '',\n      mutationID = 0,\n      addRetryPredicate,\n    } = transactionInput ?? {};\n    return this.connection.transaction(async dbTx => {\n      // What the mutator's `tx` uses. Closed once the callback settles, so a\n      // `tx` that outlives its transaction, such as one captured by a\n      // `tx.retryOn()` predicate, throws instead of reaching a connection\n      // that may already be back in the pool.\n      const mutatorTx = new ClosableDBTransaction(dbTx);\n      try {\n        const zeroTx = await this.#makeServerTransaction(\n          mutatorTx,\n          clientID,\n          mutationID,\n          addRetryPredicate,\n        );\n\n        return await callback(zeroTx, {\n          async updateClientMutationID() {\n            const formatted = formatPg(\n              sql`INSERT INTO ${sql.ident(upstreamSchema)}.clients \n                    as current (\"clientGroupID\", \"clientID\", \"lastMutationID\")\n                        VALUES (${clientGroupID}, ${clientID}, ${1})\n                    ON CONFLICT (\"clientGroupID\", \"clientID\")\n                    DO UPDATE SET \"lastMutationID\" = current.\"lastMutationID\" + 1\n                    RETURNING \"lastMutationID\"`,\n            );\n\n            const [{lastMutationID}] = (await dbTx.query(\n              formatted.text,\n              formatted.values,\n            )) as {lastMutationID: bigint}[];\n\n            return {lastMutationID};\n          },\n\n          async writeMutationResult(result) {\n            const formatted = formatPg(\n              sql`INSERT INTO ${sql.ident(upstreamSchema)}.mutations\n                    (\"clientGroupID\", \"clientID\", \"mutationID\", \"result\")\n                VALUES (${clientGroupID}, ${result.id.clientID}, ${result.id.id}, ${JSON.stringify(\n                  result.result,\n                )}::text::json)`,\n            );\n            await dbTx.query(formatted.text, formatted.values);\n          },\n\n          async deleteMutationResults(args: CleanupResultsArg) {\n            if ('type' in args && args.type === 'bulk') {\n              // Bulk deletion: delete all mutations for multiple clients\n              const formatted = formatPg(\n                sql`DELETE FROM ${sql.ident(upstreamSchema)}.\"mutations\"\n                  WHERE \"clientGroupID\" = ${args.clientGroupID}\n                    AND \"clientID\" = ANY(${args.clientIDs})`,\n              );\n              await dbTx.query(formatted.text, formatted.values);\n            } else {\n              // Single client (explicit 'single' or legacy without type): delete up to mutation ID\n              const formatted = formatPg(\n                sql`DELETE FROM ${sql.ident(upstreamSchema)}.\"mutations\"\n                  WHERE \"clientGroupID\" = ${args.clientGroupID}\n                    AND \"clientID\" = ${args.clientID}\n                    AND \"mutationID\" <= ${args.upToMutationID}`,\n              );\n              await dbTx.query(formatted.text, formatted.values);\n            }\n          },\n        });\n      } finally {\n        mutatorTx.close();\n      }\n    });\n  }\n\n  #makeServerTransaction(\n    dbTx: DBTransaction<TWrappedTransaction>,\n    clientID: string,\n    mutationID: number,\n    addRetryPredicate: ((shouldRetry: RetryPredicate) => void) | undefined,\n  ) {\n    return this.#crudFactory.createTransaction(\n      dbTx,\n      clientID,\n      mutationID,\n      addRetryPredicate,\n    );\n  }\n\n  /**\n   * Runs a single read query.\n   *\n   * When the {@link DBConnection} implements `query`, the compiled SQL is\n   * issued as a bare statement with no `BEGIN`/`COMMIT` around it (plus a\n   * one-time server schema lookup the first time this instance touches the\n   * database). Postgres then releases the statement's locks the moment it\n   * finishes instead of waiting for a `COMMIT` round-trip, which matters in\n   * serverless environments where the process can be frozen or reclaimed\n   * between the query resolving and the `COMMIT` being sent, leaving the\n   * transaction and its locks open indefinitely.\n   *\n   * Because no transaction is opened, any per-transaction setup the adapter\n   * performs inside `transaction` does not apply to these reads. If the\n   * connection does not implement `query`, the read is wrapped in a\n   * transaction as before.\n   *\n   * If you need multiple reads to observe a consistent snapshot, use\n   * {@link transaction} and call `tx.run(...)` for each query instead.\n   */\n  run<TTable extends keyof TSchema['tables'] & string, TReturn>(\n    query: Query<TTable, TSchema, TReturn>,\n    _options?: RunOptions,\n  ): Promise<HumanReadable<TReturn>> {\n    const {connection} = this;\n    if (connection.query) {\n      // TS narrows `connection.query`, not `connection` itself.\n      return this.#runOn(connection as ReadTarget<TWrappedTransaction>, query);\n    }\n    return connection.transaction(dbTx => this.#runOn(dbTx, query));\n  }\n\n  async #runOn<TTable extends keyof TSchema['tables'] & string, TReturn>(\n    target: ReadTarget<TWrappedTransaction>,\n    query: Query<TTable, TSchema, TReturn>,\n  ): Promise<HumanReadable<TReturn>> {\n    const {ast, format} = asQueryInternals(query);\n    const serverSchema = await this.#crudFactory.getOrFetchServerSchema(target);\n    return target.runQuery\n      ? target.runQuery<TReturn>(ast, format, this.#schema, serverSchema)\n      : executePostgresQuery<TReturn>(\n          target,\n          ast,\n          format,\n          this.#schema,\n          serverSchema,\n        );\n  }\n}\n\n/**\n * Something a read can be executed against: a `DBTransaction`, or a\n * `DBConnection` that implements `query`.\n */\ntype ReadTarget<TWrappedTransaction> = Queryable & {\n  runQuery?: DBTransaction<TWrappedTransaction>['runQuery'] | undefined;\n};\n"],"mappings":";;;;;;;;;;;;;AAgCA,IAAa,cAAb,MAGqE;CACnE;CACA;CACA;CAEA,YAAY,YAA+C,QAAiB;EAC1E,KAAK,aAAa;EAClB,KAAKA,eAAe,IAAI,mBAAmB,MAAM;EACjD,KAAKC,UAAU;CACjB;CAEA,YACE,UAIA,kBACY;EAGZ,MAAM,EACJ,iBAAiB,IACjB,gBAAgB,IAChB,WAAW,IACX,aAAa,GACb,sBACE,oBAAoB,CAAC;EACzB,OAAO,KAAK,WAAW,YAAY,OAAM,SAAQ;GAK/C,MAAM,YAAY,IAAI,sBAAsB,IAAI;GAChD,IAAI;IAQF,OAAO,MAAM,SAAS,MAPD,KAAKC,uBACxB,WACA,UACA,YACA,iBACF,GAE8B;KAC5B,MAAM,yBAAyB;MAC7B,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,cAAc,EAAE;;kCAExB,cAAc,IAAI,SAAS,IAAI,EAAE;;;+CAIvD;MAEA,MAAM,CAAC,EAAC,oBAAoB,MAAM,KAAK,MACrC,UAAU,MACV,UAAU,MACZ;MAEA,OAAO,EAAC,eAAc;KACxB;KAEA,MAAM,oBAAoB,QAAQ;MAChC,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,cAAc,EAAE;;0BAEhC,cAAc,IAAI,OAAO,GAAG,SAAS,IAAI,OAAO,GAAG,GAAG,IAAI,KAAK,UACvE,OAAO,MACT,EAAE,cACN;MACA,MAAM,KAAK,MAAM,UAAU,MAAM,UAAU,MAAM;KACnD;KAEA,MAAM,sBAAsB,MAAyB;MACnD,IAAI,UAAU,QAAQ,KAAK,SAAS,QAAQ;OAE1C,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,cAAc,EAAE;4CAChB,KAAK,cAAc;2CACpB,KAAK,UAAU,EAC5C;OACA,MAAM,KAAK,MAAM,UAAU,MAAM,UAAU,MAAM;MACnD,OAAO;OAEL,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,cAAc,EAAE;4CAChB,KAAK,cAAc;uCACxB,KAAK,SAAS;0CACX,KAAK,gBACjC;OACA,MAAM,KAAK,MAAM,UAAU,MAAM,UAAU,MAAM;MACnD;KACF;IACF,CAAC;GACH,UAAU;IACR,UAAU,MAAM;GAClB;EACF,CAAC;CACH;CAEA,uBACE,MACA,UACA,YACA,mBACA;EACA,OAAO,KAAKF,aAAa,kBACvB,MACA,UACA,YACA,iBACF;CACF;;;;;;;;;;;;;;;;;;;;;CAsBA,IACE,OACA,UACiC;EACjC,MAAM,EAAC,eAAc;EACrB,IAAI,WAAW,OAEb,OAAO,KAAKG,OAAO,YAA+C,KAAK;EAEzE,OAAO,WAAW,aAAY,SAAQ,KAAKA,OAAO,MAAM,KAAK,CAAC;CAChE;CAEA,MAAMA,OACJ,QACA,OACiC;EACjC,MAAM,EAAC,KAAK,WAAU,iBAAiB,KAAK;EAC5C,MAAM,eAAe,MAAM,KAAKH,aAAa,uBAAuB,MAAM;EAC1E,OAAO,OAAO,WACV,OAAO,SAAkB,KAAK,QAAQ,KAAKC,SAAS,YAAY,IAChE,qBACE,QACA,KACA,QACA,KAAKA,SACL,YACF;CACN;AACF"}
+{"version":3,"file":"zql-database.js","names":[],"sources":["../../../../zero-server/src/zql-database.ts"],"sourcesContent":["import type {MaybePromise} from '../../shared/src/types.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport type {CleanupResultsArg} from '../../zero-protocol/src/mutation.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {\n  DBConnection,\n  DBTransaction,\n  Queryable,\n  RetryPredicate,\n} from '../../zql/src/mutate/custom.ts';\nimport {asQueryInternals} from '../../zql/src/query/query-internals.ts';\nimport type {\n  HumanReadable,\n  Query,\n  RunOptions,\n} from '../../zql/src/query/query.ts';\nimport {ClosableDBTransaction} from './closable-db-transaction.ts';\nimport {CRUDMutatorFactory, type TransactionImpl} from './custom.ts';\nimport {executePostgresQuery} from './pg-query-executor.ts';\nimport type {\n  Database,\n  TransactionProviderHooks,\n  TransactionProviderInput,\n} from './process-mutations.ts';\n\n/**\n * Implements a Database for use with PushProcessor that is backed by Postgres.\n *\n * This implementation also implements the same ZQL interfaces for reading and\n * writing data that the Zero client does, so that mutator functions can be\n * shared across client and server.\n */\nexport class ZQLDatabase<\n  TSchema extends Schema,\n  TWrappedTransaction,\n> implements Database<TransactionImpl<TSchema, TWrappedTransaction>> {\n  readonly connection: DBConnection<TWrappedTransaction>;\n  readonly #crudFactory: CRUDMutatorFactory<TSchema>;\n  readonly #schema: TSchema;\n\n  constructor(connection: DBConnection<TWrappedTransaction>, schema: TSchema) {\n    this.connection = connection;\n    this.#crudFactory = new CRUDMutatorFactory(schema);\n    this.#schema = schema;\n  }\n\n  transaction<R>(\n    callback: (\n      tx: TransactionImpl<TSchema, TWrappedTransaction>,\n      transactionHooks: TransactionProviderHooks,\n    ) => MaybePromise<R>,\n    transactionInput?: TransactionProviderInput,\n  ): Promise<R> {\n    // Icky hack. This is just here to have user not have to do this.\n    // These interfaces need to be factored better.\n    const {\n      upstreamSchema = '',\n      clientGroupID = '',\n      clientID = '',\n      mutationID = 0,\n      addRetryPredicate,\n    } = transactionInput ?? {};\n    return this.connection.transaction(async dbTx => {\n      // What the mutator's `tx` uses. Closed once the callback settles, so a\n      // `tx` that outlives its transaction, such as one captured by a\n      // `tx.retryOn()` predicate, throws instead of reaching a connection\n      // that may already be back in the pool.\n      const mutatorTx = new ClosableDBTransaction(dbTx);\n      try {\n        const zeroTx = await this.#makeServerTransaction(\n          mutatorTx,\n          clientID,\n          mutationID,\n          addRetryPredicate,\n        );\n\n        return await callback(zeroTx, {\n          async updateClientMutationID() {\n            const formatted = formatPg(\n              sql`INSERT INTO ${sql.ident(upstreamSchema)}.clients \n                    as current (\"clientGroupID\", \"clientID\", \"lastMutationID\")\n                        VALUES (${clientGroupID}, ${clientID}, ${1})\n                    ON CONFLICT (\"clientGroupID\", \"clientID\")\n                    DO UPDATE SET \"lastMutationID\" = current.\"lastMutationID\" + 1\n                    RETURNING \"lastMutationID\"`,\n            );\n\n            const [{lastMutationID}] = (await dbTx.query(\n              formatted.text,\n              formatted.values,\n            )) as {lastMutationID: bigint}[];\n\n            return {lastMutationID};\n          },\n\n          async writeMutationResult(result) {\n            const formatted = formatPg(\n              sql`INSERT INTO ${sql.ident(upstreamSchema)}.mutations\n                    (\"clientGroupID\", \"clientID\", \"mutationID\", \"result\")\n                VALUES (${clientGroupID}, ${result.id.clientID}, ${result.id.id}, ${JSON.stringify(\n                  result.result,\n                )}::text::json)`,\n            );\n            await dbTx.query(formatted.text, formatted.values);\n          },\n\n          async deleteMutationResults(args: CleanupResultsArg) {\n            if ('type' in args && args.type === 'bulk') {\n              // Bulk deletion: delete all mutations for multiple clients\n              const formatted = formatPg(\n                sql`DELETE FROM ${sql.ident(upstreamSchema)}.\"mutations\"\n                  WHERE \"clientGroupID\" = ${args.clientGroupID}\n                    AND \"clientID\" = ANY(${args.clientIDs})`,\n              );\n              await dbTx.query(formatted.text, formatted.values);\n            } else {\n              // Single client (explicit 'single' or legacy without type): delete up to mutation ID\n              const formatted = formatPg(\n                sql`DELETE FROM ${sql.ident(upstreamSchema)}.\"mutations\"\n                  WHERE \"clientGroupID\" = ${args.clientGroupID}\n                    AND \"clientID\" = ${args.clientID}\n                    AND \"mutationID\" <= ${args.upToMutationID}`,\n              );\n              await dbTx.query(formatted.text, formatted.values);\n            }\n          },\n        });\n      } finally {\n        mutatorTx.close();\n      }\n    });\n  }\n\n  #makeServerTransaction(\n    dbTx: DBTransaction<TWrappedTransaction>,\n    clientID: string,\n    mutationID: number,\n    addRetryPredicate: ((shouldRetry: RetryPredicate) => void) | undefined,\n  ) {\n    return this.#crudFactory.createTransaction(\n      dbTx,\n      clientID,\n      mutationID,\n      addRetryPredicate,\n    );\n  }\n\n  /**\n   * Runs a single read query.\n   *\n   * When the {@link DBConnection} implements `query`, the compiled SQL is\n   * issued as a bare statement with no `BEGIN`/`COMMIT` around it (plus a\n   * one-time server schema lookup the first time this instance touches the\n   * database). Postgres then releases the statement's locks the moment it\n   * finishes instead of waiting for a `COMMIT` round-trip, which matters in\n   * serverless environments where the process can be frozen or reclaimed\n   * between the query resolving and the `COMMIT` being sent, leaving the\n   * transaction and its locks open indefinitely.\n   *\n   * Because no transaction is opened, any per-transaction setup the adapter\n   * performs inside `transaction` does not apply to these reads. If the\n   * connection does not implement `query`, the read is wrapped in a\n   * transaction as before.\n   *\n   * If you need multiple reads to observe a consistent snapshot, use\n   * {@link transaction} and call `tx.run(...)` for each query instead.\n   */\n  run<TTable extends keyof TSchema['tables'] & string, TReturn>(\n    query: Query<TTable, TSchema, TReturn>,\n    _options?: RunOptions,\n  ): Promise<HumanReadable<TReturn>> {\n    const {connection} = this;\n    if (connection.query) {\n      // TS narrows `connection.query`, not `connection` itself.\n      return this.#runOn(connection as ReadTarget<TWrappedTransaction>, query);\n    }\n    return connection.transaction(dbTx => this.#runOn(dbTx, query));\n  }\n\n  async #runOn<TTable extends keyof TSchema['tables'] & string, TReturn>(\n    target: ReadTarget<TWrappedTransaction>,\n    query: Query<TTable, TSchema, TReturn>,\n  ): Promise<HumanReadable<TReturn>> {\n    const {ast, format} = asQueryInternals(query);\n    const serverSchema = await this.#crudFactory.getOrFetchServerSchema(target);\n    return target.runQuery\n      ? target.runQuery<TReturn>(ast, format, this.#schema, serverSchema)\n      : executePostgresQuery<TReturn>(\n          target,\n          ast,\n          format,\n          this.#schema,\n          serverSchema,\n        );\n  }\n}\n\n/**\n * Something a read can be executed against: a `DBTransaction`, or a\n * `DBConnection` that implements `query`.\n */\ntype ReadTarget<TWrappedTransaction> = Queryable & {\n  runQuery?: DBTransaction<TWrappedTransaction>['runQuery'] | undefined;\n};\n"],"mappings":";;;;;;;;;;;;;AAgCA,IAAa,cAAb,MAGqE;CACnE;CACA;CACA;CAEA,YAAY,YAA+C,QAAiB;EAC1E,KAAK,aAAa;EAClB,KAAK,eAAe,IAAI,mBAAmB,MAAM;EACjD,KAAK,UAAU;CACjB;CAEA,YACE,UAIA,kBACY;EAGZ,MAAM,EACJ,iBAAiB,IACjB,gBAAgB,IAChB,WAAW,IACX,aAAa,GACb,sBACE,oBAAoB,CAAC;EACzB,OAAO,KAAK,WAAW,YAAY,OAAM,SAAQ;GAK/C,MAAM,YAAY,IAAI,sBAAsB,IAAI;GAChD,IAAI;IAQF,OAAO,MAAM,SAAS,MAPD,KAAK,uBACxB,WACA,UACA,YACA,iBACF,GAE8B;KAC5B,MAAM,yBAAyB;MAC7B,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,cAAc,EAAE;;kCAExB,cAAc,IAAI,SAAS,IAAI,EAAE;;;+CAIvD;MAEA,MAAM,CAAC,EAAC,oBAAoB,MAAM,KAAK,MACrC,UAAU,MACV,UAAU,MACZ;MAEA,OAAO,EAAC,eAAc;KACxB;KAEA,MAAM,oBAAoB,QAAQ;MAChC,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,cAAc,EAAE;;0BAEhC,cAAc,IAAI,OAAO,GAAG,SAAS,IAAI,OAAO,GAAG,GAAG,IAAI,KAAK,UACvE,OAAO,MACT,EAAE,cACN;MACA,MAAM,KAAK,MAAM,UAAU,MAAM,UAAU,MAAM;KACnD;KAEA,MAAM,sBAAsB,MAAyB;MACnD,IAAI,UAAU,QAAQ,KAAK,SAAS,QAAQ;OAE1C,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,cAAc,EAAE;4CAChB,KAAK,cAAc;2CACpB,KAAK,UAAU,EAC5C;OACA,MAAM,KAAK,MAAM,UAAU,MAAM,UAAU,MAAM;MACnD,OAAO;OAEL,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,cAAc,EAAE;4CAChB,KAAK,cAAc;uCACxB,KAAK,SAAS;0CACX,KAAK,gBACjC;OACA,MAAM,KAAK,MAAM,UAAU,MAAM,UAAU,MAAM;MACnD;KACF;IACF,CAAC;GACH,UAAU;IACR,UAAU,MAAM;GAClB;EACF,CAAC;CACH;CAEA,uBACE,MACA,UACA,YACA,mBACA;EACA,OAAO,KAAK,aAAa,kBACvB,MACA,UACA,YACA,iBACF;CACF;;;;;;;;;;;;;;;;;;;;;CAsBA,IACE,OACA,UACiC;EACjC,MAAM,EAAC,eAAc;EACrB,IAAI,WAAW,OAEb,OAAO,KAAK,OAAO,YAA+C,KAAK;EAEzE,OAAO,WAAW,aAAY,SAAQ,KAAK,OAAO,MAAM,KAAK,CAAC;CAChE;CAEA,MAAM,OACJ,QACA,OACiC;EACjC,MAAM,EAAC,KAAK,WAAU,iBAAiB,KAAK;EAC5C,MAAM,eAAe,MAAM,KAAK,aAAa,uBAAuB,MAAM;EAC1E,OAAO,OAAO,WACV,OAAO,SAAkB,KAAK,QAAQ,KAAK,SAAS,YAAY,IAChE,qBACE,QACA,KACA,QACA,KAAK,SACL,YACF;CACN;AACF"}

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

@@ -1,12 +1,12 @@
-import "../../shared/src/asserts.js";
-import "../../shared/src/must.js";
-import "../../zql/src/query/query-internals.js";
-import "../../zql/src/query/query-impl.js";
-import "../../zql/src/query/query-registry.js";
-import "../../zql/src/ivm/skip-yields.js";
-import "../../zql/src/ivm/stream.js";
-import "../../zql/src/ivm/view-apply-change.js";
-import "../../zql/src/query/ttl.js";
-import "../../shared/src/deep-clone.js";
+import { assert, unreachable } from "../../shared/src/asserts.js";
+import { must } from "../../shared/src/must.js";
+import { skipYields } from "../../zql/src/ivm/skip-yields.js";
+import { consume } from "../../zql/src/ivm/stream.js";
+import { asQueryInternals, queryInternalsTag } from "../../zql/src/query/query-internals.js";
+import { newQuery } from "../../zql/src/query/query-impl.js";
+import { addContextToQuery } from "../../zql/src/query/query-registry.js";
+import { applyChange, emptyViewValue, idSymbol, refCountSymbol } from "../../zql/src/ivm/view-apply-change.js";
+import { DEFAULT_TTL_MS } from "../../zql/src/query/ttl.js";
+import { deepClone } from "../../shared/src/deep-clone.js";
 import "../../zero-client/src/client/bindings.js";
-export {};
+export { DEFAULT_TTL_MS, addContextToQuery, applyChange, asQueryInternals, assert, consume, deepClone, emptyViewValue, idSymbol, must, newQuery, queryInternalsTag, refCountSymbol, skipYields, unreachable };

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

@@ -1,5 +1,5 @@
-import "./use-zero.js";
-import "./use-connection-state.js";
-import "./use-query.js";
-import "./use-zero-online.js";
-export {};
+import { ZeroProvider, createUseZero, createZero, useZero } from "./use-zero.js";
+import { useConnectionState } from "./use-connection-state.js";
+import { createQuery, useQuery } from "./use-query.js";
+import { useZeroOnline } from "./use-zero-online.js";
+export { ZeroProvider, createQuery, createUseZero, createZero, useConnectionState, useQuery, useZero, useZeroOnline };

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

@@ -1,9 +1,7 @@
 import { type SetStoreFunction } from 'solid-js/store';
 import { type Change, type Entry, type ErroredQuery, type Format, type Input, type Output, type Query, type QueryResultDetails, type Schema, type TTL } from './zero.ts';
 export type State = [Entry, QueryResultDetails];
-export declare const COMPLETE: QueryResultDetails;
 export declare const UNKNOWN: QueryResultDetails;
-export declare const CACHED: QueryResultDetails;
 /**
  * SolidView bridges Zero's incremental view updates with Solid's reactive
  * store.

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

@@ -1 +1 @@
-{"version":3,"file":"solid-view.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/solid-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAUzE,OAAO,EAEL,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,YAAY,EACjB,KAAK,MAAM,EACX,KAAK,KAAK,EAEV,KAAK,MAAM,EACX,KAAK,KAAK,EAEV,KAAK,kBAAkB,EACvB,KAAK,MAAM,EAEX,KAAK,GAAG,EACT,MAAM,WAAW,CAAC;AAEnB,MAAM,MAAM,KAAK,GAAG,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;AAEhD,eAAO,MAAM,QAAQ,EAAE,kBAAsD,CAAC;AAC9E,eAAO,MAAM,OAAO,EAAE,kBAAqD,CAAC;AAC5E,eAAO,MAAM,MAAM,EAAE,kBAAoD,CAAC;AAE1E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,qBAAa,SAAU,YAAW,MAAM;;IAyBtC,YACE,KAAK,EAAE,KAAK,EACZ,mBAAmB,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,EAC7C,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,IAAI,EACrB,aAAa,EAAE,IAAI,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,EAClD,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAC7B,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,EACjC,KAAK,EAAE,MAAM,IAAI,EAmDlB;IAgBD,OAAO,IAAI,IAAI,CAEd;IAED;;;;;OAKG;IACH,UAAU,IAAI,IAAI,CAIjB;IAED,8EAA8E;IAC9E,YAAY,IAAI,IAAI,CAInB;IAED;;;;;OAKG;IACH,QAAQ,IAAI,IAAI,CAEf;IA+CD,IAAI,CAAC,MAAM,EAAE,MAAM,oBAgBlB;IAyCD,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAExB;CACF;AAsDD,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,EACjC,KAAK,CAAC,EAAE,MAAM,IAAI,IAGhB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,SAAS,MAAM,EACtB,OAAO,UAEC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,SAChC,KAAK,UACJ,MAAM,aACH,MAAM,IAAI,uBACA,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,iBAC9B,IAAI,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,aACvC,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,eAiBhC"}
+{"version":3,"file":"solid-view.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/solid-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAWzE,OAAO,EAEL,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,YAAY,EACjB,KAAK,MAAM,EACX,KAAK,KAAK,EAEV,KAAK,MAAM,EACX,KAAK,KAAK,EAEV,KAAK,kBAAkB,EACvB,KAAK,MAAM,EAEX,KAAK,GAAG,EACT,MAAM,WAAW,CAAC;AAEnB,MAAM,MAAM,KAAK,GAAG,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;AAGhD,eAAO,MAAM,OAAO,EAAE,kBAAqD,CAAC;AAG5E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,qBAAa,SAAU,YAAW,MAAM;;IAyBtC,YACE,KAAK,EAAE,KAAK,EACZ,mBAAmB,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,EAC7C,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,IAAI,EACrB,aAAa,EAAE,IAAI,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,EAClD,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAC7B,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,EACjC,KAAK,EAAE,MAAM,IAAI,EAmDlB;IAgBD,OAAO,IAAI,IAAI,CAEd;IAED;;;;;OAKG;IACH,UAAU,IAAI,IAAI,CAIjB;IAED,8EAA8E;IAC9E,YAAY,IAAI,IAAI,CAInB;IAED;;;;;OAKG;IACH,QAAQ,IAAI,IAAI,CAEf;IA+CD,IAAI,CAAC,MAAM,EAAE,MAAM,oBAgBlB;IAyCD,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAExB;CACF;AAsDD,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,EACjC,KAAK,CAAC,EAAE,MAAM,IAAI,IAGhB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,SAAS,MAAM,EACtB,OAAO,UAEC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,SAChC,KAAK,UACJ,MAAM,aACH,MAAM,IAAI,uBACA,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,iBAC9B,IAAI,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,aACvC,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,eAiBhC"}

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

@@ -1,6 +1,6 @@
-import { emptyArray } from "../../shared/src/sentinels.js";
 import { skipYields } from "../../zql/src/ivm/skip-yields.js";
-import { applyChange, idSymbol } from "../../zql/src/ivm/view-apply-change.js";
+import { emptyArray } from "../../shared/src/sentinels.js";
+import { applyChange, emptyViewValue, idSymbol } from "../../zql/src/ivm/view-apply-change.js";
 import "./zero.js";
 import "./bindings.js";
 import { produce, reconcile } from "solid-js/store";
@@ -165,7 +165,7 @@ var SolidView = class {
 		applyChange(root, change, this.#input.getSchema(), "", this.#format, true, true);
 	}
 	#createEmptyRoot() {
-		return { "": this.#format.singular ? void 0 : [] };
+		return { "": emptyViewValue(this.#format) };
 	}
 	updateTTL(ttl) {
 		this.#updateTTL(ttl);
@@ -219,6 +219,6 @@ function createSolidViewFactory(setState, retry) {
 	return solidViewFactory;
 }
 //#endregion
-export { UNKNOWN, createSolidViewFactory };
+export { SolidView, UNKNOWN, createSolidViewFactory };
 
 //# sourceMappingURL=solid-view.js.map

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

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

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

@@ -11,7 +11,8 @@ function useConnectionState() {
 	const zero = useZero();
 	const [connectionState, setConnectionState] = createSignal(zero().connection.state.current);
 	createEffect(() => {
-		onCleanup(zero().connection.state.subscribe(setConnectionState));
+		const unsubscribe = zero().connection.state.subscribe(setConnectionState);
+		onCleanup(unsubscribe);
 	});
 	return connectionState;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"use-connection-state.js","names":[],"sources":["../../../../zero-solid/src/use-connection-state.ts"],"sourcesContent":["import {createEffect, createSignal, onCleanup, type Accessor} from 'solid-js';\nimport {useZero} from './use-zero.ts';\nimport type {ConnectionState} from './zero.ts';\n\n/**\n * Tracks the connection status of the current Zero instance.\n *\n * @returns The connection status of the Zero instance.\n * @see {@link ConnectionState} for more details on the connection state.\n */\nexport function useConnectionState(): Accessor<ConnectionState> {\n  const zero = useZero();\n\n  const [connectionState, setConnectionState] = createSignal<ConnectionState>(\n    zero().connection.state.current,\n  );\n\n  createEffect(() => {\n    const unsubscribe = zero().connection.state.subscribe(setConnectionState);\n\n    onCleanup(unsubscribe);\n  });\n\n  return connectionState;\n}\n"],"mappings":";;;;;;;;;AAUA,SAAgB,qBAAgD;CAC9D,MAAM,OAAO,QAAQ;CAErB,MAAM,CAAC,iBAAiB,sBAAsB,aAC5C,KAAK,EAAE,WAAW,MAAM,OAC1B;CAEA,mBAAmB;EAGjB,UAFoB,KAAK,EAAE,WAAW,MAAM,UAAU,kBAE5C,CAAW;CACvB,CAAC;CAED,OAAO;AACT"}
+{"version":3,"file":"use-connection-state.js","names":[],"sources":["../../../../zero-solid/src/use-connection-state.ts"],"sourcesContent":["import {createEffect, createSignal, onCleanup, type Accessor} from 'solid-js';\nimport {useZero} from './use-zero.ts';\nimport type {ConnectionState} from './zero.ts';\n\n/**\n * Tracks the connection status of the current Zero instance.\n *\n * @returns The connection status of the Zero instance.\n * @see {@link ConnectionState} for more details on the connection state.\n */\nexport function useConnectionState(): Accessor<ConnectionState> {\n  const zero = useZero();\n\n  const [connectionState, setConnectionState] = createSignal<ConnectionState>(\n    zero().connection.state.current,\n  );\n\n  createEffect(() => {\n    const unsubscribe = zero().connection.state.subscribe(setConnectionState);\n\n    onCleanup(unsubscribe);\n  });\n\n  return connectionState;\n}\n"],"mappings":";;;;;;;;;AAUA,SAAgB,qBAAgD;CAC9D,MAAM,OAAO,QAAQ;CAErB,MAAM,CAAC,iBAAiB,sBAAsB,aAC5C,KAAK,CAAC,CAAC,WAAW,MAAM,OAC1B;CAEA,mBAAmB;EACjB,MAAM,cAAc,KAAK,CAAC,CAAC,WAAW,MAAM,UAAU,kBAAkB;EAExE,UAAU,WAAW;CACvB,CAAC;CAED,OAAO;AACT"}

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

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

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

@@ -11,7 +11,8 @@ function useZeroOnline() {
 	const zero = useZero();
 	const [online, setOnline] = createSignal(zero().online);
 	createEffect(() => {
-		onCleanup(zero().onOnline(setOnline));
+		const unsubscribe = zero().onOnline(setOnline);
+		onCleanup(unsubscribe);
 	});
 	return online;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"use-zero-online.js","names":[],"sources":["../../../../zero-solid/src/use-zero-online.ts"],"sourcesContent":["import {createEffect, createSignal, onCleanup, type Accessor} from 'solid-js';\nimport {useZero} from './use-zero.ts';\n\n/**\n * Tracks the online status of the current Zero instance.\n *\n * @returns An accessor — call `online()` to get a reactive `boolean`.\n * @deprecated Use {@link useConnectionState} instead, which provides more detailed connection state.\n */\nexport function useZeroOnline(): Accessor<boolean> {\n  const zero = useZero();\n\n  const [online, setOnline] = createSignal<boolean>(zero().online);\n\n  createEffect(() => {\n    const unsubscribe = zero().onOnline(setOnline);\n\n    onCleanup(unsubscribe);\n  });\n\n  return online;\n}\n"],"mappings":";;;;;;;;;AASA,SAAgB,gBAAmC;CACjD,MAAM,OAAO,QAAQ;CAErB,MAAM,CAAC,QAAQ,aAAa,aAAsB,KAAK,EAAE,MAAM;CAE/D,mBAAmB;EAGjB,UAFoB,KAAK,EAAE,SAAS,SAE1B,CAAW;CACvB,CAAC;CAED,OAAO;AACT"}
+{"version":3,"file":"use-zero-online.js","names":[],"sources":["../../../../zero-solid/src/use-zero-online.ts"],"sourcesContent":["import {createEffect, createSignal, onCleanup, type Accessor} from 'solid-js';\nimport {useZero} from './use-zero.ts';\n\n/**\n * Tracks the online status of the current Zero instance.\n *\n * @returns An accessor — call `online()` to get a reactive `boolean`.\n * @deprecated Use {@link useConnectionState} instead, which provides more detailed connection state.\n */\nexport function useZeroOnline(): Accessor<boolean> {\n  const zero = useZero();\n\n  const [online, setOnline] = createSignal<boolean>(zero().online);\n\n  createEffect(() => {\n    const unsubscribe = zero().onOnline(setOnline);\n\n    onCleanup(unsubscribe);\n  });\n\n  return online;\n}\n"],"mappings":";;;;;;;;;AASA,SAAgB,gBAAmC;CACjD,MAAM,OAAO,QAAQ;CAErB,MAAM,CAAC,QAAQ,aAAa,aAAsB,KAAK,CAAC,CAAC,MAAM;CAE/D,mBAAmB;EACjB,MAAM,cAAc,KAAK,CAAC,CAAC,SAAS,SAAS;EAE7C,UAAU,WAAW;CACvB,CAAC;CAED,OAAO;AACT"}

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

@@ -7,10 +7,11 @@ var ZeroContext = createContext(void 0);
 * @deprecated Use {@link ZeroProvider} instead of managing your own Zero instance.
 */
 function createZero(options) {
-	return new Zero({
+	const opts = {
 		...options,
 		batchViewUpdates: batch
-	});
+	};
+	return new Zero(opts);
 }
 function useZero() {
 	const zero = useContext(ZeroContext);

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

@@ -1 +1 @@
-{"version":3,"file":"use-zero.js","names":[],"sources":["../../../../zero-solid/src/use-zero.ts"],"sourcesContent":["import {\n  batch,\n  createContext,\n  createEffect,\n  createMemo,\n  createSignal,\n  onCleanup,\n  splitProps,\n  untrack,\n  useContext,\n  type Accessor,\n  type JSX,\n} from 'solid-js';\nimport {\n  Zero,\n  type BaseDefaultContext,\n  type BaseDefaultSchema,\n  type CustomMutatorDefs,\n  type DefaultContext,\n  type DefaultSchema,\n  type ZeroOptions,\n} from './zero.ts';\n\nconst ZeroContext = createContext<\n  // oxlint-disable-next-line no-explicit-any\n  Accessor<Zero<any, any, any>> | undefined\n>(undefined);\n\n/**\n * @deprecated Use {@link ZeroProvider} instead of managing your own Zero instance.\n */\nexport function createZero<\n  S extends BaseDefaultSchema = DefaultSchema,\n  MD extends CustomMutatorDefs | undefined = undefined,\n  Context extends BaseDefaultContext = DefaultContext,\n>(options: ZeroOptions<S, MD, Context>): Zero<S, MD, Context> {\n  const opts = {\n    ...options,\n    batchViewUpdates: batch,\n  };\n  return new Zero<S, MD, Context>(opts);\n}\n\nexport function useZero<\n  S extends BaseDefaultSchema = DefaultSchema,\n  MD extends CustomMutatorDefs | undefined = undefined,\n  Context extends BaseDefaultContext = DefaultContext,\n>(): () => Zero<S, MD, Context> {\n  const zero = useContext(ZeroContext);\n\n  if (zero === undefined) {\n    throw new Error('useZero must be used within a ZeroProvider');\n  }\n  return zero;\n}\n\n/**\n * @deprecated Use {@link useZero} instead, alongside default types defined with:\n *\n * ```ts\n * declare module '@rocicorp/zero' {\n *   interface DefaultTypes {\n *     schema: typeof schema;\n *     context: Context;\n *   }\n * }\n */\nexport function createUseZero<\n  S extends BaseDefaultSchema = DefaultSchema,\n  MD extends CustomMutatorDefs | undefined = undefined,\n  Context extends BaseDefaultContext = DefaultContext,\n>() {\n  return () => useZero<S, MD, Context>();\n}\n\nexport function ZeroProvider<\n  S extends BaseDefaultSchema = DefaultSchema,\n  MD extends CustomMutatorDefs | undefined = undefined,\n  Context extends BaseDefaultContext = DefaultContext,\n>(\n  props: {\n    children: JSX.Element;\n    /**\n     * Called after ZeroProvider constructs a new Zero instance.\n     *\n     * This runs only when the provider creates Zero from options, and is not\n     * called when an existing instance is passed with `zero`.\n     */\n    init?: (zero: Zero<S, MD, Context>) => void;\n  } & (\n    | {\n        zero: Zero<S, MD, Context>;\n      }\n    | ZeroOptions<S, MD, Context>\n  ),\n) {\n  let prevAuth = 'auth' in props ? props.auth : undefined;\n  const [rotationGeneration, setRotationGeneration] = createSignal(0);\n\n  const auth = createMemo(() => ('auth' in props ? props.auth : undefined));\n  const hasAuth = createMemo(() => typeof auth() === 'string');\n\n  const zero = createMemo(() => {\n    rotationGeneration();\n\n    if ('zero' in props) {\n      return props.zero;\n    }\n\n    hasAuth();\n\n    const [local, options] = splitProps(props, ['children', 'auth', 'init']);\n\n    const authValue = untrack(auth);\n    prevAuth = authValue;\n    let rotationRequested = false;\n\n    const scheduleRotation = () => {\n      if (rotationRequested) {\n        return;\n      }\n      rotationRequested = true;\n      setRotationGeneration(gen => gen + 1);\n    };\n\n    const createdZero = new Zero({\n      ...options,\n      ...(authValue !== undefined ? {auth: authValue} : {}),\n      batchViewUpdates: batch,\n      onClientStateNotFound: () => {\n        if (rotationRequested) {\n          return;\n        }\n\n        if (options.onClientStateNotFound) {\n          try {\n            options.onClientStateNotFound();\n            return;\n          } catch {\n            // rotate since zero client is now closed\n          }\n        }\n\n        scheduleRotation();\n      },\n    });\n    local.init?.(createdZero);\n    onCleanup(() => createdZero.close());\n    return createdZero;\n  });\n\n  createEffect(() => {\n    const currentZero = zero();\n    if (!currentZero || 'zero' in props) {\n      return;\n    }\n\n    const currentAuth = auth();\n\n    if (currentAuth !== prevAuth) {\n      const previousAuth = prevAuth;\n      prevAuth = currentAuth;\n\n      if (typeof previousAuth === 'string' && typeof currentAuth === 'string') {\n        void currentZero.connection.connect({auth: currentAuth});\n      }\n    }\n  });\n\n  return ZeroContext.Provider({\n    value: zero,\n    get children() {\n      return props.children;\n    },\n  });\n}\n"],"mappings":";;;;AAuBA,IAAM,cAAc,cAGlB,KAAA,CAAS;;;;AAKX,SAAgB,WAId,SAA4D;CAK5D,OAAO,IAAI,KAAqB;EAH9B,GAAG;EACH,kBAAkB;CAEY,CAAI;AACtC;AAEA,SAAgB,UAIgB;CAC9B,MAAM,OAAO,WAAW,WAAW;CAEnC,IAAI,SAAS,KAAA,GACX,MAAM,IAAI,MAAM,4CAA4C;CAE9D,OAAO;AACT;;;;;;;;;;;;AAaA,SAAgB,gBAIZ;CACF,aAAa,QAAwB;AACvC;AAEA,SAAgB,aAKd,OAeA;CACA,IAAI,WAAW,UAAU,QAAQ,MAAM,OAAO,KAAA;CAC9C,MAAM,CAAC,oBAAoB,yBAAyB,aAAa,CAAC;CAElE,MAAM,OAAO,iBAAkB,UAAU,QAAQ,MAAM,OAAO,KAAA,CAAU;CACxE,MAAM,UAAU,iBAAiB,OAAO,KAAK,MAAM,QAAQ;CAE3D,MAAM,OAAO,iBAAiB;EAC5B,mBAAmB;EAEnB,IAAI,UAAU,OACZ,OAAO,MAAM;EAGf,QAAQ;EAER,MAAM,CAAC,OAAO,WAAW,WAAW,OAAO;GAAC;GAAY;GAAQ;EAAM,CAAC;EAEvE,MAAM,YAAY,QAAQ,IAAI;EAC9B,WAAW;EACX,IAAI,oBAAoB;EAExB,MAAM,yBAAyB;GAC7B,IAAI,mBACF;GAEF,oBAAoB;GACpB,uBAAsB,QAAO,MAAM,CAAC;EACtC;EAEA,MAAM,cAAc,IAAI,KAAK;GAC3B,GAAG;GACH,GAAI,cAAc,KAAA,IAAY,EAAC,MAAM,UAAS,IAAI,CAAC;GACnD,kBAAkB;GAClB,6BAA6B;IAC3B,IAAI,mBACF;IAGF,IAAI,QAAQ,uBACV,IAAI;KACF,QAAQ,sBAAsB;KAC9B;IACF,QAAQ,CAER;IAGF,iBAAiB;GACnB;EACF,CAAC;EACD,MAAM,OAAO,WAAW;EACxB,gBAAgB,YAAY,MAAM,CAAC;EACnC,OAAO;CACT,CAAC;CAED,mBAAmB;EACjB,MAAM,cAAc,KAAK;EACzB,IAAI,CAAC,eAAe,UAAU,OAC5B;EAGF,MAAM,cAAc,KAAK;EAEzB,IAAI,gBAAgB,UAAU;GAC5B,MAAM,eAAe;GACrB,WAAW;GAEX,IAAI,OAAO,iBAAiB,YAAY,OAAO,gBAAgB,UAC7D,YAAiB,WAAW,QAAQ,EAAC,MAAM,YAAW,CAAC;EAE3D;CACF,CAAC;CAED,OAAO,YAAY,SAAS;EAC1B,OAAO;EACP,IAAI,WAAW;GACb,OAAO,MAAM;EACf;CACF,CAAC;AACH"}
+{"version":3,"file":"use-zero.js","names":[],"sources":["../../../../zero-solid/src/use-zero.ts"],"sourcesContent":["import {\n  batch,\n  createContext,\n  createEffect,\n  createMemo,\n  createSignal,\n  onCleanup,\n  splitProps,\n  untrack,\n  useContext,\n  type Accessor,\n  type JSX,\n} from 'solid-js';\nimport {\n  Zero,\n  type BaseDefaultContext,\n  type BaseDefaultSchema,\n  type CustomMutatorDefs,\n  type DefaultContext,\n  type DefaultSchema,\n  type ZeroOptions,\n} from './zero.ts';\n\nconst ZeroContext = createContext<\n  // oxlint-disable-next-line no-explicit-any\n  Accessor<Zero<any, any, any>> | undefined\n>(undefined);\n\n/**\n * @deprecated Use {@link ZeroProvider} instead of managing your own Zero instance.\n */\nexport function createZero<\n  S extends BaseDefaultSchema = DefaultSchema,\n  MD extends CustomMutatorDefs | undefined = undefined,\n  Context extends BaseDefaultContext = DefaultContext,\n>(options: ZeroOptions<S, MD, Context>): Zero<S, MD, Context> {\n  const opts = {\n    ...options,\n    batchViewUpdates: batch,\n  };\n  return new Zero<S, MD, Context>(opts);\n}\n\nexport function useZero<\n  S extends BaseDefaultSchema = DefaultSchema,\n  MD extends CustomMutatorDefs | undefined = undefined,\n  Context extends BaseDefaultContext = DefaultContext,\n>(): () => Zero<S, MD, Context> {\n  const zero = useContext(ZeroContext);\n\n  if (zero === undefined) {\n    throw new Error('useZero must be used within a ZeroProvider');\n  }\n  return zero;\n}\n\n/**\n * @deprecated Use {@link useZero} instead, alongside default types defined with:\n *\n * ```ts\n * declare module '@rocicorp/zero' {\n *   interface DefaultTypes {\n *     schema: typeof schema;\n *     context: Context;\n *   }\n * }\n */\nexport function createUseZero<\n  S extends BaseDefaultSchema = DefaultSchema,\n  MD extends CustomMutatorDefs | undefined = undefined,\n  Context extends BaseDefaultContext = DefaultContext,\n>() {\n  return () => useZero<S, MD, Context>();\n}\n\nexport function ZeroProvider<\n  S extends BaseDefaultSchema = DefaultSchema,\n  MD extends CustomMutatorDefs | undefined = undefined,\n  Context extends BaseDefaultContext = DefaultContext,\n>(\n  props: {\n    children: JSX.Element;\n    /**\n     * Called after ZeroProvider constructs a new Zero instance.\n     *\n     * This runs only when the provider creates Zero from options, and is not\n     * called when an existing instance is passed with `zero`.\n     */\n    init?: (zero: Zero<S, MD, Context>) => void;\n  } & (\n    | {\n        zero: Zero<S, MD, Context>;\n      }\n    | ZeroOptions<S, MD, Context>\n  ),\n) {\n  let prevAuth = 'auth' in props ? props.auth : undefined;\n  const [rotationGeneration, setRotationGeneration] = createSignal(0);\n\n  const auth = createMemo(() => ('auth' in props ? props.auth : undefined));\n  const hasAuth = createMemo(() => typeof auth() === 'string');\n\n  const zero = createMemo(() => {\n    rotationGeneration();\n\n    if ('zero' in props) {\n      return props.zero;\n    }\n\n    hasAuth();\n\n    const [local, options] = splitProps(props, ['children', 'auth', 'init']);\n\n    const authValue = untrack(auth);\n    prevAuth = authValue;\n    let rotationRequested = false;\n\n    const scheduleRotation = () => {\n      if (rotationRequested) {\n        return;\n      }\n      rotationRequested = true;\n      setRotationGeneration(gen => gen + 1);\n    };\n\n    const createdZero = new Zero({\n      ...options,\n      ...(authValue !== undefined ? {auth: authValue} : {}),\n      batchViewUpdates: batch,\n      onClientStateNotFound: () => {\n        if (rotationRequested) {\n          return;\n        }\n\n        if (options.onClientStateNotFound) {\n          try {\n            options.onClientStateNotFound();\n            return;\n          } catch {\n            // rotate since zero client is now closed\n          }\n        }\n\n        scheduleRotation();\n      },\n    });\n    local.init?.(createdZero);\n    onCleanup(() => createdZero.close());\n    return createdZero;\n  });\n\n  createEffect(() => {\n    const currentZero = zero();\n    if (!currentZero || 'zero' in props) {\n      return;\n    }\n\n    const currentAuth = auth();\n\n    if (currentAuth !== prevAuth) {\n      const previousAuth = prevAuth;\n      prevAuth = currentAuth;\n\n      if (typeof previousAuth === 'string' && typeof currentAuth === 'string') {\n        void currentZero.connection.connect({auth: currentAuth});\n      }\n    }\n  });\n\n  return ZeroContext.Provider({\n    value: zero,\n    get children() {\n      return props.children;\n    },\n  });\n}\n"],"mappings":";;;;AAuBA,IAAM,cAAc,cAGlB,KAAA,CAAS;;;;AAKX,SAAgB,WAId,SAA4D;CAC5D,MAAM,OAAO;EACX,GAAG;EACH,kBAAkB;CACpB;CACA,OAAO,IAAI,KAAqB,IAAI;AACtC;AAEA,SAAgB,UAIgB;CAC9B,MAAM,OAAO,WAAW,WAAW;CAEnC,IAAI,SAAS,KAAA,GACX,MAAM,IAAI,MAAM,4CAA4C;CAE9D,OAAO;AACT;;;;;;;;;;;;AAaA,SAAgB,gBAIZ;CACF,aAAa,QAAwB;AACvC;AAEA,SAAgB,aAKd,OAeA;CACA,IAAI,WAAW,UAAU,QAAQ,MAAM,OAAO,KAAA;CAC9C,MAAM,CAAC,oBAAoB,yBAAyB,aAAa,CAAC;CAElE,MAAM,OAAO,iBAAkB,UAAU,QAAQ,MAAM,OAAO,KAAA,CAAU;CACxE,MAAM,UAAU,iBAAiB,OAAO,KAAK,MAAM,QAAQ;CAE3D,MAAM,OAAO,iBAAiB;EAC5B,mBAAmB;EAEnB,IAAI,UAAU,OACZ,OAAO,MAAM;EAGf,QAAQ;EAER,MAAM,CAAC,OAAO,WAAW,WAAW,OAAO;GAAC;GAAY;GAAQ;EAAM,CAAC;EAEvE,MAAM,YAAY,QAAQ,IAAI;EAC9B,WAAW;EACX,IAAI,oBAAoB;EAExB,MAAM,yBAAyB;GAC7B,IAAI,mBACF;GAEF,oBAAoB;GACpB,uBAAsB,QAAO,MAAM,CAAC;EACtC;EAEA,MAAM,cAAc,IAAI,KAAK;GAC3B,GAAG;GACH,GAAI,cAAc,KAAA,IAAY,EAAC,MAAM,UAAS,IAAI,CAAC;GACnD,kBAAkB;GAClB,6BAA6B;IAC3B,IAAI,mBACF;IAGF,IAAI,QAAQ,uBACV,IAAI;KACF,QAAQ,sBAAsB;KAC9B;IACF,QAAQ,CAER;IAGF,iBAAiB;GACnB;EACF,CAAC;EACD,MAAM,OAAO,WAAW;EACxB,gBAAgB,YAAY,MAAM,CAAC;EACnC,OAAO;CACT,CAAC;CAED,mBAAmB;EACjB,MAAM,cAAc,KAAK;EACzB,IAAI,CAAC,eAAe,UAAU,OAC5B;EAGF,MAAM,cAAc,KAAK;EAEzB,IAAI,gBAAgB,UAAU;GAC5B,MAAM,eAAe;GACrB,WAAW;GAEX,IAAI,OAAO,iBAAiB,YAAY,OAAO,gBAAgB,UAC7D,YAAiB,WAAW,QAAQ,EAAC,MAAM,YAAW,CAAC;EAE3D;CACF,CAAC;CAED,OAAO,YAAY,SAAS;EAC1B,OAAO;EACP,IAAI,WAAW;GACb,OAAO,MAAM;EACf;CACF,CAAC;AACH"}