File tree Expand file tree Collapse file tree 3 files changed +32
-4
lines changed
packages/openapi-ts/src/plugins/@hey-api Expand file tree Collapse file tree 3 files changed +32
-4
lines changed Original file line number Diff line number Diff line change @@ -181,17 +181,27 @@ export const mergeConfigs = (a: Config, b: Config): Config => {
181
181
return config ;
182
182
} ;
183
183
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
+
184
192
export const mergeHeaders = (
185
193
...headers : Array < Required < Config > [ 'headers' ] | undefined >
186
194
) : Headers => {
187
195
const mergedHeaders = new Headers ( ) ;
188
196
for ( const header of headers ) {
189
- if ( ! header || typeof header !== 'object' ) {
197
+ if ( ! header ) {
190
198
continue ;
191
199
}
192
200
193
201
const iterator =
194
- header instanceof Headers ? header . entries ( ) : Object . entries ( header ) ;
202
+ header instanceof Headers
203
+ ? headersEntries ( header )
204
+ : Object . entries ( header ) ;
195
205
196
206
for ( const [ key , value ] of iterator ) {
197
207
if ( value === null ) {
Original file line number Diff line number Diff line change @@ -293,6 +293,14 @@ export const mergeConfigs = (a: Config, b: Config): Config => {
293
293
return config ;
294
294
} ;
295
295
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
+
296
304
export const mergeHeaders = (
297
305
...headers : Array < Required < Config > [ 'headers' ] | undefined >
298
306
) : Headers => {
@@ -303,7 +311,9 @@ export const mergeHeaders = (
303
311
}
304
312
305
313
const iterator =
306
- header instanceof Headers ? header . entries ( ) : Object . entries ( header ) ;
314
+ header instanceof Headers
315
+ ? headersEntries ( header )
316
+ : Object . entries ( header ) ;
307
317
308
318
for ( const [ key , value ] of iterator ) {
309
319
if ( value === null ) {
Original file line number Diff line number Diff line change @@ -250,6 +250,14 @@ export const mergeConfigs = (a: Config, b: Config): Config => {
250
250
return config ;
251
251
} ;
252
252
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
+
253
261
export const mergeHeaders = (
254
262
...headers : Array < Required < Config > [ 'headers' ] | undefined >
255
263
) : Headers => {
@@ -266,7 +274,7 @@ export const mergeHeaders = (
266
274
267
275
const iterator =
268
276
h instanceof Headers
269
- ? h . entries ( )
277
+ ? headersEntries ( h )
270
278
: Object . entries ( h as Record < string , unknown > ) ;
271
279
272
280
for ( const [ key , value ] of iterator ) {
You can’t perform that action at this time.
0 commit comments