webpack 5.111.1 → 5.112.1

package/lib/asset/AssetGenerator.js

@@ -7,8 +7,8 @@
 
 const path = require("path");
 const { RawSource } = require("webpack-sources");
-const ConcatenationScope = require("../ConcatenationScope");
-const Generator = require("../Generator");
+const isDependencyKind = require("../graph/isDependencyKind");
+const Generator = require("../module/Generator");
 const {
 	ASSET_AND_ASSET_URL_TYPES,
 	ASSET_AND_JAVASCRIPT_AND_ASSET_URL_TYPES,
@@ -20,14 +20,17 @@ const {
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES,
 	NO_TYPES
-} = require("../ModuleSourceTypeConstants");
-const { ASSET_MODULE_TYPE } = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const { toTemplateSourceFileName } = require("../TemplatedPathPlugin");
-const URLDependency = require("../dependencies/URLDependency");
+} = require("../module/ModuleSourceTypeConstants");
+const { ASSET_MODULE_TYPE } = require("../module/ModuleTypeConstants");
+const ConcatenationScope = require("../optimize/ConcatenationScope");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const { toTemplateSourceFileName } = require("../template/TemplatedPathPlugin");
 const { getScheme } = require("../util/URLAbsoluteSpecifier");
 const createHash = require("../util/createHash");
-const { languageOfMediaType } = require("../util/dataURL");
+const {
+	encodeDataURIPayload,
+	languageOfMediaType
+} = require("../util/dataURL");
 const { makePathsRelative, parseResource } = require("../util/identifier");
 const memoize = require("../util/memoize");
 const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
@@ -39,6 +42,7 @@ const { updateHashFromSource } = require("../util/source");
 
 const getMimeTypes = memoize(() => require("../util/mimeTypes"));
 
+/** @import { BuiltAssetModule, AssetNormalModule } from "./AssetModule" */
 /** @import { Source } from "webpack-sources" */
 /**
  * @import {
@@ -50,20 +54,18 @@ const getMimeTypes = memoize(() => require("../util/mimeTypes"));
  * 	RawPublicPath
  * } from "../../declarations/WebpackOptions"
  */
-/** @import ChunkGraph from "../ChunkGraph" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 /** @import Compilation, { AssetInfo } from "../Compilation" */
-/** @import { GenerateContext, UpdateHashContext } from "../Generator" */
+/** @import { GenerateContext, UpdateHashContext } from "../module/Generator" */
 /**
  * @import Module, {
  * 	ConcatenationBailoutReasonContext,
  * 	SourceType,
  * 	SourceTypes
- * } from "../Module"
+ * } from "../module/Module"
  */
-/** @import { AssetModuleBuildInfo } from "./AssetModule" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import NormalModule from "../NormalModule" */
-/** @import RuntimeTemplate from "../RuntimeTemplate" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import RuntimeTemplate from "../template/RuntimeTemplate" */
 /** @import Hash from "../util/Hash" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 
@@ -203,6 +205,14 @@ const decodeDataUriContent = (encoding, content) => {
 
 const DEFAULT_ENCODING = "base64";
 
+/**
+ * The module type the JSDoc inherited from `Generator` names.
+ * @typedef {AssetNormalModule} TModule
+ */
+
+/**
+ * @extends {Generator<TModule>}
+ */
 class AssetGenerator extends Generator {
 	/**
 	 * Creates an instance of AssetGenerator.
@@ -242,7 +252,7 @@ class AssetGenerator extends Generator {
 
 	/**
 	 * Gets source file name.
-	 * @param {NormalModule} module module
+	 * @param {TModule} module module
 	 * @param {RuntimeTemplate} runtimeTemplate runtime template
 	 * @returns {string} source file name
 	 */
@@ -257,13 +267,11 @@ class AssetGenerator extends Generator {
 	/**
 	 * The resource this asset is named after, which something that re-encoded it
 	 * may have changed. Its emitted name and inlined media type both read this.
-	 * @param {NormalModule} module module
+	 * @param {TModule} module module
 	 * @returns {string} the resource
 	 */
 	static getAssetResource(module) {
-		const buildInfo = /** @type {AssetModuleBuildInfo | undefined} */ (
-			module.buildInfo
-		);
+		const buildInfo = module.buildInfo;
 
 		return /** @type {string} */ (
 			(buildInfo && buildInfo.assetResource) || module.getResource()
@@ -272,10 +280,10 @@ class AssetGenerator extends Generator {
 
 	/**
 	 * Gets the source file name as seen by a filename template. With
-	 * `experiments.futureDefaults` (webpack 6 default) `[path]` and `[file]` of a
+	 * `experiments.futureDefaults` (the next major release's default) `[path]` and `[file]` of a
 	 * module outside of `context` behave like `[containedpath]`/`[containedfile]`,
 	 * so they can't emit the asset outside of `output.path`.
-	 * @param {NormalModule} module module
+	 * @param {TModule} module module
 	 * @param {RuntimeTemplate} runtimeTemplate runtime template
 	 * @returns {string} source file name for the filename template
 	 */
@@ -288,7 +296,7 @@ class AssetGenerator extends Generator {
 
 	/**
 	 * Gets full content hash.
-	 * @param {NormalModule} module module
+	 * @param {TModule} module module
 	 * @param {RuntimeTemplate} runtimeTemplate runtime template
 	 * @returns {[string, string]} return full hash and non-numeric full hash
 	 */
@@ -323,7 +331,7 @@ class AssetGenerator extends Generator {
 
 	/**
 	 * Gets filename with info.
-	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {TModule} module module for which the code should be generated
 	 * @param {Pick<AssetResourceGeneratorOptions, "filename" | "outputPath">} generatorOptions generator options
 	 * @param {{ runtime: RuntimeSpec, runtimeTemplate: RuntimeTemplate, chunkGraph: ChunkGraph }} generateContext context for generate
 	 * @param {string} contentHash the content hash
@@ -381,7 +389,7 @@ class AssetGenerator extends Generator {
 
 	/**
 	 * Gets asset path with info.
-	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {TModule} module module for which the code should be generated
 	 * @param {Pick<AssetResourceGeneratorOptions, "publicPath">} generatorOptions generator options
 	 * @param {GenerateContext} generateContext context for generate
 	 * @param {string} filename the filename
@@ -493,7 +501,7 @@ class AssetGenerator extends Generator {
 
 	/**
 	 * Returns the reason this module cannot be concatenated, when one exists.
-	 * @param {NormalModule} module module for which the bailout reason should be determined
+	 * @param {TModule} module module for which the bailout reason should be determined
 	 * @param {ConcatenationBailoutReasonContext} context context
 	 * @returns {string | undefined} reason why this module can't be concatenated, undefined when it can be concatenated
 	 */
@@ -503,7 +511,7 @@ class AssetGenerator extends Generator {
 
 	/**
 	 * Returns mime type.
-	 * @param {NormalModule} module module
+	 * @param {TModule} module module
 	 * @returns {string} mime type
 	 */
 	getMimeType(module) {
@@ -554,14 +562,14 @@ class AssetGenerator extends Generator {
 			);
 		}
 
-		return /** @type {string} */ (mimeType);
+		return mimeType;
 	}
 
 	/**
 	 * Offer the payload to `renderEmbeddedSource` before it is encoded, so the
 	 * encoding covers what came back. Declines what names no language, and a
 	 * `dataUrl` function, which is handed the source itself.
-	 * @param {NormalModule} module the module holding the payload
+	 * @param {TModule} module the module holding the payload
 	 * @param {GenerateContext["runtimeTemplate"]} runtimeTemplate runtime template
 	 * @returns {Source | undefined} the rendered payload, when one came back
 	 */
@@ -589,7 +597,7 @@ class AssetGenerator extends Generator {
 
 	/**
 	 * Generates data uri.
-	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {TModule} module module for which the code should be generated
 	 * @param {Source=} renderedSource the payload to encode, when a hook rendered it
 	 * @returns {string} DataURI
 	 */
@@ -635,11 +643,19 @@ class AssetGenerator extends Generator {
 				encodedContent =
 					/** @type {string} */
 					(module.resourceResolveData.encodedContent);
-			} else {
-				encodedContent = encodeDataUri(
-					/** @type {"base64" | false} */ (encoding),
-					source
+			} else if (
+				renderedSource !== undefined &&
+				encoding === false &&
+				module.resourceResolveData &&
+				module.resourceResolveData.encoding === false
+			) {
+				// A rendered payload of a `data:` URI written as text is written back
+				// as text: percent-encoding all of it outgrows what minifying saved.
+				encodedContent = encodeDataURIPayload(
+					/** @type {string} */ (source.source())
 				);
+			} else {
+				encodedContent = encodeDataUri(encoding, source);
 			}
 
 			encodedSource = `data:${mimeType}${
@@ -652,7 +668,7 @@ class AssetGenerator extends Generator {
 
 	/**
 	 * Generates generated code for this runtime module.
-	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {TModule} module module for which the code should be generated
 	 * @param {GenerateContext} generateContext context for generate
 	 * @returns {Source | null} generated code
 	 */
@@ -670,19 +686,15 @@ class AssetGenerator extends Generator {
 
 		const needContent = type === JAVASCRIPT_TYPE || type === ASSET_URL_TYPE;
 		const data = getData ? getData() : undefined;
+		const { buildInfo } = /** @type {BuiltAssetModule} */ (module);
 
-		if (
-			/** @type {AssetModuleBuildInfo} */
-			(module.buildInfo).dataUrl &&
-			needContent
-		) {
-			// A payload bound for CSS or HTML is offered by their serializers, which
-			// see the `url()` it ends up in; only the JavaScript one is ours.
+		if (buildInfo.dataUrl && needContent) {
+			// WHY: CSS and HTML serializers offer the payload in the `url()` or
+			// attribute it lands in, but the `asset-url` value is also what an
+			// analyzable `new URL` copies into JavaScript, which nothing re-reads.
 			const encodedSource = this.generateDataUri(
 				module,
-				type === JAVASCRIPT_TYPE
-					? this._renderEmbedded(module, runtimeTemplate)
-					: undefined
+				this._renderEmbedded(module, runtimeTemplate)
 			);
 			content =
 				type === JAVASCRIPT_TYPE
@@ -703,8 +715,7 @@ class AssetGenerator extends Generator {
 				data.set("contentHash", contentHash);
 			}
 
-			/** @type {AssetModuleBuildInfo} */
-			(module.buildInfo).fullContentHash = fullContentHash;
+			buildInfo.fullContentHash = fullContentHash;
 
 			const { originalFilename, filename, assetInfo } =
 				AssetGenerator.getFilenameWithInfo(
@@ -748,12 +759,10 @@ class AssetGenerator extends Generator {
 
 			// Due to code generation caching module.buildInfo.XXX can't used to store such information
 			// It need to be stored in the code generation results instead, where it's cached too
-			// TODO webpack 6 For back-compat reasons we also store in on module.buildInfo
-			/** @type {AssetModuleBuildInfo} */
-			(module.buildInfo).filename = filename;
+			// TODO in the next major release: remove the back-compat writes to module.buildInfo
+			buildInfo.filename = filename;
 
-			/** @type {AssetModuleBuildInfo} */
-			(module.buildInfo).assetInfo = newAssetInfo;
+			buildInfo.assetInfo = newAssetInfo;
 
 			content = assetPath;
 		}
@@ -784,7 +793,7 @@ class AssetGenerator extends Generator {
 	/**
 	 * Generates fallback output for the provided error condition.
 	 * @param {Error} error the error
-	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {TModule} module module for which the code should be generated
 	 * @param {GenerateContext} generateContext context for generate
 	 * @returns {Source | null} generated code
 	 */
@@ -834,7 +843,7 @@ class AssetGenerator extends Generator {
 
 	/**
 	 * Returns the source types available for this module.
-	 * @param {NormalModule} module fresh module
+	 * @param {TModule} module fresh module
 	 * @returns {SourceTypes} available types (do not mutate)
 	 */
 	getTypes(module) {
@@ -842,10 +851,7 @@ class AssetGenerator extends Generator {
 
 		// One that emits nothing has no name to build a literal from, so expose its url.
 		const emits =
-			!(
-				module.buildInfo &&
-				/** @type {AssetModuleBuildInfo} */ (module.buildInfo).dataUrl
-			) && this.emit !== false;
+			!(module.buildInfo && module.buildInfo.dataUrl) && this.emit !== false;
 
 		// WHY: only analyzable ESM output can drop a bare `new URL()` to an asset
 		// url; without it every JS consumer needs the wrapper, so the per-connection
@@ -889,7 +895,8 @@ class AssetGenerator extends Generator {
 				// keeps the runtime form and its wrapper. A prefetch or preload ref needs
 				// none: its `<link>` resolves the href at chunk startup.
 				isModule &&
-				dependency instanceof URLDependency &&
+				dependency !== null &&
+				isDependencyKind(dependency, "url") &&
 				!dependency.relative
 			) {
 				hasUrlJs = true;
@@ -946,7 +953,7 @@ class AssetGenerator extends Generator {
 
 	/**
 	 * Returns the estimated size for the requested source type.
-	 * @param {NormalModule} module the module
+	 * @param {TModule} module the module
 	 * @param {SourceType=} type source type
 	 * @returns {number} estimate size of the module
 	 */
@@ -962,10 +969,7 @@ class AssetGenerator extends Generator {
 				return originalSource.size();
 			}
 			default:
-				if (
-					module.buildInfo &&
-					/** @type {AssetModuleBuildInfo} */ (module.buildInfo).dataUrl
-				) {
+				if (module.buildInfo && module.buildInfo.dataUrl) {
 					const originalSource = module.originalSource();
 
 					if (!originalSource) {
@@ -985,15 +989,13 @@ class AssetGenerator extends Generator {
 	/**
 	 * Updates the hash with the data contributed by this instance.
 	 * @param {Hash} hash hash that will be modified
-	 * @param {UpdateHashContext} updateHashContext context for updating hash
+	 * @param {UpdateHashContext<TModule>} updateHashContext context for updating hash
 	 */
 	updateHash(hash, updateHashContext) {
 		const { module } = updateHashContext;
+		const { buildInfo } = /** @type {BuiltAssetModule} */ (module);
 
-		if (
-			/** @type {AssetModuleBuildInfo} */
-			(module.buildInfo).dataUrl
-		) {
+		if (buildInfo.dataUrl) {
 			hash.update("data-url");
 			// What a tap varies on has to reach the key, or a changed option replays.
 			const { runtimeTemplate } = updateHashContext;

package/lib/asset/AssetModule.js

@@ -4,15 +4,16 @@
 
 "use strict";
 
-const NormalModule = require("../NormalModule");
+const NormalModule = require("../module/NormalModule");
 const makeSerializable = require("../util/makeSerializable");
 
 /** @import { AssetInfo } from "../Compilation" */
+/** @import { BuildMeta } from "../module/Module" */
 /**
  * @import {
  * 	NormalModuleBuildInfo,
  * 	NormalModuleCreateData
- * } from "../NormalModule"
+ * } from "../module/NormalModule"
  */
 
 /**
@@ -29,6 +30,16 @@ const makeSerializable = require("../util/makeSerializable");
 
 /** @typedef {NormalModuleBuildInfo & KnownAssetModuleBuildInfo} AssetModuleBuildInfo */
 
+/**
+ * An asset module before or after its build, typed with its build info.
+ * @typedef {NormalModule & { buildInfo?: AssetModuleBuildInfo }} AssetNormalModule
+ */
+
+/**
+ * A built asset module, typed with its build info and build meta.
+ * @typedef {NormalModule & { buildInfo: AssetModuleBuildInfo, buildMeta: BuildMeta }} BuiltAssetModule
+ */
+
 /**
  * Module class for all `asset/*` modules. Asset-specific properties should live here instead of `NormalModule`.
  */

package/lib/asset/AssetModulesPlugin.js

@@ -6,11 +6,10 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const HotUpdateChunk = require("../HotUpdateChunk");
 const {
 	ASSET_URL_TYPE,
 	JAVASCRIPT_TYPE
-} = require("../ModuleSourceTypeConstants");
+} = require("../module/ModuleSourceTypeConstants");
 const {
 	ASSET_MODULE_TYPE,
 	ASSET_MODULE_TYPE_BYTES,
@@ -18,7 +17,7 @@ const {
 	ASSET_MODULE_TYPE_RESOURCE,
 	ASSET_MODULE_TYPE_SOURCE,
 	ASSET_MODULE_TYPE_WEBMANIFEST
-} = require("../ModuleTypeConstants");
+} = require("../module/ModuleTypeConstants");
 const { compareModulesByFullName } = require("../util/comparators");
 const createHash = require("../util/createHash");
 const { getUndoPath } = require("../util/identifier");
@@ -44,9 +43,8 @@ const { PUBLIC_PATH_AUTO } = require("../util/publicPathPlaceholder");
  * } from "../Compilation"
  */
 /** @import Compiler from "../Compiler" */
-/** @import { AssetModuleBuildInfo } from "./AssetModule" */
-/** @import { CodeGenerationResult } from "../Module" */
-/** @import NormalModule from "../NormalModule" */
+/** @import { AssetModuleBuildInfo, BuiltAssetModule } from "./AssetModule" */
+/** @import { CodeGenerationResult } from "../module/Module" */
 
 /**
  * Returns definition.
@@ -54,9 +52,7 @@ const { PUBLIC_PATH_AUTO } = require("../util/publicPathPlaceholder");
  * @returns {Schema} definition
  */
 const getSchema = (name) => {
-	const { definitions } =
-		/** @type {EXPECTED_ANY} */
-		(require("../../schemas/WebpackOptions.json"));
+	const { definitions } = require("../../schemas/WebpackOptions.json");
 
 	return {
 		definitions,
@@ -348,7 +344,9 @@ class AssetModulesPlugin {
 								let entryHash;
 
 								if (errored) {
-									const erroredModule = /** @type {NormalModule} */ (module);
+									const erroredModule = /** @type {BuiltAssetModule} */ (
+										module
+									);
 									const AssetGenerator = getAssetGenerator.loaded();
 									const [fullContentHash, contentHash] =
 										AssetGenerator.getFullContentHash(
@@ -432,7 +430,7 @@ class AssetModulesPlugin {
 						PLUGIN_NAME,
 						(result, options) => {
 							const { chunk, codeGenerationResults } = options;
-							if (chunk instanceof HotUpdateChunk) return result;
+							if (chunk.isHotUpdate()) return result;
 							const { chunkGraph, outputOptions } = compilation;
 							const modules =
 								chunkGraph.getOrderedChunkModulesIterableBySourceType(
@@ -457,7 +455,7 @@ class AssetModulesPlugin {
 								// Icon URLs resolve relative to the manifest's own location.
 								const undoPath = getUndoPath(
 									filename,
-									/** @type {string} */ (outputOptions.path),
+									outputOptions.path,
 									false
 								);
 								const content = source

package/lib/asset/AssetParser.js

@@ -5,20 +5,23 @@
 
 "use strict";
 
-const Parser = require("../Parser");
+const Parser = require("../module/Parser");
 
+/** @import { BuiltAssetModule } from "./AssetModule" */
 /**
  * @import {
  * 	AssetParserDataUrlOptions,
  * 	AssetParserOptions
  * } from "../../declarations/WebpackOptions"
  */
-/** @import Module, { BuildMeta } from "../Module" */
-/** @import { AssetModuleBuildInfo } from "./AssetModule" */
-/** @import { ParserState, PreparsedAst } from "../Parser" */
+/** @import Module from "../module/Module" */
+/** @import { ParserState, PreparsedAst } from "../module/Parser" */
 
 /** @typedef {((source: string | Buffer, context: { filename: string, module: Module }) => boolean)} AssetParserDataUrlFunction */
 
+/**
+ * @extends {Parser<BuiltAssetModule>}
+ */
 class AssetParser extends Parser {
 	/**
 	 * Creates an instance of AssetParser.
@@ -41,13 +44,10 @@ class AssetParser extends Parser {
 			throw new Error("AssetParser doesn't accept preparsed AST");
 		}
 
-		const buildInfo =
-			/** @type {AssetModuleBuildInfo} */
-			(state.module.buildInfo);
+		const { buildInfo, buildMeta } = /** @type {BuiltAssetModule} */ (
+			state.module
+		);
 		buildInfo.strict = true;
-		const buildMeta =
-			/** @type {BuildMeta} */
-			(state.module.buildMeta);
 		buildMeta.exportsType = "default";
 		buildMeta.defaultObject = false;
 

package/lib/asset/AssetSourceGenerator.js

@@ -6,8 +6,7 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const ConcatenationScope = require("../ConcatenationScope");
-const Generator = require("../Generator");
+const Generator = require("../module/Generator");
 const {
 	ASSET_URL_TYPE,
 	ASSET_URL_TYPES,
@@ -17,23 +16,32 @@ const {
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES,
 	NO_TYPES
-} = require("../ModuleSourceTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
+} = require("../module/ModuleSourceTypeConstants");
+const ConcatenationScope = require("../optimize/ConcatenationScope");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const { languageOfFilename } = require("../util/dataURL");
 
+/** @import { AssetNormalModule } from "./AssetModule" */
 /** @import { Source } from "webpack-sources" */
-/** @import { GenerateContext, UpdateHashContext } from "../Generator" */
+/** @import { GenerateContext, UpdateHashContext } from "../module/Generator" */
 /** @import Hash from "../util/Hash" */
 /**
  * @import {
  * 	ConcatenationBailoutReasonContext,
  * 	SourceType,
  * 	SourceTypes
- * } from "../Module"
+ * } from "../module/Module"
  */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import NormalModule from "../NormalModule" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
 
+/**
+ * The module type the JSDoc inherited from `Generator` names.
+ * @typedef {AssetNormalModule} TModule
+ */
+
+/**
+ * @extends {Generator<TModule>}
+ */
 class AssetSourceGenerator extends Generator {
 	/**
 	 * Creates an instance of AssetSourceGenerator.
@@ -48,7 +56,7 @@ class AssetSourceGenerator extends Generator {
 
 	/**
 	 * Generates generated code for this runtime module.
-	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {TModule} module module for which the code should be generated
 	 * @param {GenerateContext} generateContext context for generate
 	 * @returns {Source | null} generated code
 	 */
@@ -111,7 +119,7 @@ class AssetSourceGenerator extends Generator {
 	/**
 	 * Offer the file's text to `renderEmbeddedSource` before it is embedded in
 	 * JavaScript. Declines a file whose name names no language webpack knows.
-	 * @param {NormalModule} module the module holding the text
+	 * @param {TModule} module the module holding the text
 	 * @param {string} text the file's text
 	 * @param {GenerateContext["runtimeTemplate"]} runtimeTemplate runtime template
 	 * @returns {string} the rendered text, or `text` when nothing rendered it
@@ -134,7 +142,7 @@ class AssetSourceGenerator extends Generator {
 	/**
 	 * Updates the hash with the data contributed by this instance.
 	 * @param {Hash} hash hash that will be modified
-	 * @param {UpdateHashContext} updateHashContext context for updating hash
+	 * @param {UpdateHashContext<TModule>} updateHashContext context for updating hash
 	 */
 	updateHash(hash, updateHashContext) {
 		const { module, runtimeTemplate } = updateHashContext;
@@ -151,7 +159,7 @@ class AssetSourceGenerator extends Generator {
 	/**
 	 * Generates fallback output for the provided error condition.
 	 * @param {Error} error the error
-	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {TModule} module module for which the code should be generated
 	 * @param {GenerateContext} generateContext context for generate
 	 * @returns {Source | null} generated code
 	 */
@@ -173,7 +181,7 @@ class AssetSourceGenerator extends Generator {
 
 	/**
 	 * Returns the reason this module cannot be concatenated, when one exists.
-	 * @param {NormalModule} module module for which the bailout reason should be determined
+	 * @param {TModule} module module for which the bailout reason should be determined
 	 * @param {ConcatenationBailoutReasonContext} context context
 	 * @returns {string | undefined} reason why this module can't be concatenated, undefined when it can be concatenated
 	 */
@@ -183,7 +191,7 @@ class AssetSourceGenerator extends Generator {
 
 	/**
 	 * Returns the source types available for this module.
-	 * @param {NormalModule} module fresh module
+	 * @param {TModule} module fresh module
 	 * @returns {SourceTypes} available types (do not mutate)
 	 */
 	getTypes(module) {
@@ -223,7 +231,7 @@ class AssetSourceGenerator extends Generator {
 
 	/**
 	 * Returns the estimated size for the requested source type.
-	 * @param {NormalModule} module the module
+	 * @param {TModule} module the module
 	 * @param {SourceType=} type source type
 	 * @returns {number} estimate size of the module
 	 */

package/lib/asset/AssetSourceParser.js

@@ -5,11 +5,14 @@
 
 "use strict";
 
-const Parser = require("../Parser");
+const Parser = require("../module/Parser");
 
-/** @import { BuildInfo, BuildMeta } from "../Module" */
-/** @import { ParserState, PreparsedAst } from "../Parser" */
+/** @import { BuiltAssetModule } from "./AssetModule" */
+/** @import { ParserState, PreparsedAst } from "../module/Parser" */
 
+/**
+ * @extends {Parser<BuiltAssetModule>}
+ */
 class AssetSourceParser extends Parser {
 	/**
 	 * Parses the provided source and updates the parser state.
@@ -21,13 +24,12 @@ class AssetSourceParser extends Parser {
 		if (typeof source === "object" && !Buffer.isBuffer(source)) {
 			throw new Error("AssetSourceParser doesn't accept preparsed AST");
 		}
-		const { module } = state;
-		/** @type {BuildInfo} */
-		(module.buildInfo).strict = true;
-		/** @type {BuildMeta} */
-		(module.buildMeta).exportsType = "default";
-		/** @type {BuildMeta} */
-		(state.module.buildMeta).defaultObject = false;
+		const { buildInfo, buildMeta } = /** @type {BuiltAssetModule} */ (
+			state.module
+		);
+		buildInfo.strict = true;
+		buildMeta.exportsType = "default";
+		buildMeta.defaultObject = false;
 
 		return state;
 	}