Merge pull request #2290 from btmnk/improves-client-fetch-types

Author: mrlubos

.changeset/tall-papayas-pay.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+fix(client): improve types to pass `@total-typescript/ts-reset` rules

examples/openapi-ts-tanstack-angular-query-experimental/angular.json

@@ -71,5 +71,8 @@
         }
       }
     }
+  },
+  "cli": {
+    "analytics": false
   }
 }

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

@@ -143,14 +143,16 @@ export const createClient = (config: Config = {}): Client => {
           };
     }
 
-    let error = await response.text();
+    const textError = await response.text();
+    let jsonError: unknown;
 
     try {
-      error = JSON.parse(error);
+      jsonError = JSON.parse(textError);
     } catch {
       // noop
     }
 
+    const error = jsonError ?? textError;
     let finalError = error;
 
     for (const fn of interceptors.error._fns) {

packages/openapi-ts-tests/test/__snapshots__/2.0.x/form-data/client/client.ts

@@ -143,14 +143,16 @@ export const createClient = (config: Config = {}): Client => {
           };
     }
 
-    let error = await response.text();
+    const textError = await response.text();
+    let jsonError: unknown;
 
     try {
-      error = JSON.parse(error);
+      jsonError = JSON.parse(textError);
     } catch {
       // noop
     }
 
+    const error = jsonError ?? textError;
     let finalError = error;
 
     for (const fn of interceptors.error._fns) {

packages/openapi-ts-tests/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/client.ts

@@ -143,14 +143,16 @@ export const createClient = (config: Config = {}): Client => {
           };
     }
 
-    let error = await response.text();
+    const textError = await response.text();
+    let jsonError: unknown;
 
     try {
-      error = JSON.parse(error);
+      jsonError = JSON.parse(textError);
     } catch {
       // noop
     }
 
+    const error = jsonError ?? textError;
     let finalError = error;
 
     for (const fn of interceptors.error._fns) {

packages/openapi-ts-tests/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/client.ts

@@ -143,14 +143,16 @@ export const createClient = (config: Config = {}): Client => {
           };
     }
 
-    let error = await response.text();
+    const textError = await response.text();
+    let jsonError: unknown;
 
     try {
-      error = JSON.parse(error);
+      jsonError = JSON.parse(textError);
     } catch {
       // noop
     }
 
+    const error = jsonError ?? textError;
     let finalError = error;
 
     for (const fn of interceptors.error._fns) {

packages/openapi-ts-tests/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/client.ts

@@ -143,14 +143,16 @@ export const createClient = (config: Config = {}): Client => {
           };
     }
 
-    let error = await response.text();
+    const textError = await response.text();
+    let jsonError: unknown;
 
     try {
-      error = JSON.parse(error);
+      jsonError = JSON.parse(textError);
     } catch {
       // noop
     }
 
+    const error = jsonError ?? textError;
     let finalError = error;
 
     for (const fn of interceptors.error._fns) {

packages/openapi-ts-tests/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/client/client.ts

@@ -143,14 +143,16 @@ export const createClient = (config: Config = {}): Client => {
           };
     }
 
-    let error = await response.text();
+    const textError = await response.text();
+    let jsonError: unknown;
 
     try {
-      error = JSON.parse(error);
+      jsonError = JSON.parse(textError);
     } catch {
       // noop
     }
 
+    const error = jsonError ?? textError;
     let finalError = error;
 
     for (const fn of interceptors.error._fns) {

packages/openapi-ts-tests/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/client/client.ts

@@ -143,14 +143,16 @@ export const createClient = (config: Config = {}): Client => {
           };
     }
 
-    let error = await response.text();
+    const textError = await response.text();
+    let jsonError: unknown;
 
     try {
-      error = JSON.parse(error);
+      jsonError = JSON.parse(textError);
     } catch {
       // noop
     }
 
+    const error = jsonError ?? textError;
     let finalError = error;
 
     for (const fn of interceptors.error._fns) {

packages/openapi-ts-tests/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/client.ts

@@ -143,14 +143,16 @@ export const createClient = (config: Config = {}): Client => {
           };
     }
 
-    let error = await response.text();
+    const textError = await response.text();
+    let jsonError: unknown;
 
     try {
-      error = JSON.parse(error);
+      jsonError = JSON.parse(textError);
     } catch {
       // noop
     }
 
+    const error = jsonError ?? textError;
     let finalError = error;
 
     for (const fn of interceptors.error._fns) {