fix: allow responseTransformer property with body and headers

hey-api · Sep 18, 2024 · 7ae2b1d · 7ae2b1d
1 parent 38b0b68
commit 7ae2b1d
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 42 deletions.
diff --git a/.changeset/fluffy-candles-perform.md b/.changeset/fluffy-candles-perform.md
@@ -0,0 +1,6 @@
+---
+'@hey-api/client-axios': patch
+'@hey-api/client-fetch': patch
+---
+
+fix: allow responseTransformer property with body and headers
diff --git a/packages/client-axios/src/types.ts b/packages/client-axios/src/types.ts
@@ -147,16 +147,12 @@ export type Options<
   ThrowOnError extends boolean = boolean,
 > = T extends { body?: any }
   ? T extends { headers?: any }
-    ? OmitKeys<
-        OptionsBase<ThrowOnError>,
-        'body' | 'headers' | 'responseTransformer'
-      > &
-        T
-    : OmitKeys<OptionsBase<ThrowOnError>, 'body' | 'responseTransformer'> &
+    ? OmitKeys<OptionsBase<ThrowOnError>, 'body' | 'headers'> & T
+    : OmitKeys<OptionsBase<ThrowOnError>, 'body'> &
         T &
         Pick<OptionsBase<ThrowOnError>, 'headers'>
   : T extends { headers?: any }
-    ? OmitKeys<OptionsBase<ThrowOnError>, 'headers' | 'responseTransformer'> &
+    ? OmitKeys<OptionsBase<ThrowOnError>, 'headers'> &
         T &
         Pick<OptionsBase<ThrowOnError>, 'body'>
     : OptionsBase<ThrowOnError> & T;
diff --git a/packages/client-fetch/src/types.ts b/packages/client-fetch/src/types.ts
@@ -184,16 +184,12 @@ export type Options<
   ThrowOnError extends boolean = boolean,
 > = T extends { body?: any }
   ? T extends { headers?: any }
-    ? OmitKeys<
-        OptionsBase<ThrowOnError>,
-        'body' | 'headers' | 'responseTransformer'
-      > &
-        T
-    : OmitKeys<OptionsBase<ThrowOnError>, 'body' | 'responseTransformer'> &
+    ? OmitKeys<OptionsBase<ThrowOnError>, 'body' | 'headers'> & T
+    : OmitKeys<OptionsBase<ThrowOnError>, 'body'> &
         T &
         Pick<OptionsBase<ThrowOnError>, 'headers'>
   : T extends { headers?: any }
-    ? OmitKeys<OptionsBase<ThrowOnError>, 'headers' | 'responseTransformer'> &
+    ? OmitKeys<OptionsBase<ThrowOnError>, 'headers'> &
         T &
         Pick<OptionsBase<ThrowOnError>, 'body'>
     : OptionsBase<ThrowOnError> & T;
diff --git a/...pi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-bundle/core/types.ts.snap b/...pi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-bundle/core/types.ts.snap
@@ -147,16 +147,12 @@ export type Options<
   ThrowOnError extends boolean = boolean,
 > = T extends { body?: any }
   ? T extends { headers?: any }
-    ? OmitKeys<
-        OptionsBase<ThrowOnError>,
-        'body' | 'headers' | 'responseTransformer'
-      > &
-        T
-    : OmitKeys<OptionsBase<ThrowOnError>, 'body' | 'responseTransformer'> &
+    ? OmitKeys<OptionsBase<ThrowOnError>, 'body' | 'headers'> & T
+    : OmitKeys<OptionsBase<ThrowOnError>, 'body'> &
         T &
         Pick<OptionsBase<ThrowOnError>, 'headers'>
   : T extends { headers?: any }
-    ? OmitKeys<OptionsBase<ThrowOnError>, 'headers' | 'responseTransformer'> &
+    ? OmitKeys<OptionsBase<ThrowOnError>, 'headers'> &
         T &
         Pick<OptionsBase<ThrowOnError>, 'body'>
     : OptionsBase<ThrowOnError> & T;
diff --git a/.../__snapshots__/test/generated/v3-hey-api-client-axios-bundle_transform/core/types.ts.snap b/.../__snapshots__/test/generated/v3-hey-api-client-axios-bundle_transform/core/types.ts.snap
@@ -147,16 +147,12 @@ export type Options<
   ThrowOnError extends boolean = boolean,
 > = T extends { body?: any }
   ? T extends { headers?: any }
-    ? OmitKeys<
-        OptionsBase<ThrowOnError>,
-        'body' | 'headers' | 'responseTransformer'
-      > &
-        T
-    : OmitKeys<OptionsBase<ThrowOnError>, 'body' | 'responseTransformer'> &
+    ? OmitKeys<OptionsBase<ThrowOnError>, 'body' | 'headers'> & T
+    : OmitKeys<OptionsBase<ThrowOnError>, 'body'> &
         T &
         Pick<OptionsBase<ThrowOnError>, 'headers'>
   : T extends { headers?: any }
-    ? OmitKeys<OptionsBase<ThrowOnError>, 'headers' | 'responseTransformer'> &
+    ? OmitKeys<OptionsBase<ThrowOnError>, 'headers'> &
         T &
         Pick<OptionsBase<ThrowOnError>, 'body'>
     : OptionsBase<ThrowOnError> & T;
diff --git a/...pi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-bundle/core/types.ts.snap b/...pi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-bundle/core/types.ts.snap
@@ -184,16 +184,12 @@ export type Options<
   ThrowOnError extends boolean = boolean,
 > = T extends { body?: any }
   ? T extends { headers?: any }
-    ? OmitKeys<
-        OptionsBase<ThrowOnError>,
-        'body' | 'headers' | 'responseTransformer'
-      > &
-        T
-    : OmitKeys<OptionsBase<ThrowOnError>, 'body' | 'responseTransformer'> &
+    ? OmitKeys<OptionsBase<ThrowOnError>, 'body' | 'headers'> & T
+    : OmitKeys<OptionsBase<ThrowOnError>, 'body'> &
         T &
         Pick<OptionsBase<ThrowOnError>, 'headers'>
   : T extends { headers?: any }
-    ? OmitKeys<OptionsBase<ThrowOnError>, 'headers' | 'responseTransformer'> &
+    ? OmitKeys<OptionsBase<ThrowOnError>, 'headers'> &
         T &
         Pick<OptionsBase<ThrowOnError>, 'body'>
     : OptionsBase<ThrowOnError> & T;
diff --git a/.../__snapshots__/test/generated/v3-hey-api-client-fetch-bundle_transform/core/types.ts.snap b/.../__snapshots__/test/generated/v3-hey-api-client-fetch-bundle_transform/core/types.ts.snap
@@ -184,16 +184,12 @@ export type Options<
   ThrowOnError extends boolean = boolean,
 > = T extends { body?: any }
   ? T extends { headers?: any }
-    ? OmitKeys<
-        OptionsBase<ThrowOnError>,
-        'body' | 'headers' | 'responseTransformer'
-      > &
-        T
-    : OmitKeys<OptionsBase<ThrowOnError>, 'body' | 'responseTransformer'> &
+    ? OmitKeys<OptionsBase<ThrowOnError>, 'body' | 'headers'> & T
+    : OmitKeys<OptionsBase<ThrowOnError>, 'body'> &
         T &
         Pick<OptionsBase<ThrowOnError>, 'headers'>
   : T extends { headers?: any }
-    ? OmitKeys<OptionsBase<ThrowOnError>, 'headers' | 'responseTransformer'> &
+    ? OmitKeys<OptionsBase<ThrowOnError>, 'headers'> &
         T &
         Pick<OptionsBase<ThrowOnError>, 'body'>
     : OptionsBase<ThrowOnError> & T;