@depup/webpack 5.111.1-depup.2 → 5.112.0-depup.0

package/lib/dependencies/{HarmonyImportSideEffectDependency.js → esm/ESMImportSideEffectDependency.js}

@@ -5,27 +5,26 @@
 
 "use strict";
 
-const Dependency = require("../Dependency");
-const InitFragment = require("../InitFragment");
-const Module = require("../Module");
-const { JAVASCRIPT_TYPE } = require("../ModuleSourceTypeConstants");
-const makeSerializable = require("../util/makeSerializable");
-const HarmonyImportDependency = require("./HarmonyImportDependency");
-const { ImportPhaseUtils } = require("./ImportPhase");
+const Module = require("../../module/Module");
+const { JAVASCRIPT_TYPE } = require("../../module/ModuleSourceTypeConstants");
+const InitFragment = require("../../template/InitFragment");
+const makeSerializable = require("../../util/makeSerializable");
+const { ImportPhaseUtils } = require("../core/ImportPhase");
+const ESMImportDependency = require("./ESMImportDependency");
 
-const { ExportPresenceModes } = HarmonyImportDependency;
+const { ExportPresenceModes } = ESMImportDependency;
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import { GetConditionFn, LazyUntil } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import { ConnectionState } from "../ModuleGraphConnection" */
-/** @import { ImportAttributes } from "../javascript/JavascriptParser" */
-/** @import { ImportPhaseType } from "./ImportPhase" */
-/** @import { Ids, ExportPresenceMode } from "./HarmonyImportDependency" */
-/** @import { JavascriptModuleBuildMeta } from "../javascript/JavascriptModule" */
-/** @import WebpackError from "../errors/WebpackError" */
-/** @import { ObjectSerializerContext, ObjectDeserializerContext } from "../serialization/ObjectMiddleware" */
+/** @import Dependency, { GetConditionFn, DependencyKinds } from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import { ConnectionState } from "../../graph/ModuleGraphConnection" */
+/** @import { ImportAttributes } from "../../javascript/JavascriptParser" */
+/** @import { ImportPhaseType } from "../core/ImportPhase" */
+/** @import { Ids, ExportPresenceMode } from "./ESMImportDependency" */
+/** @import { JavascriptModuleBuildMeta } from "../../javascript/JavascriptModule" */
+/** @import WebpackError from "../../errors/WebpackError" */
+/** @import { ObjectSerializerContext, ObjectDeserializerContext } from "../../serialization/ObjectMiddleware" */
 
 /**
  * Specifiers the module declares but never reads, with the presence level to
@@ -36,9 +35,9 @@ const { ExportPresenceModes } = HarmonyImportDependency;
  * @property {[Ids, string][]} specifiers
  */
 
-class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
+class ESMImportSideEffectDependency extends ESMImportDependency {
 	/**
-	 * Creates an instance of HarmonyImportSideEffectDependency.
+	 * Creates an instance of ESMImportSideEffectDependency.
 	 * @param {string} request the request string
 	 * @param {number} sourceOrder source order
 	 * @param {ImportPhaseType} phase import phase
@@ -48,6 +47,8 @@ class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
 		super(request, sourceOrder, phase, attributes);
 		/** @type {UnusedSpecifiers | undefined} */
 		this.unusedSpecifiers = undefined;
+		/** @type {string[] | undefined} */
+		this.namespaceSpecifiers = undefined;
 	}
 
 	get type() {
@@ -139,6 +140,7 @@ class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
 	 */
 	serialize(context) {
 		context.write(this.unusedSpecifiers);
+		context.write(this.namespaceSpecifiers);
 		super.serialize(context);
 	}
 
@@ -148,6 +150,7 @@ class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
 	 */
 	deserialize(context) {
 		this.unusedSpecifiers = context.read();
+		this.namespaceSpecifiers = context.read();
 		super.deserialize(context);
 	}
 
@@ -155,18 +158,10 @@ class HarmonyImportSideEffectDependency 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() {
+	get forwardId() {
 		return null;
 	}
 
-	/**
-	 * 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 Dependency.LAZY_UNTIL_REQUEST;
-	}
-
 	/**
 	 * Returns function to determine if the connection is active.
 	 * @param {ModuleGraph} moduleGraph module graph
@@ -192,13 +187,15 @@ class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
 	}
 }
 
-makeSerializable(
-	HarmonyImportSideEffectDependency,
+makeSerializable(ESMImportSideEffectDependency, [
+	"webpack/lib/dependencies/esm/ESMImportSideEffectDependency",
+	// TODO in the next major release: remove, it restores the packs written
+	// under the name the file had before the ESM rename
 	"webpack/lib/dependencies/HarmonyImportSideEffectDependency"
-);
+]);
 
-HarmonyImportSideEffectDependency.Template = class HarmonyImportSideEffectDependencyTemplate extends (
-	HarmonyImportDependency.Template
+ESMImportSideEffectDependency.Template = class ESMImportSideEffectDependencyTemplate extends (
+	ESMImportDependency.Template
 ) {
 	/**
 	 * Applies the plugin by registering its hooks on the compiler.
@@ -220,9 +217,7 @@ HarmonyImportSideEffectDependency.Template = class HarmonyImportSideEffectDepend
 
 		if (concatenationScope && concatenationScope.isModuleInScope(module)) {
 			if (concatenationScope.isModuleWrapped(module)) {
-				const dep = /** @type {HarmonyImportSideEffectDependency} */ (
-					dependency
-				);
+				const dep = /** @type {ESMImportSideEffectDependency} */ (dependency);
 				if (ImportPhaseUtils.isDefer(dep.phase)) return;
 				const connection = moduleGraph.getConnection(dep);
 				if (!connection || !connection.isTargetActive(runtime)) return;
@@ -236,7 +231,7 @@ HarmonyImportSideEffectDependency.Template = class HarmonyImportSideEffectDepend
 								moduleExportsAccess: true,
 								asiSafe: true
 							})};\n`,
-							InitFragment.STAGE_HARMONY_IMPORTS,
+							InitFragment.STAGE_ESM_IMPORTS,
 							/** @type {number} */ (dep.sourceOrder),
 							`cjs eager init ${module.identifier()}`
 						)
@@ -248,7 +243,56 @@ HarmonyImportSideEffectDependency.Template = class HarmonyImportSideEffectDepend
 			return;
 		}
 		super.apply(dependency, source, templateContext);
+		this._recordNamespaceBindings(
+			/** @type {ESMImportSideEffectDependency} */ (dependency),
+			templateContext,
+			module
+		);
+	}
+
+	/**
+	 * Records what each namespace this import declares reads in the generated
+	 * code, for the source map `scopes` field; every other binding is named by its
+	 * reference sites. Only a module whose exports are a namespace is answered by
+	 * the import variable, so every interop shape is left to them.
+	 * @param {ESMImportSideEffectDependency} dep dependency
+	 * @param {DependencyTemplateContext} templateContext the context object
+	 * @param {Module} importedModule the imported module
+	 * @returns {void}
+	 */
+	_recordNamespaceBindings(dep, templateContext, importedModule) {
+		const { moduleGraph, runtime, module, dependencyTemplates } =
+			templateContext;
+		const namespaces = dep.namespaceSpecifiers;
+		if (
+			namespaces === undefined ||
+			!importedModule ||
+			ImportPhaseUtils.isDefer(dep.phase) ||
+			ImportPhaseUtils.isSource(dep.phase) ||
+			!dependencyTemplates.importBindingScopes
+		) {
+			return;
+		}
+		// An import the build left out declares nothing to read the binding from.
+		const connection = moduleGraph.getConnection(dep);
+		if (connection && !connection.isTargetActive(runtime)) return;
+		const exportsType = importedModule.getExportsType(
+			moduleGraph,
+			/** @type {JavascriptModuleBuildMeta} */
+			(/** @type {Module} */ (module).buildMeta).strictHarmonyModule
+		);
+		if (exportsType !== "namespace") return;
+		const importVar = dep.getImportVar(moduleGraph);
+		for (const name of namespaces) {
+			this._recordImportBinding(templateContext, name, importVar);
+		}
 	}
 };
 
-module.exports = HarmonyImportSideEffectDependency;
+/** @type {Set<keyof DependencyKinds>} */
+ESMImportSideEffectDependency.KINDS = new Set([
+	...ESMImportDependency.KINDS,
+	"esm-side-effect-import"
+]);
+
+module.exports = ESMImportSideEffectDependency;

package/lib/dependencies/{HarmonyImportSpecifierDependency.js → esm/ESMImportSpecifierDependency.js}

@@ -5,69 +5,69 @@
 
 "use strict";
 
-const Dependency = require("../Dependency");
-const InitFragment = require("../InitFragment");
-const Template = require("../Template");
+const Dependency = require("../../graph/Dependency");
 const {
-	InlinedUsedName,
 	isExportInlined,
 	isInlineEnabled,
-	isInlineExportsEnabled
-} = require("../optimize/InlineExports");
+	isInlineExportsEnabled,
+	isInlinedUsedName
+} = require("../../optimize/InlineExports");
 const {
 	getDependencyUsedByExportsCondition
-} = require("../optimize/InnerGraph");
-const { getTrimmedIdsAndRange } = require("../util/chainedImports");
-const makeSerializable = require("../util/makeSerializable");
-const { propertyAccess } = require("../util/property");
-const traverseDestructuringAssignmentProperties = require("../util/traverseDestructuringAssignmentProperties");
-const HarmonyImportDependency = require("./HarmonyImportDependency");
-const HarmonyImportGuard = require("./HarmonyImportGuard");
-const { ImportPhaseUtils } = require("./ImportPhase");
+} = require("../../optimize/InnerGraph");
+const InitFragment = require("../../template/InitFragment");
+const Template = require("../../template/Template");
+const makeSerializable = require("../../util/makeSerializable");
+const { propertyAccess } = require("../../util/property");
+const { ImportPhaseUtils } = require("../core/ImportPhase");
+const { getTrimmedIdsAndRange } = require("../helpers/chainedImports");
+const traverseDestructuringAssignmentProperties = require("../helpers/traverseDestructuringAssignmentProperties");
+const ESMImportDependency = require("./ESMImportDependency");
+const ESMImportGuard = require("./ESMImportGuard");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import { GetConditionFn, ReferencedExports, UpdateHashContext } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import Module, { BuildMeta } from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import Hash from "../util/Hash" */
+/** @import { GetConditionFn, ReferencedExports, UpdateHashContext, DependencyKinds } from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import Module, { BuildMeta } from "../../module/Module" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import Hash from "../../util/Hash" */
 /**
  * @import ModuleGraphConnection, {
  * 	ConnectionState
- * } from "../ModuleGraphConnection"
+ * } from "../../graph/ModuleGraphConnection"
  */
-/** @import WebpackError from "../errors/WebpackError" */
+/** @import WebpackError from "../../errors/WebpackError" */
 /**
  * @import {
  * 	DestructuringAssignmentProperties,
  * 	ImportAttributes,
  * 	Range
- * } from "../javascript/JavascriptParser"
+ * } from "../../javascript/JavascriptParser"
  */
-/** @import { UsedByExports } from "../optimize/InnerGraph" */
+/** @import { UsedByExports } from "../../optimize/InnerGraph" */
 /**
  * @import {
  * 	ObjectDeserializerContext,
  * 	ObjectSerializerContext
- * } from "../serialization/ObjectMiddleware"
+ * } from "../../serialization/ObjectMiddleware"
  */
-/** @import { RuntimeSpec } from "../util/runtime" */
-/** @import { IdRanges } from "../util/chainedImports" */
-/** @import { ExportPresenceMode } from "./HarmonyImportDependency" */
-/** @typedef {HarmonyImportDependency.Ids} Ids */
-/** @import { ImportPhaseType } from "./ImportPhase" */
-/** @import { DependencyGuard } from "./HarmonyImportGuard" */
+/** @import { RuntimeSpec } from "../../util/runtime" */
+/** @import { IdRanges } from "../helpers/chainedImports" */
+/** @import { ExportPresenceMode } from "./ESMImportDependency" */
+/** @typedef {ESMImportDependency.Ids} Ids */
+/** @import { ImportPhaseType } from "../core/ImportPhase" */
+/** @import { DependencyGuard } from "./ESMImportGuard" */
 /**
  * @import {
  * 	JavascriptModuleBuildMeta
- * } from "../javascript/JavascriptModule"
+ * } from "../../javascript/JavascriptModule"
  */
 
 const idsSymbol = /** @type {symbol} */ (
-	Symbol("HarmonyImportSpecifierDependency.ids")
+	Symbol("ESMImportSpecifierDependency.ids")
 );
 
-const { ExportPresenceModes } = HarmonyImportDependency;
+const { ExportPresenceModes } = ESMImportDependency;
 
 /**
  * One condition closure per module graph and variant rather than per dependency.
@@ -79,14 +79,9 @@ const { ExportPresenceModes } = HarmonyImportDependency;
  */
 const conditionsByModuleGraph = new WeakMap();
 
-class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
-	// read by `HarmonyImportGuard` in place of `instanceof`, which would cycle
-	get isHarmonyImportSpecifier() {
-		return true;
-	}
-
+class ESMImportSpecifierDependency extends ESMImportDependency {
 	/**
-	 * Creates an instance of HarmonyImportSpecifierDependency.
+	 * Creates an instance of ESMImportSpecifierDependency.
 	 * @param {string} request request
 	 * @param {number} sourceOrder source order
 	 * @param {Ids} ids ids
@@ -106,7 +101,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		exportPresenceMode,
 		phase,
 		attributes,
-		idRanges // TODO webpack 6 make this non-optional. It must always be set to properly trim ids.
+		idRanges // TODO in the next major release: make this non-optional. It must always be set to properly trim ids.
 	) {
 		super(request, sourceOrder, phase, attributes);
 		/** @type {Ids} */
@@ -138,7 +133,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		this.assignment = undefined;
 	}
 
-	// TODO webpack 6 remove
+	// TODO in the next major release: remove
 	/**
 	 * Returns id.
 	 * @deprecated
@@ -147,7 +142,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		throw new Error("id was renamed to ids and type changed to string[]");
 	}
 
-	// TODO webpack 6 remove
+	// TODO in the next major release: remove
 	/**
 	 * Returns id.
 	 * @deprecated
@@ -156,7 +151,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		throw new Error("id was renamed to ids and type changed to string[]");
 	}
 
-	// TODO webpack 6 remove
+	// TODO in the next major release: remove
 	/**
 	 * Updates id.
 	 * @deprecated
@@ -173,7 +168,7 @@ class HarmonyImportSpecifierDependency 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() {
+	get forwardId() {
 		return this.ids.length > 0 ? this.ids[0] : true;
 	}
 
@@ -233,7 +228,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		if (cached !== undefined) return cached;
 		/** @type {GetConditionFn} */
 		const condition = (connection, runtime) => {
-			const dep = /** @type {HarmonyImportSpecifierDependency} */ (
+			const dep = /** @type {ESMImportSpecifierDependency} */ (
 				connection.dependency
 			);
 			if (usedByExportsCondition !== null) {
@@ -255,7 +250,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 			const guards = dep.branchGuards;
 			if (
 				guards !== undefined &&
-				HarmonyImportGuard.isDeadByGuards(guards, moduleGraph, runtime)
+				ESMImportGuard.isDeadByGuards(guards, moduleGraph, runtime)
 			) {
 				return false;
 			}
@@ -282,7 +277,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		const exportsInfo = moduleGraph.getExportsInfo(module);
 		if (!exportsInfo.hasInlinedUsedName(ids, runtime)) return;
 		const usedName = exportsInfo.getUsedName(ids, runtime);
-		if (usedName instanceof InlinedUsedName) {
+		if (isInlinedUsedName(usedName)) {
 			usedName.updateHash(hash);
 		}
 	}
@@ -504,13 +499,15 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	}
 }
 
-makeSerializable(
-	HarmonyImportSpecifierDependency,
+makeSerializable(ESMImportSpecifierDependency, [
+	"webpack/lib/dependencies/esm/ESMImportSpecifierDependency",
+	// TODO in the next major release: remove, it restores the packs written
+	// under the name the file had before the ESM rename
 	"webpack/lib/dependencies/HarmonyImportSpecifierDependency"
-);
+]);
 
-HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependencyTemplate extends (
-	HarmonyImportDependency.Template
+ESMImportSpecifierDependency.Template = class ESMImportSpecifierDependencyTemplate extends (
+	ESMImportDependency.Template
 ) {
 	/**
 	 * Applies the plugin by registering its hooks on the compiler.
@@ -520,7 +517,7 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 	 * @returns {void}
 	 */
 	apply(dependency, source, templateContext) {
-		const dep = /** @type {HarmonyImportSpecifierDependency} */ (dependency);
+		const dep = /** @type {ESMImportSpecifierDependency} */ (dependency);
 		const { moduleGraph, runtime, initFragments } = templateContext;
 		const connection = moduleGraph.getConnection(dep);
 		const ids = dep.getIds(moduleGraph);
@@ -533,7 +530,7 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 			initFragments.push(
 				new InitFragment(
 					`/* unused harmony import specifier */ var ${dep.name};\n`,
-					InitFragment.STAGE_HARMONY_IMPORTS,
+					InitFragment.STAGE_ESM_IMPORTS,
 					0,
 					`unused import specifier ${dep.name}`
 				)
@@ -608,7 +605,7 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 				const used = destructuredExportsInfo.getUsedName(concatedIds, runtime);
 				if (!used) {
 					return;
-				} else if (used instanceof InlinedUsedName) {
+				} else if (isInlinedUsedName(used)) {
 					throw new Error(
 						`Should not inline for destructuring name ${concatedIds.join(".")}`
 					);
@@ -633,7 +630,7 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 
 	/**
 	 * Returns generated code.
-	 * @param {HarmonyImportSpecifierDependency} dep dependency
+	 * @param {ESMImportSpecifierDependency} dep dependency
 	 * @param {ReplaceSource} source source
 	 * @param {DependencyTemplateContext} templateContext context
 	 * @param {Ids} ids ids
@@ -722,11 +719,49 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 					!dep.referencedPropertiesInDestructuring &&
 					!ImportPhaseUtils.isDefer(dep.phase)
 			});
+
+			// Only a bare reference reads exactly what the binding names.
+			if (
+				dep.directImport === true &&
+				templateContext.dependencyTemplates.importBindingScopes
+			) {
+				// A call site drops the `this` a member access would bind, which is
+				// a statement's concern rather than the binding's value.
+				const value = dep.call
+					? runtimeTemplate.exportFromImport({
+							moduleGraph,
+							module: /** @type {Module} */ (moduleGraph.getModule(dep)),
+							chunkGraph: templateContext.chunkGraph,
+							request: dep.request,
+							exportName: ids,
+							originModule: module,
+							asiSafe: true,
+							isCall: false,
+							callContext: false,
+							defaultInterop: true,
+							importVar: dep.getImportVar(moduleGraph),
+							initFragments,
+							runtime,
+							runtimeRequirements,
+							dependency: dep,
+							mangleableNamespace: false
+						})
+					: exportExpr;
+				if (!value.startsWith(";")) {
+					this._recordImportBinding(templateContext, dep.name, value);
+				}
+			}
 		}
 		return exportExpr;
 	}
 };
 
-HarmonyImportSpecifierDependency.idsSymbol = idsSymbol;
+ESMImportSpecifierDependency.idsSymbol = idsSymbol;
+
+/** @type {Set<keyof DependencyKinds>} */
+ESMImportSpecifierDependency.KINDS = new Set([
+	...ESMImportDependency.KINDS,
+	"esm-import-specifier"
+]);
 
-module.exports = HarmonyImportSpecifierDependency;
+module.exports = ESMImportSpecifierDependency;