feat: add options field and improve formatting of errors

README.md

@@ -83,8 +83,8 @@ const { users } = await ofetch("/api/users", {
 Parsed error body is available with `error.data`. You may also use `FetchError` type.
 
 ```ts
-await ofetch("http://google.com/404");
-// FetchError: 404 Not Found (http://google.com/404)
+await ofetch("https://google.com/404");
+// FetchError: [GET] "https://google/404": 404 "Not Found"
 //     at async main (/project/playground.ts:4:3)
 ```
 

src/error.ts

@@ -1,8 +1,9 @@
-import type { FetchRequest, FetchResponse } from "./fetch";
+import type { FetchOptions, FetchRequest, FetchResponse } from "./fetch";
 
 export class FetchError<T = any> extends Error {
   name = "FetchError";
   request?: FetchRequest;
+  options?: FetchOptions;
   response?: FetchResponse<T>;
   data?: T;
   status?: number;
@@ -13,20 +14,23 @@ export class FetchError<T = any> extends Error {
 
 export function createFetchError<T = any>(
   request: FetchRequest,
+  options: FetchOptions,
   error?: Error,
   response?: FetchResponse<T>
 ): FetchError<T> {
-  let message = "";
-  if (error) {
-    message = error.message;
-  }
-  if (request && response) {
-    message = `${message} (${response.status} ${
-      response.statusText
-    } (${request.toString()}))`;
-  } else if (request) {
-    message = `${message} (${request.toString()})`;
-  }
+  const errorMessage = error?.message || error?.toString() || "";
+
+  const method = (request as Request)?.method || options?.method || "GET";
+  const url = (request as Request)?.url || String(request) || "/";
+  const requestStr = `[${method}] ${JSON.stringify(url)}`;
+
+  const statusStr = response
+    ? `${response.status} ${JSON.stringify(response.statusText)}`
+    : "<no response>";
+
+  const message = `${requestStr}: ${statusStr}${
+    errorMessage ? ` ${errorMessage}` : ""
+  }`;
 
   const fetchError: FetchError<T> = new FetchError(message);
 
@@ -35,6 +39,11 @@ export function createFetchError<T = any>(
       return request;
     },
   });
+  Object.defineProperty(fetchError, "options", {
+    get() {
+      return options;
+    },
+  });
   Object.defineProperty(fetchError, "response", {
     get() {
       return response;

src/fetch.ts

@@ -142,6 +142,7 @@ export function createFetch(globalOptions: CreateFetchOptions = {}): $Fetch {
     // Throw normalized error
     const error = createFetchError(
       context.request,
+      context.options,
       context.error,
       context.response
     );

test/index.test.ts

@@ -8,10 +8,9 @@ import {
   readRawBody,
   toNodeListener,
 } from "h3";
-import { Blob } from "fetch-blob";
-import { FormData } from "formdata-polyfill/esm.min.js";
 import { describe, beforeAll, afterAll, it, expect } from "vitest";
-import { Headers, $fetch } from "../src/node";
+import { Headers, FormData, Blob } from "node-fetch-native";
+import { $fetch } from "../src/node";
 
 describe("ofetch", () => {
   let listener;
@@ -253,6 +252,18 @@ describe("ofetch", () => {
     expect(abortHandle()).rejects.toThrow(/aborted/);
   });
 
+  it("passing request obj should return request obj in error", async () => {
+    const error = await $fetch(getURL("/403"), { method: "post" }).catch(
+      (error) => error
+    );
+    expect(error.toString()).toBe(
+      'FetchError: [POST] "http://localhost:3000/403": 403 "Forbidden"'
+    );
+    expect(error.request).to.equal(getURL("403"));
+    expect(error.options.method).to.equal("POST");
+    expect(error.response?._data).to.deep.eq(error.data);
+  });
+
   it("aborting on timeout", async () => {
     const noTimeout = $fetch(getURL("timeout")).catch(() => "no timeout");
     const timeout = $fetch(getURL("timeout"), {