webpack 5.111.1 → 5.112.1

package/lib/util/makeSerializable.js

@@ -4,11 +4,10 @@
 
 "use strict";
 
-const { register } = require("./serialization");
+const { register, registerLegacyRequest } = require("./serialization");
 
 /**
  * @import {
- * 	Constructor,
  * 	ObjectDeserializerContext,
  * 	ObjectSerializerContext
  * } from "../serialization/ObjectMiddleware"
@@ -18,7 +17,7 @@ const { register } = 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
  */
 
 /**
@@ -60,12 +59,34 @@ class ClassSerializer {
 }
 
 /**
- * Processes the provided constructor.
- * @template {Constructor} T
+ * Registers the constructor with the serializer. Pass an array of requests to
+ * 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 {new (...params: never[]) => EXPECTED_OBJECT} T
  * @param {T} Constructor the constructor
- * @param {string} request the request which will be required when deserializing
+ * @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
  */
 module.exports = (Constructor, request, name = null) => {
-	register(Constructor, request, name, new ClassSerializer(Constructor));
+	const requests = Array.isArray(request) ? request : [request];
+	register(
+		Constructor,
+		/** @type {string} */ (requests[0]),
+		name,
+		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
+	for (let i = 1; i < requests.length; i++) {
+		const legacy = requests[i];
+		if (typeof legacy === "string") {
+			registerLegacyRequest(Constructor, legacy, name);
+		} else {
+			registerLegacyRequest(Constructor, legacy[0], legacy[1]);
+		}
+	}
 };

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 "../util/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/preloadModuleType.js

@@ -5,8 +5,11 @@
 
 "use strict";
 
-/** @import NormalModuleFactory from "../NormalModuleFactory" */
-/** @typedef {import("./lazyModule").LazyModuleAccessor<EXPECTED_ANY>} AnyLazyModuleAccessor */
+/** @import Generator from "../module/Generator" */
+/** @import Module from "../module/Module" */
+/** @import NormalModuleFactory from "../module/NormalModuleFactory" */
+/** @import Parser from "../module/Parser" */
+/** @typedef {import("./lazyModule").LazyModuleAccessor<new (...args: never[]) => Parser | Generator | Module>} AnyLazyModuleAccessor */
 
 /**
  * Warms the modules a type's `createParser`/`createGenerator`/`createModuleClass`

package/lib/util/registerExternalSerializer.js

@@ -15,10 +15,10 @@ const {
 	ReplaceSource,
 	SourceMapSource
 } = require("webpack-sources");
-const ParserPosition = require("../javascript/syntax").ParserPosition;
+const ParserPosition = require("../javascript/syntax-parser").ParserPosition;
 const { register } = require("./serialization");
 
-/** @import { SourcePosition } from "../Dependency" */
+/** @import { SourcePosition } from "../graph/Dependency" */
 /**
  * @import {
  * 	ObjectDeserializerContext,

package/lib/util/removeBOM.js

@@ -8,7 +8,7 @@
 const { decodeVLQ, encodeVLQ } = require("./createMappings");
 
 /** @import { RawSourceMap } from "webpack-sources" */
-/** @import { Result } from "../NormalModule" */
+/** @import { Result } from "../module/NormalModule" */
 
 /**
  * Returns result without BOM.

package/lib/util/runtime.js

@@ -8,7 +8,7 @@
 const SortableSet = require("./SortableSet");
 
 /** @import Compilation from "../Compilation" */
-/** @import { EntryOptions } from "../Entrypoint" */
+/** @import { EntryOptions } from "../graph/Entrypoint" */
 
 /** @typedef {SortableSet<string>} RuntimeSpecSortableSet */
 /** @typedef {string | RuntimeSpecSortableSet | undefined} RuntimeSpec */

package/lib/util/serialization.js

@@ -53,7 +53,13 @@ const registerSerializers = memoize(() => {
  * } from "../serialization/BinaryMiddleware"
  */
 /** @import { HashFunction } from "../util/Hash" */
-/** @import { IntermediateFileSystem } from "../util/fs" */
+/** @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;
 
@@ -71,6 +77,9 @@ module.exports = {
 	get register() {
 		return ObjectMiddleware.register;
 	},
+	get registerLegacyRequest() {
+		return ObjectMiddleware.registerLegacyRequest;
+	},
 	get registerLoader() {
 		return ObjectMiddleware.registerLoader;
 	},
@@ -94,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) => {
@@ -126,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/util/source.js

@@ -62,7 +62,7 @@ const isSourceEqual = (a, b) => {
 	return result;
 };
 
-// TODO remove in webpack 6, this is protection against authors who directly use `webpack-sources` outdated version
+// TODO in the next major release: remove, this is protection against authors who directly use `webpack-sources` outdated version
 /**
  * Feeds the Source's content into a Hash without forcing a single
  * concatenated Buffer. Uses webpack-sources >= 3.4.0 `buffers()` when
@@ -72,7 +72,7 @@ const isSourceEqual = (a, b) => {
  * @returns {void}
  */
 const updateHashFromSource = (hash, source) => {
-	// TODO webpack 6: drop the `buffers` check, require webpack-sources >= 3.4
+	// TODO in the next major release: drop the `buffers` check, require webpack-sources >= 3.4
 	// and call `source.buffers()` unconditionally.
 	if (typeof source.buffers === "function") {
 		for (const buf of source.buffers()) hash.update(buf);

package/lib/util/terminalColors.js

@@ -0,0 +1,161 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const tty = require("tty");
+
+/**
+ * Checks whether this object is color supported.
+ * @returns {boolean} true when colors supported, otherwise false
+ */
+const isColorSupported = () => {
+	const { env = {}, argv = [], platform = "" } = process;
+
+	// Read values instead of using `in`: Deno's and Bun's `process.env` honor
+	// property access but not the `in`/`has` trap, so `"X" in env` is unreliable.
+	const isDisabled = env.NO_COLOR !== undefined || argv.includes("--no-color");
+	const isForced = env.FORCE_COLOR !== undefined || argv.includes("--color");
+	const isWindows = platform === "win32";
+	const isDumbTerminal = env.TERM === "dumb";
+
+	const isCompatibleTerminal = tty.isatty(1) && env.TERM && !isDumbTerminal;
+
+	const isCI =
+		env.CI !== undefined &&
+		(env.GITHUB_ACTIONS !== undefined ||
+			env.GITLAB_CI !== undefined ||
+			env.CIRCLECI !== undefined);
+
+	return (
+		!isDisabled &&
+		(isForced || (isWindows && !isDumbTerminal) || isCompatibleTerminal || isCI)
+	);
+};
+
+/**
+ * Returns result.
+ * @param {number} index index
+ * @param {string} string string
+ * @param {string} close close
+ * @param {string=} replace replace
+ * @param {string=} head head
+ * @param {string=} tail tail
+ * @param {number=} next next
+ * @returns {string} result
+ */
+const replaceClose = (
+	index,
+	string,
+	close,
+	replace,
+	head = string.slice(0, Math.max(0, index)) + replace,
+	tail = string.slice(Math.max(0, index + close.length)),
+	next = tail.indexOf(close)
+) => head + (next < 0 ? tail : replaceClose(next, tail, close, replace));
+
+/**
+ * Returns result.
+ * @param {number} index index to replace
+ * @param {string} string string
+ * @param {string} open open string
+ * @param {string} close close string
+ * @param {string=} replace extra replace
+ * @returns {string} result
+ */
+const clearBleed = (index, string, open, close, replace) =>
+	index < 0
+		? open + string + close
+		: open + replaceClose(index, string, close, replace) + close;
+
+/** @typedef {(value: EXPECTED_ANY) => string} PrintFunction */
+
+/**
+ * Returns function to create color.
+ * @param {string} open open string
+ * @param {string} close close string
+ * @param {string=} replace extra replace
+ * @param {number=} at at
+ * @returns {PrintFunction} function to create color
+ */
+const filterEmpty =
+	(open, close, replace = open, at = open.length + 1) =>
+	(string) =>
+		string || !(string === "" || string === undefined)
+			? clearBleed(`${string}`.indexOf(close, at), string, open, close, replace)
+			: "";
+
+/**
+ * Returns result.
+ * @param {number} open open code
+ * @param {number} close close code
+ * @param {string=} replace extra replace
+ * @returns {PrintFunction} result
+ */
+const init = (open, close, replace) =>
+	filterEmpty(`\u001B[${open}m`, `\u001B[${close}m`, replace);
+
+/**
+ * Defines the colors type used by this module.
+ * @typedef {{ reset: PrintFunction, bold: PrintFunction, dim: PrintFunction, italic: PrintFunction, underline: PrintFunction, inverse: PrintFunction, hidden: PrintFunction, strikethrough: PrintFunction, black: PrintFunction, red: PrintFunction, green: PrintFunction, yellow: PrintFunction, blue: PrintFunction, magenta: PrintFunction, cyan: PrintFunction, white: PrintFunction, gray: PrintFunction, bgBlack: PrintFunction, bgRed: PrintFunction, bgGreen: PrintFunction, bgYellow: PrintFunction, bgBlue: PrintFunction, bgMagenta: PrintFunction, bgCyan: PrintFunction, bgWhite: PrintFunction, blackBright: PrintFunction, redBright: PrintFunction, greenBright: PrintFunction, yellowBright: PrintFunction, blueBright: PrintFunction, magentaBright: PrintFunction, cyanBright: PrintFunction, whiteBright: PrintFunction, bgBlackBright: PrintFunction, bgRedBright: PrintFunction, bgGreenBright: PrintFunction, bgYellowBright: PrintFunction, bgBlueBright: PrintFunction, bgMagentaBright: PrintFunction, bgCyanBright: PrintFunction, bgWhiteBright: PrintFunction }} Colors
+ */
+
+/**
+ * Defines the colors options type used by this module.
+ * @typedef {object} ColorsOptions
+ * @property {boolean=} useColor force use colors
+ */
+
+/**
+ * Creates a colors from the provided colors option.
+ * @param {ColorsOptions=} options options
+ * @returns {Colors} colors
+ */
+const createColors = ({ useColor = isColorSupported() } = {}) => ({
+	reset: useColor ? init(0, 0) : String,
+	bold: useColor ? init(1, 22, "\u001B[22m\u001B[1m") : String,
+	dim: useColor ? init(2, 22, "\u001B[22m\u001B[2m") : String,
+	italic: useColor ? init(3, 23) : String,
+	underline: useColor ? init(4, 24) : String,
+	inverse: useColor ? init(7, 27) : String,
+	hidden: useColor ? init(8, 28) : String,
+	strikethrough: useColor ? init(9, 29) : String,
+	black: useColor ? init(30, 39) : String,
+	red: useColor ? init(31, 39) : String,
+	green: useColor ? init(32, 39) : String,
+	yellow: useColor ? init(33, 39) : String,
+	blue: useColor ? init(34, 39) : String,
+	magenta: useColor ? init(35, 39) : String,
+	cyan: useColor ? init(36, 39) : String,
+	white: useColor ? init(37, 39) : String,
+	gray: useColor ? init(90, 39) : String,
+	bgBlack: useColor ? init(40, 49) : String,
+	bgRed: useColor ? init(41, 49) : String,
+	bgGreen: useColor ? init(42, 49) : String,
+	bgYellow: useColor ? init(43, 49) : String,
+	bgBlue: useColor ? init(44, 49) : String,
+	bgMagenta: useColor ? init(45, 49) : String,
+	bgCyan: useColor ? init(46, 49) : String,
+	bgWhite: useColor ? init(47, 49) : String,
+	blackBright: useColor ? init(90, 39) : String,
+	redBright: useColor ? init(91, 39) : String,
+	greenBright: useColor ? init(92, 39) : String,
+	yellowBright: useColor ? init(93, 39) : String,
+	blueBright: useColor ? init(94, 39) : String,
+	magentaBright: useColor ? init(95, 39) : String,
+	cyanBright: useColor ? init(96, 39) : String,
+	whiteBright: useColor ? init(97, 39) : String,
+	bgBlackBright: useColor ? init(100, 49) : String,
+	bgRedBright: useColor ? init(101, 49) : String,
+	bgGreenBright: useColor ? init(102, 49) : String,
+	bgYellowBright: useColor ? init(103, 49) : String,
+	bgBlueBright: useColor ? init(104, 49) : String,
+	bgMagentaBright: useColor ? init(105, 49) : String,
+	bgCyanBright: useColor ? init(106, 49) : String,
+	bgWhiteBright: useColor ? init(107, 49) : String
+});
+
+module.exports.createColors = createColors;
+module.exports.isColorSupported = isColorSupported;

package/lib/{wasm-async → wasm}/AsyncWasmCompileRuntimeModule.js

@@ -5,13 +5,13 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const RuntimeModule = require("../runtime/RuntimeModule");
+const Template = require("../template/Template");
 const { fullHashPathData } = require("../wasm/wasmModuleFilename");
 
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 /** @import Compilation from "../Compilation" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 

package/lib/{wasm-async → wasm}/AsyncWasmLoadingRuntimeModule.js

@@ -5,13 +5,13 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const RuntimeModule = require("../runtime/RuntimeModule");
+const Template = require("../template/Template");
 const { fullHashPathData } = require("../wasm/wasmModuleFilename");
 
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 /** @import Compilation from "../Compilation" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 

package/lib/{wasm-async → wasm}/AsyncWasmModule.js

@@ -4,15 +4,25 @@
 
 "use strict";
 
-const NormalModule = require("../NormalModule");
+const NormalModule = require("../module/NormalModule");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @import Module from "../Module" */
-/** @import { NormalModuleCreateData } from "../NormalModule" */
-/** @import { ImportPhaseName } from "../dependencies/ImportPhase" */
+/** @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`.
  */
@@ -72,6 +82,10 @@ class AsyncWasmModule extends NormalModule {
 	}
 }
 
-makeSerializable(AsyncWasmModule, "webpack/lib/wasm-async/AsyncWasmModule");
+makeSerializable(AsyncWasmModule, [
+	"webpack/lib/wasm/AsyncWasmModule",
+	// TODO in the next major release: remove, they restore pre-move cache packs
+	"webpack/lib/wasm-async/AsyncWasmModule"
+]);
 
 module.exports = AsyncWasmModule;

package/lib/{wasm-async → wasm}/AsyncWebAssemblyGenerator.js

@@ -6,13 +6,13 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const Generator = require("../Generator");
-const { WEBASSEMBLY_TYPES } = require("../ModuleSourceTypeConstants");
+const Generator = require("../module/Generator");
+const { WEBASSEMBLY_TYPES } = require("../module/ModuleSourceTypeConstants");
 
 /** @import { Source } from "webpack-sources" */
-/** @import { GenerateContext } from "../Generator" */
-/** @import { SourceType, SourceTypes } from "../Module" */
-/** @import NormalModule from "../NormalModule" */
+/** @import { GenerateContext } from "../module/Generator" */
+/** @import { SourceType, SourceTypes } from "../module/Module" */
+/** @import NormalModule from "../module/NormalModule" */
 
 /**
  * Represents the async web assembly generator runtime component.
@@ -20,6 +20,14 @@ const { WEBASSEMBLY_TYPES } = require("../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-async → wasm}/AsyncWebAssemblyJavascriptGenerator.js

@@ -6,28 +6,37 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const Generator = require("../Generator");
-const InitFragment = require("../InitFragment");
-const { WEBASSEMBLY_TYPES } = require("../ModuleSourceTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
+const isDependencyKind = require("../graph/isDependencyKind");
+const Generator = require("../module/Generator");
+const { WEBASSEMBLY_TYPES } = require("../module/ModuleSourceTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const InitFragment = require("../template/InitFragment");
+const Template = require("../template/Template");
 
+/** @import WebAssemblyImportDependency from "../dependencies/wasm/WebAssemblyImportDependency" */
 /** @import { Source } from "webpack-sources" */
 /** @import AsyncWasmModule from "./AsyncWasmModule" */
-/** @import { GenerateContext } from "../Generator" */
-/** @import Module, { SourceType, SourceTypes } from "../Module" */
-/** @import NormalModule from "../NormalModule" */
+/** @import { GenerateContext } from "../module/Generator" */
+/** @import Module, { SourceType, SourceTypes } from "../module/Module" */
+/** @import NormalModule from "../module/NormalModule" */
 
 /**
  * Represents the async web assembly javascript generator runtime component.
  * @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) {
@@ -36,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
 	 */
@@ -52,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
 	 */
@@ -97,7 +106,7 @@ class AsyncWebAssemblyJavascriptGenerator extends Generator {
 		/** @type {Map<string, WebAssemblyImportDependency[]>} */
 		const wasmDepsByRequest = new Map();
 		for (const dep of module.dependencies) {
-			if (dep instanceof WebAssemblyImportDependency) {
+			if (isDependencyKind(dep, "webassembly-import")) {
 				const module = /** @type {Module} */ (moduleGraph.getModule(dep));
 				if (!depModules.has(module)) {
 					depModules.set(module, {
@@ -235,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
 	 */
@@ -297,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
 	 */