Merge pull request #2219 from hey-api/fix/output-types

fix: make output pass stricter tsconfig configurations

Author: mrlubos

.changeset/old-feet-repeat.md

@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: make output pass stricter tsconfig configurations"

packages/custom-client/src/client.ts

@@ -102,14 +102,21 @@ export const createClient = (config: Config = {}): Client => {
           ? getParseAs(response.headers.get('Content-Type'))
           : opts.parseAs) ?? 'json';
 
-      if (parseAs === 'stream') {
-        return {
-          data: response.body,
-          ...result,
-        };
+      let data: any;
+      switch (parseAs) {
+        case 'arrayBuffer':
+        case 'blob':
+        case 'formData':
+        case 'json':
+        case 'text':
+          data = await response[parseAs]();
+          break;
+        case 'stream':
+          return {
+            data: response.body,
+            ...result,
+          };
       }
-
-      let data = await response[parseAs]();
       if (parseAs === 'json') {
         if (opts.responseValidator) {
           await opts.responseValidator(data);

packages/custom-client/src/core/bodySerializer.ts

@@ -57,7 +57,7 @@ export const formDataBodySerializer = {
 
 export const jsonBodySerializer = {
   bodySerializer: <T>(body: T) =>
-    JSON.stringify(body, (key, value) =>
+    JSON.stringify(body, (_key, value) =>
       typeof value === 'bigint' ? value.toString() : value,
     ),
 };

packages/custom-client/src/types.ts

@@ -24,7 +24,14 @@ export interface Config<T extends ClientOptions = ClientOptions>
    *
    * @default 'auto'
    */
-  parseAs?: Exclude<keyof Body, 'body' | 'bodyUsed'> | 'auto' | 'stream';
+  parseAs?:
+    | 'arrayBuffer'
+    | 'auto'
+    | 'blob'
+    | 'formData'
+    | 'json'
+    | 'stream'
+    | 'text';
   /**
    * Throw an error instead of returning it in the response?
    *

packages/custom-client/src/utils.ts

@@ -182,6 +182,8 @@ export const getParseAs = (
   if (cleanContent.startsWith('text/')) {
     return 'text';
   }
+
+  return;
 };
 
 export const setAuthParams = async ({

packages/openapi-ts-tests/package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "test:coverage": "vitest run --config vitest.config.unit.ts --coverage",
     "test:e2e:disabled": "vitest run --config vitest.config.e2e.ts",
+    "test:types": "tsc -p tsconfig.test.json --noEmit",
     "test:update": "vitest watch --config vitest.config.unit.ts --update",
     "test:watch": "vitest watch --config vitest.config.unit.ts",
     "test": "vitest run --config vitest.config.unit.ts",

packages/openapi-ts-tests/test/__snapshots__/2.0.x/body-response-text-plain/client/client.ts

@@ -103,16 +103,24 @@ export const createClient = (config: Config = {}): Client => {
           ? getParseAs(response.headers.get('Content-Type'))
           : opts.parseAs) ?? 'json';
 
-      if (parseAs === 'stream') {
-        return opts.responseStyle === 'data'
-          ? response.body
-          : {
-              data: response.body,
-              ...result,
-            };
+      let data: any;
+      switch (parseAs) {
+        case 'arrayBuffer':
+        case 'blob':
+        case 'formData':
+        case 'json':
+        case 'text':
+          data = await response[parseAs]();
+          break;
+        case 'stream':
+          return opts.responseStyle === 'data'
+            ? response.body
+            : {
+                data: response.body,
+                ...result,
+              };
       }
 
-      let data = await response[parseAs]();
       if (parseAs === 'json') {
         if (opts.responseValidator) {
           await opts.responseValidator(data);

packages/openapi-ts-tests/test/__snapshots__/2.0.x/body-response-text-plain/client/types.ts

@@ -36,7 +36,14 @@ export interface Config<T extends ClientOptions = ClientOptions>
    *
    * @default 'auto'
    */
-  parseAs?: Exclude<keyof Body, 'body' | 'bodyUsed'> | 'auto' | 'stream';
+  parseAs?:
+    | 'arrayBuffer'
+    | 'auto'
+    | 'blob'
+    | 'formData'
+    | 'json'
+    | 'stream'
+    | 'text';
   /**
    * Should we return only data or multiple fields (data, error, response, etc.)?
    *

packages/openapi-ts-tests/test/__snapshots__/2.0.x/body-response-text-plain/client/utils.ts

@@ -182,6 +182,8 @@ export const getParseAs = (
   if (cleanContent.startsWith('text/')) {
     return 'text';
   }
+
+  return;
 };
 
 export const setAuthParams = async ({

packages/openapi-ts-tests/test/__snapshots__/2.0.x/body-response-text-plain/core/bodySerializer.ts

@@ -57,7 +57,7 @@ export const formDataBodySerializer = {
 
 export const jsonBodySerializer = {
   bodySerializer: <T>(body: T) =>
-    JSON.stringify(body, (key, value) =>
+    JSON.stringify(body, (_key, value) =>
       typeof value === 'bigint' ? value.toString() : value,
     ),
 };