fix: logic for cache

Author: alexander-akait

lib/ExternalModule.js

@@ -15,7 +15,6 @@ const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const Template = require("./Template");
 const StaticExportsDependency = require("./dependencies/StaticExportsDependency");
-const { IS_LEGACY_IMPORT_ASSERTION } = require("./javascript/JavascriptParser");
 const createHash = require("./util/createHash");
 const extractUrlAndGlobal = require("./util/extractUrlAndGlobal");
 const makeSerializable = require("./util/makeSerializable");
@@ -172,8 +171,11 @@ const getSourceForImportExternal = (
 	}
 	const attributes =
 		dependencyMeta && dependencyMeta.attributes
-			? dependencyMeta.attributes[IS_LEGACY_IMPORT_ASSERTION]
-				? `, { assert: ${JSON.stringify(dependencyMeta.attributes)} }`
+			? dependencyMeta.attributes._isLegacyAssert
+				? `, { assert: ${JSON.stringify(
+						dependencyMeta.attributes,
+						importAssertionReplacer
+					)} }`
 				: `, { with: ${JSON.stringify(dependencyMeta.attributes)} }`
 			: "";
 	if (!Array.isArray(moduleAndSpecifiers)) {
@@ -201,6 +203,19 @@ const getSourceForImportExternal = (
 	};
 };
 
+/**
+ * @param {string} key key
+ * @param {any | undefined} value value
+ * @returns {undefined | string} replaced value
+ */
+const importAssertionReplacer = (key, value) => {
+	if (key === "_isLegacyAssert") {
+		return undefined;
+	}
+
+	return value;
+};
+
 /**
  * @extends {InitFragment<ChunkRenderContext>}
  */
@@ -225,8 +240,11 @@ class ModuleExternalInitFragment extends InitFragment {
 		super(
 			`import * as ${identifier} from ${JSON.stringify(request)}${
 				dependencyMeta && dependencyMeta.attributes
-					? dependencyMeta.attributes[IS_LEGACY_IMPORT_ASSERTION]
-						? ` assert ${JSON.stringify(dependencyMeta.attributes)}`
+					? dependencyMeta.attributes._isLegacyAssert
+						? ` assert ${JSON.stringify(
+								dependencyMeta.attributes,
+								importAssertionReplacer
+							)}`
 						: ` with ${JSON.stringify(dependencyMeta.attributes)}`
 					: ""
 			};\n`,

lib/NormalModuleFactory.js

@@ -20,7 +20,6 @@ const ModuleFactory = require("./ModuleFactory");
 const ModuleGraph = require("./ModuleGraph");
 const { JAVASCRIPT_MODULE_TYPE_AUTO } = require("./ModuleTypeConstants");
 const NormalModule = require("./NormalModule");
-const { IS_LEGACY_IMPORT_ASSERTION } = require("./javascript/JavascriptParser");
 const BasicEffectRulePlugin = require("./rules/BasicEffectRulePlugin");
 const BasicMatcherRulePlugin = require("./rules/BasicMatcherRulePlugin");
 const ObjectMatcherRulePlugin = require("./rules/ObjectMatcherRulePlugin");
@@ -231,12 +230,12 @@ const ruleSetCompiler = new RuleSetCompiler([
 	new ObjectMatcherRulePlugin(
 		"assert",
 		"assertions",
-		value => value[IS_LEGACY_IMPORT_ASSERTION]
+		value => value && /** @type {any} */ (value)._isLegacyAssert !== undefined
 	),
 	new ObjectMatcherRulePlugin(
 		"with",
 		"assertions",
-		value => !value[IS_LEGACY_IMPORT_ASSERTION]
+		value => value && !(/** @type {any} */ (value)._isLegacyAssert)
 	),
 	new ObjectMatcherRulePlugin("descriptionData"),
 	new BasicEffectRulePlugin("type"),

lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -6,9 +6,6 @@
 "use strict";
 
 const HotModuleReplacementPlugin = require("../HotModuleReplacementPlugin");
-const {
-	IS_LEGACY_IMPORT_ASSERTION
-} = require("../javascript/JavascriptParser");
 const InnerGraph = require("../optimize/InnerGraph");
 const ConstDependency = require("./ConstDependency");
 const HarmonyAcceptDependency = require("./HarmonyAcceptDependency");
@@ -87,7 +84,7 @@ function getAttributes(node) {
 				? node.arguments[0].properties[0].key.name
 				: /** @type {Literal} */ (node.arguments[0].properties[0].key).value;
 		if (key === "assert") {
-			result[IS_LEGACY_IMPORT_ASSERTION] = true;
+			result._isLegacyAssert = true;
 		}
 		return result;
 	}
@@ -113,7 +110,7 @@ function getAttributes(node) {
 		result[key] = /** @type {string} */ (attribute.value.value);
 	}
 	if (isImportAssertion) {
-		result[IS_LEGACY_IMPORT_ASSERTION] = true;
+		result._isLegacyAssert = true;
 	}
 	return result;
 }

lib/javascript/JavascriptParser.js

@@ -99,12 +99,7 @@ const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 /** @typedef {Statement | ModuleDeclaration | Expression} StatementPathItem */
 /** @typedef {TODO} OnIdent */
 
-/**
- * Import attributes using legacy `assert` keyword
- */
-const IS_LEGACY_IMPORT_ASSERTION = Symbol("is legacy import assertion");
-
-/** @typedef {Record<string, string> & Partial<Record<IS_LEGACY_IMPORT_ASSERTION, boolean>>} ImportAttributes */
+/** @typedef {Record<string, string> & { _isLegacyAssert?: boolean }} ImportAttributes */
 
 /** @type {string[]} */
 const EMPTY_ARRAY = [];
@@ -4809,5 +4804,3 @@ module.exports.ALLOWED_MEMBER_TYPES_EXPRESSION =
 	ALLOWED_MEMBER_TYPES_EXPRESSION;
 module.exports.ALLOWED_MEMBER_TYPES_CALL_EXPRESSION =
 	ALLOWED_MEMBER_TYPES_CALL_EXPRESSION;
-module.exports.IS_LEGACY_IMPORT_ASSERTION =
-	/** @type {typeof IS_LEGACY_IMPORT_ASSERTION} */ (IS_LEGACY_IMPORT_ASSERTION);

types.d.ts

@@ -5250,7 +5250,6 @@ type IBigIntStats = IStatsBase<bigint> & {
 	ctimeNs: bigint;
 	birthtimeNs: bigint;
 };
-declare const IS_LEGACY_IMPORT_ASSERTION: unique symbol;
 declare interface IStats {
 	isFile: () => boolean;
 	isDirectory: () => boolean;
@@ -5337,8 +5336,7 @@ type IgnorePluginOptions =
 			 */
 			checkResource: (resource: string, context: string) => boolean;
 	  };
-type ImportAttributes = Record<string, string> &
-	Partial<Record<typeof IS_LEGACY_IMPORT_ASSERTION, boolean>>;
+type ImportAttributes = Record<string, string> & {};
 declare interface ImportDependencyMeta {
 	attributes?: ImportAttributes;
 }
@@ -6521,7 +6519,6 @@ declare class JavascriptParser extends Parser {
 	static ALLOWED_MEMBER_TYPES_ALL: 3;
 	static ALLOWED_MEMBER_TYPES_EXPRESSION: 2;
 	static ALLOWED_MEMBER_TYPES_CALL_EXPRESSION: 1;
-	static IS_LEGACY_IMPORT_ASSERTION: typeof IS_LEGACY_IMPORT_ASSERTION;
 }
 
 /**