webpack 5.112.0 → 5.112.1

package/lib/util/comparators.js

@@ -93,7 +93,9 @@ const compareIds = (a, b) => {
  */
 const compareIterables = (elementComparator) => {
 	const cacheEntry = compareIteratorsCache.get(elementComparator);
-	if (cacheEntry !== undefined) return cacheEntry;
+	if (cacheEntry !== undefined) {
+		return /** @type {Comparator<Iterable<T>>} */ (cacheEntry);
+	}
 	/**
 	 * Returns compare result.
 	 * @param {Iterable<T>} a first value
@@ -419,7 +421,7 @@ class TwoKeyWeakMap {
 	}
 }
 
-/** @type {TwoKeyWeakMap<Comparator<EXPECTED_ANY>, Comparator<EXPECTED_ANY>, Comparator<EXPECTED_ANY>>}} */
+/** @type {TwoKeyWeakMap<Comparator<never>, Comparator<never>, Comparator<never>>} */
 const concatComparatorsCache = new TwoKeyWeakMap();
 
 /**
@@ -460,7 +462,7 @@ const concatComparators = (c1, c2, ...cRest) => {
  * @typedef {(input: A) => B | undefined | null} Selector
  */
 
-/** @type {TwoKeyWeakMap<Selector<EXPECTED_ANY, EXPECTED_ANY>, Comparator<EXPECTED_ANY>, Comparator<EXPECTED_ANY>>}} */
+/** @type {TwoKeyWeakMap<(input: never) => void, Comparator<never>, Comparator<never>>} */
 const compareSelectCache = new TwoKeyWeakMap();
 
 /**
@@ -473,7 +475,9 @@ const compareSelectCache = new TwoKeyWeakMap();
  */
 const compareSelect = (getter, comparator) => {
 	const cacheEntry = compareSelectCache.get(getter, comparator);
-	if (cacheEntry !== undefined) return cacheEntry;
+	if (cacheEntry !== undefined) {
+		return /** @type {Comparator<T>} */ (cacheEntry);
+	}
 	/**
 	 * Returns compare result.
 	 * @param {T} a first value
@@ -530,7 +534,7 @@ const compareErrors = concatComparators(
 	)
 );
 
-/** @type {WeakMap<Comparator<EXPECTED_ANY>, Comparator<Iterable<EXPECTED_ANY>>>} */
+/** @type {WeakMap<Comparator<never>, Comparator<Iterable<never>>>} */
 const compareIteratorsCache = new WeakMap();
 
 // TODO this is no longer needed when minimum node.js version is >= 12

package/lib/util/dataURL.js

@@ -327,6 +327,8 @@ const askEmbeddedRenderer = async (render, hole, reported) => {
 
 module.exports = {
 	EMBEDDED_LANGUAGES,
+	JSON_TYPE,
+	SVG_TYPE,
 	URIRegEx,
 	askEmbeddedRenderer,
 	buildDataURI,

package/lib/util/deprecation.js

@@ -96,7 +96,7 @@ module.exports.arrayToSetDeprecation = (set, name) => {
 			`${name} was changed from Array to Set (using Array method '${method}' is deprecated)`,
 			"ARRAY_TO_SET"
 		);
-		/** @type {EXPECTED_ANY} */
+		/** @type {Set<T> & Record<COPY_METHODS_NAMES, (this: Set<T>) => void>} */
 		(set)[method] =
 			// eslint-disable-next-line func-names
 			function () {
@@ -318,10 +318,11 @@ module.exports.soonFrozenObjectDeprecation = (obj, name, code, note = "") => {
 			set: util.deprecate(
 				/**
 				 * Handles the callback logic for this hook.
+				 * @template V
 				 * @param {object} target target
 				 * @param {string | symbol} property property
-				 * @param {EXPECTED_ANY} value value
-				 * @param {EXPECTED_ANY} receiver receiver
+				 * @param {V} value value
+				 * @param {T} receiver receiver
 				 * @returns {boolean} result
 				 */
 				(target, property, value, receiver) =>

package/lib/util/globUtils.js

@@ -15,10 +15,7 @@ const memoize = require("./memoize");
 
 // watchpack's glob-to-regexp core, loaded only when a glob is translated
 const getGlobToRegExpSource = memoize(
-	() =>
-		/** @type {{ util: { globToRegExp: (glob: string) => string } }} */ (
-			/** @type {unknown} */ (require("watchpack"))
-		).util.globToRegExp
+	() => require("watchpack").util.globToRegExp
 );
 
 /** @typedef {{ caseSensitive?: boolean, requireLiteralLeadingDot?: boolean }} GlobMatchOptions */

package/lib/util/internalSerializables.js

@@ -315,6 +315,8 @@ module.exports = {
 		require("../dependencies/esm/ESMImportSideEffectDependency"),
 	"dependencies/esm/ESMImportSpecifierDependency": () =>
 		require("../dependencies/esm/ESMImportSpecifierDependency"),
+	"dependencies/esm/ESMLiveExportDependency": () =>
+		require("../dependencies/esm/ESMLiveExportDependency"),
 	"dependencies/esm/TopLevelAwaitDependency": () =>
 		require("../dependencies/esm/TopLevelAwaitDependency"),
 	"dependencies/hmr/ImportMetaHotAcceptDependency": () =>

package/lib/util/makeSerializable.js

@@ -8,7 +8,6 @@ const { register, registerLegacyRequest } = require("./serialization");
 
 /**
  * @import {
- * 	Constructor,
  * 	ObjectDeserializerContext,
  * 	ObjectSerializerContext
  * } from "../serialization/ObjectMiddleware"
@@ -18,7 +17,7 @@ const { register, registerLegacyRequest } = require("./serialization");
 /**
  * Defines the serializable class constructor type used by this module.
  * @template {SerializableClass} T
- * @typedef {(new (...params: EXPECTED_ANY[]) => T) & { deserialize?: (context: ObjectDeserializerContext) => T }} SerializableClassConstructor
+ * @typedef {(new (...params: never[]) => T) & { deserialize?: (context: ObjectDeserializerContext) => T }} SerializableClassConstructor
  */
 
 /**
@@ -64,7 +63,7 @@ class ClassSerializer {
  * keep requests the class was written under before a move readable: the first
  * is the one it is written under now, the rest restore older cache packs; a
  * historical entry written under another name pairs its request with it.
- * @template {Constructor} T
+ * @template {new (...params: never[]) => EXPECTED_OBJECT} T
  * @param {T} Constructor the constructor
  * @param {string | (string | [string, string | null])[]} request the request which will be required when deserializing, current one first
  * @param {string | null=} name the name to make multiple serializer unique when sharing a request
@@ -75,7 +74,10 @@ module.exports = (Constructor, request, name = null) => {
 		Constructor,
 		/** @type {string} */ (requests[0]),
 		name,
-		new ClassSerializer(Constructor)
+		new ClassSerializer(
+			/** @type {SerializableClassConstructor<SerializableClass>} */
+			(Constructor)
+		)
 	);
 	// TODO in the next major release: remove, dropping every request but the
 	// first from each caller, which stops pre-move cache packs loading

package/lib/util/memoize.js

@@ -31,7 +31,7 @@ const memoize = (fn) => {
 		// and all dependent resources
 		/** @type {FunctionReturning<T> | undefined} */
 		(fn) = undefined;
-		return /** @type {T} */ (result);
+		return result;
 	};
 };
 

package/lib/util/parseJson.js

@@ -8,7 +8,7 @@ const memoize = require("./memoize");
 
 const getJSONParseError = memoize(() => require("../errors/JSONParseError"));
 
-/** @import { JsonValue } from "../fs/fs" */
+/** @import { JsonArray, JsonObject, JsonValue } from "../fs/fs" */
 
 // Inspired by https://github.com/npm/json-parse-even-better-errors
 
@@ -25,7 +25,7 @@ const stripBOM = (txt) => String(txt).replace(/^\uFEFF/, "");
  * @template [R=JsonValue]
  * @callback ParseJsonFn
  * @param {string} raw text
- * @param {(this: EXPECTED_ANY, key: string, value: EXPECTED_ANY) => EXPECTED_ANY=} reviver reviver
+ * @param {(this: JsonObject | JsonArray, key: string, value: JsonValue) => JsonValue=} reviver reviver
  * @returns {R} parsed JSON
  */
 

package/lib/util/serialization.js

@@ -54,6 +54,12 @@ const registerSerializers = memoize(() => {
  */
 /** @import { HashFunction } from "../util/Hash" */
 /** @import { IntermediateFileSystem } from "../fs/fs" */
+/**
+ * @import {
+ * 	BufferSerializableType,
+ * 	ComplexSerializableType
+ * } from "../serialization/types"
+ */
 
 /**
  * Defines the serializer type used by this module.
@@ -62,7 +68,7 @@ const registerSerializers = memoize(() => {
  */
 
 /**
- * @type {Serializer<EXPECTED_ANY, EXPECTED_ANY, EXPECTED_ANY>}
+ * @type {Serializer<ComplexSerializableType, BufferSerializableType[], EXPECTED_OBJECT>}
  */
 let buffersSerializer;
 
@@ -97,7 +103,7 @@ module.exports = {
 		const Serializer = getSerializer();
 		const binaryMiddleware = getBinaryMiddlewareInstance();
 		const SingleItemMiddleware = getSingleItemMiddleware();
-		return /** @type {Serializer<EXPECTED_ANY, EXPECTED_ANY, EXPECTED_ANY>} */ (
+		return /** @type {Serializer<ComplexSerializableType, BufferSerializableType[], EXPECTED_OBJECT>} */ (
 			buffersSerializer = new Serializer([
 				new SingleItemMiddleware(),
 				new ObjectMiddleware((context) => {
@@ -129,30 +135,28 @@ module.exports = {
 		const fileMiddleware = new FileMiddleware(fs, hashFunction);
 		const binaryMiddleware = getBinaryMiddlewareInstance();
 		const SingleItemMiddleware = getSingleItemMiddleware();
-		return /** @type {Serializer<D, S, C>} */ (
-			new Serializer([
-				new SingleItemMiddleware(),
-				new ObjectMiddleware((context) => {
-					if ("write" in context) {
-						context.writeLazy = (value) => {
-							context.write(
-								SerializerMiddleware.createLazy(value, binaryMiddleware)
-							);
-						};
-						context.writeSeparate = (value, options) => {
-							const lazy = SerializerMiddleware.createLazy(
-								value,
-								fileMiddleware,
-								options
-							);
-							context.write(lazy);
-							return lazy;
-						};
-					}
-				}, hashFunction),
-				binaryMiddleware,
-				fileMiddleware
-			])
-		);
+		return new Serializer([
+			new SingleItemMiddleware(),
+			new ObjectMiddleware((context) => {
+				if ("write" in context) {
+					context.writeLazy = (value) => {
+						context.write(
+							SerializerMiddleware.createLazy(value, binaryMiddleware)
+						);
+					};
+					context.writeSeparate = (value, options) => {
+						const lazy = SerializerMiddleware.createLazy(
+							value,
+							fileMiddleware,
+							options
+						);
+						context.write(lazy);
+						return lazy;
+					};
+				}
+			}, hashFunction),
+			binaryMiddleware,
+			fileMiddleware
+		]);
 	}
 };

package/lib/wasm/AsyncWasmModule.js

@@ -7,12 +7,22 @@
 const NormalModule = require("../module/NormalModule");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @import Module from "../module/Module" */
-/** @import { NormalModuleCreateData } from "../module/NormalModule" */
+/** @import Module, { BuildMeta } from "../module/Module" */
+/**
+ * @import {
+ * 	NormalModuleBuildInfo,
+ * 	NormalModuleCreateData
+ * } from "../module/NormalModule"
+ */
 /** @import { ImportPhaseName } from "../dependencies/core/ImportPhase" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[ImportPhaseName | undefined]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[ImportPhaseName | undefined]>} ObjectSerializerContext */
 
+/**
+ * A built async wasm module, typed with its build info and build meta.
+ * @typedef {NormalModule & { buildInfo: NormalModuleBuildInfo, buildMeta: BuildMeta }} BuiltAsyncWasmModule
+ */
+
 /**
  * Module class for `webassembly/async` modules. Wasm-specific properties should live here instead of `NormalModule`.
  */

package/lib/wasm/AsyncWebAssemblyGenerator.js

@@ -20,6 +20,14 @@ const { WEBASSEMBLY_TYPES } = require("../module/ModuleSourceTypeConstants");
  * @property {boolean=} mangleImports mangle imports
  */
 
+/**
+ * The module type the JSDoc inherited from `Generator` names.
+ * @typedef {NormalModule} TModule
+ */
+
+/**
+ * @extends {Generator<TModule>}
+ */
 class AsyncWebAssemblyGenerator extends Generator {
 	/**
 	 * Creates an instance of AsyncWebAssemblyGenerator.
@@ -33,7 +41,7 @@ class AsyncWebAssemblyGenerator 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) {
@@ -42,7 +50,7 @@ class AsyncWebAssemblyGenerator 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
 	 */
@@ -56,7 +64,7 @@ class AsyncWebAssemblyGenerator 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
 	 */
@@ -67,7 +75,7 @@ class AsyncWebAssemblyGenerator 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
 	 */

package/lib/wasm/AsyncWebAssemblyJavascriptGenerator.js

@@ -25,10 +25,18 @@ const Template = require("../template/Template");
  * @typedef {{ request: string, importVar: string, dependency: WebAssemblyImportDependency }} ImportObjRequestItem
  */
 
+/**
+ * The module type the JSDoc inherited from `Generator` names.
+ * @typedef {NormalModule} TModule
+ */
+
+/**
+ * @extends {Generator<TModule>}
+ */
 class AsyncWebAssemblyJavascriptGenerator 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) {
@@ -37,7 +45,7 @@ class AsyncWebAssemblyJavascriptGenerator 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
 	 */
@@ -53,7 +61,7 @@ class AsyncWebAssemblyJavascriptGenerator 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
 	 */
@@ -236,7 +244,7 @@ class AsyncWebAssemblyJavascriptGenerator extends Generator {
 
 	/**
 	 * Generate code for source phase import (returns WebAssembly.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} generated code
 	 */
@@ -298,7 +306,7 @@ class AsyncWebAssemblyJavascriptGenerator 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
 	 */

package/lib/wasm/AsyncWebAssemblyParser.js

@@ -16,8 +16,7 @@ const getEnvironmentNotSupportAsyncWarning = memoize(() =>
 	require("../errors/EnvironmentNotSupportAsyncWarning")
 );
 
-/** @import AsyncWasmModule from "./AsyncWasmModule" */
-/** @import { BuildInfo, BuildMeta } from "../module/Module" */
+/** @import AsyncWasmModule, { BuiltAsyncWasmModule } from "./AsyncWasmModule" */
 /** @import { ParserState, PreparsedAst } from "../module/Parser" */
 
 const WASM_HEADER = Buffer.from([0x00, 0x61, 0x73, 0x6d]);
@@ -30,6 +29,9 @@ const decoderOpts = {
 	ignoreCustomNameSection: true
 };
 
+/**
+ * @extends {Parser<BuiltAsyncWasmModule>}
+ */
 class AsyncWebAssemblyParser extends Parser {
 	/**
 	 * Parses the provided source and updates the parser state.
@@ -42,7 +44,9 @@ class AsyncWebAssemblyParser extends Parser {
 			throw new Error("AsyncWebAssemblyParser input must be a Buffer");
 		}
 
-		const buildMeta = /** @type {BuildMeta} */ (state.module.buildMeta);
+		const { buildInfo, buildMeta } = /** @type {BuiltAsyncWasmModule} */ (
+			state.module
+		);
 		buildMeta.exportsType = "namespace";
 		buildMeta.async = true;
 
@@ -53,8 +57,6 @@ class AsyncWebAssemblyParser extends Parser {
 		);
 
 		// flag it as async module
-		const buildInfo = /** @type {BuildInfo} */ (state.module.buildInfo);
-
 		buildInfo.strict = true;
 
 		if (/** @type {AsyncWasmModule} */ (state.module).phase === "source") {

package/lib/wasm/UniversalCompileAsyncWasmPlugin.js

@@ -119,9 +119,7 @@ class UniversalCompileAsyncWasmPlugin {
 						chunk,
 						new AsyncWasmLoadingRuntimeModule({
 							fullHashDigest: usesFullHashDigest(
-								/** @type {string} */ (
-									compilation.outputOptions.webassemblyModuleFilename
-								)
+								compilation.outputOptions.webassemblyModuleFilename
 							),
 							generateBeforeLoadBinaryCode,
 							generateLoadBinaryCode,
@@ -147,9 +145,7 @@ class UniversalCompileAsyncWasmPlugin {
 						chunk,
 						new AsyncWasmCompileRuntimeModule({
 							fullHashDigest: usesFullHashDigest(
-								/** @type {string} */ (
-									compilation.outputOptions.webassemblyModuleFilename
-								)
+								compilation.outputOptions.webassemblyModuleFilename
 							),
 							generateBeforeLoadBinaryCode,
 							generateLoadBinaryCode,

package/lib/wasm-sync/SyncWasmModule.js

@@ -8,7 +8,12 @@ const NormalModule = require("../module/NormalModule");
 const makeSerializable = require("../util/makeSerializable");
 
 /** @import { BuildMeta } from "../module/Module" */
-/** @import { NormalModuleCreateData } from "../module/NormalModule" */
+/**
+ * @import {
+ * 	NormalModuleBuildInfo,
+ * 	NormalModuleCreateData
+ * } from "../module/NormalModule"
+ */
 
 /**
  * Defines the build meta properties specific to sync wasm modules.
@@ -18,6 +23,16 @@ const makeSerializable = require("../util/makeSerializable");
 
 /** @typedef {BuildMeta & KnownSyncWasmModuleBuildMeta} SyncWasmModuleBuildMeta */
 
+/**
+ * A sync wasm module before or after its build, typed with its build meta.
+ * @typedef {NormalModule & { buildMeta?: SyncWasmModuleBuildMeta }} SyncWasmNormalModule
+ */
+
+/**
+ * A built sync wasm module, typed with its build info and build meta.
+ * @typedef {NormalModule & { buildInfo: NormalModuleBuildInfo, buildMeta: SyncWasmModuleBuildMeta }} BuiltSyncWasmModule
+ */
+
 /**
  * Module class for `webassembly/sync` modules. Wasm-specific properties should live here instead of `NormalModule`.
  */

package/lib/wasm-sync/WebAssemblyGenerator.js

@@ -15,12 +15,11 @@ const Generator = require("../module/Generator");
 const { WEBASSEMBLY_TYPES } = require("../module/ModuleSourceTypeConstants");
 const WebAssemblyUtils = require("./WebAssemblyUtils");
 
-/** @import WebAssemblyExportImportedDependency from "../dependencies/wasm/WebAssemblyExportImportedDependency" */
+/** @import { SyncWasmNormalModule } from "./SyncWasmModule" */
 /** @import { Source } from "webpack-sources" */
 /** @import { GenerateContext, UpdateHashContext } from "../module/Generator" */
 /** @import Module, { SourceType, SourceTypes } from "../module/Module" */
 /** @import ModuleGraph from "../graph/ModuleGraph" */
-/** @import NormalModule from "../module/NormalModule" */
 /** @import Hash from "../util/Hash" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 /** @import { UsedWasmDependency } from "./WebAssemblyUtils" */
@@ -421,6 +420,14 @@ const getUsedDependencyMap = (moduleGraph, module, mangle) => {
  * @property {boolean=} mangleImports mangle imports
  */
 
+/**
+ * The module type the JSDoc inherited from `Generator` names.
+ * @typedef {SyncWasmNormalModule} TModule
+ */
+
+/**
+ * @extends {Generator<TModule>}
+ */
 class WebAssemblyGenerator extends Generator {
 	/**
 	 * Creates an instance of WebAssemblyGenerator.
@@ -434,7 +441,7 @@ class WebAssemblyGenerator 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) {
@@ -443,7 +450,7 @@ class WebAssemblyGenerator 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
 	 */
@@ -457,7 +464,7 @@ class WebAssemblyGenerator 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
 	 */
@@ -492,9 +499,7 @@ class WebAssemblyGenerator extends Generator {
 			module.dependencies
 				.filter((d) => isDependencyKind(d, "webassembly-export-imported"))
 				.map((d) => {
-					const wasmDep = /** @type {WebAssemblyExportImportedDependency} */ (
-						d
-					);
+					const wasmDep = d;
 					return wasmDep.exportName;
 				})
 		);
@@ -540,7 +545,7 @@ class WebAssemblyGenerator 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
 	 */
@@ -556,7 +561,7 @@ class WebAssemblyGenerator 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) {
 		if (this.options.mangleImports) {

package/lib/wasm-sync/WebAssemblyJavascriptGenerator.js

@@ -14,16 +14,24 @@ const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const InitFragment = require("../template/InitFragment");
 const Template = require("../template/Template");
 
+/** @import { SyncWasmNormalModule } from "./SyncWasmModule" */
 /** @import { Source } from "webpack-sources" */
 /** @import { GenerateContext } from "../module/Generator" */
 /** @import ModuleDependency from "../dependencies/core/ModuleDependency" */
 /** @import Module, { SourceType, SourceTypes } from "../module/Module" */
-/** @import NormalModule from "../module/NormalModule" */
 
+/**
+ * The module type the JSDoc inherited from `Generator` names.
+ * @typedef {SyncWasmNormalModule} TModule
+ */
+
+/**
+ * @extends {Generator<TModule>}
+ */
 class WebAssemblyJavascriptGenerator 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) {
@@ -32,7 +40,7 @@ class WebAssemblyJavascriptGenerator 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
 	 */
@@ -42,7 +50,7 @@ class WebAssemblyJavascriptGenerator 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
 	 */
@@ -225,7 +233,7 @@ class WebAssemblyJavascriptGenerator 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
 	 */