Skip to content

Commit 040d9da

Browse files
authored
Refactor responseHeader to responseHeaders (#3375)
1 parent 01400c5 commit 040d9da

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

test/types/dispatcher.test-d.ts

+22
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ expectAssignable<Dispatcher>(new Dispatcher())
4747
expectAssignable<Error | null>(err)
4848
expectAssignable<Dispatcher.ConnectData>(data)
4949
}))
50+
expectAssignable<Promise<Dispatcher.ConnectData>>(dispatcher.connect({ origin: '', path: '', responseHeaders: 'raw' }))
51+
expectAssignable<Promise<Dispatcher.ConnectData>>(dispatcher.connect({ origin: '', path: '', responseHeaders: null }))
5052

5153
// request
5254
expectAssignable<Promise<Dispatcher.ResponseData>>(dispatcher.request({ origin: '', path: '', method: 'GET', maxRedirections: 0 }))
@@ -62,6 +64,8 @@ expectAssignable<Dispatcher>(new Dispatcher())
6264
expectAssignable<Error | null>(err)
6365
expectAssignable<Dispatcher.ResponseData>(data)
6466
}))
67+
expectAssignable<Promise<Dispatcher.ResponseData>>(dispatcher.request({ origin: '', path: '', method: 'GET', responseHeaders: 'raw' }))
68+
expectAssignable<Promise<Dispatcher.ResponseData>>(dispatcher.request({ origin: '', path: '', method: 'GET', responseHeaders: null }))
6569

6670
// pipeline
6771
expectAssignable<Duplex>(dispatcher.pipeline({ origin: '', path: '', method: 'GET', maxRedirections: 0 }, data => {
@@ -72,6 +76,14 @@ expectAssignable<Dispatcher>(new Dispatcher())
7276
expectAssignable<Dispatcher.PipelineHandlerData>(data)
7377
return new Readable()
7478
}))
79+
expectAssignable<Duplex>(dispatcher.pipeline({ origin: '', path: '', method: 'GET', responseHeaders: 'raw' }, data => {
80+
expectAssignable<Dispatcher.PipelineHandlerData>(data)
81+
return new Readable()
82+
}))
83+
expectAssignable<Duplex>(dispatcher.pipeline({ origin: '', path: '', method: 'GET', responseHeaders: null }, data => {
84+
expectAssignable<Dispatcher.PipelineHandlerData>(data)
85+
return new Readable()
86+
}))
7587

7688
// stream
7789
expectAssignable<Promise<Dispatcher.StreamData>>(dispatcher.stream({ origin: '', path: '', method: 'GET', maxRedirections: 0 }, data => {
@@ -104,13 +116,23 @@ expectAssignable<Dispatcher>(new Dispatcher())
104116
expectAssignable<Dispatcher.StreamData>(data)
105117
}
106118
))
119+
expectAssignable<Promise<Dispatcher.StreamData>>(dispatcher.stream({ origin: '', path: '', method: 'GET', responseHeaders: 'raw' }, data => {
120+
expectAssignable<Dispatcher.StreamFactoryData>(data)
121+
return new Writable()
122+
}))
123+
expectAssignable<Promise<Dispatcher.StreamData>>(dispatcher.stream({ origin: '', path: '', method: 'GET', responseHeaders: null }, data => {
124+
expectAssignable<Dispatcher.StreamFactoryData>(data)
125+
return new Writable()
126+
}))
107127

108128
// upgrade
109129
expectAssignable<Promise<Dispatcher.UpgradeData>>(dispatcher.upgrade({ path: '', maxRedirections: 0 }))
110130
expectAssignable<void>(dispatcher.upgrade({ path: '' }, (err, data) => {
111131
expectAssignable<Error | null>(err)
112132
expectAssignable<Dispatcher.UpgradeData>(data)
113133
}))
134+
expectAssignable<Promise<Dispatcher.UpgradeData>>(dispatcher.upgrade({ path: '', responseHeaders: 'raw' }))
135+
expectAssignable<Promise<Dispatcher.UpgradeData>>(dispatcher.upgrade({ path: '', responseHeaders: null }))
114136

115137
// close
116138
expectAssignable<Promise<void>>(dispatcher.close())

types/dispatcher.d.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ declare namespace Dispatcher {
139139
/** Default: false */
140140
redirectionLimitReached?: boolean;
141141
/** Default: `null` */
142-
responseHeader?: 'raw' | null;
142+
responseHeaders?: 'raw' | null;
143143
}
144144
export interface RequestOptions extends DispatchOptions {
145145
/** Default: `null` */
@@ -153,7 +153,7 @@ declare namespace Dispatcher {
153153
/** Default: `null` */
154154
onInfo?: (info: { statusCode: number, headers: Record<string, string | string[]> }) => void;
155155
/** Default: `null` */
156-
responseHeader?: 'raw' | null;
156+
responseHeaders?: 'raw' | null;
157157
/** Default: `64 KiB` */
158158
highWaterMark?: number;
159159
}
@@ -176,7 +176,7 @@ declare namespace Dispatcher {
176176
/** Default: false */
177177
redirectionLimitReached?: boolean;
178178
/** Default: `null` */
179-
responseHeader?: 'raw' | null;
179+
responseHeaders?: 'raw' | null;
180180
}
181181
export interface ConnectData {
182182
statusCode: number;

0 commit comments

Comments
 (0)