@rocicorp/zero 1.4.0-canary.6 → 1.5.0-canary.0

package/out/zero-protocol/src/query-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-server.js","names":[],"sources":["../../../../zero-protocol/src/query-server.ts"],"sourcesContent":["import * as v from '../../shared/src/valita.ts';\nimport {\n  erroredQuerySchema,\n  transformedQuerySchema,\n  transformResponseMessageSchema,\n} from './custom-queries.ts';\nimport {transformFailedBodySchema} from './error.ts';\n\nexport const queryResultSchema = v.union(\n  transformedQuerySchema,\n  erroredQuerySchema,\n);\nexport type QueryResult = v.Infer<typeof queryResultSchema>;\n\nexport const queryResponseBodySchema = v.array(queryResultSchema);\nexport type QueryResponseBody = v.Infer<typeof queryResponseBodySchema>;\n\nexport const querySuccessSchema = v.object({\n  kind: v.literal('QueryResponse'),\n  userID: v.string().nullable().optional(),\n  queries: queryResponseBodySchema,\n});\nexport type QuerySuccess = v.Infer<typeof querySuccessSchema>;\n\nexport const queryResponseSchema = v.union(\n  querySuccessSchema,\n  transformFailedBodySchema,\n  // for backwards compatibility\n  transformResponseMessageSchema,\n);\nexport type QueryResponse = v.Infer<typeof queryResponseSchema>;\n"],"mappings":";;;;AAQA,IAAa,oBAAoB,eAAE,MACjC,wBACA,mBACD;AAGD,IAAa,0BAA0B,eAAE,MAAM,kBAAkB;AAGjE,IAAa,qBAAqB,eAAE,OAAO;CACzC,MAAM,eAAE,QAAQ,gBAAgB;CAChC,QAAQ,eAAE,QAAQ,CAAC,UAAU,CAAC,UAAU;CACxC,SAAS;CACV,CAAC;AAGF,IAAa,sBAAsB,eAAE,MACnC,oBACA,2BAEA,+BACD"}

package/out/zero-protocol/src/up.js

@@ -1,8 +1,8 @@
 import { valita_exports } from "../../shared/src/valita.js";
 import { deleteClientsMessageSchema } from "./delete-clients.js";
 import { initConnectionMessageSchema } from "./connect.js";
-import { ackMutationResponsesMessageSchema, pushMessageSchema } from "./push.js";
 import { pullRequestMessageSchema } from "./pull.js";
+import { ackMutationResponsesMessageSchema, pushMessageSchema } from "./push.js";
 import { changeDesiredQueriesMessageSchema } from "./change-desired-queries.js";
 import { closeConnectionMessageSchema } from "./close-connection.js";
 import { inspectUpMessageSchema } from "./inspect-up.js";

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

@@ -1,10 +1,12 @@
 export { ApplicationError, isApplicationError, type ApplicationErrorOptions, } from '../../zero-protocol/src/application-error.ts';
+export type { MutateResponse } from '../../zero-protocol/src/mutate-server.ts';
+export type { QueryResponse } from '../../zero-protocol/src/query-server.ts';
 export type { ServerColumnSchema, ServerSchema, ServerTableSchema, } from '../../zero-types/src/server-schema.ts';
 export type { AnyTransaction, ClientTransaction, DBConnection, DBTransaction, Location, MutateCRUD, Row, ServerTransaction, Transaction, TransactionBase, TransactionReason, } from '../../zql/src/mutate/custom.ts';
 export { CRUDMutatorFactory, makeSchemaCRUD, type CustomMutatorDefs, } from './custom.ts';
 export { executePostgresQuery } from './pg-query-executor.ts';
-export { getMutation, handleMutateRequest, handleMutationRequest, OutOfOrderMutation, type Database, type ExtractTransactionType, type Params, type Parsed, type TransactFn, type TransactFnCallback, type TransactionProviderHooks, type TransactionProviderInput, } from './process-mutations.ts';
+export { getMutation, handleMutateRequest, handleMutationRequest, OutOfOrderMutation, type Database, type ExtractTransactionType, type MutateRequestOptions, type Params, type Parsed, type TransactFn, type TransactFnCallback, type TransactionProviderHooks, type TransactionProviderInput, } from './process-mutations.ts';
 export { PushProcessor } from './push-processor.ts';
-export { handleGetQueriesRequest, handleQueryRequest, handleTransformRequest, type TransformQueryFunction, } from './queries/process-queries.ts';
+export { handleGetQueriesRequest, handleQueryRequest, handleTransformRequest, type QueryRequestOptions, type TransformQueryFunction, } from './queries/process-queries.ts';
 export { ZQLDatabase } from './zql-database.ts';
 //# sourceMappingURL=mod.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,KAAK,uBAAuB,GAC7B,MAAM,8CAA8C,CAAC;AACtD,YAAY,EACV,kBAAkB,EAClB,YAAY,EACZ,iBAAiB,GAClB,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EACV,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,UAAU,EACV,GAAG,EACH,iBAAiB,EACjB,WAAW,EACX,eAAe,EACf,iBAAiB,GAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,KAAK,iBAAiB,GACvB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,EAClB,KAAK,QAAQ,EACb,KAAK,sBAAsB,EAC3B,KAAK,MAAM,EACX,KAAK,MAAM,EACX,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,wBAAwB,GAC9B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAClD,OAAO,EACL,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,EACtB,KAAK,sBAAsB,GAC5B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,KAAK,uBAAuB,GAC7B,MAAM,8CAA8C,CAAC;AACtD,YAAY,EAAC,cAAc,EAAC,MAAM,0CAA0C,CAAC;AAC7E,YAAY,EAAC,aAAa,EAAC,MAAM,yCAAyC,CAAC;AAC3E,YAAY,EACV,kBAAkB,EAClB,YAAY,EACZ,iBAAiB,GAClB,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EACV,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,UAAU,EACV,GAAG,EACH,iBAAiB,EACjB,WAAW,EACX,eAAe,EACf,iBAAiB,GAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,KAAK,iBAAiB,GACvB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,EAClB,KAAK,QAAQ,EACb,KAAK,sBAAsB,EAC3B,KAAK,oBAAoB,EACzB,KAAK,MAAM,EACX,KAAK,MAAM,EACX,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,wBAAwB,GAC9B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAClD,OAAO,EACL,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,EACtB,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,GAC5B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC"}

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

@@ -2,7 +2,9 @@ import type { LogLevel } from '@rocicorp/logger';
 import type { ReadonlyJSONValue } from '../../shared/src/json.ts';
 import type { MaybePromise } from '../../shared/src/types.ts';
 import * as v from '../../shared/src/valita.ts';
-import { pushParamsSchema, type CleanupResultsArg, type CustomMutation, type MutationResponse, type PushResponse } from '../../zero-protocol/src/push.ts';
+import { mutateParamsSchema, type MutateResponse } from '../../zero-protocol/src/mutate-server.ts';
+import { type CleanupResultsArg, type CustomMutation } from '../../zero-protocol/src/mutation.ts';
+import { type MutationResponse } from '../../zero-protocol/src/push.ts';
 import type { AnyMutatorRegistry } from '../../zql/src/mutate/mutator-registry.ts';
 import type { CustomMutatorDefs, CustomMutatorImpl } from './custom.ts';
 export interface TransactionProviderHooks {
@@ -26,7 +28,7 @@ export interface Database<T> {
     transaction: <R>(callback: (tx: T, transactionHooks: TransactionProviderHooks) => MaybePromise<R>, transactionInput?: TransactionProviderInput) => Promise<R>;
 }
 export type ExtractTransactionType<D> = D extends Database<infer T> ? T : never;
-export type Params = v.Infer<typeof pushParamsSchema>;
+export type Params = v.Infer<typeof mutateParamsSchema>;
 export type TransactFn<D extends Database<ExtractTransactionType<D>>> = (cb: TransactFnCallback<D>) => Promise<MutationResponse>;
 export type TransactFnCallback<D extends Database<ExtractTransactionType<D>>> = (tx: ExtractTransactionType<D>, mutatorName: string, mutatorArgs: ReadonlyJSONValue | undefined) => Promise<void>;
 export type Parsed<D extends Database<ExtractTransactionType<D>>> = {
@@ -37,11 +39,46 @@ export type Parsed<D extends Database<ExtractTransactionType<D>>> = {
  * @deprecated Use {@linkcode handleMutateRequest} instead.
  */
 export declare const handleMutationRequest: typeof handleMutateRequest;
-export declare function handleMutateRequest<D extends Database<ExtractTransactionType<D>>>(dbProvider: D, cb: (transact: TransactFn<D>, mutation: CustomMutation) => Promise<MutationResponse>, queryString: URLSearchParams | Record<string, string>, body: ReadonlyJSONValue, logLevel?: LogLevel): Promise<PushResponse>;
-export declare function handleMutateRequest<D extends Database<ExtractTransactionType<D>>>(dbProvider: D, cb: (transact: TransactFn<D>, mutation: CustomMutation) => Promise<MutationResponse>, request: Request, logLevel?: LogLevel): Promise<PushResponse>;
+type QueryParams = URLSearchParams | Record<string, string>;
+export type MutateRequestOptions = {
+    userID?: string | null | undefined;
+    logLevel?: LogLevel | undefined;
+};
+/**
+ * Process a `/mutate` request from a `Request`.
+ *
+ * @param dbProvider - Database used to run transactions and store mutation
+ * results.
+ * @param cb - Runs once per custom mutation. Use `transact` for DB work.
+ * Errors before `transact` are saved; errors after commit are logged.
+ * @param request - Request to read query params and JSON body from.
+ * @param logLevelOrOptions - Either a log level or additional request
+ * options.
+ * @returns A `MutateResponse`. Success returns `userID: options.userID ?? null`
+ * when `options.userID` is provided; invalid requests return the `PushFailed`
+ * branch.
+ */
+export declare function handleMutateRequest<D extends Database<ExtractTransactionType<D>>>(dbProvider: D, cb: (transact: TransactFn<D>, mutation: CustomMutation) => Promise<MutationResponse>, request: Request, logLevelOrOptions?: LogLevel | MutateRequestOptions): Promise<MutateResponse>;
+/**
+ * Process a `/mutate` request from parsed query params and a parsed JSON body.
+ *
+ * @param dbProvider - Database used to run transactions and store mutation
+ * results.
+ * @param cb - Runs once per custom mutation. Use `transact` for DB work.
+ * Errors before `transact` are saved; errors after commit are logged.
+ * @param queryParams - Parsed query params.
+ * @param jsonBody - Parsed JSON body.
+ * @param logLevelOrOptions - Either a log level or additional request
+ * options.
+ * @returns A `MutateResponse`. Success returns `userID: options.userID ?? null`
+ * when `options.userID` is provided; invalid requests return the `PushFailed`
+ * branch.
+ */
+export declare function handleMutateRequest<D extends Database<ExtractTransactionType<D>>>(dbProvider: D, cb: (transact: TransactFn<D>, mutation: CustomMutation) => Promise<MutationResponse>, queryParams: QueryParams, jsonBody: ReadonlyJSONValue, logLevelOrOptions?: LogLevel | MutateRequestOptions): Promise<MutateResponse>;
 export declare class OutOfOrderMutation extends Error {
     constructor(clientID: string, receivedMutationID: number, lastMutationID: number | bigint);
 }
 /** @deprecated Use getMutator instead */
 export declare function getMutation(mutators: AnyMutatorRegistry | CustomMutatorDefs<any>, name: string): CustomMutatorImpl<any>;
+export {};
 //# sourceMappingURL=process-mutations.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"process-mutations.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/process-mutations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"process-mutations.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/process-mutations.ts"],"names":[],"mappings":"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"}

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

@@ -7,8 +7,10 @@ import { PushFailed } from "../../zero-protocol/src/error-kind-enum.js";
 import { Server } from "../../zero-protocol/src/error-origin-enum.js";
 import { Database, Internal, OutOfOrderMutation as OutOfOrderMutation$1, Parse, UnsupportedPushVersion } from "../../zero-protocol/src/error-reason-enum.js";
 import { isMutator } from "../../zql/src/mutate/mutator.js";
-import { cleanupResultsArgSchema, pushBodySchema, pushParamsSchema } from "../../zero-protocol/src/push.js";
+import { cleanupResultsArgSchema } from "../../zero-protocol/src/mutation.js";
+import { pushBodySchema } from "../../zero-protocol/src/push.js";
 import { MutationAlreadyProcessedError } from "../../zero-cache/src/services/mutagen/error.js";
+import { mutateParamsSchema } from "../../zero-protocol/src/mutate-server.js";
 import { createLogContext } from "./logging.js";
 import { separatorRe } from "./push-processor.js";
 //#region ../zero-server/src/process-mutations.ts
@@ -24,40 +26,48 @@ var applicationErrorWrapper = async (fn) => {
 * @deprecated Use {@linkcode handleMutateRequest} instead.
 */
 var handleMutationRequest = handleMutateRequest;
-async function handleMutateRequest(dbProvider, cb, queryStringOrRequest, bodyOrLogLevel, logLevel) {
-	const isRequestOverload = queryStringOrRequest instanceof Request;
-	let request;
-	let queryString;
-	let jsonBody;
-	let lc;
-	if (isRequestOverload) {
-		request = queryStringOrRequest;
-		lc = createLogContext(bodyOrLogLevel ?? "info").withContext("PushProcessor");
-		queryString = new URL(request.url).searchParams;
-		try {
-			jsonBody = await request.json();
-		} catch (error) {
-			lc.error?.("Failed to parse push body", error);
-			const message = `Failed to parse push body: ${getErrorMessage(error)}`;
-			const details = getErrorDetails(error);
-			return {
-				kind: PushFailed,
-				origin: Server,
-				reason: Parse,
-				message,
-				mutationIDs: [],
-				...details ? { details } : {}
-			};
-		}
+async function handleMutateRequest(dbProvider, cb, requestOrQueryParams, jsonBodyOrLogLevelOrOptions, logLevelOrOptions) {
+	let requestOrJsonBody;
+	let queryParams;
+	let optionsArg;
+	if (requestOrQueryParams instanceof Request) {
+		requestOrJsonBody = requestOrQueryParams;
+		queryParams = new URL(requestOrQueryParams.url).searchParams;
+		optionsArg = jsonBodyOrLogLevelOrOptions;
 	} else {
-		queryString = queryStringOrRequest;
-		jsonBody = bodyOrLogLevel;
-		lc = createLogContext(logLevel ?? "info").withContext("PushProcessor");
+		requestOrJsonBody = jsonBodyOrLogLevelOrOptions;
+		queryParams = requestOrQueryParams;
+		optionsArg = logLevelOrOptions;
+	}
+	const options = normalizeMutateRequestOptions(optionsArg);
+	const normalized = {
+		requestOrJsonBody,
+		userID: "userID" in options ? options.userID ?? null : void 0,
+		queryParams,
+		logLevel: options.logLevel ?? "info"
+	};
+	const lc = createLogContext(normalized.logLevel).withContext("PushProcessor");
+	let jsonBody;
+	if (normalized.requestOrJsonBody instanceof Request) try {
+		jsonBody = await normalized.requestOrJsonBody.json();
+	} catch (error) {
+		lc.error?.("Failed to parse push body", error);
+		const message = `Failed to parse push body: ${getErrorMessage(error)}`;
+		const details = getErrorDetails(error);
+		return {
+			kind: PushFailed,
+			origin: Server,
+			reason: Parse,
+			message,
+			mutationIDs: [],
+			...details ? { details } : {}
+		};
 	}
+	else jsonBody = normalized.requestOrJsonBody;
 	let mutationIDs = [];
 	let pushBody;
 	try {
-		pushBody = parse(jsonBody, pushBodySchema);
+		pushBody = parse(jsonBody, pushBodySchema, "passthrough");
 		mutationIDs = pushBody.mutations.map((m) => ({
 			id: m.id,
 			clientID: m.clientID
@@ -75,9 +85,9 @@ async function handleMutateRequest(dbProvider, cb, queryStringOrRequest, bodyOrL
 			...details ? { details } : {}
 		};
 	}
-	let queryParams;
+	let parsedQueryParams;
 	try {
-		queryParams = parse(queryString instanceof URLSearchParams ? Object.fromEntries(queryString) : queryString, pushParamsSchema, "passthrough");
+		parsedQueryParams = parse(normalized.queryParams instanceof URLSearchParams ? Object.fromEntries(normalized.queryParams) : normalized.queryParams, mutateParamsSchema, "passthrough");
 	} catch (error) {
 		lc.error?.("Failed to parse push query parameters", error);
 		const message = `Failed to parse push query parameters: ${getErrorMessage(error)}`;
@@ -101,12 +111,12 @@ async function handleMutateRequest(dbProvider, cb, queryStringOrRequest, bodyOrL
 	const responses = [];
 	let processedCount = 0;
 	try {
-		const transactor = new Transactor(dbProvider, pushBody, queryParams, lc);
+		const transactor = new Transactor(dbProvider, pushBody, parsedQueryParams, lc);
 		for (const m of pushBody.mutations) {
 			if (m.type === "custom" && m.name === "_zero_cleanupResults") {
 				lc.debug?.(`Processing internal mutation '${m.name}' (clientID=${m.clientID})`);
 				try {
-					await processCleanupResultsMutation(dbProvider, m, queryParams, lc);
+					await processCleanupResultsMutation(dbProvider, m, parsedQueryParams, lc);
 					processedCount++;
 				} catch (error) {
 					lc.warn?.(`Failed to process cleanup mutation for client ${m.clientID}`, error);
@@ -137,7 +147,11 @@ async function handleMutateRequest(dbProvider, cb, queryStringOrRequest, bodyOrL
 				processedCount++;
 			}
 		}
-		return { mutations: responses };
+		return {
+			kind: "MutateResponse",
+			mutations: responses,
+			...typeof normalized.userID !== "undefined" ? { userID: normalized.userID } : {}
+		};
 	} catch (error) {
 		lc.error?.("Failed to process push request", error);
 		const unprocessedMutationIDs = mutationIDs.slice(processedCount);
@@ -153,6 +167,9 @@ async function handleMutateRequest(dbProvider, cb, queryStringOrRequest, bodyOrL
 		};
 	}
 }
+function normalizeMutateRequestOptions(logLevelOrOptions) {
+	return typeof logLevelOrOptions === "string" ? { logLevel: logLevelOrOptions } : logLevelOrOptions ?? {};
+}
 var Transactor = class {
 	#dbProvider;
 	#req;

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

@@ -1 +1 @@
-{"version":3,"file":"process-mutations.js","names":["#dbProvider","#req","#params","#lc","#transactImpl","#checkAndIncrementLastMutationID","#getTransactionInput"],"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  CLEANUP_RESULTS_MUTATION_NAME,\n  cleanupResultsArgSchema,\n  pushBodySchema,\n  pushParamsSchema,\n  type CleanupResultsArg,\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';\nimport {separatorRe} from './push-processor.ts';\n\nexport interface TransactionProviderHooks {\n  updateClientMutationID: () => Promise<{lastMutationID: number | bigint}>;\n  writeMutationResult: (result: MutationResponse) => Promise<void>;\n  deleteMutationResults: (args: CleanupResultsArg) => 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      // Handle internal mutations (like cleanup) directly without user dispatch\n      if (m.type === 'custom' && m.name === CLEANUP_RESULTS_MUTATION_NAME) {\n        lc.debug?.(\n          `Processing internal mutation '${m.name}' (clientID=${m.clientID})`,\n        );\n        try {\n          await processCleanupResultsMutation(dbProvider, m, queryParams, lc);\n          // No response added - this is fire-and-forget\n          processedCount++;\n        } catch (error) {\n          lc.warn?.(\n            `Failed to process cleanup mutation for client ${m.clientID}`,\n            error,\n          );\n          // Don't fail the whole push for cleanup errors\n          processedCount++;\n        }\n        continue;\n      }\n\n      assert(m.type === 'custom', 'Expected custom mutation');\n      lc.debug?.(\n        `Processing mutation '${m.name}' (id=${m.id}, clientID=${m.clientID})`,\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, innerCb);\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 (appError !== undefined) {\n          // Retry also failed → internal error, cannot skip mutation\n          this.#lc.error?.(\n            `Retry also failed for mutation ${mutation.id} for client ${mutation.clientID}`,\n            error,\n          );\n          throw error;\n        }\n\n        // First attempt failed → store error and retry without mutator\n        const originalError =\n          error instanceof DatabaseTransactionError\n            ? (error.cause ?? error)\n            : error;\n        appError = wrapWithApplicationError(originalError);\n        this.#lc.warn?.(\n          `Error processing mutation ${mutation.id} for client ${mutation.clientID}, retrying without mutator`,\n          appError,\n        );\n        continue;\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            await cb(dbTx, mutation.name, mutation.args[0]);\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(separatorRe);\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\n/**\n * Processes internal cleanup mutation that deletes acknowledged mutation results\n * from the upstream database. This runs without LMID tracking since it's an\n * internal operation.\n */\nasync function processCleanupResultsMutation<\n  D extends Database<ExtractTransactionType<D>>,\n>(\n  dbProvider: D,\n  mutation: CustomMutation,\n  queryParams: Params,\n  lc: LogContext,\n): Promise<void> {\n  const parseResult = v.test(mutation.args[0], cleanupResultsArgSchema);\n  if (!parseResult.ok) {\n    lc.warn?.('Cleanup mutation has invalid args', parseResult.error);\n    return;\n  }\n  const args: CleanupResultsArg = parseResult.value;\n\n  // Determine clientID for transaction input based on cleanup type\n  // Note: legacy format without type field is treated as single\n  const clientID =\n    'type' in args && args.type === 'bulk' ? args.clientIDs[0] : args.clientID;\n\n  // Run in a transaction, using the hook for DB-specific operation.\n  // Note: only upstreamSchema is used by deleteMutationResults; the other\n  // fields are required by the interface but ignored for this operation.\n  await dbProvider.transaction(\n    async (_, hooks) => {\n      await hooks.deleteMutationResults(args);\n    },\n    {\n      upstreamSchema: queryParams.schema,\n      clientGroupID: args.clientGroupID,\n      clientID,\n      mutationID: 0,\n    },\n  );\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"],"mappings":";;;;;;;;;;;;;;AAoFA,IAAM,0BAA0B,OAAU,OAAqC;AAC7E,KAAI;AACF,SAAO,MAAM,IAAI;UACV,OAAO;AACd,MACE,iBAAiB,4BACjB,iBAAiB,sBACjB,iBAAiB,iCACjB,mBAAmB,MAAM,CAEzB,OAAM;AAGR,QAAM,yBAAyB,MAAM;;;;;;AAOzC,IAAa,wBAAwB;AA2BrC,eAAsB,oBAGpB,YACA,IAIA,sBACA,gBACA,UACuB;CAEvB,MAAM,oBAAoB,gCAAgC;CAE1D,IAAI;CACJ,IAAI;CACJ,IAAI;CAEJ,IAAI;AAEJ,KAAI,mBAAmB;AACrB,YAAU;AAIV,OAAK,iBAHU,kBAA2C,OAG9B,CAAC,YAAY,gBAAgB;AAGzD,gBADY,IAAI,IAAI,QAAQ,IAAI,CACd;AAElB,MAAI;AACF,cAAW,MAAM,QAAQ,MAAM;WACxB,OAAO;AACd,MAAG,QAAQ,6BAA6B,MAAM;GAC9C,MAAM,UAAU,8BAA8B,gBAAgB,MAAM;GACpE,MAAM,UAAU,gBAAgB,MAAM;AACtC,UAAO;IACL,MAAM;IACN,QAAQ;IACR,QAAQ;IACR;IACA,aAAa,EAAE;IACf,GAAI,UAAU,EAAC,SAAQ,GAAG,EAAE;IAC7B;;QAEE;AACL,gBAAc;AACd,aAAW;AAEX,OAAK,iBADS,YAAY,OACE,CAAC,YAAY,gBAAgB;;CAG3D,IAAI,cAA4B,EAAE;CAElC,IAAI;AACJ,KAAI;AACF,aAAW,MAAQ,UAAU,eAAe;AAC5C,gBAAc,SAAS,UAAU,KAAI,OAAM;GACzC,IAAI,EAAE;GACN,UAAU,EAAE;GACb,EAAE;UACI,OAAO;AACd,KAAG,QAAQ,6BAA6B,MAAM;EAC9C,MAAM,UAAU,8BAA8B,gBAAgB,MAAM;EACpE,MAAM,UAAU,gBAAgB,MAAM;AACtC,SAAO;GACL,MAAM;GACN,QAAQ;GACR,QAAQ;GACR;GACA;GACA,GAAI,UAAU,EAAC,SAAQ,GAAG,EAAE;GAC7B;;CAGH,IAAI;AACJ,KAAI;AAKF,gBAAc,MAHZ,uBAAuB,kBACnB,OAAO,YAAY,YAAY,GAC/B,aACgC,kBAAkB,cAAc;UAC/D,OAAO;AACd,KAAG,QAAQ,yCAAyC,MAAM;EAC1D,MAAM,UAAU,0CAA0C,gBAAgB,MAAM;EAChF,MAAM,UAAU,gBAAgB,MAAM;AACtC,SAAO;GACL,MAAM;GACN,QAAQ;GACR,QAAQ;GACR;GACA;GACA,GAAI,UAAU,EAAC,SAAQ,GAAG,EAAE;GAC7B;;AAGH,KAAI,SAAS,gBAAgB,EAQ3B,QAPiB;EACf,MAAM;EACN,QAAQ;EACR,QAAQ;EACR;EACA,SAAS,6BAA6B,SAAS;EAChD;CAIH,MAAM,YAAgC,EAAE;CACxC,IAAI,iBAAiB;AAErB,KAAI;EACF,MAAM,aAAa,IAAI,WAAW,YAAY,UAAU,aAAa,GAAG;AASxE,OAAK,MAAM,KAAK,SAAS,WAAW;AAElC,OAAI,EAAE,SAAS,YAAY,EAAE,SAAA,wBAAwC;AACnE,OAAG,QACD,iCAAiC,EAAE,KAAK,cAAc,EAAE,SAAS,GAClE;AACD,QAAI;AACF,WAAM,8BAA8B,YAAY,GAAG,aAAa,GAAG;AAEnE;aACO,OAAO;AACd,QAAG,OACD,iDAAiD,EAAE,YACnD,MACD;AAED;;AAEF;;AAGF,UAAO,EAAE,SAAS,UAAU,2BAA2B;AACvD,MAAG,QACD,wBAAwB,EAAE,KAAK,QAAQ,EAAE,GAAG,aAAa,EAAE,SAAS,GACrE;GAED,IAAI,gBAA+B;GAEnC,MAAM,gBAA+B,OAAM,YAAW;AACpD,oBAAgB;IAChB,MAAM,SAAS,MAAM,WAAW,SAAS,GAAG,QAAQ;AACpD,oBAAgB;AAChB,WAAO;;AAGT,OAAI;IACF,MAAM,MAAM,MAAM,8BAA8B,GAAG,eAAe,EAAE,CAAC;AACrE,cAAU,KAAK,IAAI;AACnB,OAAG,QAAQ,aAAa,EAAE,KAAK,QAAQ,EAAE,GAAG,0BAA0B;AAEtE;YACO,OAAO;AACd,QAAI,CAAC,mBAAmB,MAAM,CAC5B,OAAM;AAGR,QAAI,kBAAkB,iBAEpB,OAAM,WAAW,6BAA6B,GAAG,MAAM;aAC9C,kBAAkB,aAE3B,IAAG,QACD,oDAAoD,EAAE,GAAG,cAAc,EAAE,YACzE,MACD;AAGH,OAAG,OACD,yCAAyC,EAAE,GAAG,cAAc,EAAE,YAC9D,MACD;AACD,cAAU,KAAK,qBAAqB,GAAG,MAAM,CAAC;AAE9C;;;AAIJ,SAAO,EACL,WAAW,WACZ;UACM,OAAO;AACd,KAAG,QAAQ,kCAAkC,MAAM;EAEnD,MAAM,yBAAyB,YAAY,MAAM,eAAe;EAEhE,MAAM,UAAU,gBAAgB,MAAM;EACtC,MAAM,UAAU,gBAAgB,MAAM;AAEtC,SAAO;GACL,MAAM;GACN,QAAQ;GACR,QACE,iBAAiB,qBACb,uBACA,iBAAiB,2BACf,WACA;GACR;GACA,aAAa;GACb,GAAI,UAAU,EAAC,SAAQ,GAAG,EAAE;GAC7B;;;AAIL,IAAM,aAAN,MAAgE;CAC9D;CACA;CACA;CACA;CAEA,YAAY,YAAe,KAAe,QAAgB,IAAgB;AACxE,QAAA,aAAmB;AACnB,QAAA,MAAY;AACZ,QAAA,SAAe;AACf,QAAA,KAAW;;CAGb,WAAW,OACT,UACA,OAC8B;EAC9B,IAAI,WAAyC,KAAA;AAC7C,UACE,KAAI;GACF,MAAM,MAAM,MAAM,MAAA,aAAmB,UAAU,IAAI,SAAS;AAC5D,OAAI,aAAa,KAAA,GAAW;AAC1B,UAAA,GAAS,OACP,YAAY,SAAS,GAAG,cAAc,SAAS,SAAS,8BACxD,SACD;AACD,WAAO,qBAAqB,UAAU,SAAS;;AAGjD,UAAO;WACA,OAAO;AACd,OAAI,iBAAiB,oBAAoB;AACvC,UAAA,GAAS,QAAQ,MAAM;AACvB,UAAM;;AAGR,OAAI,iBAAiB,+BAA+B;AAClD,UAAA,GAAS,OAAO,MAAM;AACtB,WAAO;KACL,IAAI;MACF,UAAU,SAAS;MACnB,IAAI,SAAS;MACd;KACD,QAAQ;MACN,OAAO;MACP,SAAS,MAAM;MAChB;KACF;;AAGH,OAAI,aAAa,KAAA,GAAW;AAE1B,UAAA,GAAS,QACP,kCAAkC,SAAS,GAAG,cAAc,SAAS,YACrE,MACD;AACD,UAAM;;AAQR,cAAW,yBAHT,iBAAiB,2BACZ,MAAM,SAAS,QAChB,MAC4C;AAClD,SAAA,GAAS,OACP,6BAA6B,SAAS,GAAG,cAAc,SAAS,SAAS,6BACzE,SACD;AACD;;;CAKN,MAAM,6BACJ,UACA,UAC2B;AAS3B,SANY,MAAM,MAAA,aAChB,gBAEM,aACN,SACD;;CAIH,OAAA,aACE,UACA,IACA,UAC2B;EAC3B,IAAI,mBAA6C;AAEjD,MAAI;AAiCF,UAhCY,MAAM,MAAA,WAAiB,YACjC,OAAO,MAAM,qBAAqB;AAEhC,uBAAmB;AAEnB,UAAM,MAAA,gCACJ,kBACA,SAAS,UACT,SAAS,GACV;AAED,QAAI,aAAa,KAAA,GAAW;AAC1B,WAAA,GAAS,QACP,sBAAsB,SAAS,KAAK,QAAQ,SAAS,GAAG,GACzD;AACD,WAAM,GAAG,MAAM,SAAS,MAAM,SAAS,KAAK,GAAG;WAC1C;KACL,MAAM,iBAAiB,qBAAqB,UAAU,SAAS;AAC/D,WAAM,iBAAiB,oBAAoB,eAAe;;AAG5D,WAAO;KACL,IAAI;MACF,UAAU,SAAS;MACnB,IAAI,SAAS;MACd;KACD,QAAQ,EAAE;KACX;MAEH,MAAA,oBAA0B,SAAS,CACpC;WAGM,OAAO;AACd,OACE,mBAAmB,MAAM,IACzB,iBAAiB,sBACjB,iBAAiB,8BAEjB,OAAM;AAGR,SAAM,IAAI,yBAAyB,kBAAkB,EAAC,OAAO,OAAM,CAAC;;;CAIxE,qBAAqB,UAAoD;AACvE,SAAO;GACL,gBAAgB,MAAA,OAAa;GAC7B,eAAe,MAAA,IAAU;GACzB,UAAU,SAAS;GACnB,YAAY,SAAS;GACtB;;CAGH,OAAA,gCACE,kBACA,UACA,oBACA;EACA,MAAM,EAAC,mBAAkB,MAAM,iBAAiB,wBAAwB;AAExE,MAAI,qBAAqB,eACvB,OAAM,IAAI,8BACR,UACA,oBACA,eACD;WACQ,qBAAqB,eAC9B,OAAM,IAAI,mBACR,UACA,oBACA,eACD;;;AAKP,IAAa,qBAAb,cAAwC,MAAM;CAC5C,YACE,UACA,oBACA,gBACA;AACA,QACE,UAAU,SAAS,oBAAoB,mBAAmB,gBAAgB,iBAC3E;;;AAIL,SAAS,qBACP,GACA,OACkB;AAClB,QAAO;EACL,IAAI;GACF,UAAU,EAAE;GACZ,IAAI,EAAE;GACP;EACD,QAAQ;GACN,OAAO;GACP,SAAS,MAAM;GACf,GAAI,MAAM,UAAU,EAAC,SAAS,MAAM,SAAQ,GAAG,EAAE;GAClD;EACF;;;AAIH,SAAgB,YAEd,UACA,MAEwB;CAExB,MAAM,UAAU,gBAAgB,UADnB,KAAK,MAAM,YAAY,CACW;AAC/C,QAAO,OAAO,YAAY,YAAY,0BAA0B,OAAO;AAEvE,KAAI,UAAU,QAAQ,CAGpB,SAAQ,IAAI,MAAM,QAAQ,QAAQ,GAAG;EAAC;EAAM;EAAK;EAAG,CAAC;AAIvD,QAAO;;AAGT,SAAS,gBACP,KACA,MACS;CACT,IAAI,UAAmB;AACvB,MAAK,MAAM,QAAQ,MAAM;AACvB,MAAI,OAAO,YAAY,YAAY,YAAY,QAAQ,EAAE,QAAQ,SAC/D;AAEF,YAAW,QAAoC;;AAEjD,QAAO;;;;;;;AAQT,eAAe,8BAGb,YACA,UACA,aACA,IACe;CACf,MAAM,cAAc,KAAO,SAAS,KAAK,IAAI,wBAAwB;AACrE,KAAI,CAAC,YAAY,IAAI;AACnB,KAAG,OAAO,qCAAqC,YAAY,MAAM;AACjE;;CAEF,MAAM,OAA0B,YAAY;CAI5C,MAAM,WACJ,UAAU,QAAQ,KAAK,SAAS,SAAS,KAAK,UAAU,KAAK,KAAK;AAKpE,OAAM,WAAW,YACf,OAAO,GAAG,UAAU;AAClB,QAAM,MAAM,sBAAsB,KAAK;IAEzC;EACE,gBAAgB,YAAY;EAC5B,eAAe,KAAK;EACpB;EACA,YAAY;EACb,CACF;;AAIH,IAAM,2BAAN,cAAuC,MAAM;CAC3C,YAAY,OAAiC,SAAwB;AACnE,QACE,UAAU,SACN,wCAAwC,gBAAgB,SAAS,MAAM,KACvE,8CAA8C,gBAAgB,SAAS,MAAM,IACjF,QACD;AACD,OAAK,OAAO"}
+{"version":3,"file":"process-mutations.js","names":["#dbProvider","#req","#params","#lc","#transactImpl","#checkAndIncrementLastMutationID","#getTransactionInput"],"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  mutateParamsSchema,\n  type MutateResponse,\n} from '../../zero-protocol/src/mutate-server.ts';\nimport type {MutationID} from '../../zero-protocol/src/mutation-id.ts';\nimport {\n  CLEANUP_RESULTS_MUTATION_NAME,\n  cleanupResultsArgSchema,\n  type CleanupResultsArg,\n  type CustomMutation,\n  type Mutation,\n} from '../../zero-protocol/src/mutation.ts';\nimport {\n  pushBodySchema,\n  type MutationResponse,\n  type PushBody,\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';\nimport {separatorRe} from './push-processor.ts';\n\nexport interface TransactionProviderHooks {\n  updateClientMutationID: () => Promise<{lastMutationID: number | bigint}>;\n  writeMutationResult: (result: MutationResponse) => Promise<void>;\n  deleteMutationResults: (args: CleanupResultsArg) => 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 mutateParamsSchema>;\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\ntype QueryParams = URLSearchParams | Record<string, string>;\n\nexport type MutateRequestOptions = {\n  userID?: string | null | undefined;\n  logLevel?: LogLevel | undefined;\n};\n\ntype NormalizedMutateRequestArgs = {\n  readonly requestOrJsonBody: Request | ReadonlyJSONValue;\n  readonly userID: string | null | undefined;\n  readonly queryParams: QueryParams;\n  readonly logLevel: LogLevel;\n};\n\n/**\n * Process a `/mutate` request from a `Request`.\n *\n * @param dbProvider - Database used to run transactions and store mutation\n * results.\n * @param cb - Runs once per custom mutation. Use `transact` for DB work.\n * Errors before `transact` are saved; errors after commit are logged.\n * @param request - Request to read query params and JSON body from.\n * @param logLevelOrOptions - Either a log level or additional request\n * options.\n * @returns A `MutateResponse`. Success returns `userID: options.userID ?? null`\n * when `options.userID` is provided; invalid requests return the `PushFailed`\n * branch.\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  logLevelOrOptions?: LogLevel | MutateRequestOptions,\n): Promise<MutateResponse>;\n\n/**\n * Process a `/mutate` request from parsed query params and a parsed JSON body.\n *\n * @param dbProvider - Database used to run transactions and store mutation\n * results.\n * @param cb - Runs once per custom mutation. Use `transact` for DB work.\n * Errors before `transact` are saved; errors after commit are logged.\n * @param queryParams - Parsed query params.\n * @param jsonBody - Parsed JSON body.\n * @param logLevelOrOptions - Either a log level or additional request\n * options.\n * @returns A `MutateResponse`. Success returns `userID: options.userID ?? null`\n * when `options.userID` is provided; invalid requests return the `PushFailed`\n * branch.\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  queryParams: QueryParams,\n  jsonBody: ReadonlyJSONValue,\n  logLevelOrOptions?: LogLevel | MutateRequestOptions,\n): Promise<MutateResponse>;\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  requestOrQueryParams: Request | QueryParams,\n  jsonBodyOrLogLevelOrOptions?:\n    | ReadonlyJSONValue\n    | LogLevel\n    | MutateRequestOptions,\n  logLevelOrOptions?: LogLevel | MutateRequestOptions,\n): Promise<MutateResponse> {\n  let requestOrJsonBody: Request | ReadonlyJSONValue;\n  let queryParams: QueryParams;\n  let optionsArg: LogLevel | MutateRequestOptions | undefined;\n\n  if (requestOrQueryParams instanceof Request) {\n    requestOrJsonBody = requestOrQueryParams;\n    queryParams = new URL(requestOrQueryParams.url).searchParams;\n    optionsArg = jsonBodyOrLogLevelOrOptions as\n      | LogLevel\n      | MutateRequestOptions\n      | undefined;\n  } else {\n    requestOrJsonBody = jsonBodyOrLogLevelOrOptions as ReadonlyJSONValue;\n    queryParams = requestOrQueryParams;\n    optionsArg = logLevelOrOptions;\n  }\n\n  const options = normalizeMutateRequestOptions(optionsArg);\n  const normalized: NormalizedMutateRequestArgs = {\n    requestOrJsonBody,\n    userID: 'userID' in options ? (options.userID ?? null) : undefined,\n    queryParams,\n    logLevel: options.logLevel ?? 'info',\n  };\n  const lc = createLogContext(normalized.logLevel).withContext('PushProcessor');\n  let jsonBody: unknown;\n\n  if (normalized.requestOrJsonBody instanceof Request) {\n    try {\n      jsonBody = await normalized.requestOrJsonBody.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    jsonBody = normalized.requestOrJsonBody;\n  }\n\n  let mutationIDs: MutationID[] = [];\n\n  let pushBody: PushBody;\n  try {\n    pushBody = v.parse(jsonBody, pushBodySchema, 'passthrough');\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 parsedQueryParams: Params;\n  try {\n    const rawQueryParams =\n      normalized.queryParams instanceof URLSearchParams\n        ? Object.fromEntries(normalized.queryParams)\n        : normalized.queryParams;\n    parsedQueryParams = v.parse(\n      rawQueryParams,\n      mutateParamsSchema,\n      'passthrough',\n    );\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      parsedQueryParams,\n      lc,\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      // Handle internal mutations (like cleanup) directly without user dispatch\n      if (m.type === 'custom' && m.name === CLEANUP_RESULTS_MUTATION_NAME) {\n        lc.debug?.(\n          `Processing internal mutation '${m.name}' (clientID=${m.clientID})`,\n        );\n        try {\n          await processCleanupResultsMutation(\n            dbProvider,\n            m,\n            parsedQueryParams,\n            lc,\n          );\n          // No response added - this is fire-and-forget\n          processedCount++;\n        } catch (error) {\n          lc.warn?.(\n            `Failed to process cleanup mutation for client ${m.clientID}`,\n            error,\n          );\n          // Don't fail the whole push for cleanup errors\n          processedCount++;\n        }\n        continue;\n      }\n\n      assert(m.type === 'custom', 'Expected custom mutation');\n      lc.debug?.(\n        `Processing mutation '${m.name}' (id=${m.id}, clientID=${m.clientID})`,\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, innerCb);\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      kind: 'MutateResponse',\n      mutations: responses,\n      ...(typeof normalized.userID !== 'undefined'\n        ? {userID: normalized.userID}\n        : {}),\n    } as const satisfies MutateResponse;\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\nfunction normalizeMutateRequestOptions(\n  logLevelOrOptions: LogLevel | MutateRequestOptions | undefined,\n): MutateRequestOptions {\n  return typeof logLevelOrOptions === 'string'\n    ? {logLevel: logLevelOrOptions}\n    : (logLevelOrOptions ?? {});\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 (appError !== undefined) {\n          // Retry also failed → internal error, cannot skip mutation\n          this.#lc.error?.(\n            `Retry also failed for mutation ${mutation.id} for client ${mutation.clientID}`,\n            error,\n          );\n          throw error;\n        }\n\n        // First attempt failed → store error and retry without mutator\n        const originalError =\n          error instanceof DatabaseTransactionError\n            ? (error.cause ?? error)\n            : error;\n        appError = wrapWithApplicationError(originalError);\n        this.#lc.warn?.(\n          `Error processing mutation ${mutation.id} for client ${mutation.clientID}, retrying without mutator`,\n          appError,\n        );\n        continue;\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            await cb(dbTx, mutation.name, mutation.args[0]);\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(separatorRe);\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\n/**\n * Processes internal cleanup mutation that deletes acknowledged mutation results\n * from the upstream database. This runs without LMID tracking since it's an\n * internal operation.\n */\nasync function processCleanupResultsMutation<\n  D extends Database<ExtractTransactionType<D>>,\n>(\n  dbProvider: D,\n  mutation: CustomMutation,\n  queryParams: Params,\n  lc: LogContext,\n): Promise<void> {\n  const parseResult = v.test(mutation.args[0], cleanupResultsArgSchema);\n  if (!parseResult.ok) {\n    lc.warn?.('Cleanup mutation has invalid args', parseResult.error);\n    return;\n  }\n  const args: CleanupResultsArg = parseResult.value;\n\n  // Determine clientID for transaction input based on cleanup type\n  // Note: legacy format without type field is treated as single\n  const clientID =\n    'type' in args && args.type === 'bulk' ? args.clientIDs[0] : args.clientID;\n\n  // Run in a transaction, using the hook for DB-specific operation.\n  // Note: only upstreamSchema is used by deleteMutationResults; the other\n  // fields are required by the interface but ignored for this operation.\n  await dbProvider.transaction(\n    async (_, hooks) => {\n      await hooks.deleteMutationResults(args);\n    },\n    {\n      upstreamSchema: queryParams.schema,\n      clientGroupID: args.clientGroupID,\n      clientID,\n      mutationID: 0,\n    },\n  );\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"],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 import { type LogLevel } from '@rocicorp/logger';
 import type { ReadonlyJSONValue } from '../../shared/src/json.ts';
-import { type PushResponse } from '../../zero-protocol/src/push.ts';
+import type { MutateResponse } from '../../zero-protocol/src/mutate-server.ts';
 import { type Database, type ExtractTransactionType } from '../../zero-server/src/process-mutations.ts';
 import type { Schema } from '../../zero-types/src/schema.ts';
 import type { AnyMutatorRegistry } from '../../zql/src/mutate/mutator-registry.ts';
@@ -20,13 +20,13 @@ export declare class PushProcessor<_S extends Schema, D extends Database<Extract
      * @param queryString the query string from the request sent by zero-cache. This will include zero's postgres schema name and appID.
      * @param body the body of the request sent by zero-cache as a JSON object.
      */
-    process(mutators: MD, queryString: URLSearchParams | Record<string, string>, body: ReadonlyJSONValue): Promise<PushResponse>;
+    process(mutators: MD, queryString: URLSearchParams | Record<string, string>, body: ReadonlyJSONValue): Promise<MutateResponse>;
     /**
      * This override gets the query string and the body from a Request object.
      *
      * @param mutators the custom mutators for the application
      * @param request A `Request` object.
      */
-    process(mutators: MD, request: Request): Promise<PushResponse>;
+    process(mutators: MD, request: Request): Promise<MutateResponse>;
 }
 //# sourceMappingURL=push-processor.d.ts.map

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,eAAO,MAAM,WAAW,QAAS,CAAC;AAElC,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"}
+{"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,KAAK,EAAC,cAAc,EAAC,MAAM,0CAA0C,CAAC;AAG7E,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,eAAO,MAAM,WAAW,QAAS,CAAC;AAElC,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,cAAc,CAAC;IAE1B;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC;CAqDjE"}

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

@@ -1 +1 @@
-{"version":3,"file":"push-processor.js","names":["#dbProvider","#logLevel","#context","#processMutation","#dispatchMutation"],"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 const separatorRe = /[.|]/;\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, 'body is required when using query params directly'),\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, separatorRe);\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"],"mappings":";;;;;;;;AAsBA,IAAa,cAAc;AAE3B,IAAa,gBAAb,MAKE;CACA;CACA;CACA;CAEA,YAAY,YAAe,SAAa,WAAqB,QAAQ;AACnE,QAAA,aAAmB;AACnB,QAAA,UAAgB;AAChB,QAAA,WAAiB;;CA2BnB,QACE,UACA,oBACA,MACuB;AACvB,MAAI,8BAA8B,QAChC,QAAO,oBACL,MAAA,aACC,UAAU,aACT,MAAA,gBAAsB,UAAU,UAAU,SAAS,EACrD,oBACA,MAAA,SACD;AAEH,SAAO,oBACL,MAAA,aACC,UAAU,aACT,MAAA,gBAAsB,UAAU,UAAU,SAAS,EACrD,oBACA,KAAK,MAAM,oDAAoD,EAC/D,MAAA,SACD;;CAGH,iBACE,UACA,UACA,WAC2B;AAC3B,SAAO,UAAU,IAAI,MAAM,SACzB,MAAA,iBAAuB,UAAU,IAAI,MAAM,KAAK,CACjD;;CAGH,kBACE,UACA,MACA,KACA,MACe;EAEf,MAAM,UAAU,eAAe,UAAU,KAAK,YAAY;AAC1D,SAAO,OAAO,YAAY,YAAY,0BAA0B,MAAM;AACtE,MAAI,UAAU,QAAQ,CACpB,QAAO,QAAQ,GAAG;GAChB;GACA,KAAK,MAAA;GACL,IAAI;GACL,CAAC;AAEJ,SAAO,QAAQ,MAAM,KAAK"}
+{"version":3,"file":"push-processor.js","names":["#dbProvider","#logLevel","#context","#processMutation","#dispatchMutation"],"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 type {MutateResponse} from '../../zero-protocol/src/mutate-server.ts';\nimport type {CustomMutation} from '../../zero-protocol/src/mutation.ts';\nimport {type MutationResponse} 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 const separatorRe = /[.|]/;\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<MutateResponse>;\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<MutateResponse>;\n  process(\n    mutators: MD,\n    queryOrQueryString: Request | URLSearchParams | Record<string, string>,\n    body?: ReadonlyJSONValue,\n  ): Promise<MutateResponse> {\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, 'body is required when using query params directly'),\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, separatorRe);\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"],"mappings":";;;;;;;;AAoBA,IAAa,cAAc;AAE3B,IAAa,gBAAb,MAKE;CACA;CACA;CACA;CAEA,YAAY,YAAe,SAAa,WAAqB,QAAQ;AACnE,QAAA,aAAmB;AACnB,QAAA,UAAgB;AAChB,QAAA,WAAiB;;CA2BnB,QACE,UACA,oBACA,MACyB;AACzB,MAAI,8BAA8B,QAChC,QAAO,oBACL,MAAA,aACC,UAAU,aACT,MAAA,gBAAsB,UAAU,UAAU,SAAS,EACrD,oBACA,MAAA,SACD;AAEH,SAAO,oBACL,MAAA,aACC,UAAU,aACT,MAAA,gBAAsB,UAAU,UAAU,SAAS,EACrD,oBACA,KAAK,MAAM,oDAAoD,EAC/D,MAAA,SACD;;CAGH,iBACE,UACA,UACA,WAC2B;AAC3B,SAAO,UAAU,IAAI,MAAM,SACzB,MAAA,iBAAuB,UAAU,IAAI,MAAM,KAAK,CACjD;;CAGH,kBACE,UACA,MACA,KACA,MACe;EAEf,MAAM,UAAU,eAAe,UAAU,KAAK,YAAY;AAC1D,SAAO,OAAO,YAAY,YAAY,0BAA0B,MAAM;AACtE,MAAI,UAAU,QAAQ,CACpB,QAAO,QAAQ,GAAG;GAChB;GACA,KAAK,MAAA;GACL,IAAI;GACL,CAAC;AAEJ,SAAO,QAAQ,MAAM,KAAK"}

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

@@ -1,7 +1,7 @@
 import type { LogLevel } from '@rocicorp/logger';
 import type { ReadonlyJSONValue } from '../../../shared/src/json.ts';
 import type { MaybePromise } from '../../../shared/src/types.ts';
-import { type TransformResponseMessage } from '../../../zero-protocol/src/custom-queries.ts';
+import type { QueryResponse } from '../../../zero-protocol/src/query-server.ts';
 import type { Schema } from '../../../zero-types/src/schema.ts';
 import type { AnyQuery } from '../../../zql/src/query/query.ts';
 /**
@@ -15,7 +15,7 @@ import type { AnyQuery } from '../../../zql/src/query/query.ts';
  */
 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>;
+} | AnyQuery>, schema: S, requestOrJsonBody: Request | ReadonlyJSONValue, logLevel?: LogLevel): Promise<QueryResponse>;
 /**
  * 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.
@@ -27,59 +27,29 @@ export declare function handleGetQueriesRequest<S extends Schema>(cb: (name: str
  */
 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>;
+} | AnyQuery>, schema: S, requestOrJsonBody: Request | ReadonlyJSONValue, logLevel?: LogLevel): Promise<QueryResponse>;
+export type QueryRequestOptions = {
+    userID?: string | null | undefined;
+    logLevel?: LogLevel | undefined;
+};
 /**
- * Processes a transform request by invoking the provided callback for each query.
- * The callback should return a Query that is the transformed result.
+ * Process a `/query` request.
  *
- * This function will call `transformQuery` in parallel for each query found in the request.
- *
- * @param transformQuery - Callback function that takes a query name and args, and returns a Query
- * @param schema - The Zero schema
- * @param requestOrJsonBody - Either a Request object or the JSON body directly
- * @param logLevel - Logging level (defaults to 'info')
- * @returns A Promise that resolves to a TransformResponseMessage
+ * @param transformQuery - Runs once per requested query with the query name
+ * and first JSON argument. Returns a `Query`.
+ * @param schema - Schema used when building the returned ASTs.
+ * @param request - A Fetch `Request`.
+ * @param logLevelOrOptions - Either a log level or additional request
+ * options.
+ * @returns A `QueryResponse`. Success returns `userID: options.userID ?? null`
+ * when `options.userID` is provided. Per-query errors stay in `queries`;
+ * malformed requests return `TransformFailed`.
+ */
+export declare function handleQueryRequest<S extends Schema>(transformQuery: TransformQueryFunction, schema: S, request: Request, logLevelOrOptions?: LogLevel | QueryRequestOptions): Promise<QueryResponse>;
+/**
+ * Process a `/query` request from a parsed JSON body.
  */
-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";
-    id: string;
-    name: string;
-} | {
-    details?: ReadonlyJSONValue | undefined;
-    error: "parse";
-    id: string;
-    name: string;
-    message: string;
-} | {
-    id: string;
-    name: string;
-    ast: import("../../../zero-protocol/src/ast.ts").AST;
-})[]] | ["transformFailed", {
-    details?: ReadonlyJSONValue | undefined;
-    message: string;
-    kind: "TransformFailed";
-    queryIDs: string[];
-    origin: "server";
-    reason: "parse" | "database" | "internal";
-} | {
-    details?: ReadonlyJSONValue | undefined;
-    bodyPreview?: string | undefined;
-    message: string;
-    kind: "TransformFailed";
-    queryIDs: string[];
-    origin: "zeroCache";
-    reason: "http";
-    status: number;
-} | {
-    details?: ReadonlyJSONValue | undefined;
-    message: string;
-    kind: "TransformFailed";
-    queryIDs: string[];
-    origin: "zeroCache";
-    reason: "parse" | "internal" | "timeout";
-}]>;
+export declare function handleQueryRequest<S extends Schema>(transformQuery: TransformQueryFunction, schema: S, jsonBody: ReadonlyJSONValue, logLevelOrOptions?: LogLevel | QueryRequestOptions): Promise<QueryResponse>;
 /**
  * A function that transforms a query by name and arguments into a Query object.
  *

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,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"}
+{"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;AAW/D,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,4CAA4C,CAAC;AAE9E,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,aAAa,CAAC,CASxB;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,aAAa,CAAC,CASxB;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;CACjC,CAAC;AAQF;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,MAAM,EACjD,cAAc,EAAE,sBAAsB,EACtC,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,OAAO,EAChB,iBAAiB,CAAC,EAAE,QAAQ,GAAG,mBAAmB,GACjD,OAAO,CAAC,aAAa,CAAC,CAAC;AAE1B;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,MAAM,EACjD,cAAc,EAAE,sBAAsB,EACtC,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,iBAAiB,EAC3B,iBAAiB,CAAC,EAAE,QAAQ,GAAG,mBAAmB,GACjD,OAAO,CAAC,aAAa,CAAC,CAAC;AAoI1B;;;;;;GAMG;AACH,MAAM,MAAM,sBAAsB,GAAG,CACnC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,iBAAiB,GAAG,SAAS,KAChC,QAAQ,CAAC"}