@hey-api/openapi-ts 0.82.4 → 0.83.0

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,
@@ -199,25 +200,6 @@ export const createClient = (config: Config = {}): Client => {
     }
   };
 
-  function getValidRequestBody(options: ResolvedRequestOptions) {
-    const hasBody = options.body !== undefined;
-    const isSerializedBody = hasBody && options.bodySerializer;
-
-    if (isSerializedBody) {
-      const hasSerializedBody =
-        options.serializedBody !== undefined && options.serializedBody !== '';
-
-      return hasSerializedBody ? options.serializedBody : null;
-    }
-
-    // plain/text body
-    if (hasBody) {
-      return options.body;
-    }
-
-    return undefined;
-  }
-
   const makeMethodFn =
     (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
       request({ ...options, method });

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,
@@ -112,23 +113,6 @@ export const createClient = (config: Config = {}): Client => {
     }
   };
 
-  function getValidRequestBody(options: RequestOptions) {
-    const hasBody = options.body !== undefined;
-    const isSerializedBody = hasBody && options.bodySerializer;
-
-    if (isSerializedBody) {
-      return options.body !== '' ? options.body : null;
-    }
-
-    // plain/text body
-    if (hasBody) {
-      return options.body;
-    }
-
-    // no body was provided
-    return undefined;
-  }
-
   const makeMethodFn =
     (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
       request({ ...options, method });

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,
@@ -210,26 +211,6 @@ export const createClient = (config: Config = {}): Client => {
         };
   };
 
-  function getValidRequestBody(options: ResolvedRequestOptions) {
-    const hasBody = options.body !== undefined;
-    const isSerializedBody = hasBody && options.bodySerializer;
-
-    if (isSerializedBody) {
-      const hasSerializedBody =
-        options.serializedBody !== undefined && options.serializedBody !== '';
-
-      return hasSerializedBody ? options.serializedBody : null;
-    }
-
-    // plain/text body
-    if (hasBody) {
-      return options.body;
-    }
-
-    // no body was provided
-    return undefined;
-  }
-
   const makeMethodFn =
     (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
       request({ ...options, method });

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,
@@ -198,26 +199,6 @@ export const createClient = (config: Config = {}): Client => {
     };
   };
 
-  function getValidRequestBody(options: ResolvedRequestOptions) {
-    const hasBody = options.body !== undefined;
-    const isSerializedBody = hasBody && options.bodySerializer;
-
-    if (isSerializedBody) {
-      const hasSerializedBody =
-        options.serializedBody !== undefined && options.serializedBody !== '';
-
-      return hasSerializedBody ? options.serializedBody : null;
-    }
-
-    // plain/text body
-    if (hasBody) {
-      return options.body;
-    }
-
-    // no body was provided
-    return undefined;
-  }
-
   const makeMethodFn =
     (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
       request({ ...options, method });

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/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) {