feat(client): Do not replace body with its serialized version in request options

Author: dovca

packages/openapi-ts/src/plugins/@hey-api/client-fetch/bundle/client.ts

@@ -1,4 +1,4 @@
-import type { Client, Config, RequestOptions } from './types';
+import type { Client, Config, ResolvedRequestOptions } from './types';
 import {
   buildUrl,
   createConfig,
@@ -28,7 +28,7 @@ export const createClient = (config: Config = {}): Client => {
     Request,
     Response,
     unknown,
-    RequestOptions
+    ResolvedRequestOptions
   >();
 
   const request: Client['request'] = async (options) => {
@@ -37,6 +37,7 @@ export const createClient = (config: Config = {}): Client => {
       ...options,
       fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
       headers: mergeHeaders(_config.headers, options.headers),
+      serializedBody: undefined,
     };
 
     if (opts.security) {
@@ -51,18 +52,19 @@ export const createClient = (config: Config = {}): Client => {
     }
 
     if (opts.body && opts.bodySerializer) {
-      opts.body = opts.bodySerializer(opts.body);
+      opts.serializedBody = opts.bodySerializer(opts.body);
     }
 
     // remove Content-Type header if body is empty to avoid sending invalid requests
-    if (opts.body === undefined || opts.body === '') {
+    if (opts.serializedBody === undefined || opts.serializedBody === '') {
       opts.headers.delete('Content-Type');
     }
 
     const url = buildUrl(opts);
     const requestInit: ReqInit = {
       redirect: 'follow',
       ...opts,
+      body: opts.serializedBody,
     };
 
     let request = new Request(url, requestInit);

packages/openapi-ts/src/plugins/@hey-api/client-fetch/bundle/index.ts

@@ -16,6 +16,7 @@ export type {
   OptionsLegacyParser,
   RequestOptions,
   RequestResult,
+  ResolvedRequestOptions,
   ResponseStyle,
   TDataShape,
 } from './types';

packages/openapi-ts/src/plugins/@hey-api/client-fetch/bundle/types.ts

@@ -81,6 +81,14 @@ export interface RequestOptions<
   url: Url;
 }
 
+export interface ResolvedRequestOptions<
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends RequestOptions<TResponseStyle, ThrowOnError, Url> {
+  serializedBody?: string;
+}
+
 export type RequestResult<
   TData = unknown,
   TError = unknown,
@@ -163,7 +171,7 @@ type BuildUrlFn = <
 ) => string;
 
 export type Client = CoreClient<RequestFn, Config, MethodFn, BuildUrlFn> & {
-  interceptors: Middleware<Request, Response, unknown, RequestOptions>;
+  interceptors: Middleware<Request, Response, unknown, ResolvedRequestOptions>;
 };
 
 /**

packages/openapi-ts/src/plugins/@hey-api/client-next/bundle/client.ts

@@ -1,4 +1,4 @@
-import type { Client, Config, RequestOptions } from './types';
+import type { Client, Config, ResolvedRequestOptions } from './types';
 import {
   buildUrl,
   createConfig,
@@ -24,7 +24,11 @@ export const createClient = (config: Config = {}): Client => {
     return getConfig();
   };
 
-  const interceptors = createInterceptors<Response, unknown, RequestOptions>();
+  const interceptors = createInterceptors<
+    Response,
+    unknown,
+    ResolvedRequestOptions
+  >();
 
   // @ts-expect-error
   const request: Client['request'] = async (options) => {
@@ -33,6 +37,7 @@ export const createClient = (config: Config = {}): Client => {
       ...options,
       fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
       headers: mergeHeaders(_config.headers, options.headers),
+      serializedBody: undefined,
     };
 
     if (opts.security) {
@@ -47,11 +52,11 @@ export const createClient = (config: Config = {}): Client => {
     }
 
     if (opts.body && opts.bodySerializer) {
-      opts.body = opts.bodySerializer(opts.body);
+      opts.serializedBody = opts.bodySerializer(opts.body);
     }
 
     // remove Content-Type header if body is empty to avoid sending invalid requests
-    if (opts.body === undefined || opts.body === '') {
+    if (opts.serializedBody === undefined || opts.serializedBody === '') {
       opts.headers.delete('Content-Type');
     }
 
@@ -67,7 +72,7 @@ export const createClient = (config: Config = {}): Client => {
     const _fetch = opts.fetch!;
     let response = await _fetch(url, {
       ...opts,
-      body: opts.body as ReqInit['body'],
+      body: opts.serializedBody as ReqInit['body'],
     });
 
     for (const fn of interceptors.response._fns) {

packages/openapi-ts/src/plugins/@hey-api/client-next/bundle/types.ts

@@ -64,6 +64,13 @@ export interface RequestOptions<
   url: Url;
 }
 
+export interface ResolvedRequestOptions<
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends RequestOptions<ThrowOnError, Url> {
+  serializedBody?: string;
+}
+
 export type RequestResult<
   TData = unknown,
   TError = unknown,
@@ -126,7 +133,7 @@ type BuildUrlFn = <
 ) => string;
 
 export type Client = CoreClient<RequestFn, Config, MethodFn, BuildUrlFn> & {
-  interceptors: Middleware<Response, unknown, RequestOptions>;
+  interceptors: Middleware<Response, unknown, ResolvedRequestOptions>;
 };
 
 /**