refactor: deduplicate export presence logic in Harmony dependency classes (#20521)

kartikeyg0104 · web-flow · commit 8a01dfefc865 · 2026-02-25T23:44:25.000+03:00
diff --git a/.prettierignore b/.prettierignore
@@ -45,3 +45,7 @@ examples/**
 !examples/**/test.filter.js
 
 .vscode/**/*.*
+
+# Ignore local working files
+pr.md
+issue.md
diff --git a/lib/dependencies/HarmonyExportDependencyParserPlugin.js b/lib/dependencies/HarmonyExportDependencyParserPlugin.js
@@ -39,14 +39,10 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 	 */
 	constructor(options) {
 		this.options = options;
-		this.exportPresenceMode =
-			options.reexportExportsPresence !== undefined
-				? ExportPresenceModes.fromUserOption(options.reexportExportsPresence)
-				: options.exportsPresence !== undefined
-					? ExportPresenceModes.fromUserOption(options.exportsPresence)
-					: options.strictExportPresence
-						? ExportPresenceModes.ERROR
-						: ExportPresenceModes.AUTO;
+		this.exportPresenceMode = ExportPresenceModes.resolveFromOptions(
+			options.reexportExportsPresence,
+			options
+		);
 	}
 
 	/**
diff --git a/lib/dependencies/HarmonyImportDependency.js b/lib/dependencies/HarmonyImportDependency.js
@@ -53,9 +53,38 @@ const ExportPresenceModes = {
 			default:
 				throw new Error(`Invalid export presence value ${str}`);
 		}
+	},
+	/**
+	 * Resolve export presence mode from parser options with a specific key and shared fallbacks.
+	 * @param {string | false | undefined} specificValue the type-specific option value (e.g. importExportsPresence or reexportExportsPresence)
+	 * @param {import("../../declarations/WebpackOptions").JavascriptParserOptions} options parser options
+	 * @returns {ExportPresenceMode} resolved mode
+	 */
+	resolveFromOptions(specificValue, options) {
+		if (specificValue !== undefined) {
+			return ExportPresenceModes.fromUserOption(specificValue);
+		}
+		if (options.exportsPresence !== undefined) {
+			return ExportPresenceModes.fromUserOption(options.exportsPresence);
+		}
+		return options.strictExportPresence
+			? ExportPresenceModes.ERROR
+			: ExportPresenceModes.AUTO;
 	}
 };
 
+/**
+ * Get the non-optional leading part of a member chain.
+ * @param {string[]} members members
+ * @param {boolean[]} membersOptionals optionality for each member
+ * @returns {string[]} the non-optional prefix
+ */
+const getNonOptionalPart = (members, membersOptionals) => {
+	let i = 0;
+	while (i < members.length && membersOptionals[i] === false) i++;
+	return i !== members.length ? members.slice(0, i) : members;
+};
+
 /** @typedef {string[]} Ids */
 
 class HarmonyImportDependency extends ModuleDependency {
@@ -427,3 +456,4 @@ HarmonyImportDependency.Template = class HarmonyImportDependencyTemplate extends
 };
 
 module.exports.ExportPresenceModes = ExportPresenceModes;
+module.exports.getNonOptionalPart = getNonOptionalPart;
diff --git a/lib/dependencies/HarmonyImportDependencyParserPlugin.js b/lib/dependencies/HarmonyImportDependencyParserPlugin.js
@@ -18,7 +18,10 @@ const HarmonyAcceptDependency = require("./HarmonyAcceptDependency");
 const HarmonyAcceptImportDependency = require("./HarmonyAcceptImportDependency");
 const HarmonyEvaluatedImportSpecifierDependency = require("./HarmonyEvaluatedImportSpecifierDependency");
 const HarmonyExports = require("./HarmonyExports");
-const { ExportPresenceModes } = require("./HarmonyImportDependency");
+const {
+	ExportPresenceModes,
+	getNonOptionalPart
+} = require("./HarmonyImportDependency");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
 const { ImportPhaseUtils, createGetImportPhase } = require("./ImportPhase");
@@ -82,14 +85,10 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 	constructor(options) {
 		this.options = options;
 		/** @type {ExportPresenceMode} */
-		this.exportPresenceMode =
-			options.importExportsPresence !== undefined
-				? ExportPresenceModes.fromUserOption(options.importExportsPresence)
-				: options.exportsPresence !== undefined
-					? ExportPresenceModes.fromUserOption(options.exportsPresence)
-					: options.strictExportPresence
-						? ExportPresenceModes.ERROR
-						: ExportPresenceModes.AUTO;
+		this.exportPresenceMode = ExportPresenceModes.resolveFromOptions(
+			options.importExportsPresence,
+			options
+		);
 		this.strictThisContextOnImports = options.strictThisContextOnImports;
 	}
 
@@ -119,17 +118,6 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 	apply(parser) {
 		const getImportPhase = createGetImportPhase(this.options.deferImport);
 
-		/**
-		 * @param {Members} members members
-		 * @param {MembersOptionals} membersOptionals members Optionals
-		 * @returns {Ids} a non optional part
-		 */
-		function getNonOptionalPart(members, membersOptionals) {
-			let i = 0;
-			while (i < members.length && membersOptionals[i] === false) i++;
-			return i !== members.length ? members.slice(0, i) : members;
-		}
-
 		/**
 		 * @param {MemberExpression} node member expression
 		 * @param {number} count count
diff --git a/lib/dependencies/ImportParserPlugin.js b/lib/dependencies/ImportParserPlugin.js
@@ -14,6 +14,7 @@ const {
 } = require("../javascript/JavascriptParser");
 const traverseDestructuringAssignmentProperties = require("../util/traverseDestructuringAssignmentProperties");
 const ContextDependencyHelpers = require("./ContextDependencyHelpers");
+const { getNonOptionalPart } = require("./HarmonyImportDependency");
 const ImportContextDependency = require("./ImportContextDependency");
 const ImportDependency = require("./ImportDependency");
 const ImportEagerDependency = require("./ImportEagerDependency");
@@ -178,17 +179,6 @@ class ImportParserPlugin {
 	 * @returns {void}
 	 */
 	apply(parser) {
-		/**
-		 * @param {Members} members members
-		 * @param {MembersOptionals} membersOptionals members Optionals
-		 * @returns {string[]} a non optional part
-		 */
-		function getNonOptionalPart(members, membersOptionals) {
-			let i = 0;
-			while (i < members.length && membersOptionals[i] === false) i++;
-			return i !== members.length ? members.slice(0, i) : members;
-		}
-
 		parser.hooks.collectDestructuringAssignmentProperties.tap(
 			PLUGIN_NAME,
 			(expr) => {
diff --git a/test/configCases/compiletime/exports-presence-overrides/eee/index.js b/test/configCases/compiletime/exports-presence-overrides/eee/index.js
@@ -0,0 +1,4 @@
+import { NoNo } from "../stub";
+export { NotHere } from "../stub";
+
+export default `${typeof NoNo}`;
diff --git a/test/configCases/compiletime/exports-presence-overrides/errors.js b/test/configCases/compiletime/exports-presence-overrides/errors.js
@@ -0,0 +1,12 @@
+"use strict";
+
+module.exports = [
+	{
+		moduleName: /eee/,
+		message: /NoNo.+not found/
+	},
+	{
+		moduleName: /fff/,
+		message: /NotHere.+not found/
+	}
+];
diff --git a/test/configCases/compiletime/exports-presence-overrides/fff/index.js b/test/configCases/compiletime/exports-presence-overrides/fff/index.js
@@ -0,0 +1,4 @@
+import { NoNo } from "../stub";
+export { NotHere } from "../stub";
+
+export default `${typeof NoNo}`;
diff --git a/test/configCases/compiletime/exports-presence-overrides/index.js b/test/configCases/compiletime/exports-presence-overrides/index.js
@@ -0,0 +1,7 @@
+import eee from "./eee/index.js";
+import fff from "./fff/index.js";
+
+it("should resolve presence overrides correctly", () => {
+	expect(eee).toBe("undefined");
+	expect(fff).toBe("undefined");
+});
diff --git a/test/configCases/compiletime/exports-presence-overrides/stub.js b/test/configCases/compiletime/exports-presence-overrides/stub.js
@@ -0,0 +1,3 @@
+const foo = "bar";
+
+export default foo;
diff --git a/test/configCases/compiletime/exports-presence-overrides/warnings.js b/test/configCases/compiletime/exports-presence-overrides/warnings.js
@@ -0,0 +1,8 @@
+"use strict";
+
+module.exports = [
+	{
+		moduleName: /eee/,
+		message: /NotHere.+not found/
+	}
+];
diff --git a/test/configCases/compiletime/exports-presence-overrides/webpack.config.js b/test/configCases/compiletime/exports-presence-overrides/webpack.config.js
@@ -0,0 +1,34 @@
+"use strict";
+
+/**
+ * Tests that importExportsPresence / reexportExportsPresence correctly override
+ * exportsPresence and strictExportPresence via resolveFromOptions.
+ * @type {import("../../../../").Configuration}
+ */
+module.exports = {
+	mode: "production",
+	module: {
+		rules: [
+			{
+				// importExportsPresence="error" overrides exportsPresence="warn"
+				// reexportExportsPresence="warn" overrides exportsPresence="warn"
+				test: /eee/,
+				parser: {
+					exportsPresence: "warn",
+					importExportsPresence: "error",
+					reexportExportsPresence: "warn"
+				}
+			},
+			{
+				// importExportsPresence=false silences despite strictExportPresence
+				// reexportExportsPresence="error" overrides strictExportPresence
+				test: /fff/,
+				parser: {
+					strictExportPresence: true,
+					importExportsPresence: false,
+					reexportExportsPresence: "error"
+				}
+			}
+		]
+	}
+};
diff --git a/types.d.ts b/types.d.ts
@@ -6526,7 +6526,18 @@ declare class HarmonyImportDependency extends ModuleDependency {
 		AUTO: ExportPresenceMode;
 		ERROR: ExportPresenceMode;
 		fromUserOption(str: string | false): ExportPresenceMode;
+		/**
+		 * Resolve export presence mode from parser options with a specific key and shared fallbacks.
+		 */
+		resolveFromOptions(
+			specificValue: undefined | string | false,
+			options: JavascriptParserOptions
+		): ExportPresenceMode;
 	};
+	static getNonOptionalPart: (
+		members: string[],
+		membersOptionals: boolean[]
+	) => string[];
 	static NO_EXPORTS_REFERENCED: string[][];
 	static EXPORTS_OBJECT_REFERENCED: string[][];
 	static isLowPriorityDependency(dependency: Dependency): boolean;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+const foo = "bar";`
	`2`	`+`
	`3`	`+export default foo;`