webpack 5.111.1 → 5.112.1

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

@@ -6,25 +6,28 @@
 "use strict";
 
 const { SyncWaterfallHook } = require("tapable");
-const Generator = require("../Generator");
-const { WEBASSEMBLY_MODULE_TYPE_ASYNC } = require("../ModuleTypeConstants");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
+const WebAssemblyImportDependency = require("../dependencies/wasm/WebAssemblyImportDependency");
 const { tryRunOrWebpackError } = require("../errors/HookWebpackError");
+const Generator = require("../module/Generator");
+const {
+	WEBASSEMBLY_MODULE_TYPE_ASYNC
+} = require("../module/ModuleTypeConstants");
 const { compareModulesByFullName } = require("../util/comparators");
 const createHooksRegistry = require("../util/createHooksRegistry");
+const implicitTypeLoaderFallback = require("../util/implicitTypeLoaderFallback");
 const lazyModule = require("../util/lazyModule");
 const preloadModuleType = require("../util/preloadModuleType");
 const AsyncWasmModule = require("./AsyncWasmModule");
 
 /** @import { Source } from "webpack-sources" */
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGraph from "../ChunkGraph" */
-/** @import CodeGenerationResults from "../CodeGenerationResults" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
+/** @import CodeGenerationResults from "../module/CodeGenerationResults" */
 /** @import Compiler from "../Compiler" */
-/** @import DependencyTemplates from "../DependencyTemplates" */
-/** @import Module from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import RuntimeTemplate from "../RuntimeTemplate" */
+/** @import DependencyTemplates from "../template/DependencyTemplates" */
+/** @import Module from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import RuntimeTemplate from "../template/RuntimeTemplate" */
 /** @import WebpackError from "../errors/WebpackError" */
 
 const getAsyncWebAssemblyGenerator = lazyModule(() =>
@@ -78,12 +81,25 @@ class AsyncWebAssemblyModulesPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		// `"auto"` marks implicit enablement, the one case where loaders win over
+		// the built-in type — see `applyExperimentsDefaults`.
+		// TODO in the next major release: asyncWebAssembly defaults to `true`, drop this implicit-only fallback.
+		const implicitlyEnabled =
+			compiler.options.experiments.asyncWebAssembly === "auto";
 		// A binary's name may carry the compilation hash, which the analyzable call site
 		// leaves as a stand-in — so whatever the chunk loading is, the pass that fills it
 		// in has to be there. Applying it twice is a no-op.
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
+				if (implicitlyEnabled) {
+					implicitTypeLoaderFallback(
+						normalModuleFactory,
+						PLUGIN_NAME,
+						/\.wasm$/i,
+						WEBASSEMBLY_MODULE_TYPE_ASYNC
+					);
+				}
 				const hooks =
 					AsyncWebAssemblyModulesPlugin.getCompilationHooks(compilation);
 				compilation.dependencyFactories.set(

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

@@ -7,18 +7,17 @@
 
 const t = require("@webassemblyjs/ast");
 const { decode } = require("@webassemblyjs/wasm-parser");
-const Parser = require("../Parser");
-const StaticExportsDependency = require("../dependencies/StaticExportsDependency");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
+const StaticExportsDependency = require("../dependencies/core/StaticExportsDependency");
+const WebAssemblyImportDependency = require("../dependencies/wasm/WebAssemblyImportDependency");
+const Parser = require("../module/Parser");
 const memoize = require("../util/memoize");
 
 const getEnvironmentNotSupportAsyncWarning = memoize(() =>
 	require("../errors/EnvironmentNotSupportAsyncWarning")
 );
 
-/** @import AsyncWasmModule from "./AsyncWasmModule" */
-/** @import { BuildInfo, BuildMeta } from "../Module" */
-/** @import { ParserState, PreparsedAst } from "../Parser" */
+/** @import AsyncWasmModule, { BuiltAsyncWasmModule } from "./AsyncWasmModule" */
+/** @import { ParserState, PreparsedAst } from "../module/Parser" */
 
 const WASM_HEADER = Buffer.from([0x00, 0x61, 0x73, 0x6d]);
 
@@ -30,7 +29,10 @@ const decoderOpts = {
 	ignoreCustomNameSection: true
 };
 
-class WebAssemblyParser extends Parser {
+/**
+ * @extends {Parser<BuiltAsyncWasmModule>}
+ */
+class AsyncWebAssemblyParser extends Parser {
 	/**
 	 * Parses the provided source and updates the parser state.
 	 * @param {string | Buffer | PreparsedAst} source the source to parse
@@ -39,10 +41,12 @@ class WebAssemblyParser extends Parser {
 	 */
 	parse(source, state) {
 		if (!Buffer.isBuffer(source)) {
-			throw new Error("WebAssemblyParser input must be a Buffer");
+			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 WebAssemblyParser extends Parser {
 		);
 
 		// flag it as async module
-		const buildInfo = /** @type {BuildInfo} */ (state.module.buildInfo);
-
 		buildInfo.strict = true;
 
 		if (/** @type {AsyncWasmModule} */ (state.module).phase === "source") {
@@ -103,4 +105,4 @@ class WebAssemblyParser extends Parser {
 	}
 }
 
-module.exports = WebAssemblyParser;
+module.exports = AsyncWebAssemblyParser;

package/lib/wasm/EnableWasmLoadingPlugin.js

@@ -142,7 +142,7 @@ class EnableWasmLoadingPlugin {
 					}
 
 					if (compiler.options.experiments.asyncWebAssembly) {
-						const UniversalCompileAsyncWasmPlugin = require("../wasm-async/UniversalCompileAsyncWasmPlugin");
+						const UniversalCompileAsyncWasmPlugin = require("./UniversalCompileAsyncWasmPlugin");
 
 						new UniversalCompileAsyncWasmPlugin().apply(compiler);
 					}

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

@@ -5,14 +5,16 @@
 
 "use strict";
 
-const { WEBASSEMBLY_MODULE_TYPE_ASYNC } = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
-const { usesFullHashDigest } = require("../TemplatedPathPlugin");
-const AsyncWasmCompileRuntimeModule = require("../wasm-async/AsyncWasmCompileRuntimeModule");
-const AsyncWasmLoadingRuntimeModule = require("../wasm-async/AsyncWasmLoadingRuntimeModule");
+const {
+	WEBASSEMBLY_MODULE_TYPE_ASYNC
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const Template = require("../template/Template");
+const { usesFullHashDigest } = require("../template/TemplatedPathPlugin");
+const AsyncWasmCompileRuntimeModule = require("./AsyncWasmCompileRuntimeModule");
+const AsyncWasmLoadingRuntimeModule = require("./AsyncWasmLoadingRuntimeModule");
 
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compiler from "../Compiler" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 
@@ -117,9 +119,7 @@ class UniversalCompileAsyncWasmPlugin {
 						chunk,
 						new AsyncWasmLoadingRuntimeModule({
 							fullHashDigest: usesFullHashDigest(
-								/** @type {string} */ (
-									compilation.outputOptions.webassemblyModuleFilename
-								)
+								compilation.outputOptions.webassemblyModuleFilename
 							),
 							generateBeforeLoadBinaryCode,
 							generateLoadBinaryCode,
@@ -145,9 +145,7 @@ class UniversalCompileAsyncWasmPlugin {
 						chunk,
 						new AsyncWasmCompileRuntimeModule({
 							fullHashDigest: usesFullHashDigest(
-								/** @type {string} */ (
-									compilation.outputOptions.webassemblyModuleFilename
-								)
+								compilation.outputOptions.webassemblyModuleFilename
 							),
 							generateBeforeLoadBinaryCode,
 							generateLoadBinaryCode,

package/lib/wasm/wasmModuleFilename.js

@@ -5,12 +5,12 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const {
 	getPresentKinds,
 	reEncodeDigest,
 	usesFullHashDigest
-} = require("../TemplatedPathPlugin");
+} = require("../template/TemplatedPathPlugin");
 
 /** @import Compilation from "../Compilation" */
 

package/lib/wasm-sync/SyncWasmModule.js

@@ -4,11 +4,16 @@
 
 "use strict";
 
-const NormalModule = require("../NormalModule");
+const NormalModule = require("../module/NormalModule");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @import { BuildMeta } from "../Module" */
-/** @import { NormalModuleCreateData } from "../NormalModule" */
+/** @import { BuildMeta } from "../module/Module" */
+/**
+ * @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/WasmChunkLoadingRuntimeModule.js

@@ -4,22 +4,22 @@
 
 "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 { compareModulesByIdentifier } = require("../util/comparators");
 const { fullHashPathData } = require("../wasm/wasmModuleFilename");
 const WebAssemblyUtils = require("./WebAssemblyUtils");
 
 /** @import { Signature } from "@webassemblyjs/ast" */
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGraph, { ModuleId } from "../ChunkGraph" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph, { ModuleId } from "../graph/ChunkGraph" */
 /** @import Compilation from "../Compilation" */
-/** @import Module, { ReadOnlyRuntimeRequirements } from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
+/** @import Module, { ReadOnlyRuntimeRequirements } from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 
-// TODO webpack 6 remove the whole folder
+// TODO in the next major release: remove the whole folder
 
 // Get all wasm modules
 /**

package/lib/wasm-sync/WasmFinalizeExportsPlugin.js

@@ -5,12 +5,12 @@
 
 "use strict";
 
+const UnsupportedWebAssemblyFeatureError = require("../errors/UnsupportedWebAssemblyFeatureError");
 const formatLocation = require("../util/formatLocation");
-const UnsupportedWebAssemblyFeatureError = require("./UnsupportedWebAssemblyFeatureError");
 
 /** @import Compiler from "../Compiler" */
-/** @import Dependency from "../Dependency" */
-/** @import Module from "../Module" */
+/** @import Dependency from "../graph/Dependency" */
+/** @import Module from "../module/Module" */
 /** @import { SyncWasmModuleBuildMeta } from "./SyncWasmModule" */
 
 const PLUGIN_NAME = "WasmFinalizeExportsPlugin";

package/lib/wasm-sync/WebAssemblyGenerator.js

@@ -10,16 +10,16 @@ const { moduleContextFromModuleAST } = require("@webassemblyjs/ast");
 const { addWithAST, editWithAST } = require("@webassemblyjs/wasm-edit");
 const { decode } = require("@webassemblyjs/wasm-parser");
 const { RawSource } = require("webpack-sources");
-const Generator = require("../Generator");
-const { WEBASSEMBLY_TYPES } = require("../ModuleSourceTypeConstants");
-const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
+const isDependencyKind = require("../graph/isDependencyKind");
+const Generator = require("../module/Generator");
+const { WEBASSEMBLY_TYPES } = require("../module/ModuleSourceTypeConstants");
 const WebAssemblyUtils = require("./WebAssemblyUtils");
 
+/** @import { SyncWasmNormalModule } from "./SyncWasmModule" */
 /** @import { Source } from "webpack-sources" */
-/** @import { GenerateContext, UpdateHashContext } from "../Generator" */
-/** @import Module, { SourceType, SourceTypes } from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import NormalModule from "../NormalModule" */
+/** @import { GenerateContext, UpdateHashContext } from "../module/Generator" */
+/** @import Module, { SourceType, SourceTypes } from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
 /** @import Hash from "../util/Hash" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 /** @import { UsedWasmDependency } from "./WebAssemblyUtils" */
@@ -420,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.
@@ -433,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) {
@@ -442,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
 	 */
@@ -456,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
 	 */
@@ -489,11 +497,9 @@ class WebAssemblyGenerator extends Generator {
 		);
 		const externalExports = new Set(
 			module.dependencies
-				.filter((d) => d instanceof WebAssemblyExportImportedDependency)
+				.filter((d) => isDependencyKind(d, "webassembly-export-imported"))
 				.map((d) => {
-					const wasmDep = /** @type {WebAssemblyExportImportedDependency} */ (
-						d
-					);
+					const wasmDep = d;
 					return wasmDep.exportName;
 				})
 		);
@@ -539,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
 	 */
@@ -555,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

@@ -6,25 +6,32 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const { UsageState } = require("../ExportsInfo");
-const Generator = require("../Generator");
-const InitFragment = require("../InitFragment");
-const { WEBASSEMBLY_TYPES } = require("../ModuleSourceTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
-const ModuleDependency = require("../dependencies/ModuleDependency");
-const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
-
+const { UsageState } = require("../graph/ExportsInfo");
+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 { SyncWasmNormalModule } from "./SyncWasmModule" */
 /** @import { Source } from "webpack-sources" */
-/** @import { GenerateContext } from "../Generator" */
-/** @import Module, { SourceType, SourceTypes } from "../Module" */
-/** @import NormalModule from "../NormalModule" */
-
+/** @import { GenerateContext } from "../module/Generator" */
+/** @import ModuleDependency from "../dependencies/core/ModuleDependency" */
+/** @import Module, { SourceType, SourceTypes } from "../module/Module" */
+
+/**
+ * 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) {
@@ -33,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
 	 */
@@ -43,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
 	 */
@@ -69,7 +76,7 @@ class WebAssemblyJavascriptGenerator extends Generator {
 		let index = 0;
 		for (const dep of module.dependencies) {
 			const moduleDep =
-				dep && dep instanceof ModuleDependency ? dep : undefined;
+				dep && isDependencyKind(dep, "module-dependency") ? dep : undefined;
 			const mod = moduleGraph.getModule(dep);
 			if (mod) {
 				let importData = importedModules.get(mod);
@@ -87,7 +94,7 @@ class WebAssemblyJavascriptGenerator extends Generator {
 					);
 					index++;
 				}
-				if (dep instanceof WebAssemblyImportDependency) {
+				if (isDependencyKind(dep, "webassembly-import")) {
 					importData.names.add(dep.name);
 					if (dep.description.type === "GlobalType") {
 						const exportName = dep.name;
@@ -121,7 +128,7 @@ class WebAssemblyJavascriptGenerator extends Generator {
 						}
 					}
 				}
-				if (dep instanceof WebAssemblyExportImportedDependency) {
+				if (isDependencyKind(dep, "webassembly-export-imported")) {
 					importData.names.add(dep.name);
 					const usedName = moduleGraph
 						.getExportsInfo(module)
@@ -226,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
 	 */

package/lib/wasm-sync/WebAssemblyModulesPlugin.js

@@ -5,21 +5,23 @@
 
 "use strict";
 
-const Generator = require("../Generator");
+const WebAssemblyExportImportedDependency = require("../dependencies/wasm/WebAssemblyExportImportedDependency");
+const WebAssemblyImportDependency = require("../dependencies/wasm/WebAssemblyImportDependency");
+const WebAssemblyInInitialChunkError = require("../errors/WebAssemblyInInitialChunkError");
+const Generator = require("../module/Generator");
 const {
 	JAVASCRIPT_TYPE,
 	WEBASSEMBLY_TYPE
-} = require("../ModuleSourceTypeConstants");
-const { WEBASSEMBLY_MODULE_TYPE_SYNC } = require("../ModuleTypeConstants");
-const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
+} = require("../module/ModuleSourceTypeConstants");
+const {
+	WEBASSEMBLY_MODULE_TYPE_SYNC
+} = require("../module/ModuleTypeConstants");
 const { compareModulesByFullName } = require("../util/comparators");
 const lazyModule = require("../util/lazyModule");
 const preloadModuleType = require("../util/preloadModuleType");
-const WebAssemblyInInitialChunkError = require("./WebAssemblyInInitialChunkError");
 
 /** @import Compiler from "../Compiler" */
-/** @import Module from "../Module" */
+/** @import Module from "../module/Module" */
 
 const getWebAssemblyGenerator = lazyModule(() =>
 	require("./WebAssemblyGenerator")

package/lib/wasm-sync/WebAssemblyParser.js

@@ -8,15 +8,14 @@
 const t = require("@webassemblyjs/ast");
 const { moduleContextFromModuleAST } = require("@webassemblyjs/ast");
 const { decode } = require("@webassemblyjs/wasm-parser");
-const Parser = require("../Parser");
-const StaticExportsDependency = require("../dependencies/StaticExportsDependency");
-const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
+const StaticExportsDependency = require("../dependencies/core/StaticExportsDependency");
+const WebAssemblyExportImportedDependency = require("../dependencies/wasm/WebAssemblyExportImportedDependency");
+const WebAssemblyImportDependency = require("../dependencies/wasm/WebAssemblyImportDependency");
+const Parser = require("../module/Parser");
 
+/** @import { BuiltSyncWasmModule } from "./SyncWasmModule" */
 /** @import { ModuleImport } from "@webassemblyjs/ast" */
-/** @import { BuildInfo, BuildMeta } from "../Module" */
-/** @import { SyncWasmModuleBuildMeta } from "./SyncWasmModule" */
-/** @import { ParserState, PreparsedAst } from "../Parser" */
+/** @import { ParserState, PreparsedAst } from "../module/Parser" */
 
 const JS_COMPAT_TYPES = new Set(["i32", "i64", "f32", "f64", "externref"]);
 
@@ -63,6 +62,9 @@ const decoderOpts = {
 	ignoreCustomNameSection: true
 };
 
+/**
+ * @extends {Parser<BuiltSyncWasmModule>}
+ */
 class WebAssemblyParser extends Parser {
 	/**
 	 * Parses the provided source and updates the parser state.
@@ -76,10 +78,11 @@ class WebAssemblyParser extends Parser {
 		}
 
 		// flag it as ESM
-		/** @type {BuildInfo} */
-		(state.module.buildInfo).strict = true;
-		/** @type {BuildMeta} */
-		(state.module.buildMeta).exportsType = "namespace";
+		const { buildInfo, buildMeta } = /** @type {BuiltSyncWasmModule} */ (
+			state.module
+		);
+		buildInfo.strict = true;
+		buildMeta.exportsType = "namespace";
 
 		// parse it
 		const program = decode(source, decoderOpts);
@@ -90,9 +93,6 @@ class WebAssemblyParser extends Parser {
 		// extract imports and exports
 		/** @type {string[]} */
 		const exports = [];
-		const buildMeta = /** @type {SyncWasmModuleBuildMeta} */ (
-			state.module.buildMeta
-		);
 		/** @type {Record<string, string> | undefined} */
 		let jsIncompatibleExports = (buildMeta.jsIncompatibleExports = undefined);
 
@@ -115,9 +115,7 @@ class WebAssemblyParser extends Parser {
 
 					if (incompatibleType) {
 						if (jsIncompatibleExports === undefined) {
-							jsIncompatibleExports =
-								/** @type {SyncWasmModuleBuildMeta} */
-								(state.module.buildMeta).jsIncompatibleExports = {};
+							jsIncompatibleExports = buildMeta.jsIncompatibleExports = {};
 						}
 						jsIncompatibleExports[node.name] = incompatibleType;
 					}

package/lib/wasm-sync/WebAssemblyUtils.js

@@ -5,11 +5,12 @@
 
 "use strict";
 
-const Template = require("../Template");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
+const isDependencyKind = require("../graph/isDependencyKind");
+const Template = require("../template/Template");
 
-/** @import Module from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
+/** @import WebAssemblyImportDependency from "../dependencies/wasm/WebAssemblyImportDependency" */
+/** @import Module from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
 
 /**
  * Defines the used wasm dependency type used by this module.
@@ -33,7 +34,7 @@ const getUsedDependencies = (moduleGraph, module, mangle) => {
 	const array = [];
 	let importIndex = 0;
 	for (const dep of module.dependencies) {
-		if (dep instanceof WebAssemblyImportDependency) {
+		if (isDependencyKind(dep, "webassembly-import")) {
 			if (
 				dep.description.type === "GlobalType" ||
 				moduleGraph.getModule(dep) === null

package/lib/{MultiWatching.js → watch/MultiWatching.js}

@@ -5,11 +5,11 @@
 
 "use strict";
 
-const asyncLib = require("./util/async");
+const asyncLib = require("../util/async");
 
-/** @import MultiCompiler from "./MultiCompiler" */
+/** @import MultiCompiler from "../MultiCompiler" */
 /** @import Watching from "./Watching" */
-/** @import { ErrorCallback } from "./webpack" */
+/** @import { ErrorCallback } from "../webpack" */
 
 class MultiWatching {
 	/**