Revert "Revert "Merge pull request #12278 from xtuc/sven/import-asser…

…tions""

This reverts commit 61946b7.

declarations.d.ts

@@ -371,6 +371,13 @@ declare module "browserslist" {
 	export = browserslist;
 }
 
+// TODO remove that when @types/estree is updated
+interface ImportAttributeNode {
+	type: "ImportAttribute";
+	key: import("estree").Identifier | import("estree").Literal;
+	value: import("estree").Literal;
+}
+
 type TODO = any;
 
 type RecursiveArrayOrRecord<T> =

declarations/WebpackOptions.d.ts

@@ -1316,6 +1316,12 @@ export interface ModuleOptions {
  * A rule description with conditions and effects for modules.
  */
 export interface RuleSetRule {
+	/**
+	 * Match on import assertions of the dependency.
+	 */
+	assert?: {
+		[k: string]: RuleSetConditionOrConditions;
+	};
 	/**
 	 * Match the child compiler name.
 	 */

lib/NormalModule.js

@@ -293,9 +293,13 @@ class NormalModule extends Module {
 	 */
 	identifier() {
 		if (this.layer === null) {
-			return this.request;
+			if (this.type === "javascript/auto") {
+				return this.request;
+			} else {
+				return `${this.type}|${this.request}`;
+			}
 		} else {
-			return `${this.request}|${this.layer}`;
+			return `${this.type}|${this.request}|${this.layer}`;
 		}
 	}
 

lib/NormalModuleFactory.js

@@ -20,7 +20,7 @@ const ModuleGraph = require("./ModuleGraph");
 const NormalModule = require("./NormalModule");
 const BasicEffectRulePlugin = require("./rules/BasicEffectRulePlugin");
 const BasicMatcherRulePlugin = require("./rules/BasicMatcherRulePlugin");
-const DescriptionDataMatcherRulePlugin = require("./rules/DescriptionDataMatcherRulePlugin");
+const ObjectMatcherRulePlugin = require("./rules/ObjectMatcherRulePlugin");
 const RuleSetCompiler = require("./rules/RuleSetCompiler");
 const UseEffectRulePlugin = require("./rules/UseEffectRulePlugin");
 const LazySet = require("./util/LazySet");
@@ -44,6 +44,7 @@ const { parseResource } = require("./util/identifier");
  * @property {ModuleFactoryCreateData["resolveOptions"]} resolveOptions
  * @property {string} context
  * @property {string} request
+ * @property {Record<string, any> | undefined} assertions
  * @property {ModuleDependency[]} dependencies
  * @property {Object} createData
  * @property {LazySet<string>} fileDependencies
@@ -182,7 +183,8 @@ const ruleSetCompiler = new RuleSetCompiler([
 	new BasicMatcherRulePlugin("issuer"),
 	new BasicMatcherRulePlugin("compiler"),
 	new BasicMatcherRulePlugin("issuerLayer"),
-	new DescriptionDataMatcherRulePlugin(),
+	new ObjectMatcherRulePlugin("assert", "assertions"),
+	new ObjectMatcherRulePlugin("descriptionData"),
 	new BasicEffectRulePlugin("type"),
 	new BasicEffectRulePlugin("sideEffects"),
 	new BasicEffectRulePlugin("parser"),
@@ -339,6 +341,7 @@ class NormalModuleFactory extends ModuleFactory {
 					context,
 					dependencies,
 					request,
+					assertions,
 					resolveOptions,
 					fileDependencies,
 					missingDependencies,
@@ -447,6 +450,7 @@ class NormalModuleFactory extends ModuleFactory {
 						resourceQuery: resourceDataForRules.query,
 						resourceFragment: resourceDataForRules.fragment,
 						scheme,
+						assertions,
 						mimetype: matchResourceData ? "" : resourceData.data.mimetype || "",
 						dependency: dependencyType,
 						descriptionData: matchResourceData
@@ -694,6 +698,7 @@ class NormalModuleFactory extends ModuleFactory {
 		const resolveOptions = data.resolveOptions || EMPTY_RESOLVE_OPTIONS;
 		const dependency = dependencies[0];
 		const request = dependency.request;
+		const assertions = dependency.assertions;
 		const contextInfo = data.contextInfo;
 		const fileDependencies = new LazySet();
 		const missingDependencies = new LazySet();
@@ -704,6 +709,7 @@ class NormalModuleFactory extends ModuleFactory {
 			resolveOptions,
 			context,
 			request,
+			assertions,
 			dependencies,
 			fileDependencies,
 			missingDependencies,

lib/config/defaults.js

@@ -482,18 +482,6 @@ const applyModuleDefaults = (
 					or: ["text/javascript", "application/javascript"]
 				},
 				...esm
-			},
-			{
-				dependency: "url",
-				oneOf: [
-					{
-						scheme: /^data$/,
-						type: "asset/inline"
-					},
-					{
-						type: "asset/resource"
-					}
-				]
 			}
 		];
 		if (asyncWebAssembly) {
@@ -541,6 +529,24 @@ const applyModuleDefaults = (
 				...wasm
 			});
 		}
+		rules.push(
+			{
+				dependency: "url",
+				oneOf: [
+					{
+						scheme: /^data$/,
+						type: "asset/inline"
+					},
+					{
+						type: "asset/resource"
+					}
+				]
+			},
+			{
+				assert: { type: "json" },
+				type: "json"
+			}
+		);
 		return rules;
 	});
 };

lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -12,7 +12,8 @@ const HarmonyExportHeaderDependency = require("./HarmonyExportHeaderDependency")
 const HarmonyExportImportedSpecifierDependency = require("./HarmonyExportImportedSpecifierDependency");
 const HarmonyExportSpecifierDependency = require("./HarmonyExportSpecifierDependency");
 const {
-	harmonySpecifierTag
+	harmonySpecifierTag,
+	getAssertions
 } = require("./HarmonyImportDependencyParserPlugin");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 
@@ -48,7 +49,8 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				parser.state.module.addPresentationalDependency(clearDep);
 				const sideEffectDep = new HarmonyImportSideEffectDependency(
 					source,
-					parser.state.lastHarmonyImportOrder
+					parser.state.lastHarmonyImportOrder,
+					getAssertions(statement)
 				);
 				sideEffectDep.loc = Object.create(statement.loc);
 				sideEffectDep.loc.index = -1;
@@ -127,7 +129,8 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 						harmonyNamedExports,
 						null,
 						this.strictExportPresence,
-						null
+						null,
+						settings.assertions
 					);
 				} else {
 					dep = new HarmonyExportSpecifierDependency(id, name);

lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -159,6 +159,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * @param {ReadonlyArray<HarmonyExportImportedSpecifierDependency> | Iterable<HarmonyExportImportedSpecifierDependency>} otherStarExports other star exports in the module before this import
 	 * @param {boolean} strictExportPresence when true, missing exports in the imported module lead to errors instead of warnings
 	 * @param {HarmonyStarExportsList} allStarExports all star exports in the module
+	 * @param {Record<string, any>=} assertions import assertions
 	 */
 	constructor(
 		request,
@@ -168,9 +169,10 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		activeExports,
 		otherStarExports,
 		strictExportPresence,
-		allStarExports
+		allStarExports,
+		assertions
 	) {
-		super(request, sourceOrder);
+		super(request, sourceOrder, assertions);
 
 		this.ids = ids;
 		this.name = name;

lib/dependencies/HarmonyImportDependency.js

@@ -32,10 +32,12 @@ class HarmonyImportDependency extends ModuleDependency {
 	 *
 	 * @param {string} request request string
 	 * @param {number} sourceOrder source order
+	 * @param {Record<string, any>=} assertions import assertions
 	 */
-	constructor(request, sourceOrder) {
+	constructor(request, sourceOrder, assertions) {
 		super(request);
 		this.sourceOrder = sourceOrder;
+		this.assertions = assertions;
 	}
 
 	get category() {
@@ -201,12 +203,14 @@ class HarmonyImportDependency extends ModuleDependency {
 	serialize(context) {
 		const { write } = context;
 		write(this.sourceOrder);
+		write(this.assertions);
 		super.serialize(context);
 	}
 
 	deserialize(context) {
 		const { read } = context;
 		this.sourceOrder = read();
+		this.assertions = read();
 		super.deserialize(context);
 	}
 }

lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -14,7 +14,11 @@ const HarmonyExports = require("./HarmonyExports");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
 
+/** @typedef {import("estree").ExportAllDeclaration} ExportAllDeclaration */
+/** @typedef {import("estree").ExportNamedDeclaration} ExportNamedDeclaration */
 /** @typedef {import("estree").Identifier} Identifier */
+/** @typedef {import("estree").ImportDeclaration} ImportDeclaration */
+/** @typedef {import("estree").ImportExpression} ImportExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../optimize/InnerGraph").InnerGraph} InnerGraph */
 /** @typedef {import("../optimize/InnerGraph").TopLevelSymbol} TopLevelSymbol */
@@ -29,8 +33,32 @@ const harmonySpecifierTag = Symbol("harmony import");
  * @property {number} sourceOrder
  * @property {string} name
  * @property {boolean} await
+ * @property {Record<string, any> | undefined} assertions
  */
 
+/**
+ * @param {ImportDeclaration | ExportNamedDeclaration | ExportAllDeclaration | ImportExpression} node node with assertions
+ * @returns {Record<string, any> | undefined} assertions
+ */
+function getAssertions(node) {
+	// TODO remove cast when @types/estree has been updated to import assertions
+	const assertions = /** @type {{ assertions?: ImportAttributeNode[] }} */ (
+		node
+	).assertions;
+	if (assertions === undefined) {
+		return undefined;
+	}
+	const result = {};
+	for (const assertion of assertions) {
+		const key =
+			assertion.key.type === "Identifier"
+				? assertion.key.name
+				: assertion.key.value;
+		result[key] = assertion.value.value;
+	}
+	return result;
+}
+
 module.exports = class HarmonyImportDependencyParserPlugin {
 	constructor(options) {
 		this.strictExportPresence = options.strictExportPresence;
@@ -65,9 +93,11 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 				clearDep.loc = statement.loc;
 				parser.state.module.addPresentationalDependency(clearDep);
 				parser.unsetAsiPosition(statement.range[1]);
+				const assertions = getAssertions(statement);
 				const sideEffectDep = new HarmonyImportSideEffectDependency(
 					source,
-					parser.state.lastHarmonyImportOrder
+					parser.state.lastHarmonyImportOrder,
+					assertions
 				);
 				sideEffectDep.loc = statement.loc;
 				parser.state.module.addDependency(sideEffectDep);
@@ -82,7 +112,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					name,
 					source,
 					ids,
-					sourceOrder: parser.state.lastHarmonyImportOrder
+					sourceOrder: parser.state.lastHarmonyImportOrder,
+					assertions: getAssertions(statement)
 				});
 				return true;
 			}
@@ -97,7 +128,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					settings.ids,
 					settings.name,
 					expr.range,
-					this.strictExportPresence
+					this.strictExportPresence,
+					settings.assertions
 				);
 				dep.shorthand = parser.scope.inShorthand;
 				dep.directImport = true;
@@ -118,7 +150,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					ids,
 					settings.name,
 					expr.range,
-					this.strictExportPresence
+					this.strictExportPresence,
+					settings.assertions
 				);
 				dep.asiSafe = !parser.isAsiPosition(expr.range[0]);
 				dep.loc = expr.loc;
@@ -138,7 +171,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					ids,
 					settings.name,
 					callee.range,
-					this.strictExportPresence
+					this.strictExportPresence,
+					settings.assertions
 				);
 				dep.directImport = members.length === 0;
 				dep.call = true;
@@ -206,3 +240,4 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 };
 
 module.exports.harmonySpecifierTag = harmonySpecifierTag;
+module.exports.getAssertions = getAssertions;

lib/dependencies/HarmonyImportSideEffectDependency.js

@@ -20,8 +20,8 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
-	constructor(request, sourceOrder) {
-		super(request, sourceOrder);
+	constructor(request, sourceOrder, assertions) {
+		super(request, sourceOrder, assertions);
 	}
 
 	get type() {

lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -29,8 +29,16 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 const idsSymbol = Symbol("HarmonyImportSpecifierDependency.ids");
 
 class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
-	constructor(request, sourceOrder, ids, name, range, strictExportPresence) {
-		super(request, sourceOrder);
+	constructor(
+		request,
+		sourceOrder,
+		ids,
+		name,
+		range,
+		strictExportPresence,
+		assertions
+	) {
+		super(request, sourceOrder, assertions);
 		this.ids = ids;
 		this.name = name;
 		this.range = range;

lib/dependencies/ModuleDependency.js

@@ -22,13 +22,20 @@ class ModuleDependency extends Dependency {
 		this.request = request;
 		this.userRequest = request;
 		this.range = undefined;
+		// assertions must be serialized by subclasses that use it
+		/** @type {Record<string, any> | undefined} */
+		this.assertions = undefined;
 	}
 
 	/**
 	 * @returns {string | null} an identifier to merge equal requests
 	 */
 	getResourceIdentifier() {
-		return `module${this.request}`;
+		let str = `module${this.request}`;
+		if (this.assertions !== undefined) {
+			str += JSON.stringify(this.assertions);
+		}
+		return str;
 	}
 
 	/**