webpack 5.98.0 → 5.99.0

package/lib/Generator.js

@@ -32,7 +32,15 @@
  * @property {ConcatenationScope=} concatenationScope when in concatenated module, information about other concatenated modules
  * @property {CodeGenerationResults=} codeGenerationResults code generation results of other modules (need to have a codeGenerationDependency to use that)
  * @property {string} type which kind of code should be generated
- * @property {function(): Map<string, any>=} getData get access to the code generation data
+ * @property {() => Map<string, TODO>=} getData get access to the code generation data
+ */
+
+/**
+ * @callback GenerateErrorFn
+ * @param {Error} error the error
+ * @param {NormalModule} module module for which the code should be generated
+ * @param {GenerateContext} generateContext context for generate
+ * @returns {Source | null} generated code
  */
 
 /**
@@ -108,6 +116,24 @@ class Generator {
 	}
 }
 
+/**
+ * @this {ByTypeGenerator}
+ * @type {GenerateErrorFn}
+ */
+function generateError(error, module, generateContext) {
+	const type = generateContext.type;
+	const generator =
+		/** @type {Generator & { generateError?: GenerateErrorFn }} */
+		(this.map[type]);
+	if (!generator) {
+		throw new Error(`Generator.byType: no generator specified for ${type}`);
+	}
+	if (typeof generator.generateError === "undefined") {
+		return null;
+	}
+	return generator.generateError(error, module, generateContext);
+}
+
 class ByTypeGenerator extends Generator {
 	/**
 	 * @param {Record<string, Generator>} map map of types
@@ -116,6 +142,8 @@ class ByTypeGenerator extends Generator {
 		super();
 		this.map = map;
 		this._types = new Set(Object.keys(map));
+		/** @type {GenerateErrorFn | undefined} */
+		this.generateError = generateError.bind(this);
 	}
 
 	/**

package/lib/HookWebpackError.js

@@ -51,7 +51,7 @@ module.exports.makeWebpackError = makeWebpackError;
 
 /**
  * @template T
- * @param {function(WebpackError | null, T=): void} callback webpack error callback
+ * @param {(err: WebpackError | null, result?: T) => void} callback webpack error callback
  * @param {string} hook name of hook
  * @returns {Callback<T>} generic callback
  */
@@ -71,7 +71,7 @@ module.exports.makeWebpackErrorCallback = makeWebpackErrorCallback;
 
 /**
  * @template T
- * @param {function(): T} fn function which will be wrapping in try catch
+ * @param {() => T} fn function which will be wrapping in try catch
  * @param {string} hook name of hook
  * @returns {T} the result
  */

package/lib/HotModuleReplacementPlugin.js

@@ -50,6 +50,7 @@ const {
 /** @typedef {import("./Chunk").ChunkId} ChunkId */
 /** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
+/** @typedef {import("./Compilation").Records} Records */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("./Module")} Module */
@@ -95,13 +96,6 @@ class HotModuleReplacementPlugin {
 		return hooks;
 	}
 
-	/**
-	 * @param {object=} options options
-	 */
-	constructor(options) {
-		this.options = options || {};
-	}
-
 	/**
 	 * Apply the plugin
 	 * @param {Compiler} compiler the compiler instance
@@ -390,7 +384,7 @@ class HotModuleReplacementPlugin {
 				const nonCodeGeneratedModules = new TupleSet();
 				compilation.hooks.fullHash.tap(PLUGIN_NAME, hash => {
 					const chunkGraph = compilation.chunkGraph;
-					const records = compilation.records;
+					const records = /** @type {Records} */ (compilation.records);
 					for (const chunk of compilation.chunks) {
 						/**
 						 * @param {Module} module module
@@ -484,7 +478,7 @@ class HotModuleReplacementPlugin {
 					},
 					() => {
 						const chunkGraph = compilation.chunkGraph;
-						const records = compilation.records;
+						const records = /** @type {Records} */ (compilation.records);
 						if (records.hash === compilation.hash) return;
 						if (
 							!records.chunkModuleHashes ||

package/lib/IgnoreErrorModuleFactory.js

@@ -7,8 +7,8 @@
 
 const ModuleFactory = require("./ModuleFactory");
 
+/** @typedef {import("./ModuleFactory").ModuleFactoryCallback} ModuleFactoryCallback */
 /** @typedef {import("./ModuleFactory").ModuleFactoryCreateData} ModuleFactoryCreateData */
-/** @typedef {import("./ModuleFactory").ModuleFactoryResult} ModuleFactoryResult */
 /** @typedef {import("./NormalModuleFactory")} NormalModuleFactory */
 
 /**
@@ -26,7 +26,7 @@ class IgnoreErrorModuleFactory extends ModuleFactory {
 
 	/**
 	 * @param {ModuleFactoryCreateData} data data object
-	 * @param {function((Error | null)=, ModuleFactoryResult=): void} callback callback
+	 * @param {ModuleFactoryCallback} callback callback
 	 * @returns {void}
 	 */
 	create(data, callback) {

package/lib/IgnorePlugin.js

@@ -29,11 +29,6 @@ class IgnorePlugin {
 	constructor(options) {
 		validate(options);
 		this.options = options;
-
-		/**
-		 * @private
-		 * @type {Function}
-		 */
 		this.checkIgnore = this.checkIgnore.bind(this);
 	}
 

package/lib/InitFragment.js

@@ -64,7 +64,7 @@ class InitFragment {
 
 	/**
 	 * @param {GenerateContext} context context
-	 * @returns {string|Source=} the source code that will be included at the end of the module
+	 * @returns {string | Source=} the source code that will be included at the end of the module
 	 */
 	getEndContent(context) {
 		return this.endContent;

package/lib/LoaderOptionsPlugin.js

@@ -11,8 +11,14 @@ const createSchemaValidation = require("./util/create-schema-validation");
 
 /** @typedef {import("../declarations/plugins/LoaderOptionsPlugin").LoaderOptionsPluginOptions} LoaderOptionsPluginOptions */
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./ModuleFilenameHelpers").Matcher} Matcher  */
 /** @typedef {import("./ModuleFilenameHelpers").MatchObject} MatchObject  */
 
+/**
+ * @template T
+ * @typedef {import("../declarations/LoaderContext").LoaderContext<T>} LoaderContext
+ */
+
 const validate = createSchemaValidation(
 	require("../schemas/plugins/LoaderOptionsPlugin.check.js"),
 	() => require("../schemas/plugins/LoaderOptionsPlugin.json"),
@@ -31,10 +37,7 @@ class LoaderOptionsPlugin {
 		// If no options are set then generate empty options object
 		if (typeof options !== "object") options = {};
 		if (!options.test) {
-			// This is mocking a RegExp object which always returns true
-			// TODO: Figure out how to do `as unknown as RegExp` for this line
-			// in JSDoc equivalent
-			/** @type {any} */
+			/** @type {TODO} */
 			const defaultTrueMockRegExp = {
 				test: () => true
 			};
@@ -70,7 +73,7 @@ class LoaderOptionsPlugin {
 								continue;
 							}
 
-							/** @type {any} */
+							/** @type {TODO} */
 							(context)[key] = options[key];
 						}
 					}

package/lib/MainTemplate.js

@@ -62,7 +62,7 @@ class MainTemplate {
 					/**
 					 * @template AdditionalOptions
 					 * @param {string | Tap & IfSet<AdditionalOptions>} options options
-					 * @param {function(RenderManifestEntry[], RenderManifestOptions): RenderManifestEntry[]} fn fn
+					 * @param {(renderManifestEntries: RenderManifestEntry[], renderManifestOptions: RenderManifestOptions) => RenderManifestEntry[]} fn fn
 					 */
 					(options, fn) => {
 						compilation.hooks.renderManifest.tap(
@@ -96,7 +96,7 @@ class MainTemplate {
 					/**
 					 * @template AdditionalOptions
 					 * @param {string | Tap & IfSet<AdditionalOptions>} options options
-					 * @param {function(string, RenderBootstrapContext): string} fn fn
+					 * @param {(value: string, renderBootstrapContext: RenderBootstrapContext) => string} fn fn
 					 */
 					(options, fn) => {
 						getJavascriptModulesPlugin()
@@ -133,7 +133,7 @@ class MainTemplate {
 					/**
 					 * @template AdditionalOptions
 					 * @param {string | Tap & IfSet<AdditionalOptions>} options options
-					 * @param {function(Source, Chunk, string | undefined, ModuleTemplate, DependencyTemplates): Source} fn fn
+					 * @param {(source: Source, chunk: Chunk, hash: string | undefined, moduleTemplate: ModuleTemplate, dependencyTemplates: DependencyTemplates) => Source} fn fn
 					 */
 					(options, fn) => {
 						getJavascriptModulesPlugin()
@@ -165,7 +165,7 @@ class MainTemplate {
 					/**
 					 * @template AdditionalOptions
 					 * @param {string | Tap & IfSet<AdditionalOptions>} options options
-					 * @param {function(Source, Chunk, string | undefined): Source} fn fn
+					 * @param {(source: Source, chunk: Chunk, hash: string | undefined) => Source} fn fn
 					 */
 					(options, fn) => {
 						getJavascriptModulesPlugin()
@@ -191,7 +191,7 @@ class MainTemplate {
 					/**
 					 * @template AdditionalOptions
 					 * @param {string | Tap & IfSet<AdditionalOptions>} options options
-					 * @param {function(string, object, AssetInfo | undefined): string} fn fn
+					 * @param {(value: string, path: PathData, assetInfo: AssetInfo | undefined) => string} fn fn
 					 */
 					(options, fn) => {
 						compilation.hooks.assetPath.tap(options, fn);
@@ -215,7 +215,7 @@ class MainTemplate {
 					/**
 					 * @template AdditionalOptions
 					 * @param {string | Tap & IfSet<AdditionalOptions>} options options
-					 * @param {function(Hash): void} fn fn
+					 * @param {(hash: Hash) => void} fn fn
 					 */
 					(options, fn) => {
 						compilation.hooks.fullHash.tap(options, fn);
@@ -229,7 +229,7 @@ class MainTemplate {
 					/**
 					 * @template AdditionalOptions
 					 * @param {string | Tap & IfSet<AdditionalOptions>} options options
-					 * @param {function(Hash, Chunk): void} fn fn
+					 * @param {(hash: Hash, chunk: Chunk) => void} fn fn
 					 */
 					(options, fn) => {
 						getJavascriptModulesPlugin()

package/lib/Module.js

@@ -24,6 +24,7 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./CodeGenerationResults")} CodeGenerationResults */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
+/** @typedef {import("./Compilation").UnsafeCacheData} UnsafeCacheData */
 /** @typedef {import("./ConcatenationScope")} ConcatenationScope */
 /** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
@@ -44,6 +45,7 @@ const makeSerializable = require("./util/makeSerializable");
 /** @template T @typedef {import("./util/LazySet")<T>} LazySet<T> */
 /** @template T @typedef {import("./util/SortableSet")<T>} SortableSet<T> */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
+/** @typedef {import("./util/identifier").AssociatedObjectForCache} AssociatedObjectForCache */
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
 
 /**
@@ -84,7 +86,7 @@ const makeSerializable = require("./util/makeSerializable");
 /**
  * @typedef {object} CodeGenerationResult
  * @property {Map<string, Source>} sources the resulting sources for all source types
- * @property {Map<string, any>=} data the resulting data for all source types
+ * @property {Map<string, TODO>=} data the resulting data for all source types
  * @property {ReadOnlyRuntimeRequirements | null} runtimeRequirements the runtime requirements
  * @property {string=} hash a hash of the code generation result (will be automatically calculated from sources and runtimeRequirements if not provided)
  */
@@ -92,7 +94,7 @@ const makeSerializable = require("./util/makeSerializable");
 /**
  * @typedef {object} LibIdentOptions
  * @property {string} context absolute context path to which lib ident is relative to
- * @property {object=} associatedObjectForCache object for caching
+ * @property {AssociatedObjectForCache=} associatedObjectForCache object for caching
  */
 
 /**
@@ -103,6 +105,7 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {boolean=} async
  * @property {boolean=} sideEffectFree
  * @property {Record<string, string>=} exportsFinalName
+ * @property {boolean=} isCSSModule
  */
 
 /**
@@ -133,16 +136,18 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {ValueCacheVersions} valueCacheVersions
  */
 
-/** @typedef {KnownBuildMeta & Record<string, any>} BuildMeta */
-/** @typedef {KnownBuildInfo & Record<string, any>} BuildInfo */
+/** @typedef {(err?: WebpackError | null, needBuild?: boolean) => void} NeedBuildCallback */
+
+/** @typedef {(err?: WebpackError) => void} BuildCallback */
+
+/** @typedef {KnownBuildMeta & Record<string, EXPECTED_ANY>} BuildMeta */
+/** @typedef {KnownBuildInfo & Record<string, EXPECTED_ANY>} BuildInfo */
 
 /**
  * @typedef {object} FactoryMeta
  * @property {boolean=} sideEffectFree
  */
 
-/** @typedef {{ factoryMeta: FactoryMeta | undefined, resolveOptions: ResolveOptions | undefined }} UnsafeCacheData */
-
 const EMPTY_RESOLVE_OPTIONS = {};
 
 let debugId = 1000;
@@ -201,6 +206,7 @@ class Module extends DependenciesBlock {
 		this.useSimpleSourceMap = false;
 
 		// Is in hot context, i.e. HotModuleReplacementPlugin.js enabled
+		// TODO do we need hot here?
 		/** @type {boolean} */
 		this.hot = false;
 		// Info from Build
@@ -778,7 +784,7 @@ class Module extends DependenciesBlock {
 
 	/**
 	 * @param {NeedBuildContext} context context info
-	 * @param {function((WebpackError | null)=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
+	 * @param {NeedBuildCallback} callback callback function, returns true, if the module needs a rebuild
 	 * @returns {void}
 	 */
 	needBuild(context, callback) {
@@ -861,7 +867,7 @@ class Module extends DependenciesBlock {
 	 * @param {Compilation} compilation the compilation
 	 * @param {ResolverWithOptions} resolver the resolver
 	 * @param {InputFileSystem} fs the file system
-	 * @param {function(WebpackError=): void} callback callback function
+	 * @param {BuildCallback} callback callback function
 	 * @returns {void}
 	 */
 	build(options, compilation, resolver, fs, callback) {
@@ -1030,7 +1036,7 @@ class Module extends DependenciesBlock {
 
 	/**
 	 * restore unsafe cache data
-	 * @param {object} unsafeCacheData data from getUnsafeCacheData
+	 * @param {UnsafeCacheData} unsafeCacheData data from getUnsafeCacheData
 	 * @param {NormalModuleFactory} normalModuleFactory the normal module factory handling the unsafe caching
 	 */
 	_restoreFromUnsafeCache(unsafeCacheData, normalModuleFactory) {
@@ -1122,9 +1128,11 @@ class Module extends DependenciesBlock {
 makeSerializable(Module, "webpack/lib/Module");
 
 // TODO remove in webpack 6
-// eslint-disable-next-line no-warning-comments
-// @ts-ignore https://github.com/microsoft/TypeScript/issues/42919
 Object.defineProperty(Module.prototype, "hasEqualsChunks", {
+	/**
+	 * @deprecated
+	 * @returns {EXPECTED_ANY} throw an error
+	 */
 	get() {
 		throw new Error(
 			"Module.hasEqualsChunks was renamed (use hasEqualChunks instead)"
@@ -1133,9 +1141,11 @@ Object.defineProperty(Module.prototype, "hasEqualsChunks", {
 });
 
 // TODO remove in webpack 6
-// eslint-disable-next-line no-warning-comments
-// @ts-ignore https://github.com/microsoft/TypeScript/issues/42919
 Object.defineProperty(Module.prototype, "isUsed", {
+	/**
+	 * @deprecated
+	 * @returns {EXPECTED_ANY} throw an error
+	 */
 	get() {
 		throw new Error(
 			"Module.isUsed was renamed (use getUsedName, isExportUsed or isModuleUsed instead)"
@@ -1145,10 +1155,14 @@ Object.defineProperty(Module.prototype, "isUsed", {
 
 // TODO remove in webpack 6
 Object.defineProperty(Module.prototype, "errors", {
+	/**
+	 * @deprecated
+	 * @returns {WebpackError[]} errors
+	 */
 	get: util.deprecate(
 		/**
 		 * @this {Module}
-		 * @returns {WebpackError[]} array
+		 * @returns {WebpackError[]} errors
 		 */
 		function () {
 			if (this._errors === undefined) {
@@ -1163,10 +1177,14 @@ Object.defineProperty(Module.prototype, "errors", {
 
 // TODO remove in webpack 6
 Object.defineProperty(Module.prototype, "warnings", {
+	/**
+	 * @deprecated
+	 * @returns {WebpackError[]} warnings
+	 */
 	get: util.deprecate(
 		/**
 		 * @this {Module}
-		 * @returns {WebpackError[]} array
+		 * @returns {WebpackError[]} warnings
 		 */
 		function () {
 			if (this._warnings === undefined) {
@@ -1180,14 +1198,19 @@ Object.defineProperty(Module.prototype, "warnings", {
 });
 
 // TODO remove in webpack 6
-// eslint-disable-next-line no-warning-comments
-// @ts-ignore https://github.com/microsoft/TypeScript/issues/42919
 Object.defineProperty(Module.prototype, "used", {
+	/**
+	 * @deprecated
+	 * @returns {EXPECTED_ANY} throw an error
+	 */
 	get() {
 		throw new Error(
 			"Module.used was refactored (use ModuleGraph.getUsedExports instead)"
 		);
 	},
+	/**
+	 * @param {EXPECTED_ANY} value value
+	 */
 	set(value) {
 		throw new Error(
 			"Module.used was refactored (use ModuleGraph.setUsedExports instead)"

package/lib/ModuleBuildError.js

@@ -12,9 +12,11 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
+/** @typedef {Error & { hideStack?: boolean }} ErrorWithHideStack */
+
 class ModuleBuildError extends WebpackError {
 	/**
-	 * @param {string | Error&any} err error thrown
+	 * @param {string | ErrorWithHideStack} err error thrown
 	 * @param {{from?: string|null}} info additional info
 	 */
 	constructor(err, { from = null } = {}) {

package/lib/ModuleDependencyError.js

@@ -9,12 +9,13 @@ const WebpackError = require("./WebpackError");
 
 /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("./Module")} Module */
+/** @typedef {import("./ModuleBuildError").ErrorWithHideStack} ErrorWithHideStack */
 
 class ModuleDependencyError extends WebpackError {
 	/**
 	 * Creates an instance of ModuleDependencyError.
 	 * @param {Module} module module tied to dependency
-	 * @param {Error} err error thrown
+	 * @param {ErrorWithHideStack} err error thrown
 	 * @param {DependencyLocation} loc location of dependency
 	 */
 	constructor(module, err, loc) {
@@ -22,7 +23,7 @@ class ModuleDependencyError extends WebpackError {
 
 		this.name = "ModuleDependencyError";
 		this.details =
-			err && !(/** @type {any} */ (err).hideStack)
+			err && !err.hideStack
 				? /** @type {string} */ (err.stack).split("\n").slice(1).join("\n")
 				: undefined;
 		this.module = module;
@@ -30,7 +31,7 @@ class ModuleDependencyError extends WebpackError {
 		/** error is not (de)serialized, so it might be undefined after deserialization */
 		this.error = err;
 
-		if (err && /** @type {any} */ (err).hideStack && err.stack) {
+		if (err && err.hideStack && err.stack) {
 			this.stack = /** @type {string} */ `${err.stack
 				.split("\n")
 				.slice(1)

package/lib/ModuleDependencyWarning.js

@@ -10,11 +10,12 @@ const makeSerializable = require("./util/makeSerializable");
 
 /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("./Module")} Module */
+/** @typedef {import("./ModuleDependencyError").ErrorWithHideStack} ErrorWithHideStack */
 
 class ModuleDependencyWarning extends WebpackError {
 	/**
 	 * @param {Module} module module tied to dependency
-	 * @param {Error} err error thrown
+	 * @param {ErrorWithHideStack} err error thrown
 	 * @param {DependencyLocation} loc location of dependency
 	 */
 	constructor(module, err, loc) {
@@ -22,7 +23,7 @@ class ModuleDependencyWarning extends WebpackError {
 
 		this.name = "ModuleDependencyWarning";
 		this.details =
-			err && !(/** @type {any} */ (err).hideStack)
+			err && !err.hideStack
 				? /** @type {string} */ (err.stack).split("\n").slice(1).join("\n")
 				: undefined;
 		this.module = module;
@@ -30,7 +31,7 @@ class ModuleDependencyWarning extends WebpackError {
 		/** error is not (de)serialized, so it might be undefined after deserialization */
 		this.error = err;
 
-		if (err && /** @type {any} */ (err).hideStack && err.stack) {
+		if (err && err.hideStack && err.stack) {
 			this.stack = /** @type {string} */ `${err.stack
 				.split("\n")
 				.slice(1)

package/lib/ModuleFactory.js

@@ -18,11 +18,13 @@
  * @property {boolean=} cacheable allow to use the unsafe cache
  */
 
+/** @typedef {string | null} IssuerLayer */
+
 /**
  * @typedef {object} ModuleFactoryCreateDataContextInfo
  * @property {string} issuer
- * @property {string | null=} issuerLayer
- * @property {string} compiler
+ * @property {IssuerLayer=} issuerLayer
+ * @property {string=} compiler
  */
 
 /**
@@ -33,12 +35,16 @@
  * @property {Dependency[]} dependencies
  */
 
+/**
+ * @typedef {(err?: Error | null, result?: ModuleFactoryResult) => void} ModuleFactoryCallback
+ */
+
 class ModuleFactory {
 	/* istanbul ignore next */
 	/**
 	 * @abstract
 	 * @param {ModuleFactoryCreateData} data data object
-	 * @param {function((Error | null)=, ModuleFactoryResult=): void} callback callback
+	 * @param {ModuleFactoryCallback} callback callback
 	 * @returns {void}
 	 */
 	create(data, callback) {

package/lib/ModuleFilenameHelpers.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const NormalModule = require("./NormalModule");
+const { DEFAULTS } = require("./config/defaults");
 const createHash = require("./util/createHash");
 const memoize = require("./util/memoize");
 
@@ -15,7 +16,7 @@ const memoize = require("./util/memoize");
 /** @typedef {typeof import("./util/Hash")} Hash */
 
 /** @typedef {string | RegExp | (string | RegExp)[]} Matcher */
-/** @typedef {{test?: Matcher, include?: Matcher, exclude?: Matcher }} MatchObject */
+/** @typedef {{ test?: Matcher, include?: Matcher, exclude?: Matcher }} MatchObject */
 
 const ModuleFilenameHelpers = module.exports;
 
@@ -79,7 +80,7 @@ const getBefore = (strFn, token) => () => {
  * @returns {ReturnStringCallback} a function that returns the hash of the string
  */
 const getHash =
-	(strFn, hashFunction = "md4") =>
+	(strFn, hashFunction = DEFAULTS.HASH_FUNCTION) =>
 	() => {
 		const hash = createHash(hashFunction);
 		hash.update(strFn());
@@ -92,10 +93,10 @@ const getHash =
  * Returns a lazy object. The object is lazy in the sense that the properties are
  * only evaluated when they are accessed. This is only obtained by setting a function as the value for each key.
  * @param {Record<string, () => T>} obj the object to convert to a lazy access object
- * @returns {object} the lazy access object
+ * @returns {T} the lazy access object
  */
 const lazyObject = obj => {
-	const newObj = {};
+	const newObj = /** @type {T} */ ({});
 	for (const key of Object.keys(obj)) {
 		const fn = obj[key];
 		Object.defineProperty(newObj, key, {
@@ -118,18 +119,15 @@ const SQUARE_BRACKET_TAG_REGEXP = /\[\\*([\w-]+)\\*\]/gi;
 
 /**
  * @param {Module | string} module the module
- * @param {TODO} options options
- * @param {object} contextInfo context info
- * @param {RequestShortener} contextInfo.requestShortener requestShortener
- * @param {ChunkGraph} contextInfo.chunkGraph chunk graph
- * @param {string | Hash=} contextInfo.hashFunction the hash function to use
+ * @param {{ namespace?: string, moduleFilenameTemplate?: string | TODO }} options options
+ * @param {{ requestShortener: RequestShortener, chunkGraph: ChunkGraph, hashFunction?: string | Hash }} contextInfo context info
  * @returns {string} the filename
  */
 ModuleFilenameHelpers.createFilename = (
 	// eslint-disable-next-line default-param-last
 	module = "",
 	options,
-	{ requestShortener, chunkGraph, hashFunction = "md4" }
+	{ requestShortener, chunkGraph, hashFunction = DEFAULTS.HASH_FUNCTION }
 ) => {
 	const opts = {
 		namespace: "",
@@ -141,6 +139,7 @@ ModuleFilenameHelpers.createFilename = (
 				})
 	};
 
+	/** @type {ReturnStringCallback} */
 	let absoluteResourcePath;
 	let hash;
 	/** @type {ReturnStringCallback} */
@@ -155,7 +154,8 @@ ModuleFilenameHelpers.createFilename = (
 			(memoize(() => requestShortener.shorten(module)));
 		identifier = shortIdentifier;
 		moduleId = () => "";
-		absoluteResourcePath = () => module.split("!").pop();
+		absoluteResourcePath = () =>
+			/** @type {string} */ (module.split("!").pop());
 		hash = getHash(identifier, hashFunction);
 	} else {
 		shortIdentifier = memoize(() =>
@@ -170,7 +170,7 @@ ModuleFilenameHelpers.createFilename = (
 		absoluteResourcePath = () =>
 			module instanceof NormalModule
 				? module.resource
-				: module.identifier().split("!").pop();
+				: /** @type {string} */ (module.identifier().split("!").pop());
 		hash = getHash(identifier, hashFunction);
 	}
 	const resource =
@@ -203,7 +203,7 @@ ModuleFilenameHelpers.createFilename = (
 	}
 
 	// TODO webpack 6: consider removing alternatives without dashes
-	/** @type {Map<string, function(): string>} */
+	/** @type {Map<string, () => string>} */
 	const replacements = new Map([
 		["identifier", identifier],
 		["short-identifier", shortIdentifier],