webpack 5.101.3 → 5.102.1

package/lib/IgnorePlugin.js

@@ -12,6 +12,7 @@ const createSchemaValidation = require("./util/create-schema-validation");
 /** @typedef {import("../declarations/plugins/IgnorePlugin").IgnorePluginOptions} IgnorePluginOptions */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./NormalModuleFactory").ResolveData} ResolveData */
+/** @typedef {import("./ContextModuleFactory").BeforeContextResolveData} BeforeContextResolveData */
 
 const validate = createSchemaValidation(
 	require("../schemas/plugins/IgnorePlugin.check"),
@@ -22,6 +23,8 @@ const validate = createSchemaValidation(
 	}
 );
 
+/** @typedef {(resource: string, context: string) => boolean} CheckResourceFn */
+
 const PLUGIN_NAME = "IgnorePlugin";
 
 class IgnorePlugin {
@@ -36,8 +39,8 @@ class IgnorePlugin {
 
 	/**
 	 * Note that if "contextRegExp" is given, both the "resourceRegExp" and "contextRegExp" have to match.
-	 * @param {ResolveData} resolveData resolve data
-	 * @returns {false|undefined} returns false when the request should be ignored, otherwise undefined
+	 * @param {ResolveData | BeforeContextResolveData} resolveData resolve data
+	 * @returns {false | undefined} returns false when the request should be ignored, otherwise undefined
 	 */
 	checkIgnore(resolveData) {
 		if (

package/lib/InitFragment.js

@@ -13,18 +13,32 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
+/** @typedef {string} InitFragmentKey */
+
+/**
+ * @template GenerateContext
+ * @typedef {object} MaybeMergeableInitFragment
+ * @property {InitFragmentKey=} key
+ * @property {number} stage
+ * @property {number} position
+ * @property {(context: GenerateContext) => string | Source | undefined} getContent
+ * @property {(context: GenerateContext) => string | Source | undefined} getEndContent
+ * @property {(fragments: MaybeMergeableInitFragment<GenerateContext>) => MaybeMergeableInitFragment<GenerateContext>=} merge
+ * @property {(fragments: MaybeMergeableInitFragment<GenerateContext>[]) => MaybeMergeableInitFragment<GenerateContext>[]=} mergeAll
+ */
+
 /**
  * @template T
- * @param {InitFragment<T>} fragment the init fragment
+ * @param {T} fragment the init fragment
  * @param {number} index index
- * @returns {[InitFragment<T>, number]} tuple with both
+ * @returns {[T, number]} tuple with both
  */
 const extractFragmentIndex = (fragment, index) => [fragment, index];
 
 /**
  * @template T
- * @param {[InitFragment<T>, number]} a first pair
- * @param {[InitFragment<T>, number]} b second pair
+ * @param {[MaybeMergeableInitFragment<T>, number]} a first pair
+ * @param {[MaybeMergeableInitFragment<T>, number]} b second pair
  * @returns {number} sort value
  */
 const sortFragmentWithIndex = ([a, i], [b, j]) => {
@@ -37,13 +51,14 @@ const sortFragmentWithIndex = ([a, i], [b, j]) => {
 
 /**
  * @template GenerateContext
+ * @implements {MaybeMergeableInitFragment<GenerateContext>}
  */
 class InitFragment {
 	/**
 	 * @param {string | Source | undefined} content the source code that will be included as initialization code
 	 * @param {number} stage category of initialization code (contribute to order)
 	 * @param {number} position position in the category (contribute to order)
-	 * @param {string=} key unique key to avoid emitting the same initialization code twice
+	 * @param {InitFragmentKey=} key unique key to avoid emitting the same initialization code twice
 	 * @param {string | Source=} endContent the source code that will be included at the end of the module
 	 */
 	constructor(content, stage, position, key, endContent) {
@@ -64,7 +79,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 | undefined} the source code that will be included at the end of the module
 	 */
 	getEndContent(context) {
 		return this.endContent;
@@ -72,9 +87,8 @@ class InitFragment {
 
 	/**
 	 * @template Context
-	 * @template T
 	 * @param {Source} source sources
-	 * @param {InitFragment<T>[]} initFragments init fragments
+	 * @param {MaybeMergeableInitFragment<Context>[]} initFragments init fragments
 	 * @param {Context} context context
 	 * @returns {Source} source
 	 */
@@ -87,14 +101,10 @@ class InitFragment {
 				.sort(sortFragmentWithIndex);
 
 			// Deduplicate fragments. If a fragment has no key, it is always included.
+			/** @type {Map<InitFragmentKey | symbol, MaybeMergeableInitFragment<Context> | MaybeMergeableInitFragment<Context>[]>} */
 			const keyedFragments = new Map();
 			for (const [fragment] of sortedFragments) {
-				if (
-					typeof (
-						/** @type {InitFragment<T> & { mergeAll?: (fragments: InitFragment<Context>[]) => InitFragment<Context>[] }} */
-						(fragment).mergeAll
-					) === "function"
-				) {
+				if (typeof fragment.mergeAll === "function") {
 					if (!fragment.key) {
 						throw new Error(
 							`InitFragment with mergeAll function must have a valid key: ${fragment.constructor.name}`
@@ -110,9 +120,12 @@ class InitFragment {
 					}
 					continue;
 				} else if (typeof fragment.merge === "function") {
-					const oldValue = keyedFragments.get(fragment.key);
+					const key = /** @type {InitFragmentKey} */ (fragment.key);
+					const oldValue =
+						/** @type {MaybeMergeableInitFragment<Context>} */
+						(keyedFragments.get(key));
 					if (oldValue !== undefined) {
-						keyedFragments.set(fragment.key, fragment.merge(oldValue));
+						keyedFragments.set(key, fragment.merge(oldValue));
 						continue;
 					}
 				}
@@ -123,10 +136,19 @@ class InitFragment {
 			const endContents = [];
 			for (let fragment of keyedFragments.values()) {
 				if (Array.isArray(fragment)) {
-					fragment = fragment[0].mergeAll(fragment);
+					fragment =
+						/** @type {[MaybeMergeableInitFragment<Context> & { mergeAll: (fragments: MaybeMergeableInitFragment<Context>[]) => MaybeMergeableInitFragment<Context>[] }, ...MaybeMergeableInitFragment<Context>[]]} */
+						(fragment)[0].mergeAll(fragment);
 				}
-				concatSource.add(fragment.getContent(context));
-				const endContent = fragment.getEndContent(context);
+				const content =
+					/** @type {MaybeMergeableInitFragment<Context>} */
+					(fragment).getContent(context);
+				if (content) {
+					concatSource.add(content);
+				}
+				const endContent =
+					/** @type {MaybeMergeableInitFragment<Context>} */
+					(fragment).getEndContent(context);
 				if (endContent) {
 					endContents.push(endContent);
 				}
@@ -170,16 +192,6 @@ class InitFragment {
 
 makeSerializable(InitFragment, "webpack/lib/InitFragment");
 
-InitFragment.prototype.merge =
-	/** @type {TODO} */
-	(undefined);
-InitFragment.prototype.getImported =
-	/** @type {TODO} */
-	(undefined);
-InitFragment.prototype.setImported =
-	/** @type {TODO} */
-	(undefined);
-
 InitFragment.STAGE_CONSTANTS = 10;
 InitFragment.STAGE_ASYNC_BOUNDARY = 20;
 InitFragment.STAGE_HARMONY_EXPORTS = 30;

package/lib/InvalidDependenciesModuleWarning.js

@@ -8,7 +8,6 @@
 const WebpackError = require("./WebpackError");
 const makeSerializable = require("./util/makeSerializable");
 
-/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("./Module")} Module */
 
 class InvalidDependenciesModuleWarning extends WebpackError {

package/lib/LibManifestPlugin.js

@@ -15,12 +15,13 @@ const { dirname, mkdirp } = require("./util/fs");
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Compiler").IntermediateFileSystem} IntermediateFileSystem */
 /** @typedef {import("./Module").BuildMeta} BuildMeta */
+/** @typedef {import("./ExportsInfo").ExportInfoName} ExportInfoName */
 
 /**
  * @typedef {object} ManifestModuleData
- * @property {string | number} id
+ * @property {ModuleId} id
  * @property {BuildMeta=} buildMeta
- * @property {boolean | string[]=} exports
+ * @property {ExportInfoName[]=} exports
  */
 
 /**
@@ -92,10 +93,7 @@ class LibManifestPlugin {
 								continue;
 							}
 							const ident = module.libIdent({
-								context:
-									this.options.context ||
-									/** @type {string} */
-									(compiler.options.context),
+								context: this.options.context || compiler.context,
 								associatedObjectForCache: compiler.root
 							});
 							if (ident) {

package/lib/LoaderOptionsPlugin.js

@@ -11,7 +11,6 @@ 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  */
 
 /**
@@ -39,15 +38,7 @@ class LoaderOptionsPlugin {
 		// If no options are set then generate empty options object
 		if (typeof options !== "object") options = {};
 		if (!options.test) {
-			/** @type {Partial<RegExp>} */
-			const defaultTrueMockRegExp = {
-				test: () => true
-			};
-
-			/** @type {RegExp} */
-			options.test =
-				/** @type {RegExp} */
-				(defaultTrueMockRegExp);
+			options.test = () => true;
 		}
 		this.options = options;
 	}

package/lib/MainTemplate.js

@@ -11,7 +11,6 @@ const RuntimeGlobals = require("./RuntimeGlobals");
 const memoize = require("./util/memoize");
 
 /** @typedef {import("tapable").Tap} Tap */
-/** @typedef {import("webpack-sources").ConcatSource} ConcatSource */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/WebpackOptions").Output} OutputOptions */
 /** @typedef {import("./ModuleTemplate")} ModuleTemplate */
@@ -19,19 +18,13 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("./Compilation").InterpolatedPathAndAssetInfo} InterpolatedPathAndAssetInfo */
-/** @typedef {import("./Module")} Module} */
-/** @typedef {import("./util/Hash")} Hash} */
-/** @typedef {import("./DependencyTemplates")} DependencyTemplates} */
-/** @typedef {import("./javascript/JavascriptModulesPlugin").RenderContext} RenderContext} */
-/** @typedef {import("./javascript/JavascriptModulesPlugin").RenderBootstrapContext} RenderBootstrapContext} */
-/** @typedef {import("./javascript/JavascriptModulesPlugin").ChunkHashContext} ChunkHashContext} */
-/** @typedef {import("./RuntimeTemplate")} RuntimeTemplate} */
-/** @typedef {import("./ModuleGraph")} ModuleGraph} */
-/** @typedef {import("./ChunkGraph")} ChunkGraph} */
-/** @typedef {import("./Template").RenderManifestOptions} RenderManifestOptions} */
-/** @typedef {import("./Template").RenderManifestEntry} RenderManifestEntry} */
-/** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath} */
-/** @typedef {import("./TemplatedPathPlugin").PathData} PathData} */
+/** @typedef {import("./util/Hash")} Hash */
+/** @typedef {import("./DependencyTemplates")} DependencyTemplates */
+/** @typedef {import("./javascript/JavascriptModulesPlugin").RenderBootstrapContext} RenderBootstrapContext */
+/** @typedef {import("./Template").RenderManifestOptions} RenderManifestOptions */
+/** @typedef {import("./Template").RenderManifestEntry} RenderManifestEntry */
+/** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
+/** @typedef {import("./TemplatedPathPlugin").PathData} PathData */
 /**
  * @template T
  * @typedef {import("tapable").IfSet<T>} IfSet
@@ -324,11 +317,7 @@ class MainTemplate {
 			 * @param {PathData} options context data
 			 * @returns {string} interpolated path
 			 */ (options) =>
-				compilation.getAssetPath(
-					/** @type {string} */
-					(compilation.outputOptions.publicPath),
-					options
-				),
+				compilation.getAssetPath(compilation.outputOptions.publicPath, options),
 			"MainTemplate.getPublicPath is deprecated (use Compilation.getAssetPath(compilation.outputOptions.publicPath, options) instead)",
 			"DEP_WEBPACK_MAIN_TEMPLATE_GET_PUBLIC_PATH"
 		);

package/lib/Module.js

@@ -17,7 +17,7 @@ const makeSerializable = require("./util/makeSerializable");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
-/** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
+/** @typedef {import("./config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptions */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
 /** @typedef {import("./ChunkGroup")} ChunkGroup */
@@ -30,15 +30,19 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("./DependencyTemplate").CssData} CssData */
 /** @typedef {import("./DependencyTemplates")} DependencyTemplates */
-/** @typedef {import("./ExportsInfo").UsageStateType} UsageStateType */
 /** @typedef {import("./FileSystemInfo")} FileSystemInfo */
 /** @typedef {import("./FileSystemInfo").Snapshot} Snapshot */
 /** @typedef {import("./ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("./ModuleTypeConstants").ModuleTypes} ModuleTypes */
+/** @typedef {import("./ModuleGraph").OptimizationBailouts} OptimizationBailouts */
 /** @typedef {import("./NormalModuleFactory")} NormalModuleFactory */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
+/**
+ * @template T
+ * @typedef {import("./InitFragment")<T>} InitFragment
+ */
 /** @typedef {import("./WebpackError")} WebpackError */
 /** @typedef {import("./json/JsonData")} JsonData */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
@@ -54,11 +58,6 @@ const makeSerializable = require("./util/makeSerializable");
  * @typedef {import("./util/LazySet")<T>} LazySet<T>
  */
 
-/**
- * @template T
- * @typedef {import("./util/SortableSet")<T>} SortableSet<T>
- */
-
 /**
  * @typedef {object} SourceContext
  * @property {DependencyTemplates} dependencyTemplates the dependency templates
@@ -94,10 +93,16 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {Set<string>} RuntimeRequirements */
 /** @typedef {ReadonlySet<string>} ReadOnlyRuntimeRequirements */
 
+/** @typedef {Map<"topLevelDeclarations", Set<string>> & Map<"chunkInitFragments", InitFragment<EXPECTED_ANY>[]>} KnownCodeGenerationResultDataForJavascriptModules */
+/** @typedef {Map<"url", { ["css-url"]: string }>} KnownCodeGenerationResultDataForCssModules */
+/** @typedef {Map<"filename", string> & Map<"assetInfo", AssetInfo> & Map<"fullContentHash", string>} KnownCodeGenerationResultDataForAssetModules */
+/** @typedef {Map<"share-init", [{ shareScope: string, initStage: number, init: string }]>} KnownCodeGenerationResultForSharing */
+/** @typedef {KnownCodeGenerationResultDataForJavascriptModules & KnownCodeGenerationResultDataForCssModules & KnownCodeGenerationResultDataForAssetModules & KnownCodeGenerationResultForSharing & Map<string, EXPECTED_ANY>} CodeGenerationResultData */
+
 /**
  * @typedef {object} CodeGenerationResult
  * @property {Map<string, Source>} sources the resulting sources for all source types
- * @property {Map<string, TODO>=} data the resulting data for all source types
+ * @property {CodeGenerationResultData=} 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)
  */
@@ -113,6 +118,7 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {("default" | "namespace" | "flagged" | "dynamic")=} exportsType
  * @property {(false | "redirect" | "redirect-warn")=} defaultObject
  * @property {boolean=} strictHarmonyModule
+ * @property {boolean=} treatAsCommonJs
  * @property {boolean=} async
  * @property {boolean=} sideEffectFree
  * @property {boolean=} isCSSModule
@@ -121,6 +127,8 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {string=} factoryExportsBinding
  */
 
+/** @typedef {LazySet<string>} FileSystemDependencies */
+
 /**
  * @typedef {object} KnownBuildInfo
  * @property {boolean=} cacheable
@@ -131,10 +139,10 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {string=} moduleConcatenationBailout using in CommonJs
  * @property {boolean=} needCreateRequire using in APIPlugin
  * @property {string=} resourceIntegrity using in HttpUriPlugin
- * @property {LazySet<string>=} fileDependencies using in NormalModule
- * @property {LazySet<string>=} contextDependencies using in NormalModule
- * @property {LazySet<string>=} missingDependencies using in NormalModule
- * @property {LazySet<string>=} buildDependencies using in NormalModule
+ * @property {FileSystemDependencies=} fileDependencies using in NormalModule
+ * @property {FileSystemDependencies=} contextDependencies using in NormalModule
+ * @property {FileSystemDependencies=} missingDependencies using in NormalModule
+ * @property {FileSystemDependencies=} buildDependencies using in NormalModule
  * @property {ValueCacheVersions=} valueDependencies using in NormalModule
  * @property {Record<string, Source>=} assets using in NormalModule
  * @property {Map<string, AssetInfo | undefined>=} assetsInfo using in NormalModule
@@ -151,7 +159,8 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {Set<string>=} topLevelDeclarations top level declaration names
  */
 
-/** @typedef {Map<string, string | Set<string>>} ValueCacheVersions */
+/** @typedef {string | Set<string>} ValueCacheVersion */
+/** @typedef {Map<string, ValueCacheVersion>} ValueCacheVersions */
 
 /**
  * @typedef {object} NeedBuildContext
@@ -193,6 +202,9 @@ const deprecatedNeedRebuild = util.deprecate(
 	"DEP_WEBPACK_MODULE_NEED_REBUILD"
 );
 
+/** @typedef {string} LibIdent */
+/** @typedef {string} NameForCondition */
+
 /** @typedef {(requestShortener: RequestShortener) => string} OptimizationBailoutFunction */
 
 class Module extends DependenciesBlock {
@@ -412,7 +424,7 @@ class Module extends DependenciesBlock {
 
 	/**
 	 * @deprecated
-	 * @returns {(string | OptimizationBailoutFunction)[]} list
+	 * @returns {OptimizationBailouts} list
 	 */
 	get optimizationBailout() {
 		return ModuleGraph.getModuleGraphForModule(
@@ -967,14 +979,14 @@ class Module extends DependenciesBlock {
 
 	/**
 	 * @param {LibIdentOptions} options options
-	 * @returns {string | null} an identifier for library inclusion
+	 * @returns {LibIdent | null} an identifier for library inclusion
 	 */
 	libIdent(options) {
 		return null;
 	}
 
 	/**
-	 * @returns {string | null} absolute path which should be used for condition matching (usually the resource path)
+	 * @returns {NameForCondition | null} absolute path which should be used for condition matching (usually the resource path)
 	 */
 	nameForCondition() {
 		return null;
@@ -1091,10 +1103,10 @@ class Module extends DependenciesBlock {
 	}
 
 	/**
-	 * @param {LazySet<string>} fileDependencies set where file dependencies are added to
-	 * @param {LazySet<string>} contextDependencies set where context dependencies are added to
-	 * @param {LazySet<string>} missingDependencies set where missing dependencies are added to
-	 * @param {LazySet<string>} buildDependencies set where build dependencies are added to
+	 * @param {FileSystemDependencies} fileDependencies set where file dependencies are added to
+	 * @param {FileSystemDependencies} contextDependencies set where context dependencies are added to
+	 * @param {FileSystemDependencies} missingDependencies set where missing dependencies are added to
+	 * @param {FileSystemDependencies} buildDependencies set where build dependencies are added to
 	 */
 	addCacheDependencies(
 		fileDependencies,

package/lib/ModuleFactory.js

@@ -23,7 +23,7 @@
 /**
  * @typedef {object} ModuleFactoryCreateDataContextInfo
  * @property {string} issuer
- * @property {IssuerLayer=} issuerLayer
+ * @property {IssuerLayer} issuerLayer
  * @property {string=} compiler
  */
 

package/lib/ModuleFilenameHelpers.js

@@ -10,13 +10,12 @@ const { DEFAULTS } = require("./config/defaults");
 const createHash = require("./util/createHash");
 const memoize = require("./util/memoize");
 
-/** @typedef {import("../declarations/WebpackOptions").DevtoolModuleFilenameTemplate} DevtoolModuleFilenameTemplate */
 /** @typedef {import("../declarations/WebpackOptions").HashFunction} HashFunction */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 
-/** @typedef {string | RegExp | (string | RegExp)[]} Matcher */
+/** @typedef {string | RegExp | ((str: string) => boolean) | (string | RegExp | ((str: string) => boolean))[]} Matcher */
 /** @typedef {{ test?: Matcher, include?: Matcher, exclude?: Matcher }} MatchObject */
 
 const ModuleFilenameHelpers = module.exports;
@@ -85,7 +84,7 @@ const getHash =
 	() => {
 		const hash = createHash(hashFunction);
 		hash.update(strFn());
-		const digest = /** @type {string} */ (hash.digest("hex"));
+		const digest = hash.digest("hex");
 		return digest.slice(0, 4);
 	};
 
@@ -94,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 {T} the lazy access object
+ * @returns {Record<string, T>} the lazy access object
  */
 const lazyObject = (obj) => {
-	const newObj = /** @type {T} */ ({});
+	const newObj = /** @type {Record<string, T>} */ ({});
 	for (const key of Object.keys(obj)) {
 		const fn = obj[key];
 		Object.defineProperty(newObj, key, {
@@ -117,8 +116,21 @@ const lazyObject = (obj) => {
 };
 
 const SQUARE_BRACKET_TAG_REGEXP = /\[\\*([\w-]+)\\*\]/gi;
-
-/** @typedef {((context: TODO) => string)} ModuleFilenameTemplateFunction */
+/**
+ * @typedef {object} ModuleFilenameTemplateContext
+ * @property {string} identifier the identifier of the module
+ * @property {string} shortIdentifier the shortened identifier of the module
+ * @property {string} resource the resource of the module request
+ * @property {string} resourcePath the resource path of the module request
+ * @property {string} absoluteResourcePath the absolute resource path of the module request
+ * @property {string} loaders the loaders of the module request
+ * @property {string} allLoaders the all loaders of the module request
+ * @property {string} query the query of the module identifier
+ * @property {string} moduleId the module id of the module
+ * @property {string} hash the hash of the module identifier
+ * @property {string} namespace the module namespace
+ */
+/** @typedef {((context: ModuleFilenameTemplateContext) => string)} ModuleFilenameTemplateFunction */
 /** @typedef {string | ModuleFilenameTemplateFunction} ModuleFilenameTemplate */
 
 /**
@@ -190,19 +202,22 @@ ModuleFilenameHelpers.createFilename = (
 	};
 	if (typeof opts.moduleFilenameTemplate === "function") {
 		return opts.moduleFilenameTemplate(
-			lazyObject({
-				identifier,
-				shortIdentifier,
-				resource,
-				resourcePath: memoize(resourcePath),
-				absoluteResourcePath: memoize(absoluteResourcePath),
-				loaders: memoize(loaders),
-				allLoaders: memoize(allLoaders),
-				query: memoize(query),
-				moduleId: memoize(moduleId),
-				hash: memoize(hash),
-				namespace: () => opts.namespace
-			})
+			/** @type {ModuleFilenameTemplateContext} */
+			(
+				lazyObject({
+					identifier,
+					shortIdentifier,
+					resource,
+					resourcePath: memoize(resourcePath),
+					absoluteResourcePath: memoize(absoluteResourcePath),
+					loaders: memoize(loaders),
+					allLoaders: memoize(allLoaders),
+					query: memoize(query),
+					moduleId: memoize(moduleId),
+					hash: memoize(hash),
+					namespace: () => opts.namespace
+				})
+			)
 		);
 	}
 
@@ -319,13 +334,15 @@ ModuleFilenameHelpers.replaceDuplicates = (array, fn, comparator) => {
  */
 const matchPart = (str, test) => {
 	if (!test) return true;
-	if (Array.isArray(test)) {
-		return test.some((test) => matchPart(str, test));
-	}
-	if (typeof test === "string") {
+	if (test instanceof RegExp) {
+		return test.test(str);
+	} else if (typeof test === "string") {
 		return str.startsWith(test);
+	} else if (typeof test === "function") {
+		return test(str);
 	}
-	return test.test(str);
+
+	return test.some((test) => matchPart(str, test));
 };
 
 ModuleFilenameHelpers.matchPart = matchPart;