Skip to content

Commit 278421f

Browse files
alexander-akaitalexander-akait
authored
chore: fix types (#1884)
1 parent 55862db commit 278421f

12 files changed

+428
-550
lines changed

‎package-lock.json

Lines changed: 382 additions & 475 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎types/index.d.ts

Lines changed: 19 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/// <reference types="node" />
2-
/// <reference types="node" />
31
export = wdm;
42
/** @typedef {import("schema-utils/declarations/validate").Schema} Schema */
53
/** @typedef {import("webpack").Compiler} Compiler */
@@ -154,8 +152,7 @@ export = wdm;
154152
* @returns {API<RequestInternal, ResponseInternal>}
155153
*/
156154
declare function wdm<
157-
RequestInternal extends
158-
import("http").IncomingMessage = import("http").IncomingMessage,
155+
RequestInternal extends IncomingMessage = import("http").IncomingMessage,
159156
ResponseInternal extends ServerResponse = ServerResponse,
160157
>(
161158
compiler: Compiler | MultiCompiler,
@@ -204,14 +201,6 @@ declare namespace wdm {
204201
HapiOptions,
205202
};
206203
}
207-
type Compiler = import("webpack").Compiler;
208-
type MultiCompiler = import("webpack").MultiCompiler;
209-
type API<
210-
RequestInternal extends
211-
import("http").IncomingMessage = import("http").IncomingMessage,
212-
ResponseInternal extends ServerResponse = ServerResponse,
213-
> = Middleware<RequestInternal, ResponseInternal> &
214-
AdditionalMethods<RequestInternal, ResponseInternal>;
215204
/**
216205
* @template S
217206
* @template O
@@ -243,28 +232,25 @@ declare function hapiWrapper<
243232
* @returns {(ctx: any, next: Function) => Promise<void> | void}
244233
*/
245234
declare function koaWrapper<
246-
RequestInternal extends
247-
import("http").IncomingMessage = import("http").IncomingMessage,
235+
RequestInternal extends IncomingMessage = import("http").IncomingMessage,
248236
ResponseInternal extends ServerResponse = ServerResponse,
249237
>(
250238
compiler: Compiler | MultiCompiler,
251239
options?: Options<RequestInternal, ResponseInternal> | undefined,
252240
): (ctx: any, next: Function) => Promise<void> | void;
253241
type Schema = import("schema-utils/declarations/validate").Schema;
242+
type Compiler = import("webpack").Compiler;
243+
type MultiCompiler = import("webpack").MultiCompiler;
254244
type Configuration = import("webpack").Configuration;
255245
type Stats = import("webpack").Stats;
256246
type MultiStats = import("webpack").MultiStats;
257247
type ReadStream = import("fs").ReadStream;
258248
type ExtendedServerResponse = {
259249
locals?:
260250
| {
261-
webpack?:
262-
| {
263-
devMiddleware?:
264-
| Context<import("http").IncomingMessage, ServerResponse>
265-
| undefined;
266-
}
267-
| undefined;
251+
webpack?: {
252+
devMiddleware?: Context<IncomingMessage, ServerResponse>;
253+
};
268254
}
269255
| undefined;
270256
};
@@ -289,8 +275,7 @@ type ResponseData = {
289275
byteLength: number;
290276
};
291277
type ModifyResponseData<
292-
RequestInternal extends
293-
import("http").IncomingMessage = import("http").IncomingMessage,
278+
RequestInternal extends IncomingMessage = import("http").IncomingMessage,
294279
ResponseInternal extends ServerResponse = ServerResponse,
295280
> = (
296281
req: RequestInternal,
@@ -299,8 +284,7 @@ type ModifyResponseData<
299284
byteLength: number,
300285
) => ResponseData;
301286
type Context<
302-
RequestInternal extends
303-
import("http").IncomingMessage = import("http").IncomingMessage,
287+
RequestInternal extends IncomingMessage = import("http").IncomingMessage,
304288
ResponseInternal extends ServerResponse = ServerResponse,
305289
> = {
306290
state: boolean;
@@ -313,8 +297,7 @@ type Context<
313297
outputFileSystem: OutputFileSystem;
314298
};
315299
type FilledContext<
316-
RequestInternal extends
317-
import("http").IncomingMessage = import("http").IncomingMessage,
300+
RequestInternal extends IncomingMessage = import("http").IncomingMessage,
318301
ResponseInternal extends ServerResponse = ServerResponse,
319302
> = WithoutUndefined<Context<RequestInternal, ResponseInternal>, "watching">;
320303
type NormalizedHeaders =
@@ -324,8 +307,7 @@ type NormalizedHeaders =
324307
value: number | string;
325308
}>;
326309
type Headers<
327-
RequestInternal extends
328-
import("http").IncomingMessage = import("http").IncomingMessage,
310+
RequestInternal extends IncomingMessage = import("http").IncomingMessage,
329311
ResponseInternal extends ServerResponse = ServerResponse,
330312
> =
331313
| NormalizedHeaders
@@ -336,8 +318,7 @@ type Headers<
336318
) => void | undefined | NormalizedHeaders)
337319
| undefined;
338320
type Options<
339-
RequestInternal extends
340-
import("http").IncomingMessage = import("http").IncomingMessage,
321+
RequestInternal extends IncomingMessage = import("http").IncomingMessage,
341322
ResponseInternal extends ServerResponse = ServerResponse,
342323
> = {
343324
mimeTypes?:
@@ -361,8 +342,7 @@ type Options<
361342
lastModified?: boolean | undefined;
362343
};
363344
type Middleware<
364-
RequestInternal extends
365-
import("http").IncomingMessage = import("http").IncomingMessage,
345+
RequestInternal extends IncomingMessage = import("http").IncomingMessage,
366346
ResponseInternal extends ServerResponse = ServerResponse,
367347
> = (
368348
req: RequestInternal,
@@ -378,7 +358,7 @@ type WaitUntilValid = (callback: Callback) => any;
378358
type Invalidate = (callback: Callback) => any;
379359
type Close = (callback: (err: Error | null | undefined) => void) => any;
380360
type AdditionalMethods<
381-
RequestInternal extends import("http").IncomingMessage,
361+
RequestInternal extends IncomingMessage,
382362
ResponseInternal extends ServerResponse,
383363
> = {
384364
getFilenameFromUrl: GetFilenameFromUrl;
@@ -387,6 +367,11 @@ type AdditionalMethods<
387367
close: Close;
388368
context: Context<RequestInternal, ResponseInternal>;
389369
};
370+
type API<
371+
RequestInternal extends IncomingMessage = import("http").IncomingMessage,
372+
ResponseInternal extends ServerResponse = ServerResponse,
373+
> = Middleware<RequestInternal, ResponseInternal> &
374+
AdditionalMethods<RequestInternal, ResponseInternal>;
390375
type WithOptional<T, K extends keyof T> = Omit<T, K> & Partial<T>;
391376
type WithoutUndefined<T, K extends keyof T> = T & {
392377
[P in K]: NonNullable<T[P]>;

‎types/middleware.d.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/// <reference types="node" />
21
export = wrapper;
32
/**
43
* @template {IncomingMessage} Request
@@ -14,8 +13,8 @@ export = wrapper;
1413
* @return {import("./index.js").Middleware<Request, Response>}
1514
*/
1615
declare function wrapper<
17-
Request extends import("http").IncomingMessage,
18-
Response extends import("./index.js").ServerResponse,
16+
Request extends IncomingMessage,
17+
Response extends ServerResponse,
1918
>(
2019
context: import("./index.js").FilledContext<Request, Response>,
2120
): import("./index.js").Middleware<Request, Response>;
@@ -33,8 +32,8 @@ declare namespace wrapper {
3332
* send error options
3433
*/
3534
type SendErrorOptions<
36-
Request extends import("http").IncomingMessage,
37-
Response extends import("./index.js").ServerResponse,
35+
Request extends IncomingMessage,
36+
Response extends ServerResponse,
3837
> = {
3938
/**
4039
* headers

‎types/utils/compatibleAPI.d.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/// <reference types="node" />
21
export type IncomingMessage = import("../index.js").IncomingMessage;
32
export type ServerResponse = import("../index.js").ServerResponse;
43
export type ExpectedResponse = {
@@ -20,11 +19,7 @@ export type ExpectedResponse = {
2019
* @param {number} code
2120
*/
2221
export function setStatusCode<
23-
Response extends import("http").ServerResponse<
24-
import("http").IncomingMessage
25-
> &
26-
import("../index.js").ExtendedServerResponse &
27-
ExpectedResponse,
22+
Response extends ServerResponse & ExpectedResponse,
2823
>(res: Response, code: number): void;
2924
/**
3025
* @template {IncomingMessage} Request
@@ -33,15 +28,15 @@ export function setStatusCode<
3328
* @param {string | Buffer} bufferOrStream
3429
*/
3530
export function send<
36-
Request extends import("http").IncomingMessage,
37-
Response extends import("../index.js").ServerResponse,
31+
Request extends IncomingMessage,
32+
Response extends ServerResponse,
3833
>(res: Response & ExpectedResponse, bufferOrStream: string | Buffer): void;
3934
/**
4035
* @template {ServerResponse} Response
4136
* @param {Response & ExpectedResponse} res
4237
* @param {import("fs").ReadStream} bufferOrStream
4338
*/
44-
export function pipe<Response extends import("../index.js").ServerResponse>(
39+
export function pipe<Response extends ServerResponse>(
4540
res: Response & ExpectedResponse,
4641
bufferOrStream: import("fs").ReadStream,
4742
): void;

‎types/utils/etag.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ declare function etag(entity: Buffer | ReadStream | Stats): Promise<{
1212
declare namespace etag {
1313
export { Stats, ReadStream };
1414
}
15-
type ReadStream = import("fs").ReadStream;
1615
type Stats = import("fs").Stats;
16+
type ReadStream = import("fs").ReadStream;

‎types/utils/getFilenameFromUrl.d.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/// <reference types="node" />
21
export = getFilenameFromUrl;
32
/**
43
* @template {IncomingMessage} Request
@@ -9,8 +8,8 @@ export = getFilenameFromUrl;
98
* @returns {string | undefined}
109
*/
1110
declare function getFilenameFromUrl<
12-
Request extends import("http").IncomingMessage,
13-
Response extends import("../index.js").ServerResponse,
11+
Request extends IncomingMessage,
12+
Response extends ServerResponse,
1413
>(
1514
context: import("../index.js").FilledContext<Request, Response>,
1615
url: string,

‎types/utils/getPaths.d.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/// <reference types="node" />
21
export = getPaths;
32
/** @typedef {import("webpack").Compiler} Compiler */
43
/** @typedef {import("webpack").Stats} Stats */
@@ -11,8 +10,8 @@ export = getPaths;
1110
* @param {import("../index.js").FilledContext<Request, Response>} context
1211
*/
1312
declare function getPaths<
14-
Request extends import("http").IncomingMessage,
15-
Response extends import("../index.js").ServerResponse,
13+
Request extends IncomingMessage,
14+
Response extends ServerResponse,
1615
>(
1716
context: import("../index.js").FilledContext<Request, Response>,
1817
): {

‎types/utils/memorize.d.ts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@ declare function memorize<T>(
1212
cache,
1313
}?:
1414
| {
15-
cache?:
16-
| Map<
17-
string,
18-
{
19-
data: T;
20-
}
21-
>
22-
| undefined;
15+
cache?: Map<
16+
string,
17+
{
18+
data: T;
19+
}
20+
>;
2321
}
2422
| undefined,
2523
callback?: ((value: T) => T) | undefined,

‎types/utils/ready.d.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/// <reference types="node" />
21
export = ready;
32
/** @typedef {import("../index.js").IncomingMessage} IncomingMessage */
43
/** @typedef {import("../index.js").ServerResponse} ServerResponse */
@@ -11,8 +10,8 @@ export = ready;
1110
* @returns {void}
1211
*/
1312
declare function ready<
14-
Request extends import("http").IncomingMessage,
15-
Response extends import("../index.js").ServerResponse,
13+
Request extends IncomingMessage,
14+
Response extends ServerResponse,
1615
>(
1716
context: import("../index.js").FilledContext<Request, Response>,
1817
callback: (...args: any[]) => any,

‎types/utils/setupHooks.d.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/// <reference types="node" />
21
export = setupHooks;
32
/** @typedef {import("webpack").Configuration} Configuration */
43
/** @typedef {import("webpack").Compiler} Compiler */
@@ -16,8 +15,8 @@ export = setupHooks;
1615
* @param {import("../index.js").WithOptional<import("../index.js").Context<Request, Response>, "watching" | "outputFileSystem">} context
1716
*/
1817
declare function setupHooks<
19-
Request extends import("http").IncomingMessage,
20-
Response extends import("../index.js").ServerResponse,
18+
Request extends IncomingMessage,
19+
Response extends ServerResponse,
2120
>(
2221
context: import("../index.js").WithOptional<
2322
import("../index.js").Context<Request, Response>,

0 commit comments

Comments
 (0)