From 7b03fcdb45e4d36410ad8fdfec0ac48a09eae903 Mon Sep 17 00:00:00 2001 From: btmnk Date: Wed, 9 Jul 2025 15:37:29 +0200 Subject: [PATCH] refactor(client-fetch): improves client-fetch types to allow usage of ts-reset --- .../src/plugins/@hey-api/client-fetch/bundle/client.ts | 6 ++++-- .../src/plugins/@hey-api/client-next/bundle/client.ts | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-fetch/bundle/client.ts b/packages/openapi-ts/src/plugins/@hey-api/client-fetch/bundle/client.ts index dddfe80c0..89d1e3158 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/client-fetch/bundle/client.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/client-fetch/bundle/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) { diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-next/bundle/client.ts b/packages/openapi-ts/src/plugins/@hey-api/client-next/bundle/client.ts index 93cda6b98..cedbe50bf 100644 --- a/packages/openapi-ts/src/plugins/@hey-api/client-next/bundle/client.ts +++ b/packages/openapi-ts/src/plugins/@hey-api/client-next/bundle/client.ts @@ -128,14 +128,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) { -- 2.51.2