Skip to content

Commit e7768bb

Browse files
alexander-akaitalexander-akait
committed
refactor: types fix
1 parent b1f8e7a commit e7768bb

12 files changed

+50
-23
lines changed

‎lib/AppendPlugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"use strict";
77

88
/** @typedef {import("./Resolver")} Resolver */
9-
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
109
/** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
10+
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
1111

1212
module.exports = class AppendPlugin {
1313
/**

‎lib/DescriptionFilePlugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
const DescriptionFileUtils = require("./DescriptionFileUtils");
99

1010
/** @typedef {import("./Resolver")} Resolver */
11-
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
1211
/** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
12+
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
1313

1414
module.exports = class DescriptionFilePlugin {
1515
/**

‎lib/ExportsFieldPlugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ const { parseIdentifier } = require("./util/identifier");
1313
const { checkImportsExportsFieldTarget } = require("./util/path");
1414

1515
/** @typedef {import("./Resolver")} Resolver */
16-
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
1716
/** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
17+
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
1818
/** @typedef {import("./util/entrypoints").ExportsField} ExportsField */
1919
/** @typedef {import("./util/entrypoints").FieldProcessor} FieldProcessor */
2020

‎lib/JoinRequestPartPlugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"use strict";
77

88
/** @typedef {import("./Resolver")} Resolver */
9-
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
109
/** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
10+
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
1111

1212
const namespaceStartCharCode = "@".charCodeAt(0);
1313

‎lib/JoinRequestPlugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"use strict";
77

88
/** @typedef {import("./Resolver")} Resolver */
9-
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
109
/** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
10+
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
1111

1212
module.exports = class JoinRequestPlugin {
1313
/**

‎lib/ModulesInHierarchicalDirectoriesPlugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ const forEachBail = require("./forEachBail");
99
const getPaths = require("./getPaths");
1010

1111
/** @typedef {import("./Resolver")} Resolver */
12-
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
1312
/** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
13+
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
1414

1515
module.exports = class ModulesInHierarchicalDirectoriesPlugin {
1616
/**

‎lib/ModulesInRootPlugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"use strict";
77

88
/** @typedef {import("./Resolver")} Resolver */
9-
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
109
/** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
10+
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
1111

1212
module.exports = class ModulesInRootPlugin {
1313
/**

‎lib/Resolver.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const {
4949
* @param {T=} result
5050
*/
5151

52-
/** @typedef {function((NodeJS.ErrnoException | null)=, (string | Buffer)[] | IDirent[]=): void} DirentArrayCallback */
52+
/** @typedef {function((NodeJS.ErrnoException | null)=, (string | Buffer)[] | import("fs").Dirent[]=): void} DirentArrayCallback */
5353

5454
/**
5555
* @typedef {Object} ReaddirOptions

‎lib/SelfReferencePlugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
const DescriptionFileUtils = require("./DescriptionFileUtils");
99

1010
/** @typedef {import("./Resolver")} Resolver */
11-
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
1211
/** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
12+
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
1313

1414
const slashCode = "/".charCodeAt(0);
1515

‎lib/SymlinkPlugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ const getPaths = require("./getPaths");
1010
const { getType, PathType } = require("./util/path");
1111

1212
/** @typedef {import("./Resolver")} Resolver */
13-
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
1413
/** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
14+
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
1515

1616
module.exports = class SymlinkPlugin {
1717
/**

‎lib/UseFilePlugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"use strict";
77

88
/** @typedef {import("./Resolver")} Resolver */
9-
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
109
/** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
10+
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
1111

1212
module.exports = class UseFilePlugin {
1313
/**

‎types.d.ts

+39-12
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* Run `yarn special-lint-fix` to update
55
*/
66

7+
import { Dirent } from "fs";
78
import { AsyncSeriesBailHook, AsyncSeriesHook, SyncHook } from "tapable";
89

910
declare interface AliasOption {
@@ -51,7 +52,7 @@ declare class CachedInputFileSystem {
5152
| null
5253
| ((
5354
arg0?: null | NodeJS.ErrnoException,
54-
arg1?: (string | Buffer)[] | unresolved[]
55+
arg1?: (string | Buffer)[] | Dirent[]
5556
) => void)
5657
| ReaddirOptions
5758
| "ascii"
@@ -67,7 +68,7 @@ declare class CachedInputFileSystem {
6768
| "buffer",
6869
arg2?: (
6970
arg0?: null | NodeJS.ErrnoException,
70-
arg1?: (string | Buffer)[] | unresolved[]
71+
arg1?: (string | Buffer)[] | Dirent[]
7172
) => void
7273
) => void;
7374
readdirSync: (
@@ -100,9 +101,32 @@ declare class CachedInputFileSystem {
100101
purge(what?: any): void;
101102
}
102103
declare class CloneBasenamePlugin {
103-
constructor(source?: any, target?: any);
104-
source: any;
105-
target: any;
104+
constructor(
105+
source:
106+
| string
107+
| AsyncSeriesBailHook<
108+
[ResolveRequest, ResolveContext],
109+
null | ResolveRequest
110+
>,
111+
target:
112+
| string
113+
| AsyncSeriesBailHook<
114+
[ResolveRequest, ResolveContext],
115+
null | ResolveRequest
116+
>
117+
);
118+
source:
119+
| string
120+
| AsyncSeriesBailHook<
121+
[ResolveRequest, ResolveContext],
122+
null | ResolveRequest
123+
>;
124+
target:
125+
| string
126+
| AsyncSeriesBailHook<
127+
[ResolveRequest, ResolveContext],
128+
null | ResolveRequest
129+
>;
106130
apply(resolver: Resolver): void;
107131
}
108132
type ErrorWithDetail = Error & { details?: string };
@@ -128,7 +152,7 @@ declare interface FileSystem {
128152
| null
129153
| ((
130154
arg0?: null | NodeJS.ErrnoException,
131-
arg1?: (string | Buffer)[] | unresolved[]
155+
arg1?: (string | Buffer)[] | Dirent[]
132156
) => void)
133157
| ReaddirOptions
134158
| "ascii"
@@ -144,7 +168,7 @@ declare interface FileSystem {
144168
| "buffer",
145169
arg2?: (
146170
arg0?: null | NodeJS.ErrnoException,
147-
arg1?: (string | Buffer)[] | unresolved[]
171+
arg1?: (string | Buffer)[] | Dirent[]
148172
) => void
149173
) => void;
150174
readJson?: {
@@ -626,11 +650,14 @@ declare namespace exports {
626650
export namespace ResolverFactory {
627651
export let createResolver: (options: UserResolveOptions) => Resolver;
628652
}
629-
export const forEachBail: (
630-
array?: any,
631-
iterator?: any,
632-
callback?: any
633-
) => any;
653+
export const forEachBail: <T>(
654+
array: T[],
655+
iterator: (
656+
item: T,
657+
callback: (err?: null | Error, result?: any) => void
658+
) => void,
659+
callback: (err?: null | Error, result?: ResolveRequest) => void
660+
) => void;
634661
export type ResolveCallback = (
635662
err: null | ErrorWithDetail,
636663
res?: string | false,

0 commit comments

Comments
 (0)