webpack 5.104.1 → 5.105.1

package/lib/optimize/InnerGraphPlugin.js

@@ -120,10 +120,10 @@ class InnerGraphPlugin {
 							statement.type === "FunctionDeclaration"
 						) {
 							const name = statement.id ? statement.id.name : "*default*";
-							const fn =
+							const symbol =
 								/** @type {TopLevelSymbol} */
 								(InnerGraph.tagTopLevelSymbol(parser, name));
-							statementWithTopLevelSymbol.set(statement, fn);
+							statementWithTopLevelSymbol.set(statement, symbol);
 							return true;
 						}
 					});
@@ -140,15 +140,15 @@ class InnerGraphPlugin {
 								)
 							) {
 								const name = statement.id ? statement.id.name : "*default*";
-								const fn = /** @type {TopLevelSymbol} */ (
+								const symbol = /** @type {TopLevelSymbol} */ (
 									InnerGraph.tagTopLevelSymbol(parser, name)
 								);
-								classWithTopLevelSymbol.set(statement, fn);
+								classWithTopLevelSymbol.set(statement, symbol);
 								return true;
 							}
 							if (statement.type === "ExportDefaultDeclaration") {
 								const name = "*default*";
-								const fn =
+								const symbol =
 									/** @type {TopLevelSymbol} */
 									(InnerGraph.tagTopLevelSymbol(parser, name));
 								const decl = statement.declaration;
@@ -165,7 +165,7 @@ class InnerGraphPlugin {
 									classWithTopLevelSymbol.set(
 										/** @type {ClassExpression | ClassDeclaration} */
 										(decl),
-										fn
+										symbol
 									);
 								} else if (
 									parser.isPure(
@@ -175,7 +175,7 @@ class InnerGraphPlugin {
 										(statement.range)[0]
 									)
 								) {
-									statementWithTopLevelSymbol.set(statement, fn);
+									statementWithTopLevelSymbol.set(statement, symbol);
 									if (
 										!decl.type.endsWith("FunctionExpression") &&
 										!decl.type.endsWith("Declaration") &&
@@ -207,20 +207,20 @@ class InnerGraphPlugin {
 									/** @type {Range} */ (decl.id.range)[1]
 								)
 							) {
-								const fn =
+								const symbol =
 									/** @type {TopLevelSymbol} */
 									(InnerGraph.tagTopLevelSymbol(parser, name));
-								classWithTopLevelSymbol.set(decl.init, fn);
+								classWithTopLevelSymbol.set(decl.init, symbol);
 							} else if (
 								parser.isPure(
 									decl.init,
 									/** @type {Range} */ (decl.id.range)[1]
 								)
 							) {
-								const fn =
+								const symbol =
 									/** @type {TopLevelSymbol} */
 									(InnerGraph.tagTopLevelSymbol(parser, name));
-								declWithTopLevelSymbol.set(decl, fn);
+								declWithTopLevelSymbol.set(decl, symbol);
 								if (
 									!decl.init.type.endsWith("FunctionExpression") &&
 									decl.init.type !== "Literal"
@@ -252,9 +252,9 @@ class InnerGraphPlugin {
 						if (parser.scope.topLevelScope === true) {
 							InnerGraph.setTopLevelSymbol(parser.state, undefined);
 
-							const fn = statementWithTopLevelSymbol.get(statement);
-							if (fn) {
-								InnerGraph.setTopLevelSymbol(parser.state, fn);
+							const symbol = statementWithTopLevelSymbol.get(statement);
+							if (symbol) {
+								InnerGraph.setTopLevelSymbol(parser.state, symbol);
 								const purePart = statementPurePart.get(statement);
 								if (purePart) {
 									InnerGraph.onUsage(parser.state, (usedByExports) => {
@@ -285,9 +285,9 @@ class InnerGraphPlugin {
 						(expr, statement) => {
 							if (!InnerGraph.isEnabled(parser.state)) return;
 							if (parser.scope.topLevelScope === true) {
-								const fn = classWithTopLevelSymbol.get(statement);
+								const symbol = classWithTopLevelSymbol.get(statement);
 								if (
-									fn &&
+									symbol &&
 									parser.isPure(
 										expr,
 										statement.id
@@ -295,7 +295,7 @@ class InnerGraphPlugin {
 											: /** @type {Range} */ (statement.range)[0]
 									)
 								) {
-									InnerGraph.setTopLevelSymbol(parser.state, fn);
+									InnerGraph.setTopLevelSymbol(parser.state, symbol);
 									onUsageSuper(expr);
 								}
 							}
@@ -307,8 +307,8 @@ class InnerGraphPlugin {
 						(element, classDefinition) => {
 							if (!InnerGraph.isEnabled(parser.state)) return;
 							if (parser.scope.topLevelScope === true) {
-								const fn = classWithTopLevelSymbol.get(classDefinition);
-								if (fn) {
+								const symbol = classWithTopLevelSymbol.get(classDefinition);
+								if (symbol) {
 									InnerGraph.setTopLevelSymbol(parser.state, undefined);
 								}
 							}
@@ -320,8 +320,8 @@ class InnerGraphPlugin {
 						(expression, element, classDefinition) => {
 							if (!InnerGraph.isEnabled(parser.state)) return;
 							if (parser.scope.topLevelScope === true) {
-								const fn = classWithTopLevelSymbol.get(classDefinition);
-								if (fn) {
+								const symbol = classWithTopLevelSymbol.get(classDefinition);
+								if (symbol) {
 									if (
 										!element.static ||
 										parser.isPure(
@@ -331,7 +331,7 @@ class InnerGraphPlugin {
 												: /** @type {Range} */ (element.range)[0]
 										)
 									) {
-										InnerGraph.setTopLevelSymbol(parser.state, fn);
+										InnerGraph.setTopLevelSymbol(parser.state, symbol);
 										if (element.type !== "MethodDefinition" && element.static) {
 											InnerGraph.onUsage(parser.state, (usedByExports) => {
 												switch (usedByExports) {
@@ -362,10 +362,10 @@ class InnerGraphPlugin {
 
 					parser.hooks.declarator.tap(PLUGIN_NAME, (decl, _statement) => {
 						if (!InnerGraph.isEnabled(parser.state)) return;
-						const fn = declWithTopLevelSymbol.get(decl);
+						const symbol = declWithTopLevelSymbol.get(decl);
 
-						if (fn) {
-							InnerGraph.setTopLevelSymbol(parser.state, fn);
+						if (symbol) {
+							InnerGraph.setTopLevelSymbol(parser.state, symbol);
 							if (pureDeclarators.has(decl)) {
 								if (
 									/** @type {ClassExpression} */

package/lib/optimize/LimitChunkCountPlugin.js

@@ -57,9 +57,10 @@ class LimitChunkCountPlugin {
 	/**
 	 * @param {LimitChunkCountPluginOptions=} options options object
 	 */
-	constructor(options) {
+	constructor(options = { maxChunks: 1 }) {
 		validate(options);
-		this.options = /** @type {LimitChunkCountPluginOptions} */ (options);
+		/** @type {LimitChunkCountPluginOptions} */
+		this.options = options;
 	}
 
 	/**

package/lib/optimize/MangleExportsPlugin.js

@@ -17,6 +17,12 @@ const { compareSelect, compareStringsNumeric } = require("../util/comparators");
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../ExportsInfo")} ExportsInfo */
 /** @typedef {import("../ExportsInfo").ExportInfo} ExportInfo */
+/** @typedef {import("../util/concatenate").UsedNames} UsedNames */
+
+/**
+ * @template T
+ * @typedef {import("../util/comparators").Comparator<T>} Comparator
+ */
 
 /**
  * @param {ExportsInfo} exportsInfo exports info
@@ -36,6 +42,7 @@ const canMangle = (exportsInfo) => {
 };
 
 // Sort by name
+/** @type {Comparator<ExportInfo>} */
 const comparator = compareSelect((e) => e.name, compareStringsNumeric);
 /**
  * @param {boolean} deterministic use deterministic names
@@ -45,6 +52,7 @@ const comparator = compareSelect((e) => e.name, compareStringsNumeric);
  */
 const mangleExportsInfo = (deterministic, exportsInfo, isNamespace) => {
 	if (!canMangle(exportsInfo)) return;
+	/** @type {UsedNames} */
 	const usedNames = new Set();
 	/** @type {ExportInfo[]} */
 	const mangleableExports = [];
@@ -69,11 +77,11 @@ const mangleExportsInfo = (deterministic, exportsInfo, isNamespace) => {
 				// Can the export be mangled?
 				exportInfo.canMangle !== true ||
 				// Never rename 1 char exports
-				(name.length === 1 && /^[a-zA-Z0-9_$]/.test(name)) ||
+				(name.length === 1 && /^[a-z0-9_$]/i.test(name)) ||
 				// Don't rename 2 char exports in deterministic mode
 				(deterministic &&
 					name.length === 2 &&
-					/^[a-zA-Z_$][a-zA-Z0-9_$]|^[1-9][0-9]/.test(name)) ||
+					/^[a-z_$][a-z0-9_$]|^[1-9][0-9]/i.test(name)) ||
 				// Don't rename exports that are not provided
 				(avoidMangleNonProvided && exportInfo.provided !== true)
 			) {
@@ -119,7 +127,9 @@ const mangleExportsInfo = (deterministic, exportsInfo, isNamespace) => {
 			usedNames.size
 		);
 	} else {
+		/** @type {ExportInfo[]} */
 		const usedExports = [];
+		/** @type {ExportInfo[]} */
 		const unusedExports = [];
 		for (const exportInfo of mangleableExports) {
 			if (exportInfo.getUsed(undefined) === UsageState.Unused) {
@@ -133,6 +143,7 @@ const mangleExportsInfo = (deterministic, exportsInfo, isNamespace) => {
 		let i = 0;
 		for (const list of [usedExports, unusedExports]) {
 			for (const exportInfo of list) {
+				/** @type {string} */
 				let name;
 				do {
 					name = numberToIdentifier(i++);
@@ -150,6 +161,7 @@ class MangleExportsPlugin {
 	 * @param {boolean} deterministic use deterministic names
 	 */
 	constructor(deterministic) {
+		/** @type {boolean} */
 		this._deterministic = deterministic;
 	}
 

package/lib/optimize/MergeDuplicateChunksPlugin.js

@@ -11,6 +11,7 @@ const { runtimeEqual } = require("../util/runtime");
 
 /** @typedef {import("../../declarations/plugins/optimize/MergeDuplicateChunksPlugin").MergeDuplicateChunksPluginOptions} MergeDuplicateChunksPluginOptions */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../Chunk")} Chunk */
 
 const validate = createSchemaValidation(
 	require("../../schemas/plugins/optimize/MergeDuplicateChunksPlugin.check"),
@@ -26,10 +27,11 @@ const PLUGIN_NAME = "MergeDuplicateChunksPlugin";
 
 class MergeDuplicateChunksPlugin {
 	/**
-	 * @param {MergeDuplicateChunksPluginOptions} options options object
+	 * @param {MergeDuplicateChunksPluginOptions=} options options object
 	 */
 	constructor(options = { stage: STAGE_BASIC }) {
 		validate(options);
+		/** @type {MergeDuplicateChunksPluginOptions} */
 		this.options = options;
 	}
 
@@ -48,11 +50,13 @@ class MergeDuplicateChunksPlugin {
 					const { chunkGraph, moduleGraph } = compilation;
 
 					// remember already tested chunks for performance
+					/** @type {Set<Chunk>} */
 					const notDuplicates = new Set();
 
 					// for each chunk
 					for (const chunk of chunks) {
 						// track a Set of all chunk that could be duplicates
+						/** @type {Set<Chunk> | undefined} */
 						let possibleDuplicates;
 						for (const module of chunkGraph.getChunkModulesIterable(chunk)) {
 							if (possibleDuplicates === undefined) {

package/lib/optimize/MinChunkSizePlugin.js

@@ -29,6 +29,7 @@ class MinChunkSizePlugin {
 	 */
 	constructor(options) {
 		validate(options);
+		/** @type {MinChunkSizePluginOptions} */
 		this.options = options;
 	}
 
@@ -53,11 +54,13 @@ class MinChunkSizePlugin {
 						entryChunkMultiplicator: 1
 					};
 
+					/** @type {Map<Chunk, number>} */
 					const chunkSizesMap = new Map();
 					/** @type {[Chunk, Chunk][]} */
 					const combinations = [];
 					/** @type {Chunk[]} */
 					const smallChunks = [];
+					/** @type {Chunk[]} */
 					const visitedChunks = [];
 					for (const a of chunks) {
 						// check if one of the chunks sizes is smaller than the minChunkSize
@@ -83,8 +86,8 @@ class MinChunkSizePlugin {
 					const sortedSizeFilteredExtendedPairCombinations = combinations
 						.map((pair) => {
 							// extend combination pairs with size and integrated size
-							const a = chunkSizesMap.get(pair[0]);
-							const b = chunkSizesMap.get(pair[1]);
+							const a = /** @type {number} */ (chunkSizesMap.get(pair[0]));
+							const b = /** @type {number} */ (chunkSizesMap.get(pair[1]));
 							const ab = chunkGraph.getIntegratedChunksSize(
 								pair[0],
 								pair[1],

package/lib/optimize/ModuleConcatenationPlugin.js

@@ -28,6 +28,8 @@ const ConcatenatedModule = require("./ConcatenatedModule");
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
+/** @typedef {Module | ((requestShortener: RequestShortener) => string)} Problem */
+
 /**
  * @typedef {object} Statistics
  * @property {number} cached
@@ -104,7 +106,7 @@ class ModuleConcatenationPlugin {
 
 			/**
 			 * @param {Module} module the module
-			 * @param {Module | ((requestShortener: RequestShortener) => string)} problem the problem
+			 * @param {Problem} problem the problem
 			 * @returns {(requestShortener: RequestShortener) => string} the reason
 			 */
 			const formatBailoutWarning = (module, problem) => (requestShortener) => {
@@ -143,7 +145,9 @@ class ModuleConcatenationPlugin {
 						"webpack.ModuleConcatenationPlugin"
 					);
 					const { chunkGraph, moduleGraph } = compilation;
+					/** @type {Module[]} */
 					const relevantModules = [];
+					/** @type {Set<Module>} */
 					const possibleInners = new Set();
 					const context = {
 						chunkGraph,
@@ -265,7 +269,9 @@ class ModuleConcatenationPlugin {
 					let statsEmptyConfigurations = 0;
 
 					logger.time("find modules to concatenate");
+					/** @type {ConcatConfiguration[]} */
 					const concatConfigurations = [];
+					/** @type {Set<Module>} */
 					const usedAsInner = new Set();
 					for (const currentRoot of relevantModules) {
 						// when used by another configuration as inner:
@@ -273,6 +279,7 @@ class ModuleConcatenationPlugin {
 						// TODO reconsider that when it's only used in a different runtime
 						if (usedAsInner.has(currentRoot)) continue;
 
+						/** @type {RuntimeSpec} */
 						let chunkRuntime;
 						for (const r of chunkGraph.getModuleRuntimes(currentRoot)) {
 							chunkRuntime = mergeRuntimeOwned(chunkRuntime, r);
@@ -295,6 +302,7 @@ class ModuleConcatenationPlugin {
 						);
 
 						// cache failures to add modules
+						/** @type {Map<Module, Problem>} */
 						const failureCache = new Map();
 
 						// potential optional import candidates
@@ -311,6 +319,7 @@ class ModuleConcatenationPlugin {
 						}
 
 						for (const imp of candidates) {
+							/** @type {Set<Module>} */
 							const impCandidates = new Set();
 							const problem = this._tryToAdd(
 								compilation,
@@ -373,6 +382,7 @@ class ModuleConcatenationPlugin {
 					logger.time("sort concat configurations");
 					concatConfigurations.sort((a, b) => b.modules.size - a.modules.size);
 					logger.timeEnd("sort concat configurations");
+					/** @type {Set<Module>} */
 					const usedModules = new Set();
 
 					logger.time("create concatenated modules");
@@ -515,6 +525,7 @@ class ModuleConcatenationPlugin {
 	 */
 	_getImports(compilation, module, runtime) {
 		const moduleGraph = compilation.moduleGraph;
+		/** @type {Set<Module>} */
 		const set = new Set();
 		for (const dep of module.dependencies) {
 			// Get reference info only for harmony Dependencies
@@ -555,11 +566,11 @@ class ModuleConcatenationPlugin {
 	 * @param {RuntimeSpec} activeRuntime the runtime scope of the root module
 	 * @param {Set<Module>} possibleModules modules that are candidates
 	 * @param {Set<Module>} candidates list of potential candidates (will be added to)
-	 * @param {Map<Module, Module | ((requestShortener: RequestShortener) => string)>} failureCache cache for problematic modules to be more performant
+	 * @param {Map<Module, Problem>} failureCache cache for problematic modules to be more performant
 	 * @param {ChunkGraph} chunkGraph the chunk graph
 	 * @param {boolean} avoidMutateOnFailure avoid mutating the config when adding fails
 	 * @param {Statistics} statistics gathering metrics
-	 * @returns {null | Module | ((requestShortener: RequestShortener) => string)} the problematic module
+	 * @returns {null | Problem} the problematic module
 	 */
 	_tryToAdd(
 		compilation,
@@ -646,6 +657,7 @@ class ModuleConcatenationPlugin {
 				 * @returns {string} problem description
 				 */
 				const problem = (requestShortener) => {
+					/** @type {Set<string>} */
 					const importingExplanations = new Set(
 						activeNonModulesConnections
 							.map((c) => c.explanation)
@@ -674,6 +686,7 @@ class ModuleConcatenationPlugin {
 				if (chunkGraph.getNumberOfModuleChunks(originModule) === 0) continue;
 
 				// We don't care for connections from other runtimes
+				/** @type {RuntimeSpec} */
 				let originRuntime;
 				for (const r of chunkGraph.getModuleRuntimes(originModule)) {
 					originRuntime = mergeRuntimeOwned(originRuntime, r);
@@ -822,6 +835,7 @@ class ModuleConcatenationPlugin {
 			}
 		}
 
+		/** @type {undefined | number} */
 		let backup;
 		if (avoidMutateOnFailure) {
 			backup = config.snapshot();
@@ -864,7 +878,6 @@ class ModuleConcatenationPlugin {
 	}
 }
 
-/** @typedef {Module | ((requestShortener: RequestShortener) => string)} Problem */
 /** @typedef {Map<Module, Problem>} Warnings */
 
 class ConcatConfiguration {
@@ -873,7 +886,9 @@ class ConcatConfiguration {
 	 * @param {RuntimeSpec} runtime the runtime
 	 */
 	constructor(rootModule, runtime) {
+		/** @type {Module} */
 		this.rootModule = rootModule;
+		/** @type {RuntimeSpec} */
 		this.runtime = runtime;
 		/** @type {Set<Module>} */
 		this.modules = new Set();

package/lib/optimize/RealContentHashPlugin.js

@@ -20,6 +20,12 @@ const createHash = require("../util/createHash");
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {typeof import("../util/Hash")} Hash */
 
+/**
+ * @template T
+ * @typedef {import("../util/comparators").Comparator<T>} Comparator
+ */
+
+/** @type {Hashes} */
 const EMPTY_SET = new Set();
 
 /**
@@ -47,6 +53,7 @@ const mapAndDeduplicateBuffers = (input, fn) => {
 	// Buffer.equals compares size first so this should be efficient enough
 	// If it becomes a performance problem we can use a map and group by size
 	// instead of looping over all assets.
+	/** @type {Buffer[]} */
 	const result = [];
 	outer: for (const value of input) {
 		const buf = fn(value);
@@ -65,6 +72,7 @@ const mapAndDeduplicateBuffers = (input, fn) => {
  */
 const quoteMeta = (str) => str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
 
+/** @type {WeakMap<Source, CachedSource>} */
 const cachedSourceMap = new WeakMap();
 
 /**
@@ -82,8 +90,6 @@ const toCachedSource = (source) => {
 	return newSource;
 };
 
-/** @typedef {Set<string>} OwnHashes */
-/** @typedef {Set<string>} ReferencedHashes */
 /** @typedef {Set<string>} Hashes */
 
 /**
@@ -94,10 +100,10 @@ const toCachedSource = (source) => {
  * @property {RawSource | undefined} newSource
  * @property {RawSource | undefined} newSourceWithoutOwn
  * @property {string} content
- * @property {OwnHashes | undefined} ownHashes
+ * @property {Hashes | undefined} ownHashes
  * @property {Promise<void> | undefined} contentComputePromise
  * @property {Promise<void> | undefined} contentComputeWithoutOwnPromise
- * @property {ReferencedHashes | undefined} referencedHashes
+ * @property {Hashes | undefined} referencedHashes
  * @property {Hashes} hashes
  */
 
@@ -142,7 +148,9 @@ class RealContentHashPlugin {
 	 * @param {RealContentHashPluginOptions} options options
 	 */
 	constructor({ hashFunction, hashDigest }) {
+		/** @type {HashFunction} */
 		this._hashFunction = hashFunction;
+		/** @type {HashDigest} */
 		this._hashDigest = hashDigest;
 	}
 
@@ -220,7 +228,9 @@ class RealContentHashPlugin {
 							);
 							[asset.referencedHashes, asset.ownHashes] =
 								await cacheAnalyse.providePromise(name, etag, () => {
+									/** @type {Hashes} */
 									const referencedHashes = new Set();
+									/** @type {Hashes} */
 									const ownHashes = new Set();
 									const inContent = content.match(hashRegExp);
 									if (inContent) {
@@ -238,15 +248,13 @@ class RealContentHashPlugin {
 					);
 					/**
 					 * @param {string} hash the hash
-					 * @returns {undefined | ReferencedHashes} the referenced hashes
+					 * @returns {undefined | Hashes} the referenced hashes
 					 */
 					const getDependencies = (hash) => {
 						const assets = hashToAssets.get(hash);
 						if (!assets) {
 							const referencingAssets = assetsWithInfo.filter((asset) =>
-								/** @type {ReferencedHashes} */ (asset.referencedHashes).has(
-									hash
-								)
+								/** @type {Hashes} */ (asset.referencedHashes).has(hash)
 							);
 							const err = new WebpackError(`RealContentHashPlugin
 Some kind of unexpected caching problem occurred.
@@ -264,16 +272,15 @@ ${referencingAssets
 							compilation.errors.push(err);
 							return;
 						}
+						/** @type {Hashes} */
 						const hashes = new Set();
 						for (const { referencedHashes, ownHashes } of assets) {
-							if (!(/** @type {OwnHashes} */ (ownHashes).has(hash))) {
-								for (const hash of /** @type {OwnHashes} */ (ownHashes)) {
+							if (!(/** @type {Hashes} */ (ownHashes).has(hash))) {
+								for (const hash of /** @type {Hashes} */ (ownHashes)) {
 									hashes.add(hash);
 								}
 							}
-							for (const hash of /** @type {ReferencedHashes} */ (
-								referencedHashes
-							)) {
+							for (const hash of /** @type {Hashes} */ (referencedHashes)) {
 								hashes.add(hash);
 							}
 						}
@@ -290,7 +297,7 @@ ${referencingAssets
 							(a) => a.name
 						)})`;
 					};
-					/** @type {Set<string>} */
+					/** @type {Hashes} */
 					const hashesInOrder = new Set();
 					for (const hash of hashToAssets.keys()) {
 						/**
@@ -329,7 +336,7 @@ ${referencingAssets
 						cacheGenerate.mergeEtags(
 							cacheGenerate.getLazyHashedEtag(asset.source),
 							Array.from(
-								/** @type {ReferencedHashes} */ (asset.referencedHashes),
+								/** @type {Hashes} */ (asset.referencedHashes),
 								(hash) => hashToNewHash.get(hash)
 							).join("|")
 						);
@@ -341,10 +348,10 @@ ${referencingAssets
 						if (asset.contentComputePromise) return asset.contentComputePromise;
 						return (asset.contentComputePromise = (async () => {
 							if (
-								/** @type {OwnHashes} */ (asset.ownHashes).size > 0 ||
-								[
-									.../** @type {ReferencedHashes} */ (asset.referencedHashes)
-								].some((hash) => hashToNewHash.get(hash) !== hash)
+								/** @type {Hashes} */ (asset.ownHashes).size > 0 ||
+								[.../** @type {Hashes} */ (asset.referencedHashes)].some(
+									(hash) => hashToNewHash.get(hash) !== hash
+								)
 							) {
 								const identifier = asset.name;
 								const etag = getEtag(asset);
@@ -372,10 +379,10 @@ ${referencingAssets
 						}
 						return (asset.contentComputeWithoutOwnPromise = (async () => {
 							if (
-								/** @type {OwnHashes} */ (asset.ownHashes).size > 0 ||
-								[
-									.../** @type {ReferencedHashes} */ (asset.referencedHashes)
-								].some((hash) => hashToNewHash.get(hash) !== hash)
+								/** @type {Hashes} */ (asset.ownHashes).size > 0 ||
+								[.../** @type {Hashes} */ (asset.referencedHashes)].some(
+									(hash) => hashToNewHash.get(hash) !== hash
+								)
 							) {
 								const identifier = `${asset.name}|without-own`;
 								const etag = getEtag(asset);
@@ -387,7 +394,7 @@ ${referencingAssets
 											hashRegExp,
 											(hash) => {
 												if (
-													/** @type {OwnHashes} */
+													/** @type {Hashes} */
 													(asset.ownHashes).has(hash)
 												) {
 													return "";
@@ -401,6 +408,7 @@ ${referencingAssets
 							}
 						})());
 					};
+					/** @type {Comparator<AssetInfoForRealContentHash>} */
 					const comparator = compareSelect((a) => a.name, compareStrings);
 					for (const oldHash of hashesInOrder) {
 						const assets =
@@ -409,13 +417,13 @@ ${referencingAssets
 						assets.sort(comparator);
 						await Promise.all(
 							assets.map((asset) =>
-								/** @type {OwnHashes} */ (asset.ownHashes).has(oldHash)
+								/** @type {Hashes} */ (asset.ownHashes).has(oldHash)
 									? computeNewContentWithoutOwn(asset)
 									: computeNewContent(asset)
 							)
 						);
 						const assetsContent = mapAndDeduplicateBuffers(assets, (asset) => {
-							if (/** @type {OwnHashes} */ (asset.ownHashes).has(oldHash)) {
+							if (/** @type {Hashes} */ (asset.ownHashes).has(oldHash)) {
 								return asset.newSourceWithoutOwn
 									? asset.newSourceWithoutOwn.buffer()
 									: asset.source.buffer();
@@ -447,7 +455,9 @@ ${referencingAssets
 							);
 
 							const infoUpdate = {};
-							const hash = /** @type {string} */ (asset.info.contenthash);
+							const hash =
+								/** @type {Exclude<AssetInfo["contenthash"], undefined>} */
+								(asset.info.contenthash);
 							infoUpdate.contenthash = Array.isArray(hash)
 								? hash.map(
 										(hash) => /** @type {string} */ (hashToNewHash.get(hash))