@rocicorp/zero 0.25.0-canary.9 → 0.25.1

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

@@ -1 +1 @@
-{"version":3,"file":"process-mutations.js","sources":["../../../../zero-server/src/process-mutations.ts"],"sourcesContent":["import type {LogContext, 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 {promiseVoid} from '../../shared/src/resolved-promises.ts';\nimport type {MaybePromise} from '../../shared/src/types.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport {MutationAlreadyProcessedError} from '../../zero-cache/src/services/mutagen/error.ts';\nimport type {ApplicationError} from '../../zero-protocol/src/application-error.ts';\nimport {\n  isApplicationError,\n  wrapWithApplicationError,\n} from '../../zero-protocol/src/application-error.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 {PushFailedBody} from '../../zero-protocol/src/error.ts';\nimport {\n  pushBodySchema,\n  pushParamsSchema,\n  type CustomMutation,\n  type Mutation,\n  type MutationID,\n  type MutationResponse,\n  type PushBody,\n  type PushResponse,\n} from '../../zero-protocol/src/push.ts';\nimport type {AnyMutatorRegistry} from '../../zql/src/mutate/mutator-registry.ts';\nimport {isMutator} from '../../zql/src/mutate/mutator.ts';\nimport type {CustomMutatorDefs, CustomMutatorImpl} from './custom.ts';\nimport {createLogContext} from './logging.ts';\n\nexport interface TransactionProviderHooks {\n  updateClientMutationID: () => Promise<{lastMutationID: number | bigint}>;\n  writeMutationResult: (result: MutationResponse) => Promise<void>;\n}\n\nexport interface TransactionProviderInput {\n  upstreamSchema: string;\n  clientGroupID: string;\n  clientID: string;\n  mutationID: number;\n}\n\n/**\n * Defines the abstract interface for a database that PushProcessor can execute\n * transactions against.\n */\nexport interface Database<T> {\n  transaction: <R>(\n    callback: (\n      tx: T,\n      transactionHooks: TransactionProviderHooks,\n    ) => MaybePromise<R>,\n    transactionInput?: TransactionProviderInput,\n  ) => Promise<R>;\n}\n\nexport type ExtractTransactionType<D> = D extends Database<infer T> ? T : never;\nexport type Params = v.Infer<typeof pushParamsSchema>;\n\nexport type TransactFn<\n  D extends Database<ExtractTransactionType<D>>,\n  Context,\n> = (cb: TransactFnCallback<D, Context>) => Promise<MutationResponse>;\n\nexport type TransactFnCallback<\n  D extends Database<ExtractTransactionType<D>>,\n  Context,\n> = (\n  tx: ExtractTransactionType<D>,\n  mutatorName: string,\n  mutatorArgs: ReadonlyJSONValue | undefined,\n  ctx: Context,\n) => Promise<void>;\n\nexport type Parsed<D extends Database<ExtractTransactionType<D>>, Context> = {\n  transact: TransactFn<D, Context>;\n  mutations: CustomMutation[];\n};\n\ntype MutationPhase = 'preTransaction' | 'transactionPending' | 'postCommit';\n\nconst applicationErrorWrapper = async <T>(fn: () => Promise<T>): Promise<T> => {\n  try {\n    return await fn();\n  } catch (error) {\n    if (\n      error instanceof DatabaseTransactionError ||\n      error instanceof OutOfOrderMutation ||\n      error instanceof MutationAlreadyProcessedError ||\n      isApplicationError(error)\n    ) {\n      throw error;\n    }\n\n    throw wrapWithApplicationError(error);\n  }\n};\n\nexport function handleMutationRequest<\n  D extends Database<ExtractTransactionType<D>>,\n  C = undefined,\n>(\n  dbProvider: D,\n  cb: (\n    transact: TransactFn<D, C>,\n    mutation: CustomMutation,\n  ) => Promise<MutationResponse>,\n  queryString: URLSearchParams | Record<string, string>,\n  body: ReadonlyJSONValue,\n  context?: C,\n  logLevel?: LogLevel,\n): Promise<PushResponse>;\n\nexport function handleMutationRequest<\n  D extends Database<ExtractTransactionType<D>>,\n  C = undefined,\n>(\n  dbProvider: D,\n  cb: (\n    transact: TransactFn<D, C>,\n    mutation: CustomMutation,\n  ) => Promise<MutationResponse>,\n  request: Request,\n  context?: C,\n  logLevel?: LogLevel,\n): Promise<PushResponse>;\n\nexport async function handleMutationRequest<\n  D extends Database<ExtractTransactionType<D>>,\n  C,\n>(\n  dbProvider: D,\n  cb: (\n    transact: TransactFn<D, C>,\n    mutation: CustomMutation,\n  ) => Promise<MutationResponse>,\n  queryStringOrRequest: Request | URLSearchParams | Record<string, string>,\n  bodyOrContext: ReadonlyJSONValue | C,\n  contextOrLogLevel?: C | LogLevel,\n  logLevel?: LogLevel,\n): Promise<PushResponse> {\n  // Parse overload arguments\n  const isRequestOverload = queryStringOrRequest instanceof Request;\n\n  let request: Request | undefined;\n  let queryString: URLSearchParams | Record<string, string>;\n  let jsonBody: unknown;\n  let context: C;\n  let lc: LogContext;\n\n  if (isRequestOverload) {\n    request = queryStringOrRequest;\n    context = bodyOrContext as C;\n    const level = (contextOrLogLevel as LogLevel | undefined) ?? 'info';\n\n    // Create log context early, before extracting JSON from Request\n    lc = createLogContext(level).withContext('PushProcessor');\n\n    const url = new URL(request.url);\n    queryString = url.searchParams;\n\n    try {\n      jsonBody = await request.json();\n    } catch (error) {\n      lc.error?.('Failed to parse push body', error);\n      const message = `Failed to parse push body: ${getErrorMessage(error)}`;\n      const details = getErrorDetails(error);\n      return {\n        kind: ErrorKind.PushFailed,\n        origin: ErrorOrigin.Server,\n        reason: ErrorReason.Parse,\n        message,\n        mutationIDs: [],\n        ...(details ? {details} : {}),\n      } as const satisfies PushFailedBody;\n    }\n  } else {\n    queryString = queryStringOrRequest;\n    jsonBody = bodyOrContext;\n    context = contextOrLogLevel as C;\n    const level = logLevel ?? 'info';\n    lc = createLogContext(level).withContext('PushProcessor');\n  }\n\n  let mutationIDs: MutationID[] = [];\n\n  let pushBody: PushBody;\n  try {\n    pushBody = v.parse(jsonBody, pushBodySchema);\n    mutationIDs = pushBody.mutations.map(m => ({\n      id: m.id,\n      clientID: m.clientID,\n    }));\n  } catch (error) {\n    lc.error?.('Failed to parse push body', error);\n    const message = `Failed to parse push body: ${getErrorMessage(error)}`;\n    const details = getErrorDetails(error);\n    return {\n      kind: ErrorKind.PushFailed,\n      origin: ErrorOrigin.Server,\n      reason: ErrorReason.Parse,\n      message,\n      mutationIDs,\n      ...(details ? {details} : {}),\n    } as const satisfies PushFailedBody;\n  }\n\n  let queryParams: Params;\n  try {\n    const queryStringObj =\n      queryString instanceof URLSearchParams\n        ? Object.fromEntries(queryString)\n        : queryString;\n    queryParams = v.parse(queryStringObj, pushParamsSchema, 'passthrough');\n  } catch (error) {\n    lc.error?.('Failed to parse push query parameters', error);\n    const message = `Failed to parse push query parameters: ${getErrorMessage(error)}`;\n    const details = getErrorDetails(error);\n    return {\n      kind: ErrorKind.PushFailed,\n      origin: ErrorOrigin.Server,\n      reason: ErrorReason.Parse,\n      message,\n      mutationIDs,\n      ...(details ? {details} : {}),\n    } as const satisfies PushFailedBody;\n  }\n\n  if (pushBody.pushVersion !== 1) {\n    const response = {\n      kind: ErrorKind.PushFailed,\n      origin: ErrorOrigin.Server,\n      reason: ErrorReason.UnsupportedPushVersion,\n      mutationIDs,\n      message: `Unsupported push version: ${pushBody.pushVersion}`,\n    } as const satisfies PushFailedBody;\n    return response;\n  }\n\n  const responses: MutationResponse[] = [];\n  let processedCount = 0;\n\n  try {\n    const transactor = new Transactor(\n      dbProvider,\n      pushBody,\n      queryParams,\n      lc,\n      context,\n    );\n\n    // Each mutation goes through three phases:\n    //   1. Pre-transaction: user logic that runs before `transact` is called. If\n    //      this throws we still advance LMID and persist the failure result.\n    //   2. Transaction: the callback passed to `transact`, which can be retried\n    //      if it fails with an ApplicationError.\n    //   3. Post-commit: any logic that runs after `transact` resolves. Failures\n    //      here are logged but the mutation remains committed.\n    for (const m of pushBody.mutations) {\n      assert(m.type === 'custom', 'Expected custom mutation');\n      lc.debug?.(\n        `Processing mutation '${m.name}' (id=${m.id}, clientID=${m.clientID})`,\n        m.args,\n      );\n\n      let mutationPhase: MutationPhase = 'preTransaction';\n\n      const transactProxy: TransactFn<D, C> = async innerCb => {\n        mutationPhase = 'transactionPending';\n        const result = await transactor.transact(m, (tx, name, args) =>\n          applicationErrorWrapper(() => innerCb(tx, name, args, context)),\n        );\n        mutationPhase = 'postCommit';\n        return result;\n      };\n\n      try {\n        const res = await applicationErrorWrapper(() => cb(transactProxy, m));\n        responses.push(res);\n        lc.debug?.(`Mutation '${m.name}' (id=${m.id}) completed successfully`);\n\n        processedCount++;\n      } catch (error) {\n        if (!isApplicationError(error)) {\n          throw error;\n        }\n\n        if (mutationPhase === 'preTransaction') {\n          // Pre-transaction\n          await transactor.persistPreTransactionFailure(m, error);\n        } else if (mutationPhase === 'postCommit') {\n          // Post-commit\n          lc.error?.(\n            `Post-commit mutation handler failed for mutation ${m.id} for client ${m.clientID}`,\n            error,\n          );\n        }\n\n        lc.warn?.(\n          `Application error processing mutation ${m.id} for client ${m.clientID}`,\n          error,\n        );\n        responses.push(makeAppErrorResponse(m, error));\n\n        processedCount++;\n      }\n    }\n\n    return {\n      mutations: responses,\n    };\n  } catch (error) {\n    lc.error?.('Failed to process push request', error);\n    // only include mutationIDs for mutations that were not processed\n    const unprocessedMutationIDs = mutationIDs.slice(processedCount);\n\n    const message = getErrorMessage(error);\n    const details = getErrorDetails(error);\n\n    return {\n      kind: ErrorKind.PushFailed,\n      origin: ErrorOrigin.Server,\n      reason:\n        error instanceof OutOfOrderMutation\n          ? ErrorReason.OutOfOrderMutation\n          : error instanceof DatabaseTransactionError\n            ? ErrorReason.Database\n            : ErrorReason.Internal,\n      message,\n      mutationIDs: unprocessedMutationIDs,\n      ...(details ? {details} : {}),\n    };\n  }\n}\n\nclass Transactor<D extends Database<ExtractTransactionType<D>>, Context> {\n  readonly #dbProvider: D;\n  readonly #req: PushBody;\n  readonly #params: Params;\n  readonly #lc: LogContext;\n  readonly #context: Context;\n\n  constructor(\n    dbProvider: D,\n    req: PushBody,\n    params: Params,\n    lc: LogContext,\n    context: Context,\n  ) {\n    this.#dbProvider = dbProvider;\n    this.#req = req;\n    this.#params = params;\n    this.#lc = lc;\n    this.#context = context;\n  }\n\n  transact = async (\n    mutation: CustomMutation,\n    cb: TransactFnCallback<D, Context>,\n  ): Promise<MutationResponse> => {\n    let appError: ApplicationError | undefined = undefined;\n    for (;;) {\n      try {\n        const ret = await this.#transactImpl(mutation, cb, appError);\n        if (appError !== undefined) {\n          this.#lc.warn?.(\n            `Mutation ${mutation.id} for client ${mutation.clientID} was retried after an error`,\n            appError,\n          );\n          return makeAppErrorResponse(mutation, appError);\n        }\n\n        return ret;\n      } catch (error) {\n        if (error instanceof OutOfOrderMutation) {\n          this.#lc.error?.(error);\n          throw error;\n        }\n\n        if (error instanceof MutationAlreadyProcessedError) {\n          this.#lc.warn?.(error);\n          return {\n            id: {\n              clientID: mutation.clientID,\n              id: mutation.id,\n            },\n            result: {\n              error: 'alreadyProcessed',\n              details: error.message,\n            },\n          };\n        }\n\n        if (isApplicationError(error)) {\n          appError = error;\n          this.#lc.warn?.(\n            `Application error processing mutation ${mutation.id} for client ${mutation.clientID}`,\n            appError,\n          );\n          continue;\n        }\n\n        this.#lc.error?.(\n          `Unexpected error processing mutation ${mutation.id} for client ${mutation.clientID}`,\n          error,\n        );\n\n        throw error;\n      }\n    }\n  };\n\n  async persistPreTransactionFailure(\n    mutation: CustomMutation,\n    appError: ApplicationError<ReadonlyJSONValue | undefined>,\n  ): Promise<MutationResponse> {\n    // User-land code threw before calling `transact`. We still need to bump the\n    // LMID for this mutation and persist the error so that the client knows it failed.\n    const ret = await this.#transactImpl(\n      mutation,\n      // noop callback since there's no transaction to execute\n      () => promiseVoid,\n      appError,\n    );\n    return ret;\n  }\n\n  async #transactImpl(\n    mutation: CustomMutation,\n    cb: TransactFnCallback<D, Context>,\n    appError: ApplicationError | undefined,\n  ): Promise<MutationResponse> {\n    let transactionPhase: DatabaseTransactionPhase = 'open';\n\n    try {\n      const ret = await this.#dbProvider.transaction(\n        async (dbTx, transactionHooks) => {\n          // update the transaction phase to 'execute' after the transaction is opened\n          transactionPhase = 'execute';\n\n          await this.#checkAndIncrementLastMutationID(\n            transactionHooks,\n            mutation.clientID,\n            mutation.id,\n          );\n\n          if (appError === undefined) {\n            this.#lc.debug?.(\n              `Executing mutator '${mutation.name}' (id=${mutation.id})`,\n            );\n            try {\n              await cb(dbTx, mutation.name, mutation.args[0], this.#context);\n            } catch (appError) {\n              throw wrapWithApplicationError(appError);\n            }\n          } else {\n            const mutationResult = makeAppErrorResponse(mutation, appError);\n            await transactionHooks.writeMutationResult(mutationResult);\n          }\n\n          return {\n            id: {\n              clientID: mutation.clientID,\n              id: mutation.id,\n            },\n            result: {},\n          };\n        },\n        this.#getTransactionInput(mutation),\n      );\n\n      return ret;\n    } catch (error) {\n      if (\n        isApplicationError(error) ||\n        error instanceof OutOfOrderMutation ||\n        error instanceof MutationAlreadyProcessedError\n      ) {\n        throw error;\n      }\n\n      throw new DatabaseTransactionError(transactionPhase, {cause: error});\n    }\n  }\n\n  #getTransactionInput(mutation: CustomMutation): TransactionProviderInput {\n    return {\n      upstreamSchema: this.#params.schema,\n      clientGroupID: this.#req.clientGroupID,\n      clientID: mutation.clientID,\n      mutationID: mutation.id,\n    };\n  }\n\n  async #checkAndIncrementLastMutationID(\n    transactionHooks: TransactionProviderHooks,\n    clientID: string,\n    receivedMutationID: number,\n  ) {\n    const {lastMutationID} = await transactionHooks.updateClientMutationID();\n\n    if (receivedMutationID < lastMutationID) {\n      throw new MutationAlreadyProcessedError(\n        clientID,\n        receivedMutationID,\n        lastMutationID,\n      );\n    } else if (receivedMutationID > lastMutationID) {\n      throw new OutOfOrderMutation(\n        clientID,\n        receivedMutationID,\n        lastMutationID,\n      );\n    }\n  }\n}\n\nexport class OutOfOrderMutation extends Error {\n  constructor(\n    clientID: string,\n    receivedMutationID: number,\n    lastMutationID: number | bigint,\n  ) {\n    super(\n      `Client ${clientID} sent mutation ID ${receivedMutationID} but expected ${lastMutationID}`,\n    );\n  }\n}\n\nfunction makeAppErrorResponse(\n  m: Mutation,\n  error: ApplicationError<ReadonlyJSONValue | undefined>,\n): MutationResponse {\n  return {\n    id: {\n      clientID: m.clientID,\n      id: m.id,\n    },\n    result: {\n      error: 'app',\n      message: error.message,\n      ...(error.details ? {details: error.details} : {}),\n    },\n  };\n}\n\n/** @deprecated Use getMutator instead */\nexport function getMutation(\n  // oxlint-disable-next-line no-explicit-any\n  mutators: AnyMutatorRegistry | CustomMutatorDefs<any>,\n  name: string,\n  // oxlint-disable-next-line no-explicit-any\n): CustomMutatorImpl<any> {\n  const path = name.split(/\\.|\\|/);\n  const mutator = getObjectAtPath(mutators, path);\n  assert(typeof mutator === 'function', `could not find mutator ${name}`);\n\n  if (isMutator(mutator)) {\n    // mutator needs to be called with {tx, args, ctx}\n    // CustomMutatorImpl is called with (tx, args, ctx)\n    return (tx, args, ctx) => mutator.fn({args, ctx, tx});\n  }\n\n  // oxlint-disable-next-line no-explicit-any\n  return mutator as CustomMutatorImpl<any>;\n}\n\nfunction getObjectAtPath(\n  obj: Record<string, unknown>,\n  path: string[],\n): unknown {\n  let current: unknown = obj;\n  for (const part of path) {\n    if (typeof current !== 'object' || current === null || !(part in current)) {\n      return undefined;\n    }\n    current = (current as Record<string, unknown>)[part];\n  }\n  return current;\n}\n\ntype DatabaseTransactionPhase = 'open' | 'execute';\nclass DatabaseTransactionError extends Error {\n  constructor(phase: DatabaseTransactionPhase, options?: ErrorOptions) {\n    super(\n      phase === 'open'\n        ? `Failed to open database transaction: ${getErrorMessage(options?.cause)}`\n        : `Database transaction failed after opening: ${getErrorMessage(options?.cause)}`,\n      options,\n    );\n    this.name = 'DatabaseTransactionError';\n  }\n}\n"],"names":["ErrorKind.PushFailed","ErrorOrigin.Server","ErrorReason.Parse","v.parse","ErrorReason.UnsupportedPushVersion","ErrorReason.OutOfOrderMutation","ErrorReason.Database","ErrorReason.Internal","appError"],"mappings":"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"}
+{"version":3,"file":"process-mutations.js","sources":["../../../../zero-server/src/process-mutations.ts"],"sourcesContent":["import type {LogContext, 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 {promiseVoid} from '../../shared/src/resolved-promises.ts';\nimport type {MaybePromise} from '../../shared/src/types.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport {MutationAlreadyProcessedError} from '../../zero-cache/src/services/mutagen/error.ts';\nimport type {ApplicationError} from '../../zero-protocol/src/application-error.ts';\nimport {\n  isApplicationError,\n  wrapWithApplicationError,\n} from '../../zero-protocol/src/application-error.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 {PushFailedBody} from '../../zero-protocol/src/error.ts';\nimport {\n  pushBodySchema,\n  pushParamsSchema,\n  type CustomMutation,\n  type Mutation,\n  type MutationID,\n  type MutationResponse,\n  type PushBody,\n  type PushResponse,\n} from '../../zero-protocol/src/push.ts';\nimport type {AnyMutatorRegistry} from '../../zql/src/mutate/mutator-registry.ts';\nimport {isMutator} from '../../zql/src/mutate/mutator.ts';\nimport type {CustomMutatorDefs, CustomMutatorImpl} from './custom.ts';\nimport {createLogContext} from './logging.ts';\n\nexport interface TransactionProviderHooks {\n  updateClientMutationID: () => Promise<{lastMutationID: number | bigint}>;\n  writeMutationResult: (result: MutationResponse) => Promise<void>;\n}\n\nexport interface TransactionProviderInput {\n  upstreamSchema: string;\n  clientGroupID: string;\n  clientID: string;\n  mutationID: number;\n}\n\n/**\n * Defines the abstract interface for a database that PushProcessor can execute\n * transactions against.\n */\nexport interface Database<T> {\n  transaction: <R>(\n    callback: (\n      tx: T,\n      transactionHooks: TransactionProviderHooks,\n    ) => MaybePromise<R>,\n    transactionInput?: TransactionProviderInput,\n  ) => Promise<R>;\n}\n\nexport type ExtractTransactionType<D> = D extends Database<infer T> ? T : never;\nexport type Params = v.Infer<typeof pushParamsSchema>;\n\nexport type TransactFn<D extends Database<ExtractTransactionType<D>>> = (\n  cb: TransactFnCallback<D>,\n) => Promise<MutationResponse>;\n\nexport type TransactFnCallback<D extends Database<ExtractTransactionType<D>>> =\n  (\n    tx: ExtractTransactionType<D>,\n    mutatorName: string,\n    mutatorArgs: ReadonlyJSONValue | undefined,\n  ) => Promise<void>;\n\nexport type Parsed<D extends Database<ExtractTransactionType<D>>> = {\n  transact: TransactFn<D>;\n  mutations: CustomMutation[];\n};\n\ntype MutationPhase = 'preTransaction' | 'transactionPending' | 'postCommit';\n\nconst applicationErrorWrapper = async <T>(fn: () => Promise<T>): Promise<T> => {\n  try {\n    return await fn();\n  } catch (error) {\n    if (\n      error instanceof DatabaseTransactionError ||\n      error instanceof OutOfOrderMutation ||\n      error instanceof MutationAlreadyProcessedError ||\n      isApplicationError(error)\n    ) {\n      throw error;\n    }\n\n    throw wrapWithApplicationError(error);\n  }\n};\n\n/**\n * @deprecated Use {@linkcode handleMutateRequest} instead.\n */\nexport const handleMutationRequest = handleMutateRequest;\n\nexport function handleMutateRequest<\n  D extends Database<ExtractTransactionType<D>>,\n>(\n  dbProvider: D,\n  cb: (\n    transact: TransactFn<D>,\n    mutation: CustomMutation,\n  ) => Promise<MutationResponse>,\n  queryString: URLSearchParams | Record<string, string>,\n  body: ReadonlyJSONValue,\n  logLevel?: LogLevel,\n): Promise<PushResponse>;\n\nexport function handleMutateRequest<\n  D extends Database<ExtractTransactionType<D>>,\n>(\n  dbProvider: D,\n  cb: (\n    transact: TransactFn<D>,\n    mutation: CustomMutation,\n  ) => Promise<MutationResponse>,\n  request: Request,\n  logLevel?: LogLevel,\n): Promise<PushResponse>;\n\nexport async function handleMutateRequest<\n  D extends Database<ExtractTransactionType<D>>,\n>(\n  dbProvider: D,\n  cb: (\n    transact: TransactFn<D>,\n    mutation: CustomMutation,\n  ) => Promise<MutationResponse>,\n  queryStringOrRequest: Request | URLSearchParams | Record<string, string>,\n  bodyOrLogLevel?: ReadonlyJSONValue | LogLevel,\n  logLevel?: LogLevel,\n): Promise<PushResponse> {\n  // Parse overload arguments\n  const isRequestOverload = queryStringOrRequest instanceof Request;\n\n  let request: Request | undefined;\n  let queryString: URLSearchParams | Record<string, string>;\n  let jsonBody: unknown;\n\n  let lc: LogContext;\n\n  if (isRequestOverload) {\n    request = queryStringOrRequest;\n    const level = (bodyOrLogLevel as LogLevel | undefined) ?? 'info';\n\n    // Create log context early, before extracting JSON from Request\n    lc = createLogContext(level).withContext('PushProcessor');\n\n    const url = new URL(request.url);\n    queryString = url.searchParams;\n\n    try {\n      jsonBody = await request.json();\n    } catch (error) {\n      lc.error?.('Failed to parse push body', error);\n      const message = `Failed to parse push body: ${getErrorMessage(error)}`;\n      const details = getErrorDetails(error);\n      return {\n        kind: ErrorKind.PushFailed,\n        origin: ErrorOrigin.Server,\n        reason: ErrorReason.Parse,\n        message,\n        mutationIDs: [],\n        ...(details ? {details} : {}),\n      } as const satisfies PushFailedBody;\n    }\n  } else {\n    queryString = queryStringOrRequest;\n    jsonBody = bodyOrLogLevel;\n    const level = logLevel ?? 'info';\n    lc = createLogContext(level).withContext('PushProcessor');\n  }\n\n  let mutationIDs: MutationID[] = [];\n\n  let pushBody: PushBody;\n  try {\n    pushBody = v.parse(jsonBody, pushBodySchema);\n    mutationIDs = pushBody.mutations.map(m => ({\n      id: m.id,\n      clientID: m.clientID,\n    }));\n  } catch (error) {\n    lc.error?.('Failed to parse push body', error);\n    const message = `Failed to parse push body: ${getErrorMessage(error)}`;\n    const details = getErrorDetails(error);\n    return {\n      kind: ErrorKind.PushFailed,\n      origin: ErrorOrigin.Server,\n      reason: ErrorReason.Parse,\n      message,\n      mutationIDs,\n      ...(details ? {details} : {}),\n    } as const satisfies PushFailedBody;\n  }\n\n  let queryParams: Params;\n  try {\n    const queryStringObj =\n      queryString instanceof URLSearchParams\n        ? Object.fromEntries(queryString)\n        : queryString;\n    queryParams = v.parse(queryStringObj, pushParamsSchema, 'passthrough');\n  } catch (error) {\n    lc.error?.('Failed to parse push query parameters', error);\n    const message = `Failed to parse push query parameters: ${getErrorMessage(error)}`;\n    const details = getErrorDetails(error);\n    return {\n      kind: ErrorKind.PushFailed,\n      origin: ErrorOrigin.Server,\n      reason: ErrorReason.Parse,\n      message,\n      mutationIDs,\n      ...(details ? {details} : {}),\n    } as const satisfies PushFailedBody;\n  }\n\n  if (pushBody.pushVersion !== 1) {\n    const response = {\n      kind: ErrorKind.PushFailed,\n      origin: ErrorOrigin.Server,\n      reason: ErrorReason.UnsupportedPushVersion,\n      mutationIDs,\n      message: `Unsupported push version: ${pushBody.pushVersion}`,\n    } as const satisfies PushFailedBody;\n    return response;\n  }\n\n  const responses: MutationResponse[] = [];\n  let processedCount = 0;\n\n  try {\n    const transactor = new Transactor(dbProvider, pushBody, queryParams, lc);\n\n    // Each mutation goes through three phases:\n    //   1. Pre-transaction: user logic that runs before `transact` is called. If\n    //      this throws we still advance LMID and persist the failure result.\n    //   2. Transaction: the callback passed to `transact`, which can be retried\n    //      if it fails with an ApplicationError.\n    //   3. Post-commit: any logic that runs after `transact` resolves. Failures\n    //      here are logged but the mutation remains committed.\n    for (const m of pushBody.mutations) {\n      assert(m.type === 'custom', 'Expected custom mutation');\n      lc.debug?.(\n        `Processing mutation '${m.name}' (id=${m.id}, clientID=${m.clientID})`,\n        m.args,\n      );\n\n      let mutationPhase: MutationPhase = 'preTransaction';\n\n      const transactProxy: TransactFn<D> = async innerCb => {\n        mutationPhase = 'transactionPending';\n        const result = await transactor.transact(m, (tx, name, args) =>\n          applicationErrorWrapper(() => innerCb(tx, name, args)),\n        );\n        mutationPhase = 'postCommit';\n        return result;\n      };\n\n      try {\n        const res = await applicationErrorWrapper(() => cb(transactProxy, m));\n        responses.push(res);\n        lc.debug?.(`Mutation '${m.name}' (id=${m.id}) completed successfully`);\n\n        processedCount++;\n      } catch (error) {\n        if (!isApplicationError(error)) {\n          throw error;\n        }\n\n        if (mutationPhase === 'preTransaction') {\n          // Pre-transaction\n          await transactor.persistPreTransactionFailure(m, error);\n        } else if (mutationPhase === 'postCommit') {\n          // Post-commit\n          lc.error?.(\n            `Post-commit mutation handler failed for mutation ${m.id} for client ${m.clientID}`,\n            error,\n          );\n        }\n\n        lc.warn?.(\n          `Application error processing mutation ${m.id} for client ${m.clientID}`,\n          error,\n        );\n        responses.push(makeAppErrorResponse(m, error));\n\n        processedCount++;\n      }\n    }\n\n    return {\n      mutations: responses,\n    };\n  } catch (error) {\n    lc.error?.('Failed to process push request', error);\n    // only include mutationIDs for mutations that were not processed\n    const unprocessedMutationIDs = mutationIDs.slice(processedCount);\n\n    const message = getErrorMessage(error);\n    const details = getErrorDetails(error);\n\n    return {\n      kind: ErrorKind.PushFailed,\n      origin: ErrorOrigin.Server,\n      reason:\n        error instanceof OutOfOrderMutation\n          ? ErrorReason.OutOfOrderMutation\n          : error instanceof DatabaseTransactionError\n            ? ErrorReason.Database\n            : ErrorReason.Internal,\n      message,\n      mutationIDs: unprocessedMutationIDs,\n      ...(details ? {details} : {}),\n    };\n  }\n}\n\nclass Transactor<D extends Database<ExtractTransactionType<D>>> {\n  readonly #dbProvider: D;\n  readonly #req: PushBody;\n  readonly #params: Params;\n  readonly #lc: LogContext;\n\n  constructor(dbProvider: D, req: PushBody, params: Params, lc: LogContext) {\n    this.#dbProvider = dbProvider;\n    this.#req = req;\n    this.#params = params;\n    this.#lc = lc;\n  }\n\n  transact = async (\n    mutation: CustomMutation,\n    cb: TransactFnCallback<D>,\n  ): Promise<MutationResponse> => {\n    let appError: ApplicationError | undefined = undefined;\n    for (;;) {\n      try {\n        const ret = await this.#transactImpl(mutation, cb, appError);\n        if (appError !== undefined) {\n          this.#lc.warn?.(\n            `Mutation ${mutation.id} for client ${mutation.clientID} was retried after an error`,\n            appError,\n          );\n          return makeAppErrorResponse(mutation, appError);\n        }\n\n        return ret;\n      } catch (error) {\n        if (error instanceof OutOfOrderMutation) {\n          this.#lc.error?.(error);\n          throw error;\n        }\n\n        if (error instanceof MutationAlreadyProcessedError) {\n          this.#lc.warn?.(error);\n          return {\n            id: {\n              clientID: mutation.clientID,\n              id: mutation.id,\n            },\n            result: {\n              error: 'alreadyProcessed',\n              details: error.message,\n            },\n          };\n        }\n\n        if (isApplicationError(error)) {\n          appError = error;\n          this.#lc.warn?.(\n            `Application error processing mutation ${mutation.id} for client ${mutation.clientID}`,\n            appError,\n          );\n          continue;\n        }\n\n        this.#lc.error?.(\n          `Unexpected error processing mutation ${mutation.id} for client ${mutation.clientID}`,\n          error,\n        );\n\n        throw error;\n      }\n    }\n  };\n\n  async persistPreTransactionFailure(\n    mutation: CustomMutation,\n    appError: ApplicationError<ReadonlyJSONValue | undefined>,\n  ): Promise<MutationResponse> {\n    // User-land code threw before calling `transact`. We still need to bump the\n    // LMID for this mutation and persist the error so that the client knows it failed.\n    const ret = await this.#transactImpl(\n      mutation,\n      // noop callback since there's no transaction to execute\n      () => promiseVoid,\n      appError,\n    );\n    return ret;\n  }\n\n  async #transactImpl(\n    mutation: CustomMutation,\n    cb: TransactFnCallback<D>,\n    appError: ApplicationError | undefined,\n  ): Promise<MutationResponse> {\n    let transactionPhase: DatabaseTransactionPhase = 'open';\n\n    try {\n      const ret = await this.#dbProvider.transaction(\n        async (dbTx, transactionHooks) => {\n          // update the transaction phase to 'execute' after the transaction is opened\n          transactionPhase = 'execute';\n\n          await this.#checkAndIncrementLastMutationID(\n            transactionHooks,\n            mutation.clientID,\n            mutation.id,\n          );\n\n          if (appError === undefined) {\n            this.#lc.debug?.(\n              `Executing mutator '${mutation.name}' (id=${mutation.id})`,\n            );\n            try {\n              await cb(dbTx, mutation.name, mutation.args[0]);\n            } catch (appError) {\n              throw wrapWithApplicationError(appError);\n            }\n          } else {\n            const mutationResult = makeAppErrorResponse(mutation, appError);\n            await transactionHooks.writeMutationResult(mutationResult);\n          }\n\n          return {\n            id: {\n              clientID: mutation.clientID,\n              id: mutation.id,\n            },\n            result: {},\n          };\n        },\n        this.#getTransactionInput(mutation),\n      );\n\n      return ret;\n    } catch (error) {\n      if (\n        isApplicationError(error) ||\n        error instanceof OutOfOrderMutation ||\n        error instanceof MutationAlreadyProcessedError\n      ) {\n        throw error;\n      }\n\n      throw new DatabaseTransactionError(transactionPhase, {cause: error});\n    }\n  }\n\n  #getTransactionInput(mutation: CustomMutation): TransactionProviderInput {\n    return {\n      upstreamSchema: this.#params.schema,\n      clientGroupID: this.#req.clientGroupID,\n      clientID: mutation.clientID,\n      mutationID: mutation.id,\n    };\n  }\n\n  async #checkAndIncrementLastMutationID(\n    transactionHooks: TransactionProviderHooks,\n    clientID: string,\n    receivedMutationID: number,\n  ) {\n    const {lastMutationID} = await transactionHooks.updateClientMutationID();\n\n    if (receivedMutationID < lastMutationID) {\n      throw new MutationAlreadyProcessedError(\n        clientID,\n        receivedMutationID,\n        lastMutationID,\n      );\n    } else if (receivedMutationID > lastMutationID) {\n      throw new OutOfOrderMutation(\n        clientID,\n        receivedMutationID,\n        lastMutationID,\n      );\n    }\n  }\n}\n\nexport class OutOfOrderMutation extends Error {\n  constructor(\n    clientID: string,\n    receivedMutationID: number,\n    lastMutationID: number | bigint,\n  ) {\n    super(\n      `Client ${clientID} sent mutation ID ${receivedMutationID} but expected ${lastMutationID}`,\n    );\n  }\n}\n\nfunction makeAppErrorResponse(\n  m: Mutation,\n  error: ApplicationError<ReadonlyJSONValue | undefined>,\n): MutationResponse {\n  return {\n    id: {\n      clientID: m.clientID,\n      id: m.id,\n    },\n    result: {\n      error: 'app',\n      message: error.message,\n      ...(error.details ? {details: error.details} : {}),\n    },\n  };\n}\n\n/** @deprecated Use getMutator instead */\nexport function getMutation(\n  // oxlint-disable-next-line no-explicit-any\n  mutators: AnyMutatorRegistry | CustomMutatorDefs<any>,\n  name: string,\n  // oxlint-disable-next-line no-explicit-any\n): CustomMutatorImpl<any> {\n  const path = name.split(/\\.|\\|/);\n  const mutator = getObjectAtPath(mutators, path);\n  assert(typeof mutator === 'function', `could not find mutator ${name}`);\n\n  if (isMutator(mutator)) {\n    // mutator needs to be called with {tx, args, ctx}\n    // CustomMutatorImpl is called with (tx, args, ctx)\n    return (tx, args, ctx) => mutator.fn({args, ctx, tx});\n  }\n\n  // oxlint-disable-next-line no-explicit-any\n  return mutator as CustomMutatorImpl<any>;\n}\n\nfunction getObjectAtPath(\n  obj: Record<string, unknown>,\n  path: string[],\n): unknown {\n  let current: unknown = obj;\n  for (const part of path) {\n    if (typeof current !== 'object' || current === null || !(part in current)) {\n      return undefined;\n    }\n    current = (current as Record<string, unknown>)[part];\n  }\n  return current;\n}\n\ntype DatabaseTransactionPhase = 'open' | 'execute';\nclass DatabaseTransactionError extends Error {\n  constructor(phase: DatabaseTransactionPhase, options?: ErrorOptions) {\n    super(\n      phase === 'open'\n        ? `Failed to open database transaction: ${getErrorMessage(options?.cause)}`\n        : `Database transaction failed after opening: ${getErrorMessage(options?.cause)}`,\n      options,\n    );\n    this.name = 'DatabaseTransactionError';\n  }\n}\n"],"names":["ErrorKind.PushFailed","ErrorOrigin.Server","ErrorReason.Parse","v.parse","ErrorReason.UnsupportedPushVersion","ErrorReason.OutOfOrderMutation","ErrorReason.Database","ErrorReason.Internal","appError"],"mappings":"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"}

package/out/zero-server/src/push-processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"push-processor.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/push-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAE/C,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAGhE,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,sBAAsB,EAG5B,MAAM,4CAA4C,CAAC;AACpD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAE3D,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,0CAA0C,CAAC;AAEjF,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAEnD,qBAAa,aAAa,CACxB,EAAE,SAAS,MAAM,EACjB,CAAC,SAAS,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAC7C,EAAE,SAAS,kBAAkB,GAAG,iBAAiB,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAC5E,CAAC,GAAG,SAAS;;gBAMD,UAAU,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,QAAQ,GAAE,QAAiB;IAMnE;;;;;;;;;;OAUG;IACH,OAAO,CACL,QAAQ,EAAE,EAAE,EACZ,WAAW,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrD,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;CAoD/D"}
+{"version":3,"file":"push-processor.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/push-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAE/C,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAGhE,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,sBAAsB,EAG5B,MAAM,4CAA4C,CAAC;AACpD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAE3D,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,0CAA0C,CAAC;AAEjF,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAEnD,qBAAa,aAAa,CACxB,EAAE,SAAS,MAAM,EACjB,CAAC,SAAS,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAC7C,EAAE,SAAS,kBAAkB,GAAG,iBAAiB,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAC5E,CAAC,GAAG,SAAS;;gBAMD,UAAU,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,QAAQ,GAAE,QAAiB;IAMnE;;;;;;;;;;OAUG;IACH,OAAO,CACL,QAAQ,EAAE,EAAE,EACZ,WAAW,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrD,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;CAqD/D"}

package/out/zero-server/src/push-processor.js

@@ -3,7 +3,7 @@ import { assert } from "../../shared/src/asserts.js";
 import { must } from "../../shared/src/must.js";
 import { getValueAtPath } from "../../shared/src/object-traversal.js";
 import "../../zero-protocol/src/push.js";
-import { handleMutationRequest } from "./process-mutations.js";
+import { handleMutateRequest } from "./process-mutations.js";
 import { isMutator } from "../../zql/src/mutate/mutator.js";
 class PushProcessor {
   #dbProvider;
@@ -16,33 +16,35 @@ class PushProcessor {
   }
   process(mutators, queryOrQueryString, body) {
     if (queryOrQueryString instanceof Request) {
-      return handleMutationRequest(
+      return handleMutateRequest(
         this.#dbProvider,
         (transact, mutation) => this.#processMutation(mutators, transact, mutation),
         queryOrQueryString,
-        this.#context,
         this.#logLevel
       );
     }
-    return handleMutationRequest(
+    return handleMutateRequest(
       this.#dbProvider,
       (transact, mutation) => this.#processMutation(mutators, transact, mutation),
       queryOrQueryString,
       must(body),
-      this.#context,
       this.#logLevel
     );
   }
   #processMutation(mutators, transact, _mutation) {
     return transact(
-      (tx, name, args, ctx) => this.#dispatchMutation(mutators, tx, name, args, ctx)
+      (tx, name, args) => this.#dispatchMutation(mutators, tx, name, args)
     );
   }
-  #dispatchMutation(mutators, dbTx, key, args, ctx) {
+  #dispatchMutation(mutators, dbTx, key, args) {
     const mutator = getValueAtPath(mutators, key, /\.|\|/);
     assert(typeof mutator === "function", `could not find mutator ${key}`);
     if (isMutator(mutator)) {
-      return mutator.fn({ args, ctx, tx: dbTx });
+      return mutator.fn({
+        args,
+        ctx: this.#context,
+        tx: dbTx
+      });
     }
     return mutator(dbTx, args);
   }

package/out/zero-server/src/push-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"push-processor.js","sources":["../../../../zero-server/src/push-processor.ts"],"sourcesContent":["import {type LogLevel} from '@rocicorp/logger';\nimport {assert} from '../../shared/src/asserts.ts';\nimport type {ReadonlyJSONValue} from '../../shared/src/json.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {getValueAtPath} from '../../shared/src/object-traversal.ts';\nimport {\n  type CustomMutation,\n  type MutationResponse,\n  type PushResponse,\n} from '../../zero-protocol/src/push.ts';\nimport {\n  type Database,\n  type ExtractTransactionType,\n  handleMutationRequest,\n  type TransactFn,\n} from '../../zero-server/src/process-mutations.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {Transaction} from '../../zql/src/mutate/custom.ts';\nimport type {AnyMutatorRegistry} from '../../zql/src/mutate/mutator-registry.ts';\nimport {isMutator} from '../../zql/src/mutate/mutator.ts';\nimport type {CustomMutatorDefs} from './custom.ts';\n\nexport class PushProcessor<\n  _S extends Schema,\n  D extends Database<ExtractTransactionType<D>>,\n  MD extends AnyMutatorRegistry | CustomMutatorDefs<ExtractTransactionType<D>>,\n  C = undefined,\n> {\n  readonly #dbProvider: D;\n  readonly #logLevel: LogLevel;\n  readonly #context: C;\n\n  constructor(dbProvider: D, context?: C, logLevel: LogLevel = 'info') {\n    this.#dbProvider = dbProvider;\n    this.#context = context as C;\n    this.#logLevel = logLevel;\n  }\n\n  /**\n   * Processes a push request from zero-cache.\n   * This function will parse the request, check the protocol version, and process each mutation in the request.\n   * - If a mutation is out of order: processing will stop and an error will be returned. The zero client will retry the mutation.\n   * - If a mutation has already been processed: it will be skipped and the processing will continue.\n   * - If a mutation receives an application error: it will be skipped, the error will be returned to the client, and processing will continue.\n   *\n   * @param mutators the custom mutators for the application\n   * @param queryString the query string from the request sent by zero-cache. This will include zero's postgres schema name and appID.\n   * @param body the body of the request sent by zero-cache as a JSON object.\n   */\n  process(\n    mutators: MD,\n    queryString: URLSearchParams | Record<string, string>,\n    body: ReadonlyJSONValue,\n  ): Promise<PushResponse>;\n\n  /**\n   * This override gets the query string and the body from a Request object.\n   *\n   * @param mutators the custom mutators for the application\n   * @param request A `Request` object.\n   */\n  process(mutators: MD, request: Request): Promise<PushResponse>;\n  process(\n    mutators: MD,\n    queryOrQueryString: Request | URLSearchParams | Record<string, string>,\n    body?: ReadonlyJSONValue,\n  ): Promise<PushResponse> {\n    if (queryOrQueryString instanceof Request) {\n      return handleMutationRequest(\n        this.#dbProvider,\n        (transact, mutation) =>\n          this.#processMutation(mutators, transact, mutation),\n        queryOrQueryString,\n        this.#context,\n        this.#logLevel,\n      );\n    }\n    return handleMutationRequest(\n      this.#dbProvider,\n      (transact, mutation) =>\n        this.#processMutation(mutators, transact, mutation),\n      queryOrQueryString,\n      must(body),\n      this.#context,\n      this.#logLevel,\n    );\n  }\n\n  #processMutation(\n    mutators: MD,\n    transact: TransactFn<D, C>,\n    _mutation: CustomMutation,\n  ): Promise<MutationResponse> {\n    return transact((tx, name, args, ctx) =>\n      this.#dispatchMutation(mutators, tx, name, args, ctx),\n    );\n  }\n\n  #dispatchMutation(\n    mutators: MD,\n    dbTx: ExtractTransactionType<D>,\n    key: string,\n    args: ReadonlyJSONValue | undefined,\n    ctx: C,\n  ): Promise<void> {\n    // Legacy mutators used | as a separator, new mutators use .\n    const mutator = getValueAtPath(mutators, key, /\\.|\\|/);\n    assert(typeof mutator === 'function', `could not find mutator ${key}`);\n    if (isMutator(mutator)) {\n      return mutator.fn({args, ctx, tx: dbTx as Transaction<Schema, unknown>});\n    }\n    return mutator(dbTx, args);\n  }\n}\n"],"names":[],"mappings":";;;;;;;AAsBO,MAAM,cAKX;AAAA,EACS;AAAA,EACA;AAAA,EACA;AAAA,EAET,YAAY,YAAe,SAAa,WAAqB,QAAQ;AACnE,SAAK,cAAc;AACnB,SAAK,WAAW;AAChB,SAAK,YAAY;AAAA,EACnB;AAAA,EA0BA,QACE,UACA,oBACA,MACuB;AACvB,QAAI,8BAA8B,SAAS;AACzC,aAAO;AAAA,QACL,KAAK;AAAA,QACL,CAAC,UAAU,aACT,KAAK,iBAAiB,UAAU,UAAU,QAAQ;AAAA,QACpD;AAAA,QACA,KAAK;AAAA,QACL,KAAK;AAAA,MAAA;AAAA,IAET;AACA,WAAO;AAAA,MACL,KAAK;AAAA,MACL,CAAC,UAAU,aACT,KAAK,iBAAiB,UAAU,UAAU,QAAQ;AAAA,MACpD;AAAA,MACA,KAAK,IAAI;AAAA,MACT,KAAK;AAAA,MACL,KAAK;AAAA,IAAA;AAAA,EAET;AAAA,EAEA,iBACE,UACA,UACA,WAC2B;AAC3B,WAAO;AAAA,MAAS,CAAC,IAAI,MAAM,MAAM,QAC/B,KAAK,kBAAkB,UAAU,IAAI,MAAM,MAAM,GAAG;AAAA,IAAA;AAAA,EAExD;AAAA,EAEA,kBACE,UACA,MACA,KACA,MACA,KACe;AAEf,UAAM,UAAU,eAAe,UAAU,KAAK,OAAO;AACrD,WAAO,OAAO,YAAY,YAAY,0BAA0B,GAAG,EAAE;AACrE,QAAI,UAAU,OAAO,GAAG;AACtB,aAAO,QAAQ,GAAG,EAAC,MAAM,KAAK,IAAI,MAAqC;AAAA,IACzE;AACA,WAAO,QAAQ,MAAM,IAAI;AAAA,EAC3B;AACF;"}
+{"version":3,"file":"push-processor.js","sources":["../../../../zero-server/src/push-processor.ts"],"sourcesContent":["import {type LogLevel} from '@rocicorp/logger';\nimport {assert} from '../../shared/src/asserts.ts';\nimport type {ReadonlyJSONValue} from '../../shared/src/json.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {getValueAtPath} from '../../shared/src/object-traversal.ts';\nimport {\n  type CustomMutation,\n  type MutationResponse,\n  type PushResponse,\n} from '../../zero-protocol/src/push.ts';\nimport {\n  type Database,\n  type ExtractTransactionType,\n  handleMutateRequest,\n  type TransactFn,\n} from '../../zero-server/src/process-mutations.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {Transaction} from '../../zql/src/mutate/custom.ts';\nimport type {AnyMutatorRegistry} from '../../zql/src/mutate/mutator-registry.ts';\nimport {isMutator} from '../../zql/src/mutate/mutator.ts';\nimport type {CustomMutatorDefs} from './custom.ts';\n\nexport class PushProcessor<\n  _S extends Schema,\n  D extends Database<ExtractTransactionType<D>>,\n  MD extends AnyMutatorRegistry | CustomMutatorDefs<ExtractTransactionType<D>>,\n  C = undefined,\n> {\n  readonly #dbProvider: D;\n  readonly #logLevel: LogLevel;\n  readonly #context: C;\n\n  constructor(dbProvider: D, context?: C, logLevel: LogLevel = 'info') {\n    this.#dbProvider = dbProvider;\n    this.#context = context as C;\n    this.#logLevel = logLevel;\n  }\n\n  /**\n   * Processes a push request from zero-cache.\n   * This function will parse the request, check the protocol version, and process each mutation in the request.\n   * - If a mutation is out of order: processing will stop and an error will be returned. The zero client will retry the mutation.\n   * - If a mutation has already been processed: it will be skipped and the processing will continue.\n   * - If a mutation receives an application error: it will be skipped, the error will be returned to the client, and processing will continue.\n   *\n   * @param mutators the custom mutators for the application\n   * @param queryString the query string from the request sent by zero-cache. This will include zero's postgres schema name and appID.\n   * @param body the body of the request sent by zero-cache as a JSON object.\n   */\n  process(\n    mutators: MD,\n    queryString: URLSearchParams | Record<string, string>,\n    body: ReadonlyJSONValue,\n  ): Promise<PushResponse>;\n\n  /**\n   * This override gets the query string and the body from a Request object.\n   *\n   * @param mutators the custom mutators for the application\n   * @param request A `Request` object.\n   */\n  process(mutators: MD, request: Request): Promise<PushResponse>;\n  process(\n    mutators: MD,\n    queryOrQueryString: Request | URLSearchParams | Record<string, string>,\n    body?: ReadonlyJSONValue,\n  ): Promise<PushResponse> {\n    if (queryOrQueryString instanceof Request) {\n      return handleMutateRequest(\n        this.#dbProvider,\n        (transact, mutation) =>\n          this.#processMutation(mutators, transact, mutation),\n        queryOrQueryString,\n        this.#logLevel,\n      );\n    }\n    return handleMutateRequest(\n      this.#dbProvider,\n      (transact, mutation) =>\n        this.#processMutation(mutators, transact, mutation),\n      queryOrQueryString,\n      must(body),\n      this.#logLevel,\n    );\n  }\n\n  #processMutation(\n    mutators: MD,\n    transact: TransactFn<D>,\n    _mutation: CustomMutation,\n  ): Promise<MutationResponse> {\n    return transact((tx, name, args) =>\n      this.#dispatchMutation(mutators, tx, name, args),\n    );\n  }\n\n  #dispatchMutation(\n    mutators: MD,\n    dbTx: ExtractTransactionType<D>,\n    key: string,\n    args: ReadonlyJSONValue | undefined,\n  ): Promise<void> {\n    // Legacy mutators used | as a separator, new mutators use .\n    const mutator = getValueAtPath(mutators, key, /\\.|\\|/);\n    assert(typeof mutator === 'function', `could not find mutator ${key}`);\n    if (isMutator(mutator)) {\n      return mutator.fn({\n        args,\n        ctx: this.#context,\n        tx: dbTx as Transaction<Schema, unknown>,\n      });\n    }\n    return mutator(dbTx, args);\n  }\n}\n"],"names":[],"mappings":";;;;;;;AAsBO,MAAM,cAKX;AAAA,EACS;AAAA,EACA;AAAA,EACA;AAAA,EAET,YAAY,YAAe,SAAa,WAAqB,QAAQ;AACnE,SAAK,cAAc;AACnB,SAAK,WAAW;AAChB,SAAK,YAAY;AAAA,EACnB;AAAA,EA0BA,QACE,UACA,oBACA,MACuB;AACvB,QAAI,8BAA8B,SAAS;AACzC,aAAO;AAAA,QACL,KAAK;AAAA,QACL,CAAC,UAAU,aACT,KAAK,iBAAiB,UAAU,UAAU,QAAQ;AAAA,QACpD;AAAA,QACA,KAAK;AAAA,MAAA;AAAA,IAET;AACA,WAAO;AAAA,MACL,KAAK;AAAA,MACL,CAAC,UAAU,aACT,KAAK,iBAAiB,UAAU,UAAU,QAAQ;AAAA,MACpD;AAAA,MACA,KAAK,IAAI;AAAA,MACT,KAAK;AAAA,IAAA;AAAA,EAET;AAAA,EAEA,iBACE,UACA,UACA,WAC2B;AAC3B,WAAO;AAAA,MAAS,CAAC,IAAI,MAAM,SACzB,KAAK,kBAAkB,UAAU,IAAI,MAAM,IAAI;AAAA,IAAA;AAAA,EAEnD;AAAA,EAEA,kBACE,UACA,MACA,KACA,MACe;AAEf,UAAM,UAAU,eAAe,UAAU,KAAK,OAAO;AACrD,WAAO,OAAO,YAAY,YAAY,0BAA0B,GAAG,EAAE;AACrE,QAAI,UAAU,OAAO,GAAG;AACtB,aAAO,QAAQ,GAAG;AAAA,QAChB;AAAA,QACA,KAAK,KAAK;AAAA,QACV,IAAI;AAAA,MAAA,CACL;AAAA,IACH;AACA,WAAO,QAAQ,MAAM,IAAI;AAAA,EAC3B;AACF;"}

package/out/zero-server/src/queries/process-queries.d.ts

@@ -11,11 +11,23 @@ import type { AnyQuery } from '../../../zql/src/query/query.ts';
  * This function will call `cb` in parallel for each query found in the request.
  *
  * If you need to limit concurrency, you can use a library like `p-limit` to wrap the `cb` function.
- * @deprecated Use {@linkcode handleTransformRequest} instead.
+ * @deprecated Use {@linkcode handleQueryRequest} instead.
  */
 export declare function handleGetQueriesRequest<S extends Schema>(cb: (name: string, args: readonly ReadonlyJSONValue[]) => MaybePromise<{
     query: AnyQuery;
 } | AnyQuery>, schema: S, requestOrJsonBody: Request | ReadonlyJSONValue, logLevel?: LogLevel): Promise<TransformResponseMessage>;
+/**
+ * Invokes the callback `cb` for each query in the request or JSON body.
+ * The callback should return a Query or Promise<Query> that is the transformed result.
+ *
+ * This function will call `cb` in parallel for each query found in the request.
+ *
+ * If you need to limit concurrency, you can use a library like `p-limit` to wrap the `cb` function.
+ * @deprecated Use {@linkcode handleQueryRequest} instead.
+ */
+export declare function handleTransformRequest<S extends Schema>(cb: (name: string, args: readonly ReadonlyJSONValue[]) => MaybePromise<{
+    query: AnyQuery;
+} | AnyQuery>, schema: S, requestOrJsonBody: Request | ReadonlyJSONValue, logLevel?: LogLevel): Promise<TransformResponseMessage>;
 /**
  * Processes a transform request by invoking the provided callback for each query.
  * The callback should return a Query that is the transformed result.
@@ -28,7 +40,7 @@ export declare function handleGetQueriesRequest<S extends Schema>(cb: (name: str
  * @param logLevel - Logging level (defaults to 'info')
  * @returns A Promise that resolves to a TransformResponseMessage
  */
-export declare function handleTransformRequest<S extends Schema>(transformQuery: TransformQueryFunction, schema: S, requestOrJsonBody: Request | ReadonlyJSONValue, logLevel?: LogLevel): Promise<["transformed", ({
+export declare function handleQueryRequest<S extends Schema>(transformQuery: TransformQueryFunction, schema: S, requestOrJsonBody: Request | ReadonlyJSONValue, logLevel?: LogLevel): Promise<["transformed", ({
     message?: string | undefined;
     details?: ReadonlyJSONValue | undefined;
     error: "app";

package/out/zero-server/src/queries/process-queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"process-queries.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/queries/process-queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAE3D,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAG/D,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,8CAA8C,CAAC;AAKtD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAG9D,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,iCAAiC,CAAC;AAG9D;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,SAAS,MAAM,EACtD,EAAE,EAAE,CACF,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,iBAAiB,EAAE,KAC/B,YAAY,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAC,GAAG,QAAQ,CAAC,EAC/C,MAAM,EAAE,CAAC,EACT,iBAAiB,EAAE,OAAO,GAAG,iBAAiB,EAC9C,QAAQ,GAAE,QAAiB,GAC1B,OAAO,CAAC,wBAAwB,CAAC,CAGnC;AAqGD;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,MAAM,EACrD,cAAc,EAAE,sBAAsB,EACtC,MAAM,EAAE,CAAC,EACT,iBAAiB,EAAE,OAAO,GAAG,iBAAiB,EAC9C,QAAQ,GAAE,QAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAU5B;AAED;;;;;;GAMG;AACH,MAAM,MAAM,sBAAsB,GAAG,CACnC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,iBAAiB,GAAG,SAAS,KAChC,QAAQ,CAAC"}
+{"version":3,"file":"process-queries.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/queries/process-queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAE/C,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAG/D,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,8CAA8C,CAAC;AAKtD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAG9D,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,iCAAiC,CAAC;AAG9D;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,SAAS,MAAM,EACtD,EAAE,EAAE,CACF,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,iBAAiB,EAAE,KAC/B,YAAY,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAC,GAAG,QAAQ,CAAC,EAC/C,MAAM,EAAE,CAAC,EACT,iBAAiB,EAAE,OAAO,GAAG,iBAAiB,EAC9C,QAAQ,GAAE,QAAiB,GAC1B,OAAO,CAAC,wBAAwB,CAAC,CAEnC;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,MAAM,EACrD,EAAE,EAAE,CACF,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,iBAAiB,EAAE,KAC/B,YAAY,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAC,GAAG,QAAQ,CAAC,EAC/C,MAAM,EAAE,CAAC,EACT,iBAAiB,EAAE,OAAO,GAAG,iBAAiB,EAC9C,QAAQ,GAAE,QAAiB,GAC1B,OAAO,CAAC,wBAAwB,CAAC,CAEnC;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,MAAM,EACjD,cAAc,EAAE,sBAAsB,EACtC,MAAM,EAAE,CAAC,EACT,iBAAiB,EAAE,OAAO,GAAG,iBAAiB,EAC9C,QAAQ,GAAE,QAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAS5B;AAsGD;;;;;;GAMG;AACH,MAAM,MAAM,sBAAsB,GAAG,CACnC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,iBAAiB,GAAG,SAAS,KAChC,QAAQ,CAAC"}

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

@@ -10,10 +10,22 @@ import { QueryParseError } from "../../../zql/src/query/error.js";
 import { asQueryInternals } from "../../../zql/src/query/query-internals.js";
 import { createLogContext } from "../logging.js";
 function handleGetQueriesRequest(cb, schema, requestOrJsonBody, logLevel = "info") {
-  const lc = createLogContext(logLevel).withContext("GetQueries");
-  return transform(cb, schema, requestOrJsonBody, lc, "get");
+  return transform(cb, schema, requestOrJsonBody, "getQueries", logLevel);
 }
-async function transform(cb, schema, requestOrJsonBody, lc, apiName) {
+function handleTransformRequest(cb, schema, requestOrJsonBody, logLevel = "info") {
+  return transform(cb, schema, requestOrJsonBody, "transform", logLevel);
+}
+function handleQueryRequest(transformQuery, schema, requestOrJsonBody, logLevel = "info") {
+  return transform(
+    (name, argsArray) => transformQuery(name, argsArray[0]),
+    schema,
+    requestOrJsonBody,
+    "query",
+    logLevel
+  );
+}
+async function transform(cb, schema, requestOrJsonBody, apiName, logLevel = "info") {
+  const lc = createLogContext(logLevel).withContext("TransformRequest");
   let parsed;
   let queryIDs = [];
   try {
@@ -26,8 +38,8 @@ async function transform(cb, schema, requestOrJsonBody, lc, apiName) {
     parsed = parse(body, transformRequestMessageSchema);
     queryIDs = parsed[1].map((r) => r.id);
   } catch (error) {
-    lc.error?.(`Failed to parse ${apiName} queries request`, error);
-    const message = `Failed to parse ${apiName} queries request: ${getErrorMessage(error)}`;
+    lc.error?.(`Failed to parse ${apiName} request`, error);
+    const message = `Failed to parse ${apiName} request: ${getErrorMessage(error)}`;
     const details = getErrorDetails(error);
     return [
       "transformFailed",
@@ -91,18 +103,9 @@ async function transform(cb, schema, requestOrJsonBody, lc, apiName) {
     ];
   }
 }
-function handleTransformRequest(transformQuery, schema, requestOrJsonBody, logLevel = "info") {
-  const lc = createLogContext(logLevel).withContext("TransformRequest");
-  return transform(
-    (name, argsArray) => transformQuery(name, argsArray[0]),
-    schema,
-    requestOrJsonBody,
-    lc,
-    "transform"
-  );
-}
 export {
   handleGetQueriesRequest,
+  handleQueryRequest,
   handleTransformRequest
 };
 //# sourceMappingURL=process-queries.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"process-queries.js","sources":["../../../../../zero-server/src/queries/process-queries.ts"],"sourcesContent":["import type {LogContext, LogLevel} from '@rocicorp/logger';\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  type TransformResponseMessage,\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 {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 {@linkcode handleTransformRequest} 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<TransformResponseMessage> {\n  const lc = createLogContext(logLevel).withContext('GetQueries');\n  return transform(cb, schema, requestOrJsonBody, lc, 'get');\n}\n\nasync function transform<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  lc: LogContext,\n  apiName: 'get' | 'transform',\n): Promise<TransformResponseMessage> {\n  let parsed: TransformRequestMessage;\n  let queryIDs: string[] = [];\n  try {\n    let body: ReadonlyJSONValue;\n    if (requestOrJsonBody instanceof Request) {\n      body = await requestOrJsonBody.json();\n    } else {\n      body = requestOrJsonBody;\n    }\n\n    parsed = v.parse(body, transformRequestMessageSchema);\n\n    queryIDs = parsed[1].map(r => r.id);\n  } catch (error) {\n    lc.error?.(`Failed to parse ${apiName} queries request`, error);\n\n    const message = `Failed to parse ${apiName} queries request: ${getErrorMessage(error)}`;\n    const details = getErrorDetails(error);\n\n    return [\n      'transformFailed',\n      {\n        kind: ErrorKind.TransformFailed,\n        origin: ErrorOrigin.Server,\n        reason: ErrorReason.Parse,\n        message,\n        queryIDs,\n        ...(details ? {details} : {}),\n      },\n    ];\n  }\n\n  try {\n    const nameMapper = clientToServer(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 cb(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 ['transformed', responses];\n  } catch (e) {\n    const message = getErrorMessage(e);\n    const details = getErrorDetails(e);\n\n    return [\n      'transformFailed',\n      {\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/**\n * Processes a transform request by invoking the provided callback for each query.\n * The callback should return a Query that is the transformed result.\n *\n * This function will call `transformQuery` in parallel for each query found in the request.\n *\n * @param transformQuery - Callback function that takes a query name and args, and returns a Query\n * @param schema - The Zero schema\n * @param requestOrJsonBody - Either a Request object or the JSON body directly\n * @param logLevel - Logging level (defaults to 'info')\n * @returns A Promise that resolves to a TransformResponseMessage\n */\nexport function handleTransformRequest<S extends Schema>(\n  transformQuery: TransformQueryFunction,\n  schema: S,\n  requestOrJsonBody: Request | ReadonlyJSONValue,\n  logLevel: LogLevel = 'info',\n) {\n  const lc = createLogContext(logLevel).withContext('TransformRequest');\n  return transform(\n    (name, argsArray) => transformQuery(name, argsArray[0]),\n    schema,\n    requestOrJsonBody,\n    lc,\n    'transform',\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 TransformQueryFunction = (\n  name: string,\n  args: ReadonlyJSONValue | undefined,\n) => AnyQuery;\n"],"names":["v.parse","ErrorKind.TransformFailed","ErrorOrigin.Server","ErrorReason.Parse","ErrorReason.Internal"],"mappings":";;;;;;;;;;;AA+BO,SAAS,wBACd,IAIA,QACA,mBACA,WAAqB,QACc;AACnC,QAAM,KAAK,iBAAiB,QAAQ,EAAE,YAAY,YAAY;AAC9D,SAAO,UAAU,IAAI,QAAQ,mBAAmB,IAAI,KAAK;AAC3D;AAEA,eAAe,UACb,IAIA,QACA,mBACA,IACA,SACmC;AACnC,MAAI;AACJ,MAAI,WAAqB,CAAA;AACzB,MAAI;AACF,QAAI;AACJ,QAAI,6BAA6B,SAAS;AACxC,aAAO,MAAM,kBAAkB,KAAA;AAAA,IACjC,OAAO;AACL,aAAO;AAAA,IACT;AAEA,aAASA,MAAQ,MAAM,6BAA6B;AAEpD,eAAW,OAAO,CAAC,EAAE,IAAI,CAAA,MAAK,EAAE,EAAE;AAAA,EACpC,SAAS,OAAO;AACd,OAAG,QAAQ,mBAAmB,OAAO,oBAAoB,KAAK;AAE9D,UAAM,UAAU,mBAAmB,OAAO,qBAAqB,gBAAgB,KAAK,CAAC;AACrF,UAAM,UAAU,gBAAgB,KAAK;AAErC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,QACE,MAAMC;AAAAA,QACN,QAAQC;AAAAA,QACR,QAAQC;AAAAA,QACR;AAAA,QACA;AAAA,QACA,GAAI,UAAU,EAAC,YAAW,CAAA;AAAA,MAAC;AAAA,IAC7B;AAAA,EAEJ;AAEA,MAAI;AACF,UAAM,aAAa,eAAe,OAAO,MAAM;AAE/C,UAAM,YAAmC,MAAM,QAAQ;AAAA,MACrD,OAAO,CAAC,EAAE,IAAI,OAAM,QAAO;AACzB,YAAI;AACJ,YAAI;AACF,gBAAM,SAAS,MAAM,GAAG,IAAI,MAAM,IAAI,IAAI;AAC1C,uBAAa,WAAW,SAAS,OAAO,QAAQ;AAAA,QAClD,SAAS,OAAO;AACd,gBAAM,UAAU,gBAAgB,KAAK;AACrC,gBAAM,UAAU,gBAAgB,KAAK;AAErC,iBAAO;AAAA,YACL,OAAO,iBAAiB,kBAAkB,UAAU;AAAA,YACpD,IAAI,IAAI;AAAA,YACR,MAAM,IAAI;AAAA,YACV;AAAA,YACA,GAAI,UAAU,EAAC,YAAW,CAAA;AAAA,UAAC;AAAA,QAE/B;AAEA,YAAI;AACF,gBAAM,IAAI,iBAAiB,UAAU;AACrC,gBAAM,MAAM,OAAO,EAAE,KAAK,UAAU;AAEpC,iBAAO;AAAA,YACL,IAAI,IAAI;AAAA,YACR,MAAM,IAAI;AAAA,YACV;AAAA,UAAA;AAAA,QAEJ,SAAS,OAAO;AACd,aAAG,QAAQ,qBAAqB,KAAK;AACrC,gBAAM;AAAA,QACR;AAAA,MACF,CAAC;AAAA,IAAA;AAGH,WAAO,CAAC,eAAe,SAAS;AAAA,EAClC,SAAS,GAAG;AACV,UAAM,UAAU,gBAAgB,CAAC;AACjC,UAAM,UAAU,gBAAgB,CAAC;AAEjC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,QACE,MAAMF;AAAAA,QACN,QAAQC;AAAAA,QACR,QAAQE;AAAAA,QACR;AAAA,QACA;AAAA,QACA,GAAI,UAAU,EAAC,YAAW,CAAA;AAAA,MAAC;AAAA,IAC7B;AAAA,EAEJ;AACF;AAcO,SAAS,uBACd,gBACA,QACA,mBACA,WAAqB,QACrB;AACA,QAAM,KAAK,iBAAiB,QAAQ,EAAE,YAAY,kBAAkB;AACpE,SAAO;AAAA,IACL,CAAC,MAAM,cAAc,eAAe,MAAM,UAAU,CAAC,CAAC;AAAA,IACtD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;"}
+{"version":3,"file":"process-queries.js","sources":["../../../../../zero-server/src/queries/process-queries.ts"],"sourcesContent":["import type {LogLevel} from '@rocicorp/logger';\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  type TransformResponseMessage,\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 {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 {@linkcode 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<TransformResponseMessage> {\n  return transform(cb, schema, requestOrJsonBody, 'getQueries', logLevel);\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 {@linkcode 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<TransformResponseMessage> {\n  return transform(cb, schema, requestOrJsonBody, 'transform', logLevel);\n}\n\n/**\n * Processes a transform request by invoking the provided callback for each query.\n * The callback should return a Query that is the transformed result.\n *\n * This function will call `transformQuery` in parallel for each query found in the request.\n *\n * @param transformQuery - Callback function that takes a query name and args, and returns a Query\n * @param schema - The Zero schema\n * @param requestOrJsonBody - Either a Request object or the JSON body directly\n * @param logLevel - Logging level (defaults to 'info')\n * @returns A Promise that resolves to a TransformResponseMessage\n */\nexport function handleQueryRequest<S extends Schema>(\n  transformQuery: TransformQueryFunction,\n  schema: S,\n  requestOrJsonBody: Request | ReadonlyJSONValue,\n  logLevel: LogLevel = 'info',\n) {\n  return transform(\n    (name, argsArray) => transformQuery(name, argsArray[0]),\n    schema,\n    requestOrJsonBody,\n    'query',\n    logLevel,\n  );\n}\n\nasync function transform<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  apiName: 'query' | 'getQueries' | 'transform',\n  logLevel: LogLevel = 'info',\n): Promise<TransformResponseMessage> {\n  const lc = createLogContext(logLevel).withContext('TransformRequest');\n  let parsed: TransformRequestMessage;\n  let queryIDs: string[] = [];\n  try {\n    let body: ReadonlyJSONValue;\n    if (requestOrJsonBody instanceof Request) {\n      body = await requestOrJsonBody.json();\n    } else {\n      body = requestOrJsonBody;\n    }\n\n    parsed = v.parse(body, transformRequestMessageSchema);\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      'transformFailed',\n      {\n        kind: ErrorKind.TransformFailed,\n        origin: ErrorOrigin.Server,\n        reason: ErrorReason.Parse,\n        message,\n        queryIDs,\n        ...(details ? {details} : {}),\n      },\n    ];\n  }\n\n  try {\n    const nameMapper = clientToServer(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 cb(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 ['transformed', responses];\n  } catch (e) {\n    const message = getErrorMessage(e);\n    const details = getErrorDetails(e);\n\n    return [\n      'transformFailed',\n      {\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/**\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 TransformQueryFunction = (\n  name: string,\n  args: ReadonlyJSONValue | undefined,\n) => AnyQuery;\n"],"names":["v.parse","ErrorKind.TransformFailed","ErrorOrigin.Server","ErrorReason.Parse","ErrorReason.Internal"],"mappings":";;;;;;;;;;;AA+BO,SAAS,wBACd,IAIA,QACA,mBACA,WAAqB,QACc;AACnC,SAAO,UAAU,IAAI,QAAQ,mBAAmB,cAAc,QAAQ;AACxE;AAWO,SAAS,uBACd,IAIA,QACA,mBACA,WAAqB,QACc;AACnC,SAAO,UAAU,IAAI,QAAQ,mBAAmB,aAAa,QAAQ;AACvE;AAcO,SAAS,mBACd,gBACA,QACA,mBACA,WAAqB,QACrB;AACA,SAAO;AAAA,IACL,CAAC,MAAM,cAAc,eAAe,MAAM,UAAU,CAAC,CAAC;AAAA,IACtD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;AAEA,eAAe,UACb,IAIA,QACA,mBACA,SACA,WAAqB,QACc;AACnC,QAAM,KAAK,iBAAiB,QAAQ,EAAE,YAAY,kBAAkB;AACpE,MAAI;AACJ,MAAI,WAAqB,CAAA;AACzB,MAAI;AACF,QAAI;AACJ,QAAI,6BAA6B,SAAS;AACxC,aAAO,MAAM,kBAAkB,KAAA;AAAA,IACjC,OAAO;AACL,aAAO;AAAA,IACT;AAEA,aAASA,MAAQ,MAAM,6BAA6B;AAEpD,eAAW,OAAO,CAAC,EAAE,IAAI,CAAA,MAAK,EAAE,EAAE;AAAA,EACpC,SAAS,OAAO;AACd,OAAG,QAAQ,mBAAmB,OAAO,YAAY,KAAK;AAEtD,UAAM,UAAU,mBAAmB,OAAO,aAAa,gBAAgB,KAAK,CAAC;AAC7E,UAAM,UAAU,gBAAgB,KAAK;AAErC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,QACE,MAAMC;AAAAA,QACN,QAAQC;AAAAA,QACR,QAAQC;AAAAA,QACR;AAAA,QACA;AAAA,QACA,GAAI,UAAU,EAAC,YAAW,CAAA;AAAA,MAAC;AAAA,IAC7B;AAAA,EAEJ;AAEA,MAAI;AACF,UAAM,aAAa,eAAe,OAAO,MAAM;AAE/C,UAAM,YAAmC,MAAM,QAAQ;AAAA,MACrD,OAAO,CAAC,EAAE,IAAI,OAAM,QAAO;AACzB,YAAI;AACJ,YAAI;AACF,gBAAM,SAAS,MAAM,GAAG,IAAI,MAAM,IAAI,IAAI;AAC1C,uBAAa,WAAW,SAAS,OAAO,QAAQ;AAAA,QAClD,SAAS,OAAO;AACd,gBAAM,UAAU,gBAAgB,KAAK;AACrC,gBAAM,UAAU,gBAAgB,KAAK;AAErC,iBAAO;AAAA,YACL,OAAO,iBAAiB,kBAAkB,UAAU;AAAA,YACpD,IAAI,IAAI;AAAA,YACR,MAAM,IAAI;AAAA,YACV;AAAA,YACA,GAAI,UAAU,EAAC,YAAW,CAAA;AAAA,UAAC;AAAA,QAE/B;AAEA,YAAI;AACF,gBAAM,IAAI,iBAAiB,UAAU;AACrC,gBAAM,MAAM,OAAO,EAAE,KAAK,UAAU;AAEpC,iBAAO;AAAA,YACL,IAAI,IAAI;AAAA,YACR,MAAM,IAAI;AAAA,YACV;AAAA,UAAA;AAAA,QAEJ,SAAS,OAAO;AACd,aAAG,QAAQ,qBAAqB,KAAK;AACrC,gBAAM;AAAA,QACR;AAAA,MACF,CAAC;AAAA,IAAA;AAGH,WAAO,CAAC,eAAe,SAAS;AAAA,EAClC,SAAS,GAAG;AACV,UAAM,UAAU,gBAAgB,CAAC;AACjC,UAAM,UAAU,gBAAgB,CAAC;AAEjC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,QACE,MAAMF;AAAAA,QACN,QAAQC;AAAAA,QACR,QAAQE;AAAAA,QACR;AAAA,QACA;AAAA,QACA,GAAI,UAAU,EAAC,YAAW,CAAA;AAAA,MAAC;AAAA,IAC7B;AAAA,EAEJ;AACF;"}

package/out/zero-server/src/zql-database.d.ts

@@ -2,7 +2,7 @@ import type { MaybePromise } from '../../shared/src/types.ts';
 import type { Schema } from '../../zero-types/src/schema.ts';
 import type { DBConnection } from '../../zql/src/mutate/custom.ts';
 import type { HumanReadable, Query, RunOptions } from '../../zql/src/query/query.ts';
-import type { TransactionImpl } from './custom.ts';
+import { type TransactionImpl } from './custom.ts';
 import type { Database, TransactionProviderHooks, TransactionProviderInput } from './process-mutations.ts';
 /**
  * Implements a Database for use with PushProcessor that is backed by Postgres.
@@ -11,11 +11,11 @@ import type { Database, TransactionProviderHooks, TransactionProviderInput } fro
  * writing data that the Zero client does, so that mutator functions can be
  * shared across client and server.
  */
-export declare class ZQLDatabase<S extends Schema, WrappedTransaction> implements Database<TransactionImpl<S, WrappedTransaction>> {
+export declare class ZQLDatabase<TSchema extends Schema, TWrappedTransaction> implements Database<TransactionImpl<TSchema, TWrappedTransaction>> {
     #private;
-    readonly connection: DBConnection<WrappedTransaction>;
-    constructor(connection: DBConnection<WrappedTransaction>, schema: S);
-    transaction<R>(callback: (tx: TransactionImpl<S, WrappedTransaction>, transactionHooks: TransactionProviderHooks) => MaybePromise<R>, transactionInput?: TransactionProviderInput): Promise<R>;
-    run<TTable extends keyof S['tables'] & string, TReturn>(query: Query<S, TTable, TReturn>, options?: RunOptions): Promise<HumanReadable<TReturn>>;
+    readonly connection: DBConnection<TWrappedTransaction>;
+    constructor(connection: DBConnection<TWrappedTransaction>, schema: TSchema);
+    transaction<R>(callback: (tx: TransactionImpl<TSchema, TWrappedTransaction>, transactionHooks: TransactionProviderHooks) => MaybePromise<R>, transactionInput?: TransactionProviderInput): Promise<R>;
+    run<TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TTable, TSchema, TReturn>, options?: RunOptions): Promise<HumanReadable<TReturn>>;
 }
 //# sourceMappingURL=zql-database.d.ts.map

package/out/zero-server/src/zql-database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zql-database.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/zql-database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAE5D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAE3D,OAAO,KAAK,EACV,YAAY,EAGb,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,UAAU,EACX,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAEjD,OAAO,KAAK,EACV,QAAQ,EACR,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAEhC;;;;;;GAMG;AACH,qBAAa,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,kBAAkB,CAC3D,YAAW,QAAQ,CAAC,eAAe,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;;IAE3D,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAC;gBAQ1C,UAAU,EAAE,YAAY,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAOnE,WAAW,CAAC,CAAC,EACX,QAAQ,EAAE,CACR,EAAE,EAAE,eAAe,CAAC,CAAC,EAAE,kBAAkB,CAAC,EAC1C,gBAAgB,EAAE,wBAAwB,KACvC,YAAY,CAAC,CAAC,CAAC,EACpB,gBAAgB,CAAC,EAAE,wBAAwB,GAC1C,OAAO,CAAC,CAAC,CAAC;IAgEb,GAAG,CAAC,MAAM,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,OAAO,EACpD,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAChC,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;CAGnC"}
+{"version":3,"file":"zql-database.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/zql-database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAE5D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,YAAY,EAAgB,MAAM,gCAAgC,CAAC;AAChF,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,UAAU,EACX,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAqB,KAAK,eAAe,EAAC,MAAM,aAAa,CAAC;AACrE,OAAO,KAAK,EACV,QAAQ,EACR,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAEhC;;;;;;GAMG;AACH,qBAAa,WAAW,CAAC,OAAO,SAAS,MAAM,EAAE,mBAAmB,CAClE,YAAW,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;;IAElE,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC,mBAAmB,CAAC,CAAC;gBAG3C,UAAU,EAAE,YAAY,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,OAAO;IAK1E,WAAW,CAAC,CAAC,EACX,QAAQ,EAAE,CACR,EAAE,EAAE,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,EACjD,gBAAgB,EAAE,wBAAwB,KACvC,YAAY,CAAC,CAAC,CAAC,EACpB,gBAAgB,CAAC,EAAE,wBAAwB,GAC1C,OAAO,CAAC,CAAC,CAAC;IAyDb,GAAG,CAAC,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,OAAO,EAC1D,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EACtC,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;CAGnC"}

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

@@ -1,16 +1,11 @@
 import { formatPg, sql } from "../../z2s/src/sql.js";
-import { createBuilder } from "../../zql/src/query/create-builder.js";
-import { makeSchemaCRUD, makeServerTransaction } from "./custom.js";
+import { CRUDMutatorFactory } from "./custom.js";
 class ZQLDatabase {
   connection;
-  #mutate;
-  #query;
-  #schema;
+  #crudFactory;
   constructor(connection, schema) {
     this.connection = connection;
-    this.#mutate = makeSchemaCRUD(schema);
-    this.#query = createBuilder(schema);
-    this.#schema = schema;
+    this.#crudFactory = new CRUDMutatorFactory(schema);
   }
   transaction(callback, transactionInput) {
     const {
@@ -54,15 +49,8 @@ class ZQLDatabase {
       });
     });
   }
-  async #makeServerTransaction(dbTx, clientID, mutationID) {
-    return await makeServerTransaction(
-      dbTx,
-      clientID,
-      mutationID,
-      this.#schema,
-      this.#mutate,
-      this.#query
-    );
+  #makeServerTransaction(dbTx, clientID, mutationID) {
+    return this.#crudFactory.createTransaction(dbTx, clientID, mutationID);
   }
   run(query, options) {
     return this.transaction((tx) => tx.run(query, options));

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

@@ -1 +1 @@
-{"version":3,"file":"zql-database.js","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 {Schema} from '../../zero-types/src/schema.ts';\nimport type {ServerSchema} from '../../zero-types/src/server-schema.ts';\nimport type {\n  DBConnection,\n  DBTransaction,\n  SchemaCRUD,\n} from '../../zql/src/mutate/custom.ts';\nimport {createBuilder} from '../../zql/src/query/create-builder.ts';\nimport type {\n  HumanReadable,\n  Query,\n  RunOptions,\n} from '../../zql/src/query/query.ts';\nimport type {SchemaQuery} from '../../zql/src/query/schema-query.ts';\nimport type {TransactionImpl} from './custom.ts';\nimport {makeSchemaCRUD, makeServerTransaction} from './custom.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<S extends Schema, WrappedTransaction>\n  implements Database<TransactionImpl<S, WrappedTransaction>>\n{\n  readonly connection: DBConnection<WrappedTransaction>;\n  readonly #mutate: (\n    dbTransaction: DBTransaction<WrappedTransaction>,\n    serverSchema: ServerSchema,\n  ) => SchemaCRUD<S>;\n  readonly #query: SchemaQuery<S>;\n  readonly #schema: S;\n\n  constructor(connection: DBConnection<WrappedTransaction>, schema: S) {\n    this.connection = connection;\n    this.#mutate = makeSchemaCRUD(schema);\n    this.#query = createBuilder(schema);\n    this.#schema = schema;\n  }\n\n  transaction<R>(\n    callback: (\n      tx: TransactionImpl<S, WrappedTransaction>,\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    } = transactionInput ?? {};\n    return this.connection.transaction(async dbTx => {\n      const zeroTx = await this.#makeServerTransaction(\n        dbTx,\n        clientID,\n        mutationID,\n      );\n\n      return 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    });\n  }\n\n  async #makeServerTransaction(\n    dbTx: DBTransaction<WrappedTransaction>,\n    clientID: string,\n    mutationID: number,\n  ) {\n    return await makeServerTransaction(\n      dbTx,\n      clientID,\n      mutationID,\n      this.#schema,\n      this.#mutate,\n      this.#query,\n    );\n  }\n\n  run<TTable extends keyof S['tables'] & string, TReturn>(\n    query: Query<S, TTable, TReturn>,\n    options?: RunOptions,\n  ): Promise<HumanReadable<TReturn>> {\n    return this.transaction(tx => tx.run(query, options));\n  }\n}\n"],"names":[],"mappings":";;;AA+BO,MAAM,YAEb;AAAA,EACW;AAAA,EACA;AAAA,EAIA;AAAA,EACA;AAAA,EAET,YAAY,YAA8C,QAAW;AACnE,SAAK,aAAa;AAClB,SAAK,UAAU,eAAe,MAAM;AACpC,SAAK,SAAS,cAAc,MAAM;AAClC,SAAK,UAAU;AAAA,EACjB;AAAA,EAEA,YACE,UAIA,kBACY;AAGZ,UAAM;AAAA,MACJ,iBAAiB;AAAA,MACjB,gBAAgB;AAAA,MAChB,WAAW;AAAA,MACX,aAAa;AAAA,IAAA,IACX,oBAAoB,CAAA;AACxB,WAAO,KAAK,WAAW,YAAY,OAAM,SAAQ;AAC/C,YAAM,SAAS,MAAM,KAAK;AAAA,QACxB;AAAA,QACA;AAAA,QACA;AAAA,MAAA;AAGF,aAAO,SAAS,QAAQ;AAAA,QACtB,MAAM,yBAAyB;AAC7B,gBAAM,YAAY;AAAA,YAChB,kBAAkB,IAAI,MAAM,cAAc,CAAC;AAAA;AAAA,kCAErB,aAAa,KAAK,QAAQ,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA,UAAA;AAMxD,gBAAM,CAAC,EAAC,eAAA,CAAe,IAAK,MAAM,KAAK;AAAA,YACrC,UAAU;AAAA,YACV,UAAU;AAAA,UAAA;AAGZ,iBAAO,EAAC,eAAA;AAAA,QACV;AAAA,QAEA,MAAM,oBAAoB,QAAQ;AAChC,gBAAM,YAAY;AAAA,YAChB,kBAAkB,IAAI,MAAM,cAAc,CAAC;AAAA;AAAA,0BAE7B,aAAa,KAAK,OAAO,GAAG,QAAQ,KAAK,OAAO,GAAG,EAAE,KAAK,KAAK;AAAA,cACvE,OAAO;AAAA,YAAA,CACR;AAAA,UAAA;AAEP,gBAAM,KAAK,MAAM,UAAU,MAAM,UAAU,MAAM;AAAA,QACnD;AAAA,MAAA,CACD;AAAA,IACH,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,uBACJ,MACA,UACA,YACA;AACA,WAAO,MAAM;AAAA,MACX;AAAA,MACA;AAAA,MACA;AAAA,MACA,KAAK;AAAA,MACL,KAAK;AAAA,MACL,KAAK;AAAA,IAAA;AAAA,EAET;AAAA,EAEA,IACE,OACA,SACiC;AACjC,WAAO,KAAK,YAAY,CAAA,OAAM,GAAG,IAAI,OAAO,OAAO,CAAC;AAAA,EACtD;AACF;"}
+{"version":3,"file":"zql-database.js","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 {Schema} from '../../zero-types/src/schema.ts';\nimport type {DBConnection, DBTransaction} from '../../zql/src/mutate/custom.ts';\nimport type {\n  HumanReadable,\n  Query,\n  RunOptions,\n} from '../../zql/src/query/query.ts';\nimport {CRUDMutatorFactory, type TransactionImpl} from './custom.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<TSchema extends Schema, TWrappedTransaction>\n  implements Database<TransactionImpl<TSchema, TWrappedTransaction>>\n{\n  readonly connection: DBConnection<TWrappedTransaction>;\n  readonly #crudFactory: CRUDMutatorFactory<TSchema>;\n\n  constructor(connection: DBConnection<TWrappedTransaction>, schema: TSchema) {\n    this.connection = connection;\n    this.#crudFactory = new CRUDMutatorFactory(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    } = transactionInput ?? {};\n    return this.connection.transaction(async dbTx => {\n      const zeroTx = await this.#makeServerTransaction(\n        dbTx,\n        clientID,\n        mutationID,\n      );\n\n      return 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    });\n  }\n\n  #makeServerTransaction(\n    dbTx: DBTransaction<TWrappedTransaction>,\n    clientID: string,\n    mutationID: number,\n  ) {\n    return this.#crudFactory.createTransaction(dbTx, clientID, mutationID);\n  }\n\n  run<TTable extends keyof TSchema['tables'] & string, TReturn>(\n    query: Query<TTable, TSchema, TReturn>,\n    options?: RunOptions,\n  ): Promise<HumanReadable<TReturn>> {\n    return this.transaction(tx => tx.run(query, options));\n  }\n}\n"],"names":[],"mappings":";;AAuBO,MAAM,YAEb;AAAA,EACW;AAAA,EACA;AAAA,EAET,YAAY,YAA+C,QAAiB;AAC1E,SAAK,aAAa;AAClB,SAAK,eAAe,IAAI,mBAAmB,MAAM;AAAA,EACnD;AAAA,EAEA,YACE,UAIA,kBACY;AAGZ,UAAM;AAAA,MACJ,iBAAiB;AAAA,MACjB,gBAAgB;AAAA,MAChB,WAAW;AAAA,MACX,aAAa;AAAA,IAAA,IACX,oBAAoB,CAAA;AACxB,WAAO,KAAK,WAAW,YAAY,OAAM,SAAQ;AAC/C,YAAM,SAAS,MAAM,KAAK;AAAA,QACxB;AAAA,QACA;AAAA,QACA;AAAA,MAAA;AAGF,aAAO,SAAS,QAAQ;AAAA,QACtB,MAAM,yBAAyB;AAC7B,gBAAM,YAAY;AAAA,YAChB,kBAAkB,IAAI,MAAM,cAAc,CAAC;AAAA;AAAA,kCAErB,aAAa,KAAK,QAAQ,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA,UAAA;AAMxD,gBAAM,CAAC,EAAC,eAAA,CAAe,IAAK,MAAM,KAAK;AAAA,YACrC,UAAU;AAAA,YACV,UAAU;AAAA,UAAA;AAGZ,iBAAO,EAAC,eAAA;AAAA,QACV;AAAA,QAEA,MAAM,oBAAoB,QAAQ;AAChC,gBAAM,YAAY;AAAA,YAChB,kBAAkB,IAAI,MAAM,cAAc,CAAC;AAAA;AAAA,0BAE7B,aAAa,KAAK,OAAO,GAAG,QAAQ,KAAK,OAAO,GAAG,EAAE,KAAK,KAAK;AAAA,cACvE,OAAO;AAAA,YAAA,CACR;AAAA,UAAA;AAEP,gBAAM,KAAK,MAAM,UAAU,MAAM,UAAU,MAAM;AAAA,QACnD;AAAA,MAAA,CACD;AAAA,IACH,CAAC;AAAA,EACH;AAAA,EAEA,uBACE,MACA,UACA,YACA;AACA,WAAO,KAAK,aAAa,kBAAkB,MAAM,UAAU,UAAU;AAAA,EACvE;AAAA,EAEA,IACE,OACA,SACiC;AACjC,WAAO,KAAK,YAAY,CAAA,OAAM,GAAG,IAAI,OAAO,OAAO,CAAC;AAAA,EACtD;AACF;"}

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

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

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

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

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

@@ -1,12 +1,5 @@
-export type { Expand } from '../../shared/src/expand.ts';
-export type { ConnectionState } from '../../zero-client/src/client/connection.ts';
-export type { AuthError, NeedsAuthReason, ZeroError, ZeroErrorKind, } from '../../zero-client/src/client/error.ts';
-export type { QueryResultDetails } from '../../zero-client/src/types/query-result.ts';
-export type { PrimaryKey } from '../../zero-protocol/src/primary-key.ts';
-export type { HumanReadable } from '../../zql/src/query/query.ts';
-export type { ResultType } from '../../zql/src/query/typed-view.ts';
+export { useConnectionState } from './use-connection-state.ts';
 export { createQuery, useQuery, type CreateQueryOptions, type UseQueryOptions, } from './use-query.ts';
-export { useZeroConnectionState } from './use-zero-connection-state.ts';
 export { useZeroOnline } from './use-zero-online.ts';
 export { createUseZero, createZero, useZero, ZeroProvider } from './use-zero.ts';
 //# sourceMappingURL=mod.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/mod.ts"],"names":[],"mappings":"AAAA,YAAY,EAAC,MAAM,EAAC,MAAM,4BAA4B,CAAC;AACvD,YAAY,EAAC,eAAe,EAAC,MAAM,4CAA4C,CAAC;AAChF,YAAY,EACV,SAAS,EACT,eAAe,EACf,SAAS,EACT,aAAa,GACd,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EAAC,kBAAkB,EAAC,MAAM,6CAA6C,CAAC;AACpF,YAAY,EAAC,UAAU,EAAC,MAAM,wCAAwC,CAAC;AACvE,YAAY,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAChE,YAAY,EAAC,UAAU,EAAC,MAAM,mCAAmC,CAAC;AAClE,OAAO,EACL,WAAW,EACX,QAAQ,EACR,KAAK,kBAAkB,EACvB,KAAK,eAAe,GACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,sBAAsB,EAAC,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAC,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EACL,WAAW,EACX,QAAQ,EACR,KAAK,kBAAkB,EACvB,KAAK,eAAe,GACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAC,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC"}

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

@@ -1,7 +1,5 @@
 import { type SetStoreFunction } from 'solid-js/store';
-import { type Change, type Entry, type Format, type Input, type Output, type Query, type Schema, type TTL } from '../../zero-client/src/mod.js';
-import type { QueryResultDetails } from '../../zero-client/src/types/query-result.ts';
-import type { ErroredQuery } from '../../zero-protocol/src/custom-queries.ts';
+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;
@@ -9,8 +7,8 @@ export declare class SolidView implements Output {
     #private;
     constructor(input: Input, onTransactionCommit: (cb: () => void) => void, format: Format, onDestroy: () => void, queryComplete: true | ErroredQuery | Promise<true>, updateTTL: (ttl: TTL) => void, setState: SetStoreFunction<State>, retry: () => void);
     destroy(): void;
-    push(change: Change): void;
+    push(change: Change): readonly never[];
     updateTTL(ttl: TTL): void;
 }
-export declare function createSolidViewFactory(setState: SetStoreFunction<State>, retry?: () => void): <TSchema extends Schema, TTable extends keyof TSchema["tables"] & string, TReturn>(_query: Query<TSchema, TTable, TReturn>, input: Input, format: Format, onDestroy: () => void, onTransactionCommit: (cb: () => void) => void, queryComplete: true | ErroredQuery | Promise<true>, updateTTL: (ttl: TTL) => void) => SolidView;
+export declare function createSolidViewFactory(setState: SetStoreFunction<State>, retry?: () => void): <TTable extends keyof TSchema["tables"] & string, TSchema extends Schema, TReturn>(_query: Query<TTable, TSchema, TReturn>, input: Input, format: Format, onDestroy: () => void, onTransactionCommit: (cb: () => void) => void, queryComplete: true | ErroredQuery | Promise<true>, updateTTL: (ttl: TTL) => void) => SolidView;
 //# sourceMappingURL=solid-view.d.ts.map

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;AACzE,OAAO,EAGL,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,KAAK,EAEV,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,MAAM,EAEX,KAAK,GAAG,EAET,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAEV,kBAAkB,EACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,2CAA2C,CAAC;AAG5E,MAAM,MAAM,KAAK,GAAG,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;AAEhD,eAAO,MAAM,QAAQ,EAAE,kBAAsD,CAAC;AAC9E,eAAO,MAAM,OAAO,EAAE,kBAAqD,CAAC;AAE5E,qBAAa,SAAU,YAAW,MAAM;;gBAqBpC,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;IAiEnB,OAAO,IAAI,IAAI;IA2Bf,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAoD1B,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;CAG1B;AA8CD,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,EACjC,KAAK,CAAC,EAAE,MAAM,IAAI,IAGhB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,UAEC,KAAK,CAAC,OAAO,EAAE,MAAM,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;AAQzE,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;AAE5E,qBAAa,SAAU,YAAW,MAAM;;gBAqBpC,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;IAiEnB,OAAO,IAAI,IAAI;IA2Bf,IAAI,CAAC,MAAM,EAAE,MAAM;IAqDnB,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;CAG1B;AA8CD,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,4 +1,9 @@
 import { reconcile, produce } from "solid-js/store";
+import { emptyArray } from "../../shared/src/sentinels.js";
+import { skipYields } from "../../zql/src/ivm/operator.js";
+import { idSymbol, applyChange } from "../../zql/src/ivm/view-apply-change.js";
+import "../../zero-protocol/src/ast.js";
+import "js-xxhash";
 import "../../shared/src/config.js";
 import "@rocicorp/resolver";
 import "../../shared/src/resolved-promises.js";
@@ -11,14 +16,11 @@ import "../../replicache/src/persist/client-groups.js";
 import "../../replicache/src/persist/clients.js";
 import "../../shared/src/json-schema.js";
 import "../../zero-protocol/src/custom-queries.js";
-import "js-xxhash";
 import "../../zero-protocol/src/client-schema.js";
 import "../../zero-schema/src/permissions.js";
-import { idSymbol, applyChange } from "../../zql/src/ivm/view-apply-change.js";
-import "../../zero-protocol/src/ast.js";
-import "compare-utf8";
 import "../../shared/src/document-visible.js";
 import "../../replicache/src/btree/node.js";
+import "compare-utf8";
 import "../../replicache/src/sync/push.js";
 import "../../shared/src/valita.js";
 import "../../zero-protocol/src/connect.js";
@@ -60,7 +62,7 @@ class SolidView {
     input.setOutput(this);
     const initialRoot = this.#createEmptyRoot();
     this.#applyChangesToRoot(
-      input.fetch({}),
+      skipYields(input.fetch({})),
       (node) => ({ type: "add", node }),
       initialRoot
     );
@@ -132,6 +134,7 @@ class SolidView {
     } else {
       this.#pendingChanges.push(materializeRelationships(change));
     }
+    return emptyArray;
   }
   #applyChanges(changes, mapper) {
     this.#setState(
@@ -194,7 +197,7 @@ function materializeNodeRelationships(node) {
   const relationships = {};
   for (const relationship in node.relationships) {
     const materialized = [];
-    for (const n of node.relationships[relationship]()) {
+    for (const n of skipYields(node.relationships[relationship]())) {
       materialized.push(materializeNodeRelationships(n));
     }
     relationships[relationship] = () => materialized;