@rocicorp/zero 1.4.0 → 1.5.0-canary.1

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,46 @@ 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>;
 /**
- * Processes a transform request by invoking the provided callback for each query.
- * The callback should return a Query that is the transformed result.
- *
- * 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
+ * Parsed query params accepted by {@linkcode handleQueryRequest} when the
+ * incoming request URL has already been handled by your framework.
  */
-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;
+export type QuerySearchParams = URLSearchParams | Record<string, string>;
+export type HandleQueryRequestArgs<S extends Schema> = {
+    /** Callback that transforms each requested query into a `Query`. */
+    handler: QueryRequestHandler;
+    /** Schema used when building the returned ASTs. */
+    schema: S;
+    /**
+     * Authenticated user ID. Null or undefined means the user is logged out.
+     */
+    userID: string | null | undefined;
+    /** Optional log level for request parsing and execution. */
+    logLevel?: LogLevel | undefined;
+} & ({
+    /** Fetch request containing the `/query` JSON body. */
+    request: Request;
 } | {
-    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";
-}]>;
+    /** Parsed query params from the `/query` request URL. */
+    query: QuerySearchParams;
+    /** Parsed JSON body from the `/query` request. */
+    body: ReadonlyJSONValue;
+});
+/**
+ * Process a `/query` request from a Fetch `Request`.
+ */
+export declare function handleQueryRequest<S extends Schema>(input: HandleQueryRequestArgs<S>): Promise<QueryResponse>;
+/**
+ * @deprecated Pass a single object instead:
+ * `handleQueryRequest({handler, schema, request, userID, logLevel})`.
+ */
+export declare function handleQueryRequest<S extends Schema>(transformQuery: QueryRequestHandler, schema: S, request: Request, logLevel?: LogLevel): Promise<QueryResponse>;
+/**
+ * @deprecated Pass a single object instead:
+ * `handleQueryRequest({handler, schema, body, userID, logLevel})`.
+ */
+export declare function handleQueryRequest<S extends Schema>(transformQuery: QueryRequestHandler, schema: S, jsonBody: ReadonlyJSONValue, logLevel?: LogLevel): Promise<QueryResponse>;
 /**
  * A function that transforms a query by name and arguments into a Query object.
  *
@@ -87,5 +74,10 @@ export declare function handleQueryRequest<S extends Schema>(transformQuery: Tra
  * @param args - The arguments to pass to the query (can be undefined)
  * @returns A Query object
  */
-export type TransformQueryFunction = (name: string, args: ReadonlyJSONValue | undefined) => AnyQuery;
+export type QueryRequestHandler = (name: string, args: ReadonlyJSONValue | undefined) => AnyQuery;
+/** @deprecated Use `QueryRequestHandler` instead. */
+export type TransformQueryFunction = QueryRequestHandler;
+export type LegacyQueryRequestHandler = (name: string, args: readonly ReadonlyJSONValue[]) => MaybePromise<{
+    query: AnyQuery;
+} | AnyQuery>;
 //# sourceMappingURL=process-queries.d.ts.map

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":"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"}

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

@@ -1,3 +1,4 @@
+import { assert } from "../../../shared/src/asserts.js";
 import { parse } from "../../../shared/src/valita.js";
 import { getErrorDetails, getErrorMessage } from "../../../shared/src/error.js";
 import { mapAST } from "../../../zero-protocol/src/ast.js";
@@ -20,7 +21,7 @@ import { createLogContext } from "../logging.js";
 * @deprecated Use {@linkcode handleQueryRequest} instead.
 */
 function handleGetQueriesRequest(cb, schema, requestOrJsonBody, logLevel = "info") {
-	return transform(cb, schema, requestOrJsonBody, "getQueries", logLevel);
+	return transform(normalizeLegacyQueryRequestArgs(cb, schema, requestOrJsonBody, logLevel), "getQueries");
 }
 /**
 * Invokes the callback `cb` for each query in the request or JSON body.
@@ -32,89 +33,107 @@ function handleGetQueriesRequest(cb, schema, requestOrJsonBody, logLevel = "info
 * @deprecated Use {@linkcode handleQueryRequest} instead.
 */
 function handleTransformRequest(cb, schema, requestOrJsonBody, logLevel = "info") {
-	return transform(cb, schema, requestOrJsonBody, "transform", logLevel);
+	return transform(normalizeLegacyQueryRequestArgs(cb, schema, requestOrJsonBody, logLevel), "transform");
 }
-/**
-* Processes a transform request by invoking the provided callback for each query.
-* The callback should return a Query that is the transformed result.
-*
-* 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
-*/
-function handleQueryRequest(transformQuery, schema, requestOrJsonBody, logLevel = "info") {
-	return transform((name, argsArray) => transformQuery(name, argsArray[0]), schema, requestOrJsonBody, "query", logLevel);
+function handleQueryRequest(inputOrTransformQuery, schema, requestOrJsonBody, logLevel) {
+	return transform(typeof inputOrTransformQuery === "object" && "handler" in inputOrTransformQuery ? normalizeQueryRequestInput(inputOrTransformQuery) : normalizeLegacyQueryRequestArgs(wrapQueryRequestHandler(inputOrTransformQuery), schema, requestOrJsonBody, logLevel), "query");
 }
-async function transform(cb, schema, requestOrJsonBody, apiName, logLevel = "info") {
-	const lc = createLogContext(logLevel).withContext("TransformRequest");
+function normalizeQueryRequestInput(input) {
+	return "request" in input ? normalizeLegacyQueryRequestArgs(wrapQueryRequestHandler(input.handler), input.schema, input.request, input.logLevel, input.userID ?? null) : normalizeLegacyQueryRequestArgs(wrapQueryRequestHandler(input.handler), input.schema, input.body, input.logLevel, input.userID ?? null);
+}
+function normalizeLegacyQueryRequestArgs(handler, schema, requestOrJsonBody, logLevel, userID) {
+	assert(typeof schema !== "undefined", "Schema must be provided when using handleQueryRequest");
+	if (requestOrJsonBody instanceof Request) return {
+		type: "request",
+		handler,
+		schema,
+		request: requestOrJsonBody,
+		userID,
+		logLevel: logLevel ?? "info"
+	};
+	assert(typeof requestOrJsonBody !== "undefined", "JSON body cannot be undefined");
+	return {
+		type: "body",
+		handler,
+		schema,
+		jsonBody: requestOrJsonBody,
+		userID,
+		logLevel: logLevel ?? "info"
+	};
+}
+async function transform(args, apiName) {
+	const lc = createLogContext(args.logLevel).withContext("TransformRequest");
 	let parsed;
 	let queryIDs = [];
 	try {
 		let body;
-		if (requestOrJsonBody instanceof Request) body = await requestOrJsonBody.json();
-		else body = requestOrJsonBody;
+		if (args.type === "request") body = await args.request.json();
+		else body = args.jsonBody;
 		parsed = parse(body, transformRequestMessageSchema);
 		queryIDs = parsed[1].map((r) => r.id);
 	} catch (error) {
 		lc.error?.(`Failed to parse ${apiName} request`, error);
 		const message = `Failed to parse ${apiName} request: ${getErrorMessage(error)}`;
 		const details = getErrorDetails(error);
-		return ["transformFailed", {
+		return {
 			kind: TransformFailed,
 			origin: Server,
 			reason: Parse,
 			message,
 			queryIDs,
 			...details ? { details } : {}
-		}];
+		};
 	}
 	try {
-		const nameMapper = clientToServer(schema.tables);
-		return ["transformed", await Promise.all(parsed[1].map(async (req) => {
-			let finalQuery;
-			try {
-				const result = await cb(req.name, req.args);
-				finalQuery = "query" in result ? result.query : result;
-			} catch (error) {
-				const message = getErrorMessage(error);
-				const details = getErrorDetails(error);
-				return {
-					error: error instanceof QueryParseError ? "parse" : "app",
-					id: req.id,
-					name: req.name,
-					message,
-					...details ? { details } : {}
-				};
-			}
-			try {
-				const ast = mapAST(asQueryInternals(finalQuery).ast, nameMapper);
-				return {
-					id: req.id,
-					name: req.name,
-					ast
-				};
-			} catch (error) {
-				lc.error?.("Failed to map AST", error);
-				throw error;
-			}
-		}))];
+		const nameMapper = clientToServer(args.schema.tables);
+		return {
+			kind: "QueryResponse",
+			queries: await Promise.all(parsed[1].map(async (req) => {
+				let finalQuery;
+				try {
+					const result = await args.handler(req.name, req.args);
+					finalQuery = "query" in result ? result.query : result;
+				} catch (error) {
+					const message = getErrorMessage(error);
+					const details = getErrorDetails(error);
+					return {
+						error: error instanceof QueryParseError ? "parse" : "app",
+						id: req.id,
+						name: req.name,
+						message,
+						...details ? { details } : {}
+					};
+				}
+				try {
+					const ast = mapAST(asQueryInternals(finalQuery).ast, nameMapper);
+					return {
+						id: req.id,
+						name: req.name,
+						ast
+					};
+				} catch (error) {
+					lc.error?.("Failed to map AST", error);
+					throw error;
+				}
+			})),
+			...typeof args.userID !== "undefined" ? { userID: args.userID } : {}
+		};
 	} catch (e) {
 		const message = getErrorMessage(e);
 		const details = getErrorDetails(e);
-		return ["transformFailed", {
+		return {
 			kind: TransformFailed,
 			origin: Server,
 			reason: Internal,
 			message,
 			queryIDs,
 			...details ? { details } : {}
-		}];
+		};
 	}
 }
+function wrapQueryRequestHandler(handler) {
+	return (name, args) => handler(name, args[0]);
+}
 //#endregion
 export { handleGetQueriesRequest, handleQueryRequest, handleTransformRequest };
 

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

@@ -1 +1 @@
-{"version":3,"file":"process-queries.js","names":[],"sources":["../../../../../zero-server/src/queries/process-queries.ts"],"sourcesContent":["import type {LogLevel} from '@rocicorp/logger';\nimport {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"],"mappings":";;;;;;;;;;;;;;;;;;;;;AA+BA,SAAgB,wBACd,IAIA,QACA,mBACA,WAAqB,QACc;AACnC,QAAO,UAAU,IAAI,QAAQ,mBAAmB,cAAc,SAAS;;;;;;;;;;;AAYzE,SAAgB,uBACd,IAIA,QACA,mBACA,WAAqB,QACc;AACnC,QAAO,UAAU,IAAI,QAAQ,mBAAmB,aAAa,SAAS;;;;;;;;;;;;;;AAexE,SAAgB,mBACd,gBACA,QACA,mBACA,WAAqB,QACrB;AACA,QAAO,WACJ,MAAM,cAAc,eAAe,MAAM,UAAU,GAAG,EACvD,QACA,mBACA,SACA,SACD;;AAGH,eAAe,UACb,IAIA,QACA,mBACA,SACA,WAAqB,QACc;CACnC,MAAM,KAAK,iBAAiB,SAAS,CAAC,YAAY,mBAAmB;CACrE,IAAI;CACJ,IAAI,WAAqB,EAAE;AAC3B,KAAI;EACF,IAAI;AACJ,MAAI,6BAA6B,QAC/B,QAAO,MAAM,kBAAkB,MAAM;MAErC,QAAO;AAGT,WAAS,MAAQ,MAAM,8BAA8B;AAErD,aAAW,OAAO,GAAG,KAAI,MAAK,EAAE,GAAG;UAC5B,OAAO;AACd,KAAG,QAAQ,mBAAmB,QAAQ,WAAW,MAAM;EAEvD,MAAM,UAAU,mBAAmB,QAAQ,YAAY,gBAAgB,MAAM;EAC7E,MAAM,UAAU,gBAAgB,MAAM;AAEtC,SAAO,CACL,mBACA;GACE,MAAM;GACN,QAAQ;GACR,QAAQ;GACR;GACA;GACA,GAAI,UAAU,EAAC,SAAQ,GAAG,EAAE;GAC7B,CACF;;AAGH,KAAI;EACF,MAAM,aAAa,eAAe,OAAO,OAAO;AAqChD,SAAO,CAAC,eAnCiC,MAAM,QAAQ,IACrD,OAAO,GAAG,IAAI,OAAM,QAAO;GACzB,IAAI;AACJ,OAAI;IACF,MAAM,SAAS,MAAM,GAAG,IAAI,MAAM,IAAI,KAAK;AAC3C,iBAAa,WAAW,SAAS,OAAO,QAAQ;YACzC,OAAO;IACd,MAAM,UAAU,gBAAgB,MAAM;IACtC,MAAM,UAAU,gBAAgB,MAAM;AAEtC,WAAO;KACL,OAAO,iBAAiB,kBAAkB,UAAU;KACpD,IAAI,IAAI;KACR,MAAM,IAAI;KACV;KACA,GAAI,UAAU,EAAC,SAAQ,GAAG,EAAE;KAC7B;;AAGH,OAAI;IAEF,MAAM,MAAM,OADF,iBAAiB,WAAW,CACjB,KAAK,WAAW;AAErC,WAAO;KACL,IAAI,IAAI;KACR,MAAM,IAAI;KACV;KACD;YACM,OAAO;AACd,OAAG,QAAQ,qBAAqB,MAAM;AACtC,UAAM;;IAER,CACH,CAEgC;UAC1B,GAAG;EACV,MAAM,UAAU,gBAAgB,EAAE;EAClC,MAAM,UAAU,gBAAgB,EAAE;AAElC,SAAO,CACL,mBACA;GACE,MAAM;GACN,QAAQ;GACR,QAAQ;GACR;GACA;GACA,GAAI,UAAU,EAAC,SAAQ,GAAG,EAAE;GAC7B,CACF"}
+{"version":3,"file":"process-queries.js","names":[],"sources":["../../../../../zero-server/src/queries/process-queries.ts"],"sourcesContent":["import type {LogLevel} from '@rocicorp/logger';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {getErrorDetails, getErrorMessage} from '../../../shared/src/error.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport type {MaybePromise} from '../../../shared/src/types.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {mapAST} from '../../../zero-protocol/src/ast.ts';\nimport {\n  transformRequestMessageSchema,\n  type TransformRequestMessage,\n  type TransformResponseBody,\n} from '../../../zero-protocol/src/custom-queries.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../zero-protocol/src/error-origin.ts';\nimport {ErrorReason} from '../../../zero-protocol/src/error-reason.ts';\nimport type {QueryResponse} from '../../../zero-protocol/src/query-server.ts';\nimport {clientToServer} from '../../../zero-schema/src/name-mapper.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {QueryParseError} from '../../../zql/src/query/error.ts';\nimport {asQueryInternals} from '../../../zql/src/query/query-internals.ts';\nimport type {AnyQuery} from '../../../zql/src/query/query.ts';\nimport {createLogContext} from '../logging.ts';\n\n/**\n * Invokes the callback `cb` for each query in the request or JSON body.\n * The callback should return a Query or Promise<Query> that is the transformed result.\n *\n * This function will call `cb` in parallel for each query found in the request.\n *\n * If you need to limit concurrency, you can use a library like `p-limit` to wrap the `cb` function.\n * @deprecated Use {@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<QueryResponse> {\n  return transform(\n    normalizeLegacyQueryRequestArgs(cb, schema, requestOrJsonBody, logLevel),\n    'getQueries',\n  );\n}\n\n/**\n * Invokes the callback `cb` for each query in the request or JSON body.\n * The callback should return a Query or Promise<Query> that is the transformed result.\n *\n * This function will call `cb` in parallel for each query found in the request.\n *\n * If you need to limit concurrency, you can use a library like `p-limit` to wrap the `cb` function.\n * @deprecated Use {@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<QueryResponse> {\n  return transform(\n    normalizeLegacyQueryRequestArgs(cb, schema, requestOrJsonBody, logLevel),\n    'transform',\n  );\n}\n\n/**\n * Parsed query params accepted by {@linkcode handleQueryRequest} when the\n * incoming request URL has already been handled by your framework.\n */\nexport type QuerySearchParams = URLSearchParams | Record<string, string>;\n\nexport type HandleQueryRequestArgs<S extends Schema> = {\n  /** Callback that transforms each requested query into a `Query`. */\n  handler: QueryRequestHandler;\n  /** Schema used when building the returned ASTs. */\n  schema: S;\n  /**\n   * Authenticated user ID. Null or undefined means the user is logged out.\n   */\n  userID: string | null | undefined;\n  /** Optional log level for request parsing and execution. */\n  logLevel?: LogLevel | undefined;\n} & (\n  | {\n      /** Fetch request containing the `/query` JSON body. */\n      request: Request;\n    }\n  | {\n      /** Parsed query params from the `/query` request URL. */\n      query: QuerySearchParams;\n      /** Parsed JSON body from the `/query` request. */\n      body: ReadonlyJSONValue;\n    }\n);\n\ntype NormalizedQueryRequestArgs<S extends Schema> = {\n  readonly schema: S;\n  readonly handler: LegacyQueryRequestHandler;\n  // Note: semantics of undefined differ from HandleQueryRequestArgs.userID.\n  // Here, undefined means the app didn't provide a user ID - we do not know if\n  // the user is logged in or not. This is legacy behavior needed to support\n  // deprecated signatures of handleQueryRequest which did not receive userID\n  // from app.\n  readonly userID: string | null | undefined;\n  readonly logLevel: LogLevel;\n} & (\n  | {\n      readonly type: 'request';\n      readonly request: Request;\n    }\n  | {\n      readonly type: 'body';\n      readonly jsonBody: ReadonlyJSONValue;\n    }\n);\n\n/**\n * Process a `/query` request from a Fetch `Request`.\n */\nexport function handleQueryRequest<S extends Schema>(\n  input: HandleQueryRequestArgs<S>,\n): Promise<QueryResponse>;\n\n/**\n * @deprecated Pass a single object instead:\n * `handleQueryRequest({handler, schema, request, userID, logLevel})`.\n */\nexport function handleQueryRequest<S extends Schema>(\n  transformQuery: QueryRequestHandler,\n  schema: S,\n  request: Request,\n  logLevel?: LogLevel,\n): Promise<QueryResponse>;\n\n/**\n * @deprecated Pass a single object instead:\n * `handleQueryRequest({handler, schema, body, userID, logLevel})`.\n */\nexport function handleQueryRequest<S extends Schema>(\n  transformQuery: QueryRequestHandler,\n  schema: S,\n  jsonBody: ReadonlyJSONValue,\n  logLevel?: LogLevel,\n): Promise<QueryResponse>;\n\nexport function handleQueryRequest<S extends Schema>(\n  inputOrTransformQuery: HandleQueryRequestArgs<S> | QueryRequestHandler,\n  schema?: S,\n  requestOrJsonBody?: Request | ReadonlyJSONValue,\n  logLevel?: LogLevel,\n): Promise<QueryResponse> {\n  const normalized =\n    typeof inputOrTransformQuery === 'object' &&\n    'handler' in inputOrTransformQuery\n      ? normalizeQueryRequestInput(inputOrTransformQuery)\n      : normalizeLegacyQueryRequestArgs(\n          wrapQueryRequestHandler(inputOrTransformQuery),\n          schema,\n          requestOrJsonBody,\n          logLevel,\n        );\n\n  return transform(normalized, 'query');\n}\n\nfunction normalizeQueryRequestInput<S extends Schema>(\n  input: HandleQueryRequestArgs<S>,\n): NormalizedQueryRequestArgs<S> {\n  return 'request' in input\n    ? normalizeLegacyQueryRequestArgs(\n        wrapQueryRequestHandler(input.handler),\n        input.schema,\n        input.request,\n        input.logLevel,\n        input.userID ?? null,\n      )\n    : normalizeLegacyQueryRequestArgs(\n        wrapQueryRequestHandler(input.handler),\n        input.schema,\n        input.body,\n        input.logLevel,\n        input.userID ?? null,\n      );\n}\n\nfunction normalizeLegacyQueryRequestArgs<S extends Schema>(\n  handler: LegacyQueryRequestHandler,\n  schema: S | undefined,\n  requestOrJsonBody: Request | ReadonlyJSONValue | undefined,\n  logLevel: LogLevel | undefined,\n  userID?: string | null,\n): NormalizedQueryRequestArgs<S> {\n  assert(\n    typeof schema !== 'undefined',\n    'Schema must be provided when using handleQueryRequest',\n  );\n\n  if (requestOrJsonBody instanceof Request) {\n    return {\n      type: 'request',\n      handler,\n      schema,\n      request: requestOrJsonBody,\n      userID,\n      logLevel: logLevel ?? 'info',\n    };\n  }\n\n  assert(\n    typeof requestOrJsonBody !== 'undefined',\n    'JSON body cannot be undefined',\n  );\n\n  return {\n    type: 'body',\n    handler,\n    schema,\n    jsonBody: requestOrJsonBody,\n    userID,\n    logLevel: logLevel ?? 'info',\n  };\n}\n\nasync function transform<S extends Schema>(\n  args: NormalizedQueryRequestArgs<S>,\n  apiName: 'query' | 'transform' | 'getQueries',\n): Promise<QueryResponse> {\n  const lc = createLogContext(args.logLevel).withContext('TransformRequest');\n  let parsed: TransformRequestMessage;\n  let queryIDs: string[] = [];\n  try {\n    let body: ReadonlyJSONValue;\n    if (args.type === 'request') {\n      body = await args.request.json();\n    } else {\n      body = args.jsonBody;\n    }\n\n    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      kind: ErrorKind.TransformFailed,\n      origin: ErrorOrigin.Server,\n      reason: ErrorReason.Parse,\n      message,\n      queryIDs,\n      ...(details ? {details} : {}),\n    };\n  }\n\n  try {\n    const nameMapper = clientToServer(args.schema.tables);\n\n    const responses: TransformResponseBody = await Promise.all(\n      parsed[1].map(async req => {\n        let finalQuery: AnyQuery;\n        try {\n          const result = await args.handler(req.name, req.args);\n          finalQuery = 'query' in result ? result.query : result;\n        } catch (error) {\n          const message = getErrorMessage(error);\n          const details = getErrorDetails(error);\n\n          return {\n            error: error instanceof QueryParseError ? 'parse' : 'app',\n            id: req.id,\n            name: req.name,\n            message,\n            ...(details ? {details} : {}),\n          };\n        }\n\n        try {\n          const q = asQueryInternals(finalQuery);\n          const ast = mapAST(q.ast, nameMapper);\n\n          return {\n            id: req.id,\n            name: req.name,\n            ast,\n          };\n        } catch (error) {\n          lc.error?.('Failed to map AST', error);\n          throw error;\n        }\n      }),\n    );\n\n    return {\n      kind: 'QueryResponse',\n      queries: responses,\n      ...(typeof args.userID !== 'undefined' ? {userID: args.userID} : {}),\n    } as const satisfies QueryResponse;\n  } catch (e) {\n    const message = getErrorMessage(e);\n    const details = getErrorDetails(e);\n\n    return {\n      kind: ErrorKind.TransformFailed,\n      origin: ErrorOrigin.Server,\n      reason: ErrorReason.Internal,\n      message,\n      queryIDs,\n      ...(details ? {details} : {}),\n    };\n  }\n}\n\n/**\n * A function that transforms a query by name and arguments into a Query object.\n *\n * @param name - The name of the query (can be dot-separated for nested queries)\n * @param args - The arguments to pass to the query (can be undefined)\n * @returns A Query object\n */\nexport type QueryRequestHandler = (\n  name: string,\n  args: ReadonlyJSONValue | undefined,\n) => AnyQuery;\n\n/** @deprecated Use `QueryRequestHandler` instead. */\nexport type TransformQueryFunction = QueryRequestHandler;\n\nexport type LegacyQueryRequestHandler = (\n  name: string,\n  args: readonly ReadonlyJSONValue[],\n) => MaybePromise<{query: AnyQuery} | AnyQuery>;\n\nfunction wrapQueryRequestHandler(\n  handler: QueryRequestHandler,\n): LegacyQueryRequestHandler {\n  return (name, args) => handler(name, args[0]);\n}\n"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"zql-database.js","names":["#crudFactory","#makeServerTransaction"],"sources":["../../../../zero-server/src/zql-database.ts"],"sourcesContent":["import type {MaybePromise} from '../../shared/src/types.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport type {CleanupResultsArg} from '../../zero-protocol/src/push.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<\n  TSchema extends Schema,\n  TWrappedTransaction,\n> implements Database<TransactionImpl<TSchema, TWrappedTransaction>> {\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        async deleteMutationResults(args: CleanupResultsArg) {\n          if ('type' in args && args.type === 'bulk') {\n            // Bulk deletion: delete all mutations for multiple clients\n            const formatted = formatPg(\n              sql`DELETE FROM ${sql.ident(upstreamSchema)}.\"mutations\"\n                  WHERE \"clientGroupID\" = ${args.clientGroupID}\n                    AND \"clientID\" = ANY(${args.clientIDs})`,\n            );\n            await dbTx.query(formatted.text, formatted.values);\n          } else {\n            // Single client (explicit 'single' or legacy without type): delete up to mutation ID\n            const formatted = formatPg(\n              sql`DELETE FROM ${sql.ident(upstreamSchema)}.\"mutations\"\n                  WHERE \"clientGroupID\" = ${args.clientGroupID}\n                    AND \"clientID\" = ${args.clientID}\n                    AND \"mutationID\" <= ${args.upToMutationID}`,\n            );\n            await dbTx.query(formatted.text, formatted.values);\n          }\n        },\n      });\n    });\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"],"mappings":";;;;;;;;;;AAwBA,IAAa,cAAb,MAGqE;CACnE;CACA;CAEA,YAAY,YAA+C,QAAiB;AAC1E,OAAK,aAAa;AAClB,QAAA,cAAoB,IAAI,mBAAmB,OAAO;;CAGpD,YACE,UAIA,kBACY;EAGZ,MAAM,EACJ,iBAAiB,IACjB,gBAAgB,IAChB,WAAW,IACX,aAAa,MACX,oBAAoB,EAAE;AAC1B,SAAO,KAAK,WAAW,YAAY,OAAM,SAAQ;AAO/C,UAAO,SANQ,MAAM,MAAA,sBACnB,MACA,UACA,WACD,EAEuB;IACtB,MAAM,yBAAyB;KAC7B,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,eAAe,CAAC;;kCAEtB,cAAc,IAAI,SAAS,IAAI,EAAE;;;gDAIxD;KAED,MAAM,CAAC,EAAC,oBAAoB,MAAM,KAAK,MACrC,UAAU,MACV,UAAU,OACX;AAED,YAAO,EAAC,gBAAe;;IAGzB,MAAM,oBAAoB,QAAQ;KAChC,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,eAAe,CAAC;;0BAE9B,cAAc,IAAI,OAAO,GAAG,SAAS,IAAI,OAAO,GAAG,GAAG,IAAI,KAAK,UACvE,OAAO,OACR,CAAC,eACP;AACD,WAAM,KAAK,MAAM,UAAU,MAAM,UAAU,OAAO;;IAGpD,MAAM,sBAAsB,MAAyB;AACnD,SAAI,UAAU,QAAQ,KAAK,SAAS,QAAQ;MAE1C,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,eAAe,CAAC;4CACd,KAAK,cAAc;2CACpB,KAAK,UAAU,GAC7C;AACD,YAAM,KAAK,MAAM,UAAU,MAAM,UAAU,OAAO;YAC7C;MAEL,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,eAAe,CAAC;4CACd,KAAK,cAAc;uCACxB,KAAK,SAAS;0CACX,KAAK,iBAClC;AACD,YAAM,KAAK,MAAM,UAAU,MAAM,UAAU,OAAO;;;IAGvD,CAAC;IACF;;CAGJ,uBACE,MACA,UACA,YACA;AACA,SAAO,MAAA,YAAkB,kBAAkB,MAAM,UAAU,WAAW;;CAGxE,IACE,OACA,SACiC;AACjC,SAAO,KAAK,aAAY,OAAM,GAAG,IAAI,OAAO,QAAQ,CAAC"}
+{"version":3,"file":"zql-database.js","names":["#crudFactory","#makeServerTransaction"],"sources":["../../../../zero-server/src/zql-database.ts"],"sourcesContent":["import type {MaybePromise} from '../../shared/src/types.ts';\nimport {formatPg, sql} from '../../z2s/src/sql.ts';\nimport type {CleanupResultsArg} from '../../zero-protocol/src/mutation.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {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<\n  TSchema extends Schema,\n  TWrappedTransaction,\n> implements Database<TransactionImpl<TSchema, TWrappedTransaction>> {\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        async deleteMutationResults(args: CleanupResultsArg) {\n          if ('type' in args && args.type === 'bulk') {\n            // Bulk deletion: delete all mutations for multiple clients\n            const formatted = formatPg(\n              sql`DELETE FROM ${sql.ident(upstreamSchema)}.\"mutations\"\n                  WHERE \"clientGroupID\" = ${args.clientGroupID}\n                    AND \"clientID\" = ANY(${args.clientIDs})`,\n            );\n            await dbTx.query(formatted.text, formatted.values);\n          } else {\n            // Single client (explicit 'single' or legacy without type): delete up to mutation ID\n            const formatted = formatPg(\n              sql`DELETE FROM ${sql.ident(upstreamSchema)}.\"mutations\"\n                  WHERE \"clientGroupID\" = ${args.clientGroupID}\n                    AND \"clientID\" = ${args.clientID}\n                    AND \"mutationID\" <= ${args.upToMutationID}`,\n            );\n            await dbTx.query(formatted.text, formatted.values);\n          }\n        },\n      });\n    });\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"],"mappings":";;;;;;;;;;AAwBA,IAAa,cAAb,MAGqE;CACnE;CACA;CAEA,YAAY,YAA+C,QAAiB;AAC1E,OAAK,aAAa;AAClB,QAAA,cAAoB,IAAI,mBAAmB,OAAO;;CAGpD,YACE,UAIA,kBACY;EAGZ,MAAM,EACJ,iBAAiB,IACjB,gBAAgB,IAChB,WAAW,IACX,aAAa,MACX,oBAAoB,EAAE;AAC1B,SAAO,KAAK,WAAW,YAAY,OAAM,SAAQ;AAO/C,UAAO,SANQ,MAAM,MAAA,sBACnB,MACA,UACA,WACD,EAEuB;IACtB,MAAM,yBAAyB;KAC7B,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,eAAe,CAAC;;kCAEtB,cAAc,IAAI,SAAS,IAAI,EAAE;;;gDAIxD;KAED,MAAM,CAAC,EAAC,oBAAoB,MAAM,KAAK,MACrC,UAAU,MACV,UAAU,OACX;AAED,YAAO,EAAC,gBAAe;;IAGzB,MAAM,oBAAoB,QAAQ;KAChC,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,eAAe,CAAC;;0BAE9B,cAAc,IAAI,OAAO,GAAG,SAAS,IAAI,OAAO,GAAG,GAAG,IAAI,KAAK,UACvE,OAAO,OACR,CAAC,eACP;AACD,WAAM,KAAK,MAAM,UAAU,MAAM,UAAU,OAAO;;IAGpD,MAAM,sBAAsB,MAAyB;AACnD,SAAI,UAAU,QAAQ,KAAK,SAAS,QAAQ;MAE1C,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,eAAe,CAAC;4CACd,KAAK,cAAc;2CACpB,KAAK,UAAU,GAC7C;AACD,YAAM,KAAK,MAAM,UAAU,MAAM,UAAU,OAAO;YAC7C;MAEL,MAAM,YAAY,SAChB,GAAG,eAAe,IAAI,MAAM,eAAe,CAAC;4CACd,KAAK,cAAc;uCACxB,KAAK,SAAS;0CACX,KAAK,iBAClC;AACD,YAAM,KAAK,MAAM,UAAU,MAAM,UAAU,OAAO;;;IAGvD,CAAC;IACF;;CAGJ,uBACE,MACA,UACA,YACA;AACA,SAAO,MAAA,YAAkB,kBAAkB,MAAM,UAAU,WAAW;;CAGxE,IACE,OACA,SACiC;AACjC,SAAO,KAAK,aAAY,OAAM,GAAG,IAAI,OAAO,QAAQ,CAAC"}

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

@@ -16,6 +16,7 @@ import type { Schema } from './schema.ts';
  */
 export interface DefaultTypes {
 }
+export type IsUnknown<T> = unknown extends T ? [T] extends [unknown] ? true : false : false;
 export type DefaultSchema<TDefaultTypes = DefaultTypes> = TDefaultTypes extends {
     readonly schema: infer S extends Schema;
 } ? S : Schema;

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

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

package/out/zql/src/builder/builder.d.ts.map

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

package/out/zql/src/builder/builder.js

@@ -1,5 +1,8 @@
 import { assert, unreachable } from "../../../shared/src/asserts.js";
 import { must } from "../../../shared/src/must.js";
+import { completeOrdering } from "../query/complete-ordering.js";
+import { Take } from "../ivm/take.js";
+import { Cap } from "../ivm/cap.js";
 import { buildFilterPipeline } from "../ivm/filter-operators.js";
 import { Exists } from "../ivm/exists.js";
 import { FanIn } from "../ivm/fan-in.js";
@@ -8,8 +11,6 @@ import { Filter } from "../ivm/filter.js";
 import { FlippedJoin } from "../ivm/flipped-join.js";
 import { Join } from "../ivm/join.js";
 import { Skip } from "../ivm/skip.js";
-import { completeOrdering } from "../query/complete-ordering.js";
-import { Take } from "../ivm/take.js";
 import { UnionFanIn } from "../ivm/union-fan-in.js";
 import { UnionFanOut } from "../ivm/union-fan-out.js";
 import { planQuery } from "../planner/planner-builder.js";
@@ -112,7 +113,7 @@ function assertNoNotExists(condition) {
 		default: unreachable(condition);
 	}
 }
-function buildPipelineInternal(ast, delegate, queryID, name, partitionKey) {
+function buildPipelineInternal(ast, delegate, queryID, name, partitionKey, isNonFlippedExistsChild) {
 	const source = delegate.getSource(ast.table);
 	if (!source) throw new Error(`Source not found: ${ast.table}`);
 	ast = uniquifyCorrelatedSubqueryConditionAliases(ast);
@@ -125,7 +126,11 @@ function buildPipelineInternal(ast, delegate, queryID, name, partitionKey) {
 		for (const key of csq.related.correlation.parentField) splitEditKeys.add(key);
 	}
 	if (ast.related) for (const csq of ast.related) for (const key of csq.correlation.parentField) splitEditKeys.add(key);
-	const conn = source.connect(must(ast.orderBy), ast.where, splitEditKeys, delegate.debug);
+	if (isNonFlippedExistsChild) {
+		assert(ast.start === void 0, "EXISTS subqueries must not have start");
+		assert(ast.related === void 0, "EXISTS subqueries must not have related");
+	}
+	const conn = source.connect(isNonFlippedExistsChild ? void 0 : must(ast.orderBy), ast.where, splitEditKeys, delegate.debug);
 	let end = delegate.decorateSourceInput(conn, queryID);
 	end = delegate.decorateInput(end, `${name}:source(${ast.table})`);
 	const { fullyAppliedFilters } = conn;
@@ -142,7 +147,12 @@ function buildPipelineInternal(ast, delegate, queryID, name, partitionKey) {
 		}
 	}, delegate, queryID, end, name, true);
 	if (ast.where && (!fullyAppliedFilters || delegate.applyFiltersAnyway)) end = applyWhere(end, ast.where, delegate, name);
-	if (ast.limit !== void 0) {
+	if (ast.limit !== void 0) if (isNonFlippedExistsChild) {
+		const capName = `${name}:cap`;
+		const cap = new Cap(end, delegate.createStorage(capName), ast.limit, partitionKey);
+		delegate.addEdge(end, cap);
+		end = delegate.decorateInput(cap, capName);
+	} else {
 		const takeName = `${name}:take`;
 		const take = new Take(end, delegate.createStorage(takeName), ast.limit, partitionKey);
 		delegate.addEdge(end, take);
@@ -192,7 +202,7 @@ function applyFilterWithFlips(input, condition, delegate, name) {
 		}
 		case "correlatedSubquery": {
 			const sq = condition.related;
-			const child = buildPipelineInternal(sq.subquery, delegate, "", `${name}.${sq.subquery.alias}`, sq.correlation.childField);
+			const child = buildPipelineInternal(sq.subquery, delegate, "", `${name}.${sq.subquery.alias}`, sq.correlation.childField, false);
 			const flippedJoin = new FlippedJoin({
 				parent: end,
 				child,
@@ -275,7 +285,7 @@ function valuePosName(left) {
 function applyCorrelatedSubQuery(sq, delegate, queryID, end, name, fromCondition) {
 	if (sq.subquery.limit === 0 && fromCondition) return end;
 	assert(sq.subquery.alias, "Subquery must have an alias");
-	const child = buildPipelineInternal(sq.subquery, delegate, queryID, `${name}.${sq.subquery.alias}`, sq.correlation.childField);
+	const child = buildPipelineInternal(sq.subquery, delegate, queryID, `${name}.${sq.subquery.alias}`, sq.correlation.childField, fromCondition);
 	const joinName = `${name}:join(${sq.subquery.alias})`;
 	const join = new Join({
 		parent: end,