@rocicorp/zero 0.23.2025081401 → 0.23.2025081901

package/out/zero-protocol/src/custom-queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom-queries.js","sourceRoot":"","sources":["../../../../zero-protocol/src/custom-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AAEnC,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,CAAC,KAAK,CAC/C,CAAC,CAAC,MAAM,CAAC;IACP,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;CACtC,CAAC,CACH,CAAC;AAGF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7C,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,GAAG,EAAE,SAAS;CACf,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IACvB,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,KAAK,CAChD,CAAC,CAAC,KAAK,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,CACpD,CAAC;AAGF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAC,KAAK,CAAC;IACnD,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IACtB,0BAA0B;CAC3B,CAAC,CAAC;AAKH,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,CAAC,KAAK,CAAC;IACpD,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;IACxB,2BAA2B;CAC5B,CAAC,CAAC"}
+{"version":3,"file":"custom-queries.js","sourceRoot":"","sources":["../../../../zero-protocol/src/custom-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AAEnC,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,CAAC,KAAK,CAC/C,CAAC,CAAC,MAAM,CAAC;IACP,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;CACtC,CAAC,CACH,CAAC;AAGF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7C,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,GAAG,EAAE,SAAS;CACf,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1C,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IACvB,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACxB,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACxB,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CACvC,mBAAmB,EACnB,oBAAoB,EACpB,eAAe,CAChB,CAAC;AAKF,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,KAAK,CAChD,CAAC,CAAC,KAAK,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,CACpD,CAAC;AAGF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAC,KAAK,CAAC;IACnD,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IACtB,0BAA0B;CAC3B,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,KAAK,CAAC;IACjD,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;IAC3B,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC;CAC5B,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,CAAC,KAAK,CAAC;IACpD,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;IACxB,2BAA2B;CAC5B,CAAC,CAAC"}

package/out/zero-protocol/src/down.d.ts

@@ -145,6 +145,7 @@ export declare const downstreamSchema: v.UnionType<[v.TupleType<[v.Type<"connect
         rowCount: v.Type<number>;
         metrics: v.Optional<{
             'query-materialization-server': [number, ...number[]];
+            'query-update-server': [number, ...number[]];
         } | null>;
     }, undefined>>;
 }, undefined>, v.ObjectType<Omit<{
@@ -153,12 +154,29 @@ export declare const downstreamSchema: v.UnionType<[v.TupleType<[v.Type<"connect
     op: v.Type<"metrics">;
     value: v.ObjectType<{
         'query-materialization-server': v.VariadicTupleType<[v.Type<number>], v.Type<number>, []>;
+        'query-update-server': v.VariadicTupleType<[v.Type<number>], v.Type<number>, []>;
     }, undefined>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;
 }, "op" | "value"> & {
     op: v.Type<"version">;
     value: v.Type<string>;
-}, undefined>]>]>]>;
+}, undefined>]>]>, v.TupleType<[v.Type<"transformError">, v.ArrayType<v.UnionType<[v.ObjectType<{
+    error: v.Type<"app">;
+    id: v.Type<string>;
+    name: v.Type<string>;
+    details: v.Type<import("../../shared/src/json.ts").ReadonlyJSONValue>;
+}, undefined>, v.ObjectType<{
+    error: v.Type<"http">;
+    id: v.Type<string>;
+    name: v.Type<string>;
+    status: v.Type<number>;
+    details: v.Type<import("../../shared/src/json.ts").ReadonlyJSONValue>;
+}, undefined>, v.ObjectType<{
+    error: v.Type<"zero">;
+    id: v.Type<string>;
+    name: v.Type<string>;
+    details: v.Type<import("../../shared/src/json.ts").ReadonlyJSONValue>;
+}, undefined>]>>]>]>;
 export type Downstream = v.Infer<typeof downstreamSchema>;
 //# sourceMappingURL=down.d.ts.map

package/out/zero-protocol/src/down.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"down.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/down.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAchD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAW5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC"}
+{"version":3,"file":"down.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/down.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAehD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBAY5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC"}

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

@@ -1,5 +1,6 @@
 import * as v from "../../shared/src/valita.js";
 import { connectedMessageSchema } from "./connect.js";
+import { transformErrorMessageSchema } from "./custom-queries.js";
 import { deleteClientsMessageSchema } from "./delete-clients.js";
 import { errorMessageSchema } from "./error.js";
 import { inspectDownMessageSchema } from "./inspect-down.js";
@@ -7,5 +8,5 @@ import { pokeEndMessageSchema, pokePartMessageSchema, pokeStartMessageSchema, }
 import { pongMessageSchema } from "./pong.js";
 import { pullResponseMessageSchema } from "./pull.js";
 import { pushResponseMessageSchema } from "./push.js";
-export const downstreamSchema = v.union(connectedMessageSchema, errorMessageSchema, pongMessageSchema, pokeStartMessageSchema, pokePartMessageSchema, pokeEndMessageSchema, pullResponseMessageSchema, deleteClientsMessageSchema, pushResponseMessageSchema, inspectDownMessageSchema);
+export const downstreamSchema = v.union(connectedMessageSchema, errorMessageSchema, pongMessageSchema, pokeStartMessageSchema, pokePartMessageSchema, pokeEndMessageSchema, pullResponseMessageSchema, deleteClientsMessageSchema, pushResponseMessageSchema, inspectDownMessageSchema, transformErrorMessageSchema);
 //# sourceMappingURL=down.js.map

package/out/zero-protocol/src/down.js.map

@@ -1 +1 @@
-{"version":3,"file":"down.js","sourceRoot":"","sources":["../../../../zero-protocol/src/down.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,sBAAsB,EAAC,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,0BAA0B,EAAC,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAC,kBAAkB,EAAC,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAC,wBAAwB,EAAC,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAC,yBAAyB,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,EAAC,yBAAyB,EAAC,MAAM,WAAW,CAAC;AAEpD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CACrC,sBAAsB,EACtB,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACtB,qBAAqB,EACrB,oBAAoB,EACpB,yBAAyB,EACzB,0BAA0B,EAC1B,yBAAyB,EACzB,wBAAwB,CACzB,CAAC"}
+{"version":3,"file":"down.js","sourceRoot":"","sources":["../../../../zero-protocol/src/down.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,sBAAsB,EAAC,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,2BAA2B,EAAC,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAC,0BAA0B,EAAC,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAC,kBAAkB,EAAC,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAC,wBAAwB,EAAC,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAC,yBAAyB,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,EAAC,yBAAyB,EAAC,MAAM,WAAW,CAAC;AAEpD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CACrC,sBAAsB,EACtB,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACtB,qBAAqB,EACrB,oBAAoB,EACpB,yBAAyB,EACzB,0BAA0B,EAC1B,yBAAyB,EACzB,wBAAwB,EACxB,2BAA2B,CAC5B,CAAC"}

package/out/zero-protocol/src/inspect-down.d.ts

@@ -1,6 +1,7 @@
 import * as v from '../../shared/src/valita.ts';
 declare const serverMetricsSchema: v.ObjectType<{
     'query-materialization-server': v.VariadicTupleType<[v.Type<number>], v.Type<number>, []>;
+    'query-update-server': v.VariadicTupleType<[v.Type<number>], v.Type<number>, []>;
 }, undefined>;
 export type ServerMetrics = v.Infer<typeof serverMetricsSchema>;
 declare const inspectQueryRowSchema: v.ObjectType<{
@@ -16,6 +17,7 @@ declare const inspectQueryRowSchema: v.ObjectType<{
     rowCount: v.Type<number>;
     metrics: v.Optional<{
         'query-materialization-server': [number, ...number[]];
+        'query-update-server': [number, ...number[]];
     } | null>;
 }, undefined>;
 export type InspectQueryRow = v.Infer<typeof inspectQueryRowSchema>;
@@ -36,6 +38,7 @@ export declare const inspectQueriesDownSchema: v.ObjectType<Omit<{
         rowCount: v.Type<number>;
         metrics: v.Optional<{
             'query-materialization-server': [number, ...number[]];
+            'query-update-server': [number, ...number[]];
         } | null>;
     }, undefined>>;
 }, undefined>;
@@ -46,6 +49,7 @@ export declare const inspectMetricsDownSchema: v.ObjectType<Omit<{
     op: v.Type<"metrics">;
     value: v.ObjectType<{
         'query-materialization-server': v.VariadicTupleType<[v.Type<number>], v.Type<number>, []>;
+        'query-update-server': v.VariadicTupleType<[v.Type<number>], v.Type<number>, []>;
     }, undefined>;
 }, undefined>;
 export type InspectMetricsDown = v.Infer<typeof inspectMetricsDownSchema>;
@@ -72,6 +76,7 @@ export declare const inspectDownBodySchema: v.UnionType<[v.ObjectType<Omit<{
         rowCount: v.Type<number>;
         metrics: v.Optional<{
             'query-materialization-server': [number, ...number[]];
+            'query-update-server': [number, ...number[]];
         } | null>;
     }, undefined>>;
 }, undefined>, v.ObjectType<Omit<{
@@ -80,6 +85,7 @@ export declare const inspectDownBodySchema: v.UnionType<[v.ObjectType<Omit<{
     op: v.Type<"metrics">;
     value: v.ObjectType<{
         'query-materialization-server': v.VariadicTupleType<[v.Type<number>], v.Type<number>, []>;
+        'query-update-server': v.VariadicTupleType<[v.Type<number>], v.Type<number>, []>;
     }, undefined>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;
@@ -104,6 +110,7 @@ export declare const inspectDownMessageSchema: v.TupleType<[v.Type<"inspect">, v
         rowCount: v.Type<number>;
         metrics: v.Optional<{
             'query-materialization-server': [number, ...number[]];
+            'query-update-server': [number, ...number[]];
         } | null>;
     }, undefined>>;
 }, undefined>, v.ObjectType<Omit<{
@@ -112,6 +119,7 @@ export declare const inspectDownMessageSchema: v.TupleType<[v.Type<"inspect">, v
     op: v.Type<"metrics">;
     value: v.ObjectType<{
         'query-materialization-server': v.VariadicTupleType<[v.Type<number>], v.Type<number>, []>;
+        'query-update-server': v.VariadicTupleType<[v.Type<number>], v.Type<number>, []>;
     }, undefined>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;

package/out/zero-protocol/src/inspect-down.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inspect-down.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/inspect-down.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAGhD,QAAA,MAAM,mBAAmB;;aAEvB,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;aAezB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAMpE,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;aAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,eAAO,MAAM,wBAAwB;;;;;;;aAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,eAAO,MAAM,wBAAwB;;;;;aAGnC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAIjC,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"inspect-down.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/inspect-down.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAGhD,QAAA,MAAM,mBAAmB;;;aAGvB,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;aAezB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAMpE,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;aAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,eAAO,MAAM,wBAAwB;;;;;;;;aAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,eAAO,MAAM,wBAAwB;;;;;aAGnC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAIjC,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC"}

package/out/zero-protocol/src/inspect-down.js

@@ -4,6 +4,7 @@ import * as v from "../../shared/src/valita.js";
 import { astSchema } from "./ast.js";
 const serverMetricsSchema = v.object({
     'query-materialization-server': tdigestSchema,
+    'query-update-server': tdigestSchema,
 });
 const inspectQueryRowSchema = v.object({
     clientID: v.string(),

package/out/zero-protocol/src/inspect-down.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspect-down.js","sourceRoot":"","sources":["../../../../zero-protocol/src/inspect-down.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAC,aAAa,EAAC,MAAM,oCAAoC,CAAC;AACjE,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AAEnC,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,8BAA8B,EAAE,aAAa;CAC9C,CAAC,CAAC;AAIH,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,0BAA0B;IAC1B,GAAG,EAAE,SAAS,CAAC,QAAQ,EAAE;IACzB,8BAA8B;IAC9B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,8BAA8B;IAC9B,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE;IAC5C,GAAG,EAAE,CAAC,CAAC,OAAO,EAAE;IAChB,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE;IACpB,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;IACf,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACpC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,OAAO,EAAE,mBAAmB,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;CACnD,CAAC,CAAC;AAIH,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;CACf,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAqB,CAAC,MAAM,CAAC;IACnE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IACxB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC;CACtC,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAqB,CAAC,MAAM,CAAC;IACnE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IACxB,KAAK,EAAE,mBAAmB;CAC3B,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAqB,CAAC,MAAM,CAAC;IACnE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IACxB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;CAClB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAC1C,wBAAwB,EACxB,wBAAwB,EACxB,wBAAwB,CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC;IAC9C,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IACpB,qBAAqB;CACtB,CAAC,CAAC"}
+{"version":3,"file":"inspect-down.js","sourceRoot":"","sources":["../../../../zero-protocol/src/inspect-down.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAC,aAAa,EAAC,MAAM,oCAAoC,CAAC;AACjE,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AAEnC,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,8BAA8B,EAAE,aAAa;IAC7C,qBAAqB,EAAE,aAAa;CACrC,CAAC,CAAC;AAIH,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,0BAA0B;IAC1B,GAAG,EAAE,SAAS,CAAC,QAAQ,EAAE;IACzB,8BAA8B;IAC9B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,8BAA8B;IAC9B,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE;IAC5C,GAAG,EAAE,CAAC,CAAC,OAAO,EAAE;IAChB,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE;IACpB,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;IACf,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACpC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,OAAO,EAAE,mBAAmB,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;CACnD,CAAC,CAAC;AAIH,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;CACf,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAqB,CAAC,MAAM,CAAC;IACnE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IACxB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC;CACtC,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAqB,CAAC,MAAM,CAAC;IACnE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IACxB,KAAK,EAAE,mBAAmB;CAC3B,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAqB,CAAC,MAAM,CAAC;IACnE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IACxB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;CAClB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAC1C,wBAAwB,EACxB,wBAAwB,EACxB,wBAAwB,CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC;IAC9C,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IACpB,qBAAqB;CACtB,CAAC,CAAC"}

package/out/zero-protocol/src/protocol-version.d.ts

@@ -10,7 +10,7 @@
  * release. The server (`zero-cache`) must be deployed before clients start
  * running the new code.
  */
-export declare const PROTOCOL_VERSION = 27;
+export declare const PROTOCOL_VERSION = 29;
 /**
  * The minimum server-supported sync protocol version (i.e. the version
  * declared in the "/sync/v{#}/connect" URL). The contract for

package/out/zero-protocol/src/protocol-version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol-version.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/protocol-version.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AAsBH,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC;;;;;;;;;GASG;AACH,eAAO,MAAM,kCAAkC,KAAK,CAAC"}
+{"version":3,"file":"protocol-version.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/protocol-version.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AAwBH,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC;;;;;;;;;GASG;AACH,eAAO,MAAM,kCAAkC,KAAK,CAAC"}

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

@@ -32,7 +32,9 @@ import { assert } from "../../shared/src/asserts.js";
 // -- version 25 modifies `mutationsResults` to include `del` patches (0.22)
 // -- version 26 adds inspect/metrics and adds metrics to inspect/query (0.23)
 // -- version 27 adds inspect/version (0.23)
-export const PROTOCOL_VERSION = 27;
+// -- version 28 adds more inspect/metrics (0.23)
+// -- version 29 adds error responses for custom queries (0.23)
+export const PROTOCOL_VERSION = 29;
 /**
  * The minimum server-supported sync protocol version (i.e. the version
  * declared in the "/sync/v{#}/connect" URL). The contract for

package/out/zero-protocol/src/protocol-version.js.map

@@ -1 +1 @@
-{"version":3,"file":"protocol-version.js","sourceRoot":"","sources":["../../../../zero-protocol/src/protocol-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AAEnD;;;;;;;;;;;GAWG;AACH,WAAW;AACX,yDAAyD;AACzD,yDAAyD;AACzD,wEAAwE;AACxE,mDAAmD;AACnD,6CAA6C;AAC7C,uHAAuH;AACvH,6FAA6F;AAC7F,yEAAyE;AACzE,sFAAsF;AACtF,4FAA4F;AAC5F,8EAA8E;AAC9E,6EAA6E;AAC7E,sDAAsD;AACtD,oIAAoI;AACpI,oFAAoF;AACpF,qDAAqD;AACrD,8DAA8D;AAC9D,4EAA4E;AAC5E,8EAA8E;AAC9E,4CAA4C;AAC5C,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAEnC;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,EAAE,CAAC;AAErD,MAAM,CAAC,kCAAkC,GAAG,gBAAgB,CAAC,CAAC"}
+{"version":3,"file":"protocol-version.js","sourceRoot":"","sources":["../../../../zero-protocol/src/protocol-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AAEnD;;;;;;;;;;;GAWG;AACH,WAAW;AACX,yDAAyD;AACzD,yDAAyD;AACzD,wEAAwE;AACxE,mDAAmD;AACnD,6CAA6C;AAC7C,uHAAuH;AACvH,6FAA6F;AAC7F,yEAAyE;AACzE,sFAAsF;AACtF,4FAA4F;AAC5F,8EAA8E;AAC9E,6EAA6E;AAC7E,sDAAsD;AACtD,oIAAoI;AACpI,oFAAoF;AACpF,qDAAqD;AACrD,8DAA8D;AAC9D,4EAA4E;AAC5E,8EAA8E;AAC9E,4CAA4C;AAC5C,iDAAiD;AACjD,+DAA+D;AAC/D,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAEnC;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,EAAE,CAAC;AAErD,MAAM,CAAC,kCAAkC,GAAG,gBAAgB,CAAC,CAAC"}

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

@@ -1,4 +1,5 @@
 export * from './queries/process-queries.ts';
+export * from './process-mutations.ts';
 export * from './push-processor.ts';
 export * from './custom.ts';
 export * from './zql-database.ts';

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

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gCAAgC,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-server/src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gCAAgC,CAAC"}

package/out/zero-server/src/mod.js

@@ -1,4 +1,5 @@
 export * from "./queries/process-queries.js";
+export * from "./process-mutations.js";
 export * from "./push-processor.js";
 export * from "./custom.js";
 export * from "./zql-database.js";

package/out/zero-server/src/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../../../zero-server/src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gCAAgC,CAAC"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../../../zero-server/src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gCAAgC,CAAC"}

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

@@ -0,0 +1,46 @@
+import type { ReadonlyJSONValue } from '../../shared/src/json.ts';
+import { pushParamsSchema, type CustomMutation, type MutationResponse, type PushResponse } from '../../zero-protocol/src/push.ts';
+import * as v from '../../shared/src/valita.ts';
+import type { LogLevel } from '@rocicorp/logger';
+import type { CustomMutatorDefs, CustomMutatorImpl } from './custom.ts';
+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>;
+}
+export type ExtractTransactionType<D> = D extends Database<infer T> ? T : never;
+export type Params = v.Infer<typeof pushParamsSchema>;
+export type TransactFn = <D extends Database<ExtractTransactionType<D>>>(dbProvider: D, cb: TransactFnCallback<D>) => Promise<MutationResponse>;
+export type TransactFnCallback<D extends Database<ExtractTransactionType<D>>> = (tx: ExtractTransactionType<D>, mutatorName: string, mutatorArgs: ReadonlyJSONValue) => Promise<void>;
+export type Parsed = {
+    transact: TransactFn;
+    mutations: CustomMutation[];
+};
+/**
+ * Call `cb` for each mutation in the request.
+ * The callback is called sequentially for each mutation.
+ * If a mutation is out of order, the processing will stop and an error will be returned.
+ * If a mutation has already been processed, it will be skipped and the processing will continue.
+ * If a mutation receives an application error, it will be skipped, the error will be returned to the client, and processing will continue.
+ */
+export declare function mapMutationRequest(cb: (transact: TransactFn, mutation: CustomMutation) => Promise<MutationResponse>, queryString: URLSearchParams | Record<string, string>, body: ReadonlyJSONValue, logLevel?: LogLevel | undefined): Promise<PushResponse>;
+export declare function mapMutationRequest(cb: (transact: TransactFn, mutation: CustomMutation) => Promise<MutationResponse>, request: Request, logLevel?: LogLevel | undefined): Promise<PushResponse>;
+export declare class OutOfOrderMutation extends Error {
+    constructor(clientID: string, receivedMutationID: number, lastMutationID: number | bigint);
+}
+export declare function getMutation(mutators: CustomMutatorDefs<any>, name: string): CustomMutatorImpl<any, any>;
+//# sourceMappingURL=process-mutations.d.ts.map

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

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

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

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

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