@depup/webpack 5.106.1-depup.0 → 5.109.2-depup.0

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -8,10 +8,14 @@
 const ConditionalInitFragment = require("../ConditionalInitFragment");
 const Dependency = require("../Dependency");
 const { UsageState } = require("../ExportsInfo");
-const HarmonyLinkingError = require("../HarmonyLinkingError");
 const InitFragment = require("../InitFragment");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
+const {
+	InlinedUsedName,
+	isExportInlined,
+	isInlineEnabled
+} = require("../optimize/InlineExports");
 const {
 	getMakeDeferredNamespaceModeFromExportsType
 } = require("../runtime/MakeDeferredNamespaceObjectRuntime");
@@ -26,6 +30,7 @@ const {
 } = require("../util/runtime");
 const HarmonyExportInitFragment = require("./HarmonyExportInitFragment");
 const HarmonyImportDependency = require("./HarmonyImportDependency");
+const HarmonyLinkingError = require("./HarmonyLinkingError");
 const { ImportPhaseUtils } = require("./ImportPhase");
 const processExportInfo = require("./processExportInfo");
 
@@ -33,6 +38,7 @@ const processExportInfo = require("./processExportInfo");
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
 /** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
+/** @typedef {import("../Dependency").LazyUntil} LazyUntil */
 /** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
 /** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
@@ -50,15 +56,19 @@ const processExportInfo = require("./processExportInfo");
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
-/** @typedef {import("../WebpackError")} WebpackError */
+/** @typedef {import("../errors/WebpackError")} WebpackError */
 /** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {[Ids, string | null, Set<string>, ReadonlyArray<HarmonyExportImportedSpecifierDependency> | null, ExportPresenceMode, HarmonyStarExportsList | null]} SerializedData */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<SerializedData>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<SerializedData>} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[HarmonyExportImportedSpecifierDependency[]]>} StarListDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[HarmonyExportImportedSpecifierDependency[]]>} StarListSerializerContext */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 /** @typedef {import("./HarmonyImportDependency").Ids} Ids */
 /** @typedef {import("./HarmonyImportDependency").ExportPresenceMode} ExportPresenceMode */
 /** @typedef {import("./HarmonyExportInitFragment").ExportMap} ExportMap */
 /** @typedef {import("../dependencies/ImportPhase").ImportPhaseType} ImportPhaseType */
+/** @typedef {import("../javascript/JavascriptModule").JavascriptModuleBuildMeta} JavascriptModuleBuildMeta */
 
 /** @typedef {"missing" | "unused" | "empty-star" | "reexport-dynamic-default" | "reexport-named-default" | "reexport-namespace-object" | "reexport-fake-namespace-object" | "reexport-undefined" | "normal-reexport" | "dynamic-reexport"} ExportModeType */
 
@@ -70,6 +80,7 @@ const idsSymbol = /** @type {symbol} */ (
 
 class NormalReexportItem {
 	/**
+	 * Creates an instance of NormalReexportItem.
 	 * @param {string} name export name
 	 * @param {Ids} ids reexported ids from other module
 	 * @param {ExportInfo} exportInfo export info from other module
@@ -77,10 +88,15 @@ class NormalReexportItem {
 	 * @param {boolean} hidden true, if it is hidden behind another active export in the same module
 	 */
 	constructor(name, ids, exportInfo, checked, hidden) {
+		/** @type {string} */
 		this.name = name;
+		/** @type {Ids} */
 		this.ids = ids;
+		/** @type {ExportInfo} */
 		this.exportInfo = exportInfo;
+		/** @type {boolean} */
 		this.checked = checked;
+		/** @type {boolean} */
 		this.hidden = hidden;
 	}
 }
@@ -90,6 +106,7 @@ class NormalReexportItem {
 
 class ExportMode {
 	/**
+	 * Creates an instance of ExportMode.
 	 * @param {ExportModeType} type type of the mode
 	 */
 	constructor(type) {
@@ -126,7 +143,85 @@ class ExportMode {
 
 /** @typedef {number[]} DependencyIndices */
 
+const RETURNS_TRUE = () => true;
+
 /**
+ * Detect a per-name cycle when collecting `export *` contributions from
+ * `exportInfo`'s module into `parentModule`. The TC39 `ResolveExport`
+ * algorithm tracks a `resolveSet` of `(module, exportName)` pairs and
+ * returns null when an entry is revisited — letting the `StarExportEntries`
+ * loop fall through to a non-cyclic source. Webpack's static export graph
+ * does not run that resolution algorithm, so we approximate it: if the
+ * imported module's same-named export ultimately re-exports from
+ * `parentModule` under the same name, the star contribution is cyclic and
+ * must be skipped. The non-cyclic alternative (a sibling `export *` that
+ * provides a real binding) then wins.
+ *
+ * We walk the target chain one hop at a time using `findTarget` with a
+ * "match anything" filter so we can guard against namespace targets
+ * (`export * as ns from`, where `target.export` is undefined) and against
+ * unrelated cycles in the graph that would otherwise loop forever inside
+ * `_findTarget`.
+ * @param {ModuleGraph} moduleGraph the module graph
+ * @param {ExportInfo} exportInfo export info on the imported module
+ * @param {Module} parentModule the module that contains the star reexport
+ * @returns {boolean} true when this export reexports back to the parent module under the same name
+ */
+const isStarReexportBackToParent = (moduleGraph, exportInfo, parentModule) => {
+	// Fast path: probe the first hop directly. The overwhelmingly common case
+	// in real builds is a terminal local binding (no `_target`) — `findTarget`
+	// returns `undefined` and we exit without allocating a `visited` set.
+	const firstTarget = exportInfo.findTarget(moduleGraph, RETURNS_TRUE);
+	if (!firstTarget || typeof firstTarget !== "object") return false;
+	const name = exportInfo.name;
+	if (
+		firstTarget.module === parentModule &&
+		Array.isArray(firstTarget.export) &&
+		firstTarget.export.length === 1 &&
+		firstTarget.export[0] === name
+	) {
+		return true;
+	}
+	if (!Array.isArray(firstTarget.export) || firstTarget.export.length === 0) {
+		return false;
+	}
+	// Multi-hop chain — allocate visited tracking now. The set protects against
+	// unrelated cycles in the graph that would otherwise spin inside
+	// `_findTarget` (its `alreadyVisited` is only seeded for the entry node).
+	let current = moduleGraph
+		.getExportsInfo(firstTarget.module)
+		.getReadOnlyExportInfo(firstTarget.export[0]);
+	// Allocated lazily: a single-extra-hop chain that terminates (the common
+	// `barrel -> leaf local binding` case) returns before `next` is ever
+	// computed, so the visited set is pure waste there.
+	/** @type {Set<ExportInfo> | undefined} */
+	let visited;
+	for (;;) {
+		const target = current.findTarget(moduleGraph, RETURNS_TRUE);
+		if (!target || typeof target !== "object") return false;
+		if (
+			target.module === parentModule &&
+			Array.isArray(target.export) &&
+			target.export.length === 1 &&
+			target.export[0] === name
+		) {
+			return true;
+		}
+		if (!Array.isArray(target.export) || target.export.length === 0) {
+			return false;
+		}
+		const next = moduleGraph
+			.getExportsInfo(target.module)
+			.getReadOnlyExportInfo(target.export[0]);
+		if (visited === undefined) visited = new Set([exportInfo, current]);
+		if (visited.has(next)) return false;
+		visited.add(next);
+		current = next;
+	}
+};
+
+/**
+ * Determine export assignments.
  * @param {ModuleGraph} moduleGraph module graph
  * @param {HarmonyExportImportedSpecifierDependency[]} dependencies dependencies
  * @param {HarmonyExportImportedSpecifierDependency=} additionalDependency additional dependency
@@ -146,6 +241,11 @@ const determineExportAssignments = (
 		dependencies = [...dependencies, additionalDependency];
 	}
 
+	const referenceDep = dependencies[0] || additionalDependency;
+	const parentModule = referenceDep
+		? moduleGraph.getParentModule(referenceDep)
+		: null;
+
 	for (const dep of dependencies) {
 		const i = dependencyIndices.length;
 		dependencyIndices[i] = names.size;
@@ -156,7 +256,11 @@ const determineExportAssignments = (
 				if (
 					exportInfo.provided === true &&
 					exportInfo.name !== "default" &&
-					!names.has(exportInfo.name)
+					!names.has(exportInfo.name) &&
+					!(
+						parentModule &&
+						isStarReexportBackToParent(moduleGraph, exportInfo, parentModule)
+					)
 				) {
 					names.add(exportInfo.name);
 					dependencyIndices[i] = names.size;
@@ -170,6 +274,7 @@ const determineExportAssignments = (
 };
 
 /**
+ * Finds dependency for name.
  * @param {object} options options
  * @param {ExportInfoName[]} options.names names
  * @param {DependencyIndices} options.dependencyIndices dependency indices
@@ -199,6 +304,7 @@ const findDependencyForName = (
 };
 
 /**
+ * Returns the export mode.
  * @param {ModuleGraph} moduleGraph the module graph
  * @param {HarmonyExportImportedSpecifierDependency} dep the dependency
  * @param {string} runtimeKey the runtime key
@@ -373,6 +479,7 @@ const getMode = (moduleGraph, dep, runtimeKey) => {
 
 class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	/**
+	 * Creates an instance of HarmonyExportImportedSpecifierDependency.
 	 * @param {string} request the request string
 	 * @param {number} sourceOrder the order in the original source file
 	 * @param {Ids} ids the requested export name of the imported module
@@ -398,15 +505,21 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	) {
 		super(request, sourceOrder, phase, attributes);
 
+		/** @type {Ids} */
 		this.ids = ids;
+		/** @type {string | null} */
 		this.name = name;
+		/** @type {Set<string>} */
 		this.activeExports = activeExports;
 		this.otherStarExports = otherStarExports;
+		/** @type {ExportPresenceMode} */
 		this.exportPresenceMode = exportPresenceMode;
+		/** @type {HarmonyStarExportsList | null} */
 		this.allStarExports = allStarExports;
 	}
 
 	/**
+	 * Could affect referencing module.
 	 * @returns {boolean | TRANSITIVE} true, when changes to the referenced module could affect the referencing module; TRANSITIVE, when changes to the referenced module could affect referencing modules of the referencing module
 	 */
 	couldAffectReferencingModule() {
@@ -415,6 +528,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 	// TODO webpack 6 remove
 	/**
+	 * Returns id.
 	 * @deprecated
 	 */
 	get id() {
@@ -423,6 +537,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 	// TODO webpack 6 remove
 	/**
+	 * Returns id.
 	 * @deprecated
 	 */
 	getId() {
@@ -431,6 +546,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 	// TODO webpack 6 remove
 	/**
+	 * Updates id.
 	 * @deprecated
 	 */
 	setId() {
@@ -442,6 +558,33 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	/**
+	 * Returns the export name this dependency requests from its target module (lazy barrel optimization).
+	 * @returns {string | true | null} export name, true for all exports, null for none
+	 */
+	getForwardId() {
+		return this.ids.length > 0 ? this.ids[0] : true;
+	}
+
+	/**
+	 * Returns how this dependency may be deferred when its parent module is side-effect-free (lazy barrel optimization).
+	 * @returns {LazyUntil | null} lazy classification, null when it must be processed eagerly
+	 */
+	getLazyUntil() {
+		return this.name !== null
+			? Dependency.LAZY_UNTIL_ID
+			: Dependency.LAZY_UNTIL_FALLBACK;
+	}
+
+	/**
+	 * Returns the export name for a `LAZY_UNTIL_LOCAL`/`LAZY_UNTIL_ID` classification (lazy barrel optimization).
+	 * @returns {string | null} export name, null when not applicable
+	 */
+	getLazyName() {
+		return this.name;
+	}
+
+	/**
+	 * Returns the imported id.
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 * @returns {Ids} the imported id
 	 */
@@ -450,6 +593,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	/**
+	 * Updates ids using the provided module graph.
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 * @param {Ids} ids the imported ids
 	 * @returns {void}
@@ -459,6 +603,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	/**
+	 * Returns the export mode.
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 * @param {RuntimeSpec} runtime the runtime
 	 * @returns {ExportMode} the export mode
@@ -472,6 +617,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	/**
+	 * Gets star reexports.
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 * @param {RuntimeSpec} runtime the runtime
 	 * @param {ExportsInfo} exportsInfo exports info about the current module (optional)
@@ -493,7 +639,8 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 			exportsInfo.otherExportsInfo.getUsed(runtime) === UsageState.Unused;
 
 		/** @type {IgnoredExports} */
-		const ignoredExports = new Set(["default", ...this.activeExports]);
+		const ignoredExports = new Set(this.activeExports);
+		ignoredExports.add("default");
 
 		/** @type {Hidden | undefined} */
 		let hiddenExports;
@@ -521,6 +668,10 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		/** @type {Hidden | undefined} */
 		const hidden = hiddenExports !== undefined ? new Set() : undefined;
 
+		const parentModule = /** @type {Module} */ (
+			moduleGraph.getParentModule(this)
+		);
+
 		if (noExtraImports) {
 			for (const exportInfo of exportsInfo.orderedExports) {
 				const name = exportInfo.name;
@@ -530,10 +681,22 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 					importedExportsInfo.getReadOnlyExportInfo(name);
 				if (importedExportInfo.provided === false) continue;
 				if (hiddenExports !== undefined && hiddenExports.has(name)) {
+					// Earlier star deps already provided this name non-cyclically
+					// (`determineExportAssignments` filters cyclic candidates), so
+					// the cycle check below would be wasted work.
 					/** @type {Hidden} */
 					(hidden).add(name);
 					continue;
 				}
+				if (
+					isStarReexportBackToParent(
+						moduleGraph,
+						importedExportInfo,
+						parentModule
+					)
+				) {
+					continue;
+				}
 				exports.add(name);
 				if (importedExportInfo.provided === true) continue;
 				checked.add(name);
@@ -550,6 +713,15 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 					(hidden).add(name);
 					continue;
 				}
+				if (
+					isStarReexportBackToParent(
+						moduleGraph,
+						importedExportInfo,
+						parentModule
+					)
+				) {
+					continue;
+				}
 				exports.add(name);
 				if (importedExportInfo.provided === true) continue;
 				checked.add(name);
@@ -560,17 +732,36 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	/**
+	 * Returns function to determine if the connection is active.
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @returns {null | false | GetConditionFn} function to determine if the connection is active
 	 */
 	getCondition(moduleGraph) {
 		return (connection, runtime) => {
 			const mode = this.getMode(moduleGraph, runtime);
-			return mode.type !== "unused" && mode.type !== "empty-star";
+			const active = mode.type !== "unused" && mode.type !== "empty-star";
+			if (!active) return active;
+
+			const module = connection.module;
+			if (!isInlineEnabled(module)) return true;
+			if (mode.type !== "normal-reexport") return true;
+			const exportsInfo = moduleGraph.getExportsInfo(module);
+			if (exportsInfo.otherExportsInfo.getUsed(runtime) !== UsageState.Unused) {
+				return true;
+			}
+			for (const item of /** @type {NormalReexportItem[]} */ (mode.items)) {
+				// Hidden/checked items can't be statically inlined away
+				if (item.hidden || item.checked) return true;
+				if (!isExportInlined(moduleGraph, module, item.ids, runtime)) {
+					return true;
+				}
+			}
+			return false;
 		};
 	}
 
 	/**
+	 * Gets module evaluation side effects state.
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 * @returns {ConnectionState} how this dependency connects the module to referencing modules
 	 */
@@ -652,6 +843,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	/**
+	 * Discover active exports from other star exports.
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 * @returns {{ names: ExportInfoName[], namesSlice: number, dependencyIndices: DependencyIndices, dependencyIndex: number } | undefined} exported names and their origin dependency
 	 */
@@ -830,6 +1022,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	/**
+	 * Get effective export presence level.
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @returns {ExportPresenceMode} effective mode
 	 */
@@ -844,7 +1037,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	/**
-	 * Returns warnings
+	 * Returns warnings.
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @returns {WebpackError[] | null | undefined} warnings
 	 */
@@ -857,7 +1050,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	/**
-	 * Returns errors
+	 * Returns errors.
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @returns {WebpackError[] | null | undefined} errors
 	 */
@@ -870,6 +1063,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	/**
+	 * Returns errors.
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @returns {WebpackError[] | undefined} errors
 	 */
@@ -956,37 +1150,41 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	/**
+	 * Serializes this instance into the provided serializer context.
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write, setCircularReference } = context;
-
-		setCircularReference(this);
-		write(this.ids);
-		write(this.name);
-		write(this.activeExports);
-		write(this.otherStarExports);
-		write(this.exportPresenceMode);
-		write(this.allStarExports);
+		context.setCircularReference(this);
+		context
+			.write(this.ids)
+			.write(this.name)
+			.write(this.activeExports)
+			.write(this.otherStarExports)
+			.write(this.exportPresenceMode)
+			.write(this.allStarExports);
 
 		super.serialize(context);
 	}
 
 	/**
+	 * Restores this instance from the provided deserializer context.
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read, setCircularReference } = context;
-
-		setCircularReference(this);
-		this.ids = read();
-		this.name = read();
-		this.activeExports = read();
-		this.otherStarExports = read();
-		this.exportPresenceMode = read();
-		this.allStarExports = read();
-
-		super.deserialize(context);
+		context.setCircularReference(this);
+		this.ids = context.read();
+		const c1 = context.rest;
+		this.name = c1.read();
+		const c2 = c1.rest;
+		this.activeExports = c2.read();
+		const c3 = c2.rest;
+		this.otherStarExports = c3.read();
+		const c4 = c3.rest;
+		this.exportPresenceMode = c4.read();
+		const c5 = c4.rest;
+		this.allStarExports = c5.read();
+
+		super.deserialize(c5.rest);
 	}
 }
 
@@ -999,6 +1197,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	HarmonyImportDependency.Template
 ) {
 	/**
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {Dependency} dependency the dependency for which the template should be applied
 	 * @param {ReplaceSource} source the current replace source which can be modified
 	 * @param {DependencyTemplateContext} templateContext the context object
@@ -1042,6 +1241,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	}
 
 	/**
+	 * Add export fragments.
 	 * @param {InitFragment<GenerateContext>[]} initFragments target array for init fragments
 	 * @param {HarmonyExportImportedSpecifierDependency} dep dependency
 	 * @param {ExportMode} mode the export mode
@@ -1085,7 +1285,9 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 					importVar,
 					importedModule.getExportsType(
 						moduleGraph,
-						module.buildMeta && module.buildMeta.strictHarmonyModule
+						module.buildMeta &&
+							/** @type {JavascriptModuleBuildMeta} */ (module.buildMeta)
+								.strictHarmonyModule
 					),
 					runtimeRequirements
 				)
@@ -1190,7 +1392,12 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				);
 				break;
 
-			case "normal-reexport":
+			case "normal-reexport": {
+				// loop-invariants hoisted out of the per-item loop below (a barrel
+				// re-exporting N names otherwise repeats these lookups N times)
+				const connection = moduleGraph.getConnection(dep);
+				const selfExportsInfo = moduleGraph.getExportsInfo(module);
+				const importedExportsInfo = moduleGraph.getExportsInfo(importedModule);
 				for (const {
 					name,
 					ids,
@@ -1199,7 +1406,6 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 				} of /** @type {NormalReexportItem[]} */ (mode.items)) {
 					if (hidden) continue;
 					if (checked) {
-						const connection = moduleGraph.getConnection(dep);
 						const key = `harmony reexport (checked) ${importVar} ${name}`;
 						const runtimeCondition = dep.weak
 							? false
@@ -1228,17 +1434,17 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 							this.getReexportFragment(
 								module,
 								"reexport safe",
-								moduleGraph.getExportsInfo(module).getUsedName(name, runtime),
+								selfExportsInfo.getUsedName(name, runtime),
 								importVar,
-								moduleGraph
-									.getExportsInfo(importedModule)
-									.getUsedName(ids, runtime),
-								runtimeRequirements
+								importedExportsInfo.getUsedName(ids, runtime),
+								runtimeRequirements,
+								ids
 							)
 						);
 					}
 				}
 				break;
+			}
 
 			case "dynamic-reexport": {
 				const ignored = mode.hidden
@@ -1293,12 +1499,14 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	}
 
 	/**
+	 * Gets reexport fragment.
 	 * @param {Module} module the current module
 	 * @param {string} comment comment
 	 * @param {UsedName} key key
 	 * @param {string} name name
 	 * @param {UsedName | null} valueKey value key
 	 * @param {RuntimeRequirements} runtimeRequirements runtime requirements
+	 * @param {string[]=} ids original ids on the imported side (for inline-rendering comment)
 	 * @returns {HarmonyExportInitFragment} harmony export init fragment
 	 */
 	getReexportFragment(
@@ -1307,9 +1515,10 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 		key,
 		name,
 		valueKey,
-		runtimeRequirements
+		runtimeRequirements,
+		ids
 	) {
-		const returnValue = this.getReturnValue(name, valueKey);
+		const returnValue = this.getReturnValue(name, valueKey, ids);
 
 		runtimeRequirements.add(RuntimeGlobals.exports);
 		runtimeRequirements.add(RuntimeGlobals.definePropertyGetters);
@@ -1322,6 +1531,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	}
 
 	/**
+	 * Gets reexport fake namespace object fragments.
 	 * @param {Module} module module
 	 * @param {UsedName} key key
 	 * @param {string} name name
@@ -1361,6 +1571,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	}
 
 	/**
+	 * Gets reexport deferred namespace object fragments.
 	 * @param {Module} module module
 	 * @param {ChunkGraph} chunkGraph chunkGraph
 	 * @param {UsedName} key key
@@ -1402,6 +1613,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	}
 
 	/**
+	 * Gets conditional reexport statement.
 	 * @param {Module} module module
 	 * @param {string} key key
 	 * @param {string} name name
@@ -1437,11 +1649,13 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	}
 
 	/**
+	 * Returns value.
 	 * @param {string} name name
-	 * @param {null | false | string | string[]} valueKey value key
+	 * @param {null | false | string | string[] | import("../optimize/InlineExports").InlinedUsedName} valueKey value key
+	 * @param {string[]=} ids original imported ids (for inline-rendering comment)
 	 * @returns {string | undefined} value
 	 */
-	getReturnValue(name, valueKey) {
+	getReturnValue(name, valueKey, ids) {
 		if (valueKey === null) {
 			return `${name}_default.a`;
 		}
@@ -1454,7 +1668,14 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 			return "/* unused export */ undefined";
 		}
 
-		return `${name}${propertyAccess(valueKey)}`;
+		if (valueKey instanceof InlinedUsedName) {
+			// Re-export forwards the source export's inlined literal as its own runtime value
+			return valueKey.render(
+				Template.toNormalComment(`inlined export ${propertyAccess(ids || [])}`)
+			);
+		}
+
+		return `${name}${propertyAccess(Array.isArray(valueKey) ? valueKey : [valueKey])}`;
 	}
 };
 
@@ -1465,6 +1686,7 @@ class HarmonyStarExportsList {
 	}
 
 	/**
+	 * Processes the provided dep.
 	 * @param {HarmonyExportImportedSpecifierDependency} dep dependency
 	 * @returns {void}
 	 */
@@ -1477,7 +1699,8 @@ class HarmonyStarExportsList {
 	}
 
 	/**
-	 * @param {ObjectSerializerContext} context context
+	 * Serializes this instance into the provided serializer context.
+	 * @param {StarListSerializerContext} context context
 	 */
 	serialize({ write, setCircularReference }) {
 		setCircularReference(this);
@@ -1485,7 +1708,8 @@ class HarmonyStarExportsList {
 	}
 
 	/**
-	 * @param {ObjectDeserializerContext} context context
+	 * Restores this instance from the provided deserializer context.
+	 * @param {StarListDeserializerContext} context context
 	 */
 	deserialize({ read, setCircularReference }) {
 		setCircularReference(this);