webpack 5.109.0 → 5.109.1

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -1695,172 +1695,30 @@ class DefaultStatsPrinterPlugin {
 						context.timeReference = compilation.time;
 					});
 
-				for (const key of /** @type {(keyof CompilationSimplePrinters)[]} */ (
-					Object.keys(COMPILATION_SIMPLE_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {NonNullable<CompilationSimplePrinters[keyof CompilationSimplePrinters]>} */
-						(COMPILATION_SIMPLE_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"compilation">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				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[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"asset" | "asset.info">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof ModuleSimplePrinters)[]} */ (
-					Object.keys(MODULE_SIMPLE_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {SimplePrinter<EXPECTED_ANY, "module">} */
-						(MODULE_SIMPLE_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"module">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				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[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"moduleIssuer">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof ModuleReasonsPrinters)[]} */ (
-					Object.keys(MODULE_REASON_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {SimplePrinter<EXPECTED_ANY, "moduleReason">} */
-						(MODULE_REASON_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"moduleReason">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				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[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"profile">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof ChunkGroupPrinters)[]} */ (
-					Object.keys(CHUNK_GROUP_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {SimplePrinter<EXPECTED_ANY, "chunkGroupKind" | "chunkGroup">} */
-						(CHUNK_GROUP_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"chunkGroupKind" | "chunkGroup">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof ChunkPrinters)[]} */ (
-					Object.keys(CHUNK_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {SimplePrinter<EXPECTED_ANY, "chunk">} */
-						(CHUNK_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"chunk">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof ErrorPrinters)[]} */ (
-					Object.keys(ERROR_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {SimplePrinter<EXPECTED_ANY, "error">} */
-						(ERROR_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"error">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				for (const key of /** @type {(keyof LogEntryPrinters)[]} */ (
-					Object.keys(LOG_ENTRY_PRINTERS)
-				)) {
-					stats.hooks.print.for(key).tap(PLUGIN_NAME, (obj, ctx) =>
-						/** @type {SimplePrinter<EXPECTED_ANY, "logging">} */
-						(LOG_ENTRY_PRINTERS[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"logging">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				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[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"moduleTraceDependency">} */
-							(ctx),
-							stats
-						)
-					);
-				}
-
-				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[key])(
-							obj,
-							/** @type {DefineStatsPrinterContext<"moduleTraceItem">} */
-							(ctx),
-							stats
-						)
-					);
+				// Every `*_SIMPLE_PRINTERS` map registers identically: tap
+				// `print.for(key)` with a formatter called as `(obj, ctx, stats)`.
+				// One loop over all maps replaces a dozen near-identical blocks.
+				for (const simplePrinters of /** @type {Record<string, EXPECTED_ANY>[]} */ ([
+					COMPILATION_SIMPLE_PRINTERS,
+					ASSET_SIMPLE_PRINTERS,
+					MODULE_SIMPLE_PRINTERS,
+					MODULE_ISSUER_PRINTERS,
+					MODULE_REASON_PRINTERS,
+					MODULE_PROFILE_PRINTERS,
+					CHUNK_GROUP_PRINTERS,
+					CHUNK_PRINTERS,
+					ERROR_PRINTERS,
+					LOG_ENTRY_PRINTERS,
+					MODULE_TRACE_DEPENDENCY_PRINTERS,
+					MODULE_TRACE_ITEM_PRINTERS
+				])) {
+					for (const key of Object.keys(simplePrinters)) {
+						stats.hooks.print
+							.for(key)
+							.tap(PLUGIN_NAME, (obj, ctx) =>
+								simplePrinters[key](obj, ctx, stats)
+							);
+					}
 				}
 
 				for (const key of Object.keys(PREFERRED_ORDERS)) {

package/lib/stats/StatsFactory.js

@@ -6,7 +6,6 @@
 "use strict";
 
 const { HookMap, SyncBailHook, SyncWaterfallHook } = require("tapable");
-const { concatComparators, keepOriginalOrder } = require("../util/comparators");
 const smartGrouping = require("../util/smartGrouping");
 
 /** @typedef {import("../Chunk")} Chunk */
@@ -294,10 +293,7 @@ class StatsFactory {
 				h.call(comparators, context)
 			);
 			if (comparators.length > 0) {
-				items.sort(
-					// @ts-expect-error number of arguments is correct
-					concatComparators(...comparators, keepOriginalOrder(items))
-				);
+				sortWithOriginalOrder(items, comparators);
 			}
 
 			// run filter on sorted items
@@ -358,10 +354,7 @@ class StatsFactory {
 				(h) => h.call(comparators2, context)
 			);
 			if (comparators2.length > 0) {
-				resultItems.sort(
-					// @ts-expect-error number of arguments is correct
-					concatComparators(...comparators2, keepOriginalOrder(resultItems))
-				);
+				sortWithOriginalOrder(resultItems, comparators2);
 			}
 
 			// group result items
@@ -424,4 +417,33 @@ class StatsFactory {
 	}
 }
 
+/**
+ * Stable in-place sort applying comparators in order, keeping the original order
+ * for equal items. Inlined instead of `concatComparators(...c, keepOriginalOrder())`
+ * because that combination is single-use per sort and only thrashes the comparator
+ * caches (a fresh tiebreaker closure every call allocates a new cache entry).
+ * @param {EXPECTED_ANY[]} items items to sort in place
+ * @param {Comparator[]} comparators comparators applied in order
+ * @returns {void}
+ */
+const sortWithOriginalOrder = (items, comparators) => {
+	// original-index tiebreaker keeps the sort stable on engines without a stable Array.sort
+	/** @type {Map<EXPECTED_ANY, number>} */
+	const originalOrder = new Map();
+	for (let i = 0; i < items.length; i++) {
+		originalOrder.set(items[i], i);
+	}
+	const count = comparators.length;
+	items.sort((a, b) => {
+		for (let i = 0; i < count; i++) {
+			const res = comparators[i](a, b);
+			if (res !== 0) return res;
+		}
+		return (
+			/** @type {number} */ (originalOrder.get(a)) -
+			/** @type {number} */ (originalOrder.get(b))
+		);
+	});
+};
+
 module.exports = StatsFactory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.109.0",
+  "version": "5.109.1",
   "description": "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "homepage": "https://github.com/webpack/webpack",
   "bugs": "https://github.com/webpack/webpack/issues",
@@ -65,7 +65,7 @@
     "test:test262": "yarn test:base --testMatch \"<rootDir>/test/test262.spectest.js\"",
     "test:html5lib": "yarn test:base --testMatch \"<rootDir>/test/html5lib.spectest.js\"",
     "test:css-parsing": "yarn test:base --testMatch \"<rootDir>/test/cssParsing-webpack.spectest.js\"",
-    "test:deno": "yarn test:base:deno --reporters default --reporters \"<rootDir>/test/runtimeCrashReporter.js\" --testMatch \"<rootDir>/test/*.{basictest,longtest,test,unittest}.js\" --testPathIgnorePatterns \"/node_modules/|test/HotTestCases\"",
+    "test:deno": "yarn test:base:deno --reporters default --reporters \"<rootDir>/test/runtimeCrashReporter.js\" --testMatch \"<rootDir>/test/*.{basictest,longtest,test,unittest}.js\" --testPathIgnorePatterns \"/node_modules/\"",
     "test:base:deno": "deno --allow-read --allow-env --allow-sys --allow-ffi --allow-write --allow-run --allow-net --import-map=test/deno-import-map.json --v8-flags='--max-old-space-size=4096' ./node_modules/jest-cli/bin/jest.js --workerIdleMemoryLimit=512MB --logHeapUsage",
     "test:bun": "yarn test:base:bun --reporters default --reporters \"<rootDir>/test/runtimeCrashReporter.js\" --testMatch \"<rootDir>/test/*.{basictest,longtest,test,unittest}.js\" --testPathIgnorePatterns \"/node_modules/\"",
     "test:base:bun": "bun --bun --smol --preload ./test/bun-preload.js ./node_modules/jest-cli/bin/jest.js --workerThreads --workerIdleMemoryLimit=512MB --logHeapUsage",

package/types.d.ts

@@ -15239,10 +15239,6 @@ type Matcher =
 	| RegExp
 	| ((str: string) => boolean)
 	| (string | RegExp | ((str: string) => boolean))[];
-
-/**
- * Extract fragment index.
- */
 declare interface MaybeMergeableInitFragment<GenerateContext> {
 	key?: string;
 	stage: number;