webpack 5.107.2 → 5.108.0

package/lib/dependencies/CssIcssImportDependency.js

@@ -19,8 +19,8 @@ const CssImportDependency = require("./CssImportDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, string]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, string]>} ObjectSerializerContext */
 /** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @typedef {import("../../declarations/WebpackOptions").CssGeneratorExportsConvention} CssGeneratorExportsConvention */
 /** @typedef {import("./CssIcssExportDependency").ExportMode} ExportMode */
@@ -39,7 +39,9 @@ class CssIcssImportDependency extends CssImportDependency {
 	 */
 	constructor(request, range, mode, importName, localName) {
 		super(request, range, mode);
+		/** @type {string} */
 		this.importName = importName;
+		/** @type {string} */
 		this.localName = localName;
 		/** @type {undefined | string[]} */
 		this._importNameConventionNames = undefined;
@@ -130,9 +132,7 @@ class CssIcssImportDependency extends CssImportDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.importName);
-		write(this.localName);
+		context.write(this.importName).write(this.localName);
 		super.serialize(context);
 	}
 
@@ -141,10 +141,10 @@ class CssIcssImportDependency extends CssImportDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.importName = read();
-		this.localName = read();
-		super.deserialize(context);
+		this.importName = context.read();
+		const c1 = context.rest;
+		this.localName = c1.read();
+		super.deserialize(c1.rest);
 	}
 }
 

package/lib/dependencies/CssIcssSymbolDependency.js

@@ -18,8 +18,8 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../css/CssParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, Range, string | undefined, string | undefined, string | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, Range, string | undefined, string | undefined, string | undefined]>} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
@@ -34,10 +34,14 @@ class CssIcssSymbolDependency extends NullDependency {
 	 */
 	constructor(localName, range, value, importName, request) {
 		super();
+		/** @type {string} */
 		this.localName = localName;
 		this.range = range;
+		/** @type {string | undefined} */
 		this.value = value;
+		/** @type {string | undefined} */
 		this.importName = importName;
+		/** @type {string | undefined} */
 		this.request = request;
 		/** @type {undefined | string} */
 		this._hashUpdate = undefined;
@@ -68,12 +72,12 @@ class CssIcssSymbolDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.localName);
-		write(this.range);
-		write(this.value);
-		write(this.importName);
-		write(this.request);
+		context
+			.write(this.localName)
+			.write(this.range)
+			.write(this.value)
+			.write(this.importName)
+			.write(this.request);
 		super.serialize(context);
 	}
 
@@ -82,13 +86,16 @@ class CssIcssSymbolDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.localName = read();
-		this.range = read();
-		this.value = read();
-		this.importName = read();
-		this.request = read();
-		super.deserialize(context);
+		this.localName = context.read();
+		const c1 = context.rest;
+		this.range = c1.read();
+		const c2 = c1.rest;
+		this.value = c2.read();
+		const c3 = c2.rest;
+		this.importName = c3.read();
+		const c4 = c3.rest;
+		this.request = c4.read();
+		super.deserialize(c4.rest);
 	}
 }
 

package/lib/dependencies/CssImportDependency.js

@@ -9,8 +9,10 @@ const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
+/** @typedef {import("../../declarations/WebpackOptions").CssParserExportType} CssParserExportType */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../css/CssModule").Inheritance} Inheritance */
 /** @typedef {import("../css/CssParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
@@ -25,14 +27,32 @@ class CssImportDependency extends ModuleDependency {
 	 * @param {string=} layer layer
 	 * @param {string=} supports list of supports conditions
 	 * @param {string=} media list of media conditions
+	 * @param {Inheritance=} inheritance layer/supports/media chain inherited from the importing module
+	 * @param {CssParserExportType=} exportType exportType inherited from the importing module
 	 */
-	constructor(request, range, mode, layer, supports, media) {
+	constructor(
+		request,
+		range,
+		mode,
+		layer,
+		supports,
+		media,
+		inheritance,
+		exportType
+	) {
 		super(request);
 		this.range = range;
 		this.mode = mode;
+		/** @type {string | undefined} */
 		this.layer = layer;
+		/** @type {string | undefined} */
 		this.supports = supports;
+		/** @type {string | undefined} */
 		this.media = media;
+		/** @type {Inheritance | undefined} */
+		this.inheritance = inheritance;
+		/** @type {CssParserExportType | undefined} */
+		this.exportType = exportType;
 	}
 
 	get type() {
@@ -88,6 +108,8 @@ class CssImportDependency extends ModuleDependency {
 		write(this.layer);
 		write(this.supports);
 		write(this.media);
+		write(this.inheritance);
+		write(this.exportType);
 		super.serialize(context);
 	}
 
@@ -102,6 +124,8 @@ class CssImportDependency extends ModuleDependency {
 		this.layer = read();
 		this.supports = read();
 		this.media = read();
+		this.inheritance = read();
+		this.exportType = read();
 		super.deserialize(context);
 	}
 }

package/lib/dependencies/CssUrlDependency.js

@@ -21,10 +21,11 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").CodeGenerationResultData} CodeGenerationResultData */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<["string" | "url" | "src"]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<["string" | "url" | "src"]>} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @typedef {import("../NormalModule").NormalModuleBuildInfo} NormalModuleBuildInfo */
 
 const getIgnoredRawDataUrlModule = memoize(
 	() => new RawDataUrlModule("data:,", "ignored-asset", "(ignored asset)")
@@ -75,7 +76,9 @@ class CssUrlDependency extends ModuleDependency {
 		const { chunkGraph } = context;
 		const module = chunkGraph.moduleGraph.getModule(this);
 		if (!module) return;
-		const buildInfo = /** @type {BuildInfo | undefined} */ (module.buildInfo);
+		const buildInfo = /** @type {NormalModuleBuildInfo | undefined} */ (
+			module.buildInfo
+		);
 		if (buildInfo && buildInfo.hash) {
 			hash.update(/** @type {string} */ (buildInfo.hash));
 		}
@@ -86,8 +89,7 @@ class CssUrlDependency extends ModuleDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.urlType);
+		context.write(this.urlType);
 		super.serialize(context);
 	}
 
@@ -96,12 +98,22 @@ class CssUrlDependency extends ModuleDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.urlType = read();
-		super.deserialize(context);
+		this.urlType = context.read();
+		super.deserialize(context.rest);
 	}
 }
 
+// Hoisted out of `cssEscapeString` so the patterns + replacer aren't
+// recompiled/reallocated per `url()` / `src()` reference at code-gen.
+const CSS_ESCAPE_UNQUOTED_REGEXP = /[\n\t ()'"\\]/g;
+const CSS_ESCAPE_DOUBLE_REGEXP = /[\n"\\]/g;
+const CSS_ESCAPE_SINGLE_REGEXP = /[\n'\\]/g;
+/**
+ * @param {string} m matched character
+ * @returns {string} the character backslash-escaped
+ */
+const cssEscapeReplacer = (m) => `\\${m}`;
+
 /**
  * Returns string in quotes if needed.
  * @param {string} str string
@@ -130,11 +142,11 @@ const cssEscapeString = (str) => {
 		}
 	}
 	if (countWhiteOrBracket < 2) {
-		return str.replace(/[\n\t ()'"\\]/g, (m) => `\\${m}`);
+		return str.replace(CSS_ESCAPE_UNQUOTED_REGEXP, cssEscapeReplacer);
 	} else if (countQuotation <= countApostrophe) {
-		return `"${str.replace(/[\n"\\]/g, (m) => `\\${m}`)}"`;
+		return `"${str.replace(CSS_ESCAPE_DOUBLE_REGEXP, cssEscapeReplacer)}"`;
 	}
-	return `'${str.replace(/[\n'\\]/g, (m) => `\\${m}`)}'`;
+	return `'${str.replace(CSS_ESCAPE_SINGLE_REGEXP, cssEscapeReplacer)}'`;
 };
 
 CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
@@ -216,7 +228,4 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 
 makeSerializable(CssUrlDependency, "webpack/lib/dependencies/CssUrlDependency");
 
-CssUrlDependency.PUBLIC_PATH_AUTO = "__WEBPACK_CSS_PUBLIC_PATH_AUTO__";
-CssUrlDependency.PUBLIC_PATH_FULL_HASH = "__WEBPACK_CSS_PUBLIC_PATH_FULL_HASH_";
-
 module.exports = CssUrlDependency;

package/lib/dependencies/DllEntryDependency.js

@@ -8,9 +8,9 @@
 const Dependency = require("../Dependency");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("./EntryDependency")} EntryDependency */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[EntryDependency[], string]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[EntryDependency[], string]>} ObjectSerializerContext */
 
 class DllEntryDependency extends Dependency {
 	/**
@@ -21,7 +21,9 @@ class DllEntryDependency extends Dependency {
 	constructor(dependencies, name) {
 		super();
 
+		/** @type {EntryDependency[]} */
 		this.dependencies = dependencies;
+		/** @type {string} */
 		this.name = name;
 	}
 
@@ -34,11 +36,7 @@ class DllEntryDependency extends Dependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.dependencies);
-		write(this.name);
-
+		context.write(this.dependencies).write(this.name);
 		super.serialize(context);
 	}
 
@@ -47,12 +45,10 @@ class DllEntryDependency extends Dependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.dependencies = read();
-		this.name = read();
-
-		super.deserialize(context);
+		this.dependencies = context.read();
+		const c1 = context.rest;
+		this.name = c1.read();
+		super.deserialize(c1.rest);
 	}
 }
 

package/lib/dependencies/ExportBindingInitFragment.js

@@ -0,0 +1,164 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Natsu @xiaoxiaojx
+*/
+
+"use strict";
+
+const InitFragment = require("../InitFragment");
+const RuntimeGlobals = require("../RuntimeGlobals");
+
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../Generator").GenerateContext} GenerateContext */
+/** @typedef {import("../ExportsInfo").UsedName} UsedName */
+
+/**
+ * @typedef {object} ExportBinding
+ * @property {UsedName} name the used export name
+ * @property {string} value the variable expression
+ * @property {"getter" | "value"=} bindingType "value" for value binding, defaults to "getter"
+ */
+
+/**
+ * Init fragment for const export bindings.
+ * Generates a flat-array __webpack_require__.d() call.
+ * Getter bindings: "key", () => expr (2 items).
+ * Value bindings: "key", 0, expr (3 items, 0 is sentinel).
+ *
+ * Uses a separate key ("harmony-export-bindings") from HarmonyExportInitFragment
+ * so the two fragment types do not merge and cannot interfere with each
+ * other's placement (top vs bottom).
+ * @extends {InitFragment<GenerateContext>} Context
+ */
+class ExportBindingInitFragment extends InitFragment {
+	/**
+	 * @param {string} exportsArgument the exports identifier
+	 * @param {ExportBinding[]} bindings list of export bindings
+	 * @param {boolean=} placeAtEnd when true, place the d() call at the end of the module
+	 */
+	constructor(exportsArgument, bindings, placeAtEnd = false) {
+		super(
+			undefined,
+			InitFragment.STAGE_HARMONY_EXPORTS,
+			1,
+			"harmony-export-bindings"
+		);
+		/** @type {string} */
+		this.exportsArgument = exportsArgument;
+		/** @type {ExportBinding[]} */
+		this.bindings = bindings;
+		/** @type {boolean} */
+		this.placeAtEnd = placeAtEnd;
+	}
+
+	/**
+	 * @param {ExportBindingInitFragment[]} fragments all fragments to merge
+	 * @returns {ExportBindingInitFragment} merged fragment
+	 */
+	mergeAll(fragments) {
+		/** @type {ExportBinding[]} */
+		const bindings = [];
+		/** @type {Set<string>} */
+		const seenNames = new Set();
+		let placeAtEnd = false;
+
+		for (const fragment of fragments) {
+			for (const binding of fragment.bindings) {
+				const key = /** @type {string} */ (binding.name);
+				if (!seenNames.has(key)) {
+					seenNames.add(key);
+					bindings.push(binding);
+				}
+			}
+			if (fragment.placeAtEnd) placeAtEnd = true;
+		}
+		return new ExportBindingInitFragment(
+			this.exportsArgument,
+			bindings,
+			placeAtEnd
+		);
+	}
+
+	/**
+	 * @param {ExportBindingInitFragment} other other
+	 * @returns {ExportBindingInitFragment} merged result
+	 */
+	merge(other) {
+		/** @type {ExportBinding[]} */
+		const bindings = [];
+		/** @type {Set<string>} */
+		const seenNames = new Set();
+		for (const binding of other.bindings) {
+			const key = /** @type {string} */ (binding.name);
+			seenNames.add(key);
+			bindings.push(binding);
+		}
+		for (const binding of this.bindings) {
+			const key = /** @type {string} */ (binding.name);
+			if (!seenNames.has(key)) {
+				seenNames.add(key);
+				bindings.push(binding);
+			}
+		}
+		return new ExportBindingInitFragment(
+			this.exportsArgument,
+			bindings,
+			this.placeAtEnd || other.placeAtEnd
+		);
+	}
+
+	/**
+	 * @param {GenerateContext} context context
+	 * @returns {string} the d() call or empty string
+	 */
+	_generateDefinition({ runtimeTemplate, runtimeRequirements }) {
+		if (this.bindings.length === 0) return "";
+
+		const sorted = [...this.bindings].sort((a, b) =>
+			/** @type {string} */ (a.name) < /** @type {string} */ (b.name) ? -1 : 1
+		);
+
+		/** @type {string[]} */
+		const items = [];
+		for (const binding of sorted) {
+			const key = JSON.stringify(/** @type {string} */ (binding.name));
+			if (binding.bindingType === "value") {
+				items.push(`\n/* harmony export */   ${key}, 0, ${binding.value}`);
+			} else {
+				items.push(
+					`\n/* harmony export */   ${key}, ${runtimeTemplate.returningFunction(binding.value)}`
+				);
+			}
+		}
+
+		runtimeRequirements.add(RuntimeGlobals.exports);
+		runtimeRequirements.add(RuntimeGlobals.definePropertyGetters);
+		return `/* harmony export */ ${RuntimeGlobals.definePropertyGetters}(${
+			this.exportsArgument
+		}, [${items.join(",")}\n/* harmony export */ ]);\n`;
+	}
+
+	/**
+	 * Returns the source code that will be included as initialization code.
+	 * @param {GenerateContext} context context
+	 * @returns {string | Source | undefined} the source code that will be included as initialization code
+	 */
+	getContent(context) {
+		if (this.placeAtEnd) return undefined;
+		return this._generateDefinition(context);
+	}
+
+	/**
+	 * Returns the source code that will be included at the end of the module.
+	 * @param {GenerateContext} context context
+	 * @returns {string | Source | undefined} the source code that will be included at the end of the module
+	 */
+	getEndContent(context) {
+		if (!this.placeAtEnd) return undefined;
+		const definePart = this._generateDefinition(context);
+		if (!definePart) return undefined;
+		return `\n${definePart}`;
+	}
+}
+
+module.exports = ExportBindingInitFragment;

package/lib/dependencies/ExportsInfoDependency.js

@@ -16,9 +16,9 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, ExportInfoName[] | null, string | null]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, ExportInfoName[] | null, string | null]>} ObjectSerializerContext */
 
 /**
  * Defines the sortable set type used by this module.
@@ -99,7 +99,9 @@ class ExportsInfoDependency extends NullDependency {
 	constructor(range, exportName, property) {
 		super();
 		this.range = range;
+		/** @type {string[] | null} */
 		this.exportName = exportName;
+		/** @type {string | null} */
 		this.property = property;
 	}
 
@@ -108,10 +110,7 @@ class ExportsInfoDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.range);
-		write(this.exportName);
-		write(this.property);
+		context.write(this.range).write(this.exportName).write(this.property);
 		super.serialize(context);
 	}
 
@@ -121,12 +120,13 @@ class ExportsInfoDependency extends NullDependency {
 	 * @returns {ExportsInfoDependency} ExportsInfoDependency
 	 */
 	static deserialize(context) {
-		const obj = new ExportsInfoDependency(
-			context.read(),
-			context.read(),
-			context.read()
-		);
-		obj.deserialize(context);
+		const range = context.read();
+		const c1 = context.rest;
+		const exportName = c1.read();
+		const c2 = c1.rest;
+		const property = c2.read();
+		const obj = new ExportsInfoDependency(range, exportName, property);
+		obj.deserialize(c2.rest);
 		return obj;
 	}
 }

package/lib/dependencies/ExternalModuleDependency.js

@@ -14,8 +14,8 @@ const ExternalModuleInitFragment = require("./ExternalModuleInitFragment");
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../dependencies/ExternalModuleInitFragment").ArrayImportSpecifiers} ArrayImportSpecifiers */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<(string | ArrayImportSpecifiers | undefined)[]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<(string | ArrayImportSpecifiers | undefined)[]>} ObjectSerializerContext */
 
 class ExternalModuleDependency extends CachedConstDependency {
 	/**
@@ -39,8 +39,11 @@ class ExternalModuleDependency extends CachedConstDependency {
 	) {
 		super(expression, range, identifier, place);
 
+		/** @type {string} */
 		this.importedModule = module;
+		/** @type {ArrayImportSpecifiers} */
 		this.specifiers = importSpecifiers;
+		/** @type {string | undefined} */
 		this.default = defaultImport;
 	}
 
@@ -73,9 +76,9 @@ class ExternalModuleDependency extends CachedConstDependency {
 	deserialize(context) {
 		super.deserialize(context);
 		const { read } = context;
-		this.importedModule = read();
-		this.specifiers = read();
-		this.default = read();
+		this.importedModule = /** @type {string} */ (read());
+		this.specifiers = /** @type {ArrayImportSpecifiers} */ (read());
+		this.default = /** @type {string | undefined} */ (read());
 	}
 }
 

package/lib/dependencies/ExternalModuleInitFragment.js

@@ -10,11 +10,11 @@ const makeSerializable = require("../util/makeSerializable");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {{ name: string, value?: string }[]} ArrayImportSpecifiers */
 /** @typedef {Set<string>} ImportSpecifier */
 /** @typedef {Map<string, ImportSpecifier>} ImportSpecifiers */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<(string | ArrayImportSpecifiers | ImportSpecifiers | undefined)[]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<(string | ArrayImportSpecifiers | ImportSpecifiers | undefined)[]>} ObjectSerializerContext */
 
 /**
  * @extends {InitFragment<GenerateContext>}
@@ -32,6 +32,7 @@ class ExternalModuleInitFragment extends InitFragment {
 			0,
 			`external module imports|${importedModule}|${defaultImport || "null"}`
 		);
+		/** @type {string} */
 		this.importedModule = importedModule;
 		if (Array.isArray(specifiers)) {
 			/** @type {ImportSpecifiers} */
@@ -48,6 +49,7 @@ class ExternalModuleInitFragment extends InitFragment {
 		} else {
 			this.specifiers = specifiers;
 		}
+		/** @type {string | undefined} */
 		this.defaultImport = defaultImport;
 	}
 
@@ -126,9 +128,9 @@ class ExternalModuleInitFragment extends InitFragment {
 	deserialize(context) {
 		super.deserialize(context);
 		const { read } = context;
-		this.importedModule = read();
-		this.specifiers = read();
-		this.defaultImport = read();
+		this.importedModule = /** @type {string} */ (read());
+		this.specifiers = /** @type {ImportSpecifiers} */ (read());
+		this.defaultImport = /** @type {string | undefined} */ (read());
 	}
 }
 

package/lib/dependencies/ExternalModuleInitFragmentDependency.js

@@ -15,8 +15,8 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../dependencies/ExternalModuleInitFragment").ArrayImportSpecifiers} ArrayImportSpecifiers */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, ArrayImportSpecifiers, string | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, ArrayImportSpecifiers, string | undefined]>} ObjectSerializerContext */
 
 class ExternalModuleInitFragmentDependency extends NullDependency {
 	/**
@@ -27,8 +27,11 @@ class ExternalModuleInitFragmentDependency extends NullDependency {
 	 */
 	constructor(module, importSpecifiers, defaultImport) {
 		super();
+		/** @type {string} */
 		this.importedModule = module;
+		/** @type {ArrayImportSpecifiers} */
 		this.specifiers = importSpecifiers;
+		/** @type {string | undefined} */
 		this.default = defaultImport;
 	}
 
@@ -37,10 +40,10 @@ class ExternalModuleInitFragmentDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.importedModule);
-		write(this.specifiers);
-		write(this.default);
+		context
+			.write(this.importedModule)
+			.write(this.specifiers)
+			.write(this.default);
 	}
 
 	/**
@@ -48,10 +51,10 @@ class ExternalModuleInitFragmentDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.importedModule = read();
-		this.specifiers = read();
-		this.default = read();
+		this.importedModule = context.read();
+		const c1 = context.rest;
+		this.specifiers = c1.read();
+		this.default = c1.rest.read();
 	}
 }