effect-zero 0.4.0 → 0.4.1

package/dist/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,iBAAiB,EAAE,IAAI,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEvH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAGtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,YAAY,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,WAAW,MAAM,4BAA4B,CAAC;AAK1D,KAAK,SAAS,CAAC,CAAC,SAAS,iBAAiB,GAAG,IAAI,EAAE,CAAC,IAAI;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,CAAC;AAEpH,eAAO,MAAM,cAAc,eAAmC,CAAC;AAC/D,eAAO,MAAM,eAAe,eAAoC,CAAC;AAEjE,eAAO,MAAM,IAAI,GACf,CAAC,SAAS,MAAM,EAGhB,CAAC,SAAS,iBAAiB,GAAG,IAAI,EAElC,CAAC,EACD,CAAC,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EACpC,CAAC,SAAS,UAAU,EACpB,CAAC,EACD,CAAC,EACD,EAAE,EACF,EAAE,EACF,SAAS;IACT,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACjC,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;CACvE,aA+B6B,CAAC;;;CAK9B,CAAC;AAGF,MAAM,MAAM,eAAe,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,GAAG,GAAG,EAAE,EAAE,GAAG,GAAG,IAAI,UAAU,CAEnE,OAAO,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAC9F,CAAC;AAEF,eAAO,MAAM,MAAM,GAAI,CAAC,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC,SAAS,UAAU,EAAE,CAAC,EAClF,MAAM,IAAI,CAAC,CAAC,CAAC,EACb,OAAO,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,4DAoBG,CAAC;AAE/B,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC,SAAS,UAAU,EAAE,CAAC,EACxF,OAAO,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,+BAC0D,CAAC;AAEtF,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC,SAAS,UAAU,EAAE,CAAC,EACxF,MAAM,IAAI,CAAC,CAAC,CAAC,EACb,OAAO,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,wEAQ1B,CAAC"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,iBAAiB,EAAE,IAAI,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEvH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAGtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,YAAY,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,WAAW,MAAM,4BAA4B,CAAC;AAK1D,KAAK,SAAS,CAAC,CAAC,SAAS,iBAAiB,GAAG,IAAI,EAAE,CAAC,IAAI;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,CAAC;AAEpH,eAAO,MAAM,cAAc,eAAmC,CAAC;AAC/D,eAAO,MAAM,eAAe,eAAoC,CAAC;AAEjE,eAAO,MAAM,IAAI,GACf,CAAC,SAAS,MAAM,EAGhB,CAAC,SAAS,iBAAiB,GAAG,IAAI,EAElC,CAAC,EACD,CAAC,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EACpC,CAAC,SAAS,UAAU,EACpB,CAAC,EACD,CAAC,EACD,EAAE,EACF,EAAE,EACF,SAAS;IACT,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACjC,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;CACvE,aA+B6B,CAAC;;;CAK9B,CAAC;AAGF,MAAM,MAAM,eAAe,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,GAAG,GAAG,EAAE,EAAE,GAAG,GAAG,IAAI,UAAU,CAEnE,OAAO,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAC9F,CAAC;AAEF,eAAO,MAAM,MAAM,GAAI,CAAC,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC,SAAS,UAAU,EAAE,CAAC,EAClF,MAAM,IAAI,CAAC,CAAC,CAAC,EACb,OAAO,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,4DA6BG,CAAC;AAE/B,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC,SAAS,UAAU,EAAE,CAAC,EACxF,OAAO,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,+BAC0D,CAAC;AAEtF,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC,SAAS,UAAU,EAAE,CAAC,EACxF,MAAM,IAAI,CAAC,CAAC,CAAC,EACb,OAAO,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,wEAQ1B,CAAC"}

package/dist/query.js

@@ -42,10 +42,14 @@ export const make = (options) => {
 };
 export const stream = (zero, query) => Effect.gen(function* () {
     const view = yield* Effect.acquireRelease(Effect.sync(() => zero.materialize(query)), (view) => Effect.sync(() => view.destroy()));
-    return Stream.asyncEffect((emit) => Effect.sync(() => view.addListener((...args) => emit.single(args)))).pipe(Stream.mapEffect(([data, resultType]) => Effect.sync(() => {
-        // logic here borrowed from: https://github.com/rocicorp/mono/blob/288b00ec94f5a9ae6e988513423af25c281dbb2a/packages/zero-react/src/use-query.tsx#L295
+    return Stream.asyncEffect((emit) => Effect.sync(() => view.addListener((...args) => emit.single(args)))).pipe(Stream.mapEffect(([data, resultType, error]) => Effect.sync(() => {
+        // logic here borrowed from: https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-react/src/use-query.tsx#L543
         const cloned = data === undefined ? data : deepClone(data);
-        return getSnapshot(asQueryInternals(query).format.singular, cloned, resultType);
+        return getSnapshot(asQueryInternals(query).format.singular, cloned, resultType, 
+        // TODO: Look into this. It seems like this is difficult but not impossible to model in the Effect paradigm.
+        // Likely need some kind of stateful piece between the publisher and and subscriber, allowing the subscriber to swap out
+        // the publisher when this function is called.
+        () => Effect.dieMessage("retry not available in `effect-zero`"), error);
     })), Stream.map(QueryResult.make));
 }).pipe(Stream.unwrapScoped);
 export const initialValue = (query) => QueryResult.make(getDefaultSnapshot(asQueryInternals(query).format.singular));

package/dist/query.js.map

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

package/dist/server.d.ts

@@ -11,6 +11,7 @@ export declare const processPush: <TSchema extends ZeroSchema, TTransaction, TMu
     readonly schema: string;
     readonly appID: string;
 }, request: {
+    readonly auth?: string | undefined;
     readonly timestamp: number;
     readonly clientGroupID: string;
     readonly mutations: readonly ({
@@ -72,6 +73,7 @@ export declare const processPush: <TSchema extends ZeroSchema, TTransaction, TMu
         };
         readonly result: {
             readonly error: "app";
+            readonly message?: string | undefined;
             readonly details?: unknown;
         } | {
             readonly error: "oooMutation" | "alreadyProcessed";

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAG9E,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAGtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,OAAO,KAAK,KAAK,WAAW,MAAM,oBAAoB,CAAC;AAOvD,OAAO,EAGL,4BAA4B,EAC5B,sBAAsB,EACvB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,KAAK,eAAe,EAAmC,MAAM,YAAY,CAAC;AACnF,OAAO,KAAK,KAAK,iBAAiB,MAAM,yBAAyB,CAAC;AAQlE,KAAK,wBAAwB,CAAC,OAAO,SAAS,UAAU,EAAE,YAAY,IAAI,IAAI,CAC5E,UAAU,CAAC,OAAO,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,EACxE,KAAK,CACN,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,OAAO,SAAS,UAAU,EAC1B,YAAY,EACZ,SAAS,SAAS,QAAQ,CAAC,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wJAyCtC,CAAC;;;;AA+EH,cAAM,2BAA4B,SAAQ,gCAA+C;CAAG;AAwB5F,eAAO,MAAM,WAAW,GAAwB,CAAC,EAAE,EAAE,EAAE,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4EA2BvD,CAAC;;;;AAEH,cAAM,aAAc,SAAQ,mBAAkC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;IAC7E,IAAa,OAAO,WAEnB;CACF;;;;AAYD,cAAM,iBAAkB,SAAQ,uBAAsC;IAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;CAAE,CAAC;CAAG"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAG9E,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAGtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,OAAO,KAAK,KAAK,WAAW,MAAM,oBAAoB,CAAC;AAOvD,OAAO,EAGL,4BAA4B,EAC5B,sBAAsB,EACvB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,KAAK,eAAe,EAAmC,MAAM,YAAY,CAAC;AACnF,OAAO,KAAK,KAAK,iBAAiB,MAAM,yBAAyB,CAAC;AAQlE,KAAK,wBAAwB,CAAC,OAAO,SAAS,UAAU,EAAE,YAAY,IAAI,IAAI,CAC5E,UAAU,CAAC,OAAO,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,EACxE,KAAK,CACN,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,OAAO,SAAS,UAAU,EAC1B,YAAY,EACZ,SAAS,SAAS,QAAQ,CAAC,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wJAyCtC,CAAC;;;;AA+EH,cAAM,2BAA4B,SAAQ,gCAA+C;CAAG;AAwB5F,eAAO,MAAM,WAAW,GAAwB,CAAC,EAAE,EAAE,EAAE,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4EA2BvD,CAAC;;;;AAEH,cAAM,aAAc,SAAQ,mBAAkC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;IAC7E,IAAa,OAAO,WAEnB;CACF;;;;AAYD,cAAM,iBAAkB,SAAQ,uBAAsC;IAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;CAAE,CAAC;CAAG"}

package/dist/snapshot.d.ts

@@ -1,10 +1,10 @@
-import type { HumanReadable, JSONValue, ReadonlyJSONValue } from "@rocicorp/zero";
+import type { ErroredQuery, HumanReadable, JSONValue, ReadonlyJSONValue, ResultType } from "@rocicorp/zero";
 import type { QueryResult } from "@rocicorp/zero/react";
 export declare function getDefaultSnapshot<TReturn>(singular: boolean): QueryResult<TReturn>;
 /**
  * Returns a new snapshot or one of the empty predefined ones. Returning the
  * predefined ones is important to prevent unnecessary re-renders in React.
  */
-export declare function getSnapshot<TReturn>(singular: boolean, data: HumanReadable<TReturn>, resultType: string): QueryResult<TReturn>;
+export declare function getSnapshot<TReturn>(singular: boolean, data: HumanReadable<TReturn>, resultType: ResultType, retryFn: () => void, error?: ErroredQuery): QueryResult<TReturn>;
 export declare function deepClone(value: ReadonlyJSONValue): JSONValue;
 //# sourceMappingURL=snapshot.d.ts.map

package/dist/snapshot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../src/snapshot.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAClF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAYxD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAEnF;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,OAAO,EACjC,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,EAC5B,UAAU,EAAE,MAAM,GACjB,WAAW,CAAC,OAAO,CAAC,CActB;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,iBAAiB,GAAG,SAAS,CAG7D"}
+{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../src/snapshot.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAqB,iBAAiB,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC/H,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAexD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAEnF;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,OAAO,EACjC,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,EAC5B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,MAAM,IAAI,EACnB,KAAK,CAAC,EAAE,YAAY,GACnB,WAAW,CAAC,OAAO,CAAC,CAsDtB;AAgBD,wBAAgB,SAAS,CAAC,KAAK,EAAE,iBAAiB,GAAG,SAAS,CAG7D"}

package/dist/snapshot.js

@@ -1,13 +1,16 @@
 // Code borrowed from:
-// https://github.com/rocicorp/mono/blob/30f209f2946b4cf2cd2dee459849351498f11308/packages/zero-react/src/use-query.tsx
-// https://github.com/rocicorp/mono/blob/30f209f2946b4cf2cd2dee459849351498f11308/packages/shared/src/deep-clone.ts#L4
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-react/src/use-query.tsx
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/shared/src/deep-clone.ts
 const emptyArray = [];
 const resultTypeUnknown = { type: "unknown" };
 const resultTypeComplete = { type: "complete" };
+const resultTypeError = { type: 'error' };
 const emptySnapshotSingularUnknown = [undefined, resultTypeUnknown];
 const emptySnapshotSingularComplete = [undefined, resultTypeComplete];
+const emptySnapshotSingularErrorUnknown = [undefined, resultTypeError];
 const emptySnapshotPluralUnknown = [emptyArray, resultTypeUnknown];
 const emptySnapshotPluralComplete = [emptyArray, resultTypeComplete];
+const emptySnapshotErrorUnknown = [emptyArray, resultTypeError];
 export function getDefaultSnapshot(singular) {
     return (singular ? emptySnapshotSingularUnknown : emptySnapshotPluralUnknown);
 }
@@ -15,16 +18,71 @@ export function getDefaultSnapshot(singular) {
  * Returns a new snapshot or one of the empty predefined ones. Returning the
  * predefined ones is important to prevent unnecessary re-renders in React.
  */
-export function getSnapshot(singular, data, resultType) {
+export function getSnapshot(singular, data, resultType, retryFn, error) {
     if (singular && data === undefined) {
-        return (resultType === "complete"
-            ? emptySnapshotSingularComplete
-            : emptySnapshotSingularUnknown);
+        switch (resultType) {
+            case 'error':
+                if (error) {
+                    return [
+                        undefined,
+                        makeError(retryFn, error),
+                    ];
+                }
+                return emptySnapshotSingularErrorUnknown;
+            case 'complete':
+                return emptySnapshotSingularComplete;
+            case 'unknown':
+                return emptySnapshotSingularUnknown;
+        }
     }
     if (!singular && data.length === 0) {
-        return (resultType === "complete" ? emptySnapshotPluralComplete : emptySnapshotPluralUnknown);
+        switch (resultType) {
+            case 'error':
+                if (error) {
+                    return [
+                        emptyArray,
+                        makeError(retryFn, error),
+                    ];
+                }
+                return emptySnapshotErrorUnknown;
+            case 'complete':
+                return emptySnapshotPluralComplete;
+            case 'unknown':
+                return emptySnapshotPluralUnknown;
+        }
     }
-    return [data, resultType === "complete" ? resultTypeComplete : resultTypeUnknown];
+    switch (resultType) {
+        case 'error':
+            if (error) {
+                return [data, makeError(retryFn, error)];
+            }
+            return [
+                data,
+                makeError(retryFn, {
+                    error: 'app',
+                    id: 'unknown',
+                    name: 'unknown',
+                    message: 'An unknown error occurred',
+                }),
+            ];
+        case 'complete':
+            return [data, resultTypeComplete];
+        case 'unknown':
+            return [data, resultTypeUnknown];
+    }
+}
+function makeError(retry, error) {
+    const message = error.message ?? 'An unknown error occurred';
+    return {
+        type: 'error',
+        retry,
+        refetch: retry,
+        error: {
+            type: error.error,
+            message,
+            ...(error.details ? { details: error.details } : {}),
+        },
+    };
 }
 export function deepClone(value) {
     const seen = [];

package/dist/snapshot.js.map

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

package/dist/types/error.d.ts

@@ -0,0 +1,59 @@
+import * as Schema from "effect/Schema";
+export declare const PushFailedBody: Schema.Union<[Schema.Struct<{
+    origin: Schema.Literal<["server"]>;
+    reason: Schema.Literal<["database", "parse", "oooMutation", "unsupportedPushVersion", "internal"]>;
+    kind: Schema.Literal<["PushFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    mutationIDs: Schema.Array$<Schema.Struct<{
+        id: typeof Schema.Number;
+        clientID: typeof Schema.String;
+    }>>;
+    message: typeof Schema.String;
+}>, Schema.Struct<{
+    origin: Schema.Literal<["zeroCache"]>;
+    reason: Schema.Literal<["http"]>;
+    status: typeof Schema.Number;
+    bodyPreview: Schema.optional<typeof Schema.String>;
+    kind: Schema.Literal<["PushFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    mutationIDs: Schema.Array$<Schema.Struct<{
+        id: typeof Schema.Number;
+        clientID: typeof Schema.String;
+    }>>;
+    message: typeof Schema.String;
+}>, Schema.Struct<{
+    origin: Schema.Literal<["zeroCache"]>;
+    reason: Schema.Literal<["timeout", "parse", "internal"]>;
+    kind: Schema.Literal<["PushFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    mutationIDs: Schema.Array$<Schema.Struct<{
+        id: typeof Schema.Number;
+        clientID: typeof Schema.String;
+    }>>;
+    message: typeof Schema.String;
+}>]>;
+export declare const TransformFailedBody: Schema.Union<[Schema.Struct<{
+    origin: Schema.Literal<["server"]>;
+    reason: Schema.Literal<["database", "parse", "internal"]>;
+    kind: Schema.Literal<["TransformFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    queryIDs: Schema.Array$<typeof Schema.String>;
+    message: typeof Schema.String;
+}>, Schema.Struct<{
+    origin: Schema.Literal<["zeroCache"]>;
+    reason: Schema.Literal<["http"]>;
+    status: typeof Schema.Number;
+    bodyPreview: Schema.optional<typeof Schema.String>;
+    kind: Schema.Literal<["TransformFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    queryIDs: Schema.Array$<typeof Schema.String>;
+    message: typeof Schema.String;
+}>, Schema.Struct<{
+    origin: Schema.Literal<["zeroCache"]>;
+    reason: Schema.Literal<["timeout", "parse", "internal"]>;
+    kind: Schema.Literal<["TransformFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    queryIDs: Schema.Array$<typeof Schema.String>;
+    message: typeof Schema.String;
+}>]>;
+//# sourceMappingURL=error.d.ts.map

package/dist/types/error.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/types/error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAsBxC,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAkB1B,CAAC;AAYF,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;IAkB/B,CAAC"}

package/dist/types/error.js

@@ -0,0 +1,58 @@
+import * as Schema from "effect/Schema";
+import { JsonSchema } from "./common.js";
+// The code below was converted to Effect Schema from:
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-protocol/src/error.ts
+const MutationId = Schema.Struct({
+    id: Schema.Number,
+    clientID: Schema.String,
+});
+const PushFailedBase = Schema.Struct({
+    kind: Schema.Literal("PushFailed"),
+    details: Schema.optional(JsonSchema),
+    /**
+     * The mutationIDs of the mutations that failed to process.
+     * This can be a subset of the mutationIDs in the request.
+     */
+    mutationIDs: Schema.Array(MutationId),
+    message: Schema.String,
+});
+export const PushFailedBody = Schema.Union(Schema.Struct({
+    ...PushFailedBase.fields,
+    origin: Schema.Literal("server"),
+    reason: Schema.Literal("database", "parse", "oooMutation", "unsupportedPushVersion", "internal"),
+}), Schema.Struct({
+    ...PushFailedBase.fields,
+    origin: Schema.Literal("zeroCache"),
+    reason: Schema.Literal("http"),
+    status: Schema.Number,
+    bodyPreview: Schema.optional(Schema.String),
+}), Schema.Struct({
+    ...PushFailedBase.fields,
+    origin: Schema.Literal("zeroCache"),
+    reason: Schema.Literal("timeout", "parse", "internal"),
+}));
+const TransformFailedBase = Schema.Struct({
+    kind: Schema.Literal("TransformFailed"),
+    details: Schema.optional(JsonSchema),
+    /**
+     * The queryIDs of the queries that failed to transform.
+     */
+    queryIDs: Schema.Array(Schema.String),
+    message: Schema.String,
+});
+export const TransformFailedBody = Schema.Union(Schema.Struct({
+    ...TransformFailedBase.fields,
+    origin: Schema.Literal("server"),
+    reason: Schema.Literal("database", "parse", "internal"),
+}), Schema.Struct({
+    ...TransformFailedBase.fields,
+    origin: Schema.Literal("zeroCache"),
+    reason: Schema.Literal("http"),
+    status: Schema.Number,
+    bodyPreview: Schema.optional(Schema.String),
+}), Schema.Struct({
+    ...TransformFailedBase.fields,
+    origin: Schema.Literal("zeroCache"),
+    reason: Schema.Literal("timeout", "parse", "internal"),
+}));
+//# sourceMappingURL=error.js.map

package/dist/types/error.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/types/error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,sDAAsD;AACtD,qHAAqH;AAErH,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,QAAQ,EAAE,MAAM,CAAC,MAAM;CACxB,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC;IACnC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;IACpC;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC,MAAM;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CACxC,MAAM,CAAC,MAAM,CAAC;IACZ,GAAG,cAAc,CAAC,MAAM;IACxB,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,UAAU,CAAC;CACjG,CAAC,EACF,MAAM,CAAC,MAAM,CAAC;IACZ,GAAG,cAAc,CAAC,MAAM;IACxB,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM;IACrB,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC;CAC5C,CAAC,EACF,MAAM,CAAC,MAAM,CAAC;IACZ,GAAG,cAAc,CAAC,MAAM;IACxB,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC;CACvD,CAAC,CACH,CAAC;AAEF,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC;IACxC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;IACpC;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC,MAAM;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,KAAK,CAC7C,MAAM,CAAC,MAAM,CAAC;IACZ,GAAG,mBAAmB,CAAC,MAAM;IAC7B,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC;CACxD,CAAC,EACF,MAAM,CAAC,MAAM,CAAC;IACZ,GAAG,mBAAmB,CAAC,MAAM;IAC7B,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM;IACrB,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC;CAC5C,CAAC,EACF,MAAM,CAAC,MAAM,CAAC;IACZ,GAAG,mBAAmB,CAAC,MAAM;IAC7B,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC;CACvD,CAAC,CACH,CAAC"}

package/dist/types/push.d.ts

@@ -80,10 +80,16 @@ export declare const PushBody: Schema.Struct<{
     schemaVersion: Schema.optional<typeof Schema.Number>;
     timestamp: typeof Schema.Number;
     requestID: typeof Schema.String;
+    /**
+     * @deprecated auth is managed at client-group scope via connect/updateAuth
+     * and should not be included in push messages.
+     */
+    auth: Schema.optional<typeof Schema.String>;
 }>;
 export type PushBody = typeof PushBody.Type;
 export declare const AppError: Schema.Struct<{
     error: Schema.Literal<["app"]>;
+    message: Schema.optional<typeof Schema.String>;
     details: Schema.optional<typeof Schema.Unknown>;
 }>;
 export type AppError = typeof AppError.Type;
@@ -94,6 +100,7 @@ export declare const ZeroError: Schema.Struct<{
 export type ZeroError = typeof ZeroError.Type;
 export declare const MutationResult: Schema.Union<[Schema.Union<[Schema.Struct<{
     error: Schema.Literal<["app"]>;
+    message: Schema.optional<typeof Schema.String>;
     details: Schema.optional<typeof Schema.Unknown>;
 }>, Schema.Struct<{
     error: Schema.Union<[Schema.Literal<["oooMutation"]>, Schema.Literal<["alreadyProcessed"]>]>;
@@ -109,6 +116,7 @@ export declare const MutationResponse: Schema.Struct<{
     }>;
     result: Schema.Union<[Schema.Union<[Schema.Struct<{
         error: Schema.Literal<["app"]>;
+        message: Schema.optional<typeof Schema.String>;
         details: Schema.optional<typeof Schema.Unknown>;
     }>, Schema.Struct<{
         error: Schema.Union<[Schema.Literal<["oooMutation"]>, Schema.Literal<["alreadyProcessed"]>]>;
@@ -118,7 +126,7 @@ export declare const MutationResponse: Schema.Struct<{
     }>]>;
 }>;
 export type MutationResponse = typeof MutationResponse.Type;
-export declare const PushResponse: Schema.Union<[Schema.Struct<{
+export declare const PushResponse: Schema.Union<[Schema.Union<[Schema.Struct<{
     mutations: Schema.Array$<Schema.Struct<{
         id: Schema.Struct<{
             id: typeof Schema.Number;
@@ -126,6 +134,7 @@ export declare const PushResponse: Schema.Union<[Schema.Struct<{
         }>;
         result: Schema.Union<[Schema.Union<[Schema.Struct<{
             error: Schema.Literal<["app"]>;
+            message: Schema.optional<typeof Schema.String>;
             details: Schema.optional<typeof Schema.Unknown>;
         }>, Schema.Struct<{
             error: Schema.Union<[Schema.Literal<["oooMutation"]>, Schema.Literal<["alreadyProcessed"]>]>;
@@ -135,32 +144,75 @@ export declare const PushResponse: Schema.Union<[Schema.Struct<{
         }>]>;
     }>>;
 }>, Schema.Union<[Schema.Struct<{
+    /** @deprecated */
     error: Schema.Literal<["unsupportedPushVersion"]>;
+    /** @deprecated */
     mutationIDs: Schema.optional<Schema.Array$<Schema.Struct<{
         id: typeof Schema.Number;
         clientID: typeof Schema.String;
     }>>>;
 }>, Schema.Struct<{
+    /** @deprecated */
     error: Schema.Literal<["unsupportedSchemaVersion"]>;
+    /** @deprecated */
     mutationIDs: Schema.optional<Schema.Array$<Schema.Struct<{
         id: typeof Schema.Number;
         clientID: typeof Schema.String;
     }>>>;
 }>, Schema.Struct<{
+    /** @deprecated */
     error: Schema.Literal<["http"]>;
+    /** @deprecated */
     status: typeof Schema.Number;
+    /** @deprecated */
     details: typeof Schema.String;
+    /** @deprecated */
     mutationIDs: Schema.optional<Schema.Array$<Schema.Struct<{
         id: typeof Schema.Number;
         clientID: typeof Schema.String;
     }>>>;
 }>, Schema.Struct<{
+    /** @deprecated */
     error: Schema.Literal<["zeroPusher"]>;
+    /** @deprecated */
     details: typeof Schema.String;
+    /** @deprecated */
     mutationIDs: Schema.optional<Schema.Array$<Schema.Struct<{
         id: typeof Schema.Number;
         clientID: typeof Schema.String;
     }>>>;
+}>]>]>, Schema.Union<[Schema.Struct<{
+    origin: Schema.Literal<["server"]>;
+    reason: Schema.Literal<["database", "parse", "oooMutation", "unsupportedPushVersion", "internal"]>;
+    kind: Schema.Literal<["PushFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    mutationIDs: Schema.Array$<Schema.Struct<{
+        id: typeof Schema.Number;
+        clientID: typeof Schema.String;
+    }>>;
+    message: typeof Schema.String;
+}>, Schema.Struct<{
+    origin: Schema.Literal<["zeroCache"]>;
+    reason: Schema.Literal<["http"]>;
+    status: typeof Schema.Number;
+    bodyPreview: Schema.optional<typeof Schema.String>;
+    kind: Schema.Literal<["PushFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    mutationIDs: Schema.Array$<Schema.Struct<{
+        id: typeof Schema.Number;
+        clientID: typeof Schema.String;
+    }>>;
+    message: typeof Schema.String;
+}>, Schema.Struct<{
+    origin: Schema.Literal<["zeroCache"]>;
+    reason: Schema.Literal<["timeout", "parse", "internal"]>;
+    kind: Schema.Literal<["PushFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    mutationIDs: Schema.Array$<Schema.Struct<{
+        id: typeof Schema.Number;
+        clientID: typeof Schema.String;
+    }>>;
+    message: typeof Schema.String;
 }>]>]>;
 export type PushResponse = typeof PushResponse.Type;
 /**

package/dist/types/push.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/types/push.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAsFxC,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAA6C,CAAC;AACnE,MAAM,MAAM,QAAQ,GAAG,OAAO,QAAQ,CAAC,IAAI,CAAC;AAE5C,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUnB,CAAC;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,QAAQ,CAAC,IAAI,CAAC;AAU5C,eAAO,MAAM,QAAQ;;;EAInB,CAAC;AAEH,MAAM,MAAM,QAAQ,GAAG,OAAO,QAAQ,CAAC,IAAI,CAAC;AAE5C,eAAO,MAAM,SAAS;;;EAGpB,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC,IAAI,CAAC;AAS9C,eAAO,MAAM,cAAc;;;;;;;;IAI1B,CAAC;AACF,MAAM,MAAM,cAAc,GAAG,OAAO,cAAc,CAAC,IAAI,CAAC;AAExD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;EAG3B,CAAC;AACH,MAAM,MAAM,gBAAgB,GAAG,OAAO,gBAAgB,CAAC,IAAI,CAAC;AAqC5D,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAkC,CAAC;AAC5D,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,IAAI,CAAC;AAQpD;;GAEG;AACH,eAAO,MAAM,UAAU;;;EAGrB,CAAC;AACH,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,IAAI,CAAC"}
+{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/types/push.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAiHxC,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAA6C,CAAC;AACnE,MAAM,MAAM,QAAQ,GAAG,OAAO,QAAQ,CAAC,IAAI,CAAC;AAE5C,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAUnB;;;OAGG;;EAEH,CAAC;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,QAAQ,CAAC,IAAI,CAAC;AAU5C,eAAO,MAAM,QAAQ;;;;EAKnB,CAAC;AAEH,MAAM,MAAM,QAAQ,GAAG,OAAO,QAAQ,CAAC,IAAI,CAAC;AAE5C,eAAO,MAAM,SAAS;;;EAOpB,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC,IAAI,CAAC;AAS9C,eAAO,MAAM,cAAc;;;;;;;;;IAI1B,CAAC;AACF,MAAM,MAAM,cAAc,GAAG,OAAO,cAAc,CAAC,IAAI,CAAC;AAExD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;EAG3B,CAAC;AACH,MAAM,MAAM,gBAAgB,GAAG,OAAO,gBAAgB,CAAC,IAAI,CAAC;AA2D5D,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;IAjDvB,kBAAkB;;IAElB,kBAAkB;;;;;;IAQlB,kBAAkB;;IAElB,kBAAkB;;;;;;IAQlB,kBAAkB;;IAElB,kBAAkB;;IAElB,kBAAkB;;IAElB,kBAAkB;;;;;;IAQlB,kBAAkB;;IAElB,kBAAkB;;IAElB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAWsD,CAAC;AAC3E,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,IAAI,CAAC;AAQpD;;GAEG;AACH,eAAO,MAAM,UAAU;;;EAGrB,CAAC;AACH,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,IAAI,CAAC"}

package/dist/types/push.js

@@ -1,13 +1,37 @@
 import * as Schema from "effect/Schema";
 import { JsonSchema } from "./common.js";
+import { PushFailedBody } from "./error.js";
 // The code below was converted to Effect Schema from:
-// https://github.com/rocicorp/mono/blob/30f209f2946b4cf2cd2dee459849351498f11308/packages/zero-protocol/src/push.ts
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-protocol/src/push.ts
 const PrimaryKey = Schema.Array(Schema.String);
 const PrimaryKeyValue = Schema.Union(Schema.String, Schema.Number, Schema.Boolean);
 const PrimaryKeyValueRecord = Schema.Record({ key: Schema.String, value: PrimaryKeyValue });
 const Value = Schema.Union(JsonSchema, Schema.Undefined);
 const Row = Schema.Record({ key: Schema.String, value: Value });
 const CRUD_MUTATION_NAME = "_zero_crud";
+// biome-ignore lint/correctness/noUnusedVariables: borrowed code
+const CLEANUP_RESULTS_MUTATION_NAME = "_zero_cleanupResults";
+// biome-ignore lint/correctness/noUnusedVariables: borrowed code
+const CleanupResultsArg = Schema.Union(
+// Legacy format (no type field) - treat as single
+Schema.Struct({
+    clientGroupID: Schema.String,
+    clientID: Schema.String,
+    upToMutationID: Schema.Number,
+}), 
+// Explicit single: delete up to a specific mutation ID for one client
+Schema.Struct({
+    type: Schema.Literal("single"),
+    clientGroupID: Schema.String,
+    clientID: Schema.String,
+    upToMutationID: Schema.Number,
+}), 
+// Bulk: delete all mutations for multiple clients
+Schema.Struct({
+    type: Schema.Literal("bulk"),
+    clientGroupID: Schema.String,
+    clientIDs: Schema.NonEmptyArray(Schema.String),
+}));
 /**
  * Inserts if entity with id does not already exist.
  */
@@ -79,6 +103,11 @@ export const PushBody = Schema.Struct({
     schemaVersion: Schema.optional(Schema.Number),
     timestamp: Schema.Number,
     requestID: Schema.String,
+    /**
+     * @deprecated auth is managed at client-group scope via connect/updateAuth
+     * and should not be included in push messages.
+     */
+    auth: Schema.optional(Schema.String),
 });
 // biome-ignore lint/correctness/noUnusedVariables: borrowed code
 const PushMessage = Schema.Tuple(Schema.Literal("push"), PushBody);
@@ -89,10 +118,13 @@ const MutationId = Schema.Struct({
 export const AppError = Schema.Struct({
     error: Schema.Literal("app"),
     // The user can return any additional data here
+    message: Schema.optional(Schema.String),
     details: Schema.optional(JsonSchema),
 });
 export const ZeroError = Schema.Struct({
-    error: Schema.Union(Schema.Literal("oooMutation"), Schema.Literal("alreadyProcessed")),
+    error: Schema.Union(
+    /** @deprecated push oooMutation errors are now represented as ['error', { ... }] messages */
+    Schema.Literal("oooMutation"), Schema.Literal("alreadyProcessed")),
     details: Schema.optional(JsonSchema),
 });
 const MutationOk = Schema.Struct({
@@ -110,35 +142,56 @@ export const MutationResponse = Schema.Struct({
 const PushOk = Schema.Struct({
     mutations: Schema.Array(MutationResponse),
 });
+/**
+ * @deprecated push errors are now represented as ['error', { ... }] messages
+ */
 const UnsupportedPushVersion = Schema.Struct({
+    /** @deprecated */
     error: Schema.Literal("unsupportedPushVersion"),
-    // optional for backwards compatibility
-    // This field is included so the client knows which mutations
-    // were not processed by the server.
+    /** @deprecated */
     mutationIDs: Schema.optional(Schema.Array(MutationId)),
 });
+/**
+ * @deprecated push errors are now represented as ['error', { ... }] messages
+ */
 const UnsupportedSchemaVersion = Schema.Struct({
+    /** @deprecated */
     error: Schema.Literal("unsupportedSchemaVersion"),
-    // optional for backwards compatibility
-    // This field is included so the client knows which mutations
-    // were not processed by the server.
+    /** @deprecated */
     mutationIDs: Schema.optional(Schema.Array(MutationId)),
 });
+/**
+ * @deprecated push http errors are now represented as ['error', { ... }] messages
+ */
 const HttpError = Schema.Struct({
+    /** @deprecated */
     error: Schema.Literal("http"),
+    /** @deprecated */
     status: Schema.Number,
+    /** @deprecated */
     details: Schema.String,
+    /** @deprecated */
     mutationIDs: Schema.optional(Schema.Array(MutationId)),
 });
+/**
+ * @deprecated push zero errors are now represented as ['error', { ... }] messages
+ */
 const ZeroPusherError = Schema.Struct({
+    /** @deprecated */
     error: Schema.Literal("zeroPusher"),
+    /** @deprecated */
     details: Schema.String,
+    /** @deprecated */
     mutationIDs: Schema.optional(Schema.Array(MutationId)),
 });
+/**
+ * @deprecated push errors are now represented as ['error', { ... }] messages
+ */
 const PushError = Schema.Union(UnsupportedPushVersion, UnsupportedSchemaVersion, HttpError, ZeroPusherError);
-export const PushResponse = Schema.Union(PushOk, PushError);
+const PushResponseBody = Schema.Union(PushOk, PushError);
+export const PushResponse = Schema.Union(PushResponseBody, PushFailedBody);
 // biome-ignore lint/correctness/noUnusedVariables: borrowed code
-const PushResponseMessage = Schema.Tuple(Schema.Literal("pushResponse"), PushResponse);
+const PushResponseMessage = Schema.Tuple(Schema.Literal("pushResponse"), PushResponseBody);
 // biome-ignore lint/correctness/noUnusedVariables: borrowed code
 const AckMutationResponsesMessage = Schema.Tuple(Schema.Literal("ackMutationResponses"), MutationId);
 /**

package/dist/types/push.js.map

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

package/dist/types/queries.d.ts

@@ -5,7 +5,7 @@ export declare const TransformRequestMessage: Schema.Tuple2<Schema.Literal<["tra
     args: Schema.Array$<typeof Schema.Unknown>;
 }>>>;
 export type TransformRequestMessage = typeof TransformRequestMessage.Type;
-export declare const TransformResponseMessage: Schema.Tuple2<Schema.Literal<["transformed"]>, Schema.Array$<Schema.Union<[Schema.Struct<{
+export declare const TransformResponseMessage: Schema.Union<[Schema.Tuple2<Schema.Literal<["transformed"]>, Schema.Array$<Schema.Union<[Schema.Struct<{
     id: typeof Schema.String;
     name: typeof Schema.String;
     ast: typeof Schema.Unknown;
@@ -13,17 +13,36 @@ export declare const TransformResponseMessage: Schema.Tuple2<Schema.Literal<["tr
     error: Schema.Literal<["app"]>;
     id: typeof Schema.String;
     name: typeof Schema.String;
-    details: typeof Schema.Unknown;
+    message: Schema.optional<typeof Schema.String>;
+    details: Schema.optional<typeof Schema.Unknown>;
 }>, Schema.Struct<{
-    error: Schema.Literal<["http"]>;
+    error: Schema.Literal<["parse"]>;
     id: typeof Schema.String;
     name: typeof Schema.String;
+    message: typeof Schema.String;
+    details: Schema.optional<typeof Schema.Unknown>;
+}>]>]>>>, Schema.Tuple2<Schema.Literal<["transformFailed"]>, Schema.Union<[Schema.Struct<{
+    origin: Schema.Literal<["server"]>;
+    reason: Schema.Literal<["database", "parse", "internal"]>;
+    kind: Schema.Literal<["TransformFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    queryIDs: Schema.Array$<typeof Schema.String>;
+    message: typeof Schema.String;
+}>, Schema.Struct<{
+    origin: Schema.Literal<["zeroCache"]>;
+    reason: Schema.Literal<["http"]>;
     status: typeof Schema.Number;
-    details: typeof Schema.Unknown;
+    bodyPreview: Schema.optional<typeof Schema.String>;
+    kind: Schema.Literal<["TransformFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    queryIDs: Schema.Array$<typeof Schema.String>;
+    message: typeof Schema.String;
 }>, Schema.Struct<{
-    error: Schema.Literal<["zero"]>;
-    id: typeof Schema.String;
-    name: typeof Schema.String;
-    details: typeof Schema.Unknown;
-}>]>]>>>;
+    origin: Schema.Literal<["zeroCache"]>;
+    reason: Schema.Literal<["timeout", "parse", "internal"]>;
+    kind: Schema.Literal<["TransformFailed"]>;
+    details: Schema.optional<typeof Schema.Unknown>;
+    queryIDs: Schema.Array$<typeof Schema.String>;
+    message: typeof Schema.String;
+}>]>>]>;
 //# sourceMappingURL=queries.d.ts.map

package/dist/types/queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../../src/types/queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAiDxC,eAAO,MAAM,uBAAuB;;;;IAAkE,CAAC;AACvG,MAAM,MAAM,uBAAuB,GAAG,OAAO,uBAAuB,CAAC,IAAI,CAAC;AAK1E,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;QAAqE,CAAC"}
+{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../../src/types/queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AA6CxC,eAAO,MAAM,uBAAuB;;;;IAAkE,CAAC;AACvG,MAAM,MAAM,uBAAuB,GAAG,OAAO,uBAAuB,CAAC,IAAI,CAAC;AAS1E,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAA2D,CAAC"}

package/dist/types/queries.js

@@ -1,7 +1,8 @@
 import * as Schema from "effect/Schema";
 import { JsonSchema } from "./common.js";
+import { TransformFailedBody } from "./error.js";
 // The code below was converted to Effect Schema from:
-// https://github.com/rocicorp/mono/blob/9fe2b3cb770bad269ecaf12296c64a0739c23e4e/packages/zero-protocol/src/custom-queries.ts#L14
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-protocol/src/custom-queries.ts
 /** TODO: Defined as unknown for now */
 const Ast = Schema.Unknown;
 const TransformRequestBody = Schema.Array(Schema.Struct({
@@ -14,29 +15,27 @@ const TransformedQuery = Schema.Struct({
     name: Schema.String,
     ast: Ast,
 });
-const AppQueryError = Schema.Struct({
+const AppErroredQuery = Schema.Struct({
     error: Schema.Literal("app"),
     id: Schema.String,
     name: Schema.String,
-    details: JsonSchema,
+    // optional for backwards compatibility
+    message: Schema.optional(Schema.String),
+    details: Schema.optional(JsonSchema),
 });
-const ErrorSchema = Schema.Struct({
-    error: Schema.Literal("zero"),
+const ParseErroredQuery = Schema.Struct({
+    error: Schema.Literal("parse"),
     id: Schema.String,
     name: Schema.String,
-    details: JsonSchema,
+    message: Schema.String,
+    details: Schema.optional(JsonSchema),
 });
-const HttpQueryError = Schema.Struct({
-    error: Schema.Literal("http"),
-    id: Schema.String,
-    name: Schema.String,
-    status: Schema.Number,
-    details: JsonSchema,
-});
-const ErroredQuery = Schema.Union(AppQueryError, HttpQueryError, ErrorSchema);
+const ErroredQuery = Schema.Union(AppErroredQuery, ParseErroredQuery);
 const TransformResponseBody = Schema.Array(Schema.Union(TransformedQuery, ErroredQuery));
 export const TransformRequestMessage = Schema.Tuple(Schema.Literal("transform"), TransformRequestBody);
 // biome-ignore lint/correctness/noUnusedVariables: borrowed code
 const TransformErrorMessage = Schema.Tuple(Schema.Literal("transformError"), Schema.Array(ErroredQuery));
-export const TransformResponseMessage = Schema.Tuple(Schema.Literal("transformed"), TransformResponseBody);
+const TransformFailedMessage = Schema.Tuple(Schema.Literal("transformFailed"), TransformFailedBody);
+const TransformOkMessage = Schema.Tuple(Schema.Literal("transformed"), TransformResponseBody);
+export const TransformResponseMessage = Schema.Union(TransformOkMessage, TransformFailedMessage);
 //# sourceMappingURL=queries.js.map

package/dist/types/queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/types/queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,sDAAsD;AACtD,kIAAkI;AAElI,uCAAuC;AACvC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC;AAE3B,MAAM,oBAAoB,GAAG,MAAM,CAAC,KAAK,CACvC,MAAM,CAAC,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;CAC/B,CAAC,CACH,CAAC;AAEF,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,GAAG,EAAE,GAAG;CACT,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,MAAM,EAAE,MAAM,CAAC,MAAM;IACrB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;AAE9E,MAAM,qBAAqB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC;AAEzF,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,oBAAoB,CAAC,CAAC;AAGvG,iEAAiE;AACjE,MAAM,qBAAqB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;AAEzG,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/types/queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,sDAAsD;AACtD,8HAA8H;AAE9H,uCAAuC;AACvC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC;AAE3B,MAAM,oBAAoB,GAAG,MAAM,CAAC,KAAK,CACvC,MAAM,CAAC,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;CAC/B,CAAC,CACH,CAAC;AAEF,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,GAAG,EAAE,GAAG;CACT,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;IACpC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,uCAAuC;IACvC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;CACrC,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;IAC9B,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;CACrC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;AAEtE,MAAM,qBAAqB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC;AAEzF,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,oBAAoB,CAAC,CAAC;AAGvG,iEAAiE;AACjE,MAAM,qBAAqB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;AAEzG,MAAM,sBAAsB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,mBAAmB,CAAC,CAAC;AAEpG,MAAM,kBAAkB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,qBAAqB,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,sBAAsB,CAAC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "effect-zero",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "license": "MIT",
   "repository": {
     "url": "https://github.com/realms-labs/effect-zero"
@@ -94,6 +94,12 @@
         "default": "./dist/types/queries.js"
       }
     },
+    "./types/error": {
+      "import": {
+        "types": "./dist/types/error.d.ts",
+        "default": "./dist/types/error.js"
+      }
+    },
     "./types/common": {
       "import": {
         "types": "./dist/types/common.d.ts",

package/src/query.ts

@@ -91,11 +91,20 @@ export const stream = <T extends keyof S["tables"] & string, S extends ZeroSchem
     return Stream.asyncEffect<Parameters<Parameters<(typeof view)["addListener"]>[0]>>((emit) =>
       Effect.sync(() => view.addListener((...args) => emit.single(args))),
     ).pipe(
-      Stream.mapEffect(([data, resultType]) =>
+      Stream.mapEffect(([data, resultType, error]) =>
         Effect.sync(() => {
-          // logic here borrowed from: https://github.com/rocicorp/mono/blob/288b00ec94f5a9ae6e988513423af25c281dbb2a/packages/zero-react/src/use-query.tsx#L295
+          // logic here borrowed from: https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-react/src/use-query.tsx#L543
           const cloned = data === undefined ? data : (deepClone(data as ReadonlyJSONValue) as HumanReadable<R>);
-          return getSnapshot<R>(asQueryInternals(query).format.singular, cloned, resultType);
+          return getSnapshot<R>(
+            asQueryInternals(query).format.singular,
+            cloned,
+            resultType,
+            // TODO: Look into this. It seems like this is difficult but not impossible to model in the Effect paradigm.
+            // Likely need some kind of stateful piece between the publisher and and subscriber, allowing the subscriber to swap out
+            // the publisher when this function is called.
+            () => Effect.dieMessage("retry not available in `effect-zero`"),
+            error,
+          );
         }),
       ),
       Stream.map(QueryResult.make),

package/src/snapshot.ts

@@ -1,19 +1,22 @@
 // Code borrowed from:
-// https://github.com/rocicorp/mono/blob/30f209f2946b4cf2cd2dee459849351498f11308/packages/zero-react/src/use-query.tsx
-// https://github.com/rocicorp/mono/blob/30f209f2946b4cf2cd2dee459849351498f11308/packages/shared/src/deep-clone.ts#L4
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-react/src/use-query.tsx
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/shared/src/deep-clone.ts
 
-import type { HumanReadable, JSONValue, ReadonlyJSONValue } from "@rocicorp/zero";
+import type { ErroredQuery, HumanReadable, JSONValue, QueryErrorDetails, ReadonlyJSONValue, ResultType } from "@rocicorp/zero";
 import type { QueryResult } from "@rocicorp/zero/react";
 
 const emptyArray: unknown[] = [];
 
 const resultTypeUnknown = { type: "unknown" } as const;
 const resultTypeComplete = { type: "complete" } as const;
+const resultTypeError = {type: 'error'} as const;
 
 const emptySnapshotSingularUnknown = [undefined, resultTypeUnknown] as const;
 const emptySnapshotSingularComplete = [undefined, resultTypeComplete] as const;
+const emptySnapshotSingularErrorUnknown = [undefined, resultTypeError] as const;
 const emptySnapshotPluralUnknown = [emptyArray, resultTypeUnknown] as const;
 const emptySnapshotPluralComplete = [emptyArray, resultTypeComplete] as const;
+const emptySnapshotErrorUnknown = [emptyArray, resultTypeError] as const;
 
 export function getDefaultSnapshot<TReturn>(singular: boolean): QueryResult<TReturn> {
   return (singular ? emptySnapshotSingularUnknown : emptySnapshotPluralUnknown) as QueryResult<TReturn>;
@@ -26,21 +29,77 @@ export function getDefaultSnapshot<TReturn>(singular: boolean): QueryResult<TRet
 export function getSnapshot<TReturn>(
   singular: boolean,
   data: HumanReadable<TReturn>,
-  resultType: string,
+  resultType: ResultType,
+  retryFn: () => void,
+  error?: ErroredQuery,
 ): QueryResult<TReturn> {
   if (singular && data === undefined) {
-    return (resultType === "complete"
-      ? emptySnapshotSingularComplete
-      : emptySnapshotSingularUnknown) as unknown as QueryResult<TReturn>;
+    switch (resultType) {
+      case 'error':
+        if (error) {
+          return [
+            undefined,
+            makeError(retryFn, error),
+          ] as unknown as QueryResult<TReturn>;
+        }
+        return emptySnapshotSingularErrorUnknown as unknown as QueryResult<TReturn>;
+      case 'complete':
+        return emptySnapshotSingularComplete as unknown as QueryResult<TReturn>;
+      case 'unknown':
+        return emptySnapshotSingularUnknown as unknown as QueryResult<TReturn>;
+    }
   }
 
   if (!singular && (data as unknown[]).length === 0) {
-    return (
-      resultType === "complete" ? emptySnapshotPluralComplete : emptySnapshotPluralUnknown
-    ) as QueryResult<TReturn>;
+    switch (resultType) {
+      case 'error':
+        if (error) {
+          return [
+            emptyArray,
+            makeError(retryFn, error),
+          ] as unknown as QueryResult<TReturn>;
+        }
+        return emptySnapshotErrorUnknown as unknown as QueryResult<TReturn>;
+      case 'complete':
+        return emptySnapshotPluralComplete as unknown as QueryResult<TReturn>;
+      case 'unknown':
+        return emptySnapshotPluralUnknown as unknown as QueryResult<TReturn>;
+    }
   }
 
-  return [data, resultType === "complete" ? resultTypeComplete : resultTypeUnknown];
+  switch (resultType) {
+    case 'error':
+      if (error) {
+        return [data, makeError(retryFn, error)];
+      }
+      return [
+        data,
+        makeError(retryFn, {
+          error: 'app',
+          id: 'unknown',
+          name: 'unknown',
+          message: 'An unknown error occurred',
+        }),
+      ];
+    case 'complete':
+      return [data, resultTypeComplete];
+    case 'unknown':
+      return [data, resultTypeUnknown];
+  }
+}
+
+function makeError(retry: () => void, error: ErroredQuery): QueryErrorDetails {
+  const message = error.message ?? 'An unknown error occurred';
+  return {
+    type: 'error',
+    retry,
+    refetch: retry,
+    error: {
+      type: error.error,
+      message,
+      ...(error.details ? {details: error.details} : {}),
+    },
+  };
 }
 
 export function deepClone(value: ReadonlyJSONValue): JSONValue {

package/src/types/error.ts

@@ -0,0 +1,71 @@
+import * as Schema from "effect/Schema";
+import { JsonSchema } from "./common.js";
+
+// The code below was converted to Effect Schema from:
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-protocol/src/error.ts
+
+const MutationId = Schema.Struct({
+  id: Schema.Number,
+  clientID: Schema.String,
+});
+
+const PushFailedBase = Schema.Struct({
+  kind: Schema.Literal("PushFailed"),
+  details: Schema.optional(JsonSchema),
+  /**
+   * The mutationIDs of the mutations that failed to process.
+   * This can be a subset of the mutationIDs in the request.
+   */
+  mutationIDs: Schema.Array(MutationId),
+  message: Schema.String,
+});
+
+export const PushFailedBody = Schema.Union(
+  Schema.Struct({
+    ...PushFailedBase.fields,
+    origin: Schema.Literal("server"),
+    reason: Schema.Literal("database", "parse", "oooMutation", "unsupportedPushVersion", "internal"),
+  }),
+  Schema.Struct({
+    ...PushFailedBase.fields,
+    origin: Schema.Literal("zeroCache"),
+    reason: Schema.Literal("http"),
+    status: Schema.Number,
+    bodyPreview: Schema.optional(Schema.String),
+  }),
+  Schema.Struct({
+    ...PushFailedBase.fields,
+    origin: Schema.Literal("zeroCache"),
+    reason: Schema.Literal("timeout", "parse", "internal"),
+  }),
+);
+
+const TransformFailedBase = Schema.Struct({
+  kind: Schema.Literal("TransformFailed"),
+  details: Schema.optional(JsonSchema),
+  /**
+   * The queryIDs of the queries that failed to transform.
+   */
+  queryIDs: Schema.Array(Schema.String),
+  message: Schema.String,
+});
+
+export const TransformFailedBody = Schema.Union(
+  Schema.Struct({
+    ...TransformFailedBase.fields,
+    origin: Schema.Literal("server"),
+    reason: Schema.Literal("database", "parse", "internal"),
+  }),
+  Schema.Struct({
+    ...TransformFailedBase.fields,
+    origin: Schema.Literal("zeroCache"),
+    reason: Schema.Literal("http"),
+    status: Schema.Number,
+    bodyPreview: Schema.optional(Schema.String),
+  }),
+  Schema.Struct({
+    ...TransformFailedBase.fields,
+    origin: Schema.Literal("zeroCache"),
+    reason: Schema.Literal("timeout", "parse", "internal"),
+  }),
+);

package/src/types/push.ts

@@ -1,8 +1,9 @@
 import * as Schema from "effect/Schema";
 import { JsonSchema } from "./common.js";
+import { PushFailedBody } from "./error.js";
 
 // The code below was converted to Effect Schema from:
-// https://github.com/rocicorp/mono/blob/30f209f2946b4cf2cd2dee459849351498f11308/packages/zero-protocol/src/push.ts
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-protocol/src/push.ts
 
 const PrimaryKey = Schema.Array(Schema.String);
 
@@ -15,6 +16,32 @@ const Row = Schema.Record({ key: Schema.String, value: Value });
 
 const CRUD_MUTATION_NAME = "_zero_crud";
 
+// biome-ignore lint/correctness/noUnusedVariables: borrowed code
+const CLEANUP_RESULTS_MUTATION_NAME = "_zero_cleanupResults";
+
+// biome-ignore lint/correctness/noUnusedVariables: borrowed code
+const CleanupResultsArg = Schema.Union(
+  // Legacy format (no type field) - treat as single
+  Schema.Struct({
+    clientGroupID: Schema.String,
+    clientID: Schema.String,
+    upToMutationID: Schema.Number,
+  }),
+  // Explicit single: delete up to a specific mutation ID for one client
+  Schema.Struct({
+    type: Schema.Literal("single"),
+    clientGroupID: Schema.String,
+    clientID: Schema.String,
+    upToMutationID: Schema.Number,
+  }),
+  // Bulk: delete all mutations for multiple clients
+  Schema.Struct({
+    type: Schema.Literal("bulk"),
+    clientGroupID: Schema.String,
+    clientIDs: Schema.NonEmptyArray(Schema.String),
+  }),
+);
+
 /**
  * Inserts if entity with id does not already exist.
  */
@@ -97,6 +124,11 @@ export const PushBody = Schema.Struct({
   schemaVersion: Schema.optional(Schema.Number),
   timestamp: Schema.Number,
   requestID: Schema.String,
+  /**
+   * @deprecated auth is managed at client-group scope via connect/updateAuth
+   * and should not be included in push messages.
+   */
+  auth: Schema.optional(Schema.String),
 });
 export type PushBody = typeof PushBody.Type;
 
@@ -111,13 +143,18 @@ const MutationId = Schema.Struct({
 export const AppError = Schema.Struct({
   error: Schema.Literal("app"),
   // The user can return any additional data here
+  message: Schema.optional(Schema.String),
   details: Schema.optional(JsonSchema),
 });
 
 export type AppError = typeof AppError.Type;
 
 export const ZeroError = Schema.Struct({
-  error: Schema.Union(Schema.Literal("oooMutation"), Schema.Literal("alreadyProcessed")),
+  error: Schema.Union(
+    /** @deprecated push oooMutation errors are now represented as ['error', { ... }] messages */
+    Schema.Literal("oooMutation"),
+    Schema.Literal("alreadyProcessed"),
+  ),
   details: Schema.optional(JsonSchema),
 });
 
@@ -147,42 +184,64 @@ const PushOk = Schema.Struct({
   mutations: Schema.Array(MutationResponse),
 });
 
+/**
+ * @deprecated push errors are now represented as ['error', { ... }] messages
+ */
 const UnsupportedPushVersion = Schema.Struct({
+  /** @deprecated */
   error: Schema.Literal("unsupportedPushVersion"),
-  // optional for backwards compatibility
-  // This field is included so the client knows which mutations
-  // were not processed by the server.
+  /** @deprecated */
   mutationIDs: Schema.optional(Schema.Array(MutationId)),
 });
 
+/**
+ * @deprecated push errors are now represented as ['error', { ... }] messages
+ */
 const UnsupportedSchemaVersion = Schema.Struct({
+  /** @deprecated */
   error: Schema.Literal("unsupportedSchemaVersion"),
-  // optional for backwards compatibility
-  // This field is included so the client knows which mutations
-  // were not processed by the server.
+  /** @deprecated */
   mutationIDs: Schema.optional(Schema.Array(MutationId)),
 });
 
+/**
+ * @deprecated push http errors are now represented as ['error', { ... }] messages
+ */
 const HttpError = Schema.Struct({
+  /** @deprecated */
   error: Schema.Literal("http"),
+  /** @deprecated */
   status: Schema.Number,
+  /** @deprecated */
   details: Schema.String,
+  /** @deprecated */
   mutationIDs: Schema.optional(Schema.Array(MutationId)),
 });
 
+/**
+ * @deprecated push zero errors are now represented as ['error', { ... }] messages
+ */
 const ZeroPusherError = Schema.Struct({
+  /** @deprecated */
   error: Schema.Literal("zeroPusher"),
+  /** @deprecated */
   details: Schema.String,
+  /** @deprecated */
   mutationIDs: Schema.optional(Schema.Array(MutationId)),
 });
 
+/**
+ * @deprecated push errors are now represented as ['error', { ... }] messages
+ */
 const PushError = Schema.Union(UnsupportedPushVersion, UnsupportedSchemaVersion, HttpError, ZeroPusherError);
 
-export const PushResponse = Schema.Union(PushOk, PushError);
+const PushResponseBody = Schema.Union(PushOk, PushError);
+
+export const PushResponse = Schema.Union(PushResponseBody, PushFailedBody);
 export type PushResponse = typeof PushResponse.Type;
 
 // biome-ignore lint/correctness/noUnusedVariables: borrowed code
-const PushResponseMessage = Schema.Tuple(Schema.Literal("pushResponse"), PushResponse);
+const PushResponseMessage = Schema.Tuple(Schema.Literal("pushResponse"), PushResponseBody);
 
 // biome-ignore lint/correctness/noUnusedVariables: borrowed code
 const AckMutationResponsesMessage = Schema.Tuple(Schema.Literal("ackMutationResponses"), MutationId);

package/src/types/queries.ts

@@ -1,8 +1,9 @@
 import * as Schema from "effect/Schema";
 import { JsonSchema } from "./common.js";
+import { TransformFailedBody } from "./error.js";
 
 // The code below was converted to Effect Schema from:
-// https://github.com/rocicorp/mono/blob/9fe2b3cb770bad269ecaf12296c64a0739c23e4e/packages/zero-protocol/src/custom-queries.ts#L14
+// https://github.com/rocicorp/mono/blob/8e0f600fb3a9185facf60cfd4971d260b266690e/packages/zero-protocol/src/custom-queries.ts
 
 /** TODO: Defined as unknown for now */
 const Ast = Schema.Unknown;
@@ -21,29 +22,24 @@ const TransformedQuery = Schema.Struct({
   ast: Ast,
 });
 
-const AppQueryError = Schema.Struct({
+const AppErroredQuery = Schema.Struct({
   error: Schema.Literal("app"),
   id: Schema.String,
   name: Schema.String,
-  details: JsonSchema,
+  // optional for backwards compatibility
+  message: Schema.optional(Schema.String),
+  details: Schema.optional(JsonSchema),
 });
 
-const ErrorSchema = Schema.Struct({
-  error: Schema.Literal("zero"),
+const ParseErroredQuery = Schema.Struct({
+  error: Schema.Literal("parse"),
   id: Schema.String,
   name: Schema.String,
-  details: JsonSchema,
+  message: Schema.String,
+  details: Schema.optional(JsonSchema),
 });
 
-const HttpQueryError = Schema.Struct({
-  error: Schema.Literal("http"),
-  id: Schema.String,
-  name: Schema.String,
-  status: Schema.Number,
-  details: JsonSchema,
-});
-
-const ErroredQuery = Schema.Union(AppQueryError, HttpQueryError, ErrorSchema);
+const ErroredQuery = Schema.Union(AppErroredQuery, ParseErroredQuery);
 
 const TransformResponseBody = Schema.Array(Schema.Union(TransformedQuery, ErroredQuery));
 
@@ -53,4 +49,8 @@ export type TransformRequestMessage = typeof TransformRequestMessage.Type;
 // biome-ignore lint/correctness/noUnusedVariables: borrowed code
 const TransformErrorMessage = Schema.Tuple(Schema.Literal("transformError"), Schema.Array(ErroredQuery));
 
-export const TransformResponseMessage = Schema.Tuple(Schema.Literal("transformed"), TransformResponseBody);
+const TransformFailedMessage = Schema.Tuple(Schema.Literal("transformFailed"), TransformFailedBody);
+
+const TransformOkMessage = Schema.Tuple(Schema.Literal("transformed"), TransformResponseBody);
+
+export const TransformResponseMessage = Schema.Union(TransformOkMessage, TransformFailedMessage);