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

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

@@ -1,37 +1,53 @@
-import {} from '@rocicorp/logger';
+import "@rocicorp/logger";
 import { assert } from "../../shared/src/asserts.js";
-import {} from "../../zero-protocol/src/push.js";
-import { splitMutatorKey } from "../../zql/src/mutate/custom.js";
-import { handleMutationRequest, } from "../../zero-server/src/process-mutations.js";
 import { must } from "../../shared/src/must.js";
-export class PushProcessor {
-    #dbProvider;
-    #logLevel;
-    constructor(dbProvider, logLevel = 'info') {
-        this.#dbProvider = dbProvider;
-        this.#logLevel = logLevel;
+import { getValueAtPath } from "../../shared/src/object-traversal.js";
+import "../../zero-protocol/src/push.js";
+import { handleMutationRequest } from "./process-mutations.js";
+import { isMutator } from "../../zql/src/mutate/mutator.js";
+class PushProcessor {
+  #dbProvider;
+  #logLevel;
+  #context;
+  constructor(dbProvider, context, logLevel = "info") {
+    this.#dbProvider = dbProvider;
+    this.#context = context;
+    this.#logLevel = logLevel;
+  }
+  process(mutators, queryOrQueryString, body) {
+    if (queryOrQueryString instanceof Request) {
+      return handleMutationRequest(
+        this.#dbProvider,
+        (transact, mutation) => this.#processMutation(mutators, transact, mutation),
+        queryOrQueryString,
+        this.#context,
+        this.#logLevel
+      );
     }
-    process(mutators, queryOrQueryString, body) {
-        if (queryOrQueryString instanceof Request) {
-            return handleMutationRequest((transact, mutations) => this.#processMutation(mutators, transact, mutations), queryOrQueryString, this.#logLevel);
-        }
-        return handleMutationRequest((transact, mutation) => this.#processMutation(mutators, transact, mutation), queryOrQueryString, must(body), this.#logLevel);
-    }
-    #processMutation(mutators, transact, _mutation) {
-        return transact(this.#dbProvider, (tx, name, args) => this.#dispatchMutation(mutators, tx, name, args));
-    }
-    #dispatchMutation(mutators, dbTx, key, args) {
-        const [namespace, name] = splitMutatorKey(key);
-        if (name === undefined) {
-            const mutator = mutators[namespace];
-            assert(typeof mutator === 'function', () => `could not find mutator ${key}`);
-            return mutator(dbTx, args);
-        }
-        const mutatorGroup = mutators[namespace];
-        assert(typeof mutatorGroup === 'object', () => `could not find mutators for namespace ${namespace}`);
-        const mutator = mutatorGroup[name];
-        assert(typeof mutator === 'function', () => `could not find mutator ${key}`);
-        return mutator(dbTx, args);
+    return handleMutationRequest(
+      this.#dbProvider,
+      (transact, mutation) => this.#processMutation(mutators, transact, mutation),
+      queryOrQueryString,
+      must(body),
+      this.#context,
+      this.#logLevel
+    );
+  }
+  #processMutation(mutators, transact, _mutation) {
+    return transact(
+      (tx, name, args, ctx) => this.#dispatchMutation(mutators, tx, name, args, ctx)
+    );
+  }
+  #dispatchMutation(mutators, dbTx, key, args, ctx) {
+    const mutator = getValueAtPath(mutators, key, /\.|\|/);
+    assert(typeof mutator === "function", `could not find mutator ${key}`);
+    if (isMutator(mutator)) {
+      return mutator.fn({ args, ctx, tx: dbTx });
     }
+    return mutator(dbTx, args);
+  }
 }
-//# sourceMappingURL=push-processor.js.map
+export {
+  PushProcessor
+};
+//# sourceMappingURL=push-processor.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"push-processor.js","sourceRoot":"","sources":["../../../../zero-server/src/push-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AAEnD,OAAO,EAIN,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAC,eAAe,EAAC,MAAM,gCAAgC,CAAC;AAE/D,OAAO,EAGL,qBAAqB,GAEtB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAC,IAAI,EAAC,MAAM,0BAA0B,CAAC;AAE9C,MAAM,OAAO,aAAa;IAIf,WAAW,CAAI;IACf,SAAS,CAAC;IAEnB,YAAY,UAAa,EAAE,WAAqB,MAAM;QACpD,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC5B,CAAC;IA0BD,OAAO,CACL,QAAY,EACZ,kBAAsE,EACtE,IAAwB;QAExB,IAAI,kBAAkB,YAAY,OAAO,EAAE,CAAC;YAC1C,OAAO,qBAAqB,CAC1B,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,CACtB,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,EACtD,kBAAkB,EAClB,IAAI,CAAC,SAAS,CACf,CAAC;QACJ,CAAC;QACD,OAAO,qBAAqB,CAC1B,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,CACrB,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EACrD,kBAAkB,EAClB,IAAI,CAAC,IAAI,CAAC,EACV,IAAI,CAAC,SAAS,CACf,CAAC;IACJ,CAAC;IAED,gBAAgB,CACd,QAAY,EACZ,QAAoB,EACpB,SAAyB;QAEzB,OAAO,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CACnD,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CACjD,CAAC;IACJ,CAAC;IAED,iBAAiB,CACf,QAAY,EACZ,IAA+B,EAC/B,GAAW,EACX,IAAuB;QAEvB,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;YACpC,MAAM,CACJ,OAAO,OAAO,KAAK,UAAU,EAC7B,GAAG,EAAE,CAAC,0BAA0B,GAAG,EAAE,CACtC,CAAC;YACF,OAAO,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC;QAED,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;QACzC,MAAM,CACJ,OAAO,YAAY,KAAK,QAAQ,EAChC,GAAG,EAAE,CAAC,yCAAyC,SAAS,EAAE,CAC3D,CAAC;QACF,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,CACJ,OAAO,OAAO,KAAK,UAAU,EAC7B,GAAG,EAAE,CAAC,0BAA0B,GAAG,EAAE,CACtC,CAAC;QACF,OAAO,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF"}
+{"version":3,"file":"push-processor.js","sources":["../../../../zero-server/src/push-processor.ts"],"sourcesContent":["import {type LogLevel} from '@rocicorp/logger';\nimport {assert} from '../../shared/src/asserts.ts';\nimport type {ReadonlyJSONValue} from '../../shared/src/json.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {getValueAtPath} from '../../shared/src/object-traversal.ts';\nimport {\n  type CustomMutation,\n  type MutationResponse,\n  type PushResponse,\n} from '../../zero-protocol/src/push.ts';\nimport {\n  type Database,\n  type ExtractTransactionType,\n  handleMutationRequest,\n  type TransactFn,\n} from '../../zero-server/src/process-mutations.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {Transaction} from '../../zql/src/mutate/custom.ts';\nimport type {AnyMutatorRegistry} from '../../zql/src/mutate/mutator-registry.ts';\nimport {isMutator} from '../../zql/src/mutate/mutator.ts';\nimport type {CustomMutatorDefs} from './custom.ts';\n\nexport class PushProcessor<\n  _S extends Schema,\n  D extends Database<ExtractTransactionType<D>>,\n  MD extends AnyMutatorRegistry | CustomMutatorDefs<ExtractTransactionType<D>>,\n  C = undefined,\n> {\n  readonly #dbProvider: D;\n  readonly #logLevel: LogLevel;\n  readonly #context: C;\n\n  constructor(dbProvider: D, context?: C, logLevel: LogLevel = 'info') {\n    this.#dbProvider = dbProvider;\n    this.#context = context as C;\n    this.#logLevel = logLevel;\n  }\n\n  /**\n   * Processes a push request from zero-cache.\n   * This function will parse the request, check the protocol version, and process each mutation in the request.\n   * - If a mutation is out of order: processing will stop and an error will be returned. The zero client will retry the mutation.\n   * - If a mutation has already been processed: it will be skipped and the processing will continue.\n   * - If a mutation receives an application error: it will be skipped, the error will be returned to the client, and processing will continue.\n   *\n   * @param mutators the custom mutators for the application\n   * @param queryString the query string from the request sent by zero-cache. This will include zero's postgres schema name and appID.\n   * @param body the body of the request sent by zero-cache as a JSON object.\n   */\n  process(\n    mutators: MD,\n    queryString: URLSearchParams | Record<string, string>,\n    body: ReadonlyJSONValue,\n  ): Promise<PushResponse>;\n\n  /**\n   * This override gets the query string and the body from a Request object.\n   *\n   * @param mutators the custom mutators for the application\n   * @param request A `Request` object.\n   */\n  process(mutators: MD, request: Request): Promise<PushResponse>;\n  process(\n    mutators: MD,\n    queryOrQueryString: Request | URLSearchParams | Record<string, string>,\n    body?: ReadonlyJSONValue,\n  ): Promise<PushResponse> {\n    if (queryOrQueryString instanceof Request) {\n      return handleMutationRequest(\n        this.#dbProvider,\n        (transact, mutation) =>\n          this.#processMutation(mutators, transact, mutation),\n        queryOrQueryString,\n        this.#context,\n        this.#logLevel,\n      );\n    }\n    return handleMutationRequest(\n      this.#dbProvider,\n      (transact, mutation) =>\n        this.#processMutation(mutators, transact, mutation),\n      queryOrQueryString,\n      must(body),\n      this.#context,\n      this.#logLevel,\n    );\n  }\n\n  #processMutation(\n    mutators: MD,\n    transact: TransactFn<D, C>,\n    _mutation: CustomMutation,\n  ): Promise<MutationResponse> {\n    return transact((tx, name, args, ctx) =>\n      this.#dispatchMutation(mutators, tx, name, args, ctx),\n    );\n  }\n\n  #dispatchMutation(\n    mutators: MD,\n    dbTx: ExtractTransactionType<D>,\n    key: string,\n    args: ReadonlyJSONValue | undefined,\n    ctx: C,\n  ): Promise<void> {\n    // Legacy mutators used | as a separator, new mutators use .\n    const mutator = getValueAtPath(mutators, key, /\\.|\\|/);\n    assert(typeof mutator === 'function', `could not find mutator ${key}`);\n    if (isMutator(mutator)) {\n      return mutator.fn({args, ctx, tx: dbTx as Transaction<Schema, unknown>});\n    }\n    return mutator(dbTx, args);\n  }\n}\n"],"names":[],"mappings":";;;;;;;AAsBO,MAAM,cAKX;AAAA,EACS;AAAA,EACA;AAAA,EACA;AAAA,EAET,YAAY,YAAe,SAAa,WAAqB,QAAQ;AACnE,SAAK,cAAc;AACnB,SAAK,WAAW;AAChB,SAAK,YAAY;AAAA,EACnB;AAAA,EA0BA,QACE,UACA,oBACA,MACuB;AACvB,QAAI,8BAA8B,SAAS;AACzC,aAAO;AAAA,QACL,KAAK;AAAA,QACL,CAAC,UAAU,aACT,KAAK,iBAAiB,UAAU,UAAU,QAAQ;AAAA,QACpD;AAAA,QACA,KAAK;AAAA,QACL,KAAK;AAAA,MAAA;AAAA,IAET;AACA,WAAO;AAAA,MACL,KAAK;AAAA,MACL,CAAC,UAAU,aACT,KAAK,iBAAiB,UAAU,UAAU,QAAQ;AAAA,MACpD;AAAA,MACA,KAAK,IAAI;AAAA,MACT,KAAK;AAAA,MACL,KAAK;AAAA,IAAA;AAAA,EAET;AAAA,EAEA,iBACE,UACA,UACA,WAC2B;AAC3B,WAAO;AAAA,MAAS,CAAC,IAAI,MAAM,MAAM,QAC/B,KAAK,kBAAkB,UAAU,IAAI,MAAM,MAAM,GAAG;AAAA,IAAA;AAAA,EAExD;AAAA,EAEA,kBACE,UACA,MACA,KACA,MACA,KACe;AAEf,UAAM,UAAU,eAAe,UAAU,KAAK,OAAO;AACrD,WAAO,OAAO,YAAY,YAAY,0BAA0B,GAAG,EAAE;AACrE,QAAI,UAAU,OAAO,GAAG;AACtB,aAAO,QAAQ,GAAG,EAAC,MAAM,KAAK,IAAI,MAAqC;AAAA,IACzE;AACA,WAAO,QAAQ,MAAM,IAAI;AAAA,EAC3B;AACF;"}

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

@@ -1,8 +1,9 @@
+import type { LogLevel } from '@rocicorp/logger';
 import type { ReadonlyJSONValue } from '../../../shared/src/json.ts';
-import { type AnyQuery } from '../../../zql/src/query/query-impl.ts';
-import { type TransformResponseMessage } from '../../../zero-protocol/src/custom-queries.ts';
-import type { Schema } from '../../../zero-schema/src/builder/schema-builder.ts';
 import type { MaybePromise } from '../../../shared/src/types.ts';
+import { type TransformResponseMessage } from '../../../zero-protocol/src/custom-queries.ts';
+import type { Schema } from '../../../zero-types/src/schema.ts';
+import type { AnyQuery } from '../../../zql/src/query/query.ts';
 /**
  * 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.
@@ -10,8 +11,69 @@ import type { MaybePromise } from '../../../shared/src/types.ts';
  * This function will call `cb` in parallel for each query found in the request.
  *
  * If you need to limit concurrency, you can use a library like `p-limit` to wrap the `cb` function.
+ * @deprecated Use {@linkcode handleTransformRequest} instead.
  */
 export declare function handleGetQueriesRequest<S extends Schema>(cb: (name: string, args: readonly ReadonlyJSONValue[]) => MaybePromise<{
     query: AnyQuery;
-}>, schema: S, requestOrJsonBody: Request | ReadonlyJSONValue): Promise<TransformResponseMessage>;
+} | AnyQuery>, schema: S, requestOrJsonBody: Request | ReadonlyJSONValue, logLevel?: LogLevel): Promise<TransformResponseMessage>;
+/**
+ * Processes a transform request by invoking the provided callback for each query.
+ * The callback should return a Query that is the transformed result.
+ *
+ * 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
+ */
+export declare function handleTransformRequest<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";
+}]>;
+/**
+ * A function that transforms a query by name and arguments into a Query object.
+ *
+ * @param name - The name of the query (can be dot-separated for nested queries)
+ * @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;
 //# 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,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAC,KAAK,QAAQ,EAAC,MAAM,sCAAsC,CAAC;AAEnE,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,8CAA8C,CAAC;AACtD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,oDAAoD,CAAC;AAG/E,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAE/D;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CAAC,CAAC,SAAS,MAAM,EAC5D,EAAE,EAAE,CACF,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,iBAAiB,EAAE,KAC/B,YAAY,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAC,CAAC,EACpC,MAAM,EAAE,CAAC,EACT,iBAAiB,EAAE,OAAO,GAAG,iBAAiB,GAC7C,OAAO,CAAC,wBAAwB,CAAC,CAwBnC"}
+{"version":3,"file":"process-queries.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/queries/process-queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAE3D,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAG/D,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,8CAA8C,CAAC;AAKtD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAG9D,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,iCAAiC,CAAC;AAG9D;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,SAAS,MAAM,EACtD,EAAE,EAAE,CACF,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,iBAAiB,EAAE,KAC/B,YAAY,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAC,GAAG,QAAQ,CAAC,EAC/C,MAAM,EAAE,CAAC,EACT,iBAAiB,EAAE,OAAO,GAAG,iBAAiB,EAC9C,QAAQ,GAAE,QAAiB,GAC1B,OAAO,CAAC,wBAAwB,CAAC,CAGnC;AAqGD;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,MAAM,EACrD,cAAc,EAAE,sBAAsB,EACtC,MAAM,EAAE,CAAC,EACT,iBAAiB,EAAE,OAAO,GAAG,iBAAiB,EAC9C,QAAQ,GAAE,QAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAU5B;AAED;;;;;;GAMG;AACH,MAAM,MAAM,sBAAsB,GAAG,CACnC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,iBAAiB,GAAG,SAAS,KAChC,QAAQ,CAAC"}

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

@@ -1,34 +1,108 @@
-import {} from "../../../zql/src/query/query-impl.js";
-import * as v from "../../../shared/src/valita.js";
-import { transformRequestMessageSchema, } from "../../../zero-protocol/src/custom-queries.js";
-import { clientToServer } from "../../../zero-schema/src/name-mapper.js";
+import { getErrorMessage, getErrorDetails } from "../../../shared/src/error.js";
+import { parse } from "../../../shared/src/valita.js";
 import { mapAST } from "../../../zero-protocol/src/ast.js";
-/**
- * Invokes the callback `cb` for each query in the request or JSON body.
- * The callback should return a Query or Promise<Query> that is the transformed result.
- *
- * This function will call `cb` in parallel for each query found in the request.
- *
- * If you need to limit concurrency, you can use a library like `p-limit` to wrap the `cb` function.
- */
-export async function handleGetQueriesRequest(cb, schema, requestOrJsonBody) {
-    const nameMapper = clientToServer(schema.tables);
+import { transformRequestMessageSchema } from "../../../zero-protocol/src/custom-queries.js";
+import { TransformFailed } from "../../../zero-protocol/src/error-kind-enum.js";
+import { Server } from "../../../zero-protocol/src/error-origin-enum.js";
+import { Parse, Internal } from "../../../zero-protocol/src/error-reason-enum.js";
+import { clientToServer } from "../../../zero-schema/src/name-mapper.js";
+import { QueryParseError } from "../../../zql/src/query/error.js";
+import { asQueryInternals } from "../../../zql/src/query/query-internals.js";
+import { createLogContext } from "../logging.js";
+function handleGetQueriesRequest(cb, schema, requestOrJsonBody, logLevel = "info") {
+  const lc = createLogContext(logLevel).withContext("GetQueries");
+  return transform(cb, schema, requestOrJsonBody, lc, "get");
+}
+async function transform(cb, schema, requestOrJsonBody, lc, apiName) {
+  let parsed;
+  let queryIDs = [];
+  try {
     let body;
     if (requestOrJsonBody instanceof Request) {
-        body = await requestOrJsonBody.json();
-    }
-    else {
-        body = requestOrJsonBody;
+      body = await requestOrJsonBody.json();
+    } else {
+      body = requestOrJsonBody;
     }
-    const parsed = v.parse(body, transformRequestMessageSchema);
-    const responses = await Promise.all(parsed[1].map(async (req) => {
-        const { query } = await cb(req.name, req.args);
-        return {
+    parsed = parse(body, transformRequestMessageSchema);
+    queryIDs = parsed[1].map((r) => r.id);
+  } catch (error) {
+    lc.error?.(`Failed to parse ${apiName} queries request`, error);
+    const message = `Failed to parse ${apiName} queries request: ${getErrorMessage(error)}`;
+    const details = getErrorDetails(error);
+    return [
+      "transformFailed",
+      {
+        kind: TransformFailed,
+        origin: Server,
+        reason: Parse,
+        message,
+        queryIDs,
+        ...details ? { details } : {}
+      }
+    ];
+  }
+  try {
+    const nameMapper = clientToServer(schema.tables);
+    const responses = 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 q = asQueryInternals(finalQuery);
+          const ast = mapAST(q.ast, nameMapper);
+          return {
             id: req.id,
             name: req.name,
-            ast: mapAST(query.ast, nameMapper),
-        };
-    }));
-    return ['transformed', responses];
+            ast
+          };
+        } catch (error) {
+          lc.error?.("Failed to map AST", error);
+          throw error;
+        }
+      })
+    );
+    return ["transformed", responses];
+  } catch (e) {
+    const message = getErrorMessage(e);
+    const details = getErrorDetails(e);
+    return [
+      "transformFailed",
+      {
+        kind: TransformFailed,
+        origin: Server,
+        reason: Internal,
+        message,
+        queryIDs,
+        ...details ? { details } : {}
+      }
+    ];
+  }
+}
+function handleTransformRequest(transformQuery, schema, requestOrJsonBody, logLevel = "info") {
+  const lc = createLogContext(logLevel).withContext("TransformRequest");
+  return transform(
+    (name, argsArray) => transformQuery(name, argsArray[0]),
+    schema,
+    requestOrJsonBody,
+    lc,
+    "transform"
+  );
 }
-//# sourceMappingURL=process-queries.js.map
+export {
+  handleGetQueriesRequest,
+  handleTransformRequest
+};
+//# sourceMappingURL=process-queries.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"process-queries.js","sourceRoot":"","sources":["../../../../../zero-server/src/queries/process-queries.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AACnD,OAAO,EACL,6BAA6B,GAE9B,MAAM,8CAA8C,CAAC;AAEtD,OAAO,EAAC,cAAc,EAAC,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAGzD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,EAGoC,EACpC,MAAS,EACT,iBAA8C;IAE9C,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEjD,IAAI,IAAuB,CAAC;IAC5B,IAAI,iBAAiB,YAAY,OAAO,EAAE,CAAC;QACzC,IAAI,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAC;IACxC,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,iBAAiB,CAAC;IAC3B,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,6BAA6B,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;QACxB,MAAM,EAAC,KAAK,EAAC,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO;YACL,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC;SACnC,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,OAAO,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"process-queries.js","sources":["../../../../../zero-server/src/queries/process-queries.ts"],"sourcesContent":["import type {LogContext, LogLevel} from '@rocicorp/logger';\nimport {getErrorDetails, getErrorMessage} from '../../../shared/src/error.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport type {MaybePromise} from '../../../shared/src/types.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {mapAST} from '../../../zero-protocol/src/ast.ts';\nimport {\n  transformRequestMessageSchema,\n  type TransformRequestMessage,\n  type TransformResponseBody,\n  type TransformResponseMessage,\n} from '../../../zero-protocol/src/custom-queries.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../zero-protocol/src/error-origin.ts';\nimport {ErrorReason} from '../../../zero-protocol/src/error-reason.ts';\nimport {clientToServer} from '../../../zero-schema/src/name-mapper.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {QueryParseError} from '../../../zql/src/query/error.ts';\nimport {asQueryInternals} from '../../../zql/src/query/query-internals.ts';\nimport type {AnyQuery} from '../../../zql/src/query/query.ts';\nimport {createLogContext} from '../logging.ts';\n\n/**\n * Invokes the callback `cb` for each query in the request or JSON body.\n * The callback should return a Query or Promise<Query> that is the transformed result.\n *\n * This function will call `cb` in parallel for each query found in the request.\n *\n * If you need to limit concurrency, you can use a library like `p-limit` to wrap the `cb` function.\n * @deprecated Use {@linkcode handleTransformRequest} instead.\n */\nexport function handleGetQueriesRequest<S extends Schema>(\n  cb: (\n    name: string,\n    args: readonly ReadonlyJSONValue[],\n  ) => MaybePromise<{query: AnyQuery} | AnyQuery>,\n  schema: S,\n  requestOrJsonBody: Request | ReadonlyJSONValue,\n  logLevel: LogLevel = 'info',\n): Promise<TransformResponseMessage> {\n  const lc = createLogContext(logLevel).withContext('GetQueries');\n  return transform(cb, schema, requestOrJsonBody, lc, 'get');\n}\n\nasync function transform<S extends Schema>(\n  cb: (\n    name: string,\n    args: readonly ReadonlyJSONValue[],\n  ) => MaybePromise<{query: AnyQuery} | AnyQuery>,\n  schema: S,\n  requestOrJsonBody: Request | ReadonlyJSONValue,\n  lc: LogContext,\n  apiName: 'get' | 'transform',\n): Promise<TransformResponseMessage> {\n  let parsed: TransformRequestMessage;\n  let queryIDs: string[] = [];\n  try {\n    let body: ReadonlyJSONValue;\n    if (requestOrJsonBody instanceof Request) {\n      body = await requestOrJsonBody.json();\n    } else {\n      body = requestOrJsonBody;\n    }\n\n    parsed = v.parse(body, transformRequestMessageSchema);\n\n    queryIDs = parsed[1].map(r => r.id);\n  } catch (error) {\n    lc.error?.(`Failed to parse ${apiName} queries request`, error);\n\n    const message = `Failed to parse ${apiName} queries request: ${getErrorMessage(error)}`;\n    const details = getErrorDetails(error);\n\n    return [\n      'transformFailed',\n      {\n        kind: ErrorKind.TransformFailed,\n        origin: ErrorOrigin.Server,\n        reason: ErrorReason.Parse,\n        message,\n        queryIDs,\n        ...(details ? {details} : {}),\n      },\n    ];\n  }\n\n  try {\n    const nameMapper = clientToServer(schema.tables);\n\n    const responses: TransformResponseBody = await Promise.all(\n      parsed[1].map(async req => {\n        let finalQuery: AnyQuery;\n        try {\n          const result = await cb(req.name, req.args);\n          finalQuery = 'query' in result ? result.query : result;\n        } catch (error) {\n          const message = getErrorMessage(error);\n          const details = getErrorDetails(error);\n\n          return {\n            error: error instanceof QueryParseError ? 'parse' : 'app',\n            id: req.id,\n            name: req.name,\n            message,\n            ...(details ? {details} : {}),\n          };\n        }\n\n        try {\n          const q = asQueryInternals(finalQuery);\n          const ast = mapAST(q.ast, nameMapper);\n\n          return {\n            id: req.id,\n            name: req.name,\n            ast,\n          };\n        } catch (error) {\n          lc.error?.('Failed to map AST', error);\n          throw error;\n        }\n      }),\n    );\n\n    return ['transformed', responses];\n  } catch (e) {\n    const message = getErrorMessage(e);\n    const details = getErrorDetails(e);\n\n    return [\n      'transformFailed',\n      {\n        kind: ErrorKind.TransformFailed,\n        origin: ErrorOrigin.Server,\n        reason: ErrorReason.Internal,\n        message,\n        queryIDs,\n        ...(details ? {details} : {}),\n      },\n    ];\n  }\n}\n\n/**\n * Processes a transform request by invoking the provided callback for each query.\n * The callback should return a Query that is the transformed result.\n *\n * This function will call `transformQuery` in parallel for each query found in the request.\n *\n * @param transformQuery - Callback function that takes a query name and args, and returns a Query\n * @param schema - The Zero schema\n * @param requestOrJsonBody - Either a Request object or the JSON body directly\n * @param logLevel - Logging level (defaults to 'info')\n * @returns A Promise that resolves to a TransformResponseMessage\n */\nexport function handleTransformRequest<S extends Schema>(\n  transformQuery: TransformQueryFunction,\n  schema: S,\n  requestOrJsonBody: Request | ReadonlyJSONValue,\n  logLevel: LogLevel = 'info',\n) {\n  const lc = createLogContext(logLevel).withContext('TransformRequest');\n  return transform(\n    (name, argsArray) => transformQuery(name, argsArray[0]),\n    schema,\n    requestOrJsonBody,\n    lc,\n    'transform',\n  );\n}\n\n/**\n * A function that transforms a query by name and arguments into a Query object.\n *\n * @param name - The name of the query (can be dot-separated for nested queries)\n * @param args - The arguments to pass to the query (can be undefined)\n * @returns A Query object\n */\nexport type TransformQueryFunction = (\n  name: string,\n  args: ReadonlyJSONValue | undefined,\n) => AnyQuery;\n"],"names":["v.parse","ErrorKind.TransformFailed","ErrorOrigin.Server","ErrorReason.Parse","ErrorReason.Internal"],"mappings":";;;;;;;;;;;AA+BO,SAAS,wBACd,IAIA,QACA,mBACA,WAAqB,QACc;AACnC,QAAM,KAAK,iBAAiB,QAAQ,EAAE,YAAY,YAAY;AAC9D,SAAO,UAAU,IAAI,QAAQ,mBAAmB,IAAI,KAAK;AAC3D;AAEA,eAAe,UACb,IAIA,QACA,mBACA,IACA,SACmC;AACnC,MAAI;AACJ,MAAI,WAAqB,CAAA;AACzB,MAAI;AACF,QAAI;AACJ,QAAI,6BAA6B,SAAS;AACxC,aAAO,MAAM,kBAAkB,KAAA;AAAA,IACjC,OAAO;AACL,aAAO;AAAA,IACT;AAEA,aAASA,MAAQ,MAAM,6BAA6B;AAEpD,eAAW,OAAO,CAAC,EAAE,IAAI,CAAA,MAAK,EAAE,EAAE;AAAA,EACpC,SAAS,OAAO;AACd,OAAG,QAAQ,mBAAmB,OAAO,oBAAoB,KAAK;AAE9D,UAAM,UAAU,mBAAmB,OAAO,qBAAqB,gBAAgB,KAAK,CAAC;AACrF,UAAM,UAAU,gBAAgB,KAAK;AAErC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,QACE,MAAMC;AAAAA,QACN,QAAQC;AAAAA,QACR,QAAQC;AAAAA,QACR;AAAA,QACA;AAAA,QACA,GAAI,UAAU,EAAC,YAAW,CAAA;AAAA,MAAC;AAAA,IAC7B;AAAA,EAEJ;AAEA,MAAI;AACF,UAAM,aAAa,eAAe,OAAO,MAAM;AAE/C,UAAM,YAAmC,MAAM,QAAQ;AAAA,MACrD,OAAO,CAAC,EAAE,IAAI,OAAM,QAAO;AACzB,YAAI;AACJ,YAAI;AACF,gBAAM,SAAS,MAAM,GAAG,IAAI,MAAM,IAAI,IAAI;AAC1C,uBAAa,WAAW,SAAS,OAAO,QAAQ;AAAA,QAClD,SAAS,OAAO;AACd,gBAAM,UAAU,gBAAgB,KAAK;AACrC,gBAAM,UAAU,gBAAgB,KAAK;AAErC,iBAAO;AAAA,YACL,OAAO,iBAAiB,kBAAkB,UAAU;AAAA,YACpD,IAAI,IAAI;AAAA,YACR,MAAM,IAAI;AAAA,YACV;AAAA,YACA,GAAI,UAAU,EAAC,YAAW,CAAA;AAAA,UAAC;AAAA,QAE/B;AAEA,YAAI;AACF,gBAAM,IAAI,iBAAiB,UAAU;AACrC,gBAAM,MAAM,OAAO,EAAE,KAAK,UAAU;AAEpC,iBAAO;AAAA,YACL,IAAI,IAAI;AAAA,YACR,MAAM,IAAI;AAAA,YACV;AAAA,UAAA;AAAA,QAEJ,SAAS,OAAO;AACd,aAAG,QAAQ,qBAAqB,KAAK;AACrC,gBAAM;AAAA,QACR;AAAA,MACF,CAAC;AAAA,IAAA;AAGH,WAAO,CAAC,eAAe,SAAS;AAAA,EAClC,SAAS,GAAG;AACV,UAAM,UAAU,gBAAgB,CAAC;AACjC,UAAM,UAAU,gBAAgB,CAAC;AAEjC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,QACE,MAAMF;AAAAA,QACN,QAAQC;AAAAA,QACR,QAAQE;AAAAA,QACR;AAAA,QACA;AAAA,QACA,GAAI,UAAU,EAAC,YAAW,CAAA;AAAA,MAAC;AAAA,IAC7B;AAAA,EAEJ;AACF;AAcO,SAAS,uBACd,gBACA,QACA,mBACA,WAAqB,QACrB;AACA,QAAM,KAAK,iBAAiB,QAAQ,EAAE,YAAY,kBAAkB;AACpE,SAAO;AAAA,IACL,CAAC,MAAM,cAAc,eAAe,MAAM,UAAU,CAAC,CAAC;AAAA,IACtD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;"}

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

@@ -1,5 +1,5 @@
-import type { ServerSchema } from '../../zero-schema/src/server-schema.ts';
-import type { Schema } from '../../zero-schema/src/builder/schema-builder.ts';
+import type { Schema } from '../../zero-types/src/schema.ts';
+import type { ServerSchema } from '../../zero-types/src/server-schema.ts';
 import type { DBTransaction } from '../../zql/src/mutate/custom.ts';
 export declare function getServerSchema<S extends Schema>(dbTransaction: DBTransaction<unknown>, schema: S): Promise<ServerSchema>;
 export type SchemaIncompatibilityError = {

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/schema.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,wCAAwC,CAAC;AAIzE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAC5E,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,gCAAgC,CAAC;AAkBlE,wBAAsB,eAAe,CAAC,CAAC,SAAS,MAAM,EACpD,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,EACrC,MAAM,EAAE,CAAC,GACR,OAAO,CAAC,YAAY,CAAC,CAwGvB;AAwCD,MAAM,MAAM,0BAA0B,GAClC;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,0BAA0B,EAAE,CAkD9B"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/schema.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AACxE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,gCAAgC,CAAC;AAkBlE,wBAAsB,eAAe,CAAC,CAAC,SAAS,MAAM,EACpD,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,EACrC,MAAM,EAAE,CAAC,GACR,OAAO,CAAC,YAAY,CAAC,CAwGvB;AAwCD,MAAM,MAAM,0BAA0B,GAClC;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,0BAA0B,EAAE,CAkD9B"}