refactor: pass all fetch context to the error

unjs · Aug 23, 2023 · b70e6b0 · b70e6b0
1 parent 15a28fb
commit b70e6b0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 26 deletions.
diff --git a/src/error.ts b/src/error.ts
@@ -1,4 +1,9 @@
-import type { FetchOptions, FetchRequest, FetchResponse } from "./fetch";
+import type {
+  FetchContext,
+  FetchOptions,
+  FetchRequest,
+  FetchResponse,
+} from "./fetch";
 
 export class FetchError<T = any> extends Error {
   name = "FetchError";
@@ -12,20 +17,16 @@ export class FetchError<T = any> extends Error {
   statusMessage?: string;
 }
 
-export function createFetchError<T = any>(
-  request: FetchRequest,
-  options: FetchOptions,
-  error?: Error,
-  response?: FetchResponse<T>
-): FetchError<T> {
-  const errorMessage = error?.message || error?.toString() || "";
+export function createFetchError<T = any>(ctx: FetchContext<T>): FetchError<T> {
+  const errorMessage = ctx.error?.message || ctx.error?.toString() || "";
 
-  const method = (request as Request)?.method || options?.method || "GET";
-  const url = (request as Request)?.url || String(request) || "/";
+  const method =
+    (ctx.request as Request)?.method || ctx.options?.method || "GET";
+  const url = (ctx.request as Request)?.url || String(ctx.request) || "/";
   const requestStr = `[${method}] ${JSON.stringify(url)}`;
 
-  const statusStr = response
-    ? `${response.status} ${JSON.stringify(response.statusText)}`
+  const statusStr = ctx.response
+    ? `${ctx.response.status} ${JSON.stringify(ctx.response.statusText)}`
     : "<no response>";
 
   const message = `${requestStr}: ${statusStr}${
@@ -36,42 +37,42 @@ export function createFetchError<T = any>(
 
   Object.defineProperty(fetchError, "request", {
     get() {
-      return request;
+      return ctx.request;
     },
   });
   Object.defineProperty(fetchError, "options", {
     get() {
-      return options;
+      return ctx.options;
     },
   });
   Object.defineProperty(fetchError, "response", {
     get() {
-      return response;
+      return ctx.response;
     },
   });
   Object.defineProperty(fetchError, "data", {
     get() {
-      return response && response._data;
+      return ctx.response && ctx.response._data;
     },
   });
   Object.defineProperty(fetchError, "status", {
     get() {
-      return response && response.status;
+      return ctx.response && ctx.response.status;
     },
   });
   Object.defineProperty(fetchError, "statusText", {
     get() {
-      return response && response.statusText;
+      return ctx.response && ctx.response.statusText;
     },
   });
   Object.defineProperty(fetchError, "statusCode", {
     get() {
-      return response && response.status;
+      return ctx.response && ctx.response.status;
     },
   });
   Object.defineProperty(fetchError, "statusMessage", {
     get() {
-      return response && response.statusText;
+      return ctx.response && ctx.response.statusText;
     },
   });
 

diff --git a/src/fetch.ts b/src/fetch.ts
@@ -148,12 +148,7 @@ export function createFetch(globalOptions: CreateFetchOptions = {}): $Fetch {
     }
 
     // Throw normalized error
-    const error = createFetchError(
-      context.request,
-      context.options,
-      context.error,
-      context.response
-    );
+    const error = createFetchError(context);
 
     // Only available on V8 based runtimes (https://v8.dev/docs/stack-trace-api)
     if (Error.captureStackTrace) {