🐛 Better error catching precedence

Fixes #155
elbywan · Dec 9, 2022 · 107fc71 · 107fc71
1 parent 3ffd0d3
commit 107fc71
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/resolver.ts b/src/resolver.ts
@@ -61,8 +61,11 @@ export const resolver = <T, Chain, R>(wretch: T & Wretch<T, Chain, R>) => {
       const error = err.__wrap || err
 
       const catcher =
-        err.__wrap && catchers.has(FETCH_ERROR) ? catchers.get(FETCH_ERROR) :
-          (catchers.get(error.status) || catchers.get(error.name))
+        catchers.get(error.name) || (
+          err.__wrap && catchers.has(FETCH_ERROR)
+            ? catchers.get(FETCH_ERROR)
+            : catchers.get(error.status)
+        )
 
       if (catcher)
         return catcher(error, wretch)

diff --git a/test/node/wretch.spec.ts b/test/node/wretch.spec.ts
@@ -547,6 +547,7 @@ describe("Wretch", function () {
       .addon(AbortAddon())
       .get()
       .setTimeout(100)
+      .fetchError(() => { /* ignore - tests precendence */ })
       .onAbort(handleError)
       .res()