webpack 5.104.1 → 5.105.0

package/lib/optimize/ConcatenatedModule.js

@@ -72,6 +72,7 @@ const {
 /** @typedef {import("../Module").FileSystemDependencies} FileSystemDependencies */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../Module").CodeGenerationContext} CodeGenerationContext */
+/** @typedef {import("../Module").CodeGenerationResultData} CodeGenerationResultData */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
 /** @typedef {import("../Module").LibIdent} LibIdent */
@@ -90,7 +91,8 @@ const {
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../util/Hash")} Hash */
-/** @typedef {typeof import("../util/Hash")} HashConstructor */
+/** @typedef {import("../util/Hash").HashFunction} HashFunction */
+/** @typedef {import("../util/concatenate").UsedNames} UsedNames */
 /** @typedef {import("../util/concatenate").ScopeInfo} ScopeInfo */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("../util/identifier").AssociatedObjectForCache} AssociatedObjectForCache */
@@ -227,6 +229,7 @@ const compareNumbers = (a, b) => {
 	}
 	return 0;
 };
+
 const bySourceOrder = createComparator("sourceOrder", compareNumbers);
 const byRangeStart = createComparator("rangeStart", compareNumbers);
 
@@ -653,7 +656,9 @@ const getFinalName = (
 	);
 	{
 		const { ids, comment } = binding;
+		/** @type {string} */
 		let reference;
+		/** @type {boolean} */
 		let isPropertyAccess;
 		if ("rawName" in binding) {
 			reference = `${binding.rawName}${comment || ""}${propertyAccess(ids)}`;
@@ -705,7 +710,7 @@ class ConcatenatedModule extends Module {
 	 * @param {RuntimeSpec} runtime the runtime
 	 * @param {Compilation} compilation the compilation
 	 * @param {AssociatedObjectForCache=} associatedObjectForCache object for caching
-	 * @param {string | HashConstructor=} hashFunction hash function to use
+	 * @param {HashFunction=} hashFunction hash function to use
 	 * @returns {ConcatenatedModule} the module
 	 */
 	static create(
@@ -854,6 +859,7 @@ class ConcatenatedModule extends Module {
 		const { moduleArgument, exportsArgument } =
 			/** @type {BuildInfo} */
 			(rootModule.buildInfo);
+		/** @type {BuildInfo} */
 		this.buildInfo = {
 			strict: true,
 			cacheable: true,
@@ -872,8 +878,7 @@ class ConcatenatedModule extends Module {
 		for (const m of this._modules) {
 			// populate cacheable
 			if (!(/** @type {BuildInfo} */ (m.buildInfo).cacheable)) {
-				/** @type {BuildInfo} */
-				(this.buildInfo).cacheable = false;
+				this.buildInfo.cacheable = false;
 			}
 
 			// populate dependencies
@@ -911,7 +916,7 @@ class ConcatenatedModule extends Module {
 			const { assets, assetsInfo, topLevelDeclarations, needCreateRequire } =
 				/** @type {BuildInfo} */ (m.buildInfo);
 
-			const buildInfo = /** @type {BuildInfo} */ (this.buildInfo);
+			const buildInfo = this.buildInfo;
 
 			// populate topLevelDeclarations
 			if (topLevelDeclarations) {
@@ -1209,7 +1214,7 @@ class ConcatenatedModule extends Module {
 	 * @param {Module} rootModule the root module of the concatenation
 	 * @param {Set<Module>} modules all modules in the concatenation (including the root module)
 	 * @param {AssociatedObjectForCache=} associatedObjectForCache object for caching
-	 * @param {string | HashConstructor=} hashFunction hash function to use
+	 * @param {HashFunction=} hashFunction hash function to use
 	 * @returns {string} the identifier
 	 */
 	static _createIdentifier(
@@ -1222,6 +1227,7 @@ class ConcatenatedModule extends Module {
 			/** @type {string} */ (rootModule.context),
 			associatedObjectForCache
 		);
+		/** @type {string[]} */
 		const identifiers = [];
 		for (const module of modules) {
 			identifiers.push(cachedMakePathsRelative(module.identifier()));
@@ -1316,6 +1322,7 @@ class ConcatenatedModule extends Module {
 		const usedNamesInScopeInfo = new Map();
 
 		// Set of already checked scopes
+		/** @type {Set<Scope>} */
 		const ignoredScopes = new Set();
 
 		// get all global names
@@ -1329,14 +1336,17 @@ class ConcatenatedModule extends Module {
 				// The super class expression in class scopes behaves weird
 				// We get ranges of all super class expressions to make
 				// renaming to work correctly
+				/** @typedef {{ range: Range, variables: Variable[] }} ClassInfo */
+				/** @type {WeakMap<Scope, ClassInfo[]>} */
 				const superClassCache = new WeakMap();
 				/**
 				 * @param {Scope} scope scope
-				 * @returns {{ range: Range, variables: Variable[] }[]} result
+				 * @returns {ClassInfo[]} result
 				 */
 				const getSuperClassExpressions = (scope) => {
 					const cacheEntry = superClassCache.get(scope);
 					if (cacheEntry !== undefined) return cacheEntry;
+					/** @type {ClassInfo[]} */
 					const superClassExpressions = [];
 					for (const childScope of scope.childScopes) {
 						if (childScope.type !== "class") continue;
@@ -1462,6 +1472,7 @@ class ConcatenatedModule extends Module {
 					info.module.identifier(),
 					name
 				);
+			/** @type {UsedNames} */
 			const referencesUsedNames = new Set();
 			for (const ref of references) {
 				addScopeSymbols(
@@ -1533,11 +1544,12 @@ class ConcatenatedModule extends Module {
 							topLevelDeclarations.add(name);
 						}
 					}
+					/** @type {string} */
 					let namespaceObjectName;
 					if (info.namespaceExportSymbol) {
-						namespaceObjectName = info.internalNames.get(
-							info.namespaceExportSymbol
-						);
+						namespaceObjectName =
+							/** @type {string} */
+							(info.internalNames.get(info.namespaceExportSymbol));
 					} else {
 						namespaceObjectName = findNewName(
 							"namespaceObject",
@@ -1547,13 +1559,8 @@ class ConcatenatedModule extends Module {
 						);
 						allUsedNames.add(namespaceObjectName);
 					}
-					info.namespaceObjectName =
-						/** @type {string} */
-						(namespaceObjectName);
-					topLevelDeclarations.add(
-						/** @type {string} */
-						(namespaceObjectName)
-					);
+					info.namespaceObjectName = namespaceObjectName;
+					topLevelDeclarations.add(namespaceObjectName);
 					break;
 				}
 				case "external": {
@@ -1636,13 +1643,15 @@ class ConcatenatedModule extends Module {
 			if (info.type === "concatenated") {
 				const globalScope = /** @type {Scope} */ (info.globalScope);
 				// group references by name
+				/** @type {Map<string, Reference[]>} */
 				const referencesByName = new Map();
 				for (const reference of globalScope.through) {
 					const name = reference.identifier.name;
 					if (!referencesByName.has(name)) {
 						referencesByName.set(name, []);
 					}
-					referencesByName.get(name).push(reference);
+					/** @type {Reference[]} */
+					(referencesByName.get(name)).push(reference);
 				}
 				for (const [name, references] of referencesByName) {
 					const match = ConcatenationScope.matchModuleReference(name);
@@ -1775,6 +1784,7 @@ class ConcatenatedModule extends Module {
 
 		// define exports
 		if (exportsMap.size > 0) {
+			/** @type {string[]} */
 			const definitions = [];
 			for (const [key, value] of exportsMap) {
 				definitions.push(
@@ -1826,9 +1836,11 @@ class ConcatenatedModule extends Module {
 		}
 
 		// generate namespace objects
+		/** @type {Map<ConcatenatedModuleInfo, string>} */
 		const namespaceObjectSources = new Map();
 		for (const info of neededNamespaceObjects) {
 			if (info.namespaceExportSymbol) continue;
+			/** @type {string[]} */
 			const nsObj = [];
 			const exportsInfo = moduleGraph.getExportsInfo(info.module);
 			for (const exportInfo of exportsInfo.orderedExports) {
@@ -1924,6 +1936,7 @@ ${defineGetters}`
 
 		// evaluate modules in order
 		for (const rawInfo of modulesWithInfo) {
+			/** @type {undefined | string} */
 			let name;
 			let isConditional = false;
 			const info = rawInfo.type === "reference" ? rawInfo.target : rawInfo;
@@ -2012,6 +2025,7 @@ ${defineGetters}`
 			}
 		}
 
+		/** @type {CodeGenerationResultData} */
 		const data = new Map();
 		if (chunkInitFragments.length > 0) {
 			data.set("chunkInitFragments", chunkInitFragments);
@@ -2038,7 +2052,7 @@ ${defineGetters}`
 	 * @param {RuntimeSpec} runtime runtime
 	 * @param {RuntimeSpec[]} runtimes runtimes
 	 * @param {CodeGenerationResults} codeGenerationResults codeGenerationResults
-	 * @param {Set<string>} usedNames used names
+	 * @param {UsedNames} usedNames used names
 	 */
 	_analyseModule(
 		modulesMap,

package/lib/optimize/FlagIncludedChunksPlugin.js

@@ -42,7 +42,16 @@ class FlagIncludedChunksPlugin {
 
 				// precalculate the modulo values for each bit
 				const modulo = 1 / (1 / modulesCount) ** (1 / 31);
-				const modulos = Array.from({ length: 31 }, (x, i) => (modulo ** i) | 0);
+				/** @type {number[]} */
+				const modulos = Array.from(
+					{ length: 31 },
+					/**
+					 * @param {number} x x
+					 * @param {number} i i
+					 * @returns {number} result
+					 */
+					(x, i) => (modulo ** i) | 0
+				);
 
 				// iterate all modules to generate bit values
 				let i = 0;
@@ -72,6 +81,7 @@ class FlagIncludedChunksPlugin {
 						(chunkModulesHash.get(chunkA));
 					const chunkAModulesCount = chunkGraph.getNumberOfChunkModules(chunkA);
 					if (chunkAModulesCount === 0) continue;
+					/** @type {undefined | Module} */
 					let bestModule;
 					for (const module of chunkGraph.getChunkModulesIterable(chunkA)) {
 						if (

package/lib/optimize/InnerGraph.js

@@ -35,6 +35,7 @@ class TopLevelSymbol {
 	 * @param {string} name name of the variable
 	 */
 	constructor(name) {
+		/** @type {string} */
 		this.name = name;
 	}
 }
@@ -310,6 +311,7 @@ module.exports.onUsage = (state, onUsageCallback) => {
 			let callbacks = usageCallbackMap.get(currentTopLevelSymbol);
 
 			if (callbacks === undefined) {
+				/** @type {Set<UsageCallback>} */
 				callbacks = new Set();
 				usageCallbackMap.set(currentTopLevelSymbol, callbacks);
 			}
@@ -353,14 +355,14 @@ module.exports.tagTopLevelSymbol = (parser, name) => {
 		return existingTag;
 	}
 
-	const fn = new TopLevelSymbol(name);
+	const symbol = new TopLevelSymbol(name);
 	parser.tagVariable(
 		name,
 		topLevelSymbolTag,
-		fn,
+		symbol,
 		JavascriptParser.VariableInfoFlags.Normal
 	);
-	return fn;
+	return symbol;
 };
 
 module.exports.topLevelSymbolTag = topLevelSymbolTag;

package/lib/optimize/InnerGraphPlugin.js

@@ -120,10 +120,10 @@ class InnerGraphPlugin {
 							statement.type === "FunctionDeclaration"
 						) {
 							const name = statement.id ? statement.id.name : "*default*";
-							const fn =
+							const symbol =
 								/** @type {TopLevelSymbol} */
 								(InnerGraph.tagTopLevelSymbol(parser, name));
-							statementWithTopLevelSymbol.set(statement, fn);
+							statementWithTopLevelSymbol.set(statement, symbol);
 							return true;
 						}
 					});
@@ -140,15 +140,15 @@ class InnerGraphPlugin {
 								)
 							) {
 								const name = statement.id ? statement.id.name : "*default*";
-								const fn = /** @type {TopLevelSymbol} */ (
+								const symbol = /** @type {TopLevelSymbol} */ (
 									InnerGraph.tagTopLevelSymbol(parser, name)
 								);
-								classWithTopLevelSymbol.set(statement, fn);
+								classWithTopLevelSymbol.set(statement, symbol);
 								return true;
 							}
 							if (statement.type === "ExportDefaultDeclaration") {
 								const name = "*default*";
-								const fn =
+								const symbol =
 									/** @type {TopLevelSymbol} */
 									(InnerGraph.tagTopLevelSymbol(parser, name));
 								const decl = statement.declaration;
@@ -165,7 +165,7 @@ class InnerGraphPlugin {
 									classWithTopLevelSymbol.set(
 										/** @type {ClassExpression | ClassDeclaration} */
 										(decl),
-										fn
+										symbol
 									);
 								} else if (
 									parser.isPure(
@@ -175,7 +175,7 @@ class InnerGraphPlugin {
 										(statement.range)[0]
 									)
 								) {
-									statementWithTopLevelSymbol.set(statement, fn);
+									statementWithTopLevelSymbol.set(statement, symbol);
 									if (
 										!decl.type.endsWith("FunctionExpression") &&
 										!decl.type.endsWith("Declaration") &&
@@ -207,20 +207,20 @@ class InnerGraphPlugin {
 									/** @type {Range} */ (decl.id.range)[1]
 								)
 							) {
-								const fn =
+								const symbol =
 									/** @type {TopLevelSymbol} */
 									(InnerGraph.tagTopLevelSymbol(parser, name));
-								classWithTopLevelSymbol.set(decl.init, fn);
+								classWithTopLevelSymbol.set(decl.init, symbol);
 							} else if (
 								parser.isPure(
 									decl.init,
 									/** @type {Range} */ (decl.id.range)[1]
 								)
 							) {
-								const fn =
+								const symbol =
 									/** @type {TopLevelSymbol} */
 									(InnerGraph.tagTopLevelSymbol(parser, name));
-								declWithTopLevelSymbol.set(decl, fn);
+								declWithTopLevelSymbol.set(decl, symbol);
 								if (
 									!decl.init.type.endsWith("FunctionExpression") &&
 									decl.init.type !== "Literal"
@@ -252,9 +252,9 @@ class InnerGraphPlugin {
 						if (parser.scope.topLevelScope === true) {
 							InnerGraph.setTopLevelSymbol(parser.state, undefined);
 
-							const fn = statementWithTopLevelSymbol.get(statement);
-							if (fn) {
-								InnerGraph.setTopLevelSymbol(parser.state, fn);
+							const symbol = statementWithTopLevelSymbol.get(statement);
+							if (symbol) {
+								InnerGraph.setTopLevelSymbol(parser.state, symbol);
 								const purePart = statementPurePart.get(statement);
 								if (purePart) {
 									InnerGraph.onUsage(parser.state, (usedByExports) => {
@@ -285,9 +285,9 @@ class InnerGraphPlugin {
 						(expr, statement) => {
 							if (!InnerGraph.isEnabled(parser.state)) return;
 							if (parser.scope.topLevelScope === true) {
-								const fn = classWithTopLevelSymbol.get(statement);
+								const symbol = classWithTopLevelSymbol.get(statement);
 								if (
-									fn &&
+									symbol &&
 									parser.isPure(
 										expr,
 										statement.id
@@ -295,7 +295,7 @@ class InnerGraphPlugin {
 											: /** @type {Range} */ (statement.range)[0]
 									)
 								) {
-									InnerGraph.setTopLevelSymbol(parser.state, fn);
+									InnerGraph.setTopLevelSymbol(parser.state, symbol);
 									onUsageSuper(expr);
 								}
 							}
@@ -307,8 +307,8 @@ class InnerGraphPlugin {
 						(element, classDefinition) => {
 							if (!InnerGraph.isEnabled(parser.state)) return;
 							if (parser.scope.topLevelScope === true) {
-								const fn = classWithTopLevelSymbol.get(classDefinition);
-								if (fn) {
+								const symbol = classWithTopLevelSymbol.get(classDefinition);
+								if (symbol) {
 									InnerGraph.setTopLevelSymbol(parser.state, undefined);
 								}
 							}
@@ -320,8 +320,8 @@ class InnerGraphPlugin {
 						(expression, element, classDefinition) => {
 							if (!InnerGraph.isEnabled(parser.state)) return;
 							if (parser.scope.topLevelScope === true) {
-								const fn = classWithTopLevelSymbol.get(classDefinition);
-								if (fn) {
+								const symbol = classWithTopLevelSymbol.get(classDefinition);
+								if (symbol) {
 									if (
 										!element.static ||
 										parser.isPure(
@@ -331,7 +331,7 @@ class InnerGraphPlugin {
 												: /** @type {Range} */ (element.range)[0]
 										)
 									) {
-										InnerGraph.setTopLevelSymbol(parser.state, fn);
+										InnerGraph.setTopLevelSymbol(parser.state, symbol);
 										if (element.type !== "MethodDefinition" && element.static) {
 											InnerGraph.onUsage(parser.state, (usedByExports) => {
 												switch (usedByExports) {
@@ -362,10 +362,10 @@ class InnerGraphPlugin {
 
 					parser.hooks.declarator.tap(PLUGIN_NAME, (decl, _statement) => {
 						if (!InnerGraph.isEnabled(parser.state)) return;
-						const fn = declWithTopLevelSymbol.get(decl);
+						const symbol = declWithTopLevelSymbol.get(decl);
 
-						if (fn) {
-							InnerGraph.setTopLevelSymbol(parser.state, fn);
+						if (symbol) {
+							InnerGraph.setTopLevelSymbol(parser.state, symbol);
 							if (pureDeclarators.has(decl)) {
 								if (
 									/** @type {ClassExpression} */

package/lib/optimize/MangleExportsPlugin.js

@@ -17,6 +17,12 @@ const { compareSelect, compareStringsNumeric } = require("../util/comparators");
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../ExportsInfo")} ExportsInfo */
 /** @typedef {import("../ExportsInfo").ExportInfo} ExportInfo */
+/** @typedef {import("../util/concatenate").UsedNames} UsedNames */
+
+/**
+ * @template T
+ * @typedef {import("../util/comparators").Comparator<T>} Comparator
+ */
 
 /**
  * @param {ExportsInfo} exportsInfo exports info
@@ -36,6 +42,7 @@ const canMangle = (exportsInfo) => {
 };
 
 // Sort by name
+/** @type {Comparator<ExportInfo>} */
 const comparator = compareSelect((e) => e.name, compareStringsNumeric);
 /**
  * @param {boolean} deterministic use deterministic names
@@ -45,6 +52,7 @@ const comparator = compareSelect((e) => e.name, compareStringsNumeric);
  */
 const mangleExportsInfo = (deterministic, exportsInfo, isNamespace) => {
 	if (!canMangle(exportsInfo)) return;
+	/** @type {UsedNames} */
 	const usedNames = new Set();
 	/** @type {ExportInfo[]} */
 	const mangleableExports = [];
@@ -69,11 +77,11 @@ const mangleExportsInfo = (deterministic, exportsInfo, isNamespace) => {
 				// Can the export be mangled?
 				exportInfo.canMangle !== true ||
 				// Never rename 1 char exports
-				(name.length === 1 && /^[a-zA-Z0-9_$]/.test(name)) ||
+				(name.length === 1 && /^[a-z0-9_$]/i.test(name)) ||
 				// Don't rename 2 char exports in deterministic mode
 				(deterministic &&
 					name.length === 2 &&
-					/^[a-zA-Z_$][a-zA-Z0-9_$]|^[1-9][0-9]/.test(name)) ||
+					/^[a-z_$][a-z0-9_$]|^[1-9][0-9]/i.test(name)) ||
 				// Don't rename exports that are not provided
 				(avoidMangleNonProvided && exportInfo.provided !== true)
 			) {
@@ -119,7 +127,9 @@ const mangleExportsInfo = (deterministic, exportsInfo, isNamespace) => {
 			usedNames.size
 		);
 	} else {
+		/** @type {ExportInfo[]} */
 		const usedExports = [];
+		/** @type {ExportInfo[]} */
 		const unusedExports = [];
 		for (const exportInfo of mangleableExports) {
 			if (exportInfo.getUsed(undefined) === UsageState.Unused) {
@@ -133,6 +143,7 @@ const mangleExportsInfo = (deterministic, exportsInfo, isNamespace) => {
 		let i = 0;
 		for (const list of [usedExports, unusedExports]) {
 			for (const exportInfo of list) {
+				/** @type {string} */
 				let name;
 				do {
 					name = numberToIdentifier(i++);
@@ -150,6 +161,7 @@ class MangleExportsPlugin {
 	 * @param {boolean} deterministic use deterministic names
 	 */
 	constructor(deterministic) {
+		/** @type {boolean} */
 		this._deterministic = deterministic;
 	}
 

package/lib/optimize/MergeDuplicateChunksPlugin.js

@@ -11,6 +11,7 @@ const { runtimeEqual } = require("../util/runtime");
 
 /** @typedef {import("../../declarations/plugins/optimize/MergeDuplicateChunksPlugin").MergeDuplicateChunksPluginOptions} MergeDuplicateChunksPluginOptions */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../Chunk")} Chunk */
 
 const validate = createSchemaValidation(
 	require("../../schemas/plugins/optimize/MergeDuplicateChunksPlugin.check"),
@@ -48,11 +49,13 @@ class MergeDuplicateChunksPlugin {
 					const { chunkGraph, moduleGraph } = compilation;
 
 					// remember already tested chunks for performance
+					/** @type {Set<Chunk>} */
 					const notDuplicates = new Set();
 
 					// for each chunk
 					for (const chunk of chunks) {
 						// track a Set of all chunk that could be duplicates
+						/** @type {Set<Chunk> | undefined} */
 						let possibleDuplicates;
 						for (const module of chunkGraph.getChunkModulesIterable(chunk)) {
 							if (possibleDuplicates === undefined) {

package/lib/optimize/MinChunkSizePlugin.js

@@ -29,6 +29,7 @@ class MinChunkSizePlugin {
 	 */
 	constructor(options) {
 		validate(options);
+		/** @type {MinChunkSizePluginOptions} */
 		this.options = options;
 	}
 
@@ -53,11 +54,13 @@ class MinChunkSizePlugin {
 						entryChunkMultiplicator: 1
 					};
 
+					/** @type {Map<Chunk, number>} */
 					const chunkSizesMap = new Map();
 					/** @type {[Chunk, Chunk][]} */
 					const combinations = [];
 					/** @type {Chunk[]} */
 					const smallChunks = [];
+					/** @type {Chunk[]} */
 					const visitedChunks = [];
 					for (const a of chunks) {
 						// check if one of the chunks sizes is smaller than the minChunkSize
@@ -83,8 +86,8 @@ class MinChunkSizePlugin {
 					const sortedSizeFilteredExtendedPairCombinations = combinations
 						.map((pair) => {
 							// extend combination pairs with size and integrated size
-							const a = chunkSizesMap.get(pair[0]);
-							const b = chunkSizesMap.get(pair[1]);
+							const a = /** @type {number} */ (chunkSizesMap.get(pair[0]));
+							const b = /** @type {number} */ (chunkSizesMap.get(pair[1]));
 							const ab = chunkGraph.getIntegratedChunksSize(
 								pair[0],
 								pair[1],

package/lib/optimize/ModuleConcatenationPlugin.js

@@ -28,6 +28,8 @@ const ConcatenatedModule = require("./ConcatenatedModule");
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
+/** @typedef {Module | ((requestShortener: RequestShortener) => string)} Problem */
+
 /**
  * @typedef {object} Statistics
  * @property {number} cached
@@ -104,7 +106,7 @@ class ModuleConcatenationPlugin {
 
 			/**
 			 * @param {Module} module the module
-			 * @param {Module | ((requestShortener: RequestShortener) => string)} problem the problem
+			 * @param {Problem} problem the problem
 			 * @returns {(requestShortener: RequestShortener) => string} the reason
 			 */
 			const formatBailoutWarning = (module, problem) => (requestShortener) => {
@@ -143,7 +145,9 @@ class ModuleConcatenationPlugin {
 						"webpack.ModuleConcatenationPlugin"
 					);
 					const { chunkGraph, moduleGraph } = compilation;
+					/** @type {Module[]} */
 					const relevantModules = [];
+					/** @type {Set<Module>} */
 					const possibleInners = new Set();
 					const context = {
 						chunkGraph,
@@ -265,7 +269,9 @@ class ModuleConcatenationPlugin {
 					let statsEmptyConfigurations = 0;
 
 					logger.time("find modules to concatenate");
+					/** @type {ConcatConfiguration[]} */
 					const concatConfigurations = [];
+					/** @type {Set<Module>} */
 					const usedAsInner = new Set();
 					for (const currentRoot of relevantModules) {
 						// when used by another configuration as inner:
@@ -273,6 +279,7 @@ class ModuleConcatenationPlugin {
 						// TODO reconsider that when it's only used in a different runtime
 						if (usedAsInner.has(currentRoot)) continue;
 
+						/** @type {RuntimeSpec} */
 						let chunkRuntime;
 						for (const r of chunkGraph.getModuleRuntimes(currentRoot)) {
 							chunkRuntime = mergeRuntimeOwned(chunkRuntime, r);
@@ -295,6 +302,7 @@ class ModuleConcatenationPlugin {
 						);
 
 						// cache failures to add modules
+						/** @type {Map<Module, Problem>} */
 						const failureCache = new Map();
 
 						// potential optional import candidates
@@ -311,6 +319,7 @@ class ModuleConcatenationPlugin {
 						}
 
 						for (const imp of candidates) {
+							/** @type {Set<Module>} */
 							const impCandidates = new Set();
 							const problem = this._tryToAdd(
 								compilation,
@@ -373,6 +382,7 @@ class ModuleConcatenationPlugin {
 					logger.time("sort concat configurations");
 					concatConfigurations.sort((a, b) => b.modules.size - a.modules.size);
 					logger.timeEnd("sort concat configurations");
+					/** @type {Set<Module>} */
 					const usedModules = new Set();
 
 					logger.time("create concatenated modules");
@@ -515,6 +525,7 @@ class ModuleConcatenationPlugin {
 	 */
 	_getImports(compilation, module, runtime) {
 		const moduleGraph = compilation.moduleGraph;
+		/** @type {Set<Module>} */
 		const set = new Set();
 		for (const dep of module.dependencies) {
 			// Get reference info only for harmony Dependencies
@@ -555,11 +566,11 @@ class ModuleConcatenationPlugin {
 	 * @param {RuntimeSpec} activeRuntime the runtime scope of the root module
 	 * @param {Set<Module>} possibleModules modules that are candidates
 	 * @param {Set<Module>} candidates list of potential candidates (will be added to)
-	 * @param {Map<Module, Module | ((requestShortener: RequestShortener) => string)>} failureCache cache for problematic modules to be more performant
+	 * @param {Map<Module, Problem>} failureCache cache for problematic modules to be more performant
 	 * @param {ChunkGraph} chunkGraph the chunk graph
 	 * @param {boolean} avoidMutateOnFailure avoid mutating the config when adding fails
 	 * @param {Statistics} statistics gathering metrics
-	 * @returns {null | Module | ((requestShortener: RequestShortener) => string)} the problematic module
+	 * @returns {null | Problem} the problematic module
 	 */
 	_tryToAdd(
 		compilation,
@@ -646,6 +657,7 @@ class ModuleConcatenationPlugin {
 				 * @returns {string} problem description
 				 */
 				const problem = (requestShortener) => {
+					/** @type {Set<string>} */
 					const importingExplanations = new Set(
 						activeNonModulesConnections
 							.map((c) => c.explanation)
@@ -674,6 +686,7 @@ class ModuleConcatenationPlugin {
 				if (chunkGraph.getNumberOfModuleChunks(originModule) === 0) continue;
 
 				// We don't care for connections from other runtimes
+				/** @type {RuntimeSpec} */
 				let originRuntime;
 				for (const r of chunkGraph.getModuleRuntimes(originModule)) {
 					originRuntime = mergeRuntimeOwned(originRuntime, r);
@@ -822,6 +835,7 @@ class ModuleConcatenationPlugin {
 			}
 		}
 
+		/** @type {undefined | number} */
 		let backup;
 		if (avoidMutateOnFailure) {
 			backup = config.snapshot();
@@ -864,7 +878,6 @@ class ModuleConcatenationPlugin {
 	}
 }
 
-/** @typedef {Module | ((requestShortener: RequestShortener) => string)} Problem */
 /** @typedef {Map<Module, Problem>} Warnings */
 
 class ConcatConfiguration {
@@ -873,7 +886,9 @@ class ConcatConfiguration {
 	 * @param {RuntimeSpec} runtime the runtime
 	 */
 	constructor(rootModule, runtime) {
+		/** @type {Module} */
 		this.rootModule = rootModule;
+		/** @type {RuntimeSpec} */
 		this.runtime = runtime;
 		/** @type {Set<Module>} */
 		this.modules = new Set();