🐛 Fix passing Headers/entries array as an argument to headers()

Should solve #205
elbywan · Nov 19, 2023 · f32845a · f32845a
1 parent 9e6fa07
commit f32845a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/core.ts b/src/core.ts
@@ -49,7 +49,12 @@ export const core: Wretch = {
     return { ...this, _options: replace ? options : mix(this._options, options) }
   },
   headers(headerValues) {
-    return { ...this, _options: mix(this._options, { headers: headerValues || {} }) }
+    const headers =
+      !headerValues ? {} :
+      Array.isArray(headerValues) ? Object.fromEntries(headerValues) :
+      "entries" in headerValues ? Object.fromEntries((headerValues as Headers).entries()) :
+      headerValues
+    return { ...this, _options: mix(this._options, { headers }) }
   },
   accept(headerValue) {
     return this.headers({ Accept: headerValue })

diff --git a/src/utils.ts b/src/utils.ts
@@ -1,6 +1,6 @@
 import { CONTENT_TYPE_HEADER } from "./constants.js"
 
-export function extractContentType(headers: HeadersInit = {}): string | undefined {
+export function extractContentType(headers: Record<string, string> = {}): string | undefined {
   return Object.entries(headers).find(([k]) =>
     k.toLowerCase() === CONTENT_TYPE_HEADER.toLowerCase()
   )?.[1]

diff --git a/test/tsconfig.json b/test/tsconfig.json
@@ -3,7 +3,8 @@
     "target": "es5",
     "lib": [
       "es2015",
-      "dom"
+      "dom",
+      "dom.iterable"
     ],
     "module": "commonjs",
     "noImplicitAny": false,
@@ -17,4 +18,4 @@
   "include": [
     "./node/**/*.spec.ts"
   ]
-}
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -3,7 +3,8 @@
     "target": "ES2018",
     "lib": [
       "es2020",
-      "dom"
+      "dom",
+      "dom.iterable"
     ],
     "module": "es2015",
     "outDir": "dist",
@@ -19,4 +20,4 @@
     "src/**/*",
     "test.ts"
   ]
-}
+}