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

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

@@ -1,8 +1,27 @@
 import { assert } from "../../shared/src/asserts.js";
 import * as v from "../../shared/src/valita.js";
 import { MutationAlreadyProcessedError } from "../../zero-cache/src/services/mutagen/error.js";
+import { ApplicationError, isApplicationError, wrapWithApplicationError, } from "../../zero-protocol/src/application-error.js";
+import { ErrorKind } from "../../zero-protocol/src/error-kind.js";
+import { ErrorOrigin } from "../../zero-protocol/src/error-origin.js";
+import { ErrorReason } from "../../zero-protocol/src/error-reason.js";
 import { pushBodySchema, pushParamsSchema, } from "../../zero-protocol/src/push.js";
 import { createLogContext } from "./logging.js";
+import { getErrorDetails, getErrorMessage } from "../../shared/src/error.js";
+const applicationErrorWrapper = async (fn) => {
+    try {
+        return await fn();
+    }
+    catch (error) {
+        if (error instanceof DatabaseTransactionError ||
+            error instanceof OutOfOrderMutation ||
+            error instanceof MutationAlreadyProcessedError ||
+            isApplicationError(error)) {
+            throw error;
+        }
+        throw wrapWithApplicationError(error);
+    }
+};
 export async function handleMutationRequest(cb, queryOrQueryString, body, logLevel) {
     if (logLevel === undefined) {
         if (queryOrQueryString instanceof Request && typeof body === 'string') {
@@ -12,81 +31,146 @@ export async function handleMutationRequest(cb, queryOrQueryString, body, logLev
             logLevel = 'info';
         }
     }
-    let queryString;
-    if (queryOrQueryString instanceof Request) {
-        const url = new URL(queryOrQueryString.url);
-        queryString = url.searchParams;
-        body = await queryOrQueryString.json();
+    const lc = createLogContext(logLevel).withContext('PushProcessor');
+    let mutationIDs = [];
+    let req;
+    try {
+        let rawBody;
+        if (queryOrQueryString instanceof Request) {
+            rawBody = await queryOrQueryString.json();
+        }
+        else {
+            rawBody = body;
+        }
+        req = v.parse(rawBody, pushBodySchema);
+        mutationIDs = req.mutations.map(m => ({
+            id: m.id,
+            clientID: m.clientID,
+        }));
     }
-    else {
-        queryString = queryOrQueryString;
+    catch (error) {
+        lc.error?.('Failed to parse push body', error);
+        const message = `Failed to parse push body: ${getErrorMessage(error)}`;
+        const details = getErrorDetails(error);
+        return {
+            kind: ErrorKind.PushFailed,
+            origin: ErrorOrigin.Server,
+            reason: ErrorReason.Parse,
+            message,
+            mutationIDs,
+            ...(details ? { details } : {}),
+        };
     }
-    const req = v.parse(body, pushBodySchema);
-    if (queryString instanceof URLSearchParams) {
-        queryString = Object.fromEntries(queryString);
+    let queryParams;
+    try {
+        let queryString;
+        if (queryOrQueryString instanceof Request) {
+            const url = new URL(queryOrQueryString.url);
+            queryString = url.searchParams;
+        }
+        else {
+            queryString = queryOrQueryString;
+        }
+        if (queryString instanceof URLSearchParams) {
+            queryString = Object.fromEntries(queryString);
+        }
+        queryParams = v.parse(queryString, pushParamsSchema, 'passthrough');
     }
-    const queryParams = v.parse(queryString, pushParamsSchema, 'passthrough');
-    if (req.pushVersion !== 1) {
+    catch (error) {
+        lc.error?.('Failed to parse push query parameters', error);
+        const message = `Failed to parse push query parameters: ${getErrorMessage(error)}`;
+        const details = getErrorDetails(error);
         return {
-            error: 'unsupportedPushVersion',
+            kind: ErrorKind.PushFailed,
+            origin: ErrorOrigin.Server,
+            reason: ErrorReason.Parse,
+            message,
+            mutationIDs,
+            ...(details ? { details } : {}),
         };
     }
-    const transactor = new Transactor(req, queryParams, logLevel);
+    if (req.pushVersion !== 1) {
+        const response = {
+            kind: ErrorKind.PushFailed,
+            origin: ErrorOrigin.Server,
+            reason: ErrorReason.UnsupportedPushVersion,
+            mutationIDs,
+            message: `Unsupported push version: ${req.pushVersion}`,
+        };
+        return response;
+    }
     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;
+    let processedCount = 0;
+    try {
+        const transactor = new Transactor(req, queryParams, lc);
+        for (const m of req.mutations) {
+            assert(m.type === 'custom', 'Expected custom mutation');
+            const transactProxy = (dbProvider, innerCb) => transactor.transact(dbProvider, m, (tx, name, args) => applicationErrorWrapper(() => innerCb(tx, name, args)));
+            try {
+                const res = await applicationErrorWrapper(() => cb(transactProxy, m));
+                responses.push(res);
+                processedCount++;
+            }
+            catch (error) {
+                if (!isApplicationError(error)) {
+                    throw error;
+                }
+                lc.warn?.(`Application error processing mutation ${m.id} for client ${m.clientID}`, error);
+                responses.push(makeAppErrorResponse(m, error));
+                processedCount++;
+            }
         }
+        return {
+            mutations: responses,
+        };
+    }
+    catch (error) {
+        lc.error?.('Failed to process push request', error);
+        // only include mutationIDs for mutations that were not processed
+        const unprocessedMutationIDs = mutationIDs.slice(processedCount);
+        const message = getErrorMessage(error);
+        const details = getErrorDetails(error);
+        return {
+            kind: ErrorKind.PushFailed,
+            origin: ErrorOrigin.Server,
+            reason: error instanceof OutOfOrderMutation
+                ? ErrorReason.OutOfOrderMutation
+                : error instanceof DatabaseTransactionError
+                    ? ErrorReason.Database
+                    : ErrorReason.Internal,
+            message,
+            mutationIDs: unprocessedMutationIDs,
+            ...(details ? { details } : {}),
+        };
     }
-    return {
-        mutations: responses,
-    };
 }
 class Transactor {
     #req;
     #params;
     #lc;
-    constructor(req, params, logLevel) {
+    constructor(req, params, lc) {
         this.#req = req;
         this.#params = params;
-        this.#lc = createLogContext(logLevel).withContext('PushProcessor');
+        this.#lc = lc;
     }
     transact = async (dbProvider, mutation, cb) => {
-        let caughtError = undefined;
+        let appError = 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);
+                const ret = await this.#transactImpl(dbProvider, mutation, cb, appError);
+                if (appError !== undefined) {
+                    this.#lc.warn?.(`Mutation ${mutation.id} for client ${mutation.clientID} was retried after an error`, appError);
+                    return makeAppErrorResponse(mutation, appError);
                 }
                 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,
-                        },
-                    };
+            catch (error) {
+                if (error instanceof OutOfOrderMutation) {
+                    this.#lc.error?.(error);
+                    throw error;
                 }
-                if (e instanceof MutationAlreadyProcessedError) {
-                    this.#lc.warn?.(e);
+                if (error instanceof MutationAlreadyProcessedError) {
+                    this.#lc.warn?.(error);
                     return {
                         id: {
                             clientID: mutation.clientID,
@@ -94,31 +178,43 @@ class Transactor {
                         },
                         result: {
                             error: 'alreadyProcessed',
-                            details: e.message,
+                            details: error.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;
+                if (isApplicationError(error)) {
+                    appError = error;
+                    this.#lc.warn?.(`Application error processing mutation ${mutation.id} for client ${mutation.clientID}`, appError);
+                    continue;
+                }
+                if (error instanceof DatabaseTransactionError) {
+                    this.#lc.error?.(`Database error processing mutation ${mutation.id} for client ${mutation.clientID}`, error);
+                }
+                else {
+                    this.#lc.error?.(`Unexpected error processing mutation ${mutation.id} for client ${mutation.clientID}`, error);
                 }
-                caughtError = e;
-                this.#lc.error?.(`Unexpected error processing mutation ${mutation.id} for client ${mutation.clientID}`, e);
+                throw error;
             }
         }
     };
-    #transactImpl(dbProvider, mutation, cb, caughtError) {
-        return dbProvider.transaction(async (dbTx, transactionHooks) => {
+    #transactImpl(dbProvider, mutation, cb, appError) {
+        let transactionPhase = 'open';
+        return dbProvider
+            .transaction(async (dbTx, transactionHooks) => {
+            // update the transaction phase to 'execute' after the transaction is opened
+            transactionPhase = 'execute';
             await this.#checkAndIncrementLastMutationID(transactionHooks, mutation.clientID, mutation.id);
-            if (caughtError === undefined) {
-                await cb(dbTx, mutation.name, mutation.args[0]);
+            if (appError === undefined) {
+                try {
+                    await cb(dbTx, mutation.name, mutation.args[0]);
+                }
+                catch (appError) {
+                    throw wrapWithApplicationError(appError);
+                }
             }
             else {
-                const appError = makeAppErrorResponse(mutation, caughtError);
-                await transactionHooks.writeMutationResult(appError);
+                const mutationResult = makeAppErrorResponse(mutation, appError);
+                await transactionHooks.writeMutationResult(mutationResult);
             }
             return {
                 id: {
@@ -132,6 +228,14 @@ class Transactor {
             clientGroupID: this.#req.clientGroupID,
             clientID: mutation.clientID,
             mutationID: mutation.id,
+        })
+            .catch(error => {
+            if (isApplicationError(error) ||
+                error instanceof OutOfOrderMutation ||
+                error instanceof MutationAlreadyProcessedError) {
+                throw error;
+            }
+            throw new DatabaseTransactionError(transactionPhase, { cause: error });
         });
     }
     async #checkAndIncrementLastMutationID(transactionHooks, clientID, receivedMutationID) {
@@ -149,7 +253,7 @@ export class OutOfOrderMutation extends Error {
         super(`Client ${clientID} sent mutation ID ${receivedMutationID} but expected ${lastMutationID}`);
     }
 }
-function makeAppErrorResponse(m, e) {
+function makeAppErrorResponse(m, error) {
     return {
         id: {
             clientID: m.clientID,
@@ -157,7 +261,8 @@ function makeAppErrorResponse(m, e) {
         },
         result: {
             error: 'app',
-            details: e instanceof Error ? e.message : 'exception was not of type `Error`',
+            message: error.message,
+            ...(error.details ? { details: error.details } : {}),
         },
     };
 }
@@ -184,4 +289,12 @@ mutators, name) {
     assert(typeof mutator === 'function', () => `could not find mutator ${name}`);
     return mutator;
 }
+class DatabaseTransactionError extends Error {
+    constructor(phase, options) {
+        super(phase === 'open'
+            ? `Failed to open database transaction: ${getErrorMessage(options?.cause)}`
+            : `Database transaction failed after opening: ${getErrorMessage(options?.cause)}`, options);
+        this.name = 'DatabaseTransactionError';
+    }
+}
 //# sourceMappingURL=process-mutations.js.map

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

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

@@ -1,8 +1,9 @@
+import type { LogLevel } from '@rocicorp/logger';
 import type { ReadonlyJSONValue } from '../../../shared/src/json.ts';
-import { type AnyQuery } from '../../../zql/src/query/query-impl.ts';
+import type { MaybePromise } from '../../../shared/src/types.ts';
 import { type TransformResponseMessage } from '../../../zero-protocol/src/custom-queries.ts';
 import type { Schema } from '../../../zero-schema/src/builder/schema-builder.ts';
-import type { MaybePromise } from '../../../shared/src/types.ts';
+import type { AnyQuery } from '../../../zql/src/query/query-impl.ts';
 /**
  * Invokes the callback `cb` for each query in the request or JSON body.
  * The callback should return a Query or Promise<Query> that is the transformed result.
@@ -13,5 +14,5 @@ import type { MaybePromise } from '../../../shared/src/types.ts';
  */
 export declare function handleGetQueriesRequest<S extends Schema>(cb: (name: string, args: readonly ReadonlyJSONValue[]) => MaybePromise<{
     query: AnyQuery;
-}>, schema: S, requestOrJsonBody: Request | ReadonlyJSONValue): Promise<TransformResponseMessage>;
+}>, schema: S, requestOrJsonBody: Request | ReadonlyJSONValue, logLevel?: LogLevel): Promise<TransformResponseMessage>;
 //# sourceMappingURL=process-queries.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"process-queries.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/queries/process-queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAC,KAAK,QAAQ,EAAC,MAAM,sCAAsC,CAAC;AAEnE,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,8CAA8C,CAAC;AACtD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,oDAAoD,CAAC;AAG/E,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAE/D;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CAAC,CAAC,SAAS,MAAM,EAC5D,EAAE,EAAE,CACF,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,iBAAiB,EAAE,KAC/B,YAAY,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAC,CAAC,EACpC,MAAM,EAAE,CAAC,EACT,iBAAiB,EAAE,OAAO,GAAG,iBAAiB,GAC7C,OAAO,CAAC,wBAAwB,CAAC,CAwBnC"}
+{"version":3,"file":"process-queries.d.ts","sourceRoot":"","sources":["../../../../../zero-server/src/queries/process-queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAE/C,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAG/D,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,8CAA8C,CAAC;AAItD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,oDAAoD,CAAC;AAG/E,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,sCAAsC,CAAC;AAGnE;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CAAC,CAAC,SAAS,MAAM,EAC5D,EAAE,EAAE,CACF,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,iBAAiB,EAAE,KAC/B,YAAY,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAC,CAAC,EACpC,MAAM,EAAE,CAAC,EACT,iBAAiB,EAAE,OAAO,GAAG,iBAAiB,EAC9C,QAAQ,CAAC,EAAE,QAAQ,GAClB,OAAO,CAAC,wBAAwB,CAAC,CA0FnC"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"process-queries.js","sourceRoot":"","sources":["../../../../../zero-server/src/queries/process-queries.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AACnD,OAAO,EACL,6BAA6B,GAE9B,MAAM,8CAA8C,CAAC;AAEtD,OAAO,EAAC,cAAc,EAAC,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAGzD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,EAGoC,EACpC,MAAS,EACT,iBAA8C;IAE9C,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEjD,IAAI,IAAuB,CAAC;IAC5B,IAAI,iBAAiB,YAAY,OAAO,EAAE,CAAC;QACzC,IAAI,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAC;IACxC,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,iBAAiB,CAAC;IAC3B,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,6BAA6B,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;QACxB,MAAM,EAAC,KAAK,EAAC,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAE7C,OAAO;YACL,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC;SACnC,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,OAAO,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"process-queries.js","sourceRoot":"","sources":["../../../../../zero-server/src/queries/process-queries.ts"],"names":[],"mappings":"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"}

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

@@ -1,3 +1,11 @@
+export type { Expand } from '../../shared/src/expand.ts';
+export type { ConnectionState } from '../../zero-client/src/client/connection-manager.ts';
+export { ConnectionStatus } from '../../zero-client/src/client/connection-status.ts';
+export type { AuthError, NeedsAuthReason, ZeroError, ZeroErrorKind, } from '../../zero-client/src/client/error.ts';
+export type { QueryResultDetails } from '../../zero-client/src/types/query-result.ts';
+export type { PrimaryKey } from '../../zero-protocol/src/primary-key.ts';
+export type { HumanReadable } from '../../zql/src/query/query.ts';
+export type { ResultType } from '../../zql/src/query/typed-view.ts';
 export { createQuery, useQuery, type CreateQueryOptions, type UseQueryOptions, } from './use-query.ts';
 export { useZeroConnectionState } from './use-zero-connection-state.ts';
 export { useZeroOnline } from './use-zero-online.ts';

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

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,QAAQ,EACR,KAAK,kBAAkB,EACvB,KAAK,eAAe,GACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,sBAAsB,EAAC,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAC,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/mod.ts"],"names":[],"mappings":"AAAA,YAAY,EAAC,MAAM,EAAC,MAAM,4BAA4B,CAAC;AACvD,YAAY,EAAC,eAAe,EAAC,MAAM,oDAAoD,CAAC;AACxF,OAAO,EAAC,gBAAgB,EAAC,MAAM,mDAAmD,CAAC;AACnF,YAAY,EACV,SAAS,EACT,eAAe,EACf,SAAS,EACT,aAAa,GACd,MAAM,uCAAuC,CAAC;AAC/C,YAAY,EAAC,kBAAkB,EAAC,MAAM,6CAA6C,CAAC;AACpF,YAAY,EAAC,UAAU,EAAC,MAAM,wCAAwC,CAAC;AACvE,YAAY,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAChE,YAAY,EAAC,UAAU,EAAC,MAAM,mCAAmC,CAAC;AAClE,OAAO,EACL,WAAW,EACX,QAAQ,EACR,KAAK,kBAAkB,EACvB,KAAK,eAAe,GACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,sBAAsB,EAAC,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAC,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC"}

package/out/zero-solid/src/solid-view.d.ts

@@ -1,36 +1,16 @@
 import { type SetStoreFunction } from 'solid-js/store';
 import { type Change, type Entry, type Format, type Input, type Output, type Query, type Schema, type TTL } from '../../zero-client/src/mod.js';
-import type { ReadonlyJSONValue } from '../../shared/src/json.ts';
+import type { QueryResultDetails } from '../../zero-client/src/types/query-result.ts';
 import type { ErroredQuery } from '../../zero-protocol/src/custom-queries.ts';
-export type QueryResultDetails = Readonly<{
-    type: 'complete';
-} | {
-    type: 'unknown';
-} | QueryErrorDetails>;
-type QueryErrorDetails = {
-    type: 'error';
-    refetch: () => void;
-    error: {
-        type: 'app';
-        queryName: string;
-        details: ReadonlyJSONValue;
-    } | {
-        type: 'http';
-        queryName: string;
-        status: number;
-        details: ReadonlyJSONValue;
-    };
-};
 export type State = [Entry, QueryResultDetails];
 export declare const COMPLETE: QueryResultDetails;
 export declare const UNKNOWN: QueryResultDetails;
 export declare class SolidView implements Output {
     #private;
-    constructor(input: Input, onTransactionCommit: (cb: () => void) => void, format: Format, onDestroy: () => void, queryComplete: true | ErroredQuery | Promise<true>, updateTTL: (ttl: TTL) => void, setState: SetStoreFunction<State>, refetch: () => void);
+    constructor(input: Input, onTransactionCommit: (cb: () => void) => void, format: Format, onDestroy: () => void, queryComplete: true | ErroredQuery | Promise<true>, updateTTL: (ttl: TTL) => void, setState: SetStoreFunction<State>, retry: () => void);
     destroy(): void;
     push(change: Change): void;
     updateTTL(ttl: TTL): void;
 }
-export declare function createSolidViewFactory(setState: SetStoreFunction<State>, refetch?: () => void): <TSchema extends Schema, TTable extends keyof TSchema["tables"] & string, TReturn>(_query: Query<TSchema, TTable, TReturn>, input: Input, format: Format, onDestroy: () => void, onTransactionCommit: (cb: () => void) => void, queryComplete: true | ErroredQuery | Promise<true>, updateTTL: (ttl: TTL) => void) => SolidView;
-export {};
+export declare function createSolidViewFactory(setState: SetStoreFunction<State>, retry?: () => void): <TSchema extends Schema, TTable extends keyof TSchema["tables"] & string, TReturn>(_query: Query<TSchema, TTable, TReturn>, input: Input, format: Format, onDestroy: () => void, onTransactionCommit: (cb: () => void) => void, queryComplete: true | ErroredQuery | Promise<true>, updateTTL: (ttl: TTL) => void) => SolidView;
 //# sourceMappingURL=solid-view.d.ts.map

package/out/zero-solid/src/solid-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solid-view.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/solid-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAEL,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,KAAK,EAEV,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,MAAM,EAEX,KAAK,GAAG,EAGT,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,2CAA2C,CAAC;AAE5E,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CACrC;IACE,IAAI,EAAE,UAAU,CAAC;CAClB,GACD;IACE,IAAI,EAAE,SAAS,CAAC;CACjB,GACD,iBAAiB,CACpB,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EACD;QACE,IAAI,EAAE,KAAK,CAAC;QACZ,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,iBAAiB,CAAC;KAC5B,GACD;QACE,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,iBAAiB,CAAC;KAC5B,CAAC;CACP,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;AAEhD,eAAO,MAAM,QAAQ,EAAE,kBAAsD,CAAC;AAC9E,eAAO,MAAM,OAAO,EAAE,kBAAqD,CAAC;AAE5E,qBAAa,SAAU,YAAW,MAAM;;gBAqBpC,KAAK,EAAE,KAAK,EACZ,mBAAmB,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,EAC7C,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,IAAI,EACrB,aAAa,EAAE,IAAI,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,EAClD,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAC7B,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,EACjC,OAAO,EAAE,MAAM,IAAI;IAuErB,OAAO,IAAI,IAAI;IA2Bf,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAoD1B,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;CAG1B;AA8CD,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,EACjC,OAAO,CAAC,EAAE,MAAM,IAAI,IAGlB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,UAEC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,SAChC,KAAK,UACJ,MAAM,aACH,MAAM,IAAI,uBACA,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,iBAC9B,IAAI,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,aACvC,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,eAiBhC"}
+{"version":3,"file":"solid-view.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/solid-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAEL,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,KAAK,EAEV,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,MAAM,EAEX,KAAK,GAAG,EAGT,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAEV,kBAAkB,EACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,2CAA2C,CAAC;AAG5E,MAAM,MAAM,KAAK,GAAG,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;AAEhD,eAAO,MAAM,QAAQ,EAAE,kBAAsD,CAAC;AAC9E,eAAO,MAAM,OAAO,EAAE,kBAAqD,CAAC;AAE5E,qBAAa,SAAU,YAAW,MAAM;;gBAqBpC,KAAK,EAAE,KAAK,EACZ,mBAAmB,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,EAC7C,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,IAAI,EACrB,aAAa,EAAE,IAAI,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,EAClD,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAC7B,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,EACjC,KAAK,EAAE,MAAM,IAAI;IAiEnB,OAAO,IAAI,IAAI;IA2Bf,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAoD1B,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;CAG1B;AA8CD,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,EACjC,KAAK,CAAC,EAAE,MAAM,IAAI,IAGhB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,UAEC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,SAChC,KAAK,UACJ,MAAM,aACH,MAAM,IAAI,uBACA,CAAC,EAAE,EAAE,MAAM,IAAI,KAAK,IAAI,iBAC9B,IAAI,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,aACvC,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,eAiBhC"}

package/out/zero-solid/src/use-query.d.ts

@@ -2,7 +2,7 @@ import { type Accessor } from 'solid-js';
 import type { Schema } from '../../zero-schema/src/builder/schema-builder.ts';
 import type { HumanReadable, Query } from '../../zql/src/query/query.ts';
 import { type TTL } from '../../zql/src/query/ttl.ts';
-import { type QueryResultDetails } from './solid-view.ts';
+import type { QueryResultDetails } from '../../zero-client/src/types/query-result.ts';
 export type QueryResult<TReturn> = readonly [
     Accessor<HumanReadable<TReturn>>,
     Accessor<QueryResultDetails>

package/out/zero-solid/src/use-query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-query.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,KAAK,QAAQ,EAAC,MAAM,UAAU,CAAC;AAGhF,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAC5E,OAAO,KAAK,EAAC,aAAa,EAAE,KAAK,EAAC,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAiB,KAAK,GAAG,EAAC,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAGL,KAAK,kBAAkB,EAGxB,MAAM,iBAAiB,CAAC;AAGzB,MAAM,MAAM,WAAW,CAAC,OAAO,IAAI,SAAS;IAC1C,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAChC,QAAQ,CAAC,kBAAkB,CAAC;CAC7B,CAAC;AAGF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CACvB,CAAC;AAGF;;GAEG;AACH,wBAAgB,WAAW,CACzB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EAEP,WAAW,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,EACtD,OAAO,CAAC,EAAE,kBAAkB,GAAG,QAAQ,CAAC,kBAAkB,CAAC,GAC1D,WAAW,CAAC,OAAO,CAAC,CAEtB;AAED,wBAAgB,QAAQ,CACtB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EAEP,WAAW,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,EACtD,OAAO,CAAC,EAAE,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC,GACpD,WAAW,CAAC,OAAO,CAAC,CAyEtB"}
+{"version":3,"file":"use-query.d.ts","sourceRoot":"","sources":["../../../../zero-solid/src/use-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,KAAK,QAAQ,EAAC,MAAM,UAAU,CAAC;AAGhF,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAC5E,OAAO,KAAK,EAAC,aAAa,EAAE,KAAK,EAAC,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAiB,KAAK,GAAG,EAAC,MAAM,4BAA4B,CAAC;AAQpE,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,6CAA6C,CAAC;AAEpF,MAAM,MAAM,WAAW,CAAC,OAAO,IAAI,SAAS;IAC1C,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAChC,QAAQ,CAAC,kBAAkB,CAAC;CAC7B,CAAC;AAGF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;CACvB,CAAC;AAGF;;GAEG;AACH,wBAAgB,WAAW,CACzB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EAEP,WAAW,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,EACtD,OAAO,CAAC,EAAE,kBAAkB,GAAG,QAAQ,CAAC,kBAAkB,CAAC,GAC1D,WAAW,CAAC,OAAO,CAAC,CAEtB;AAED,wBAAgB,QAAQ,CACtB,OAAO,SAAS,MAAM,EACtB,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC/C,OAAO,EAEP,WAAW,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,EACtD,OAAO,CAAC,EAAE,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC,GACpD,WAAW,CAAC,OAAO,CAAC,CAyEtB"}