@rocicorp/zero 0.23.2025081401 → 0.23.2025081900

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

@@ -0,0 +1,187 @@
+import { pushBodySchema, pushParamsSchema, } from "../../zero-protocol/src/push.js";
+import * as v from "../../shared/src/valita.js";
+import { MutationAlreadyProcessedError } from "../../zero-cache/src/services/mutagen/mutagen.js";
+import { createLogContext } from "./logging.js";
+import { assert } from "../../shared/src/asserts.js";
+export async function mapMutationRequest(cb, queryOrQueryString, body, logLevel) {
+    if (logLevel === undefined) {
+        if (queryOrQueryString instanceof Request && typeof body === 'string') {
+            logLevel = body;
+        }
+        else {
+            logLevel = 'info';
+        }
+    }
+    let queryString;
+    if (queryOrQueryString instanceof Request) {
+        const url = new URL(queryOrQueryString.url);
+        queryString = url.searchParams;
+        body = await queryOrQueryString.json();
+    }
+    else {
+        queryString = queryOrQueryString;
+    }
+    const req = v.parse(body, pushBodySchema);
+    if (queryString instanceof URLSearchParams) {
+        queryString = Object.fromEntries(queryString);
+    }
+    const queryParams = v.parse(queryString, pushParamsSchema, 'passthrough');
+    if (req.pushVersion !== 1) {
+        return {
+            error: 'unsupportedPushVersion',
+        };
+    }
+    const transactor = new Transactor(req, queryParams, logLevel);
+    const responses = [];
+    for (const m of req.mutations) {
+        assert(m.type === 'custom', 'Expected custom mutation');
+        const res = await cb((dbProvider, innerCb) => transactor.transact(dbProvider, m, innerCb), m);
+        responses.push(res);
+        // We only stop processing if the mutation is out of order.
+        // If the mutation has already been processed or if it returns an application error,
+        // we continue processing the next mutation.
+        if ('error' in res.result && res.result.error === 'oooMutation') {
+            break;
+        }
+    }
+    return {
+        mutations: responses,
+    };
+}
+class Transactor {
+    #req;
+    #params;
+    #lc;
+    constructor(req, params, logLevel) {
+        this.#req = req;
+        this.#params = params;
+        this.#lc = createLogContext(logLevel).withContext('PushProcessor');
+    }
+    transact = async (dbProvider, mutation, cb) => {
+        let caughtError = undefined;
+        for (;;) {
+            try {
+                const ret = await this.#transactImpl(dbProvider, mutation, cb, caughtError);
+                // The first time through we caught an error.
+                // We want to report that error as it was an application
+                // level error.
+                if (caughtError !== undefined) {
+                    this.#lc.warn?.(`Mutation ${mutation.id} for client ${mutation.clientID} was retried after an error: ${caughtError}`);
+                    return makeAppErrorResponse(mutation, caughtError);
+                }
+                return ret;
+            }
+            catch (e) {
+                if (e instanceof OutOfOrderMutation) {
+                    this.#lc.error?.(e);
+                    return {
+                        id: {
+                            clientID: mutation.clientID,
+                            id: mutation.id,
+                        },
+                        result: {
+                            error: 'oooMutation',
+                            details: e.message,
+                        },
+                    };
+                }
+                if (e instanceof MutationAlreadyProcessedError) {
+                    this.#lc.warn?.(e);
+                    return {
+                        id: {
+                            clientID: mutation.clientID,
+                            id: mutation.id,
+                        },
+                        result: {
+                            error: 'alreadyProcessed',
+                            details: e.message,
+                        },
+                    };
+                }
+                // We threw an error while running in error mode.
+                // Re-throw the error and stop processing any further
+                // mutations as all subsequent mutations will fail by being
+                // out of order.
+                if (caughtError !== undefined) {
+                    throw e;
+                }
+                caughtError = e;
+                this.#lc.error?.(`Unexpected error processing mutation ${mutation.id} for client ${mutation.clientID}`, e);
+            }
+        }
+    };
+    #transactImpl(dbProvider, mutation, cb, caughtError) {
+        return dbProvider.transaction(async (dbTx, transactionHooks) => {
+            await this.#checkAndIncrementLastMutationID(transactionHooks, mutation.clientID, mutation.id);
+            if (caughtError === undefined) {
+                await cb(dbTx, mutation.name, mutation.args[0]);
+            }
+            else {
+                const appError = makeAppErrorResponse(mutation, caughtError);
+                await transactionHooks.writeMutationResult(appError);
+            }
+            return {
+                id: {
+                    clientID: mutation.clientID,
+                    id: mutation.id,
+                },
+                result: {},
+            };
+        }, {
+            upstreamSchema: this.#params.schema,
+            clientGroupID: this.#req.clientGroupID,
+            clientID: mutation.clientID,
+            mutationID: mutation.id,
+        });
+    }
+    async #checkAndIncrementLastMutationID(transactionHooks, clientID, receivedMutationID) {
+        const { lastMutationID } = await transactionHooks.updateClientMutationID();
+        if (receivedMutationID < lastMutationID) {
+            throw new MutationAlreadyProcessedError(clientID, receivedMutationID, lastMutationID);
+        }
+        else if (receivedMutationID > lastMutationID) {
+            throw new OutOfOrderMutation(clientID, receivedMutationID, lastMutationID);
+        }
+    }
+}
+export class OutOfOrderMutation extends Error {
+    constructor(clientID, receivedMutationID, lastMutationID) {
+        super(`Client ${clientID} sent mutation ID ${receivedMutationID} but expected ${lastMutationID}`);
+    }
+}
+function makeAppErrorResponse(m, e) {
+    return {
+        id: {
+            clientID: m.clientID,
+            id: m.id,
+        },
+        result: {
+            error: 'app',
+            details: e instanceof Error ? e.message : 'exception was not of type `Error`',
+        },
+    };
+}
+export function getMutation(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+mutators, name) {
+    let path;
+    if (name.includes('|')) {
+        path = name.split('|');
+    }
+    else {
+        path = name.split('.');
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    let mutator;
+    if (path.length === 1) {
+        mutator = mutators[path[0]];
+    }
+    else {
+        const nextMap = mutators[path[0]];
+        assert(typeof nextMap === 'object' && nextMap !== undefined, `could not find mutator map for ${name}`);
+        mutator = nextMap[path[1]];
+    }
+    assert(typeof mutator === 'function', () => `could not find mutator ${name}`);
+    return mutator;
+}
+//# sourceMappingURL=process-mutations.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"process-mutations.js","sourceRoot":"","sources":["../../../../zero-server/src/process-mutations.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,gBAAgB,GAMjB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,6BAA6B,EAAC,MAAM,kDAAkD,CAAC;AAC/F,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AAsEnD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,EAG8B,EAC9B,kBAAsE,EACtE,IAAmC,EACnC,QAA+B;IAE/B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,IAAI,kBAAkB,YAAY,OAAO,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtE,QAAQ,GAAG,IAAgB,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,MAAM,CAAC;QACpB,CAAC;IACH,CAAC;IAED,IAAI,WAAqD,CAAC;IAC1D,IAAI,kBAAkB,YAAY,OAAO,EAAE,CAAC;QAC1C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAC5C,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC;QAE/B,IAAI,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,CAAC;IACzC,CAAC;SAAM,CAAC;QACN,WAAW,GAAG,kBAAkB,CAAC;IACnC,CAAC;IACD,MAAM,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC1C,IAAI,WAAW,YAAY,eAAe,EAAE,CAAC;QAC3C,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC;IAE1E,IAAI,GAAG,CAAC,WAAW,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO;YACL,KAAK,EAAE,wBAAwB;SAChC,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IAE9D,MAAM,SAAS,GAAuB,EAAE,CAAC;IACzC,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;QAC9B,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,0BAA0B,CAAC,CAAC;QAExD,MAAM,GAAG,GAAG,MAAM,EAAE,CAClB,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,EAAE,OAAO,CAAC,EACpE,CAAC,CACF,CAAC;QACF,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEpB,2DAA2D;QAC3D,oFAAoF;QACpF,4CAA4C;QAC5C,IAAI,OAAO,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,aAAa,EAAE,CAAC;YAChE,MAAM;QACR,CAAC;IACH,CAAC;IAED,OAAO;QACL,SAAS,EAAE,SAAS;KACrB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU;IACL,IAAI,CAAW;IACf,OAAO,CAAS;IAChB,GAAG,CAAa;IAEzB,YAAY,GAAa,EAAE,MAAc,EAAE,QAAkB;QAC3D,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,GAAG,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IACrE,CAAC;IAED,QAAQ,GAAG,KAAK,EACd,UAAa,EACb,QAAwB,EACxB,EAAyB,EACE,EAAE;QAC7B,IAAI,WAAW,GAAY,SAAS,CAAC;QACrC,SAAS,CAAC;YACR,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAClC,UAAU,EACV,QAAQ,EACR,EAAE,EACF,WAAW,CACZ,CAAC;gBACF,6CAA6C;gBAC7C,wDAAwD;gBACxD,eAAe;gBACf,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBAC9B,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CACb,YAAY,QAAQ,CAAC,EAAE,eAAe,QAAQ,CAAC,QAAQ,gCAAgC,WAAW,EAAE,CACrG,CAAC;oBACF,OAAO,oBAAoB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;gBACrD,CAAC;gBAED,OAAO,GAAG,CAAC;YACb,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,YAAY,kBAAkB,EAAE,CAAC;oBACpC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;oBACpB,OAAO;wBACL,EAAE,EAAE;4BACF,QAAQ,EAAE,QAAQ,CAAC,QAAQ;4BAC3B,EAAE,EAAE,QAAQ,CAAC,EAAE;yBAChB;wBACD,MAAM,EAAE;4BACN,KAAK,EAAE,aAAa;4BACpB,OAAO,EAAE,CAAC,CAAC,OAAO;yBACnB;qBACF,CAAC;gBACJ,CAAC;gBAED,IAAI,CAAC,YAAY,6BAA6B,EAAE,CAAC;oBAC/C,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;oBACnB,OAAO;wBACL,EAAE,EAAE;4BACF,QAAQ,EAAE,QAAQ,CAAC,QAAQ;4BAC3B,EAAE,EAAE,QAAQ,CAAC,EAAE;yBAChB;wBACD,MAAM,EAAE;4BACN,KAAK,EAAE,kBAAkB;4BACzB,OAAO,EAAE,CAAC,CAAC,OAAO;yBACnB;qBACF,CAAC;gBACJ,CAAC;gBAED,iDAAiD;gBACjD,qDAAqD;gBACrD,2DAA2D;gBAC3D,gBAAgB;gBAChB,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBAC9B,MAAM,CAAC,CAAC;gBACV,CAAC;gBAED,WAAW,GAAG,CAAC,CAAC;gBAChB,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CACd,wCAAwC,QAAQ,CAAC,EAAE,eAAe,QAAQ,CAAC,QAAQ,EAAE,EACrF,CAAC,CACF,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF,aAAa,CACX,UAAa,EACb,QAAwB,EACxB,EAAyB,EACzB,WAAoB;QAEpB,OAAO,UAAU,CAAC,WAAW,CAC3B,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE;YAC/B,MAAM,IAAI,CAAC,gCAAgC,CACzC,gBAAgB,EAChB,QAAQ,CAAC,QAAQ,EACjB,QAAQ,CAAC,EAAE,CACZ,CAAC;YAEF,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAClD,CAAC;iBAAM,CAAC;gBACN,MAAM,QAAQ,GAAG,oBAAoB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC7D,MAAM,gBAAgB,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YACvD,CAAC;YAED,OAAO;gBACL,EAAE,EAAE;oBACF,QAAQ,EAAE,QAAQ,CAAC,QAAQ;oBAC3B,EAAE,EAAE,QAAQ,CAAC,EAAE;iBAChB;gBACD,MAAM,EAAE,EAAE;aACX,CAAC;QACJ,CAAC,EACD;YACE,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;YACnC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,aAAa;YACtC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,UAAU,EAAE,QAAQ,CAAC,EAAE;SACxB,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,gCAAgC,CACpC,gBAA0C,EAC1C,QAAgB,EAChB,kBAA0B;QAE1B,MAAM,EAAC,cAAc,EAAC,GAAG,MAAM,gBAAgB,CAAC,sBAAsB,EAAE,CAAC;QAEzE,IAAI,kBAAkB,GAAG,cAAc,EAAE,CAAC;YACxC,MAAM,IAAI,6BAA6B,CACrC,QAAQ,EACR,kBAAkB,EAClB,cAAc,CACf,CAAC;QACJ,CAAC;aAAM,IAAI,kBAAkB,GAAG,cAAc,EAAE,CAAC;YAC/C,MAAM,IAAI,kBAAkB,CAC1B,QAAQ,EACR,kBAAkB,EAClB,cAAc,CACf,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAC3C,YACE,QAAgB,EAChB,kBAA0B,EAC1B,cAA+B;QAE/B,KAAK,CACH,UAAU,QAAQ,qBAAqB,kBAAkB,iBAAiB,cAAc,EAAE,CAC3F,CAAC;IACJ,CAAC;CACF;AAED,SAAS,oBAAoB,CAAC,CAAW,EAAE,CAAU;IACnD,OAAO;QACL,EAAE,EAAE;YACF,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,EAAE,EAAE,CAAC,CAAC,EAAE;SACT;QACD,MAAM,EAAE;YACN,KAAK,EAAE,KAAK;YACZ,OAAO,EACL,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,mCAAmC;SACvE;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,WAAW;AACzB,8DAA8D;AAC9D,QAAgC,EAChC,IAAY;IAGZ,IAAI,IAAc,CAAC;IACnB,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,8DAA8D;IAC9D,IAAI,OAAY,CAAC;IACjB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;SAAM,CAAC;QACN,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,CACJ,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,SAAS,EACpD,kCAAkC,IAAI,EAAE,CACzC,CAAC;QACF,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,OAAO,OAAO,KAAK,UAAU,EAAE,GAAG,EAAE,CAAC,0BAA0B,IAAI,EAAE,CAAC,CAAC;IAC9E,OAAO,OAAO,CAAC;AACjB,CAAC"}

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

@@ -1,29 +1,8 @@
 import { type LogLevel } from '@rocicorp/logger';
 import type { ReadonlyJSONValue } from '../../shared/src/json.ts';
-import * as v from '../../shared/src/valita.ts';
-import { pushParamsSchema, type MutationResponse, type PushResponse } from '../../zero-protocol/src/push.ts';
+import { type PushResponse } from '../../zero-protocol/src/push.ts';
 import type { CustomMutatorDefs } from './custom.ts';
-export type Params = v.Infer<typeof pushParamsSchema>;
-export interface TransactionProviderHooks {
-    updateClientMutationID: () => Promise<{
-        lastMutationID: number | bigint;
-    }>;
-    writeMutationResult: (result: MutationResponse) => Promise<void>;
-}
-export interface TransactionProviderInput {
-    upstreamSchema: string;
-    clientGroupID: string;
-    clientID: string;
-    mutationID: number;
-}
-/**
- * Defines the abstract interface for a database that PushProcessor can execute
- * transactions against.
- */
-export interface Database<T> {
-    transaction: <R>(callback: (tx: T, transactionHooks: TransactionProviderHooks) => Promise<R>, transactionInput: TransactionProviderInput) => Promise<R>;
-}
-type ExtractTransactionType<D> = D extends Database<infer T> ? T : never;
+import { type ExtractTransactionType, type Database } from '../../zero-server/src/process-mutations.ts';
 export declare class PushProcessor<D extends Database<ExtractTransactionType<D>>, MD extends CustomMutatorDefs<ExtractTransactionType<D>>> {
     #private;
     constructor(dbProvider: D, logLevel?: LogLevel);
@@ -47,8 +26,4 @@ export declare class PushProcessor<D extends Database<ExtractTransactionType<D>>
      */
     process(mutators: MD, request: Request): Promise<PushResponse>;
 }
-export declare class OutOfOrderMutation extends Error {
-    constructor(clientID: string, receivedMutationID: number, lastMutationID: number | bigint);
-}
-export {};
 //# 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,EAAa,KAAK,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAE3D,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAEhD,OAAO,EAEL,gBAAgB,EAEhB,KAAK,gBAAgB,EAErB,KAAK,YAAY,EAClB,MAAM,iCAAiC,CAAC;AAGzC,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAEnD,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAKtD,MAAM,WAAW,wBAAwB;IACvC,sBAAsB,EAAE,MAAM,OAAO,CAAC;QAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAC,CAAC;IACzE,mBAAmB,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AAED,MAAM,WAAW,wBAAwB;IACvC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,WAAW,QAAQ,CAAC,CAAC;IACzB,WAAW,EAAE,CAAC,CAAC,EACb,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,gBAAgB,EAAE,wBAAwB,KAAK,OAAO,CAAC,CAAC,CAAC,EAC3E,gBAAgB,EAAE,wBAAwB,KACvC,OAAO,CAAC,CAAC,CAAC,CAAC;CACjB;AAED,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAEzE,qBAAa,aAAa,CACxB,CAAC,SAAS,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAC7C,EAAE,SAAS,iBAAiB,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;;gBAK3C,UAAU,EAAE,CAAC,EAAE,QAAQ,GAAE,QAAiB;IAKtD;;;;;;;;;;OAUG;IACG,OAAO,CACX,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;IACG,OAAO,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;CAgOrE;AAED,qBAAa,kBAAmB,SAAQ,KAAK;gBAEzC,QAAQ,EAAE,MAAM,EAChB,kBAAkB,EAAE,MAAM,EAC1B,cAAc,EAAE,MAAM,GAAG,MAAM;CAMlC"}
+{"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;AAChE,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AACnD,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,QAAQ,EAGd,MAAM,4CAA4C,CAAC;AAGpD,qBAAa,aAAa,CACxB,CAAC,SAAS,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAC7C,EAAE,SAAS,iBAAiB,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;;gBAK3C,UAAU,EAAE,CAAC,EAAE,QAAQ,GAAE,QAAiB;IAKtD;;;;;;;;;;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;CA6D/D"}

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

@@ -1,174 +1,37 @@
-import { LogContext } from '@rocicorp/logger';
+import {} from '@rocicorp/logger';
 import { assert } from "../../shared/src/asserts.js";
-import * as v from "../../shared/src/valita.js";
-import { MutationAlreadyProcessedError } from "../../zero-cache/src/services/mutagen/mutagen.js";
-import { pushBodySchema, pushParamsSchema, } from "../../zero-protocol/src/push.js";
+import {} from "../../zero-protocol/src/push.js";
 import { splitMutatorKey } from "../../zql/src/mutate/custom.js";
-import { createLogContext } from "./logging.js";
+import { mapMutationRequest, } from "../../zero-server/src/process-mutations.js";
+import { must } from "../../shared/src/must.js";
 export class PushProcessor {
     #dbProvider;
-    #lc;
+    #logLevel;
     constructor(dbProvider, logLevel = 'info') {
         this.#dbProvider = dbProvider;
-        this.#lc = createLogContext(logLevel).withContext('PushProcessor');
+        this.#logLevel = logLevel;
     }
-    async process(mutators, queryOrQueryString, body) {
-        let queryString;
+    process(mutators, queryOrQueryString, body) {
         if (queryOrQueryString instanceof Request) {
-            const url = new URL(queryOrQueryString.url);
-            queryString = url.searchParams;
-            body = await queryOrQueryString.json();
+            return mapMutationRequest((transact, mutations) => this.#processMutation(mutators, transact, mutations), queryOrQueryString, this.#logLevel);
         }
-        else {
-            queryString = queryOrQueryString;
-        }
-        const req = v.parse(body, pushBodySchema);
-        if (queryString instanceof URLSearchParams) {
-            queryString = Object.fromEntries(queryString);
-        }
-        const queryParams = v.parse(queryString, pushParamsSchema, 'passthrough');
-        if (req.pushVersion !== 1) {
-            this.#lc.error?.(`Unsupported push version ${req.pushVersion} for clientGroupID ${req.clientGroupID}`);
-            return {
-                error: 'unsupportedPushVersion',
-            };
-        }
-        const responses = [];
-        for (const m of req.mutations) {
-            const res = await this.#processMutation(mutators, queryParams, req, m);
-            responses.push(res);
-            // we only break if we encounter an out-of-order mutation.
-            // otherwise we continue processing the rest of the mutations.
-            if ('error' in res.result && res.result.error === 'oooMutation') {
-                break;
-            }
-        }
-        return {
-            mutations: responses,
-        };
+        return mapMutationRequest((transact, mutation) => this.#processMutation(mutators, transact, mutation), queryOrQueryString, must(body), this.#logLevel);
     }
-    async #processMutation(mutators, params, req, m) {
-        let caughtError = undefined;
-        for (;;) {
-            try {
-                const ret = await this.#processMutationImpl(mutators, params, req, m, caughtError);
-                // The first time through we caught an error.
-                // We want to report that error as it was an application
-                // level error.
-                if (caughtError !== undefined) {
-                    this.#lc.warn?.(`Mutation ${m.id} for client ${m.clientID} was retried after an error: ${caughtError}`);
-                    return makeAppErrorResponse(m, caughtError);
-                }
-                return ret;
-            }
-            catch (e) {
-                if (e instanceof OutOfOrderMutation) {
-                    this.#lc.error?.(e);
-                    return {
-                        id: {
-                            clientID: m.clientID,
-                            id: m.id,
-                        },
-                        result: {
-                            error: 'oooMutation',
-                            details: e.message,
-                        },
-                    };
-                }
-                if (e instanceof MutationAlreadyProcessedError) {
-                    this.#lc.warn?.(e);
-                    return {
-                        id: {
-                            clientID: m.clientID,
-                            id: m.id,
-                        },
-                        result: {
-                            error: 'alreadyProcessed',
-                            details: e.message,
-                        },
-                    };
-                }
-                // We threw an error while running in error mode.
-                // Re-throw the error and stop processing any further
-                // mutations as all subsequent mutations will fail by being
-                // out of order.
-                if (caughtError !== undefined) {
-                    throw e;
-                }
-                caughtError = e;
-                this.#lc.error?.(`Unexpected error processing mutation ${m.id} for client ${m.clientID}`, e);
-            }
-        }
-    }
-    #processMutationImpl(mutators, params, req, m, caughtError) {
-        if (m.type === 'crud') {
-            throw new Error('crud mutators are deprecated in favor of custom mutators.');
-        }
-        return this.#dbProvider.transaction(async (dbTx, transactionHooks) => {
-            await this.#checkAndIncrementLastMutationID(this.#lc, transactionHooks, m.clientID, m.id);
-            const result = {
-                id: {
-                    clientID: m.clientID,
-                    id: m.id,
-                },
-                result: {},
-            };
-            // no caught error? Not in error mode.
-            if (caughtError === undefined) {
-                await this.#dispatchMutation(dbTx, mutators, m);
-            }
-            else {
-                const appError = makeAppErrorResponse(m, caughtError);
-                await transactionHooks.writeMutationResult(appError);
-            }
-            return result;
-        }, {
-            upstreamSchema: params.schema,
-            clientGroupID: req.clientGroupID,
-            clientID: m.clientID,
-            mutationID: m.id,
-        });
+    #processMutation(mutators, transact, _mutation) {
+        return transact(this.#dbProvider, (tx, name, args) => this.#dispatchMutation(mutators, tx, name, args));
     }
-    #dispatchMutation(dbTx, mutators, m) {
-        const [namespace, name] = splitMutatorKey(m.name);
+    #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 ${m.name}`);
-            return mutator(dbTx, m.args[0]);
+            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 ${m.name}`);
-        return mutator(dbTx, m.args[0]);
+        assert(typeof mutator === 'function', () => `could not find mutator ${key}`);
+        return mutator(dbTx, args);
     }
-    async #checkAndIncrementLastMutationID(lc, transactionHooks, clientID, receivedMutationID) {
-        lc.debug?.(`Incrementing LMID. Received: ${receivedMutationID}`);
-        const { lastMutationID } = await transactionHooks.updateClientMutationID();
-        if (receivedMutationID < lastMutationID) {
-            throw new MutationAlreadyProcessedError(clientID, receivedMutationID, lastMutationID);
-        }
-        else if (receivedMutationID > lastMutationID) {
-            throw new OutOfOrderMutation(clientID, receivedMutationID, lastMutationID);
-        }
-        lc.debug?.(`Incremented LMID. Received: ${receivedMutationID}. New: ${lastMutationID}`);
-    }
-}
-export class OutOfOrderMutation extends Error {
-    constructor(clientID, receivedMutationID, lastMutationID) {
-        super(`Client ${clientID} sent mutation ID ${receivedMutationID} but expected ${lastMutationID}`);
-    }
-}
-function makeAppErrorResponse(m, e) {
-    return {
-        id: {
-            clientID: m.clientID,
-            id: m.id,
-        },
-        result: {
-            error: 'app',
-            details: e instanceof Error ? e.message : 'exception was not of type `Error`',
-        },
-    };
 }
 //# 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":"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"}
+{"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,kBAAkB,GAEnB,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,kBAAkB,CACvB,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,kBAAkB,CACvB,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"}

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

@@ -10,7 +10,7 @@ import type { Schema } from '../../../zero-schema/src/builder/schema-builder.ts'
  *
  * If you need to limit concurrency, you can use a library like `p-limit` to wrap the `cb` function.
  */
-export declare function getQueries<S extends Schema>(cb: (name: string, args: readonly ReadonlyJSONValue[]) => Promise<{
+export declare function mapQueryRequest<S extends Schema>(cb: (name: string, args: readonly ReadonlyJSONValue[]) => Promise<{
     query: AnyQuery;
 }>, schema: S, requestOrJsonBody: Request | ReadonlyJSONValue): Promise<TransformResponseMessage>;
 //# 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;AAI/E;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAAC,CAAC,SAAS,MAAM,EAC/C,EAAE,EAAE,CACF,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,iBAAiB,EAAE,KAC/B,OAAO,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAC,CAAC,EAC/B,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,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;AAI/E;;;;;;;GAOG;AACH,wBAAsB,eAAe,CAAC,CAAC,SAAS,MAAM,EACpD,EAAE,EAAE,CACF,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,iBAAiB,EAAE,KAC/B,OAAO,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAC,CAAC,EAC/B,MAAM,EAAE,CAAC,EACT,iBAAiB,EAAE,OAAO,GAAG,iBAAiB,GAC7C,OAAO,CAAC,wBAAwB,CAAC,CAwBnC"}

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

@@ -11,7 +11,7 @@ import { mapAST } from "../../../zero-protocol/src/ast.js";
  *
  * If you need to limit concurrency, you can use a library like `p-limit` to wrap the `cb` function.
  */
-export async function getQueries(cb, schema, requestOrJsonBody) {
+export async function mapQueryRequest(cb, schema, requestOrJsonBody) {
     const nameMapper = clientToServer(schema.tables);
     let body;
     if (requestOrJsonBody instanceof Request) {

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;AAEzD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,EAG+B,EAC/B,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","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;AAEzD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,EAG+B,EAC/B,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"}

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

@@ -1,7 +1,7 @@
 import type { DBConnection } from '../../zql/src/mutate/custom.ts';
 import { TransactionImpl } from './custom.ts';
 import type { Schema } from '../../zero-schema/src/builder/schema-builder.ts';
-import type { Database, TransactionProviderHooks, TransactionProviderInput } from './push-processor.ts';
+import type { Database, TransactionProviderHooks, TransactionProviderInput } from './process-mutations.ts';
 /**
  * Implements a Database for use with PushProcessor that is backed by Postgres.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"zql-database.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/zql-database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EAIb,MAAM,gCAAgC,CAAC;AAIxC,OAAO,EAAiB,eAAe,EAAC,MAAM,aAAa,CAAC;AAC5D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAE5E,OAAO,KAAK,EACV,QAAQ,EACR,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,qBAAqB,CAAC;AAE7B;;;;;;GAMG;AACH,qBAAa,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,kBAAkB,CAC3D,YAAW,QAAQ,CAAC,eAAe,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;;gBAc/C,UAAU,EAAE,YAAY,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAOnE,WAAW,CAAC,CAAC,EACX,QAAQ,EAAE,CACR,EAAE,EAAE,eAAe,CAAC,CAAC,EAAE,kBAAkB,CAAC,EAC1C,gBAAgB,EAAE,wBAAwB,KACvC,OAAO,CAAC,CAAC,CAAC,EACf,gBAAgB,EAAE,wBAAwB,GACzC,OAAO,CAAC,CAAC,CAAC;CA2Cd"}
+{"version":3,"file":"zql-database.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/zql-database.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EAIb,MAAM,gCAAgC,CAAC;AAIxC,OAAO,EAAiB,eAAe,EAAC,MAAM,aAAa,CAAC;AAC5D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAE5E,OAAO,KAAK,EACV,QAAQ,EACR,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAEhC;;;;;;GAMG;AACH,qBAAa,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,kBAAkB,CAC3D,YAAW,QAAQ,CAAC,eAAe,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;;gBAc/C,UAAU,EAAE,YAAY,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAOnE,WAAW,CAAC,CAAC,EACX,QAAQ,EAAE,CACR,EAAE,EAAE,eAAe,CAAC,CAAC,EAAE,kBAAkB,CAAC,EAC1C,gBAAgB,EAAE,wBAAwB,KACvC,OAAO,CAAC,CAAC,CAAC,EACf,gBAAgB,EAAE,wBAAwB,GACzC,OAAO,CAAC,CAAC,CAAC;CA2Cd"}

package/out/zero.js

@@ -5,12 +5,12 @@ import {
   createBuilder,
   definePermissions,
   escapeLike,
-  queries,
-  queriesWithContext,
   relationships,
-  transformRequestMessageSchema,
-  transformResponseMessageSchema
-} from "./chunk-ZIZNSAHP.js";
+  syncedQuery,
+  syncedQueryWithContext,
+  withContext,
+  withValidation
+} from "./chunk-ZKQCPILX.js";
 import {
   IDBNotFoundError,
   TransactionClosedError,
@@ -27,12 +27,14 @@ import {
   number,
   string,
   table,
+  transformRequestMessageSchema,
+  transformResponseMessageSchema,
   update_needed_reason_type_enum_exports
-} from "./chunk-KKPRF2XZ.js";
+} from "./chunk-ZZJ2SCHD.js";
 import "./chunk-MKB4RXL3.js";
 import {
   applyChange
-} from "./chunk-O536GEIT.js";
+} from "./chunk-RPVWLROJ.js";
 import "./chunk-SGW2EIVJ.js";
 import "./chunk-424PT5DM.js";
 export {
@@ -57,12 +59,14 @@ export {
   json,
   makeIDBName,
   number,
-  queries,
-  queriesWithContext,
   relationships,
   string,
+  syncedQuery,
+  syncedQueryWithContext,
   table,
   transformRequestMessageSchema,
-  transformResponseMessageSchema
+  transformResponseMessageSchema,
+  withContext,
+  withValidation
 };
 //# sourceMappingURL=zero.js.map

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

@@ -3,8 +3,9 @@ import type { AST, Condition, Disjunction, Ordering } from '../../../zero-protoc
 import type { Row } from '../../../zero-protocol/src/data.ts';
 import type { PrimaryKey } from '../../../zero-protocol/src/primary-key.ts';
 import { type FilterInput } from '../ivm/filter-operators.ts';
-import type { Input, Storage } from '../ivm/operator.ts';
+import type { Input, InputBase, Storage } from '../ivm/operator.ts';
 import type { Source, SourceInput } from '../ivm/source.ts';
+import type { DebugDelegate } from './debug-delegate.ts';
 import { type NoSubqueryCondition } from './filter.ts';
 export type StaticQueryParameters = {
     authData: Record<string, JSONValue>;
@@ -15,6 +16,8 @@ export type StaticQueryParameters = {
  * pipeline to delegate environment to provide sources and storage.
  */
 export interface BuilderDelegate {
+    readonly applyFiltersAnyway?: boolean | undefined;
+    readonly debug?: DebugDelegate | undefined;
     /**
      * Called once for each source needed by the AST.
      * Might be called multiple times with same tableName. It is OK to return
@@ -27,6 +30,7 @@ export interface BuilderDelegate {
      */
     createStorage(name: string): Storage;
     decorateInput(input: Input, name: string): Input;
+    addEdge(source: InputBase, dest: InputBase): void;
     decorateFilterInput(input: FilterInput, name: string): FilterInput;
     decorateSourceInput(input: SourceInput, queryID: string): Input;
     /**

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":"AACA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAE3D,OAAO,KAAK,EACV,GAAG,EAGH,SAAS,EAIT,WAAW,EAEX,QAAQ,EAIT,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAI1E,OAAO,EAEL,KAAK,WAAW,EACjB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,KAAK,EAAC,KAAK,EAAE,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAkB,KAAK,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAEtE,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,cAAc,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAEjD;;;OAGG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAErC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAEjD,mBAAmB,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAEnE,mBAAmB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC;IAEhE;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC;CAC1C;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,MAAM,GACd,KAAK,CAOP;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,GAAG,EACR,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,OAqDzD;AAmID,wBAAgB,OAAO,CACrB,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,WAAW,EACtB,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,MAAM,GACX,WAAW,CAgCb;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,WAAW,6EAa7D;AAED,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,SAAS,GACnB,SAAS,IAAI,mBAAmB,CAQlC;AA0GD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,UAAU,GACb,IAAI,CAeN"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../../zql/src/builder/builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAE3D,OAAO,KAAK,EACV,GAAG,EAGH,SAAS,EAIT,WAAW,EAEX,QAAQ,EAIT,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAI1E,OAAO,EAEL,KAAK,WAAW,EACjB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,KAAK,EAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAElE,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE1D,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAkB,KAAK,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAEtE,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,cAAc,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClD,QAAQ,CAAC,KAAK,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAE3C;;;;OAIG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAEjD;;;OAGG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAErC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAEjD,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;IAElD,mBAAmB,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAEnE,mBAAmB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC;IAEhE;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC;CAC1C;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,MAAM,GACd,KAAK,CAOP;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,GAAG,EACR,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,OAqDzD;AA8ID,wBAAgB,OAAO,CACrB,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,WAAW,EACtB,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,MAAM,GACX,WAAW,CAsCb;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,WAAW,6EAa7D;AAED,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,SAAS,GACnB,SAAS,IAAI,mBAAmB,CAQlC;AAiID,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,UAAU,GACb,IAAI,CAeN"}