@hey-api/openapi-ts 0.82.3 → 0.82.5

package/dist/clients/angular/client.ts

@@ -16,6 +16,7 @@ import { filter } from 'rxjs/operators';
 
 import { createSseClient } from '../core/serverSentEvents';
 import type { HttpMethod } from '../core/types';
+import { getValidRequestBody } from '../core/utils';
 import type {
   Client,
   Config,
@@ -67,7 +68,7 @@ export const createClient = (config: Config = {}): Client => {
       ...options,
       headers: mergeHeaders(_config.headers, options.headers),
       httpClient: options.httpClient ?? _config.httpClient,
-      serializedBody: options.body as any,
+      serializedBody: undefined,
     };
 
     if (!opts.httpClient) {
@@ -81,12 +82,12 @@ export const createClient = (config: Config = {}): Client => {
       }
     }
 
-    if (opts.body && opts.bodySerializer) {
+    if (opts.body !== undefined && opts.bodySerializer) {
       opts.serializedBody = opts.bodySerializer(opts.body);
     }
 
     // remove Content-Type header if body is empty to avoid sending invalid requests
-    if (opts.serializedBody === undefined || opts.serializedBody === '') {
+    if (opts.body === undefined || opts.serializedBody === '') {
       opts.headers.delete('Content-Type');
     }
 
@@ -95,7 +96,7 @@ export const createClient = (config: Config = {}): Client => {
     const req = new HttpRequest<unknown>(
       opts.method ?? 'GET',
       url,
-      opts.serializedBody || null,
+      getValidRequestBody(opts),
       {
         redirect: 'follow',
         ...opts,

package/dist/clients/axios/client.ts

@@ -3,6 +3,7 @@ import axios from 'axios';
 
 import { createSseClient } from '../core/serverSentEvents';
 import type { HttpMethod } from '../core/types';
+import { getValidRequestBody } from '../core/utils';
 import type { Client, Config, RequestOptions } from './types';
 import {
   buildUrl,
@@ -57,7 +58,7 @@ export const createClient = (config: Config = {}): Client => {
       await opts.requestValidator(opts);
     }
 
-    if (opts.body && opts.bodySerializer) {
+    if (opts.body !== undefined && opts.bodySerializer) {
       opts.body = opts.bodySerializer(opts.body);
     }
 
@@ -78,7 +79,7 @@ export const createClient = (config: Config = {}): Client => {
       const response = await _axios({
         ...optsWithoutAuth,
         baseURL: opts.baseURL as string,
-        data: opts.body,
+        data: getValidRequestBody(opts),
         headers: opts.headers as RawAxiosRequestHeaders,
         // let `paramsSerializer()` handle query params if it exists
         params: opts.paramsSerializer ? opts.query : undefined,

package/dist/clients/core/utils.ts

@@ -1,4 +1,4 @@
-import type { QuerySerializer } from './bodySerializer';
+import type { BodySerializer, QuerySerializer } from './bodySerializer';
 import {
   type ArraySeparatorStyle,
   serializeArrayParam,
@@ -110,3 +110,32 @@ export const getUrl = ({
   }
   return url;
 };
+
+export function getValidRequestBody(options: {
+  body?: unknown;
+  bodySerializer?: BodySerializer | null;
+  serializedBody?: unknown;
+}) {
+  const hasBody = options.body !== undefined;
+  const isSerializedBody = hasBody && options.bodySerializer;
+
+  if (isSerializedBody) {
+    if ('serializedBody' in options) {
+      const hasSerializedBody =
+        options.serializedBody !== undefined && options.serializedBody !== '';
+
+      return hasSerializedBody ? options.serializedBody : null;
+    }
+
+    // not all clients implement a serializedBody property (i.e. client-axios)
+    return options.body !== '' ? options.body : null;
+  }
+
+  // plain/text body
+  if (hasBody) {
+    return options.body;
+  }
+
+  // no body was provided
+  return undefined;
+}

package/dist/clients/fetch/client.ts

@@ -1,5 +1,6 @@
 import { createSseClient } from '../core/serverSentEvents';
 import type { HttpMethod } from '../core/types';
+import { getValidRequestBody } from '../core/utils';
 import type {
   Client,
   Config,
@@ -58,12 +59,12 @@ export const createClient = (config: Config = {}): Client => {
       await opts.requestValidator(opts);
     }
 
-    if (opts.body && opts.bodySerializer) {
+    if (opts.body !== undefined && opts.bodySerializer) {
       opts.serializedBody = opts.bodySerializer(opts.body);
     }
 
     // remove Content-Type header if body is empty to avoid sending invalid requests
-    if (opts.serializedBody === undefined || opts.serializedBody === '') {
+    if (opts.body === undefined || opts.serializedBody === '') {
       opts.headers.delete('Content-Type');
     }
 
@@ -78,7 +79,7 @@ export const createClient = (config: Config = {}): Client => {
     const requestInit: ReqInit = {
       redirect: 'follow',
       ...opts,
-      body: opts.serializedBody,
+      body: getValidRequestBody(opts),
     };
 
     let request = new Request(url, requestInit);

package/dist/clients/fetch/utils.ts

@@ -181,17 +181,27 @@ export const mergeConfigs = (a: Config, b: Config): Config => {
   return config;
 };
 
+const headersEntries = (headers: Headers): Array<[string, string]> => {
+  const entries: Array<[string, string]> = [];
+  headers.forEach((value, key) => {
+    entries.push([key, value]);
+  });
+  return entries;
+};
+
 export const mergeHeaders = (
   ...headers: Array<Required<Config>['headers'] | undefined>
 ): Headers => {
   const mergedHeaders = new Headers();
   for (const header of headers) {
-    if (!header || typeof header !== 'object') {
+    if (!header) {
       continue;
     }
 
     const iterator =
-      header instanceof Headers ? header.entries() : Object.entries(header);
+      header instanceof Headers
+        ? headersEntries(header)
+        : Object.entries(header);
 
     for (const [key, value] of iterator) {
       if (value === null) {

package/dist/clients/next/client.ts

@@ -1,5 +1,6 @@
 import { createSseClient } from '../core/serverSentEvents';
 import type { HttpMethod } from '../core/types';
+import { getValidRequestBody } from '../core/utils';
 import type {
   Client,
   Config,
@@ -57,12 +58,12 @@ export const createClient = (config: Config = {}): Client => {
       await opts.requestValidator(opts);
     }
 
-    if (opts.body && opts.bodySerializer) {
+    if (opts.body !== undefined && opts.bodySerializer) {
       opts.serializedBody = opts.bodySerializer(opts.body);
     }
 
     // remove Content-Type header if body is empty to avoid sending invalid requests
-    if (opts.serializedBody === undefined || opts.serializedBody === '') {
+    if (opts.body === undefined || opts.serializedBody === '') {
       opts.headers.delete('Content-Type');
     }
 
@@ -85,10 +86,12 @@ export const createClient = (config: Config = {}): Client => {
     // fetch must be assigned here, otherwise it would throw the error:
     // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
     const _fetch = opts.fetch!;
-    let response = await _fetch(url, {
+    const requestInit: ReqInit = {
       ...opts,
-      body: opts.serializedBody as ReqInit['body'],
-    });
+      body: getValidRequestBody(opts),
+    };
+
+    let response = await _fetch(url, requestInit);
 
     for (const fn of interceptors.response._fns) {
       if (fn) {

package/dist/clients/next/utils.ts

@@ -293,6 +293,14 @@ export const mergeConfigs = (a: Config, b: Config): Config => {
   return config;
 };
 
+const headersEntries = (headers: Headers): Array<[string, string]> => {
+  const entries: Array<[string, string]> = [];
+  headers.forEach((value, key) => {
+    entries.push([key, value]);
+  });
+  return entries;
+};
+
 export const mergeHeaders = (
   ...headers: Array<Required<Config>['headers'] | undefined>
 ): Headers => {
@@ -303,7 +311,9 @@ export const mergeHeaders = (
     }
 
     const iterator =
-      header instanceof Headers ? header.entries() : Object.entries(header);
+      header instanceof Headers
+        ? headersEntries(header)
+        : Object.entries(header);
 
     for (const [key, value] of iterator) {
       if (value === null) {

package/dist/clients/nuxt/client.ts

@@ -59,7 +59,7 @@ export const createClient = (config: Config = {}): Client => {
 
   const request: Client['request'] = ({
     asyncDataOptions,
-    composable,
+    composable = '$fetch',
     ...options
   }) => {
     const key = options.key;

package/dist/clients/nuxt/types.ts

@@ -62,7 +62,7 @@ export interface Config<T extends ClientOptions = ClientOptions>
 }
 
 export interface RequestOptions<
-  TComposable extends Composable = Composable,
+  TComposable extends Composable = '$fetch',
   ResT = unknown,
   DefaultT = undefined,
   Url extends string = string,
@@ -87,7 +87,7 @@ export interface RequestOptions<
       | 'sseMaxRetryDelay'
     > {
   asyncDataOptions?: AsyncDataOptions<ResT, ResT, KeysOf<ResT>, DefaultT>;
-  composable: TComposable;
+  composable?: TComposable;
   key?: string;
   /**
    * Security mechanism(s) to use for the request.
@@ -117,7 +117,7 @@ export interface ClientOptions {
 }
 
 type MethodFn = <
-  TComposable extends Composable,
+  TComposable extends Composable = '$fetch',
   ResT = unknown,
   TError = unknown,
   DefaultT = undefined,
@@ -126,7 +126,7 @@ type MethodFn = <
 ) => RequestResult<TComposable, ResT, TError>;
 
 type SseFn = <
-  TComposable extends Composable,
+  TComposable extends Composable = '$fetch',
   ResT = unknown,
   TError = unknown,
   DefaultT = undefined,
@@ -135,7 +135,7 @@ type SseFn = <
 ) => Promise<ServerSentEventsResult<RequestResult<TComposable, ResT, TError>>>;
 
 type RequestFn = <
-  TComposable extends Composable,
+  TComposable extends Composable = '$fetch',
   ResT = unknown,
   TError = unknown,
   DefaultT = undefined,
@@ -179,7 +179,7 @@ export type Client = CoreClient<RequestFn, Config, MethodFn, BuildUrlFn, SseFn>;
 type OmitKeys<T, K> = Pick<T, Exclude<keyof T, K>>;
 
 export type Options<
-  TComposable extends Composable,
+  TComposable extends Composable = '$fetch',
   TData extends TDataShape = TDataShape,
   ResT = unknown,
   DefaultT = undefined,

package/dist/clients/nuxt/utils.ts

@@ -250,6 +250,14 @@ export const mergeConfigs = (a: Config, b: Config): Config => {
   return config;
 };
 
+const headersEntries = (headers: Headers): Array<[string, string]> => {
+  const entries: Array<[string, string]> = [];
+  headers.forEach((value, key) => {
+    entries.push([key, value]);
+  });
+  return entries;
+};
+
 export const mergeHeaders = (
   ...headers: Array<Required<Config>['headers'] | undefined>
 ): Headers => {
@@ -266,7 +274,7 @@ export const mergeHeaders = (
 
     const iterator =
       h instanceof Headers
-        ? h.entries()
+        ? headersEntries(h)
         : Object.entries(h as Record<string, unknown>);
 
     for (const [key, value] of iterator) {