gemi 0.76.0 → 0.78.0

package/dist/client/index.js

@@ -485,6 +485,96 @@ function useInfiniteQuery(url, options, config) {
 	};
 }
 //#endregion
+//#region client/MutationError.ts
+var AUTHENTICATION = "Authentication error";
+var PERMISSION = ["Insufficient permissions", "Not authorized"];
+var CSRF = "Invalid CSRF token";
+var SERVER = "Internal Server Error";
+function isObject(error) {
+	return typeof error === "object" && error !== null;
+}
+function bodyMessage(error) {
+	return isObject(error) && !(error instanceof Error) && !("kind" in error) ? error.message : void 0;
+}
+/**
+* The `MutationError` a non-2xx response's parsed body stands for.
+*
+* gemi's own error bodies are `{ error }`, and the value under `error` is what
+* the guards above read, so that is what is handed over. An app's body without
+* one — `HttpResponse.json({ message: "Taken" }, { status: 409 })` — is handed
+* over whole: read as `body.error` it was `undefined`, and a failed request
+* left `error` looking like no error at all. A body with no content to hand
+* over (`null`) becomes a `{ message }` naming the status.
+*
+* @internal
+*/
+function mutationErrorFromBody(body, status) {
+	if (isObject(body) && "error" in body && body.error != null) return body.error;
+	if (body == null) return { message: `Request failed with status ${status}` };
+	return body;
+}
+/** Field messages, as `<ValidationErrors>` renders them. */
+function isValidationError(error) {
+	return isObject(error) && error.kind === "validation_error";
+}
+/** A form-level message, as `<FormError>` renders it. */
+function isFormError(error) {
+	return isObject(error) && error.kind === "form_error";
+}
+/** No signed-in user: `AuthenticationError` (401). */
+function isAuthenticationError(error) {
+	return error === AUTHENTICATION;
+}
+/**
+* A signed-in user who may not do this: `InsufficientPermissionsError` (403),
+* `AuthorizationError` (401) or a policy denial (403, `{ message:
+* "Forbidden" }`). Recognised by the framework's default messages.
+*/
+function isPermissionError(error) {
+	return typeof error === "string" && PERMISSION.includes(error) || bodyMessage(error) === "Forbidden";
+}
+/** The CSRF cookie is missing or stale (403). A reload fixes it. */
+function isCsrfError(error) {
+	return error === CSRF;
+}
+/** A missing record, file or route (404). */
+function isNotFoundError(error) {
+	return bodyMessage(error) === "Not found";
+}
+/** `RateLimitMiddleware` refused the request (429). */
+function isRateLimitError(error) {
+	return bodyMessage(error) === "Rate limit exceeded";
+}
+/**
+* The server failed (a production 500), or answered something that is not
+* JSON. Under `gemi dev` a 500 carries the exception's message instead, which
+* is `"unknown"`.
+*/
+function isServerError(error) {
+	return error === SERVER || isObject(error) && error.kind === "server_error" || error instanceof SyntaxError;
+}
+/** The request got no answer: offline, DNS, CORS, a dropped connection. */
+function isNetworkError(error) {
+	return error instanceof TypeError;
+}
+/**
+* Which of the guards above `error` passes, for a `switch` over all of them.
+* `"unknown"` is everything else: a refusal thrown with a message of its own,
+* a 500 under `gemi dev`, an error body of the app's own shape.
+*/
+function mutationErrorKind(error) {
+	if (isValidationError(error)) return "validation";
+	if (isFormError(error)) return "form";
+	if (isAuthenticationError(error)) return "authentication";
+	if (isPermissionError(error)) return "permission";
+	if (isCsrfError(error)) return "csrf";
+	if (isNotFoundError(error)) return "not_found";
+	if (isRateLimitError(error)) return "rate_limit";
+	if (isServerError(error)) return "server";
+	if (isNetworkError(error)) return "network";
+	return "unknown";
+}
+//#endregion
 //#region client/useMutation.ts
 function applyParams(url, params = {}) {
 	let out = url;
@@ -546,12 +636,13 @@ function useMutation(method, url, ...args) {
 			if (!isLatest()) return;
 			formData.current = new FormData();
 			if (!response.ok) {
+				const error = mutationErrorFromBody(data, response.status);
 				setState((prev) => ({
 					data: prev.data,
-					error: data.error,
+					error,
 					loading: false
 				}));
-				options.onError(data.error);
+				options.onError(error);
 				return;
 			}
 			clearPrefetchCache?.();
@@ -675,7 +766,7 @@ function useUpload(url, ...args) {
 					message: result.statusText
 				};
 				try {
-					error = (await result.json()).error;
+					error = mutationErrorFromBody(await result.json(), result.status);
 				} catch (e) {}
 				setState("error");
 				options?.onError?.(error);
@@ -743,79 +834,6 @@ function useMutate() {
 	};
 }
 //#endregion
-//#region client/MutationError.ts
-var AUTHENTICATION = "Authentication error";
-var PERMISSION = ["Insufficient permissions", "Not authorized"];
-var CSRF = "Invalid CSRF token";
-var SERVER = "Internal Server Error";
-function isObject(error) {
-	return typeof error === "object" && error !== null;
-}
-function bodyMessage(error) {
-	return isObject(error) && !(error instanceof Error) && !("kind" in error) ? error.message : void 0;
-}
-/** Field messages, as `<ValidationErrors>` renders them. */
-function isValidationError(error) {
-	return isObject(error) && error.kind === "validation_error";
-}
-/** A form-level message, as `<FormError>` renders it. */
-function isFormError(error) {
-	return isObject(error) && error.kind === "form_error";
-}
-/** No signed-in user: `AuthenticationError` (401). */
-function isAuthenticationError(error) {
-	return error === AUTHENTICATION;
-}
-/**
-* A signed-in user who may not do this: `InsufficientPermissionsError` (403),
-* `AuthorizationError` (401) or a policy denial (403, `{ message:
-* "Forbidden" }`). Recognised by the framework's default messages.
-*/
-function isPermissionError(error) {
-	return typeof error === "string" && PERMISSION.includes(error) || bodyMessage(error) === "Forbidden";
-}
-/** The CSRF cookie is missing or stale (403). A reload fixes it. */
-function isCsrfError(error) {
-	return error === CSRF;
-}
-/** A missing record, file or route (404). */
-function isNotFoundError(error) {
-	return bodyMessage(error) === "Not found";
-}
-/** `RateLimitMiddleware` refused the request (429). */
-function isRateLimitError(error) {
-	return bodyMessage(error) === "Rate limit exceeded";
-}
-/**
-* The server failed (a production 500), or answered something that is not
-* JSON. Under `gemi dev` a 500 carries the exception's message instead, which
-* is `"unknown"`.
-*/
-function isServerError(error) {
-	return error === SERVER || isObject(error) && error.kind === "server_error" || error instanceof SyntaxError;
-}
-/** The request got no answer: offline, DNS, CORS, a dropped connection. */
-function isNetworkError(error) {
-	return error instanceof TypeError;
-}
-/**
-* Which of the guards above `error` passes, for a `switch` over all of them.
-* `"unknown"` is everything else: a refusal thrown with a message of its own,
-* a 500 under `gemi dev`, an error body of the app's own shape.
-*/
-function mutationErrorKind(error) {
-	if (isValidationError(error)) return "validation";
-	if (isFormError(error)) return "form";
-	if (isAuthenticationError(error)) return "authentication";
-	if (isPermissionError(error)) return "permission";
-	if (isCsrfError(error)) return "csrf";
-	if (isNotFoundError(error)) return "not_found";
-	if (isRateLimitError(error)) return "rate_limit";
-	if (isServerError(error)) return "server";
-	if (isNetworkError(error)) return "network";
-	return "unknown";
-}
-//#endregion
 //#region client/Mutation.tsx
 var MutationContext = createContext({
 	isPending: false,