webpack 5.98.0 → 5.99.0

package/lib/dependencies/CssIcssImportDependency.js

@@ -14,6 +14,7 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
 /** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
@@ -74,7 +75,9 @@ CssIcssImportDependency.Template = class CssIcssImportDependencyTemplate extends
 	apply(dependency, source, templateContext) {
 		const dep = /** @type {CssIcssImportDependency} */ (dependency);
 		const { range } = dep;
-		const module = templateContext.moduleGraph.getModule(dep);
+		const module =
+			/** @type {Module} */
+			(templateContext.moduleGraph.getModule(dep));
 		let value;
 
 		for (const item of module.dependencies) {

package/lib/dependencies/CssLocalIdentifierDependency.js

@@ -41,9 +41,10 @@ const getCssParser = memoize(() => require("../css/CssParser"));
  * @returns {string} local ident
  */
 const getLocalIdent = (local, module, chunkGraph, runtimeTemplate) => {
+	const generator = /** @type {CssGenerator} */ (module.generator);
 	const localIdentName =
-		/** @type {CssGenerator} */
-		(module.generator).localIdentName;
+		/** @type {CssGeneratorLocalIdentName} */
+		(generator.localIdentName);
 	const relativeResourcePath = makePathsRelative(
 		/** @type {string} */
 		(module.context),
@@ -120,10 +121,11 @@ class CssLocalIdentifierDependency extends NullDependency {
 	 */
 	getExports(moduleGraph) {
 		const module = /** @type {CssModule} */ (moduleGraph.getParentModule(this));
-		const convention =
-			/** @type {CssGenerator} */
-			(module.generator).convention;
-		const names = this.getExportsConventionNames(this.name, convention);
+		const generator = /** @type {CssGenerator} */ (module.generator);
+		const names = this.getExportsConventionNames(
+			this.name,
+			/** @type {CssGeneratorExportsConvention} */ (generator.convention)
+		);
 		return {
 			exports: names.map(name => ({
 				name,
@@ -144,12 +146,11 @@ class CssLocalIdentifierDependency extends NullDependency {
 			const module =
 				/** @type {CssModule} */
 				(chunkGraph.moduleGraph.getParentModule(this));
-			const generator =
-				/** @type {CssGenerator} */
-				(module.generator);
+			const generator = /** @type {CssGenerator} */ (module.generator);
 			const names = this.getExportsConventionNames(
 				this.name,
-				generator.convention
+				/** @type {CssGeneratorExportsConvention} */
+				(generator.convention)
 			);
 			this._hashUpdate = `exportsConvention|${JSON.stringify(names)}|localIdentName|${JSON.stringify(generator.localIdentName)}`;
 		}
@@ -214,10 +215,12 @@ CssLocalIdentifierDependency.Template = class CssLocalIdentifierDependencyTempla
 		const { module: m, moduleGraph, runtime, cssData } = templateContext;
 		const dep = /** @type {CssLocalIdentifierDependency} */ (dependency);
 		const module = /** @type {CssModule} */ (m);
-		const convention =
-			/** @type {CssGenerator} */
-			(module.generator).convention;
-		const names = dep.getExportsConventionNames(dep.name, convention);
+		const generator = /** @type {CssGenerator} */ (module.generator);
+		const names = dep.getExportsConventionNames(
+			dep.name,
+			/** @type {CssGeneratorExportsConvention} */
+			(generator.convention)
+		);
 		const usedNames =
 			/** @type {(string)[]} */
 			(

package/lib/dependencies/ExportsInfoDependency.js

@@ -22,13 +22,18 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
+/**
+ * @template T
+ * @typedef {import("../util/SortableSet")<T>} SortableSet
+ */
+
 /**
  * @param {ModuleGraph} moduleGraph the module graph
  * @param {Module} module the module
  * @param {string[] | null} _exportName name of the export if any
  * @param {string | null} property name of the requested property
  * @param {RuntimeSpec} runtime for which runtime
- * @returns {any} value of the property
+ * @returns {undefined | null | number | boolean | string[] | SortableSet<string>} value of the property
  */
 const getProperty = (moduleGraph, module, _exportName, property, runtime) => {
 	if (!_exportName) {

package/lib/dependencies/HarmonyEvaluatedImportSpecifierDependency.js

@@ -30,8 +30,8 @@ class HarmonyEvaluatedImportSpecifierDependency extends HarmonyImportSpecifierDe
 	/**
 	 * @param {string} request the request string
 	 * @param {number} sourceOrder source order
-	 * @param {TODO} ids ids
-	 * @param {TODO} name name
+	 * @param {string[]} ids ids
+	 * @param {string} name name
 	 * @param {Range} range location in source code
 	 * @param {ImportAttributes} attributes import assertions
 	 * @param {string} operator operator
@@ -79,9 +79,9 @@ HarmonyEvaluatedImportSpecifierDependency.Template = class HarmonyEvaluatedImpor
 	 * @returns {void}
 	 */
 	apply(dependency, source, templateContext) {
-		const dep = /** @type {HarmonyEvaluatedImportSpecifierDependency} */ (
-			dependency
-		);
+		const dep =
+			/** @type {HarmonyEvaluatedImportSpecifierDependency} */
+			(dependency);
 		const { module, moduleGraph, runtime } = templateContext;
 		const connection = moduleGraph.getConnection(dep);
 		// Skip rendering depending when dependency is conditional

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -20,6 +20,7 @@ const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDepe
 
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("../javascript/JavascriptParser").ClassDeclaration} ClassDeclaration */
 /** @typedef {import("../javascript/JavascriptParser").FunctionDeclaration} FunctionDeclaration */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
@@ -90,9 +91,9 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 		);
 		parser.hooks.exportExpression.tap(
 			"HarmonyExportDependencyParserPlugin",
-			(statement, expr) => {
-				const isFunctionDeclaration = expr.type === "FunctionDeclaration";
-				const exprRange = /** @type {Range} */ (expr.range);
+			(statement, node) => {
+				const isFunctionDeclaration = node.type === "FunctionDeclaration";
+				const exprRange = /** @type {Range} */ (node.range);
 				const statementRange = /** @type {Range} */ (statement.range);
 				const comments = parser.getComments([statementRange[0], exprRange[0]]);
 				const dep = new HarmonyExportExpressionDependency(
@@ -109,20 +110,22 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 							return "";
 						})
 						.join(""),
-					expr.type.endsWith("Declaration") && expr.id
-						? expr.id.name
+					node.type.endsWith("Declaration") &&
+					/** @type {FunctionDeclaration | ClassDeclaration} */ (node).id
+						? /** @type {FunctionDeclaration | ClassDeclaration} */
+							(node).id.name
 						: isFunctionDeclaration
 							? {
 									range: [
 										exprRange[0],
-										expr.params.length > 0
-											? /** @type {Range} */ (expr.params[0].range)[0]
-											: /** @type {Range} */ (expr.body.range)[0]
+										node.params.length > 0
+											? /** @type {Range} */ (node.params[0].range)[0]
+											: /** @type {Range} */ (node.body.range)[0]
 									],
-									prefix: `${expr.async ? "async " : ""}function${
-										expr.generator ? "*" : ""
+									prefix: `${node.async ? "async " : ""}function${
+										node.generator ? "*" : ""
 									} `,
-									suffix: `(${expr.params.length > 0 ? "" : ") "}`
+									suffix: `(${node.params.length > 0 ? "" : ") "}`
 								}
 							: undefined
 				);
@@ -133,8 +136,10 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				parser.state.current.addDependency(dep);
 				InnerGraph.addVariableUsage(
 					parser,
-					expr.type.endsWith("Declaration") && expr.id
-						? expr.id.name
+					node.type.endsWith("Declaration") &&
+						/** @type {FunctionDeclaration | ClassDeclaration} */ (node).id
+						? /** @type {FunctionDeclaration | ClassDeclaration} */ (node).id
+								.name
 						: "*default*",
 					"default"
 				);
@@ -159,7 +164,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 							null,
 							exportPresenceMode,
 							null,
-							settings.assertions
+							settings.attributes
 						)
 					: new HarmonyExportSpecifierDependency(id, name);
 				dep.loc = Object.create(
@@ -189,6 +194,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 					harmonyStarExports = parser.state.harmonyStarExports =
 						parser.state.harmonyStarExports || new HarmonyStarExportsList();
 				}
+				const attributes = getImportAttributes(statement);
 				const dep = new HarmonyExportImportedSpecifierDependency(
 					/** @type {string} */ (source),
 					parser.state.lastHarmonyImportOrder,
@@ -197,7 +203,8 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 					harmonyNamedExports,
 					harmonyStarExports && harmonyStarExports.slice(),
 					exportPresenceMode,
-					harmonyStarExports
+					harmonyStarExports,
+					attributes
 				);
 				if (harmonyStarExports) {
 					harmonyStarExports.push(dep);

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -51,6 +51,7 @@ const processExportInfo = require("./processExportInfo");
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @typedef {import("./HarmonyImportDependency").ExportPresenceMode} ExportPresenceMode */
 /** @typedef {import("./processExportInfo").ReferencedExports} ReferencedExports */
 
 /** @typedef {"missing"|"unused"|"empty-star"|"reexport-dynamic-default"|"reexport-named-default"|"reexport-namespace-object"|"reexport-fake-namespace-object"|"reexport-undefined"|"normal-reexport"|"dynamic-reexport"} ExportModeType */
@@ -115,11 +116,14 @@ class ExportMode {
 	}
 }
 
+/** @typedef {string[]} Names */
+/** @typedef {number[]} DependencyIndices */
+
 /**
  * @param {ModuleGraph} moduleGraph module graph
- * @param {TODO} dependencies dependencies
+ * @param {HarmonyExportImportedSpecifierDependency[]} dependencies dependencies
  * @param {TODO=} additionalDependency additional dependency
- * @returns {TODO} result
+ * @returns {{ names: Names, dependencyIndices: DependencyIndices }} result
  */
 const determineExportAssignments = (
 	moduleGraph,
@@ -157,6 +161,14 @@ const determineExportAssignments = (
 	return { names: Array.from(names), dependencyIndices };
 };
 
+/**
+ * @param {object} options options
+ * @param {Names} options.names names
+ * @param {DependencyIndices} options.dependencyIndices dependency indices
+ * @param {string} name name
+ * @param {Iterable<HarmonyExportImportedSpecifierDependency>} dependencies dependencies
+ * @returns {HarmonyExportImportedSpecifierDependency | undefined} found dependency or nothing
+ */
 const findDependencyForName = (
 	{ names, dependencyIndices },
 	name,
@@ -359,7 +371,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * @param {string | null} name the export name of for this module
 	 * @param {Set<string>} activeExports other named exports in the module
 	 * @param {ReadonlyArray<HarmonyExportImportedSpecifierDependency> | Iterable<HarmonyExportImportedSpecifierDependency> | null} otherStarExports other star exports in the module before this import
-	 * @param {number} exportPresenceMode mode of checking export names
+	 * @param {ExportPresenceMode} exportPresenceMode mode of checking export names
 	 * @param {HarmonyStarExportsList | null} allStarExports all star exports in the module
 	 * @param {ImportAttributes=} attributes import attributes
 	 */
@@ -424,8 +436,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * @returns {void}
 	 */
 	setIds(moduleGraph, ids) {
-		/** @type {TODO} */
-		(moduleGraph.getMeta(this))[idsSymbol] = ids;
+		moduleGraph.getMeta(this)[idsSymbol] = ids;
 	}
 
 	/**
@@ -619,7 +630,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph the module graph
-	 * @returns {{ names: string[], namesSlice: number, dependencyIndices: number[], dependencyIndex: number } | undefined} exported names and their origin dependency
+	 * @returns {{ names: Names, namesSlice: number, dependencyIndices: DependencyIndices, dependencyIndex: number } | undefined} exported names and their origin dependency
 	 */
 	_discoverActiveExportsFromOtherStarExports(moduleGraph) {
 		if (!this.otherStarExports) return;
@@ -796,7 +807,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph module graph
-	 * @returns {number} effective mode
+	 * @returns {ExportPresenceMode} effective mode
 	 */
 	_getEffectiveExportPresenceLevel(moduleGraph) {
 		if (this.exportPresenceMode !== ExportPresenceModes.AUTO)
@@ -871,7 +882,11 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 							exportInfo.name,
 							this.allStarExports
 								? this.allStarExports.dependencies
-								: [...this.otherStarExports, this]
+								: [
+										.../** @type {Iterable<HarmonyExportImportedSpecifierDependency>} */
+										(this.otherStarExports),
+										this
+									]
 						);
 						if (!conflictingDependency) continue;
 						const target = exportInfo.getTerminalBinding(moduleGraph);

package/lib/dependencies/HarmonyExportSpecifierDependency.js

@@ -20,8 +20,8 @@ const NullDependency = require("./NullDependency");
 
 class HarmonyExportSpecifierDependency extends NullDependency {
 	/**
-	 * @param {TODO} id id
-	 * @param {TODO} name name
+	 * @param {string} id the id
+	 * @param {string} name the name
 	 */
 	constructor(id, name) {
 		super();

package/lib/dependencies/HarmonyImportDependency.js

@@ -32,14 +32,16 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
+/** @typedef {0 | 1 | 2 | 3 | false} ExportPresenceMode */
+
 const ExportPresenceModes = {
-	NONE: /** @type {0} */ (0),
-	WARN: /** @type {1} */ (1),
-	AUTO: /** @type {2} */ (2),
-	ERROR: /** @type {3} */ (3),
+	NONE: /** @type {ExportPresenceMode} */ (0),
+	WARN: /** @type {ExportPresenceMode} */ (1),
+	AUTO: /** @type {ExportPresenceMode} */ (2),
+	ERROR: /** @type {ExportPresenceMode} */ (3),
 	/**
 	 * @param {string | false} str param
-	 * @returns {0 | 1 | 2 | 3} result
+	 * @returns {ExportPresenceMode} result
 	 */
 	fromUserOption(str) {
 		switch (str) {
@@ -89,7 +91,7 @@ class HarmonyImportDependency extends ModuleDependency {
 	 */
 	getImportVar(moduleGraph) {
 		const module = /** @type {Module} */ (moduleGraph.getParentModule(this));
-		const meta = /** @type {TODO} */ (moduleGraph.getMeta(module));
+		const meta = moduleGraph.getMeta(module);
 		let importVarMap = meta.importVarMap;
 		if (!importVarMap) meta.importVarMap = importVarMap = new Map();
 		let importVar = importVarMap.get(

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -17,6 +17,7 @@ const { ExportPresenceModes } = require("./HarmonyImportDependency");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
 
+/** @typedef {import("estree").Expression} Expression */
 /** @typedef {import("estree").Identifier} Identifier */
 /** @typedef {import("estree").Literal} Literal */
 /** @typedef {import("estree").MemberExpression} MemberExpression */
@@ -33,6 +34,7 @@ const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDepend
 /** @typedef {import("../javascript/JavascriptParser").ImportDeclaration} ImportDeclaration */
 /** @typedef {import("../javascript/JavascriptParser").ImportExpression} ImportExpression */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../javascript/JavascriptParser").TagData} TagData */
 /** @typedef {import("../optimize/InnerGraph").InnerGraph} InnerGraph */
 /** @typedef {import("../optimize/InnerGraph").TopLevelSymbol} TopLevelSymbol */
 /** @typedef {import("./HarmonyImportDependency")} HarmonyImportDependency */
@@ -46,7 +48,7 @@ const harmonySpecifierTag = Symbol("harmony import");
  * @property {number} sourceOrder
  * @property {string} name
  * @property {boolean} await
- * @property {Record<string, any> | undefined} assertions
+ * @property {Record<string, any> | undefined} attributes
  */
 
 module.exports = class HarmonyImportDependencyParserPlugin {
@@ -86,7 +88,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 		/**
 		 * @param {TODO} node member expression
 		 * @param {number} count count
-		 * @returns {TODO} member expression
+		 * @returns {Expression} member expression
 		 */
 		function getNonOptionalMemberChain(node, count) {
 			while (count--) node = node.object;
@@ -138,7 +140,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					source,
 					ids,
 					sourceOrder: parser.state.lastHarmonyImportOrder,
-					assertions: getImportAttributes(statement)
+					attributes: getImportAttributes(statement)
 				});
 				return true;
 			}
@@ -164,7 +166,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					rootInfo.tagInfo.tag !== harmonySpecifierTag
 				)
 					return;
-				const settings = rootInfo.tagInfo.data;
+				const settings = /** @type {TagData} */ (rootInfo.tagInfo.data);
 				const members =
 					/** @type {(() => string[])} */
 					(rightPart.getMembers)();
@@ -174,7 +176,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					settings.ids.concat(members).concat([leftPart]),
 					settings.name,
 					/** @type {Range} */ (expression.range),
-					settings.assertions,
+					settings.attributes,
 					"in"
 				);
 				dep.directImport = members.length === 0;
@@ -196,9 +198,10 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					settings.sourceOrder,
 					settings.ids,
 					settings.name,
-					/** @type {Range} */ (expr.range),
+					/** @type {Range} */
+					(expr.range),
 					exportPresenceMode,
-					settings.assertions,
+					settings.attributes,
 					[]
 				);
 				dep.referencedPropertiesInDestructuring =
@@ -219,9 +222,9 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			.tap(
 				"HarmonyImportDependencyParserPlugin",
 				(expression, members, membersOptionals, memberRanges) => {
-					const settings = /** @type {HarmonySettings} */ (
-						parser.currentTagData
-					);
+					const settings =
+						/** @type {HarmonySettings} */
+						(parser.currentTagData);
 					const nonOptionalMembers = getNonOptionalPart(
 						members,
 						membersOptionals
@@ -244,15 +247,17 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 						settings.sourceOrder,
 						ids,
 						settings.name,
-						/** @type {Range} */ (expr.range),
+						/** @type {Range} */
+						(expr.range),
 						exportPresenceMode,
-						settings.assertions,
+						settings.attributes,
 						ranges
 					);
 					dep.referencedPropertiesInDestructuring =
 						parser.destructuringAssignmentPropertiesFor(expr);
 					dep.asiSafe = !parser.isAsiPosition(
-						/** @type {Range} */ (expr.range)[0]
+						/** @type {Range} */
+						(expr.range)[0]
 					);
 					dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 					parser.state.module.addDependency(dep);
@@ -293,7 +298,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 						settings.name,
 						/** @type {Range} */ (expr.range),
 						exportPresenceMode,
-						settings.assertions,
+						settings.attributes,
 						ranges
 					);
 					dep.directImport = members.length === 0;

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -35,6 +35,7 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @typedef {import("./HarmonyImportDependency").ExportPresenceMode} ExportPresenceMode */
 
 const idsSymbol = Symbol("HarmonyImportSpecifierDependency.ids");
 
@@ -47,7 +48,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	 * @param {string[]} ids ids
 	 * @param {string} name name
 	 * @param {Range} range range
-	 * @param {TODO} exportPresenceMode export presence mode
+	 * @param {ExportPresenceMode} exportPresenceMode export presence mode
 	 * @param {ImportAttributes | undefined} attributes import attributes
 	 * @param {Range[] | undefined} idRanges ranges for members of ids; the two arrays are right-aligned
 	 */
@@ -104,7 +105,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	getIds(moduleGraph) {
 		const meta = moduleGraph.getMetaIfExisting(this);
 		if (meta === undefined) return this.ids;
-		const ids = meta[/** @type {keyof object} */ (idsSymbol)];
+		const ids = meta[idsSymbol];
 		return ids !== undefined ? ids : this.ids;
 	}
 
@@ -114,8 +115,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	 * @returns {void}
 	 */
 	setIds(moduleGraph, ids) {
-		/** @type {TODO} */
-		(moduleGraph.getMeta(this))[idsSymbol] = ids;
+		moduleGraph.getMeta(this)[idsSymbol] = ids;
 	}
 
 	/**
@@ -204,7 +204,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph module graph
-	 * @returns {number} effective mode
+	 * @returns {ExportPresenceMode} effective mode
 	 */
 	_getEffectiveExportPresenceLevel(moduleGraph) {
 		if (this.exportPresenceMode !== ExportPresenceModes.AUTO)

package/lib/dependencies/ImportContextDependency.js

@@ -12,10 +12,11 @@ const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTempl
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("./ContextDependency").ContextDependencyOptions} ContextDependencyOptions */
 
 class ImportContextDependency extends ContextDependency {
 	/**
-	 * @param {TODO} options options
+	 * @param {ContextDependencyOptions} options options
 	 * @param {Range} range range
 	 * @param {Range} valueRange value range
 	 */

package/lib/dependencies/ImportMetaContextDependencyParserPlugin.js

@@ -14,6 +14,7 @@ const ImportMetaContextDependency = require("./ImportMetaContextDependency");
 /** @typedef {import("estree").Expression} Expression */
 /** @typedef {import("estree").ObjectExpression} ObjectExpression */
 /** @typedef {import("estree").Property} Property */
+/** @typedef {import("estree").Identifier} Identifier */
 /** @typedef {import("estree").SourceLocation} SourceLocation */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
@@ -24,16 +25,18 @@ const ImportMetaContextDependency = require("./ImportMetaContextDependency");
 /** @typedef {Pick<ContextModuleOptions, 'mode'|'recursive'|'regExp'|'include'|'exclude'|'chunkName'>&{groupOptions: RawChunkGroupOptions, exports?: ContextModuleOptions["referencedExports"]}} ImportMetaContextOptions */
 
 /**
- * @param {TODO} prop property
+ * @param {Property} 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(
-			prop.key.name
+			/** @type {Identifier} */
+			(prop.key).name
 		)}, expected type ${expect}.`,
-		prop.value.loc
+		/** @type {DependencyLocation} */
+		(prop.value.loc)
 	);
 }
 
@@ -98,7 +101,8 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 							errors.push(
 								createError(
 									"Parsing import.meta.webpackContext options failed.",
-									/** @type {DependencyLocation} */ (optionsNode.loc)
+									/** @type {DependencyLocation} */
+									(optionsNode.loc)
 								)
 							);
 							break;

package/lib/dependencies/JsonExportsDependency.js

@@ -14,39 +14,55 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../json/JsonData")} JsonData */
-/** @typedef {import("../json/JsonData").RawJsonData} RawJsonData */
+/** @typedef {import("../json/JsonData").JsonValue} JsonValue */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 
+/**
+ * @callback GetExportsFromDataFn
+ * @param {JsonValue} data raw json data
+ * @param {number} [curDepth] current depth
+ * @returns {ExportSpec[] | null} export spec or nothing
+ */
+
 /**
  * @param {number} exportsDepth exportsDepth
- * @returns {((data: RawJsonData, curDepth?: number) => ExportSpec[] | undefined)} value
+ * @returns {GetExportsFromDataFn} value
  */
 const getExportsWithDepth = exportsDepth =>
+	/** @type {GetExportsFromDataFn} */
 	function getExportsFromData(data, curDepth = 1) {
-		if (curDepth > exportsDepth) return undefined;
+		if (curDepth > exportsDepth) {
+			return null;
+		}
+
 		if (data && typeof data === "object") {
 			if (Array.isArray(data)) {
 				return data.length < 100
 					? data.map((item, idx) => ({
 							name: `${idx}`,
 							canMangle: true,
-							exports: getExportsFromData(item, curDepth + 1)
+							exports: getExportsFromData(item, curDepth + 1) || undefined
 						}))
-					: undefined;
+					: null;
 			}
+
+			/** @type {ExportSpec[]} */
 			const exports = [];
+
 			for (const key of Object.keys(data)) {
 				exports.push({
 					name: key,
 					canMangle: true,
-					exports: getExportsFromData(data[key], curDepth + 1)
+					exports: getExportsFromData(data[key], curDepth + 1) || undefined
 				});
 			}
+
 			return exports;
 		}
-		return undefined;
+
+		return null;
 	};
 
 class JsonExportsDependency extends NullDependency {
@@ -72,7 +88,7 @@ class JsonExportsDependency extends NullDependency {
 	getExports(moduleGraph) {
 		return {
 			exports: getExportsWithDepth(this.exportsDepth)(
-				this.data && /** @type {RawJsonData} */ (this.data.get())
+				this.data && /** @type {JsonValue} */ (this.data.get())
 			),
 			dependencies: undefined
 		};