webpack 5.59.0 → 5.94.0

package/lib/ModuleGraph.js

@@ -35,14 +35,15 @@ const getConnectionsByOriginModule = set => {
 	const map = new Map();
 	/** @type {Module | 0} */
 	let lastModule = 0;
-	/** @type {ModuleGraphConnection[]} */
-	let lastList = undefined;
+	/** @type {ModuleGraphConnection[] | undefined} */
+	let lastList;
 	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[]} */
-	let lastList = undefined;
+	/** @type {ModuleGraphConnection[] | undefined} */
+	let lastList;
 	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);
@@ -87,47 +89,69 @@ const getConnectionsByModule = set => {
 	return map;
 };
 
+/** @typedef {SortableSet<ModuleGraphConnection>} IncomingConnections */
+/** @typedef {SortableSet<ModuleGraphConnection>} OutgoingConnections */
+
 class ModuleGraphModule {
 	constructor() {
-		/** @type {SortableSet<ModuleGraphConnection>} */
+		/** @type {IncomingConnections} */
 		this.incomingConnections = new SortableSet();
-		/** @type {SortableSet<ModuleGraphConnection> | undefined} */
+		/** @type {OutgoingConnections | undefined} */
 		this.outgoingConnections = undefined;
-		/** @type {Module | null} */
+		/** @type {Module | null | undefined} */
 		this.issuer = undefined;
 		/** @type {(string | OptimizationBailoutFunction)[]} */
 		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} */
 		this.profile = undefined;
 		/** @type {boolean} */
 		this.async = false;
-		/** @type {ModuleGraphConnection[]} */
+		/** @type {ModuleGraphConnection[] | undefined} */
 		this._unassignedConnections = undefined;
 	}
 }
 
 class ModuleGraph {
 	constructor() {
-		/** @type {WeakMap<Dependency, ModuleGraphConnection>} */
+		/**
+		 * @type {WeakMap<Dependency, ModuleGraphConnection | null>}
+		 * @private
+		 */
 		this._dependencyMap = new WeakMap();
-		/** @type {Map<Module, ModuleGraphModule>} */
+		/**
+		 * @type {Map<Module, ModuleGraphModule>}
+		 * @private
+		 */
 		this._moduleMap = new Map();
-		/** @type {WeakMap<any, Object>} */
+		/**
+		 * @type {WeakMap<any, object>}
+		 * @private
+		 */
 		this._metaMap = new WeakMap();
-
-		/** @type {WeakTupleMap<any[], any>} */
+		/**
+		 * @type {WeakTupleMap<any[], any> | undefined}
+		 * @private
+		 */
 		this._cache = undefined;
-
-		/** @type {Map<Module, WeakTupleMap<any, any>>} */
+		/**
+		 * @type {Map<Module, WeakTupleMap<any, any>> | undefined}
+		 * @private
+		 */
 		this._moduleMemCaches = undefined;
+
+		/**
+		 * @type {string | undefined}
+		 * @private
+		 */
+		this._cacheStage = undefined;
 	}
 
 	/**
@@ -158,7 +182,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Dependency} dependency the dependency
-	 * @returns {Module} parent module
+	 * @returns {Module | undefined} parent module
 	 */
 	getParentModule(dependency) {
 		return dependency._parentModule;
@@ -166,7 +190,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Dependency} dependency the dependency
-	 * @returns {DependenciesBlock} parent block
+	 * @returns {DependenciesBlock | undefined} parent block
 	 */
 	getParentBlock(dependency) {
 		return dependency._parentDependenciesBlock;
@@ -181,7 +205,7 @@ class ModuleGraph {
 	}
 
 	/**
-	 * @param {Module} originModule the referencing module
+	 * @param {Module | null} originModule the referencing module
 	 * @param {Dependency} dependency the referencing dependency
 	 * @param {Module} module the referenced module
 	 * @returns {void}
@@ -218,14 +242,19 @@ 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;
 		this._dependencyMap.set(dependency, newConnection);
 		connection.setActive(false);
-		const originMgm = this._getModuleGraphModule(connection.originModule);
-		originMgm.outgoingConnections.add(newConnection);
+		const originMgm = this._getModuleGraphModule(
+			/** @type {Module} */ (connection.originModule)
+		);
+		/** @type {OutgoingConnections} */
+		(originMgm.outgoingConnections).add(newConnection);
 		const targetMgm = this._getModuleGraphModule(module);
 		targetMgm.incomingConnections.add(newConnection);
 	}
@@ -235,11 +264,16 @@ class ModuleGraph {
 	 * @returns {void}
 	 */
 	removeConnection(dependency) {
-		const connection = this.getConnection(dependency);
+		const connection =
+			/** @type {ModuleGraphConnection} */
+			(this.getConnection(dependency));
 		const targetMgm = this._getModuleGraphModule(connection.module);
 		targetMgm.incomingConnections.delete(connection);
-		const originMgm = this._getModuleGraphModule(connection.originModule);
-		originMgm.outgoingConnections.delete(connection);
+		const originMgm = this._getModuleGraphModule(
+			/** @type {Module} */ (connection.originModule)
+		);
+		/** @type {OutgoingConnections} */
+		(originMgm.outgoingConnections).delete(connection);
 		this._dependencyMap.set(dependency, null);
 	}
 
@@ -249,7 +283,9 @@ class ModuleGraph {
 	 * @returns {void}
 	 */
 	addExplanation(dependency, explanation) {
-		const connection = this.getConnection(dependency);
+		const connection =
+			/** @type {ModuleGraphConnection} */
+			(this.getConnection(dependency));
 		connection.addExplanation(explanation);
 	}
 
@@ -372,7 +408,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);
@@ -395,7 +431,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;
 					}
@@ -406,14 +445,14 @@ class ModuleGraph {
 				}
 			}
 			this._dependencyMap.set(dependency, null);
-			return undefined;
+			return;
 		}
 		return connection === null ? undefined : connection;
 	}
 
 	/**
 	 * @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);
@@ -422,7 +461,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);
@@ -431,7 +470,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);
@@ -458,7 +497,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Module} module the module
-	 * @returns {readonly Map<Module | undefined, readonly ModuleGraphConnection[]>} reasons why a module is included, in a map by source module
+	 * @returns {readonly Map<Module | undefined | null, readonly ModuleGraphConnection[]>} reasons why a module is included, in a map by source module
 	 */
 	getIncomingConnectionsByOriginModule(module) {
 		const connections = this._getModuleGraphModule(module).incomingConnections;
@@ -478,7 +517,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Module} module the module
-	 * @returns {ModuleProfile | null} the module profile
+	 * @returns {ModuleProfile | undefined} the module profile
 	 */
 	getProfile(module) {
 		const mgm = this._getModuleGraphModule(module);
@@ -487,7 +526,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Module} module the module
-	 * @param {ModuleProfile | null} profile the module profile
+	 * @param {ModuleProfile | undefined} profile the module profile
 	 * @returns {void}
 	 */
 	setProfile(module, profile) {
@@ -497,7 +536,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Module} module the module
-	 * @returns {Module | null} the issuer module
+	 * @returns {Module | null | undefined} the issuer module
 	 */
 	getIssuer(module) {
 		const mgm = this._getModuleGraphModule(module);
@@ -601,7 +640,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);
@@ -610,7 +649,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);
@@ -667,7 +706,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);
@@ -718,20 +757,20 @@ class ModuleGraph {
 
 	/**
 	 * @param {any} thing any thing
-	 * @returns {Object} metadata
+	 * @returns {object} metadata
 	 */
 	getMeta(thing) {
 		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);
@@ -779,7 +818,7 @@ class ModuleGraph {
 		const fn = args.pop();
 		if (this._moduleMemCaches && this._cacheStage) {
 			const memCache = this._moduleMemCaches.get(
-				this.getParentModule(dependency)
+				/** @type {Module} */ (this.getParentModule(dependency))
 			);
 			if (memCache !== undefined) {
 				return memCache.provide(dependency, this._cacheStage, ...args, () =>
@@ -812,12 +851,13 @@ class ModuleGraph {
 				const moduleGraph = moduleGraphForModuleMap.get(module);
 				if (!moduleGraph)
 					throw new Error(
-						deprecateMessage +
-							"There was no ModuleGraph assigned to the Module for backward-compat (Use the new API)"
+						`${
+							deprecateMessage
+						}There was no ModuleGraph assigned to the Module for backward-compat (Use the new API)`
 					);
 				return moduleGraph;
 			},
-			deprecateMessage + ": Use new ModuleGraph API",
+			`${deprecateMessage}: Use new ModuleGraph API`,
 			deprecationCode
 		);
 		deprecateMap.set(deprecateMessage, newFn);

package/lib/ModuleGraphConnection.js

@@ -6,6 +6,7 @@
 "use strict";
 
 /** @typedef {import("./Dependency")} Dependency */
+/** @typedef {import("./Dependency").GetConditionFn} GetConditionFn */
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
 
@@ -56,7 +57,7 @@ class ModuleGraphConnection {
 	 * @param {Module} module the referenced module
 	 * @param {string=} explanation some extra detail
 	 * @param {boolean=} weak the reference is weak
-	 * @param {false | function(ModuleGraphConnection, RuntimeSpec): ConnectionState=} condition condition for the connection
+	 * @param {false | null | GetConditionFn | undefined} condition condition for the connection
 	 */
 	constructor(
 		originModule,
@@ -72,11 +73,11 @@ class ModuleGraphConnection {
 		this.resolvedModule = module;
 		this.module = module;
 		this.weak = weak;
-		this.conditional = !!condition;
+		this.conditional = Boolean(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 +108,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) {
@@ -132,18 +135,18 @@ class ModuleGraphConnection {
 		return Array.from(this.explanations).join(" ");
 	}
 
-	// TODO webpack 5 remove
-	get active() {
-		throw new Error("Use getActiveState instead");
-	}
-
 	/**
 	 * @param {RuntimeSpec} runtime the runtime
 	 * @returns {boolean} true, if the connection is active
 	 */
 	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 +155,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 +168,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);
 	}
 
 	/**
@@ -173,6 +182,11 @@ class ModuleGraphConnection {
 		this._active = value;
 	}
 
+	// TODO webpack 5 remove
+	get active() {
+		throw new Error("Use getActiveState instead");
+	}
+
 	set active(value) {
 		throw new Error("Use setActive instead");
 	}

package/lib/ModuleHashingError.js

@@ -0,0 +1,29 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const WebpackError = require("./WebpackError");
+
+/** @typedef {import("./Module")} Module */
+
+class ModuleHashingError extends WebpackError {
+	/**
+	 * Create a new ModuleHashingError
+	 * @param {Module} module related module
+	 * @param {Error} error Original error
+	 */
+	constructor(module, error) {
+		super();
+
+		this.name = "ModuleHashingError";
+		this.error = error;
+		this.message = error.message;
+		this.details = error.stack;
+		this.module = module;
+	}
+}
+
+module.exports = ModuleHashingError;