webpack 5.83.1 → 5.85.0

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -195,7 +195,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					settings.name,
 					expr.range,
 					exportPresenceMode,
-					settings.assertions
+					settings.assertions,
+					[]
 				);
 				dep.referencedPropertiesInDestructuring =
 					parser.destructuringAssignmentPropertiesFor(expr);
@@ -211,7 +212,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			.for(harmonySpecifierTag)
 			.tap(
 				"HarmonyImportDependencyParserPlugin",
-				(expression, members, membersOptionals) => {
+				(expression, members, membersOptionals, memberRangeStarts) => {
 					const settings = /** @type {HarmonySettings} */ (
 						parser.currentTagData
 					);
@@ -219,6 +220,11 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 						members,
 						membersOptionals
 					);
+					const rangeStarts = memberRangeStarts.slice(
+						0,
+						memberRangeStarts.length -
+							(members.length - nonOptionalMembers.length)
+					);
 					const expr =
 						nonOptionalMembers !== members
 							? getNonOptionalMemberChain(
@@ -234,7 +240,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 						settings.name,
 						expr.range,
 						exportPresenceMode,
-						settings.assertions
+						settings.assertions,
+						rangeStarts
 					);
 					dep.referencedPropertiesInDestructuring =
 						parser.destructuringAssignmentPropertiesFor(expr);
@@ -249,7 +256,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			.for(harmonySpecifierTag)
 			.tap(
 				"HarmonyImportDependencyParserPlugin",
-				(expression, members, membersOptionals) => {
+				(expression, members, membersOptionals, memberRangeStarts) => {
 					const { arguments: args, callee } = expression;
 					const settings = /** @type {HarmonySettings} */ (
 						parser.currentTagData
@@ -258,6 +265,11 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 						members,
 						membersOptionals
 					);
+					const rangeStarts = memberRangeStarts.slice(
+						0,
+						memberRangeStarts.length -
+							(members.length - nonOptionalMembers.length)
+					);
 					const expr =
 						nonOptionalMembers !== members
 							? getNonOptionalMemberChain(
@@ -273,7 +285,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 						settings.name,
 						expr.range,
 						exportPresenceMode,
-						settings.assertions
+						settings.assertions,
+						rangeStarts
 					);
 					dep.directImport = members.length === 0;
 					dep.call = true;

package/lib/dependencies/HarmonyImportSideEffectDependency.js

@@ -16,10 +16,16 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
+/** @typedef {import("../javascript/JavascriptParser").Assertions} Assertions */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
+	/**
+	 * @param {TODO} request the request string
+	 * @param {number} sourceOrder source order
+	 * @param {Assertions=} assertions assertions
+	 */
 	constructor(request, sourceOrder, assertions) {
 		super(request, sourceOrder, assertions);
 	}

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -23,6 +23,8 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("../WebpackError")} WebpackError */
+/** @typedef {import("../javascript/JavascriptParser").Assertions} Assertions */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
@@ -33,6 +35,16 @@ const idsSymbol = Symbol("HarmonyImportSpecifierDependency.ids");
 const { ExportPresenceModes } = HarmonyImportDependency;
 
 class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
+	/**
+	 * @param {TODO} request request
+	 * @param {number} sourceOrder source order
+	 * @param {string[]} ids ids
+	 * @param {string} name name
+	 * @param {Range} range range
+	 * @param {TODO} exportPresenceMode export presence mode
+	 * @param {Assertions=} assertions assertions
+	 * @param {number[]=} idRangeStarts range starts for members of ids; the two arrays are right-aligned
+	 */
 	constructor(
 		request,
 		sourceOrder,
@@ -40,12 +52,14 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		name,
 		range,
 		exportPresenceMode,
-		assertions
+		assertions,
+		idRangeStarts // TODO webpack 6 make this non-optional. It must always be set to properly trim ids.
 	) {
 		super(request, sourceOrder, assertions);
 		this.ids = ids;
 		this.name = name;
 		this.range = range;
+		this.idRangeStarts = idRangeStarts;
 		this.exportPresenceMode = exportPresenceMode;
 		this.namespaceObjectAsContext = false;
 		this.call = undefined;
@@ -247,6 +261,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		write(this.ids);
 		write(this.name);
 		write(this.range);
+		write(this.idRangeStarts);
 		write(this.exportPresenceMode);
 		write(this.namespaceObjectAsContext);
 		write(this.call);
@@ -266,6 +281,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		this.ids = read();
 		this.name = read();
 		this.range = read();
+		this.idRangeStarts = read();
 		this.exportPresenceMode = read();
 		this.namespaceObjectAsContext = read();
 		this.call = read();
@@ -299,14 +315,78 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 		// Skip rendering depending when dependency is conditional
 		if (connection && !connection.isTargetActive(runtime)) return;
 
-		const ids = dep.getIds(moduleGraph);
-		const exportExpr = this._getCodeForIds(dep, source, templateContext, ids);
-		const range = dep.range;
+		const ids = dep.getIds(moduleGraph); // determine minimal set of IDs.
+		let trimmedIds = this._trimIdsToThoseImported(ids, moduleGraph, dep);
+
+		let [rangeStart, rangeEnd] = dep.range;
+		if (trimmedIds.length !== ids.length) {
+			// The array returned from dep.idRangeStarts is right-aligned with the array returned from dep.getIds.
+			// Meaning, the two arrays may not always have the same number of elements, but the last element of
+			// dep.idRangeStarts corresponds to [the starting range position of] the last element of dep.getIds.
+			// Use this to find the correct range end position based on the number of ids that were trimmed.
+			const idx =
+				dep.idRangeStarts === undefined
+					? -1 /* trigger failure case below */
+					: dep.idRangeStarts.length + (trimmedIds.length - ids.length);
+			if (idx < 0 || idx >= dep.idRangeStarts.length) {
+				// cspell:ignore minifiers
+				// Should not happen but we can't throw an error here because of backward compatibility with
+				// external plugins in wp5.  Instead, we just disable trimming for now.  This may break some minifiers.
+				trimmedIds = ids;
+				// TODO webpack 6 remove the "trimmedIds = ids" above and uncomment the following line instead.
+				// throw new Error("Missing range starts data for id replacement trimming.");
+			} else {
+				rangeEnd = dep.idRangeStarts[idx];
+			}
+		}
+
+		const exportExpr = this._getCodeForIds(
+			dep,
+			source,
+			templateContext,
+			trimmedIds
+		);
 		if (dep.shorthand) {
-			source.insert(range[1], `: ${exportExpr}`);
+			source.insert(rangeEnd, `: ${exportExpr}`);
 		} else {
-			source.replace(range[0], range[1] - 1, exportExpr);
+			source.replace(rangeStart, rangeEnd - 1, exportExpr);
+		}
+	}
+
+	/**
+	 * @summary Determine which IDs in the id chain are actually referring to namespaces or imports,
+	 * and which are deeper member accessors on the imported object.  Only the former should be re-rendered.
+	 * @param {string[]} ids ids
+	 * @param {ModuleGraph} moduleGraph moduleGraph
+	 * @param {HarmonyImportSpecifierDependency} dependency dependency
+	 * @returns {string[]} generated code
+	 */
+	_trimIdsToThoseImported(ids, moduleGraph, dependency) {
+		let trimmedIds = [];
+		const exportsInfo = moduleGraph.getExportsInfo(
+			moduleGraph.getModule(dependency)
+		);
+		let currentExportsInfo = /** @type {ExportsInfo=} */ exportsInfo;
+		for (let i = 0; i < ids.length; i++) {
+			if (i === 0 && ids[i] === "default") {
+				continue; // ExportInfo for the next level under default is still at the root ExportsInfo, so don't advance currentExportsInfo
+			}
+			const exportInfo = currentExportsInfo.getExportInfo(ids[i]);
+			if (exportInfo.provided === false) {
+				// json imports have nested ExportInfo for elements that things that are not actually exported, so check .provided
+				trimmedIds = ids.slice(0, i);
+				break;
+			}
+			const nestedInfo = exportInfo.getNestedExportsInfo();
+			if (!nestedInfo) {
+				// once all nested exports are traversed, the next item is the actual import so stop there
+				trimmedIds = ids.slice(0, i + 1);
+				break;
+			}
+			currentExportsInfo = nestedInfo;
 		}
+		// Never trim to nothing.  This can happen for invalid imports (e.g. import { notThere } from "./module", or import { anything } from "./missingModule")
+		return trimmedIds.length ? trimmedIds : ids;
 	}
 
 	/**

package/lib/dependencies/HarmonyModulesPlugin.js

@@ -25,11 +25,18 @@ const HarmonyExportDependencyParserPlugin = require("./HarmonyExportDependencyPa
 const HarmonyImportDependencyParserPlugin = require("./HarmonyImportDependencyParserPlugin");
 const HarmonyTopLevelThisParserPlugin = require("./HarmonyTopLevelThisParserPlugin");
 
+/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../javascript/JavascriptParser")} Parser */
 
 const PLUGIN_NAME = "HarmonyModulesPlugin";
 
+/** @typedef {{ topLevelAwait?: boolean }} HarmonyModulesPluginOptions */
+
 class HarmonyModulesPlugin {
+	/**
+	 * @param {HarmonyModulesPluginOptions} options options
+	 */
 	constructor(options) {
 		this.options = options;
 	}
@@ -113,6 +120,11 @@ class HarmonyModulesPlugin {
 					new HarmonyAcceptImportDependency.Template()
 				);
 
+				/**
+				 * @param {Parser} parser parser parser
+				 * @param {JavascriptParserOptions} parserOptions parserOptions
+				 * @returns {void}
+				 */
 				const handler = (parser, parserOptions) => {
 					// TODO webpack 6: rename harmony to esm or module
 					if (parserOptions.harmony !== undefined && !parserOptions.harmony)

package/lib/dependencies/ImportContextDependency.js

@@ -9,10 +9,16 @@ const makeSerializable = require("../util/makeSerializable");
 const ContextDependency = require("./ContextDependency");
 const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTemplateAsRequireCall");
 
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
 class ImportContextDependency extends ContextDependency {
+	/**
+	 * @param {TODO} options options
+	 * @param {Range} range range
+	 * @param {Range} valueRange value range
+	 */
 	constructor(options, range, valueRange) {
 		super(options);
 

package/lib/dependencies/ImportDependency.js

@@ -14,6 +14,7 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @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("../util/runtime").RuntimeSpec} RuntimeSpec */
@@ -21,7 +22,7 @@ const ModuleDependency = require("./ModuleDependency");
 class ImportDependency extends ModuleDependency {
 	/**
 	 * @param {string} request the request
-	 * @param {[number, number]} range expression range
+	 * @param {Range} range expression range
 	 * @param {string[][]=} referencedExports list of referenced exports
 	 */
 	constructor(request, range, referencedExports) {

package/lib/dependencies/ImportEagerDependency.js

@@ -13,11 +13,12 @@ const ImportDependency = require("./ImportDependency");
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
 class ImportEagerDependency extends ImportDependency {
 	/**
 	 * @param {string} request the request
-	 * @param {[number, number]} range expression range
+	 * @param {Range} range expression range
 	 * @param {string[][]=} referencedExports list of referenced exports
 	 */
 	constructor(request, range, referencedExports) {

package/lib/dependencies/ImportMetaContextDependencyParserPlugin.js

@@ -11,13 +11,20 @@ const {
 } = require("../javascript/JavascriptParserHelpers");
 const ImportMetaContextDependency = require("./ImportMetaContextDependency");
 
-/** @typedef {import("estree").Expression} ExpressionNode */
-/** @typedef {import("estree").ObjectExpression} ObjectExpressionNode */
+/** @typedef {import("estree").Expression} Expression */
+/** @typedef {import("estree").ObjectExpression} ObjectExpression */
+/** @typedef {import("estree").Property} Property */
+/** @typedef {import("estree").SourceLocation} SourceLocation */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../ContextModule").ContextModuleOptions} ContextModuleOptions */
 /** @typedef {import("../ChunkGroup").RawChunkGroupOptions} RawChunkGroupOptions */
 /** @typedef {Pick<ContextModuleOptions, 'mode'|'recursive'|'regExp'|'include'|'exclude'|'chunkName'>&{groupOptions: RawChunkGroupOptions, exports?: ContextModuleOptions["referencedExports"]}} ImportMetaContextOptions */
 
+/**
+ * @param {TODO} prop property
+ * @param {string} expect except message
+ * @returns {WebpackError} error
+ */
 function createPropertyParseError(prop, expect) {
 	return createError(
 		`Parsing import.meta.webpackContext options failed. Unknown value for property ${JSON.stringify(
@@ -27,6 +34,11 @@ function createPropertyParseError(prop, expect) {
 	);
 }
 
+/**
+ * @param {string} msg message
+ * @param {SourceLocation} loc location
+ * @returns {WebpackError} error
+ */
 function createError(msg, loc) {
 	const error = new WebpackError(msg);
 	error.name = "ImportMetaContextError";
@@ -35,6 +47,10 @@ function createError(msg, loc) {
 }
 
 module.exports = class ImportMetaContextDependencyParserPlugin {
+	/**
+	 * @param {JavascriptParser} parser the parser
+	 * @returns {void}
+	 */
 	apply(parser) {
 		parser.hooks.evaluateIdentifier
 			.for("import.meta.webpackContext")
@@ -52,7 +68,9 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 				if (expr.arguments.length < 1 || expr.arguments.length > 2) return;
 				const [directoryNode, optionsNode] = expr.arguments;
 				if (optionsNode && optionsNode.type !== "ObjectExpression") return;
-				const requestExpr = parser.evaluateExpression(directoryNode);
+				const requestExpr = parser.evaluateExpression(
+					/** @type {Expression} */ (directoryNode)
+				);
 				if (!requestExpr.isString()) return;
 				const request = requestExpr.string;
 				const errors = [];
@@ -71,7 +89,8 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 				/** @type {ContextModuleOptions["referencedExports"]} */
 				let exports;
 				if (optionsNode) {
-					for (const prop of optionsNode.properties) {
+					for (const prop of /** @type {ObjectExpression} */ (optionsNode)
+						.properties) {
 						if (prop.type !== "Property" || prop.key.type !== "Identifier") {
 							errors.push(
 								createError(
@@ -84,7 +103,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 						switch (prop.key.name) {
 							case "regExp": {
 								const regExpExpr = parser.evaluateExpression(
-									/** @type {ExpressionNode} */ (prop.value)
+									/** @type {Expression} */ (prop.value)
 								);
 								if (!regExpExpr.isRegExp()) {
 									errors.push(createPropertyParseError(prop, "RegExp"));
@@ -95,7 +114,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 							}
 							case "include": {
 								const regExpExpr = parser.evaluateExpression(
-									/** @type {ExpressionNode} */ (prop.value)
+									/** @type {Expression} */ (prop.value)
 								);
 								if (!regExpExpr.isRegExp()) {
 									errors.push(createPropertyParseError(prop, "RegExp"));
@@ -106,7 +125,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 							}
 							case "exclude": {
 								const regExpExpr = parser.evaluateExpression(
-									/** @type {ExpressionNode} */ (prop.value)
+									/** @type {Expression} */ (prop.value)
 								);
 								if (!regExpExpr.isRegExp()) {
 									errors.push(createPropertyParseError(prop, "RegExp"));
@@ -117,7 +136,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 							}
 							case "mode": {
 								const modeExpr = parser.evaluateExpression(
-									/** @type {ExpressionNode} */ (prop.value)
+									/** @type {Expression} */ (prop.value)
 								);
 								if (!modeExpr.isString()) {
 									errors.push(createPropertyParseError(prop, "string"));
@@ -130,7 +149,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 							}
 							case "chunkName": {
 								const expr = parser.evaluateExpression(
-									/** @type {ExpressionNode} */ (prop.value)
+									/** @type {Expression} */ (prop.value)
 								);
 								if (!expr.isString()) {
 									errors.push(createPropertyParseError(prop, "string"));
@@ -141,7 +160,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 							}
 							case "exports": {
 								const expr = parser.evaluateExpression(
-									/** @type {ExpressionNode} */ (prop.value)
+									/** @type {Expression} */ (prop.value)
 								);
 								if (expr.isString()) {
 									exports = [[expr.string]];
@@ -176,7 +195,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 							}
 							case "prefetch": {
 								const expr = parser.evaluateExpression(
-									/** @type {ExpressionNode} */ (prop.value)
+									/** @type {Expression} */ (prop.value)
 								);
 								if (expr.isBoolean()) {
 									groupOptions.prefetchOrder = 0;
@@ -189,7 +208,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 							}
 							case "preload": {
 								const expr = parser.evaluateExpression(
-									/** @type {ExpressionNode} */ (prop.value)
+									/** @type {Expression} */ (prop.value)
 								);
 								if (expr.isBoolean()) {
 									groupOptions.preloadOrder = 0;
@@ -202,7 +221,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 							}
 							case "recursive": {
 								const recursiveExpr = parser.evaluateExpression(
-									/** @type {ExpressionNode} */ (prop.value)
+									/** @type {Expression} */ (prop.value)
 								);
 								if (!recursiveExpr.isBoolean()) {
 									errors.push(createPropertyParseError(prop, "boolean"));

package/lib/dependencies/ImportMetaContextPlugin.js

@@ -13,8 +13,10 @@ const ContextElementDependency = require("./ContextElementDependency");
 const ImportMetaContextDependency = require("./ImportMetaContextDependency");
 const ImportMetaContextDependencyParserPlugin = require("./ImportMetaContextDependencyParserPlugin");
 
+/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../javascript/JavascriptParser")} Parser */
 
 const PLUGIN_NAME = "ImportMetaContextPlugin";
 
@@ -41,6 +43,11 @@ class ImportMetaContextPlugin {
 					normalModuleFactory
 				);
 
+				/**
+				 * @param {Parser} parser parser parser
+				 * @param {JavascriptParserOptions} parserOptions parserOptions
+				 * @returns {void}
+				 */
 				const handler = (parser, parserOptions) => {
 					if (
 						parserOptions.importMetaContext !== undefined &&

package/lib/dependencies/ImportMetaHotAcceptDependency.js

@@ -9,7 +9,13 @@ const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 const ModuleDependencyTemplateAsId = require("./ModuleDependencyTemplateAsId");
 
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+
 class ImportMetaHotAcceptDependency extends ModuleDependency {
+	/**
+	 * @param {string} request the request string
+	 * @param {Range} range location in source code
+	 */
 	constructor(request, range) {
 		super(request);
 		this.range = range;

package/lib/dependencies/ImportMetaHotDeclineDependency.js

@@ -9,7 +9,13 @@ const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 const ModuleDependencyTemplateAsId = require("./ModuleDependencyTemplateAsId");
 
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+
 class ImportMetaHotDeclineDependency extends ModuleDependency {
+	/**
+	 * @param {string} request the request string
+	 * @param {Range} range location in source code
+	 */
 	constructor(request, range) {
 		super(request);
 

package/lib/dependencies/ImportParserPlugin.js

@@ -17,6 +17,7 @@ const ImportWeakDependency = require("./ImportWeakDependency");
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../ChunkGroup").RawChunkGroupOptions} RawChunkGroupOptions */
 /** @typedef {import("../ContextModule").ContextMode} ContextMode */
+/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 
 class ImportParserPlugin {
 	/**
@@ -26,6 +27,10 @@ class ImportParserPlugin {
 		this.options = options;
 	}
 
+	/**
+	 * @param {JavascriptParser} parser the parser
+	 * @returns {void}
+	 */
 	apply(parser) {
 		const exportsFromEnumerable = enumerable =>
 			Array.from(enumerable, e => [e]);

package/lib/dependencies/ImportPlugin.js

@@ -16,7 +16,9 @@ const ImportEagerDependency = require("./ImportEagerDependency");
 const ImportParserPlugin = require("./ImportParserPlugin");
 const ImportWeakDependency = require("./ImportWeakDependency");
 
+/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../javascript/JavascriptParser")} Parser */
 
 const PLUGIN_NAME = "ImportPlugin";
 
@@ -66,6 +68,11 @@ class ImportPlugin {
 					new ImportContextDependency.Template()
 				);
 
+				/**
+				 * @param {Parser} parser parser parser
+				 * @param {JavascriptParserOptions} parserOptions parserOptions
+				 * @returns {void}
+				 */
 				const handler = (parser, parserOptions) => {
 					if (parserOptions.import !== undefined && !parserOptions.import)
 						return;

package/lib/dependencies/ImportWeakDependency.js

@@ -13,11 +13,12 @@ const ImportDependency = require("./ImportDependency");
 /** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
 class ImportWeakDependency extends ImportDependency {
 	/**
 	 * @param {string} request the request
-	 * @param {[number, number]} range expression range
+	 * @param {Range} range expression range
 	 * @param {string[][]=} referencedExports list of referenced exports
 	 */
 	constructor(request, range, referencedExports) {

package/lib/dependencies/LocalModule.js

@@ -7,7 +7,14 @@
 
 const makeSerializable = require("../util/makeSerializable");
 
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+
 class LocalModule {
+	/**
+	 * @param {string} name name
+	 * @param {number} idx index
+	 */
 	constructor(name, idx) {
 		this.name = name;
 		this.idx = idx;
@@ -18,10 +25,16 @@ class LocalModule {
 		this.used = true;
 	}
 
+	/**
+	 * @returns {string} variable name
+	 */
 	variableName() {
 		return "__WEBPACK_LOCAL_MODULE_" + this.idx + "__";
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 
@@ -30,6 +43,9 @@ class LocalModule {
 		write(this.used);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize(context) {
 		const { read } = context;
 

package/lib/dependencies/LocalModuleDependency.js

@@ -11,10 +11,17 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("./LocalModule")} LocalModule */
 
 class LocalModuleDependency extends NullDependency {
+	/**
+	 * @param {LocalModule} localModule local module
+	 * @param {Range} range range
+	 * @param {boolean} callNew true, when the local module should be called with new
+	 */
 	constructor(localModule, range, callNew) {
 		super();
 

package/lib/dependencies/LocalModulesHelpers.js

@@ -7,6 +7,13 @@
 
 const LocalModule = require("./LocalModule");
 
+/** @typedef {import("../javascript/JavascriptParser").ParserState} ParserState */
+
+/**
+ * @param {string} parent parent module
+ * @param {string} mod module to resolve
+ * @returns {string} resolved module
+ */
 const lookup = (parent, mod) => {
 	if (mod.charAt(0) !== ".") return mod;
 
@@ -26,6 +33,11 @@ const lookup = (parent, mod) => {
 	return path.join("/");
 };
 
+/**
+ * @param {ParserState} state parser state
+ * @param {string} name name
+ * @returns {LocalModule} local module
+ */
 exports.addLocalModule = (state, name) => {
 	if (!state.localModules) {
 		state.localModules = [];
@@ -35,6 +47,12 @@ exports.addLocalModule = (state, name) => {
 	return m;
 };
 
+/**
+ * @param {ParserState} state parser state
+ * @param {string} name name
+ * @param {string} [namedModule] named module
+ * @returns {LocalModule | null} local module or null
+ */
 exports.getLocalModule = (state, name, namedModule) => {
 	if (!state.localModules) return null;
 	if (namedModule) {