webpack 5.85.1 → 5.87.0

package/lib/ConstPlugin.js

@@ -15,9 +15,14 @@ const ConstDependency = require("./dependencies/ConstDependency");
 const { evaluateToString } = require("./javascript/JavascriptParserHelpers");
 const { parseResource } = require("./util/identifier");
 
-/** @typedef {import("estree").Expression} ExpressionNode */
-/** @typedef {import("estree").Super} SuperNode */
+/** @typedef {import("estree").Expression} Expression */
+/** @typedef {import("estree").SourceLocation} SourceLocation */
+/** @typedef {import("estree").Statement} Statement */
+/** @typedef {import("estree").Super} Super */
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
+/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("./javascript/JavascriptParser").Range} Range */
 
 const collectDeclaration = (declarations, pattern) => {
 	const stack = [pattern];
@@ -136,6 +141,9 @@ class ConstPlugin {
 					new CachedConstDependency.Template()
 				);
 
+				/**
+				 * @param {JavascriptParser} parser the parser
+				 */
 				const handler = parser => {
 					parser.hooks.statementIf.tap(PLUGIN_NAME, statement => {
 						if (parser.scope.isAsmJs) return;
@@ -143,8 +151,11 @@ class ConstPlugin {
 						const bool = param.asBool();
 						if (typeof bool === "boolean") {
 							if (!param.couldHaveSideEffects()) {
-								const dep = new ConstDependency(`${bool}`, param.range);
-								dep.loc = statement.loc;
+								const dep = new ConstDependency(
+									`${bool}`,
+									/** @type {Range} */ (param.range)
+								);
+								dep.loc = /** @type {SourceLocation} */ (statement.loc);
 								parser.state.module.addPresentationalDependency(dep);
 							} else {
 								parser.walkExpression(statement.test);
@@ -200,9 +211,9 @@ class ConstPlugin {
 								}
 								const dep = new ConstDependency(
 									replacement,
-									branchToRemove.range
+									/** @type {Range} */ (branchToRemove.range)
 								);
-								dep.loc = branchToRemove.loc;
+								dep.loc = /** @type {SourceLocation} */ (branchToRemove.loc);
 								parser.state.module.addPresentationalDependency(dep);
 							}
 							return bool;
@@ -216,8 +227,11 @@ class ConstPlugin {
 							const bool = param.asBool();
 							if (typeof bool === "boolean") {
 								if (!param.couldHaveSideEffects()) {
-									const dep = new ConstDependency(` ${bool}`, param.range);
-									dep.loc = expression.loc;
+									const dep = new ConstDependency(
+										` ${bool}`,
+										/** @type {Range} */ (param.range)
+									);
+									dep.loc = /** @type {SourceLocation} */ (expression.loc);
 									parser.state.module.addPresentationalDependency(dep);
 								} else {
 									parser.walkExpression(expression.test);
@@ -236,8 +250,11 @@ class ConstPlugin {
 								const branchToRemove = bool
 									? expression.alternate
 									: expression.consequent;
-								const dep = new ConstDependency("0", branchToRemove.range);
-								dep.loc = branchToRemove.loc;
+								const dep = new ConstDependency(
+									"0",
+									/** @type {Range} */ (branchToRemove.range)
+								);
+								dep.loc = /** @type {SourceLocation} */ (branchToRemove.loc);
 								parser.state.module.addPresentationalDependency(dep);
 								return bool;
 							}
@@ -313,8 +330,11 @@ class ConstPlugin {
 										//
 										//   returnfalse&&'foo'
 										//
-										const dep = new ConstDependency(` ${bool}`, param.range);
-										dep.loc = expression.loc;
+										const dep = new ConstDependency(
+											` ${bool}`,
+											/** @type {Range} */ (param.range)
+										);
+										dep.loc = /** @type {SourceLocation} */ (expression.loc);
 										parser.state.module.addPresentationalDependency(dep);
 									} else {
 										parser.walkExpression(expression.left);
@@ -322,9 +342,9 @@ class ConstPlugin {
 									if (!keepRight) {
 										const dep = new ConstDependency(
 											"0",
-											expression.right.range
+											/** @type {Range} */ (expression.right.range)
 										);
-										dep.loc = expression.loc;
+										dep.loc = /** @type {SourceLocation} */ (expression.loc);
 										parser.state.module.addPresentationalDependency(dep);
 									}
 									return keepRight;
@@ -363,15 +383,18 @@ class ConstPlugin {
 										//
 										//   returnnull??'foo'
 										//
-										const dep = new ConstDependency(" null", param.range);
-										dep.loc = expression.loc;
+										const dep = new ConstDependency(
+											" null",
+											/** @type {Range} */ (param.range)
+										);
+										dep.loc = /** @type {SourceLocation} */ (expression.loc);
 										parser.state.module.addPresentationalDependency(dep);
 									} else {
 										const dep = new ConstDependency(
 											"0",
-											expression.right.range
+											/** @type {Range} */ (expression.right.range)
 										);
-										dep.loc = expression.loc;
+										dep.loc = /** @type {SourceLocation} */ (expression.loc);
 										parser.state.module.addPresentationalDependency(dep);
 										parser.walkExpression(expression.left);
 									}
@@ -382,9 +405,9 @@ class ConstPlugin {
 						}
 					);
 					parser.hooks.optionalChaining.tap(PLUGIN_NAME, expr => {
-						/** @type {ExpressionNode[]} */
+						/** @type {Expression[]} */
 						const optionalExpressionsStack = [];
-						/** @type {ExpressionNode|SuperNode} */
+						/** @type {Expression | Super} */
 						let next = expr.expression;
 
 						while (
@@ -395,7 +418,7 @@ class ConstPlugin {
 								if (next.optional) {
 									// SuperNode can not be optional
 									optionalExpressionsStack.push(
-										/** @type {ExpressionNode} */ (next.object)
+										/** @type {Expression} */ (next.object)
 									);
 								}
 								next = next.object;
@@ -403,7 +426,7 @@ class ConstPlugin {
 								if (next.optional) {
 									// SuperNode can not be optional
 									optionalExpressionsStack.push(
-										/** @type {ExpressionNode} */ (next.callee)
+										/** @type {Expression} */ (next.callee)
 									);
 								}
 								next = next.callee;
@@ -412,7 +435,9 @@ class ConstPlugin {
 
 						while (optionalExpressionsStack.length) {
 							const expression = optionalExpressionsStack.pop();
-							const evaluated = parser.evaluateExpression(expression);
+							const evaluated = parser.evaluateExpression(
+								/** @type {Expression} */ (expression)
+							);
 
 							if (evaluated.asNullish()) {
 								// ------------------------------------------
@@ -427,8 +452,11 @@ class ConstPlugin {
 								//
 								// ------------------------------------------
 								//
-								const dep = new ConstDependency(" undefined", expr.range);
-								dep.loc = expr.loc;
+								const dep = new ConstDependency(
+									" undefined",
+									/** @type {Range} */ (expr.range)
+								);
+								dep.loc = /** @type {SourceLocation} */ (expr.loc);
 								parser.state.module.addPresentationalDependency(dep);
 								return true;
 							}
@@ -452,10 +480,10 @@ class ConstPlugin {
 								JSON.stringify(
 									cachedParseResource(parser.state.module.resource).query
 								),
-								expr.range,
+								/** @type {Range} */ (expr.range),
 								"__resourceQuery"
 							);
-							dep.loc = expr.loc;
+							dep.loc = /** @type {SourceLocation} */ (expr.loc);
 							parser.state.module.addPresentationalDependency(dep);
 							return true;
 						});
@@ -478,10 +506,10 @@ class ConstPlugin {
 								JSON.stringify(
 									cachedParseResource(parser.state.module.resource).fragment
 								),
-								expr.range,
+								/** @type {Range} */ (expr.range),
 								"__resourceFragment"
 							);
-							dep.loc = expr.loc;
+							dep.loc = /** @type {SourceLocation} */ (expr.loc);
 							parser.state.module.addPresentationalDependency(dep);
 							return true;
 						});

package/lib/ContextModule.js

@@ -64,6 +64,7 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {string=} typePrefix
  * @property {string=} category
  * @property {string[][]=} referencedExports exports referenced from modules (won't be mangled)
+ * @property {string=} layer
  */
 
 /**
@@ -107,8 +108,9 @@ class ContextModule extends Module {
 			const resourceQuery = (options && options.resourceQuery) || parsed.query;
 			const resourceFragment =
 				(options && options.resourceFragment) || parsed.fragment;
+			const layer = options && options.layer;
 
-			super(JAVASCRIPT_MODULE_TYPE_DYNAMIC, resource);
+			super(JAVASCRIPT_MODULE_TYPE_DYNAMIC, resource, layer);
 			/** @type {ContextModuleOptions} */
 			this.options = {
 				...options,
@@ -117,7 +119,7 @@ class ContextModule extends Module {
 				resourceFragment
 			};
 		} else {
-			super(JAVASCRIPT_MODULE_TYPE_DYNAMIC);
+			super(JAVASCRIPT_MODULE_TYPE_DYNAMIC, undefined, options.layer);
 			/** @type {ContextModuleOptions} */
 			this.options = {
 				...options,

package/lib/ContextModuleFactory.js

@@ -95,6 +95,7 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 			{
 				context: context,
 				dependencies: dependencies,
+				layer: data.contextInfo.issuerLayer,
 				resolveOptions,
 				fileDependencies,
 				missingDependencies,

package/lib/DependenciesBlock.js

@@ -32,7 +32,7 @@ class DependenciesBlock {
 		this.dependencies = [];
 		/** @type {AsyncDependenciesBlock[]} */
 		this.blocks = [];
-		/** @type {DependenciesBlock} */
+		/** @type {DependenciesBlock | undefined} */
 		this.parent = undefined;
 	}
 

package/lib/DllModule.js

@@ -15,6 +15,7 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
 /** @typedef {import("./Compilation")} Compilation */
+/** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("./DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("./Module").CodeGenerationContext} CodeGenerationContext */
@@ -37,6 +38,11 @@ const RUNTIME_REQUIREMENTS = new Set([
 ]);
 
 class DllModule extends Module {
+	/**
+	 * @param {string} context context path
+	 * @param {Dependency[]} dependencies dependencies
+	 * @param {string} name name
+	 */
 	constructor(context, dependencies, name) {
 		super(JAVASCRIPT_MODULE_TYPE_DYNAMIC, context);
 

package/lib/EvalSourceMapDevToolPlugin.js

@@ -160,7 +160,8 @@ class EvalSourceMapDevToolPlugin {
 						}
 						sourceMap.sourceRoot = options.sourceRoot || "";
 						const moduleId = chunkGraph.getModuleId(m);
-						sourceMap.file = `${moduleId}.js`;
+						sourceMap.file =
+							typeof moduleId === "number" ? `${moduleId}.js` : moduleId;
 
 						const footer =
 							this.sourceMapComment.replace(

package/lib/ExternalModule.js

@@ -104,9 +104,13 @@ const getSourceForCommonJsExternal = moduleAndSpecifiers => {
 
 /**
  * @param {string|string[]} moduleAndSpecifiers the module request
+ * @param {string} importMetaName import.meta name
  * @returns {SourceData} the generated source
  */
-const getSourceForCommonJsExternalInNodeModule = moduleAndSpecifiers => {
+const getSourceForCommonJsExternalInNodeModule = (
+	moduleAndSpecifiers,
+	importMetaName
+) => {
 	const chunkInitFragments = [
 		new InitFragment(
 			'import { createRequire as __WEBPACK_EXTERNAL_createRequire } from "module";\n',
@@ -117,18 +121,18 @@ const getSourceForCommonJsExternalInNodeModule = moduleAndSpecifiers => {
 	];
 	if (!Array.isArray(moduleAndSpecifiers)) {
 		return {
-			expression: `__WEBPACK_EXTERNAL_createRequire(import.meta.url)(${JSON.stringify(
+			chunkInitFragments,
+			expression: `__WEBPACK_EXTERNAL_createRequire(${importMetaName}.url)(${JSON.stringify(
 				moduleAndSpecifiers
-			)})`,
-			chunkInitFragments
+			)})`
 		};
 	}
 	const moduleName = moduleAndSpecifiers[0];
 	return {
-		expression: `__WEBPACK_EXTERNAL_createRequire(import.meta.url)(${JSON.stringify(
+		chunkInitFragments,
+		expression: `__WEBPACK_EXTERNAL_createRequire(${importMetaName}.url)(${JSON.stringify(
 			moduleName
-		)})${propertyAccess(moduleAndSpecifiers, 1)}`,
-		chunkInitFragments
+		)})${propertyAccess(moduleAndSpecifiers, 1)}`
 	};
 };
 
@@ -557,7 +561,10 @@ class ExternalModule extends Module {
 				return getSourceForCommonJsExternal(request);
 			case "node-commonjs":
 				return this.buildInfo.module
-					? getSourceForCommonJsExternalInNodeModule(request)
+					? getSourceForCommonJsExternalInNodeModule(
+							request,
+							runtimeTemplate.outputOptions.importMetaName
+					  )
 					: getSourceForCommonJsExternal(request);
 			case "amd":
 			case "amd-require":

package/lib/FlagEntryExportAsUsedPlugin.js

@@ -12,6 +12,10 @@ const { getEntryRuntime } = require("./util/runtime");
 const PLUGIN_NAME = "FlagEntryExportAsUsedPlugin";
 
 class FlagEntryExportAsUsedPlugin {
+	/**
+	 * @param {boolean} nsObjectUsed true, if the ns object is used
+	 * @param {string} explanation explanation for the reason
+	 */
 	constructor(nsObjectUsed, explanation) {
 		this.nsObjectUsed = nsObjectUsed;
 		this.explanation = explanation;

package/lib/Module.js

@@ -107,6 +107,7 @@ const makeSerializable = require("./util/makeSerializable");
  */
 
 /** @typedef {KnownBuildMeta & Record<string, any>} BuildMeta */
+/** @typedef {Record<string, any>} BuildInfo */
 
 const EMPTY_RESOLVE_OPTIONS = {};
 
@@ -116,6 +117,11 @@ const DEFAULT_TYPES_UNKNOWN = new Set(["unknown"]);
 const DEFAULT_TYPES_JS = new Set(["javascript"]);
 
 const deprecatedNeedRebuild = util.deprecate(
+	/**
+	 * @param {Module} module the module
+	 * @param {NeedBuildContext} context context info
+	 * @returns {boolean} true, when rebuild is needed
+	 */
 	(module, context) => {
 		return module.needRebuild(
 			context.fileSystemInfo.getDeprecatedFileTimestamps(),
@@ -169,7 +175,7 @@ class Module extends DependenciesBlock {
 		this._errors = undefined;
 		/** @type {BuildMeta | undefined} */
 		this.buildMeta = undefined;
-		/** @type {Record<string, any> | undefined} */
+		/** @type {BuildInfo | undefined} */
 		this.buildInfo = undefined;
 		/** @type {Dependency[] | undefined} */
 		this.presentationalDependencies = undefined;

package/lib/ModuleDependencyError.js

@@ -23,7 +23,7 @@ class ModuleDependencyError extends WebpackError {
 		this.name = "ModuleDependencyError";
 		this.details =
 			err && !(/** @type {any} */ (err).hideStack)
-				? err.stack.split("\n").slice(1).join("\n")
+				? /** @type {string} */ (err.stack).split("\n").slice(1).join("\n")
 				: undefined;
 		this.module = module;
 		this.loc = loc;
@@ -32,7 +32,9 @@ class ModuleDependencyError extends WebpackError {
 
 		if (err && /** @type {any} */ (err).hideStack) {
 			this.stack =
-				err.stack.split("\n").slice(1).join("\n") + "\n\n" + this.stack;
+				/** @type {string} */ (err.stack).split("\n").slice(1).join("\n") +
+				"\n\n" +
+				this.stack;
 		}
 	}
 }

package/lib/ModuleDependencyWarning.js

@@ -23,7 +23,7 @@ class ModuleDependencyWarning extends WebpackError {
 		this.name = "ModuleDependencyWarning";
 		this.details =
 			err && !(/** @type {any} */ (err).hideStack)
-				? err.stack.split("\n").slice(1).join("\n")
+				? /** @type {string} */ (err.stack).split("\n").slice(1).join("\n")
 				: undefined;
 		this.module = module;
 		this.loc = loc;
@@ -32,7 +32,9 @@ class ModuleDependencyWarning extends WebpackError {
 
 		if (err && /** @type {any} */ (err).hideStack) {
 			this.stack =
-				err.stack.split("\n").slice(1).join("\n") + "\n\n" + this.stack;
+				/** @type {string} */ (err.stack).split("\n").slice(1).join("\n") +
+				"\n\n" +
+				this.stack;
 		}
 	}
 }

package/lib/ModuleGraph.js

@@ -35,14 +35,15 @@ const getConnectionsByOriginModule = set => {
 	const map = new Map();
 	/** @type {Module | 0} */
 	let lastModule = 0;
-	/** @type {ModuleGraphConnection[]} */
+	/** @type {ModuleGraphConnection[] | undefined} */
 	let lastList = undefined;
 	for (const connection of set) {
 		const { originModule } = connection;
 		if (lastModule === originModule) {
-			lastList.push(connection);
+			/** @type {ModuleGraphConnection[]} */
+			(lastList).push(connection);
 		} else {
-			lastModule = originModule;
+			lastModule = /** @type {Module} */ (originModule);
 			const list = map.get(originModule);
 			if (list !== undefined) {
 				lastList = list;
@@ -65,12 +66,13 @@ const getConnectionsByModule = set => {
 	const map = new Map();
 	/** @type {Module | 0} */
 	let lastModule = 0;
-	/** @type {ModuleGraphConnection[]} */
+	/** @type {ModuleGraphConnection[] | undefined} */
 	let lastList = undefined;
 	for (const connection of set) {
 		const { module } = connection;
 		if (lastModule === module) {
-			lastList.push(connection);
+			/** @type {ModuleGraphConnection[]} */
+			(lastList).push(connection);
 		} else {
 			lastModule = module;
 			const list = map.get(module);
@@ -99,13 +101,13 @@ class ModuleGraphModule {
 		this.optimizationBailout = [];
 		/** @type {ExportsInfo} */
 		this.exports = new ExportsInfo();
-		/** @type {number} */
+		/** @type {number | null} */
 		this.preOrderIndex = null;
-		/** @type {number} */
+		/** @type {number | null} */
 		this.postOrderIndex = null;
-		/** @type {number} */
+		/** @type {number | null} */
 		this.depth = null;
-		/** @type {ModuleProfile} */
+		/** @type {ModuleProfile | undefined | null} */
 		this.profile = undefined;
 		/** @type {boolean} */
 		this.async = false;
@@ -116,20 +118,20 @@ class ModuleGraphModule {
 
 class ModuleGraph {
 	constructor() {
-		/** @type {WeakMap<Dependency, ModuleGraphConnection>} */
+		/** @type {WeakMap<Dependency, ModuleGraphConnection | null>} */
 		this._dependencyMap = new WeakMap();
 		/** @type {Map<Module, ModuleGraphModule>} */
 		this._moduleMap = new Map();
 		/** @type {WeakMap<any, Object>} */
 		this._metaMap = new WeakMap();
 
-		/** @type {WeakTupleMap<any[], any>} */
+		/** @type {WeakTupleMap<any[], any> | undefined} */
 		this._cache = undefined;
 
 		/** @type {Map<Module, WeakTupleMap<any, any>>} */
 		this._moduleMemCaches = undefined;
 
-		/** @type {string} */
+		/** @type {string | undefined} */
 		this._cacheStage = undefined;
 	}
 
@@ -221,7 +223,9 @@ class ModuleGraph {
 	 * @returns {void}
 	 */
 	updateModule(dependency, module) {
-		const connection = this.getConnection(dependency);
+		const connection =
+			/** @type {ModuleGraphConnection} */
+			(this.getConnection(dependency));
 		if (connection.module === module) return;
 		const newConnection = connection.clone();
 		newConnection.module = module;
@@ -375,7 +379,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Dependency} dependency the dependency to look for a referenced module
-	 * @returns {Module} the referenced module
+	 * @returns {Module | null} the referenced module
 	 */
 	getResolvedModule(dependency) {
 		const connection = this.getConnection(dependency);
@@ -398,7 +402,10 @@ class ModuleGraph {
 				) {
 					let foundConnection;
 					for (const connection of mgm._unassignedConnections) {
-						this._dependencyMap.set(connection.dependency, connection);
+						this._dependencyMap.set(
+							/** @type {Dependency} */ (connection.dependency),
+							connection
+						);
 						if (connection.dependency === dependency)
 							foundConnection = connection;
 					}
@@ -416,7 +423,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Dependency} dependency the dependency to look for a referenced module
-	 * @returns {Module} the referenced module
+	 * @returns {Module | null} the referenced module
 	 */
 	getModule(dependency) {
 		const connection = this.getConnection(dependency);
@@ -425,7 +432,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Dependency} dependency the dependency to look for a referencing module
-	 * @returns {Module} the referencing module
+	 * @returns {Module | null} the referencing module
 	 */
 	getOrigin(dependency) {
 		const connection = this.getConnection(dependency);
@@ -434,7 +441,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Dependency} dependency the dependency to look for a referencing module
-	 * @returns {Module} the original referencing module
+	 * @returns {Module | null} the original referencing module
 	 */
 	getResolvedOrigin(dependency) {
 		const connection = this.getConnection(dependency);
@@ -604,7 +611,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Module} module the module
-	 * @returns {number} the index of the module
+	 * @returns {number | null} the index of the module
 	 */
 	getPreOrderIndex(module) {
 		const mgm = this._getModuleGraphModule(module);
@@ -613,7 +620,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Module} module the module
-	 * @returns {number} the index of the module
+	 * @returns {number | null} the index of the module
 	 */
 	getPostOrderIndex(module) {
 		const mgm = this._getModuleGraphModule(module);
@@ -670,7 +677,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Module} module the module
-	 * @returns {number} the depth of the module
+	 * @returns {number | null} the depth of the module
 	 */
 	getDepth(module) {
 		const mgm = this._getModuleGraphModule(module);
@@ -727,14 +734,14 @@ class ModuleGraph {
 		let meta = this._metaMap.get(thing);
 		if (meta === undefined) {
 			meta = Object.create(null);
-			this._metaMap.set(thing, meta);
+			this._metaMap.set(thing, /** @type {Object} */ (meta));
 		}
-		return meta;
+		return /** @type {Object} */ (meta);
 	}
 
 	/**
 	 * @param {any} thing any thing
-	 * @returns {Object} metadata
+	 * @returns {Object | undefined} metadata
 	 */
 	getMetaIfExisting(thing) {
 		return this._metaMap.get(thing);

package/lib/ModuleGraphConnection.js

@@ -74,9 +74,9 @@ class ModuleGraphConnection {
 		this.weak = weak;
 		this.conditional = !!condition;
 		this._active = condition !== false;
-		/** @type {function(ModuleGraphConnection, RuntimeSpec): ConnectionState} */
+		/** @type {(function(ModuleGraphConnection, RuntimeSpec): ConnectionState) | undefined} */
 		this.condition = condition || undefined;
-		/** @type {Set<string>} */
+		/** @type {Set<string> | undefined} */
 		this.explanations = undefined;
 		if (explanation) {
 			this.explanations = new Set();
@@ -107,7 +107,9 @@ class ModuleGraphConnection {
 	 */
 	addCondition(condition) {
 		if (this.conditional) {
-			const old = this.condition;
+			const old =
+				/** @type {(function(ModuleGraphConnection, RuntimeSpec): ConnectionState)} */
+				(this.condition);
 			this.condition = (c, r) =>
 				intersectConnectionStates(old(c, r), condition(c, r));
 		} else if (this._active) {
@@ -143,7 +145,12 @@ class ModuleGraphConnection {
 	 */
 	isActive(runtime) {
 		if (!this.conditional) return this._active;
-		return this.condition(this, runtime) !== false;
+
+		return (
+			/** @type {(function(ModuleGraphConnection, RuntimeSpec): ConnectionState)} */ (
+				this.condition
+			)(this, runtime) !== false
+		);
 	}
 
 	/**
@@ -152,7 +159,11 @@ class ModuleGraphConnection {
 	 */
 	isTargetActive(runtime) {
 		if (!this.conditional) return this._active;
-		return this.condition(this, runtime) === true;
+		return (
+			/** @type {(function(ModuleGraphConnection, RuntimeSpec): ConnectionState)} */ (
+				this.condition
+			)(this, runtime) === true
+		);
 	}
 
 	/**
@@ -161,7 +172,9 @@ class ModuleGraphConnection {
 	 */
 	getActiveState(runtime) {
 		if (!this.conditional) return this._active;
-		return this.condition(this, runtime);
+		return /** @type {(function(ModuleGraphConnection, RuntimeSpec): ConnectionState)} */ (
+			this.condition
+		)(this, runtime);
 	}
 
 	/**