🏭 Add partial typing for the wretch options

Solves #253 and #251
elbywan · Oct 29, 2024 · 05be188 · 05be188
1 parent db86a5f
commit 05be188
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/src/index.cts b/src/index.cts
@@ -1,3 +1,3 @@
-import factory from "./index.js";
+import factory from "./index.js"
 
-module.exports = factory.default;
+module.exports = factory.default
diff --git a/src/index.ts b/src/index.ts
@@ -1,7 +1,7 @@
 import { setOptions, setErrorType, setPolyfills } from "./config.js"
 import { core } from "./core.js"
 import { WretchError } from "./resolver.js"
-import type { Wretch } from "./types.js"
+import type { Wretch, WretchOptions } from "./types.js"
 
 export type {
   Wretch,
@@ -33,7 +33,7 @@ export type {
  * @param _options The base fetch options
  * @returns A fresh wretch instance
  */
-function factory(_url = "", _options = {}): Wretch {
+function factory(_url = "", _options: WretchOptions = {}): Wretch {
   return { ...core, _url, _options }
 }
 

diff --git a/src/types.ts b/src/types.ts
@@ -761,7 +761,7 @@ export type Config = {
 /**
  * Fetch Request options with additional properties.
  */
-export type WretchOptions = Record<string, any>
+export type WretchOptions = Record<string, any> & RequestInit
 /**
  * An Error enhanced with status, text and body.
  */

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

diff --git a/test/node/middlewares/retry.spec.ts b/test/node/middlewares/retry.spec.ts
@@ -99,7 +99,7 @@ export default describe("Retry Middleware", () => {
         true
       )
       .options({ a: 1 })
-    await expect(w.get("/retry").res()).rejects.toThrowError(
+    await expect(w.get("/retry").res()).rejects.toThrow(
       "Number of attempts exceeded."
     )
     expect(counter).toEqual(10)
@@ -114,17 +114,17 @@ export default describe("Retry Middleware", () => {
           delayTimer: 1,
           onRetry() {
             counter++
-            return { url: `/${counter}`, options: { method: counter } }
+            return { url: `/${counter}`, options: { method: `${counter}` } }
           },
         }),
       ],
       true
     )
-    await expect(w.options({ a: 0 }).get("/0").res()).rejects.toThrowError(
+    await expect(w.options({ a: 0 }).get("/0").res()).rejects.toThrow(
       "Number of attempts exceeded."
     )
     logs.forEach((log, index) => {
-      expect(log).toMatchObject([`/${index}`, index === 0 ? "GET" : index])
+      expect(log).toMatchObject([`/${index}`, index === 0 ? "GET" : `${index}`])
     })
   })
 
@@ -161,10 +161,10 @@ export default describe("Retry Middleware", () => {
         true
       )
 
-    await expect(wThrow.get("/retry").res()).rejects.toThrowError(
+    await expect(wThrow.get("/retry").res()).rejects.toThrow(
       "Network Error"
     )
-    await expect(wRetry.get("/retry").res()).rejects.toThrowError(
+    await expect(wRetry.get("/retry").res()).rejects.toThrow(
       "Network Error"
     )
     expect(counter).toBe(10)