webpack 5.98.0 → 5.99.0

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -7,9 +7,15 @@
 
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsChunkGroup} KnownStatsChunkGroup */
+/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsError} KnownStatsError */
+/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsModuleIssuer} KnownStatsModuleIssuer */
+/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsModuleTraceDependency} KnownStatsModuleTraceDependency */
+/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsModuleTraceItem} KnownStatsModuleTraceItem */
+/** @typedef {import("./DefaultStatsFactoryPlugin").KnownStatsProfile} KnownStatsProfile */
 /** @typedef {import("./StatsPrinter")} StatsPrinter */
 /** @typedef {import("./StatsPrinter").KnownStatsPrinterColorFn} KnownStatsPrinterColorFn */
-/** @typedef {import("./StatsPrinter").KnownStatsPrinterFormaters} KnownStatsPrinterFormaters */
+/** @typedef {import("./StatsPrinter").KnownStatsPrinterContext} KnownStatsPrinterContext */
+/** @typedef {import("./StatsPrinter").KnownStatsPrinterFormatters} KnownStatsPrinterFormatters */
 /** @typedef {import("./StatsPrinter").StatsPrinterContext} StatsPrinterContext */
 
 const DATA_URI_CONTENT_LENGTH = 16;
@@ -59,7 +65,7 @@ const getResourceName = resource => {
  */
 const getModuleName = name => {
 	const [, prefix, resource] =
-		/** @type {[any, string, string]} */
+		/** @type {[string, string, string]} */
 		(/** @type {unknown} */ (/^(.*!)?([^!]*)$/.exec(name)));
 
 	if (resource.length > MAX_MODULE_IDENTIFIER_LENGTH) {
@@ -79,7 +85,7 @@ const getModuleName = name => {
 
 /**
  * @param {string} str string
- * @param {function(string): string} fn function to apply to each line
+ * @param {(item: string) => string} fn function to apply to each line
  * @returns {string} joined string
  */
 const mapLines = (str, fn) => str.split("\n").map(fn).join("\n");
@@ -111,7 +117,42 @@ const moreCount = (list, count) =>
  * @typedef {{ [P in K]-?: T[P] }} WithRequired
  */
 
-/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation">, printer: StatsPrinter) => string | undefined>} */
+/**
+ * @template {keyof StatsPrinterContext} RequiredStatsPrinterContextKeys
+ * @typedef {Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormatters> & WithRequired<StatsPrinterContext, "type" | "compilation" | RequiredStatsPrinterContextKeys>} DefineStatsPrinterContext
+ */
+
+/**
+ * @template T
+ * @template {keyof StatsPrinterContext} RequiredStatsPrinterContextKeys
+ * @typedef {(thing: Exclude<T, undefined>, context: DefineStatsPrinterContext<RequiredStatsPrinterContextKeys>, printer: StatsPrinter) => string | undefined} ModuleSimplePrinter
+ */
+
+/**
+ * @template T
+ * @typedef {T extends (infer U)[] ? U : T} Unpacked
+ */
+
+/**
+ * @template {object} O
+ * @template {keyof O} P
+ * @template {string} B
+ * @typedef {P extends string ? `${B}.${P}` : never} PropertyName
+ */
+
+/**
+ * @template {string} T
+ * @typedef {{ [property in `${T}.separator!`]: () => string }} Separator
+ */
+
+/**
+ * @template {object} O
+ * @template {string} B
+ * @template {string} [R=B]
+ * @typedef {{ [P in keyof O as PropertyName<O, P, B>]?: ModuleSimplePrinter<O[P], R> }} Printers
+ */
+
+/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormatters> & WithRequired<StatsPrinterContext, "type" | "compilation">, printer: StatsPrinter) => string | undefined>} */
 const COMPILATION_SIMPLE_PRINTERS = {
 	"compilation.summary!": (
 		_,
@@ -318,7 +359,7 @@ const COMPILATION_SIMPLE_PRINTERS = {
 	}
 };
 
-/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "asset">, printer: StatsPrinter) => string | undefined>} */
+/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormatters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "asset">, printer: StatsPrinter) => string | undefined>} */
 const ASSET_SIMPLE_PRINTERS = {
 	"asset.type": type => type,
 	"asset.name": (name, { formatFilename, asset: { isOverSizeLimit } }) =>
@@ -339,13 +380,7 @@ const ASSET_SIMPLE_PRINTERS = {
 	"asset.info.javascriptModule": (javascriptModule, { formatFlag }) =>
 		javascriptModule ? formatFlag("javascript module") : undefined,
 	"asset.info.sourceFilename": (sourceFilename, { formatFlag }) =>
-		sourceFilename
-			? formatFlag(
-					sourceFilename === true
-						? "from source file"
-						: `from: ${sourceFilename}`
-				)
-			: undefined,
+		sourceFilename ? formatFlag(`from: ${sourceFilename}`) : undefined,
 	"asset.info.development": (development, { green, formatFlag }) =>
 		development ? green(formatFlag("dev")) : undefined,
 	"asset.info.hotModuleReplacement": (
@@ -376,7 +411,7 @@ const ASSET_SIMPLE_PRINTERS = {
 	assetChunkIdHint: name => name
 };
 
-/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "module">, printer: StatsPrinter) => string | undefined>} */
+/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormatters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "module">, printer: StatsPrinter) => string | undefined>} */
 const MODULE_SIMPLE_PRINTERS = {
 	"module.type": type => (type !== "module" ? type : undefined),
 	"module.id": (id, { formatModuleId }) =>
@@ -493,13 +528,13 @@ const MODULE_SIMPLE_PRINTERS = {
 	"module.separator!": () => "\n"
 };
 
-/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "moduleIssuer">, printer: StatsPrinter) => string | undefined>} */
+/** @type {Printers<KnownStatsModuleIssuer, "moduleIssuer"> & Printers<KnownStatsModuleIssuer["profile"], "moduleIssuer.profile", "moduleIssuer">} */
 const MODULE_ISSUER_PRINTERS = {
 	"moduleIssuer.id": (id, { formatModuleId }) => formatModuleId(id),
 	"moduleIssuer.profile.total": (value, { formatTime }) => formatTime(value)
 };
 
-/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "moduleReason">, printer: StatsPrinter) => string | undefined>} */
+/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormatters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "moduleReason">, printer: StatsPrinter) => string | undefined>} */
 const MODULE_REASON_PRINTERS = {
 	"moduleReason.type": type => type,
 	"moduleReason.userRequest": (userRequest, { cyan }) =>
@@ -525,7 +560,7 @@ const MODULE_REASON_PRINTERS = {
 			: undefined
 };
 
-/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "profile">, printer: StatsPrinter) => string | undefined>} */
+/** @type {Printers<KnownStatsProfile, "module.profile", "profile">} */
 const MODULE_PROFILE_PRINTERS = {
 	"module.profile.total": (value, { formatTime }) => formatTime(value),
 	"module.profile.resolving": (value, { formatTime }) =>
@@ -544,7 +579,7 @@ const MODULE_PROFILE_PRINTERS = {
 		value ? `additional integration: ${formatTime(value)}` : undefined
 };
 
-/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "chunkGroupKind" | "chunkGroup">, printer: StatsPrinter) => string | undefined>} */
+/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormatters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "chunkGroupKind" | "chunkGroup">, printer: StatsPrinter) => string | undefined>} */
 const CHUNK_GROUP_PRINTERS = {
 	"chunkGroup.kind!": (_, { chunkGroupKind }) => chunkGroupKind,
 	"chunkGroup.separator!": () => "\n",
@@ -596,7 +631,7 @@ const CHUNK_GROUP_PRINTERS = {
 	"chunkGroupChild.name": name => (name ? `(name: ${name})` : undefined)
 };
 
-/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "chunk">, printer: StatsPrinter) => string | undefined>} */
+/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormatters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "chunk">, printer: StatsPrinter) => string | undefined>} */
 const CHUNK_PRINTERS = {
 	"chunk.id": (id, { formatChunkId }) => formatChunkId(id),
 	"chunk.files[]": (file, { formatFilename }) => formatFilename(file),
@@ -650,7 +685,7 @@ const CHUNK_PRINTERS = {
 	"chunkOrigin.loc": loc => loc
 };
 
-/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "error">, printer: StatsPrinter) => string | undefined>} */
+/** @type {Printers<KnownStatsError, "error"> & { ["error.filteredDetails"]?: (filteredDetails: number) => string | undefined } & Separator<"error">} */
 const ERROR_PRINTERS = {
 	"error.compilerPath": (compilerPath, { bold }) =>
 		compilerPath ? bold(`(${compilerPath})`) : undefined,
@@ -676,7 +711,7 @@ const ERROR_PRINTERS = {
 	"error.separator!": () => "\n"
 };
 
-/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "logging">, printer: StatsPrinter) => string | undefined>} */
+/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormatters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "logging">, printer: StatsPrinter) => string | undefined>} */
 const LOG_ENTRY_PRINTERS = {
 	"loggingEntry(error).loggingEntry.message": (message, { red }) =>
 		mapLines(message, x => `<e> ${red(x)}`),
@@ -716,17 +751,19 @@ const LOG_ENTRY_PRINTERS = {
 		filteredEntries > 0 ? `+ ${filteredEntries} hidden lines` : undefined
 };
 
-/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "moduleTraceItem">, printer: StatsPrinter) => string | undefined>} */
+/** @type {Printers<KnownStatsModuleTraceItem, "moduleTraceItem">} */
 const MODULE_TRACE_ITEM_PRINTERS = {
 	"moduleTraceItem.originName": originName => originName
 };
 
-/** @type {Record<string, (thing: any, context: Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "moduleTraceDependency">, printer: StatsPrinter) => string | undefined>} */
+/** @type {Printers<KnownStatsModuleTraceDependency, "moduleTraceDependency">} */
 const MODULE_TRACE_DEPENDENCY_PRINTERS = {
 	"moduleTraceDependency.loc": loc => loc
 };
 
-/** @type {Record<string, string | function(any): string>} */
+/**
+ * @type {Record<string, string | ((item: EXPECTED_ANY) => string)>}
+ */
 const ITEM_NAMES = {
 	"compilation.assets[]": "asset",
 	"compilation.modules[]": "module",
@@ -969,7 +1006,7 @@ const itemsJoinComma = items => items.filter(Boolean).join(", ");
 /** @type {SimpleItemsJoiner} */
 const itemsJoinCommaBrackets = items =>
 	items.length > 0 ? `(${items.filter(Boolean).join(", ")})` : undefined;
-/** @type {function(string): SimpleItemsJoiner} */
+/** @type {(item: string) => SimpleItemsJoiner} */
 const itemsJoinCommaBracketsWithName = name => items =>
 	items.length > 0
 		? `(${name}: ${items.filter(Boolean).join(", ")})`
@@ -1300,7 +1337,7 @@ const AVAILABLE_COLORS = {
 	magenta: "\u001B[1m\u001B[35m"
 };
 
-/** @type {Record<string, function(any, Required<KnownStatsPrinterColorFn> & StatsPrinterContext, ...any): string>} */
+/** @type {Record<string, (value: any, options: Required<KnownStatsPrinterColorFn> & StatsPrinterContext, ...args: any) => string>} */
 const AVAILABLE_FORMATS = {
 	formatChunkId: (id, { yellow }, direction) => {
 		switch (direction) {
@@ -1391,7 +1428,7 @@ const AVAILABLE_FORMATS = {
 	}
 };
 
-/** @typedef {function(string): string} ResultModifierFn */
+/** @typedef {(result: string) => string} ResultModifierFn */
 /** @type {Record<string, ResultModifierFn>} */
 const RESULT_MODIFIER = {
 	"module.modules": result => indent(result, "| ")
@@ -1498,7 +1535,7 @@ class DefaultStatsPrinterPlugin {
 							.tap("DefaultStatsPrinterPlugin", (obj, ctx) =>
 								COMPILATION_SIMPLE_PRINTERS[key](
 									obj,
-									/** @type {Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation">} */
+									/** @type {DefineStatsPrinterContext<"compilation">} */
 									(ctx),
 									stats
 								)
@@ -1511,7 +1548,7 @@ class DefaultStatsPrinterPlugin {
 							.tap("DefaultStatsPrinterPlugin", (obj, ctx) =>
 								ASSET_SIMPLE_PRINTERS[key](
 									obj,
-									/** @type {Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "asset">} */
+									/** @type {DefineStatsPrinterContext<"asset">} */
 									(ctx),
 									stats
 								)
@@ -1524,7 +1561,7 @@ class DefaultStatsPrinterPlugin {
 							.tap("DefaultStatsPrinterPlugin", (obj, ctx) =>
 								MODULE_SIMPLE_PRINTERS[key](
 									obj,
-									/** @type {Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "module">} */
+									/** @type {DefineStatsPrinterContext<"module">} */
 									(ctx),
 									stats
 								)
@@ -1535,9 +1572,10 @@ class DefaultStatsPrinterPlugin {
 						stats.hooks.print
 							.for(key)
 							.tap("DefaultStatsPrinterPlugin", (obj, ctx) =>
-								MODULE_ISSUER_PRINTERS[key](
+								/** @type {Record<string, ModuleSimplePrinter<KnownStatsModuleIssuer[keyof KnownStatsModuleIssuer] | KnownStatsModuleIssuer["profile"][keyof KnownStatsModuleIssuer["profile"]], "type" | "compilation" | "moduleIssuer">>} */
+								(MODULE_ISSUER_PRINTERS)[key](
 									obj,
-									/** @type {Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "moduleIssuer">} */
+									/** @type {DefineStatsPrinterContext<"moduleIssuer">} */
 									(ctx),
 									stats
 								)
@@ -1550,7 +1588,7 @@ class DefaultStatsPrinterPlugin {
 							.tap("DefaultStatsPrinterPlugin", (obj, ctx) =>
 								MODULE_REASON_PRINTERS[key](
 									obj,
-									/** @type {Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "moduleReason">} */
+									/** @type {DefineStatsPrinterContext<"moduleReason">} */
 									(ctx),
 									stats
 								)
@@ -1561,9 +1599,10 @@ class DefaultStatsPrinterPlugin {
 						stats.hooks.print
 							.for(key)
 							.tap("DefaultStatsPrinterPlugin", (obj, ctx) =>
-								MODULE_PROFILE_PRINTERS[key](
+								/** @type {Record<string, ModuleSimplePrinter<KnownStatsProfile[keyof KnownStatsProfile], "type" | "compilation" | "profile">>} */
+								(MODULE_PROFILE_PRINTERS)[key](
 									obj,
-									/** @type {Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "profile">} */
+									/** @type {DefineStatsPrinterContext<"profile">} */
 									(ctx),
 									stats
 								)
@@ -1576,7 +1615,7 @@ class DefaultStatsPrinterPlugin {
 							.tap("DefaultStatsPrinterPlugin", (obj, ctx) =>
 								CHUNK_GROUP_PRINTERS[key](
 									obj,
-									/** @type {Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "chunkGroupKind" | "chunkGroup">} */
+									/** @type {DefineStatsPrinterContext<"chunkGroupKind" | "chunkGroup">} */
 									(ctx),
 									stats
 								)
@@ -1589,7 +1628,7 @@ class DefaultStatsPrinterPlugin {
 							.tap("DefaultStatsPrinterPlugin", (obj, ctx) =>
 								CHUNK_PRINTERS[key](
 									obj,
-									/** @type {Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "chunk">} */
+									/** @type {DefineStatsPrinterContext<"chunk">} */
 									(ctx),
 									stats
 								)
@@ -1600,9 +1639,10 @@ class DefaultStatsPrinterPlugin {
 						stats.hooks.print
 							.for(key)
 							.tap("DefaultStatsPrinterPlugin", (obj, ctx) =>
-								ERROR_PRINTERS[key](
+								/** @type {Record<string, ModuleSimplePrinter<KnownStatsError[keyof KnownStatsError], "type" | "compilation" | "error">>} */
+								(ERROR_PRINTERS)[key](
 									obj,
-									/** @type {Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "error">} */
+									/** @type {DefineStatsPrinterContext<"error">} */
 									(ctx),
 									stats
 								)
@@ -1615,7 +1655,7 @@ class DefaultStatsPrinterPlugin {
 							.tap("DefaultStatsPrinterPlugin", (obj, ctx) =>
 								LOG_ENTRY_PRINTERS[key](
 									obj,
-									/** @type {Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "logging">} */
+									/** @type {DefineStatsPrinterContext<"logging">} */
 									(ctx),
 									stats
 								)
@@ -1626,9 +1666,10 @@ class DefaultStatsPrinterPlugin {
 						stats.hooks.print
 							.for(key)
 							.tap("DefaultStatsPrinterPlugin", (obj, ctx) =>
-								MODULE_TRACE_DEPENDENCY_PRINTERS[key](
+								/** @type {Record<string, ModuleSimplePrinter<KnownStatsModuleTraceDependency[keyof KnownStatsModuleTraceDependency], "type" | "compilation" | "moduleTraceDependency">>} */
+								(MODULE_TRACE_DEPENDENCY_PRINTERS)[key](
 									obj,
-									/** @type {Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "moduleTraceDependency">} */
+									/** @type {DefineStatsPrinterContext<"moduleTraceDependency">} */
 									(ctx),
 									stats
 								)
@@ -1639,9 +1680,10 @@ class DefaultStatsPrinterPlugin {
 						stats.hooks.print
 							.for(key)
 							.tap("DefaultStatsPrinterPlugin", (obj, ctx) =>
-								MODULE_TRACE_ITEM_PRINTERS[key](
+								/** @type {Record<string, ModuleSimplePrinter<KnownStatsModuleTraceItem[keyof KnownStatsModuleTraceItem], "type" | "compilation" | "moduleTraceItem">>} */
+								(MODULE_TRACE_ITEM_PRINTERS)[key](
 									obj,
-									/** @type {Required<KnownStatsPrinterColorFn> & Required<KnownStatsPrinterFormaters> & WithRequired<StatsPrinterContext, "type" | "compilation" | "moduleTraceItem">} */
+									/** @type {DefineStatsPrinterContext<"moduleTraceItem">} */
 									(ctx),
 									stats
 								)

package/lib/stats/StatsFactory.js

@@ -14,24 +14,24 @@ const smartGrouping = require("../util/smartGrouping");
 /** @typedef {import("../Compilation").NormalizedStatsOptions} NormalizedStatsOptions */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../WebpackError")} WebpackError */
-/** @typedef {import("../util/comparators").Comparator<any>} Comparator */
+/** @typedef {import("../util/comparators").Comparator<TODO>} Comparator */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
-/** @typedef {import("../util/smartGrouping").GroupConfig<any, object>} GroupConfig */
+/** @typedef {import("../util/smartGrouping").GroupConfig<TODO, EXPECTED_OBJECT>} GroupConfig */
 
 /**
  * @typedef {object} KnownStatsFactoryContext
  * @property {string} type
- * @property {function(string): string} makePathsRelative
+ * @property {(path: string) => string} makePathsRelative
  * @property {Compilation} compilation
  * @property {Set<Module>} rootModules
- * @property {Map<string,Chunk[]>} compilationFileToChunks
- * @property {Map<string,Chunk[]>} compilationAuxiliaryFileToChunks
+ * @property {Map<string, Chunk[]>} compilationFileToChunks
+ * @property {Map<string, Chunk[]>} compilationAuxiliaryFileToChunks
  * @property {RuntimeSpec} runtime
- * @property {function(Compilation): WebpackError[]} cachedGetErrors
- * @property {function(Compilation): WebpackError[]} cachedGetWarnings
+ * @property {(compilation: Compilation) => WebpackError[]} cachedGetErrors
+ * @property {(compilation: Compilation) => WebpackError[]} cachedGetWarnings
  */
 
-/** @typedef {Record<string, any> & KnownStatsFactoryContext} StatsFactoryContext */
+/** @typedef {KnownStatsFactoryContext & Record<string, EXPECTED_ANY>} StatsFactoryContext */
 
 /** @typedef {any} CreatedObject */
 /** @typedef {any} FactoryData */
@@ -128,7 +128,7 @@ class StatsFactory {
 	 * @param {HM} hookMap hook map
 	 * @param {Caches<H>} cache cache
 	 * @param {string} type type
-	 * @param {function(H): R | void} fn fn
+	 * @param {(hook: H) => R | void} fn fn
 	 * @returns {R | void} hook
 	 * @private
 	 */
@@ -146,7 +146,7 @@ class StatsFactory {
 	 * @param {Caches<H>} cache cache
 	 * @param {string} type type
 	 * @param {FactoryData} data data
-	 * @param {function(H, FactoryData): FactoryData} fn fn
+	 * @param {(hook: H, factoryData: FactoryData) => FactoryData} fn fn
 	 * @returns {FactoryData} data
 	 * @private
 	 */
@@ -165,7 +165,7 @@ class StatsFactory {
 	 * @param {Caches<H>} cache cache
 	 * @param {string} type type
 	 * @param {Array<FactoryData>} items items
-	 * @param {function(H, R, number, number): R | undefined} fn fn
+	 * @param {(hook: H, item: R, idx: number, i: number) => R | undefined} fn fn
 	 * @param {boolean} forceClone force clone
 	 * @returns {R[]} result for each level
 	 * @private

package/lib/stats/StatsPrinter.js

@@ -55,10 +55,10 @@ const { HookMap, SyncWaterfallHook, SyncBailHook } = require("tapable");
  */
 
 /**
- * @typedef {object} KnownStatsPrinterFormaters
+ * @typedef {object} KnownStatsPrinterFormatters
  * @property {(file: string, oversize?: boolean) => string=} formatFilename
- * @property {(id: string) => string=} formatModuleId
- * @property {(id: string, direction?: "parent"|"child"|"sibling") => string=} formatChunkId
+ * @property {(id: string | number) => string=} formatModuleId
+ * @property {(id: string | number, direction?: "parent" | "child" | "sibling") => string=} formatChunkId
  * @property {(size: number) => string=} formatSize
  * @property {(size: string) => string=} formatLayer
  * @property {(dateTime: number) => string=} formatDateTime
@@ -67,8 +67,8 @@ const { HookMap, SyncWaterfallHook, SyncBailHook } = require("tapable");
  * @property {(message: string) => string=} formatError
  */
 
-/** @typedef {Record<string, EXPECTED_ANY> & KnownStatsPrinterColorFn & KnownStatsPrinterFormaters & KnownStatsPrinterContext} StatsPrinterContext */
-/** @typedef {any} PrintObject */
+/** @typedef {KnownStatsPrinterColorFn & KnownStatsPrinterFormatters & KnownStatsPrinterContext & Record<string, EXPECTED_ANY>} StatsPrinterContext */
+/** @typedef {TODO} PrintObject */
 
 /**
  * @typedef {object} StatsPrintHooks
@@ -147,7 +147,7 @@ class StatsPrinter {
 	 * @template {H extends import("tapable").Hook<any, infer R> ? R : never} R
 	 * @param {HM} hookMap hook map
 	 * @param {string} type type
-	 * @param {function(H): R | void} fn fn
+	 * @param {(hooK: H) => R | void} fn fn
 	 * @returns {R | void} hook
 	 */
 	_forEachLevel(hookMap, type, fn) {
@@ -165,7 +165,7 @@ class StatsPrinter {
 	 * @param {HM} hookMap hook map
 	 * @param {string} type type
 	 * @param {string} data data
-	 * @param {function(H, string): string} fn fn
+	 * @param {(hook: H, data: string) => string} fn fn
 	 * @returns {string} result of `fn`
 	 */
 	_forEachLevelWaterfall(hookMap, type, data, fn) {

package/lib/util/ArrayHelpers.js

@@ -7,12 +7,11 @@
 
 /**
  * Compare two arrays or strings by performing strict equality check for each value.
- * @template T [T=any]
+ * @template T
  * @param {ArrayLike<T>} a Array of values to be compared
  * @param {ArrayLike<T>} b Array of values to be compared
  * @returns {boolean} returns true if all the elements of passed arrays are strictly equal.
  */
-
 module.exports.equals = (a, b) => {
 	if (a.length !== b.length) return false;
 	for (let i = 0; i < a.length; i++) {
@@ -23,12 +22,11 @@ module.exports.equals = (a, b) => {
 
 /**
  * Partition an array by calling a predicate function on each value.
- * @template T [T=any]
+ * @template T
  * @param {Array<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.
  */
-
 module.exports.groupBy = (
 	// eslint-disable-next-line default-param-last
 	arr = [],

package/lib/util/ArrayQueue.js

@@ -10,7 +10,7 @@
  */
 class ArrayQueue {
 	/**
-	 * @param {Iterable<T>=} items The initial elements.
+	 * @param {Iterable<T>} [items] The initial elements.
 	 */
 	constructor(items) {
 		/**

package/lib/util/AsyncQueue.js

@@ -50,12 +50,12 @@ class AsyncQueueEntry {
 
 /**
  * @template T, K
- * @typedef {function(T): K} getKey
+ * @typedef {(item: T) => K} getKey
  */
 
 /**
  * @template T, R
- * @typedef {function(T, Callback<R>): void} Processor
+ * @typedef {(item: T, callback: Callback<R>) => void} Processor
  */
 
 /**
@@ -85,13 +85,13 @@ class AsyncQueue {
 		this._entries = new Map();
 		/** @type {ArrayQueue<AsyncQueueEntry<T, K, R>>} */
 		this._queued = new ArrayQueue();
-		/** @type {AsyncQueue<any, any, any>[] | undefined} */
+		/** @type {AsyncQueue<T, K, R>[] | undefined} */
 		this._children = undefined;
 		this._activeTasks = 0;
 		this._willEnsureProcessing = false;
 		this._needProcessing = false;
 		this._stopped = false;
-		/** @type {AsyncQueue<any, any, any>} */
+		/** @type {AsyncQueue<T, K, R>} */
 		this._root = parent ? parent._root : this;
 		if (parent) {
 			if (this._root._children === undefined) {

package/lib/util/IterableHelpers.js

@@ -19,7 +19,7 @@ const last = set => {
 /**
  * @template T
  * @param {Iterable<T>} iterable iterable
- * @param {function(T): boolean | null | undefined} filter predicate
+ * @param {(value: T) => boolean | null | undefined} filter predicate
  * @returns {boolean} true, if some items match the filter predicate
  */
 const someInIterable = (iterable, filter) => {