🏭 addon.resolver can now be a function

elbywan · elbywan · commit 0bf9aa89b2ce · 2023-12-30T10:17:29.000+01:00
should solve #212
diff --git a/src/resolver.ts b/src/resolver.ts
@@ -95,7 +95,7 @@ export const resolver = <T, Chain, R>(wretch: T & Wretch<T, Chain, R>) => {
     })
   }
   // Enforces the proper promise type when a body parsing method is called.
-  type BodyParser = <Type>(funName: string | null) => <Result = void>(cb?: (type: Type) => Result) => Promise<Awaited<Result>>
+  type BodyParser = <Type>(funName: "json" | "blob" | "formData" | "arrayBuffer" | "text" | null) => <Result = void>(cb?: (type: Type) => Result) => Promise<Awaited<Result>>
   const bodyParser: BodyParser = funName => cb => funName ?
     // If a callback is provided, then callback with the body result otherwise return the parsed body itself.
     catchersWrapper(throwingPromise.then(_ => _ && _[funName]()).then(_ => cb ? cb(_) : _)) :
@@ -127,7 +127,7 @@ export const resolver = <T, Chain, R>(wretch: T & Wretch<T, Chain, R>) => {
 
   const enhancedResponseChain: R extends undefined ? Chain & WretchResponseChain<T, Chain, undefined> : R = addons.reduce((chain, addon) => ({
     ...chain,
-    ...(addon.resolver as any)
+    ...(typeof addon.resolver === "function" ? (addon.resolver as (_: WretchResponseChain<T, Chain, R>) => any)(chain) : addon.resolver)
   }), responseChain)
 
   return resolvers.reduce((chain, r) => r(chain, wretch), enhancedResponseChain)
diff --git a/src/types.ts b/src/types.ts
@@ -786,6 +786,6 @@ export type FetchLike = (url: string, opts: WretchOptions) => Promise<WretchResp
 export type WretchAddon<W extends unknown, R extends unknown = unknown> = {
   beforeRequest?<T, C, R>(wretch: T & Wretch<T, C, R>, options: WretchOptions, state: Record<any, any>): T & Wretch<T, C, R>,
   wretch?: W,
-  resolver?: R
+  resolver?: R | (<T, C>(_: C & WretchResponseChain<T, C, R>) => R)
 }
 
diff --git a/tsconfig.json b/tsconfig.json
@@ -17,7 +17,6 @@
     "isolatedModules": true
   },
   "include": [
-    "src/**/*",
-    "test.ts"
+    "src/**/*"
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -786,6 +786,6 @@ export type FetchLike = (url: string, opts: WretchOptions) => Promise<WretchResp`
`786`	`786`	`export type WretchAddon<W extends unknown, R extends unknown = unknown> = {`
`787`	`787`	`beforeRequest?<T, C, R>(wretch: T & Wretch<T, C, R>, options: WretchOptions, state: Record<any, any>): T & Wretch<T, C, R>,`
`788`	`788`	`wretch?: W,`
`789`		`- resolver?: R`
	`789`	`+ resolver?: R \| (<T, C>(_: C & WretchResponseChain<T, C, R>) => R)`
`790`	`790`	`}`
`791`	`791`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`"isolatedModules": true`
`18`	`18`	`},`
`19`	`19`	`"include": [`
`20`		`- "src/*/",`
`21`		`- "test.ts"`
	`20`	`+ "src/*/"`
`22`	`21`	`]`
`23`	`22`	`}`