webpack 5.93.0 → 5.94.0

package/lib/FileSystemInfo.js

@@ -16,6 +16,9 @@ const { join, dirname, relative, lstatReadlinkAbsolute } = require("./util/fs");
 const makeSerializable = require("./util/makeSerializable");
 const processAsyncTree = require("./util/processAsyncTree");
 
+/** @typedef {import("enhanced-resolve").Resolver} Resolver */
+/** @typedef {import("enhanced-resolve").ResolveRequest} ResolveRequest */
+/** @typedef {import("enhanced-resolve").ResolveFunctionAsync} ResolveFunctionAsync */
 /** @typedef {import("./WebpackError")} WebpackError */
 /** @typedef {import("./logging/Logger").Logger} Logger */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
@@ -23,9 +26,20 @@ const processAsyncTree = require("./util/processAsyncTree");
 /** @typedef {typeof import("./util/Hash")} Hash */
 /** @typedef {import("./util/fs").IStats} IStats */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
+/** @typedef {import("./util/fs").PathLike} PathLike */
+/** @typedef {import("./util/fs").StringCallback} StringCallback */
+/**
+ * @template T
+ * @typedef {import("./util/AsyncQueue").Callback<T>} ProcessorCallback
+ */
+/**
+ * @template T, R
+ * @typedef {import("./util/AsyncQueue").Processor<T, R>} Processor
+ */
 
-const supportsEsm = +process.versions.modules >= 83;
+const supportsEsm = Number(process.versions.modules) >= 83;
 
+/** @type {Set<string>} */
 const builtinModules = new Set(nodeModule.builtinModules);
 
 let FS_ACCURACY = 2000;
@@ -43,6 +57,8 @@ const RBDT_FILE = 7;
 const RBDT_DIRECTORY_DEPENDENCIES = 8;
 const RBDT_FILE_DEPENDENCIES = 9;
 
+/** @typedef {RBDT_RESOLVE_CJS | RBDT_RESOLVE_ESM | RBDT_RESOLVE_DIRECTORY | RBDT_RESOLVE_CJS_FILE | RBDT_RESOLVE_CJS_FILE_AS_CHILD | RBDT_RESOLVE_ESM_FILE | RBDT_DIRECTORY | RBDT_FILE | RBDT_DIRECTORY_DEPENDENCIES | RBDT_FILE_DEPENDENCIES} JobType */
+
 const INVALID = Symbol("invalid");
 
 /**
@@ -79,27 +95,31 @@ const INVALID = Symbol("invalid");
  * @property {string} hash
  */
 
+/** @typedef {Set<string>} Symlinks */
+
 /**
  * @typedef {object} ContextTimestampAndHash
  * @property {number} safeTime
  * @property {string=} timestampHash
  * @property {string} hash
  * @property {ResolvedContextTimestampAndHash=} resolved
- * @property {Set<string>=} symlinks
+ * @property {Symlinks=} symlinks
  */
 
 /**
  * @typedef {object} ContextHash
  * @property {string} hash
  * @property {string=} resolved
- * @property {Set<string>=} symlinks
+ * @property {Symlinks=} symlinks
  */
 
+/** @typedef {Set<string>} SnapshotContent */
+
 /**
  * @typedef {object} SnapshotOptimizationEntry
  * @property {Snapshot} snapshot
  * @property {number} shared
- * @property {Set<string> | undefined} snapshotContent
+ * @property {SnapshotContent | undefined} snapshotContent
  * @property {Set<SnapshotOptimizationEntry> | undefined} children
  */
 
@@ -108,7 +128,7 @@ const INVALID = Symbol("invalid");
  * @property {Set<string>} files list of files
  * @property {Set<string>} directories list of directories
  * @property {Set<string>} missing list of missing entries
- * @property {Map<string, string | false>} resolveResults stored resolve results
+ * @property {Map<string, string | false | undefined>} resolveResults stored resolve results
  * @property {object} resolveDependencies dependencies of the resolving
  * @property {Set<string>} resolveDependencies.files list of files
  * @property {Set<string>} resolveDependencies.directories list of directories
@@ -128,12 +148,17 @@ const DONE_ITERATOR_RESULT = new Set().keys().next();
 // Tshs = Timestamp + Hash combinations
 
 class SnapshotIterator {
+	/**
+	 * @param {() => IteratorResult<string>} next next
+	 */
 	constructor(next) {
 		this.next = next;
 	}
 }
 
-/** @typedef {(snapshot: Snapshot) => (Map<string, any> | Set<string>)[]} GetMapsFunction */
+/**
+ * @typedef {(snapshot: Snapshot) => (Map<string, any> | Set<string> | undefined)[]} GetMapsFunction
+ */
 
 class SnapshotIterable {
 	/**
@@ -149,12 +174,13 @@ class SnapshotIterable {
 		let state = 0;
 		/** @type {IterableIterator<string>} */
 		let it;
-		/** @type {(snapshot: Snapshot) => (Map<string, any> | Set<string>)[]} */
+		/** @type {(snapshot: Snapshot) => (Map<string, any> | Set<string> | undefined)[]} */
 		let getMaps;
-		/** @type {(Map<string, any> | Set<string>)[]} */
+		/** @type {(Map<string, any> | Set<string> | undefined)[]} */
 		let maps;
 		/** @type {Snapshot} */
 		let snapshot;
+		/** @type {Snapshot[] | undefined} */
 		let queue;
 		return new SnapshotIterator(() => {
 			for (;;) {
@@ -202,7 +228,7 @@ class SnapshotIterable {
 							}
 						}
 						if (queue !== undefined && queue.length > 0) {
-							snapshot = queue.pop();
+							snapshot = /** @type {Snapshot} */ (queue.pop());
 							maps = getMaps(snapshot);
 							state = 1;
 							break;
@@ -225,6 +251,12 @@ class SnapshotIterable {
 /** @typedef {Map<string, ResolvedContextFileSystemInfoEntry | null>} ContextTimestamps */
 /** @typedef {Map<string, string | null>} ContextHashes */
 /** @typedef {Map<string, ResolvedContextTimestampAndHash | null>} ContextTshs */
+/** @typedef {Map<string, boolean>} MissingExistence */
+/** @typedef {Map<string, string>} ManagedItemInfo */
+/** @typedef {Set<string>} ManagedFiles */
+/** @typedef {Set<string>} ManagedContexts */
+/** @typedef {Set<string>} ManagedMissing */
+/** @typedef {Set<Snapshot>} Children */
 
 class Snapshot {
 	constructor() {
@@ -249,17 +281,17 @@ class Snapshot {
 		this.contextHashes = undefined;
 		/** @type {ContextTshs | undefined} */
 		this.contextTshs = undefined;
-		/** @type {Map<string, boolean> | undefined} */
+		/** @type {MissingExistence | undefined} */
 		this.missingExistence = undefined;
-		/** @type {Map<string, string> | undefined} */
+		/** @type {ManagedItemInfo | undefined} */
 		this.managedItemInfo = undefined;
-		/** @type {Set<string> | undefined} */
+		/** @type {ManagedFiles | undefined} */
 		this.managedFiles = undefined;
-		/** @type {Set<string> | undefined} */
+		/** @type {ManagedContexts | undefined} */
 		this.managedContexts = undefined;
-		/** @type {Set<string> | undefined} */
+		/** @type {ManagedMissing | undefined} */
 		this.managedMissing = undefined;
-		/** @type {Set<Snapshot> | undefined} */
+		/** @type {Children | undefined} */
 		this.children = undefined;
 	}
 
@@ -275,15 +307,28 @@ class Snapshot {
 		this.startTime = value;
 	}
 
+	/**
+	 * @param {number | undefined} value value
+	 * @param {Snapshot} snapshot snapshot
+	 */
 	setMergedStartTime(value, snapshot) {
 		if (value) {
 			if (snapshot.hasStartTime()) {
-				this.setStartTime(Math.min(value, snapshot.startTime));
+				this.setStartTime(
+					Math.min(
+						value,
+						/** @type {NonNullable<Snapshot["startTime"]>} */
+						(snapshot.startTime)
+					)
+				);
 			} else {
 				this.setStartTime(value);
 			}
-		} else {
-			if (snapshot.hasStartTime()) this.setStartTime(snapshot.startTime);
+		} else if (snapshot.hasStartTime()) {
+			this.setStartTime(
+				/** @type {NonNullable<Snapshot["startTime"]>} */
+				(snapshot.startTime)
+			);
 		}
 	}
 
@@ -291,6 +336,9 @@ class Snapshot {
 		return (this._flags & 2) !== 0;
 	}
 
+	/**
+	 * @param {FileTimestamps} value file timestamps
+	 */
 	setFileTimestamps(value) {
 		this._flags = this._flags | 2;
 		this.fileTimestamps = value;
@@ -300,6 +348,9 @@ class Snapshot {
 		return (this._flags & 4) !== 0;
 	}
 
+	/**
+	 * @param {FileHashes} value file hashes
+	 */
 	setFileHashes(value) {
 		this._flags = this._flags | 4;
 		this.fileHashes = value;
@@ -309,6 +360,9 @@ class Snapshot {
 		return (this._flags & 8) !== 0;
 	}
 
+	/**
+	 * @param {FileTshs} value file tshs
+	 */
 	setFileTshs(value) {
 		this._flags = this._flags | 8;
 		this.fileTshs = value;
@@ -318,6 +372,9 @@ class Snapshot {
 		return (this._flags & 0x10) !== 0;
 	}
 
+	/**
+	 * @param {ContextTimestamps} value context timestamps
+	 */
 	setContextTimestamps(value) {
 		this._flags = this._flags | 0x10;
 		this.contextTimestamps = value;
@@ -327,6 +384,9 @@ class Snapshot {
 		return (this._flags & 0x20) !== 0;
 	}
 
+	/**
+	 * @param {ContextHashes} value context hashes
+	 */
 	setContextHashes(value) {
 		this._flags = this._flags | 0x20;
 		this.contextHashes = value;
@@ -336,6 +396,9 @@ class Snapshot {
 		return (this._flags & 0x40) !== 0;
 	}
 
+	/**
+	 * @param {ContextTshs} value context tshs
+	 */
 	setContextTshs(value) {
 		this._flags = this._flags | 0x40;
 		this.contextTshs = value;
@@ -345,6 +408,9 @@ class Snapshot {
 		return (this._flags & 0x80) !== 0;
 	}
 
+	/**
+	 * @param {MissingExistence} value context tshs
+	 */
 	setMissingExistence(value) {
 		this._flags = this._flags | 0x80;
 		this.missingExistence = value;
@@ -354,6 +420,9 @@ class Snapshot {
 		return (this._flags & 0x100) !== 0;
 	}
 
+	/**
+	 * @param {ManagedItemInfo} value managed item info
+	 */
 	setManagedItemInfo(value) {
 		this._flags = this._flags | 0x100;
 		this.managedItemInfo = value;
@@ -363,6 +432,9 @@ class Snapshot {
 		return (this._flags & 0x200) !== 0;
 	}
 
+	/**
+	 * @param {ManagedFiles} value managed files
+	 */
 	setManagedFiles(value) {
 		this._flags = this._flags | 0x200;
 		this.managedFiles = value;
@@ -372,6 +444,9 @@ class Snapshot {
 		return (this._flags & 0x400) !== 0;
 	}
 
+	/**
+	 * @param {ManagedContexts} value managed contexts
+	 */
 	setManagedContexts(value) {
 		this._flags = this._flags | 0x400;
 		this.managedContexts = value;
@@ -381,6 +456,9 @@ class Snapshot {
 		return (this._flags & 0x800) !== 0;
 	}
 
+	/**
+	 * @param {ManagedMissing} value managed missing
+	 */
 	setManagedMissing(value) {
 		this._flags = this._flags | 0x800;
 		this.managedMissing = value;
@@ -390,16 +468,23 @@ class Snapshot {
 		return (this._flags & 0x1000) !== 0;
 	}
 
+	/**
+	 * @param {Children} value children
+	 */
 	setChildren(value) {
 		this._flags = this._flags | 0x1000;
 		this.children = value;
 	}
 
+	/**
+	 * @param {Snapshot} child children
+	 */
 	addChild(child) {
 		if (!this.hasChildren()) {
 			this.setChildren(new Set());
 		}
-		this.children.add(child);
+		/** @type {Children} */
+		(this.children).add(child);
 	}
 
 	/**
@@ -498,22 +583,35 @@ makeSerializable(Snapshot, "webpack/lib/FileSystemInfo", "Snapshot");
 
 const MIN_COMMON_SNAPSHOT_SIZE = 3;
 
+/**
+ * @template U, T
+ * @typedef {U extends true ? Set<string> : Map<string, T>} SnapshotOptimizationValue
+ */
+
 /**
  * @template T
+ * @template {boolean} [U=false]
  */
 class SnapshotOptimization {
 	/**
 	 * @param {function(Snapshot): boolean} has has value
-	 * @param {function(Snapshot): Map<string, T> | Set<string>} get get value
-	 * @param {function(Snapshot, Map<string, T> | Set<string>): void} set set value
+	 * @param {function(Snapshot): SnapshotOptimizationValue<U, T> | undefined} get get value
+	 * @param {function(Snapshot, SnapshotOptimizationValue<U, T>): void} set set value
 	 * @param {boolean=} useStartTime use the start time of snapshots
-	 * @param {boolean=} isSet value is an Set instead of a Map
+	 * @param {U=} isSet value is an Set instead of a Map
 	 */
-	constructor(has, get, set, useStartTime = true, isSet = false) {
+	constructor(
+		has,
+		get,
+		set,
+		useStartTime = true,
+		isSet = /** @type {U} */ (false)
+	) {
 		this._has = has;
 		this._get = get;
 		this._set = set;
 		this._useStartTime = useStartTime;
+		/** @type {U} */
 		this._isSet = isSet;
 		/** @type {Map<string, SnapshotOptimizationEntry>} */
 		this._map = new Map();
@@ -525,7 +623,7 @@ class SnapshotOptimization {
 
 	getStatisticMessage() {
 		const total = this._statItemsShared + this._statItemsUnshared;
-		if (total === 0) return undefined;
+		if (total === 0) return;
 		return `${
 			this._statItemsShared && Math.round((this._statItemsShared * 100) / total)
 		}% (${this._statItemsShared}/${total}) entries shared via ${
@@ -555,7 +653,9 @@ class SnapshotOptimization {
 		 */
 		const increaseSharedAndStoreOptimizationEntry = entry => {
 			if (entry.children !== undefined) {
-				entry.children.forEach(increaseSharedAndStoreOptimizationEntry);
+				for (const child of entry.children) {
+					increaseSharedAndStoreOptimizationEntry(child);
+				}
 			}
 			entry.shared++;
 			storeOptimizationEntry(entry);
@@ -565,8 +665,12 @@ class SnapshotOptimization {
 		 * @returns {void}
 		 */
 		const storeOptimizationEntry = entry => {
-			for (const path of entry.snapshotContent) {
-				const old = this._map.get(path);
+			for (const path of /** @type {SnapshotContent} */ (
+				entry.snapshotContent
+			)) {
+				const old =
+					/** @type {SnapshotOptimizationEntry} */
+					(this._map.get(path));
 				if (old.shared < entry.shared) {
 					this._map.set(path, entry);
 				}
@@ -575,7 +679,7 @@ class SnapshotOptimization {
 		};
 
 		/** @type {SnapshotOptimizationEntry | undefined} */
-		let newOptimizationEntry = undefined;
+		let newOptimizationEntry;
 
 		const capturedFilesSize = capturedFiles.size;
 
@@ -600,7 +704,7 @@ class SnapshotOptimization {
 			}
 		}
 
-		optimizationEntries: for (const optimizationEntry of optimizationEntries) {
+		optimizationEntriesLabel: for (const optimizationEntry of optimizationEntries) {
 			const snapshot = optimizationEntry.snapshot;
 			if (optimizationEntry.shared > 0) {
 				// It's a shared snapshot
@@ -614,14 +718,18 @@ class SnapshotOptimization {
 					continue;
 				}
 				const nonSharedFiles = new Set();
-				const snapshotContent = optimizationEntry.snapshotContent;
-				const snapshotEntries = this._get(snapshot);
+				const snapshotContent =
+					/** @type {NonNullable<SnapshotOptimizationEntry["snapshotContent"]>} */
+					(optimizationEntry.snapshotContent);
+				const snapshotEntries =
+					/** @type {SnapshotOptimizationValue<U, T>} */
+					(this._get(snapshot));
 				for (const path of snapshotContent) {
 					if (!capturedFiles.has(path)) {
 						if (!snapshotEntries.has(path)) {
 							// File is not shared and can't be removed from the snapshot
 							// because it's in a child of the snapshot
-							continue optimizationEntries;
+							continue optimizationEntriesLabel;
 						}
 						nonSharedFiles.add(path);
 						continue;
@@ -638,7 +746,7 @@ class SnapshotOptimization {
 					const sharedCount = snapshotContent.size - nonSharedFiles.size;
 					if (sharedCount < MIN_COMMON_SNAPSHOT_SIZE) {
 						// Common part it too small
-						continue optimizationEntries;
+						continue;
 					}
 					// Extract common timestamps from both snapshots
 					let commonMap;
@@ -663,7 +771,10 @@ class SnapshotOptimization {
 					if (this._useStartTime) {
 						commonSnapshot.setMergedStartTime(newSnapshot.startTime, snapshot);
 					}
-					this._set(commonSnapshot, commonMap);
+					this._set(
+						commonSnapshot,
+						/** @type {SnapshotOptimizationValue<U, T>} */ (commonMap)
+					);
 					newSnapshot.addChild(commonSnapshot);
 					snapshot.addChild(commonSnapshot);
 					// Create optimization entry
@@ -686,7 +797,7 @@ class SnapshotOptimization {
 				const snapshotEntries = this._get(snapshot);
 				if (snapshotEntries === undefined) {
 					// Incomplete snapshot, that can't be used
-					continue optimizationEntries;
+					continue;
 				}
 				let commonMap;
 				if (this._isSet) {
@@ -713,14 +824,18 @@ class SnapshotOptimization {
 
 				if (commonMap.size < MIN_COMMON_SNAPSHOT_SIZE) {
 					// Common part it too small
-					continue optimizationEntries;
+					continue;
 				}
 				// Create and attach snapshot
 				const commonSnapshot = new Snapshot();
 				if (this._useStartTime) {
 					commonSnapshot.setMergedStartTime(newSnapshot.startTime, snapshot);
 				}
-				this._set(commonSnapshot, commonMap);
+				this._set(
+					commonSnapshot,
+					/** @type {SnapshotOptimizationValue<U, T>} */
+					(commonMap)
+				);
 				newSnapshot.addChild(commonSnapshot);
 				snapshot.addChild(commonSnapshot);
 				// Remove files from snapshot
@@ -746,7 +861,7 @@ class SnapshotOptimization {
 
 /**
  * @param {string} str input
- * @returns {TODO} result
+ * @returns {string} result
  */
 const parseString = str => {
 	if (str[0] === "'" || str[0] === "`")
@@ -768,13 +883,14 @@ const applyMtime = mtime => {
 /**
  * @template T
  * @template K
- * @param {Map<T, K>} a source map
- * @param {Map<T, K>} b joining map
+ * @param {Map<T, K> | undefined} a source map
+ * @param {Map<T, K> | undefined} b joining map
  * @returns {Map<T, K>} joined map
  */
 const mergeMaps = (a, b) => {
-	if (!b || b.size === 0) return a;
-	if (!a || a.size === 0) return b;
+	if (!b || b.size === 0) return /** @type {Map<T, K>} */ (a);
+	if (!a || a.size === 0) return /** @type {Map<T, K>} */ (b);
+	/** @type {Map<T, K>} */
 	const map = new Map(a);
 	for (const [key, value] of b) {
 		map.set(key, value);
@@ -784,13 +900,14 @@ const mergeMaps = (a, b) => {
 
 /**
  * @template T
- * @param {Set<T>} a source map
- * @param {Set<T>} b joining map
+ * @param {Set<T> | undefined} a source map
+ * @param {Set<T> | undefined} b joining map
  * @returns {Set<T>} joined map
  */
 const mergeSets = (a, b) => {
-	if (!b || b.size === 0) return a;
-	if (!a || a.size === 0) return b;
+	if (!b || b.size === 0) return /** @type {Set<T>} */ (a);
+	if (!a || a.size === 0) return /** @type {Set<T>} */ (b);
+	/** @type {Set<T>} */
 	const map = new Set(a);
 	for (const item of b) {
 		map.add(item);
@@ -912,6 +1029,8 @@ const addAll = (source, target) => {
 	for (const key of source) target.add(key);
 };
 
+/** @typedef {Set<string>} LoggedPaths */
+
 /**
  * Used to access information about the filesystem in a cached way
  */
@@ -938,9 +1057,10 @@ class FileSystemInfo {
 		this.fs = fs;
 		this.logger = logger;
 		this._remainingLogs = logger ? 40 : 0;
+		/** @type {LoggedPaths | undefined} */
 		this._loggedPaths = logger ? new Set() : undefined;
 		this._hashFunction = hashFunction;
-		/** @type {WeakMap<Snapshot, boolean | (function(WebpackError=, boolean=): void)[]>} */
+		/** @type {WeakMap<Snapshot, boolean | (function((WebpackError | null)=, boolean=): void)[]>} */
 		this._snapshotCache = new WeakMap();
 		this._fileTimestampsOptimization = new SnapshotOptimization(
 			s => s.hasFileTimestamps(),
@@ -1021,37 +1141,37 @@ class FileSystemInfo {
 		this._contextTshs = new Map();
 		/** @type {Map<string, string>} */
 		this._managedItems = new Map();
-		/** @type {AsyncQueue<string, string, FileSystemInfoEntry | null>} */
+		/** @type {AsyncQueue<string, string, FileSystemInfoEntry>} */
 		this.fileTimestampQueue = new AsyncQueue({
 			name: "file timestamp",
 			parallelism: 30,
 			processor: this._readFileTimestamp.bind(this)
 		});
-		/** @type {AsyncQueue<string, string, string | null>} */
+		/** @type {AsyncQueue<string, string, string>} */
 		this.fileHashQueue = new AsyncQueue({
 			name: "file hash",
 			parallelism: 10,
 			processor: this._readFileHash.bind(this)
 		});
-		/** @type {AsyncQueue<string, string, ContextFileSystemInfoEntry | null>} */
+		/** @type {AsyncQueue<string, string, ContextFileSystemInfoEntry>} */
 		this.contextTimestampQueue = new AsyncQueue({
 			name: "context timestamp",
 			parallelism: 2,
 			processor: this._readContextTimestamp.bind(this)
 		});
-		/** @type {AsyncQueue<string, string, ContextHash | null>} */
+		/** @type {AsyncQueue<string, string, ContextHash>} */
 		this.contextHashQueue = new AsyncQueue({
 			name: "context hash",
 			parallelism: 2,
 			processor: this._readContextHash.bind(this)
 		});
-		/** @type {AsyncQueue<string, string, ContextTimestampAndHash | null>} */
+		/** @type {AsyncQueue<string, string, ContextTimestampAndHash>} */
 		this.contextTshQueue = new AsyncQueue({
 			name: "context hash and timestamp",
 			parallelism: 2,
 			processor: this._readContextTimestampAndHash.bind(this)
 		});
-		/** @type {AsyncQueue<string, string, string | null>} */
+		/** @type {AsyncQueue<string, string, string>} */
 		this.managedItemQueue = new AsyncQueue({
 			name: "managed item info",
 			parallelism: 10,
@@ -1140,51 +1260,51 @@ class FileSystemInfo {
 			`File info in cache: ${this._fileTimestamps.size} timestamps ${this._fileHashes.size} hashes ${this._fileTshs.size} timestamp hash combinations`
 		);
 		logWhenMessage(
-			`File timestamp snapshot optimization`,
+			"File timestamp snapshot optimization",
 			this._fileTimestampsOptimization.getStatisticMessage()
 		);
 		logWhenMessage(
-			`File hash snapshot optimization`,
+			"File hash snapshot optimization",
 			this._fileHashesOptimization.getStatisticMessage()
 		);
 		logWhenMessage(
-			`File timestamp hash combination snapshot optimization`,
+			"File timestamp hash combination snapshot optimization",
 			this._fileTshsOptimization.getStatisticMessage()
 		);
 		logger.log(
 			`Directory info in cache: ${this._contextTimestamps.size} timestamps ${this._contextHashes.size} hashes ${this._contextTshs.size} timestamp hash combinations`
 		);
 		logWhenMessage(
-			`Directory timestamp snapshot optimization`,
+			"Directory timestamp snapshot optimization",
 			this._contextTimestampsOptimization.getStatisticMessage()
 		);
 		logWhenMessage(
-			`Directory hash snapshot optimization`,
+			"Directory hash snapshot optimization",
 			this._contextHashesOptimization.getStatisticMessage()
 		);
 		logWhenMessage(
-			`Directory timestamp hash combination snapshot optimization`,
+			"Directory timestamp hash combination snapshot optimization",
 			this._contextTshsOptimization.getStatisticMessage()
 		);
 		logWhenMessage(
-			`Missing items snapshot optimization`,
+			"Missing items snapshot optimization",
 			this._missingExistenceOptimization.getStatisticMessage()
 		);
 		logger.log(`Managed items info in cache: ${this._managedItems.size} items`);
 		logWhenMessage(
-			`Managed items snapshot optimization`,
+			"Managed items snapshot optimization",
 			this._managedItemInfoOptimization.getStatisticMessage()
 		);
 		logWhenMessage(
-			`Managed files snapshot optimization`,
+			"Managed files snapshot optimization",
 			this._managedFilesOptimization.getStatisticMessage()
 		);
 		logWhenMessage(
-			`Managed contexts snapshot optimization`,
+			"Managed contexts snapshot optimization",
 			this._managedContextsOptimization.getStatisticMessage()
 		);
 		logWhenMessage(
-			`Managed missing snapshot optimization`,
+			"Managed missing snapshot optimization",
 			this._managedMissingOptimization.getStatisticMessage()
 		);
 	}
@@ -1196,11 +1316,14 @@ class FileSystemInfo {
 	 */
 	_log(path, reason, ...args) {
 		const key = path + reason;
-		if (this._loggedPaths.has(key)) return;
-		this._loggedPaths.add(key);
-		this.logger.debug(`${path} invalidated because ${reason}`, ...args);
+		const loggedPaths = /** @type {LoggedPaths} */ (this._loggedPaths);
+		if (loggedPaths.has(key)) return;
+		loggedPaths.add(key);
+		/** @type {Logger} */
+		(this.logger).debug(`${path} invalidated because ${reason}`, ...args);
 		if (--this._remainingLogs === 0) {
-			this.logger.debug(
+			/** @type {Logger} */
+			(this.logger).debug(
 				"Logging limit has been reached and no further logging will be emitted by FileSystemInfo"
 			);
 		}
@@ -1284,10 +1407,15 @@ class FileSystemInfo {
 			if (cache === "ignore") return callback(null, "ignore");
 			const resolved = getResolvedTimestamp(cache);
 			if (resolved !== undefined) return callback(null, resolved);
-			return this._resolveContextTimestamp(cache, callback);
+			return this._resolveContextTimestamp(
+				/** @type {ResolvedContextFileSystemInfoEntry} */
+				(cache),
+				callback
+			);
 		}
-		this.contextTimestampQueue.add(path, (err, entry) => {
+		this.contextTimestampQueue.add(path, (err, _entry) => {
 			if (err) return callback(err);
+			const entry = /** @type {ContextFileSystemInfoEntry} */ (_entry);
 			const resolved = getResolvedTimestamp(entry);
 			if (resolved !== undefined) return callback(null, resolved);
 			this._resolveContextTimestamp(entry, callback);
@@ -1329,8 +1457,9 @@ class FileSystemInfo {
 				return callback(null, /** @type {string} */ (resolved));
 			return this._resolveContextHash(cache, callback);
 		}
-		this.contextHashQueue.add(path, (err, entry) => {
+		this.contextHashQueue.add(path, (err, _entry) => {
 			if (err) return callback(err);
+			const entry = /** @type {ContextHash} */ (_entry);
 			const resolved = getResolvedHash(entry);
 			if (resolved !== undefined)
 				return callback(null, /** @type {string} */ (resolved));
@@ -1351,7 +1480,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {string} path context path
-	 * @param {function((WebpackError | null)=, ResolvedContextTimestampAndHash=): void} callback callback function
+	 * @param {function((WebpackError | null)=, (ResolvedContextTimestampAndHash | null)=): void} callback callback function
 	 * @returns {void}
 	 */
 	getContextTsh(path, callback) {
@@ -1361,8 +1490,9 @@ class FileSystemInfo {
 			if (resolved !== undefined) return callback(null, resolved);
 			return this._resolveContextTsh(cache, callback);
 		}
-		this.contextTshQueue.add(path, (err, entry) => {
+		this.contextTshQueue.add(path, (err, _entry) => {
 			if (err) return callback(err);
+			const entry = /** @type {ContextTimestampAndHash} */ (_entry);
 			const resolved = getResolvedTimestamp(entry);
 			if (resolved !== undefined) return callback(null, resolved);
 			this._resolveContextTsh(entry, callback);
@@ -1443,12 +1573,17 @@ class FileSystemInfo {
 			missingDependencies: resolveMissing
 		};
 		/**
-		 * @param {string} expected expected result
+		 * @param {undefined | boolean | string} expected expected result
 		 * @returns {string} expected result
 		 */
-		const expectedToString = expected => {
-			return expected ? ` (expected ${expected})` : "";
-		};
+		const expectedToString = expected =>
+			expected ? ` (expected ${expected})` : "";
+		/** @typedef {{ type: JobType, context: string | undefined, path: string, issuer: Job | undefined, expected: undefined | boolean | string }} Job */
+
+		/**
+		 * @param {Job} job job
+		 * @returns {`resolve commonjs file ${string}${string}`|`resolve esm file ${string}${string}`|`resolve esm ${string}${string}`|`resolve directory ${string}`|`file ${string}`|`unknown ${string} ${string}`|`resolve commonjs ${string}${string}`|`directory ${string}`|`file dependencies ${string}`|`directory dependencies ${string}`} result
+		 */
 		const jobToString = job => {
 			switch (job.type) {
 				case RBDT_RESOLVE_CJS:
@@ -1478,105 +1613,135 @@ class FileSystemInfo {
 			}
 			return `unknown ${job.type} ${job.path}`;
 		};
+		/**
+		 * @param {Job} job job
+		 * @returns {string} string value
+		 */
 		const pathToString = job => {
 			let result = ` at ${jobToString(job)}`;
-			job = job.issuer;
+			/** @type {Job | undefined} */
+			(job) = job.issuer;
 			while (job !== undefined) {
 				result += `\n at ${jobToString(job)}`;
-				job = job.issuer;
+				job = /** @type {Job} */ (job.issuer);
 			}
 			return result;
 		};
+		const logger = /** @type {Logger} */ (this.logger);
 		processAsyncTree(
-			Array.from(deps, dep => ({
-				type: RBDT_RESOLVE_CJS,
-				context,
-				path: dep,
-				expected: undefined,
-				issuer: undefined
-			})),
+			Array.from(
+				deps,
+				dep =>
+					/** @type {Job} */ ({
+						type: RBDT_RESOLVE_CJS,
+						context,
+						path: dep,
+						expected: undefined,
+						issuer: undefined
+					})
+			),
 			20,
 			(job, push, callback) => {
 				const { type, context, path, expected } = job;
+				/**
+				 * @param {string} path path
+				 * @returns {void}
+				 */
 				const resolveDirectory = path => {
 					const key = `d\n${context}\n${path}`;
 					if (resolveResults.has(key)) {
 						return callback();
 					}
 					resolveResults.set(key, undefined);
-					resolveContext(context, path, resolverContext, (err, _, result) => {
-						if (err) {
-							if (expected === false) {
-								resolveResults.set(key, false);
-								return callback();
-							}
-							invalidResolveResults.add(key);
-							err.message += `\nwhile resolving '${path}' in ${context} to a directory`;
-							return callback(err);
-						}
-						const resultPath = result.path;
-						resolveResults.set(key, resultPath);
-						push({
-							type: RBDT_DIRECTORY,
-							context: undefined,
-							path: /** @type {string} */ (resultPath),
-							expected: undefined,
-							issuer: job
-						});
-						callback();
-					});
-				};
-				const resolveFile = (path, symbol, resolve) => {
-					const key = `${symbol}\n${context}\n${path}`;
-					if (resolveResults.has(key)) {
-						return callback();
-					}
-					resolveResults.set(key, undefined);
-					resolve(context, path, resolverContext, (err, _, result) => {
-						if (typeof expected === "string") {
-							if (!err && result && result.path === expected) {
-								resolveResults.set(key, result.path);
-							} else {
-								invalidResolveResults.add(key);
-								/** @type {Logger} */
-								(this.logger).warn(
-									`Resolving '${path}' in ${context} for build dependencies doesn't lead to expected result '${expected}', but to '${
-										err || (result && result.path)
-									}' instead. Resolving dependencies are ignored for this path.\n${pathToString(
-										job
-									)}`
-								);
-							}
-						} else {
+					resolveContext(
+						/** @type {string} */ (context),
+						path,
+						resolverContext,
+						(err, _, result) => {
 							if (err) {
 								if (expected === false) {
 									resolveResults.set(key, false);
 									return callback();
 								}
 								invalidResolveResults.add(key);
-								err.message += `\nwhile resolving '${path}' in ${context} as file\n${pathToString(
-									job
-								)}`;
+								err.message += `\nwhile resolving '${path}' in ${context} to a directory`;
 								return callback(err);
 							}
-							const resultPath = result.path;
+							const resultPath = /** @type {ResolveRequest} */ (result).path;
 							resolveResults.set(key, resultPath);
 							push({
-								type: RBDT_FILE,
+								type: RBDT_DIRECTORY,
 								context: undefined,
-								path: resultPath,
+								path: /** @type {string} */ (resultPath),
 								expected: undefined,
 								issuer: job
 							});
+							callback();
 						}
-						callback();
-					});
+					);
+				};
+				/**
+				 * @param {string} path path
+				 * @param {("f" | "c" | "e")=} symbol symbol
+				 * @param {(ResolveFunctionAsync)=} resolve resolve fn
+				 * @returns {void}
+				 */
+				const resolveFile = (path, symbol, resolve) => {
+					const key = `${symbol}\n${context}\n${path}`;
+					if (resolveResults.has(key)) {
+						return callback();
+					}
+					resolveResults.set(key, undefined);
+					/** @type {ResolveFunctionAsync} */
+					(resolve)(
+						/** @type {string} */ (context),
+						path,
+						resolverContext,
+						(err, _, result) => {
+							if (typeof expected === "string") {
+								if (!err && result && result.path === expected) {
+									resolveResults.set(key, result.path);
+								} else {
+									invalidResolveResults.add(key);
+									logger.warn(
+										`Resolving '${path}' in ${context} for build dependencies doesn't lead to expected result '${expected}', but to '${
+											err || (result && result.path)
+										}' instead. Resolving dependencies are ignored for this path.\n${pathToString(
+											job
+										)}`
+									);
+								}
+							} else {
+								if (err) {
+									if (expected === false) {
+										resolveResults.set(key, false);
+										return callback();
+									}
+									invalidResolveResults.add(key);
+									err.message += `\nwhile resolving '${path}' in ${context} as file\n${pathToString(
+										job
+									)}`;
+									return callback(err);
+								}
+								const resultPath = /** @type {ResolveRequest} */ (result).path;
+								resolveResults.set(key, resultPath);
+								push({
+									type: RBDT_FILE,
+									context: undefined,
+									path: /** @type {string} */ (resultPath),
+									expected: undefined,
+									issuer: job
+								});
+							}
+							callback();
+						}
+					);
 				};
 				switch (type) {
 					case RBDT_RESOLVE_CJS: {
 						const isDirectory = /[\\/]$/.test(path);
 						if (isDirectory) {
-							resolveDirectory(path.slice(0, path.length - 1));
+							resolveDirectory(path.slice(0, -1));
 						} else {
 							resolveFile(path, "f", resolveCjs);
 						}
@@ -1585,7 +1750,7 @@ class FileSystemInfo {
 					case RBDT_RESOLVE_ESM: {
 						const isDirectory = /[\\/]$/.test(path);
 						if (isDirectory) {
-							resolveDirectory(path.slice(0, path.length - 1));
+							resolveDirectory(path.slice(0, -1));
 						} else {
 							resolveFile(path);
 						}
@@ -1613,7 +1778,8 @@ class FileSystemInfo {
 							break;
 						}
 						files.add(path);
-						this.fs.realpath(path, (err, _realPath) => {
+						/** @type {NonNullable<InputFileSystem["realpath"]>} */
+						(this.fs.realpath)(path, (err, _realPath) => {
 							if (err) return callback(err);
 							const realPath = /** @type {string} */ (_realPath);
 							if (realPath !== path) {
@@ -1639,7 +1805,8 @@ class FileSystemInfo {
 							break;
 						}
 						directories.add(path);
-						this.fs.realpath(path, (err, _realPath) => {
+						/** @type {NonNullable<InputFileSystem["realpath"]>} */
+						(this.fs.realpath)(path, (err, _realPath) => {
 							if (err) return callback(err);
 							const realPath = /** @type {string} */ (_realPath);
 							if (realPath !== path) {
@@ -1670,7 +1837,7 @@ class FileSystemInfo {
 						const module = require.cache[path];
 						if (module && Array.isArray(module.children)) {
 							children: for (const child of module.children) {
-								let childPath = child.filename;
+								const childPath = child.filename;
 								if (childPath) {
 									push({
 										type: RBDT_FILE,
@@ -1682,7 +1849,7 @@ class FileSystemInfo {
 									const context = dirname(this.fs, path);
 									for (const modulePath of module.paths) {
 										if (childPath.startsWith(modulePath)) {
-											let subPath = childPath.slice(modulePath.length + 1);
+											const subPath = childPath.slice(modulePath.length + 1);
 											const packageMatch = /^(@[^\\/]+[\\/])[^\\/]+/.exec(
 												subPath
 											);
@@ -1690,12 +1857,12 @@ class FileSystemInfo {
 												push({
 													type: RBDT_FILE,
 													context: undefined,
-													path:
+													path: `${
 														modulePath +
 														childPath[modulePath.length] +
 														packageMatch[0] +
-														childPath[modulePath.length] +
-														"package.json",
+														childPath[modulePath.length]
+													}package.json`,
 													expected: false,
 													issuer: job
 												});
@@ -1730,7 +1897,7 @@ class FileSystemInfo {
 							}
 						} else if (supportsEsm && /\.m?js$/.test(path)) {
 							if (!this._warnAboutExperimentalEsmTracking) {
-								this.logger.log(
+								logger.log(
 									"Node.js doesn't offer a (nice) way to introspect the ESM dependency graph yet.\n" +
 										"Until a full solution is available webpack uses an experimental ESM tracking based on parsing.\n" +
 										"As best effort webpack parses the ESM files to guess dependencies. But this can lead to expensive and incorrect tracking."
@@ -1743,7 +1910,7 @@ class FileSystemInfo {
 									if (err) return callback(err);
 									try {
 										const context = dirname(this.fs, path);
-										const source = content.toString();
+										const source = /** @type {Buffer} */ (content).toString();
 										const [imports] = lexer.parse(source);
 										for (const imp of imports) {
 											try {
@@ -1755,7 +1922,7 @@ class FileSystemInfo {
 													);
 												} else if (imp.d > -1) {
 													// import()
-													let expr = source.substring(imp.s, imp.e).trim();
+													const expr = source.substring(imp.s, imp.e).trim();
 													dependency = parseString(expr);
 												} else {
 													// e.g. import.meta
@@ -1773,34 +1940,34 @@ class FileSystemInfo {
 													expected: imp.d > -1 ? false : undefined,
 													issuer: job
 												});
-											} catch (e) {
-												this.logger.warn(
+											} catch (err1) {
+												logger.warn(
 													`Parsing of ${path} for build dependencies failed at 'import(${source.substring(
 														imp.s,
 														imp.e
 													)})'.\n` +
 														"Build dependencies behind this expression are ignored and might cause incorrect cache invalidation."
 												);
-												this.logger.debug(pathToString(job));
-												this.logger.debug(e.stack);
+												logger.debug(pathToString(job));
+												logger.debug(/** @type {Error} */ (err1).stack);
 											}
 										}
-									} catch (e) {
-										this.logger.warn(
+									} catch (err2) {
+										logger.warn(
 											`Parsing of ${path} for build dependencies failed and all dependencies of this file are ignored, which might cause incorrect cache invalidation..`
 										);
-										this.logger.debug(pathToString(job));
-										this.logger.debug(e.stack);
+										logger.debug(pathToString(job));
+										logger.debug(/** @type {Error} */ (err2).stack);
 									}
 									process.nextTick(callback);
 								});
 							}, callback);
 							break;
 						} else {
-							this.logger.log(
+							logger.log(
 								`Assuming ${path} has no dependencies as we were unable to assign it to any module system.`
 							);
-							this.logger.debug(pathToString(job));
+							logger.debug(pathToString(job));
 						}
 						process.nextTick(callback);
 						break;
@@ -1832,9 +1999,11 @@ class FileSystemInfo {
 							resolveFiles.add(packageJson);
 							let packageData;
 							try {
-								packageData = JSON.parse(content.toString("utf-8"));
-							} catch (e) {
-								return callback(e);
+								packageData = JSON.parse(
+									/** @type {Buffer} */ (content).toString("utf-8")
+								);
+							} catch (parseErr) {
+								return callback(/** @type {Error} */ (parseErr));
 							}
 							const depsObject = packageData.dependencies;
 							const optionalDepsObject = packageData.optionalDependencies;
@@ -1908,7 +2077,7 @@ class FileSystemInfo {
 							if (expectedResult === false)
 								return callback(err ? undefined : INVALID);
 							if (err) return callback(err);
-							const resultPath = result.path;
+							const resultPath = /** @type {ResolveRequest} */ (result).path;
 							if (resultPath !== expectedResult) return callback(INVALID);
 							callback();
 						});
@@ -1918,7 +2087,7 @@ class FileSystemInfo {
 							if (expectedResult === false)
 								return callback(err ? undefined : INVALID);
 							if (err) return callback(err);
-							const resultPath = result.path;
+							const resultPath = /** @type {ResolveRequest} */ (result).path;
 							if (resultPath !== expectedResult) return callback(INVALID);
 							callback();
 						});
@@ -1928,7 +2097,7 @@ class FileSystemInfo {
 							if (expectedResult === false)
 								return callback(err ? undefined : INVALID);
 							if (err) return callback(err);
-							const resultPath = result.path;
+							const resultPath = /** @type {ResolveRequest} */ (result).path;
 							if (resultPath !== expectedResult) return callback(INVALID);
 							callback();
 						});
@@ -1938,7 +2107,7 @@ class FileSystemInfo {
 							if (expectedResult === false)
 								return callback(err ? undefined : INVALID);
 							if (err) return callback(err);
-							const resultPath = result.path;
+							const resultPath = /** @type {ResolveRequest} */ (result).path;
 							if (resultPath !== expectedResult) return callback(INVALID);
 							callback();
 						});
@@ -1965,39 +2134,38 @@ class FileSystemInfo {
 	}
 
 	/**
-	 *
 	 * @param {number | null | undefined} startTime when processing the files has started
 	 * @param {Iterable<string> | null} files all files
 	 * @param {Iterable<string> | null} directories all directories
 	 * @param {Iterable<string> | null} missing all missing files or directories
 	 * @param {SnapshotOptions | null | undefined} options options object (for future extensions)
-	 * @param {function((WebpackError | null)=, (Snapshot | null)=): void} callback callback function
+	 * @param {function(WebpackError | null, Snapshot | null): void} callback callback function
 	 * @returns {void}
 	 */
 	createSnapshot(startTime, files, directories, missing, options, callback) {
-		/** @type {Map<string, FileSystemInfoEntry | null>} */
+		/** @type {FileTimestamps} */
 		const fileTimestamps = new Map();
-		/** @type {Map<string, string | null>} */
+		/** @type {FileHashes} */
 		const fileHashes = new Map();
-		/** @type {Map<string, TimestampAndHash | string | null>} */
+		/** @type {FileTshs} */
 		const fileTshs = new Map();
-		/** @type {Map<string, FileSystemInfoEntry | null>} */
+		/** @type {ContextTimestamps} */
 		const contextTimestamps = new Map();
-		/** @type {Map<string, string | null>} */
+		/** @type {ContextHashes} */
 		const contextHashes = new Map();
-		/** @type {Map<string, ResolvedContextTimestampAndHash | null>} */
+		/** @type {ContextTshs} */
 		const contextTshs = new Map();
-		/** @type {Map<string, boolean>} */
+		/** @type {MissingExistence} */
 		const missingExistence = new Map();
-		/** @type {Map<string, string>} */
+		/** @type {ManagedItemInfo} */
 		const managedItemInfo = new Map();
-		/** @type {Set<string>} */
+		/** @type {ManagedFiles} */
 		const managedFiles = new Set();
-		/** @type {Set<string>} */
+		/** @type {ManagedContexts} */
 		const managedContexts = new Set();
-		/** @type {Set<string>} */
+		/** @type {ManagedMissing} */
 		const managedMissing = new Set();
-		/** @type {Set<Snapshot>} */
+		/** @type {Children} */
 		const children = new Set();
 
 		const snapshot = new Snapshot();
@@ -2064,6 +2232,11 @@ class FileSystemInfo {
 				callback(null, null);
 			}
 		};
+		/**
+		 * @param {string} path path
+		 * @param {Set<string>} managedSet managed set
+		 * @returns {boolean} true when managed
+		 */
 		const checkManaged = (path, managedSet) => {
 			for (const unmanagedPath of this.unmanagedPathsRegExps) {
 				if (unmanagedPath.test(path)) return false;
@@ -2106,6 +2279,11 @@ class FileSystemInfo {
 			}
 			return false;
 		};
+		/**
+		 * @param {Iterable<string>} items items
+		 * @param {Set<string>} managedSet managed set
+		 * @returns {Set<string>} result
+		 */
 		const captureNonManaged = (items, managedSet) => {
 			const capturedItems = new Set();
 			for (const path of items) {
@@ -2135,7 +2313,7 @@ class FileSystemInfo {
 									}
 									jobError();
 								} else {
-									fileTshs.set(path, entry);
+									fileTshs.set(path, /** @type {TimestampAndHash} */ (entry));
 									jobDone();
 								}
 							});
@@ -2159,7 +2337,7 @@ class FileSystemInfo {
 									}
 									jobError();
 								} else {
-									fileHashes.set(path, entry);
+									fileHashes.set(path, /** @type {string} */ (entry));
 									jobDone();
 								}
 							});
@@ -2185,7 +2363,11 @@ class FileSystemInfo {
 									}
 									jobError();
 								} else {
-									fileTimestamps.set(path, entry);
+									fileTimestamps.set(
+										path,
+										/** @type {FileSystemInfoEntry} */
+										(entry)
+									);
 									jobDone();
 								}
 							});
@@ -2197,13 +2379,16 @@ class FileSystemInfo {
 		if (files) {
 			processCapturedFiles(captureNonManaged(files, managedFiles));
 		}
+		/**
+		 * @param {Set<string>} capturedDirectories captured directories
+		 */
 		const processCapturedDirectories = capturedDirectories => {
 			switch (mode) {
 				case 3:
 					this._contextTshsOptimization.optimize(snapshot, capturedDirectories);
 					for (const path of capturedDirectories) {
 						const cache = this._contextTshs.get(path);
-						/** @type {ResolvedContextTimestampAndHash} */
+						/** @type {ResolvedContextTimestampAndHash | null | undefined} */
 						let resolved;
 						if (
 							cache !== undefined &&
@@ -2213,8 +2398,8 @@ class FileSystemInfo {
 						} else {
 							jobs++;
 							/**
-							 * @param {Error=} err error
-							 * @param {ResolvedContextTimestampAndHash=} entry entry
+							 * @param {(WebpackError | null)=} err error
+							 * @param {(ResolvedContextTimestampAndHash | null)=} entry entry
 							 * @returns {void}
 							 */
 							const callback = (err, entry) => {
@@ -2226,7 +2411,11 @@ class FileSystemInfo {
 									}
 									jobError();
 								} else {
-									contextTshs.set(path, entry);
+									contextTshs.set(
+										path,
+										/** @type {ResolvedContextTimestampAndHash | null} */
+										(entry)
+									);
 									jobDone();
 								}
 							};
@@ -2253,6 +2442,10 @@ class FileSystemInfo {
 							contextHashes.set(path, resolved);
 						} else {
 							jobs++;
+							/**
+							 * @param {(WebpackError | null)=} err err
+							 * @param {string=} entry entry
+							 */
 							const callback = (err, entry) => {
 								if (err) {
 									if (this.logger) {
@@ -2262,7 +2455,7 @@ class FileSystemInfo {
 									}
 									jobError();
 								} else {
-									contextHashes.set(path, entry);
+									contextHashes.set(path, /** @type {string} */ (entry));
 									jobDone();
 								}
 							};
@@ -2291,8 +2484,8 @@ class FileSystemInfo {
 						} else {
 							jobs++;
 							/**
-							 * @param {Error=} err error
-							 * @param {ResolvedContextFileSystemInfoEntry=} entry entry
+							 * @param {(Error | null)=} err error
+							 * @param {(FileSystemInfoEntry | "ignore" | null)=} entry entry
 							 * @returns {void}
 							 */
 							const callback = (err, entry) => {
@@ -2304,12 +2497,20 @@ class FileSystemInfo {
 									}
 									jobError();
 								} else {
-									contextTimestamps.set(path, entry);
+									contextTimestamps.set(
+										path,
+										/** @type {FileSystemInfoEntry | null} */
+										(entry)
+									);
 									jobDone();
 								}
 							};
 							if (cache !== undefined) {
-								this._resolveContextTimestamp(cache, callback);
+								this._resolveContextTimestamp(
+									/** @type {ContextFileSystemInfoEntry} */
+									(cache),
+									callback
+								);
 							} else {
 								this.getContextTimestamp(path, callback);
 							}
@@ -2323,6 +2524,9 @@ class FileSystemInfo {
 				captureNonManaged(directories, managedContexts)
 			);
 		}
+		/**
+		 * @param {Set<string>} capturedMissing captured missing
+		 */
 		const processCapturedMissing = capturedMissing => {
 			this._missingExistenceOptimization.optimize(snapshot, capturedMissing);
 			for (const path of capturedMissing) {
@@ -2382,6 +2586,10 @@ class FileSystemInfo {
 						jobDone();
 					} else {
 						// Fallback to normal snapshotting
+						/**
+						 * @param {Set<string>} set set
+						 * @param {function(Set<string>): void} fn fn
+						 */
 						const process = (set, fn) => {
 							if (set.size === 0) return;
 							const captured = new Set();
@@ -2408,10 +2616,20 @@ class FileSystemInfo {
 	 */
 	mergeSnapshots(snapshot1, snapshot2) {
 		const snapshot = new Snapshot();
-		if (snapshot1.hasStartTime() && snapshot2.hasStartTime())
-			snapshot.setStartTime(Math.min(snapshot1.startTime, snapshot2.startTime));
-		else if (snapshot2.hasStartTime()) snapshot.startTime = snapshot2.startTime;
-		else if (snapshot1.hasStartTime()) snapshot.startTime = snapshot1.startTime;
+		if (snapshot1.hasStartTime() && snapshot2.hasStartTime()) {
+			snapshot.setStartTime(
+				Math.min(
+					/** @type {NonNullable<Snapshot["startTime"]>} */
+					(snapshot1.startTime),
+					/** @type {NonNullable<Snapshot["startTime"]>} */
+					(snapshot2.startTime)
+				)
+			);
+		} else if (snapshot2.hasStartTime()) {
+			snapshot.startTime = snapshot2.startTime;
+		} else if (snapshot1.hasStartTime()) {
+			snapshot.startTime = snapshot1.startTime;
+		}
 		if (snapshot1.hasFileTimestamps() || snapshot2.hasFileTimestamps()) {
 			snapshot.setFileTimestamps(
 				mergeMaps(snapshot1.fileTimestamps, snapshot2.fileTimestamps)
@@ -2504,7 +2722,7 @@ class FileSystemInfo {
 	 */
 	_checkSnapshotValidNoCache(snapshot, callback) {
 		/** @type {number | undefined} */
-		let startTime = undefined;
+		let startTime;
 		if (snapshot.hasStartTime()) {
 			startTime = snapshot.startTime;
 		}
@@ -2523,23 +2741,27 @@ class FileSystemInfo {
 				callback(null, false);
 			}
 		};
+		/**
+		 * @param {string} path path
+		 * @param {WebpackError} err err
+		 */
 		const invalidWithError = (path, err) => {
 			if (this._remainingLogs > 0) {
-				this._log(path, `error occurred: %s`, err);
+				this._log(path, "error occurred: %s", err);
 			}
 			invalid();
 		};
 		/**
 		 * @param {string} path file path
-		 * @param {string} current current hash
-		 * @param {string} snap snapshot hash
+		 * @param {string | null} current current hash
+		 * @param {string | null} snap snapshot hash
 		 * @returns {boolean} true, if ok
 		 */
 		const checkHash = (path, current, snap) => {
 			if (current !== snap) {
 				// If hash differ it's invalid
 				if (this._remainingLogs > 0) {
-					this._log(path, `hashes differ (%s != %s)`, current, snap);
+					this._log(path, "hashes differ (%s != %s)", current, snap);
 				}
 				return false;
 			}
@@ -2567,40 +2789,38 @@ class FileSystemInfo {
 		};
 		/**
 		 * @param {string} path file path
-		 * @param {FileSystemInfoEntry} current current entry
-		 * @param {FileSystemInfoEntry} snap entry from snapshot
+		 * @param {FileSystemInfoEntry | null} c current entry
+		 * @param {FileSystemInfoEntry | null} s entry from snapshot
 		 * @param {boolean} log log reason
 		 * @returns {boolean} true, if ok
 		 */
-		const checkFile = (path, current, snap, log = true) => {
-			if (current === snap) return true;
-			if (!checkExistence(path, Boolean(current), Boolean(snap))) return false;
-			if (current) {
+		const checkFile = (path, c, s, log = true) => {
+			if (c === s) return true;
+			if (!checkExistence(path, Boolean(c), Boolean(s))) return false;
+			if (c) {
 				// For existing items only
-				if (typeof startTime === "number" && current.safeTime > startTime) {
+				if (typeof startTime === "number" && c.safeTime > startTime) {
 					// If a change happened after starting reading the item
 					// this may no longer be valid
 					if (log && this._remainingLogs > 0) {
 						this._log(
 							path,
-							`it may have changed (%d) after the start time of the snapshot (%d)`,
-							current.safeTime,
+							"it may have changed (%d) after the start time of the snapshot (%d)",
+							c.safeTime,
 							startTime
 						);
 					}
 					return false;
 				}
-				if (
-					snap.timestamp !== undefined &&
-					current.timestamp !== snap.timestamp
-				) {
+				const snap = /** @type {FileSystemInfoEntry} */ (s);
+				if (snap.timestamp !== undefined && c.timestamp !== snap.timestamp) {
 					// If we have a timestamp (it was a file or symlink) and it differs from current timestamp
 					// it's invalid
 					if (log && this._remainingLogs > 0) {
 						this._log(
 							path,
-							`timestamps differ (%d != %d)`,
-							current.timestamp,
+							"timestamps differ (%d != %d)",
+							c.timestamp,
 							snap.timestamp
 						);
 					}
@@ -2611,40 +2831,41 @@ class FileSystemInfo {
 		};
 		/**
 		 * @param {string} path file path
-		 * @param {ResolvedContextFileSystemInfoEntry} current current entry
-		 * @param {ResolvedContextFileSystemInfoEntry} snap entry from snapshot
+		 * @param {ResolvedContextFileSystemInfoEntry | null} c current entry
+		 * @param {ResolvedContextFileSystemInfoEntry | null} s entry from snapshot
 		 * @param {boolean} log log reason
 		 * @returns {boolean} true, if ok
 		 */
-		const checkContext = (path, current, snap, log = true) => {
-			if (current === snap) return true;
-			if (!checkExistence(path, Boolean(current), Boolean(snap))) return false;
-			if (current) {
+		const checkContext = (path, c, s, log = true) => {
+			if (c === s) return true;
+			if (!checkExistence(path, Boolean(c), Boolean(s))) return false;
+			if (c) {
 				// For existing items only
-				if (typeof startTime === "number" && current.safeTime > startTime) {
+				if (typeof startTime === "number" && c.safeTime > startTime) {
 					// If a change happened after starting reading the item
 					// this may no longer be valid
 					if (log && this._remainingLogs > 0) {
 						this._log(
 							path,
-							`it may have changed (%d) after the start time of the snapshot (%d)`,
-							current.safeTime,
+							"it may have changed (%d) after the start time of the snapshot (%d)",
+							c.safeTime,
 							startTime
 						);
 					}
 					return false;
 				}
+				const snap = /** @type {ResolvedContextFileSystemInfoEntry} */ (s);
 				if (
 					snap.timestampHash !== undefined &&
-					current.timestampHash !== snap.timestampHash
+					c.timestampHash !== snap.timestampHash
 				) {
 					// If we have a timestampHash (it was a directory) and it differs from current timestampHash
 					// it's invalid
 					if (log && this._remainingLogs > 0) {
 						this._log(
 							path,
-							`timestamps hashes differ (%s != %s)`,
-							current.timestampHash,
+							"timestamps hashes differ (%s != %s)",
+							c.timestampHash,
 							snap.timestampHash
 						);
 					}
@@ -2654,11 +2875,16 @@ class FileSystemInfo {
 			return true;
 		};
 		if (snapshot.hasChildren()) {
+			/**
+			 * @param {(WebpackError | null)=} err err
+			 * @param {boolean=} result result
+			 * @returns {void}
+			 */
 			const childCallback = (err, result) => {
 				if (err || !result) return invalid();
-				else jobDone();
+				jobDone();
 			};
-			for (const child of snapshot.children) {
+			for (const child of /** @type {Children} */ (snapshot.children)) {
 				const cache = this._snapshotCache.get(child);
 				if (cache !== undefined) {
 					this._statTestedChildrenCached++;
@@ -2680,7 +2906,9 @@ class FileSystemInfo {
 			}
 		}
 		if (snapshot.hasFileTimestamps()) {
-			const { fileTimestamps } = snapshot;
+			const fileTimestamps =
+				/** @type {FileTimestamps} */
+				(snapshot.fileTimestamps);
 			this._statTestedEntries += fileTimestamps.size;
 			for (const [path, ts] of fileTimestamps) {
 				const cache = this._fileTimestamps.get(path);
@@ -2693,7 +2921,13 @@ class FileSystemInfo {
 					jobs++;
 					this.fileTimestampQueue.add(path, (err, entry) => {
 						if (err) return invalidWithError(path, err);
-						if (!checkFile(path, entry, ts)) {
+						if (
+							!checkFile(
+								path,
+								/** @type {FileSystemInfoEntry | null} */ (entry),
+								ts
+							)
+						) {
 							invalid();
 						} else {
 							jobDone();
@@ -2704,20 +2938,19 @@ class FileSystemInfo {
 		}
 		/**
 		 * @param {string} path file path
-		 * @param {string} hash hash
+		 * @param {string | null} hash hash
 		 */
 		const processFileHashSnapshot = (path, hash) => {
 			const cache = this._fileHashes.get(path);
 			if (cache !== undefined) {
 				if (cache !== "ignore" && !checkHash(path, cache, hash)) {
 					invalid();
-					return;
 				}
 			} else {
 				jobs++;
 				this.fileHashQueue.add(path, (err, entry) => {
 					if (err) return invalidWithError(path, err);
-					if (!checkHash(path, entry, hash)) {
+					if (!checkHash(path, /** @type {string} */ (entry), hash)) {
 						invalid();
 					} else {
 						jobDone();
@@ -2726,14 +2959,14 @@ class FileSystemInfo {
 			}
 		};
 		if (snapshot.hasFileHashes()) {
-			const { fileHashes } = snapshot;
+			const fileHashes = /** @type {FileHashes} */ (snapshot.fileHashes);
 			this._statTestedEntries += fileHashes.size;
 			for (const [path, hash] of fileHashes) {
 				processFileHashSnapshot(path, hash);
 			}
 		}
 		if (snapshot.hasFileTshs()) {
-			const { fileTshs } = snapshot;
+			const fileTshs = /** @type {FileTshs} */ (snapshot.fileTshs);
 			this._statTestedEntries += fileTshs.size;
 			for (const [path, tsh] of fileTshs) {
 				if (typeof tsh === "string") {
@@ -2748,7 +2981,15 @@ class FileSystemInfo {
 						jobs++;
 						this.fileTimestampQueue.add(path, (err, entry) => {
 							if (err) return invalidWithError(path, err);
-							if (!checkFile(path, entry, tsh, false)) {
+							if (
+								!checkFile(
+									path,
+									/** @type {FileSystemInfoEntry | null} */
+									(entry),
+									tsh,
+									false
+								)
+							) {
 								processFileHashSnapshot(path, tsh && tsh.hash);
 							}
 							jobDone();
@@ -2758,7 +2999,9 @@ class FileSystemInfo {
 			}
 		}
 		if (snapshot.hasContextTimestamps()) {
-			const { contextTimestamps } = snapshot;
+			const contextTimestamps =
+				/** @type {ContextTimestamps} */
+				(snapshot.contextTimestamps);
 			this._statTestedEntries += contextTimestamps.size;
 			for (const [path, ts] of contextTimestamps) {
 				const cache = this._contextTimestamps.get(path);
@@ -2775,26 +3018,41 @@ class FileSystemInfo {
 				} else {
 					jobs++;
 					/**
-					 * @param {Error=} err error
-					 * @param {ResolvedContextFileSystemInfoEntry=} entry entry
+					 * @param {(WebpackError | null)=} err error
+					 * @param {(ResolvedContextFileSystemInfoEntry | "ignore" | null)=} entry entry
 					 * @returns {void}
 					 */
 					const callback = (err, entry) => {
 						if (err) return invalidWithError(path, err);
-						if (!checkContext(path, entry, ts)) {
+						if (
+							!checkContext(
+								path,
+								/** @type {ResolvedContextFileSystemInfoEntry | null} */
+								(entry),
+								ts
+							)
+						) {
 							invalid();
 						} else {
 							jobDone();
 						}
 					};
 					if (cache !== undefined) {
-						this._resolveContextTimestamp(cache, callback);
+						this._resolveContextTimestamp(
+							/** @type {ContextFileSystemInfoEntry} */
+							(cache),
+							callback
+						);
 					} else {
 						this.getContextTimestamp(path, callback);
 					}
 				}
 			}
 		}
+		/**
+		 * @param {string} path path
+		 * @param {string | null} hash hash
+		 */
 		const processContextHashSnapshot = (path, hash) => {
 			const cache = this._contextHashes.get(path);
 			let resolved;
@@ -2804,13 +3062,17 @@ class FileSystemInfo {
 			) {
 				if (!checkHash(path, resolved, hash)) {
 					invalid();
-					return;
 				}
 			} else {
 				jobs++;
+				/**
+				 * @param {(WebpackError | null)=} err err
+				 * @param {string=} entry entry
+				 * @returns {void}
+				 */
 				const callback = (err, entry) => {
 					if (err) return invalidWithError(path, err);
-					if (!checkHash(path, entry, hash)) {
+					if (!checkHash(path, /** @type {string} */ (entry), hash)) {
 						invalid();
 					} else {
 						jobDone();
@@ -2824,14 +3086,16 @@ class FileSystemInfo {
 			}
 		};
 		if (snapshot.hasContextHashes()) {
-			const { contextHashes } = snapshot;
+			const contextHashes =
+				/** @type {ContextHashes} */
+				(snapshot.contextHashes);
 			this._statTestedEntries += contextHashes.size;
 			for (const [path, hash] of contextHashes) {
 				processContextHashSnapshot(path, hash);
 			}
 		}
 		if (snapshot.hasContextTshs()) {
-			const { contextTshs } = snapshot;
+			const contextTshs = /** @type {ContextTshs} */ (snapshot.contextTshs);
 			this._statTestedEntries += contextTshs.size;
 			for (const [path, tsh] of contextTshs) {
 				if (typeof tsh === "string") {
@@ -2844,25 +3108,46 @@ class FileSystemInfo {
 						cache !== undefined &&
 						(resolved = getResolvedTimestamp(cache)) !== undefined
 					) {
-						if (!checkContext(path, resolved, tsh, false)) {
+						if (
+							!checkContext(
+								path,
+								/** @type {ResolvedContextFileSystemInfoEntry | null} */
+								(resolved),
+								tsh,
+								false
+							)
+						) {
 							processContextHashSnapshot(path, tsh && tsh.hash);
 						}
 					} else {
 						jobs++;
 						/**
-						 * @param {Error=} err error
-						 * @param {ResolvedContextFileSystemInfoEntry=} entry entry
+						 * @param {(WebpackError | null)=} err error
+						 * @param {(ResolvedContextFileSystemInfoEntry | "ignore" | null)=} entry entry
 						 * @returns {void}
 						 */
 						const callback = (err, entry) => {
 							if (err) return invalidWithError(path, err);
-							if (!checkContext(path, entry, tsh, false)) {
+							if (
+								!checkContext(
+									path,
+									// TODO: test with `"ignore"`
+									/** @type {ResolvedContextFileSystemInfoEntry | null} */
+									(entry),
+									tsh,
+									false
+								)
+							) {
 								processContextHashSnapshot(path, tsh && tsh.hash);
 							}
 							jobDone();
 						};
 						if (cache !== undefined) {
-							this._resolveContextTimestamp(cache, callback);
+							this._resolveContextTimestamp(
+								/** @type {ContextFileSystemInfoEntry} */
+								(cache),
+								callback
+							);
 						} else {
 							this.getContextTimestamp(path, callback);
 						}
@@ -2871,7 +3156,9 @@ class FileSystemInfo {
 			}
 		}
 		if (snapshot.hasMissingExistence()) {
-			const { missingExistence } = snapshot;
+			const missingExistence =
+				/** @type {MissingExistence} */
+				(snapshot.missingExistence);
 			this._statTestedEntries += missingExistence.size;
 			for (const [path, existence] of missingExistence) {
 				const cache = this._fileTimestamps.get(path);
@@ -2897,7 +3184,9 @@ class FileSystemInfo {
 			}
 		}
 		if (snapshot.hasManagedItemInfo()) {
-			const { managedItemInfo } = snapshot;
+			const managedItemInfo =
+				/** @type {ManagedItemInfo} */
+				(snapshot.managedItemInfo);
 			this._statTestedEntries += managedItemInfo.size;
 			for (const [path, info] of managedItemInfo) {
 				const cache = this._managedItems.get(path);
@@ -2910,7 +3199,7 @@ class FileSystemInfo {
 					jobs++;
 					this.managedItemQueue.add(path, (err, entry) => {
 						if (err) return invalidWithError(path, err);
-						if (!checkHash(path, entry, info)) {
+						if (!checkHash(path, /** @type {string} */ (entry), info)) {
 							invalid();
 						} else {
 							jobDone();
@@ -2932,17 +3221,21 @@ class FileSystemInfo {
 		}
 	}
 
+	/**
+	 * @type {Processor<string, FileSystemInfoEntry>}
+	 * @private
+	 */
 	_readFileTimestamp(path, callback) {
-		this.fs.stat(path, (err, stat) => {
+		this.fs.stat(path, (err, _stat) => {
 			if (err) {
 				if (err.code === "ENOENT") {
 					this._fileTimestamps.set(path, null);
 					this._cachedDeprecatedFileTimestamps = undefined;
 					return callback(null, null);
 				}
-				return callback(err);
+				return callback(/** @type {WebpackError} */ (err));
 			}
-
+			const stat = /** @type {IStats} */ (_stat);
 			let ts;
 			if (stat.isDirectory()) {
 				ts = {
@@ -2950,7 +3243,7 @@ class FileSystemInfo {
 					timestamp: undefined
 				};
 			} else {
-				const mtime = +stat.mtime;
+				const mtime = Number(stat.mtime);
 
 				if (mtime) applyMtime(mtime);
 
@@ -2967,6 +3260,10 @@ class FileSystemInfo {
 		});
 	}
 
+	/**
+	 * @type {Processor<string, string>}
+	 * @private
+	 */
 	_readFileHash(path, callback) {
 		this.fs.readFile(path, (err, content) => {
 			if (err) {
@@ -2979,11 +3276,12 @@ class FileSystemInfo {
 					return callback(null, null);
 				}
 				if (err.code === "ERR_FS_FILE_TOO_LARGE") {
-					this.logger.warn(`Ignoring ${path} for hashing as it's very large`);
+					/** @type {Logger} */
+					(this.logger).warn(`Ignoring ${path} for hashing as it's very large`);
 					this._fileHashes.set(path, "too large");
 					return callback(null, "too large");
 				}
-				return callback(err);
+				return callback(/** @type {WebpackError} */ (err));
 			}
 
 			const hash = createHash(this._hashFunction);
@@ -2998,45 +3296,54 @@ class FileSystemInfo {
 		});
 	}
 
+	/**
+	 * @param {string} path path
+	 * @param {function(WebpackError | null, TimestampAndHash=) : void} callback callback
+	 * @private
+	 */
 	_getFileTimestampAndHash(path, callback) {
+		/**
+		 * @param {string} hash hash
+		 * @returns {void}
+		 */
 		const continueWithHash = hash => {
 			const cache = this._fileTimestamps.get(path);
 			if (cache !== undefined) {
 				if (cache !== "ignore") {
+					/** @type {TimestampAndHash} */
 					const result = {
-						...cache,
+						.../** @type {FileSystemInfoEntry} */ (cache),
 						hash
 					};
 					this._fileTshs.set(path, result);
 					return callback(null, result);
-				} else {
-					this._fileTshs.set(path, hash);
-					return callback(null, hash);
 				}
-			} else {
-				this.fileTimestampQueue.add(path, (err, entry) => {
-					if (err) {
-						return callback(err);
-					}
-					const result = {
-						...entry,
-						hash
-					};
-					this._fileTshs.set(path, result);
-					return callback(null, result);
-				});
+				this._fileTshs.set(path, hash);
+				return callback(null, /** @type {TODO} */ (hash));
 			}
+			this.fileTimestampQueue.add(path, (err, entry) => {
+				if (err) {
+					return callback(err);
+				}
+				/** @type {TimestampAndHash} */
+				const result = {
+					.../** @type {FileSystemInfoEntry} */ (entry),
+					hash
+				};
+				this._fileTshs.set(path, result);
+				return callback(null, result);
+			});
 		};
 
 		const cache = this._fileHashes.get(path);
 		if (cache !== undefined) {
-			continueWithHash(cache);
+			continueWithHash(/** @type {string} */ (cache));
 		} else {
 			this.fileHashQueue.add(path, (err, entry) => {
 				if (err) {
 					return callback(err);
 				}
-				continueWithHash(entry);
+				continueWithHash(/** @type {string} */ (entry));
 			});
 		}
 	}
@@ -3048,9 +3355,9 @@ class FileSystemInfo {
 	 * @param {string} options.path path
 	 * @param {function(string): ItemType} options.fromImmutablePath called when context item is an immutable path
 	 * @param {function(string): ItemType} options.fromManagedItem called when context item is a managed path
-	 * @param {function(string, string, function(Error=, ItemType=): void): void} options.fromSymlink called when context item is a symlink
-	 * @param {function(string, IStats, function(Error=, ItemType=): void): void} options.fromFile called when context item is a file
-	 * @param {function(string, IStats, function(Error=, ItemType=): void): void} options.fromDirectory called when context item is a directory
+	 * @param {function(string, string, function((WebpackError | null)=, ItemType=): void): void} options.fromSymlink called when context item is a symlink
+	 * @param {function(string, IStats, function((WebpackError | null)=, (ItemType | null)=): void): void} options.fromFile called when context item is a file
+	 * @param {function(string, IStats, function((WebpackError | null)=, ItemType=): void): void} options.fromDirectory called when context item is a directory
 	 * @param {function(string[], ItemType[]): T} options.reduce called from all context items
 	 * @param {function((Error | null)=, (T | null)=): void} callback callback
 	 */
@@ -3101,7 +3408,10 @@ class FileSystemInfo {
 								// construct timestampHash from managed info
 								return this.managedItemQueue.add(managedItem, (err, info) => {
 									if (err) return callback(err);
-									return callback(null, fromManagedItem(info));
+									return callback(
+										null,
+										fromManagedItem(/** @type {string} */ (info))
+									);
 								});
 							}
 						}
@@ -3113,15 +3423,20 @@ class FileSystemInfo {
 								// construct timestampHash from managed info
 								return this.managedItemQueue.add(managedItem, (err, info) => {
 									if (err) return callback(err);
-									return callback(null, fromManagedItem(info));
+									return callback(
+										null,
+										fromManagedItem(/** @type {string} */ (info))
+									);
 								});
 							}
 						}
 					}
 
-					lstatReadlinkAbsolute(this.fs, child, (err, stat) => {
+					lstatReadlinkAbsolute(this.fs, child, (err, _stat) => {
 						if (err) return callback(err);
 
+						const stat = /** @type {IStats | string} */ (_stat);
+
 						if (typeof stat === "string") {
 							return fromSymlink(child, stat, callback);
 						}
@@ -3137,27 +3452,37 @@ class FileSystemInfo {
 				},
 				(err, results) => {
 					if (err) return callback(err);
-					const result = reduce(files, results);
+					const result = reduce(files, /** @type {ItemType[]} */ (results));
 					callback(null, result);
 				}
 			);
 		});
 	}
 
+	/**
+	 * @type {Processor<string, ContextFileSystemInfoEntry>}
+	 * @private
+	 */
 	_readContextTimestamp(path, callback) {
 		this._readContext(
 			{
 				path,
-				fromImmutablePath: () => null,
+				fromImmutablePath: () =>
+					/** @type {ContextFileSystemInfoEntry | FileSystemInfoEntry | "ignore" | null} */
+					(null),
 				fromManagedItem: info => ({
 					safeTime: 0,
 					timestampHash: info
 				}),
 				fromSymlink: (file, target, callback) => {
-					callback(null, {
-						timestampHash: target,
-						symlinks: new Set([target])
-					});
+					callback(
+						null,
+						/** @type {ContextFileSystemInfoEntry} */
+						({
+							timestampHash: target,
+							symlinks: new Set([target])
+						})
+					);
 				},
 				fromFile: (file, stat, callback) => {
 					// Prefer the cached value over our new stat to report consistent results
@@ -3165,10 +3490,11 @@ class FileSystemInfo {
 					if (cache !== undefined)
 						return callback(null, cache === "ignore" ? null : cache);
 
-					const mtime = +stat.mtime;
+					const mtime = Number(stat.mtime);
 
 					if (mtime) applyMtime(mtime);
 
+					/** @type {FileSystemInfoEntry} */
 					const ts = {
 						safeTime: mtime ? mtime + FS_ACCURACY : Infinity,
 						timestamp: mtime
@@ -3186,27 +3512,42 @@ class FileSystemInfo {
 					});
 				},
 				reduce: (files, tsEntries) => {
-					let symlinks = undefined;
+					let symlinks;
 
 					const hash = createHash(this._hashFunction);
 
 					for (const file of files) hash.update(file);
 					let safeTime = 0;
-					for (const entry of tsEntries) {
-						if (!entry) {
+					for (const _e of tsEntries) {
+						if (!_e) {
 							hash.update("n");
 							continue;
 						}
-						if (entry.timestamp) {
+						const entry =
+							/** @type {FileSystemInfoEntry | ContextFileSystemInfoEntry} */
+							(_e);
+						if (/** @type {FileSystemInfoEntry} */ (entry).timestamp) {
 							hash.update("f");
-							hash.update(`${entry.timestamp}`);
-						} else if (entry.timestampHash) {
+							hash.update(
+								`${/** @type {FileSystemInfoEntry} */ (entry).timestamp}`
+							);
+						} else if (
+							/** @type {ContextFileSystemInfoEntry} */ (entry).timestampHash
+						) {
 							hash.update("d");
-							hash.update(`${entry.timestampHash}`);
+							hash.update(
+								`${/** @type {ContextFileSystemInfoEntry} */ (entry).timestampHash}`
+							);
 						}
-						if (entry.symlinks !== undefined) {
+						if (
+							/** @type {ContextFileSystemInfoEntry} */
+							(entry).symlinks !== undefined
+						) {
 							if (symlinks === undefined) symlinks = new Set();
-							addAll(entry.symlinks, symlinks);
+							addAll(
+								/** @type {ContextFileSystemInfoEntry} */ (entry).symlinks,
+								symlinks
+							);
 						}
 						if (entry.safeTime) {
 							safeTime = Math.max(safeTime, entry.safeTime);
@@ -3214,7 +3555,7 @@ class FileSystemInfo {
 					}
 
 					const digest = /** @type {string} */ (hash.digest("hex"));
-
+					/** @type {ContextFileSystemInfoEntry} */
 					const result = {
 						safeTime,
 						timestampHash: digest
@@ -3224,7 +3565,7 @@ class FileSystemInfo {
 				}
 			},
 			(err, result) => {
-				if (err) return callback(err);
+				if (err) return callback(/** @type {WebpackError} */ (err));
 				this._contextTimestamps.set(path, result);
 				this._cachedDeprecatedContextTimestamps = undefined;
 
@@ -3235,7 +3576,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {ContextFileSystemInfoEntry} entry entry
-	 * @param {function((Error | null)=, ResolvedContextFileSystemInfoEntry=): void} callback callback
+	 * @param {function((WebpackError | null)=, (ResolvedContextFileSystemInfoEntry | "ignore" | null)=): void} callback callback
 	 * @returns {void}
 	 */
 	_resolveContextTimestamp(entry, callback) {
@@ -3243,13 +3584,13 @@ class FileSystemInfo {
 		const hashes = [];
 		let safeTime = 0;
 		processAsyncTree(
-			entry.symlinks,
+			/** @type {NonNullable<ContextHash["symlinks"]>} */ (entry.symlinks),
 			10,
 			(target, push, callback) => {
 				this._getUnresolvedContextTimestamp(target, (err, entry) => {
 					if (err) return callback(err);
 					if (entry && entry !== "ignore") {
-						hashes.push(entry.timestampHash);
+						hashes.push(/** @type {string} */ (entry.timestampHash));
 						if (entry.safeTime) {
 							safeTime = Math.max(safeTime, entry.safeTime);
 						}
@@ -3261,9 +3602,9 @@ class FileSystemInfo {
 				});
 			},
 			err => {
-				if (err) return callback(err);
+				if (err) return callback(/** @type {WebpackError} */ (err));
 				const hash = createHash(this._hashFunction);
-				hash.update(entry.timestampHash);
+				hash.update(/** @type {string} */ (entry.timestampHash));
 				if (entry.safeTime) {
 					safeTime = Math.max(safeTime, entry.safeTime);
 				}
@@ -3282,17 +3623,26 @@ class FileSystemInfo {
 		);
 	}
 
+	/**
+	 * @type {Processor<string, ContextHash>}
+	 * @private
+	 */
 	_readContextHash(path, callback) {
 		this._readContext(
 			{
 				path,
-				fromImmutablePath: () => "",
+				fromImmutablePath: () =>
+					/** @type {ContextHash} */ (/** @type {unknown} */ ("")),
 				fromManagedItem: info => info || "",
 				fromSymlink: (file, target, callback) => {
-					callback(null, {
-						hash: target,
-						symlinks: new Set([target])
-					});
+					callback(
+						null,
+						/** @type {ContextHash} */
+						({
+							hash: target,
+							symlinks: new Set([target])
+						})
+					);
 				},
 				fromFile: (file, stat, callback) =>
 					this.getFileHash(file, (err, hash) => {
@@ -3311,7 +3661,7 @@ class FileSystemInfo {
 				 * @returns {ContextHash} reduced hash
 				 */
 				reduce: (files, fileHashes) => {
-					let symlinks = undefined;
+					let symlinks;
 					const hash = createHash(this._hashFunction);
 
 					for (const file of files) hash.update(file);
@@ -3327,6 +3677,7 @@ class FileSystemInfo {
 						}
 					}
 
+					/** @type {ContextHash} */
 					const result = {
 						hash: /** @type {string} */ (hash.digest("hex"))
 					};
@@ -3334,8 +3685,9 @@ class FileSystemInfo {
 					return result;
 				}
 			},
-			(err, result) => {
-				if (err) return callback(err);
+			(err, _result) => {
+				if (err) return callback(/** @type {WebpackError} */ (err));
+				const result = /** @type {ContextHash} */ (_result);
 				this._contextHashes.set(path, result);
 				return callback(null, result);
 			}
@@ -3344,14 +3696,14 @@ class FileSystemInfo {
 
 	/**
 	 * @param {ContextHash} entry context hash
-	 * @param {function((WebpackError | null)=, string=): void} callback callback
+	 * @param {function(WebpackError | null, string=): void} callback callback
 	 * @returns {void}
 	 */
 	_resolveContextHash(entry, callback) {
 		/** @type {string[]} */
 		const hashes = [];
 		processAsyncTree(
-			entry.symlinks,
+			/** @type {NonNullable<ContextHash["symlinks"]>} */ (entry.symlinks),
 			10,
 			(target, push, callback) => {
 				this._getUnresolvedContextHash(target, (err, hash) => {
@@ -3381,15 +3733,19 @@ class FileSystemInfo {
 		);
 	}
 
+	/**
+	 * @type {Processor<string, ContextTimestampAndHash>}
+	 * @private
+	 */
 	_readContextTimestampAndHash(path, callback) {
+		/**
+		 * @param {ContextFileSystemInfoEntry | "ignore" | null} timestamp timestamp
+		 * @param {ContextHash} hash hash
+		 */
 		const finalize = (timestamp, hash) => {
 			const result =
-				timestamp === "ignore"
-					? hash
-					: {
-							...timestamp,
-							...hash
-						};
+				/** @type {ContextTimestampAndHash} */
+				(timestamp === "ignore" ? hash : { ...timestamp, ...hash });
 			this._contextTshs.set(path, result);
 			callback(null, result);
 		};
@@ -3401,107 +3757,111 @@ class FileSystemInfo {
 			} else {
 				this.contextTimestampQueue.add(path, (err, entry) => {
 					if (err) return callback(err);
-					finalize(entry, cachedHash);
+					finalize(
+						/** @type {ContextFileSystemInfoEntry} */
+						(entry),
+						cachedHash
+					);
 				});
 			}
+		} else if (cachedTimestamp !== undefined) {
+			this.contextHashQueue.add(path, (err, entry) => {
+				if (err) return callback(err);
+				finalize(cachedTimestamp, /** @type {ContextHash} */ (entry));
+			});
 		} else {
-			if (cachedTimestamp !== undefined) {
-				this.contextHashQueue.add(path, (err, entry) => {
-					if (err) return callback(err);
-					finalize(cachedTimestamp, entry);
-				});
-			} else {
-				this._readContext(
-					{
-						path,
-						fromImmutablePath: () => null,
-						fromManagedItem: info => ({
-							safeTime: 0,
-							timestampHash: info,
-							hash: info || ""
-						}),
-						fromSymlink: (file, target, callback) => {
-							callback(null, {
-								timestampHash: target,
-								hash: target,
-								symlinks: new Set([target])
-							});
-						},
-						fromFile: (file, stat, callback) => {
-							this._getFileTimestampAndHash(file, callback);
-						},
-						fromDirectory: (directory, stat, callback) => {
-							this.contextTshQueue.increaseParallelism();
-							this.contextTshQueue.add(directory, (err, result) => {
-								this.contextTshQueue.decreaseParallelism();
-								callback(err, result);
-							});
-						},
-						/**
-						 * @param {string[]} files files
-						 * @param {(Partial<TimestampAndHash> & Partial<ContextTimestampAndHash> | string | null)[]} results results
-						 * @returns {ContextTimestampAndHash} tsh
-						 */
-						reduce: (files, results) => {
-							let symlinks = undefined;
+			this._readContext(
+				{
+					path,
+					fromImmutablePath: () => null,
+					fromManagedItem: info => ({
+						safeTime: 0,
+						timestampHash: info,
+						hash: info || ""
+					}),
+					fromSymlink: (file, target, callback) => {
+						callback(null, {
+							timestampHash: target,
+							hash: target,
+							symlinks: new Set([target])
+						});
+					},
+					fromFile: (file, stat, callback) => {
+						this._getFileTimestampAndHash(file, callback);
+					},
+					fromDirectory: (directory, stat, callback) => {
+						this.contextTshQueue.increaseParallelism();
+						this.contextTshQueue.add(directory, (err, result) => {
+							this.contextTshQueue.decreaseParallelism();
+							callback(err, result);
+						});
+					},
+					/**
+					 * @param {string[]} files files
+					 * @param {(Partial<TimestampAndHash> & Partial<ContextTimestampAndHash> | string | null)[]} results results
+					 * @returns {ContextTimestampAndHash} tsh
+					 */
+					reduce: (files, results) => {
+						let symlinks;
 
-							const tsHash = createHash(this._hashFunction);
-							const hash = createHash(this._hashFunction);
+						const tsHash = createHash(this._hashFunction);
+						const hash = createHash(this._hashFunction);
 
-							for (const file of files) {
-								tsHash.update(file);
-								hash.update(file);
+						for (const file of files) {
+							tsHash.update(file);
+							hash.update(file);
+						}
+						let safeTime = 0;
+						for (const entry of results) {
+							if (!entry) {
+								tsHash.update("n");
+								continue;
 							}
-							let safeTime = 0;
-							for (const entry of results) {
-								if (!entry) {
-									tsHash.update("n");
-									continue;
-								}
-								if (typeof entry === "string") {
-									tsHash.update("n");
-									hash.update(entry);
-									continue;
-								}
-								if (entry.timestamp) {
-									tsHash.update("f");
-									tsHash.update(`${entry.timestamp}`);
-								} else if (entry.timestampHash) {
-									tsHash.update("d");
-									tsHash.update(`${entry.timestampHash}`);
-								}
-								if (entry.symlinks !== undefined) {
-									if (symlinks === undefined) symlinks = new Set();
-									addAll(entry.symlinks, symlinks);
-								}
-								if (entry.safeTime) {
-									safeTime = Math.max(safeTime, entry.safeTime);
-								}
-								hash.update(entry.hash);
+							if (typeof entry === "string") {
+								tsHash.update("n");
+								hash.update(entry);
+								continue;
 							}
-
-							const result = {
-								safeTime,
-								timestampHash: /** @type {string} */ (tsHash.digest("hex")),
-								hash: /** @type {string} */ (hash.digest("hex"))
-							};
-							if (symlinks) result.symlinks = symlinks;
-							return result;
+							if (entry.timestamp) {
+								tsHash.update("f");
+								tsHash.update(`${entry.timestamp}`);
+							} else if (entry.timestampHash) {
+								tsHash.update("d");
+								tsHash.update(`${entry.timestampHash}`);
+							}
+							if (entry.symlinks !== undefined) {
+								if (symlinks === undefined) symlinks = new Set();
+								addAll(entry.symlinks, symlinks);
+							}
+							if (entry.safeTime) {
+								safeTime = Math.max(safeTime, entry.safeTime);
+							}
+							hash.update(/** @type {string} */ (entry.hash));
 						}
-					},
-					(err, result) => {
-						if (err) return callback(err);
-						this._contextTshs.set(path, result);
-						return callback(null, result);
+
+						/** @type {ContextTimestampAndHash} */
+						const result = {
+							safeTime,
+							timestampHash: /** @type {string} */ (tsHash.digest("hex")),
+							hash: /** @type {string} */ (hash.digest("hex"))
+						};
+						if (symlinks) result.symlinks = symlinks;
+						return result;
 					}
-				);
-			}
+				},
+				(err, _result) => {
+					if (err) return callback(/** @type {WebpackError} */ (err));
+					const result = /** @type {ContextTimestampAndHash} */ (_result);
+					this._contextTshs.set(path, result);
+					return callback(null, result);
+				}
+			);
 		}
 	}
 
 	/**
 	 * @param {ContextTimestampAndHash} entry entry
-	 * @param {function((Error | null)=, ResolvedContextTimestampAndHash=): void} callback callback
+	 * @param {ProcessorCallback<ResolvedContextTimestampAndHash>} callback callback
 	 * @returns {void}
 	 */
 	_resolveContextTsh(entry, callback) {
@@ -3511,7 +3871,7 @@ class FileSystemInfo {
 		const tsHashes = [];
 		let safeTime = 0;
 		processAsyncTree(
-			entry.symlinks,
+			/** @type {NonNullable<ContextHash["symlinks"]>} */ (entry.symlinks),
 			10,
 			(target, push, callback) => {
 				this._getUnresolvedContextTsh(target, (err, entry) => {
@@ -3530,7 +3890,7 @@ class FileSystemInfo {
 				});
 			},
 			err => {
-				if (err) return callback(err);
+				if (err) return callback(/** @type {WebpackError} */ (err));
 				const hash = createHash(this._hashFunction);
 				const tsHash = createHash(this._hashFunction);
 				hash.update(entry.hash);
@@ -3558,13 +3918,17 @@ class FileSystemInfo {
 		);
 	}
 
+	/**
+	 * @type {Processor<string, Set<string>>}
+	 * @private
+	 */
 	_getManagedItemDirectoryInfo(path, callback) {
 		this.fs.readdir(path, (err, elements) => {
 			if (err) {
 				if (err.code === "ENOENT" || err.code === "ENOTDIR") {
 					return callback(null, EMPTY_SET);
 				}
-				return callback(err);
+				return callback(/** @type {WebpackError} */ (err));
 			}
 			const set = new Set(
 				/** @type {string[]} */ (elements).map(element =>
@@ -3575,13 +3939,17 @@ class FileSystemInfo {
 		});
 	}
 
+	/**
+	 * @type {Processor<string, string>}
+	 * @private
+	 */
 	_getManagedItemInfo(path, callback) {
 		const dir = dirname(this.fs, path);
 		this.managedItemDirectoryQueue.add(dir, (err, elements) => {
 			if (err) {
 				return callback(err);
 			}
-			if (!elements.has(path)) {
+			if (!(/** @type {Set<string>} */ (elements).has(path))) {
 				// file or directory doesn't exist
 				this._managedItems.set(path, "*missing");
 				return callback(null, "*missing");
@@ -3606,28 +3974,29 @@ class FileSystemInfo {
 						this.fs.readdir(path, (err, elements) => {
 							if (
 								!err &&
-								elements.length === 1 &&
-								elements[0] === "node_modules"
+								/** @type {string[]} */ (elements).length === 1 &&
+								/** @type {string[]} */ (elements)[0] === "node_modules"
 							) {
 								// This is only a grouping folder e.g. used by yarn
 								// we are only interested in existence of this special directory
 								this._managedItems.set(path, "*nested");
 								return callback(null, "*nested");
 							}
-							this.logger.warn(
+							/** @type {Logger} */
+							(this.logger).warn(
 								`Managed item ${path} isn't a directory or doesn't contain a package.json (see snapshot.managedPaths option)`
 							);
 							return callback();
 						});
 						return;
 					}
-					return callback(err);
+					return callback(/** @type {WebpackError} */ (err));
 				}
 				let data;
 				try {
 					data = JSON.parse(/** @type {Buffer} */ (content).toString("utf-8"));
-				} catch (e) {
-					return callback(e);
+				} catch (parseErr) {
+					return callback(/** @type {WebpackError} */ (parseErr));
 				}
 				if (!data.name) {
 					/** @type {Logger} */