webpack 5.101.3 → 5.102.1

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -10,9 +10,6 @@
 /** @typedef {import("./DefaultStatsFactoryPlugin").ChunkId} ChunkId */
 /** @typedef {import("./DefaultStatsFactoryPlugin").ChunkName} ChunkName */
 /** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsAsset} KnownStatsAsset */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsAssetChunk} KnownStatsAssetChunk */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsAssetChunkIdHint} KnownStatsAssetChunkIdHint */
-/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsAssetChunkName} KnownStatsAssetChunkName */
 /** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsChunk} KnownStatsChunk */
 /** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsChunkGroup} KnownStatsChunkGroup */
 /** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsChunkOrigin} KnownStatsChunkOrigin */
@@ -128,7 +125,7 @@ const isValidId = (id) => {
 
 /**
  * @template T
- * @param {Array<T> | undefined} list of items
+ * @param {T[] | undefined} list of items
  * @param {number} count number of items to show
  * @returns {string} string representation of list
  */
@@ -161,21 +158,14 @@ const moreCount = (list, count) =>
  * @template {object} O
  * @template {keyof O} K
  * @template {string} B
- * @typedef {K extends string ? Exclude<O[K], undefined> extends EXPECTED_ANY[] ? never : `${B}.${K}` : never} PropertyName
+ * @typedef {K extends string ? `${B}.${K}` : never} PropertyName
  */
 
 /**
  * @template {object} O
  * @template {keyof O} K
  * @template {string} B
- * @typedef {K extends string ? NonNullable<O[K]> extends EXPECTED_ANY[] ? `${B}.${K}[]` : never : never} ArrayPropertyName
- */
-
-/**
- * @template {object} O
- * @template {keyof O} K
- * @template {string} B
- * @typedef {K extends string ? Exclude<O[K], undefined> extends EXPECTED_ANY[] ? `${B}.${K}` : never : never} MultiplePropertyName
+ * @typedef {K extends string ? `${B}.${K}[]` : never} ArrayPropertyName
  */
 
 /**
@@ -190,9 +180,7 @@ const moreCount = (list, count) =>
  * @template {string} B
  * @template {string} [R=B]
  * @typedef {{ [K in keyof O as PropertyName<O, K, B>]?: SimplePrinter<O[K], R> } &
- * { [K in keyof O as ArrayPropertyName<O, K, B>]?: Exclude<O[K], undefined> extends (infer I)[] ? SimplePrinter<I, R> : never } &
- * { [K in keyof O as MultiplePropertyName<O, K, B>]?: SimplePrinter<O[K], R> }
- * } Printers
+ * { [K in keyof O as ArrayPropertyName<O, K, B>]?: Exclude<O[K], undefined> extends (infer I)[] ? SimplePrinter<I, R> : never }} Printers
  */
 
 /**
@@ -421,9 +409,9 @@ const COMPILATION_SIMPLE_PRINTERS = {
  * Printers<KnownStatsAsset["info"], "asset.info"> &
  * Exclamation<KnownStatsAsset, "asset.separator", "asset"> &
  * { ["asset.filteredChildren"]?: SimplePrinter<number, "asset"> } &
- * { assetChunk?: SimplePrinter<KnownStatsAssetChunk, "asset"> } &
- * { assetChunkName?: SimplePrinter<KnownStatsAssetChunkName, "asset"> } &
- * { assetChunkIdHint?: SimplePrinter<KnownStatsAssetChunkIdHint, "asset"> }} AssetSimplePrinters
+ * { assetChunk?: SimplePrinter<ChunkId, "asset"> } &
+ * { assetChunkName?: SimplePrinter<ChunkName, "asset"> } &
+ * { assetChunkIdHint?: SimplePrinter<string, "asset"> }} AssetSimplePrinters
  */
 
 /** @type {AssetSimplePrinters} */
@@ -473,7 +461,6 @@ const ASSET_SIMPLE_PRINTERS = {
 			: undefined,
 
 	assetChunk: (id, { formatChunkId }) => formatChunkId(id),
-
 	assetChunkName: (name) => name || undefined,
 	assetChunkIdHint: (name) => name || undefined
 };
@@ -1463,7 +1450,12 @@ const AVAILABLE_COLORS = {
  * @typedef {T extends [infer Head, ...infer Tail] ? Tail : undefined} Tail
  */
 
-/** @typedef {Required<{ [Key in keyof KnownStatsPrinterFormatters]: (value: Parameters<NonNullable<KnownStatsPrinterFormatters[Key]>>[0], options: Required<KnownStatsPrinterColorFunctions> & StatsPrinterContextWithExtra, ...args: Tail<Parameters<NonNullable<KnownStatsPrinterFormatters[Key]>>>) => string }>} AvailableFormats */
+/**
+ * @template {(...args: EXPECTED_ANY[]) => EXPECTED_ANY} T
+ * @typedef {T extends (firstArg: EXPECTED_ANY, ...rest: infer R) => EXPECTED_ANY ? R : never} TailParameters
+ */
+
+/** @typedef {{ [Key in keyof KnownStatsPrinterFormatters]: (value: Parameters<NonNullable<KnownStatsPrinterFormatters[Key]>>[0], options: Required<KnownStatsPrinterColorFunctions> & StatsPrinterContextWithExtra, ...args: TailParameters<NonNullable<KnownStatsPrinterFormatters[Key]>>) => string }} AvailableFormats */
 
 /** @type {AvailableFormats} */
 const AVAILABLE_FORMATS = {
@@ -1639,16 +1631,14 @@ class DefaultStatsPrinterPlugin {
 								context[color] = (str) => str;
 							}
 						}
-						for (const _format of Object.keys(AVAILABLE_FORMATS)) {
-							const format =
-								/** @type {keyof KnownStatsPrinterFormatters} */
-								(_format);
-
+						for (const format of /** @type {(keyof KnownStatsPrinterFormatters)[]} */ (
+							Object.keys(AVAILABLE_FORMATS)
+						)) {
 							context[format] =
 								/** @type {(content: Parameters<NonNullable<KnownStatsPrinterFormatters[keyof KnownStatsPrinterFormatters]>>[0], ...args: Tail<Parameters<NonNullable<KnownStatsPrinterFormatters[keyof KnownStatsPrinterFormatters]>>>) => string} */
 								(content, ...args) =>
-									/** @type {TODO} */
-									(AVAILABLE_FORMATS)[format](
+									/** @type {EXPECTED_ANY} */
+									(AVAILABLE_FORMATS[format])(
 										content,
 										/** @type {StatsPrinterContext & Required<KnownStatsPrinterColorFunctions>} */
 										(context),
@@ -1658,15 +1648,12 @@ class DefaultStatsPrinterPlugin {
 						context.timeReference = compilation.time;
 					});
 
-				for (const key of Object.keys(COMPILATION_SIMPLE_PRINTERS)) {
+				for (const key of /** @type {(keyof CompilationSimplePrinters)[]} */ (
+					Object.keys(COMPILATION_SIMPLE_PRINTERS)
+				)) {
 					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {TODO} */
-						(
-							COMPILATION_SIMPLE_PRINTERS[
-								/** @type {keyof CompilationSimplePrinters} */
-								(key)
-							]
-						)(
+						/** @type {EXPECTED_ANY} */
+						(COMPILATION_SIMPLE_PRINTERS)[key](
 							obj,
 							/** @type {DefineStatsPrinterContext<"compilation">} */
 							(ctx),
@@ -1675,15 +1662,12 @@ class DefaultStatsPrinterPlugin {
 					);
 				}
 
-				for (const key of Object.keys(ASSET_SIMPLE_PRINTERS)) {
+				for (const key of /** @type {(keyof AssetSimplePrinters)[]} */ (
+					Object.keys(ASSET_SIMPLE_PRINTERS)
+				)) {
 					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
 						/** @type {NonNullable<AssetSimplePrinters[keyof AssetSimplePrinters]>} */
-						(
-							ASSET_SIMPLE_PRINTERS[
-								/** @type {keyof AssetSimplePrinters} */
-								(key)
-							]
-						)(
+						(ASSET_SIMPLE_PRINTERS[key])(
 							obj,
 							/** @type {DefineStatsPrinterContext<"asset" | "asset.info">} */
 							(ctx),
@@ -1692,15 +1676,12 @@ class DefaultStatsPrinterPlugin {
 					);
 				}
 
-				for (const key of Object.keys(MODULE_SIMPLE_PRINTERS)) {
+				for (const key of /** @type {(keyof ModuleSimplePrinters)[]} */ (
+					Object.keys(MODULE_SIMPLE_PRINTERS)
+				)) {
 					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {TODO} */
-						(
-							MODULE_SIMPLE_PRINTERS[
-								/** @type {keyof ModuleSimplePrinters} */
-								(key)
-							]
-						)(
+						/** @type {EXPECTED_ANY} */
+						(MODULE_SIMPLE_PRINTERS)[key](
 							obj,
 							/** @type {DefineStatsPrinterContext<"module">} */
 							(ctx),
@@ -1709,15 +1690,12 @@ class DefaultStatsPrinterPlugin {
 					);
 				}
 
-				for (const key of Object.keys(MODULE_ISSUER_PRINTERS)) {
+				for (const key of /** @type {(keyof ModuleIssuerPrinters)[]} */ (
+					Object.keys(MODULE_ISSUER_PRINTERS)
+				)) {
 					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
 						/** @type {NonNullable<ModuleIssuerPrinters[keyof ModuleIssuerPrinters]>} */
-						(
-							MODULE_ISSUER_PRINTERS[
-								/** @type {keyof ModuleIssuerPrinters} */
-								(key)
-							]
-						)(
+						(MODULE_ISSUER_PRINTERS[key])(
 							obj,
 							/** @type {DefineStatsPrinterContext<"moduleIssuer">} */
 							(ctx),
@@ -1726,15 +1704,12 @@ class DefaultStatsPrinterPlugin {
 					);
 				}
 
-				for (const key of Object.keys(MODULE_REASON_PRINTERS)) {
+				for (const key of /** @type {(keyof ModuleReasonsPrinters)[]} */ (
+					Object.keys(MODULE_REASON_PRINTERS)
+				)) {
 					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {TODO} */
-						(
-							MODULE_REASON_PRINTERS[
-								/** @type {keyof ModuleReasonsPrinters} */
-								(key)
-							]
-						)(
+						/** @type {EXPECTED_ANY} */
+						(MODULE_REASON_PRINTERS)[key](
 							obj,
 							/** @type {DefineStatsPrinterContext<"moduleReason">} */
 							(ctx),
@@ -1743,15 +1718,12 @@ class DefaultStatsPrinterPlugin {
 					);
 				}
 
-				for (const key of Object.keys(MODULE_PROFILE_PRINTERS)) {
+				for (const key of /** @type {(keyof ModuleProfilePrinters)[]} */ (
+					Object.keys(MODULE_PROFILE_PRINTERS)
+				)) {
 					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
 						/** @type {NonNullable<ModuleProfilePrinters[keyof ModuleProfilePrinters]>} */
-						(
-							MODULE_PROFILE_PRINTERS[
-								/** @type {keyof ModuleProfilePrinters} */
-								(key)
-							]
-						)(
+						(MODULE_PROFILE_PRINTERS[key])(
 							obj,
 							/** @type {DefineStatsPrinterContext<"profile">} */
 							(ctx),
@@ -1760,15 +1732,12 @@ class DefaultStatsPrinterPlugin {
 					);
 				}
 
-				for (const key of Object.keys(CHUNK_GROUP_PRINTERS)) {
+				for (const key of /** @type {(keyof ChunkGroupPrinters)[]} */ (
+					Object.keys(CHUNK_GROUP_PRINTERS)
+				)) {
 					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {TODO} */
-						(
-							CHUNK_GROUP_PRINTERS[
-								/** @type {keyof ChunkGroupPrinters} */
-								(key)
-							]
-						)(
+						/** @type {EXPECTED_ANY} */
+						(CHUNK_GROUP_PRINTERS)[key](
 							obj,
 							/** @type {DefineStatsPrinterContext<"chunkGroupKind" | "chunkGroup">} */
 							(ctx),
@@ -1777,10 +1746,12 @@ class DefaultStatsPrinterPlugin {
 					);
 				}
 
-				for (const key of Object.keys(CHUNK_PRINTERS)) {
+				for (const key of /** @type {(keyof ChunkPrinters)[]} */ (
+					Object.keys(CHUNK_PRINTERS)
+				)) {
 					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {TODO} */
-						(CHUNK_PRINTERS[/** @type {keyof ChunkPrinters} */ (key)])(
+						/** @type {EXPECTED_ANY} */
+						(CHUNK_PRINTERS)[key](
 							obj,
 							/** @type {DefineStatsPrinterContext<"chunk">} */
 							(ctx),
@@ -1789,10 +1760,12 @@ class DefaultStatsPrinterPlugin {
 					);
 				}
 
-				for (const key of Object.keys(ERROR_PRINTERS)) {
+				for (const key of /** @type {(keyof ErrorPrinters)[]} */ (
+					Object.keys(ERROR_PRINTERS)
+				)) {
 					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {TODO} */
-						(ERROR_PRINTERS[/** @type {keyof ErrorPrinters} */ (key)])(
+						/** @type {EXPECTED_ANY} */
+						(ERROR_PRINTERS)[key](
 							obj,
 							/** @type {DefineStatsPrinterContext<"error">} */
 							(ctx),
@@ -1801,15 +1774,12 @@ class DefaultStatsPrinterPlugin {
 					);
 				}
 
-				for (const key of Object.keys(LOG_ENTRY_PRINTERS)) {
+				for (const key of /** @type {(keyof LogEntryPrinters)[]} */ (
+					Object.keys(LOG_ENTRY_PRINTERS)
+				)) {
 					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {TODO} */
-						(
-							LOG_ENTRY_PRINTERS[
-								/** @type {keyof LogEntryPrinters} */
-								(key)
-							]
-						)(
+						/** @type {EXPECTED_ANY} */
+						(LOG_ENTRY_PRINTERS)[key](
 							obj,
 							/** @type {DefineStatsPrinterContext<"logging">} */
 							(ctx),
@@ -1818,15 +1788,12 @@ class DefaultStatsPrinterPlugin {
 					);
 				}
 
-				for (const key of Object.keys(MODULE_TRACE_DEPENDENCY_PRINTERS)) {
+				for (const key of /** @type {(keyof ModuleTraceDependencyPrinters)[]} */ (
+					Object.keys(MODULE_TRACE_DEPENDENCY_PRINTERS)
+				)) {
 					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
 						/** @type {NonNullable<ModuleTraceDependencyPrinters[keyof ModuleTraceDependencyPrinters]>} */
-						(
-							MODULE_TRACE_DEPENDENCY_PRINTERS[
-								/** @type {keyof ModuleTraceDependencyPrinters} */
-								(key)
-							]
-						)(
+						(MODULE_TRACE_DEPENDENCY_PRINTERS[key])(
 							obj,
 							/** @type {DefineStatsPrinterContext<"moduleTraceDependency">} */
 							(ctx),
@@ -1835,15 +1802,12 @@ class DefaultStatsPrinterPlugin {
 					);
 				}
 
-				for (const key of Object.keys(MODULE_TRACE_ITEM_PRINTERS)) {
+				for (const key of /** @type {(keyof ModuleTraceItemPrinters)[]} */ (
+					Object.keys(MODULE_TRACE_ITEM_PRINTERS)
+				)) {
 					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
 						/** @type {NonNullable<ModuleTraceItemPrinters[keyof ModuleTraceItemPrinters]>} */
-						(
-							MODULE_TRACE_ITEM_PRINTERS[
-								/** @type {keyof ModuleTraceItemPrinters} */
-								(key)
-							]
-						)(
+						(MODULE_TRACE_ITEM_PRINTERS[key])(
 							obj,
 							/** @type {DefineStatsPrinterContext<"moduleTraceItem">} */
 							(ctx),
@@ -1877,10 +1841,10 @@ class DefaultStatsPrinterPlugin {
 				}
 
 				for (const key of Object.keys(SIMPLE_ELEMENT_JOINERS)) {
-					const joiner = SIMPLE_ELEMENT_JOINERS[key];
-					stats.hooks.printElements
-						.for(key)
-						.tap(PLUGIN_NAME, /** @type {TODO} */ (joiner));
+					const joiner =
+						/** @type {(items: Item[], context: StatsPrinterContext) => string} */
+						(SIMPLE_ELEMENT_JOINERS[key]);
+					stats.hooks.printElements.for(key).tap(PLUGIN_NAME, joiner);
 				}
 
 				for (const key of Object.keys(RESULT_MODIFIER)) {

package/lib/stats/StatsFactory.js

@@ -21,7 +21,10 @@ const smartGrouping = require("../util/smartGrouping");
 /** @typedef {import("../WebpackError")} WebpackError */
 /** @typedef {import("../util/comparators").Comparator<EXPECTED_ANY>} Comparator */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
-/** @typedef {import("../util/smartGrouping").GroupConfig<EXPECTED_ANY, EXPECTED_OBJECT>} GroupConfig */
+/**
+ * @template T, R
+ * @typedef {import("../util/smartGrouping").GroupConfig<T, R>} GroupConfig
+ */
 /** @typedef {import("./DefaultStatsFactoryPlugin").ChunkGroupInfoWithName} ChunkGroupInfoWithName */
 /** @typedef {import("./DefaultStatsFactoryPlugin").ModuleIssuerPath} ModuleIssuerPath */
 /** @typedef {import("./DefaultStatsFactoryPlugin").ModuleTrace} ModuleTrace */
@@ -41,14 +44,14 @@ const smartGrouping = require("../util/smartGrouping");
 /**
  * @typedef {object} KnownStatsFactoryContext
  * @property {string} type
- * @property {(path: string) => string} makePathsRelative
  * @property {Compilation} compilation
+ * @property {(path: string) => string} makePathsRelative
  * @property {Set<Module>} rootModules
  * @property {Map<string, Chunk[]>} compilationFileToChunks
  * @property {Map<string, Chunk[]>} compilationAuxiliaryFileToChunks
  * @property {RuntimeSpec} runtime
- * @property {(compilation: Compilation) => WebpackError[]} cachedGetErrors
- * @property {(compilation: Compilation) => WebpackError[]} cachedGetWarnings
+ * @property {(compilation: Compilation) => Error[]} cachedGetErrors
+ * @property {(compilation: Compilation) => Error[]} cachedGetWarnings
  */
 
 /** @typedef {KnownStatsFactoryContext & Record<string, EXPECTED_ANY>} StatsFactoryContext */
@@ -67,10 +70,10 @@ const smartGrouping = require("../util/smartGrouping");
  * @typedef {T extends ChunkGroupInfoWithName[] ? Record<string, StatsObject<ChunkGroupInfoWithName, F>> : T extends (infer V)[] ? StatsObject<V, F>[] : StatsObject<T, F>} CreatedObject
  */
 
-/** @typedef {TODO} FactoryData */
-/** @typedef {TODO} FactoryDataItem */
-/** @typedef {TODO} Result */
-/** @typedef {Record<string, TODO>} ObjectForExtract */
+/** @typedef {EXPECTED_ANY} ObjectForExtract */
+/** @typedef {EXPECTED_ANY} FactoryData */
+/** @typedef {EXPECTED_ANY} FactoryDataItem */
+/** @typedef {EXPECTED_ANY} Result */
 
 /**
  * @typedef {object} StatsFactoryHooks
@@ -78,7 +81,7 @@ const smartGrouping = require("../util/smartGrouping");
  * @property {HookMap<SyncBailHook<[FactoryDataItem, StatsFactoryContext, number, number], boolean | void>>} filter
  * @property {HookMap<SyncBailHook<[Comparator[], StatsFactoryContext], void>>} sort
  * @property {HookMap<SyncBailHook<[FactoryDataItem, StatsFactoryContext, number, number], boolean | void>>} filterSorted
- * @property {HookMap<SyncBailHook<[GroupConfig[], StatsFactoryContext], void>>} groupResults
+ * @property {HookMap<SyncBailHook<[GroupConfig<EXPECTED_ANY, EXPECTED_ANY>[], StatsFactoryContext], void>>} groupResults
  * @property {HookMap<SyncBailHook<[Comparator[], StatsFactoryContext], void>>} sortResults
  * @property {HookMap<SyncBailHook<[FactoryDataItem, StatsFactoryContext, number, number], boolean | void>>} filterResults
  * @property {HookMap<SyncBailHook<[FactoryDataItem[], StatsFactoryContext], Result | void>>} merge
@@ -198,7 +201,7 @@ class StatsFactory {
 	 * @param {T} hookMap hook map
 	 * @param {Caches<H>} cache cache
 	 * @param {string} type type
-	 * @param {Array<FactoryData>} items items
+	 * @param {FactoryData[]} items items
 	 * @param {(hook: H, item: R, idx: number, i: number) => R | undefined} fn fn
 	 * @param {boolean} forceClone force clone
 	 * @returns {R[]} result for each level
@@ -341,7 +344,7 @@ class StatsFactory {
 			}
 
 			// group result items
-			/** @type {GroupConfig[]} */
+			/** @type {GroupConfig<EXPECTED_ANY, EXPECTED_ANY>[]} */
 			const groupConfigs = [];
 			this._forEachLevel(
 				this.hooks.groupResults,

package/lib/url/URLParserPlugin.js

@@ -20,11 +20,9 @@ const InnerGraph = require("../optimize/InnerGraph");
 /** @typedef {import("estree").MemberExpression} MemberExpression */
 /** @typedef {import("estree").NewExpression} NewExpressionNode */
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("../ContextModule").ContextMode} ContextMode */
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../NormalModule")} NormalModule */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../javascript/JavascriptParser")} Parser */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
 const PLUGIN_NAME = "URLParserPlugin";
@@ -36,7 +34,7 @@ const PLUGIN_NAME = "URLParserPlugin";
 const getUrl = (module) => pathToFileURL(module.resource);
 
 /**
- * @param {Parser} parser parser parser
+ * @param {JavascriptParser} parser parser parser
  * @param {MemberExpression} arg arg
  * @returns {boolean} true when it is `meta.url`, otherwise false
  */
@@ -63,7 +61,7 @@ const getEvaluatedExprCache = new WeakMap();
 
 /**
  * @param {NewExpressionNode} expr expression
- * @param {Parser} parser parser parser
+ * @param {JavascriptParser} parser parser parser
  * @returns {BasicEvaluatedExpression | undefined} basic evaluated expression
  */
 const getEvaluatedExpr = (expr, parser) => {

package/lib/util/ArrayHelpers.js

@@ -23,9 +23,9 @@ module.exports.equals = (a, b) => {
 /**
  * Partition an array by calling a predicate function on each value.
  * @template T
- * @param {Array<T>} arr Array of values to be partitioned
+ * @param {T[]} arr Array of values to be partitioned
  * @param {(value: T) => boolean} fn Partition function which partitions based on truthiness of result.
- * @returns {[Array<T>, Array<T>]} returns the values of `arr` partitioned into two new arrays based on fn predicate.
+ * @returns {[T[], T[]]} returns the values of `arr` partitioned into two new arrays based on fn predicate.
  */
 module.exports.groupBy = (
 	// eslint-disable-next-line default-param-last
@@ -34,9 +34,9 @@ module.exports.groupBy = (
 ) =>
 	arr.reduce(
 		/**
-		 * @param {[Array<T>, Array<T>]} groups An accumulator storing already partitioned values returned from previous call.
+		 * @param {[T[], T[]]} groups An accumulator storing already partitioned values returned from previous call.
 		 * @param {T} value The value of the current element
-		 * @returns {[Array<T>, Array<T>]} returns an array of partitioned groups accumulator resulting from calling a predicate on the current value.
+		 * @returns {[T[], T[]]} returns an array of partitioned groups accumulator resulting from calling a predicate on the current value.
 		 */
 		(groups, value) => {
 			groups[fn(value) ? 0 : 1].push(value);

package/lib/util/AsyncQueue.js

@@ -21,6 +21,7 @@ let inHandleResult = 0;
  * @callback Callback
  * @param {(WebpackError | null)=} err
  * @param {(T | null)=} result
+ * @returns {void}
  */
 
 /**

package/lib/util/Hash.js

@@ -5,14 +5,31 @@
 
 "use strict";
 
+/** @typedef {import("../../declarations/WebpackOptions").HashDigest} Encoding */
+
 class Hash {
 	/* istanbul ignore next */
 	/**
 	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
 	 * @abstract
-	 * @param {string|Buffer} data data
-	 * @param {string=} inputEncoding data encoding
-	 * @returns {this} updated hash
+	 * @overload
+	 * @param {string | Buffer} data data
+	 * @returns {Hash} updated hash
+	 */
+	/**
+	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
+	 * @abstract
+	 * @overload
+	 * @param {string} data data
+	 * @param {Encoding} inputEncoding data encoding
+	 * @returns {Hash} updated hash
+	 */
+	/**
+	 * Update hash {@link https://nodejs.org/api/crypto.html#crypto_hash_update_data_inputencoding}
+	 * @abstract
+	 * @param {string | Buffer} data data
+	 * @param {Encoding=} inputEncoding data encoding
+	 * @returns {Hash} updated hash
 	 */
 	update(data, inputEncoding) {
 		const AbstractMethodError = require("../AbstractMethodError");
@@ -24,8 +41,21 @@ class Hash {
 	/**
 	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
 	 * @abstract
-	 * @param {string=} encoding encoding of the return value
-	 * @returns {string|Buffer} digest
+	 * @overload
+	 * @returns {Buffer} digest
+	 */
+	/**
+	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
+	 * @abstract
+	 * @overload
+	 * @param {Encoding} encoding encoding of the return value
+	 * @returns {string} digest
+	 */
+	/**
+	 * Calculates the digest {@link https://nodejs.org/api/crypto.html#crypto_hash_digest_encoding}
+	 * @abstract
+	 * @param {Encoding=} encoding encoding of the return value
+	 * @returns {string | Buffer} digest
 	 */
 	digest(encoding) {
 		const AbstractMethodError = require("../AbstractMethodError");

package/lib/util/LazySet.js

@@ -24,7 +24,7 @@ const merge = (targetSet, toMerge) => {
 /**
  * @template T
  * @param {Set<Iterable<T>>} targetSet set where iterables should be added
- * @param {Array<LazySet<T>>} toDeepMerge lazy sets to be flattened
+ * @param {LazySet<T>[]} toDeepMerge lazy sets to be flattened
  * @returns {void}
  */
 const flatten = (targetSet, toDeepMerge) => {
@@ -59,7 +59,7 @@ class LazySet {
 		this._set = new Set(iterable);
 		/** @type {Set<Iterable<T>>} */
 		this._toMerge = new Set();
-		/** @type {Array<LazySet<T>>} */
+		/** @type {LazySet<T>[]} */
 		this._toDeepMerge = [];
 		this._needMerge = false;
 		this._deopt = false;

package/lib/util/StackedCacheMap.js

@@ -5,8 +5,6 @@
 
 "use strict";
 
-new Map().entries();
-
 /**
  * The StackedCacheMap is a data structure designed as an alternative to a Map
  * in situations where you need to handle multiple item additions and

package/lib/util/TupleSet.js

@@ -112,9 +112,14 @@ class TupleSet {
 	 * @returns {Iterator<[T, V, ...EXPECTED_ANY]>} iterator
 	 */
 	[Symbol.iterator]() {
+		/**
+		 * @template T, V
+		 * @typedef {MapIterator<[T, InnerMap<T, V> | Set<V>]>} IteratorStack
+		 */
+
 		// This is difficult to type because we can have a map inside a map inside a map, etc. where the end is a set (each key is an argument)
 		// But in basic use we only have 2 arguments in our methods, so we have `Map<K, Set<V>>`
-		/** @type {MapIterator<[T, InnerMap<T, V> | Set<V>]>[]} */
+		/** @type {IteratorStack<T, V>[]} */
 		const iteratorStack = [];
 		/** @type {[T?, V?, ...EXPECTED_ANY]} */
 		const tuple = [];
@@ -122,7 +127,7 @@ class TupleSet {
 		let currentSetIterator;
 
 		/**
-		 * @param {MapIterator<[T, InnerMap<T, V> | Set<V>]>} it iterator
+		 * @param {IteratorStack<T, V>} it iterator
 		 * @returns {boolean} result
 		 */
 		const next = (it) => {
@@ -131,7 +136,7 @@ class TupleSet {
 				if (iteratorStack.length === 0) return false;
 				tuple.pop();
 				return next(
-					/** @type {MapIterator<[T, InnerMap<T, V> | Set<V>]>} */
+					/** @type {IteratorStack<T, V>} */
 					(iteratorStack.pop())
 				);
 			}
@@ -155,7 +160,7 @@ class TupleSet {
 						tuple.pop();
 						if (
 							!next(
-								/** @type {MapIterator<[T, InnerMap<T, V> | Set<V>]>} */
+								/** @type {IteratorStack<T, V>} */
 								(iteratorStack.pop())
 							)
 						) {

package/lib/util/URLAbsoluteSpecifier.js

@@ -5,7 +5,6 @@
 
 "use strict";
 
-/** @typedef {import("./fs").InputFileSystem} InputFileSystem */
 /** @typedef {(error: Error|null, result?: Buffer) => void} ErrorFirstCallback */
 
 const backSlashCharCode = "\\".charCodeAt(0);

package/lib/util/WeakTupleMap.js

@@ -25,7 +25,7 @@ const isWeakKey = (thing) => typeof thing === "object" && thing !== null;
 
 /**
  * @template {unknown[]} T
- * @typedef {T extends readonly (infer ElementType)[] ? ElementType : never} ArrayElement
+ * @typedef {T extends ReadonlyArray<infer ElementType> ? ElementType : never} ArrayElement
  */
 
 /**

package/lib/util/chainedImports.js

@@ -10,6 +10,8 @@
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
+/** @typedef {Range[]} IdRanges */
+
 /**
  * @summary Get the subset of ids and their corresponding range in an id chain that should be re-rendered by webpack.
  * Only those in the chain that are actually referring to namespaces or imports should be re-rendered.
@@ -18,7 +20,7 @@
  * because minifiers treat quoted accessors differently.  e.g. import { a } from "./module"; a["b"] vs a.b
  * @param {string[]} untrimmedIds chained ids
  * @param {Range} untrimmedRange range encompassing allIds
- * @param {Range[] | undefined} ranges cumulative range of ids for each of allIds
+ * @param {IdRanges | undefined} ranges cumulative range of ids for each of allIds
  * @param {ModuleGraph} moduleGraph moduleGraph
  * @param {Dependency} dependency dependency
  * @returns {{trimmedIds: string[], trimmedRange: Range}} computed trimmed ids and cumulative range of those ids