refactor: test and code

sapenlei · May 17, 2023 · d3a753d · d3a753d
1 parent 615674e
commit d3a753d
Show file tree

Hide file tree

Showing 27 changed files with 210 additions and 179 deletions.
diff --git a/declarations.d.ts b/declarations.d.ts
diff --git a/lib/CachedInputFileSystem.js b/lib/CachedInputFileSystem.js
@@ -499,7 +499,9 @@ module.exports = class CachedInputFileSystem {
 		const readdir = this._readdirBackend.provide;
 		this.readdir = /** @type {FileSystem["readdir"]} */ (readdir);
 		const readdirSync = this._readdirBackend.provideSync;
-		this.readdirSync = /** @type {SyncFileSystem["readdirSync"]} */ (readdirSync);
+		this.readdirSync = /** @type {SyncFileSystem["readdirSync"]} */ (
+			readdirSync
+		);
 
 		this._readFileBackend = createBackend(
 			duration,
@@ -510,7 +512,9 @@ module.exports = class CachedInputFileSystem {
 		const readFile = this._readFileBackend.provide;
 		this.readFile = /** @type {FileSystem["readFile"]} */ (readFile);
 		const readFileSync = this._readFileBackend.provideSync;
-		this.readFileSync = /** @type {SyncFileSystem["readFileSync"]} */ (readFileSync);
+		this.readFileSync = /** @type {SyncFileSystem["readFileSync"]} */ (
+			readFileSync
+		);
 
 		this._readJsonBackend = createBackend(
 			duration,
@@ -556,7 +560,9 @@ module.exports = class CachedInputFileSystem {
 		const readJson = this._readJsonBackend.provide;
 		this.readJson = /** @type {FileSystem["readJson"]} */ (readJson);
 		const readJsonSync = this._readJsonBackend.provideSync;
-		this.readJsonSync = /** @type {SyncFileSystem["readJsonSync"]} */ (readJsonSync);
+		this.readJsonSync = /** @type {SyncFileSystem["readJsonSync"]} */ (
+			readJsonSync
+		);
 
 		this._readlinkBackend = createBackend(
 			duration,
@@ -567,7 +573,9 @@ module.exports = class CachedInputFileSystem {
 		const readlink = this._readlinkBackend.provide;
 		this.readlink = /** @type {FileSystem["readlink"]} */ (readlink);
 		const readlinkSync = this._readlinkBackend.provideSync;
-		this.readlinkSync = /** @type {SyncFileSystem["readlinkSync"]} */ (readlinkSync);
+		this.readlinkSync = /** @type {SyncFileSystem["readlinkSync"]} */ (
+			readlinkSync
+		);
 	}
 
 	/**

diff --git a/lib/ExportsFieldPlugin.js b/lib/ExportsFieldPlugin.js
@@ -62,10 +62,12 @@ module.exports = class ExportsFieldPlugin {
 						: request.request;
 				const exportsField =
 					/** @type {ExportsField|null|undefined} */
-					(DescriptionFileUtils.getField(
-						/** @type {JsonObject} */ (request.descriptionFileData),
-						this.fieldName
-					));
+					(
+						DescriptionFileUtils.getField(
+							/** @type {JsonObject} */ (request.descriptionFileData),
+							this.fieldName
+						)
+					);
 				if (!exportsField) return callback();
 
 				if (request.directory) {

diff --git a/lib/ImportsFieldPlugin.js b/lib/ImportsFieldPlugin.js
@@ -65,10 +65,12 @@ module.exports = class ImportsFieldPlugin {
 					request.request + request.query + request.fragment;
 				const importsField =
 					/** @type {ImportsField|null|undefined} */
-					(DescriptionFileUtils.getField(
-						/** @type {JsonObject} */ (request.descriptionFileData),
-						this.fieldName
-					));
+					(
+						DescriptionFileUtils.getField(
+							/** @type {JsonObject} */ (request.descriptionFileData),
+							this.fieldName
+						)
+					);
 				if (!importsField) return callback();
 
 				if (request.directory) {

diff --git a/lib/MainFieldPlugin.js b/lib/MainFieldPlugin.js
@@ -48,10 +48,12 @@ module.exports = class MainFieldPlugin {
 				const filename = path.basename(request.descriptionFilePath);
 				let mainModule =
 					/** @type {string|null|undefined} */
-					(DescriptionFileUtils.getField(
-						/** @type {JsonObject} */ (request.descriptionFileData),
-						this.options.name
-					));
+					(
+						DescriptionFileUtils.getField(
+							/** @type {JsonObject} */ (request.descriptionFileData),
+							this.options.name
+						)
+					);
 
 				if (
 					!mainModule ||

diff --git a/lib/Resolver.js b/lib/Resolver.js
@@ -204,18 +204,18 @@ class Resolver {
 		}
 		name = toCamelCase(name);
 		if (/^before/.test(name)) {
-			return /** @type {ResolveStepHook} */ (this.ensureHook(
-				name[6].toLowerCase() + name.slice(7)
-			).withOptions({
-				stage: -10
-			}));
+			return /** @type {ResolveStepHook} */ (
+				this.ensureHook(name[6].toLowerCase() + name.slice(7)).withOptions({
+					stage: -10
+				})
+			);
 		}
 		if (/^after/.test(name)) {
-			return /** @type {ResolveStepHook} */ (this.ensureHook(
-				name[5].toLowerCase() + name.slice(6)
-			).withOptions({
-				stage: 10
-			}));
+			return /** @type {ResolveStepHook} */ (
+				this.ensureHook(name[5].toLowerCase() + name.slice(6)).withOptions({
+					stage: 10
+				})
+			);
 		}
 		/** @type {ResolveStepHook} */
 		const hook = /** @type {KnownHooks & EnsuredHooks} */ (this.hooks)[name];
@@ -241,18 +241,18 @@ class Resolver {
 		}
 		name = toCamelCase(name);
 		if (/^before/.test(name)) {
-			return /** @type {ResolveStepHook} */ (this.getHook(
-				name[6].toLowerCase() + name.slice(7)
-			).withOptions({
-				stage: -10
-			}));
+			return /** @type {ResolveStepHook} */ (
+				this.getHook(name[6].toLowerCase() + name.slice(7)).withOptions({
+					stage: -10
+				})
+			);
 		}
 		if (/^after/.test(name)) {
-			return /** @type {ResolveStepHook} */ (this.getHook(
-				name[5].toLowerCase() + name.slice(6)
-			).withOptions({
-				stage: 10
-			}));
+			return /** @type {ResolveStepHook} */ (
+				this.getHook(name[5].toLowerCase() + name.slice(6)).withOptions({
+					stage: 10
+				})
+			);
 		}
 		/** @type {ResolveStepHook} */
 		const hook = /** @type {KnownHooks & EnsuredHooks} */ (this.hooks)[name];

diff --git a/lib/util/entrypoints.js b/lib/util/entrypoints.js
@@ -478,7 +478,9 @@ function conditionalMapping(conditionalMapping_, conditionNames) {
 				const innerMapping = mapping[condition];
 				// is nested
 				if (isConditionalMapping(innerMapping)) {
-					const conditionalMapping = /** @type {ConditionalMapping} */ (innerMapping);
+					const conditionalMapping = /** @type {ConditionalMapping} */ (
+						innerMapping
+					);
 					lookup[lookup.length - 1][2] = i + 1;
 					lookup.push([conditionalMapping, Object.keys(conditionalMapping), 0]);
 					continue loop;
@@ -491,7 +493,9 @@ function conditionalMapping(conditionalMapping_, conditionNames) {
 				const innerMapping = mapping[condition];
 				// is nested
 				if (isConditionalMapping(innerMapping)) {
-					const conditionalMapping = /** @type {ConditionalMapping} */ (innerMapping);
+					const conditionalMapping = /** @type {ConditionalMapping} */ (
+						innerMapping
+					);
 					lookup[lookup.length - 1][2] = i + 1;
 					lookup.push([conditionalMapping, Object.keys(conditionalMapping), 0]);
 					continue loop;

diff --git a/lib/util/identifier.js b/lib/util/identifier.js
@@ -5,7 +5,8 @@
 
 "use strict";
 
-const PATH_QUERY_FRAGMENT_REGEXP = /^(#?(?:\0.|[^?#\0])*)(\?(?:\0.|[^#\0])*)?(#.*)?$/;
+const PATH_QUERY_FRAGMENT_REGEXP =
+	/^(#?(?:\0.|[^?#\0])*)(\?(?:\0.|[^#\0])*)?(#.*)?$/;
 
 /**
  * @param {string} identifier identifier

diff --git a/test/alias.test.js b/test/alias.test.js
@@ -44,6 +44,7 @@ describe("alias", () => {
 			},
 			modules: "/",
 			useSyncFileSystemCalls: true,
+			//@ts-ignore
 			fileSystem: fileSystem
 		});
 	});