Skip to content

Commit 3126e01

Browse files
committed
fix(client): Make mergeHeaders nodejs runtime compatible
1 parent 14af188 commit 3126e01

File tree

3 files changed

+32
-4
lines changed

3 files changed

+32
-4
lines changed

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,17 +181,27 @@ export const mergeConfigs = (a: Config, b: Config): Config => {
181181
return config;
182182
};
183183

184+
const headersEntries = (headers: Headers): Array<[string, string]> => {
185+
const entries: Array<[string, string]> = [];
186+
headers.forEach((value, key) => {
187+
entries.push([key, value]);
188+
});
189+
return entries;
190+
};
191+
184192
export const mergeHeaders = (
185193
...headers: Array<Required<Config>['headers'] | undefined>
186194
): Headers => {
187195
const mergedHeaders = new Headers();
188196
for (const header of headers) {
189-
if (!header || typeof header !== 'object') {
197+
if (!header) {
190198
continue;
191199
}
192200

193201
const iterator =
194-
header instanceof Headers ? header.entries() : Object.entries(header);
202+
header instanceof Headers
203+
? headersEntries(header)
204+
: Object.entries(header);
195205

196206
for (const [key, value] of iterator) {
197207
if (value === null) {

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,14 @@ export const mergeConfigs = (a: Config, b: Config): Config => {
293293
return config;
294294
};
295295

296+
const headersEntries = (headers: Headers): Array<[string, string]> => {
297+
const entries: Array<[string, string]> = [];
298+
headers.forEach((value, key) => {
299+
entries.push([key, value]);
300+
});
301+
return entries;
302+
};
303+
296304
export const mergeHeaders = (
297305
...headers: Array<Required<Config>['headers'] | undefined>
298306
): Headers => {
@@ -303,7 +311,9 @@ export const mergeHeaders = (
303311
}
304312

305313
const iterator =
306-
header instanceof Headers ? header.entries() : Object.entries(header);
314+
header instanceof Headers
315+
? headersEntries(header)
316+
: Object.entries(header);
307317

308318
for (const [key, value] of iterator) {
309319
if (value === null) {

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,14 @@ export const mergeConfigs = (a: Config, b: Config): Config => {
250250
return config;
251251
};
252252

253+
const headersEntries = (headers: Headers): Array<[string, string]> => {
254+
const entries: Array<[string, string]> = [];
255+
headers.forEach((value, key) => {
256+
entries.push([key, value]);
257+
});
258+
return entries;
259+
};
260+
253261
export const mergeHeaders = (
254262
...headers: Array<Required<Config>['headers'] | undefined>
255263
): Headers => {
@@ -266,7 +274,7 @@ export const mergeHeaders = (
266274

267275
const iterator =
268276
h instanceof Headers
269-
? h.entries()
277+
? headersEntries(h)
270278
: Object.entries(h as Record<string, unknown>);
271279

272280
for (const [key, value] of iterator) {

0 commit comments

Comments
 (0)