webpack 5.59.0 → 5.94.0

package/lib/dependencies/CachedConstDependency.js

@@ -18,9 +18,17 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 
 class CachedConstDependency extends NullDependency {
+	/**
+	 * @param {string} expression expression
+	 * @param {Range} range range
+	 * @param {string} identifier identifier
+	 */
 	constructor(expression, range, identifier) {
 		super();
 
@@ -30,6 +38,13 @@ class CachedConstDependency extends NullDependency {
 		this._hashUpdate = undefined;
 	}
 
+	/**
+	 * @returns {string} hash update
+	 */
+	_createHashUpdate() {
+		return `${this.identifier}${this.range}${this.expression}`;
+	}
+
 	/**
 	 * Update the hash
 	 * @param {Hash} hash hash to be updated
@@ -38,10 +53,13 @@ class CachedConstDependency extends NullDependency {
 	 */
 	updateHash(hash, context) {
 		if (this._hashUpdate === undefined)
-			this._hashUpdate = "" + this.identifier + this.range + this.expression;
+			this._hashUpdate = this._createHashUpdate();
 		hash.update(this._hashUpdate);
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 
@@ -52,6 +70,9 @@ class CachedConstDependency extends NullDependency {
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize(context) {
 		const { read } = context;
 

package/lib/dependencies/CommonJsDependencyHelpers.js

@@ -7,8 +7,22 @@
 
 const RuntimeGlobals = require("../RuntimeGlobals");
 
-exports.handleDependencyBase = (depBase, module, runtimeRequirements) => {
-	let base = undefined;
+/** @typedef {import("../Module")} Module */
+/** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
+/** @typedef {"exports" | "module.exports" | "this" | "Object.defineProperty(exports)" | "Object.defineProperty(module.exports)" | "Object.defineProperty(this)"} CommonJSDependencyBaseKeywords */
+
+/**
+ * @param {CommonJSDependencyBaseKeywords} depBase commonjs dependency base
+ * @param {Module} module module
+ * @param {RuntimeRequirements} runtimeRequirements runtime requirements
+ * @returns {[string, string]} type and base
+ */
+module.exports.handleDependencyBase = (
+	depBase,
+	module,
+	runtimeRequirements
+) => {
+	let base;
 	let type;
 	switch (depBase) {
 		case "exports":

package/lib/dependencies/CommonJsExportRequireDependency.js

@@ -20,15 +20,30 @@ const processExportInfo = require("./processExportInfo");
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../ExportsInfo")} ExportsInfo */
+/** @typedef {import("../ExportsInfo").ExportInfo} ExportInfo */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @typedef {import("./CommonJsDependencyHelpers").CommonJSDependencyBaseKeywords} CommonJSDependencyBaseKeywords */
 
 const idsSymbol = Symbol("CommonJsExportRequireDependency.ids");
 
 const EMPTY_OBJECT = {};
 
 class CommonJsExportRequireDependency extends ModuleDependency {
+	/**
+	 * @param {Range} range range
+	 * @param {Range | null} valueRange value range
+	 * @param {CommonJSDependencyBaseKeywords} base base
+	 * @param {string[]} names names
+	 * @param {string} request request
+	 * @param {string[]} ids ids
+	 * @param {boolean} resultUsed true, when the result is used
+	 */
 	constructor(range, valueRange, base, names, request, ids, resultUsed) {
 		super(request);
 		this.range = range;
@@ -56,7 +71,9 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 	 * @returns {string[]} the imported id
 	 */
 	getIds(moduleGraph) {
-		return moduleGraph.getMeta(this)[idsSymbol] || this.ids;
+		return (
+			/** @type {TODO} */ (moduleGraph.getMeta(this))[idsSymbol] || this.ids
+		);
 	}
 
 	/**
@@ -65,7 +82,7 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 	 * @returns {void}
 	 */
 	setIds(moduleGraph, ids) {
-		moduleGraph.getMeta(this)[idsSymbol] = ids;
+		/** @type {TODO} */ (moduleGraph.getMeta(this))[idsSymbol] = ids;
 	}
 
 	/**
@@ -79,21 +96,23 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		const getFullResult = () => {
 			if (ids.length === 0) {
 				return Dependency.EXPORTS_OBJECT_REFERENCED;
-			} else {
-				return [
-					{
-						name: ids,
-						canMangle: false
-					}
-				];
 			}
+			return [
+				{
+					name: ids,
+					canMangle: false
+				}
+			];
 		};
 		if (this.resultUsed) return getFullResult();
+		/** @type {ExportsInfo | undefined} */
 		let exportsInfo = moduleGraph.getExportsInfo(
-			moduleGraph.getParentModule(this)
+			/** @type {Module} */ (moduleGraph.getParentModule(this))
 		);
 		for (const name of this.names) {
-			const exportInfo = exportsInfo.getReadOnlyExportInfo(name);
+			const exportInfo = /** @type {ExportInfo} */ (
+				exportsInfo.getReadOnlyExportInfo(name)
+			);
 			const used = exportInfo.getUsed(runtime);
 			if (used === UsageState.Unused) return Dependency.NO_EXPORTS_REFERENCED;
 			if (used !== UsageState.OnlyPropertiesUsed) return getFullResult();
@@ -126,8 +145,8 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 	 * @returns {ExportsSpec | undefined} export names
 	 */
 	getExports(moduleGraph) {
-		const ids = this.getIds(moduleGraph);
 		if (this.names.length === 1) {
+			const ids = this.getIds(moduleGraph);
 			const name = this.names[0];
 			const from = moduleGraph.getConnection(this);
 			if (!from) return;
@@ -159,55 +178,57 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 				],
 				dependencies: undefined
 			};
-		} else {
-			const from = moduleGraph.getConnection(this);
-			if (!from) return;
-			const reexportInfo = this.getStarReexports(
-				moduleGraph,
-				undefined,
-				from.module
-			);
-			if (reexportInfo) {
-				return {
-					exports: Array.from(reexportInfo.exports, name => {
-						return {
-							name,
-							from,
-							export: ids.concat(name),
-							canMangle: !(name in EMPTY_OBJECT) && false
-						};
-					}),
-					// TODO handle deep reexports
-					dependencies: [from.module]
-				};
-			} else {
-				return {
-					exports: true,
-					from: ids.length === 0 ? from : undefined,
-					canMangle: false,
-					dependencies: [from.module]
-				};
-			}
 		}
+		const from = moduleGraph.getConnection(this);
+		if (!from) return;
+		const reexportInfo = this.getStarReexports(
+			moduleGraph,
+			undefined,
+			from.module
+		);
+		const ids = this.getIds(moduleGraph);
+		if (reexportInfo) {
+			return {
+				exports: Array.from(
+					/** @type {TODO} */ (reexportInfo).exports,
+					name => ({
+						name,
+						from,
+						export: ids.concat(name),
+						canMangle: !(name in EMPTY_OBJECT) && false
+					})
+				),
+				// TODO handle deep reexports
+				dependencies: [from.module]
+			};
+		}
+		return {
+			exports: true,
+			from: ids.length === 0 ? from : undefined,
+			canMangle: false,
+			dependencies: [from.module]
+		};
 	}
 
 	/**
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 * @param {RuntimeSpec} runtime the runtime
 	 * @param {Module} importedModule the imported module (optional)
-	 * @returns {{exports?: Set<string>, checked?: Set<string>}} information
+	 * @returns {{exports?: Set<string>, checked?: Set<string>} | undefined} information
 	 */
 	getStarReexports(
 		moduleGraph,
 		runtime,
-		importedModule = moduleGraph.getModule(this)
+		importedModule = /** @type {Module} */ (moduleGraph.getModule(this))
 	) {
+		/** @type {ExportsInfo | undefined} */
 		let importedExportsInfo = moduleGraph.getExportsInfo(importedModule);
 		const ids = this.getIds(moduleGraph);
 		if (ids.length > 0)
 			importedExportsInfo = importedExportsInfo.getNestedExportsInfo(ids);
+		/** @type {ExportsInfo | undefined} */
 		let exportsInfo = moduleGraph.getExportsInfo(
-			moduleGraph.getParentModule(this)
+			/** @type {Module} */ (moduleGraph.getParentModule(this))
 		);
 		if (this.names.length > 0)
 			exportsInfo = exportsInfo.getNestedExportsInfo(this.names);
@@ -232,7 +253,8 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		const checked = new Set();
 
 		if (noExtraImports) {
-			for (const exportInfo of exportsInfo.orderedExports) {
+			for (const exportInfo of /** @type {ExportsInfo} */ (exportsInfo)
+				.orderedExports) {
 				const name = exportInfo.name;
 				if (exportInfo.getUsed(runtime) === UsageState.Unused) continue;
 				if (name === "__esModule" && isNamespaceImport) {
@@ -250,7 +272,9 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 				}
 			}
 		} else if (noExtraExports) {
-			for (const importedExportInfo of importedExportsInfo.orderedExports) {
+			for (const importedExportInfo of /** @type {ExportsInfo} */ (
+				importedExportsInfo
+			).orderedExports) {
 				const name = importedExportInfo.name;
 				if (importedExportInfo.provided === false) continue;
 				if (exportsInfo) {
@@ -270,6 +294,9 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		return { exports, checked };
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 		write(this.asiSafe);
@@ -282,6 +309,9 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize(context) {
 		const { read } = context;
 		this.asiSafe = read();
@@ -348,7 +378,7 @@ CommonJsExportRequireDependency.Template = class CommonJsExportRequireDependency
 			if (usedImported) {
 				const comment = equals(usedImported, ids)
 					? ""
-					: Template.toNormalComment(propertyAccess(ids)) + " ";
+					: `${Template.toNormalComment(propertyAccess(ids))} `;
 				requireExpr += `${comment}${propertyAccess(usedImported)}`;
 			}
 		}

package/lib/dependencies/CommonJsExportsDependency.js

@@ -16,10 +16,20 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("./CommonJsDependencyHelpers").CommonJSDependencyBaseKeywords} CommonJSDependencyBaseKeywords */
 
 const EMPTY_OBJECT = {};
 
 class CommonJsExportsDependency extends NullDependency {
+	/**
+	 * @param {Range} range range
+	 * @param {Range | null} valueRange value range
+	 * @param {CommonJSDependencyBaseKeywords} base base
+	 * @param {string[]} names names
+	 */
 	constructor(range, valueRange, base, names) {
 		super();
 		this.range = range;
@@ -53,6 +63,9 @@ class CommonJsExportsDependency extends NullDependency {
 		};
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 		write(this.range);
@@ -62,6 +75,9 @@ class CommonJsExportsDependency extends NullDependency {
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize(context) {
 		const { read } = context;
 		this.range = read();
@@ -138,21 +154,28 @@ CommonJsExportsDependency.Template = class CommonJsExportsDependencyTemplate ext
 					);
 					source.replace(
 						dep.range[0],
-						dep.valueRange[0] - 1,
+						/** @type {Range} */ (dep.valueRange)[0] - 1,
 						"__webpack_unused_export__ = ("
 					);
-					source.replace(dep.valueRange[1], dep.range[1] - 1, ")");
+					source.replace(
+						/** @type {Range} */ (dep.valueRange)[1],
+						dep.range[1] - 1,
+						")"
+					);
 					return;
 				}
 				source.replace(
 					dep.range[0],
-					dep.valueRange[0] - 1,
+					/** @type {Range} */ (dep.valueRange)[0] - 1,
 					`Object.defineProperty(${base}${propertyAccess(
 						used.slice(0, -1)
 					)}, ${JSON.stringify(used[used.length - 1])}, (`
 				);
-				source.replace(dep.valueRange[1], dep.range[1] - 1, "))");
-				return;
+				source.replace(
+					/** @type {Range} */ (dep.valueRange)[1],
+					dep.range[1] - 1,
+					"))"
+				);
 		}
 	}
 };