renaming

webpack · Apr 11, 2024 · ccfdda1 · ccfdda1
1 parent 9f6087f
commit ccfdda1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 21 deletions.
diff --git a/lib/dependencies/HarmonyImportDependencyParserPlugin.js b/lib/dependencies/HarmonyImportDependencyParserPlugin.js
@@ -229,14 +229,9 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					if (!rightPart || !rightPart.isIdentifier()) return;
 
 					const rootInfo = rightPart.rootInfo;
-					if (
-						typeof rootInfo === "string" ||
-						!rootInfo ||
-						!rootInfo.tagInfo ||
-						rootInfo.tagInfo.tag !== harmonySpecifierTag
-					)
-						return;
-					const settings = rootInfo.tagInfo.data;
+					if (!isHarmonySpecifierTag(rootInfo)) return;
+					const settings = /** @type {VariableInfoInterface} */ (rootInfo)
+						.tagInfo.data;
 					const members = rightPart.getMembers();
 					const baseIds = settings.ids.concat(members);
 					const ids = baseIds.concat([leftPart]);

diff --git a/lib/javascript/JavascriptParser.js b/lib/javascript/JavascriptParser.js
@@ -10,8 +10,8 @@ const { importAssertions } = require("acorn-import-assertions");
 const { SyncBailHook, HookMap } = require("tapable");
 const vm = require("vm");
 const Parser = require("../Parser");
+const AppendOnlyStackedSet = require("../util/AppendOnlyStackedSet");
 const StackedMap = require("../util/StackedMap");
-const WriteOnlyStackedSet = require("../util/WriteOnlyStackedSet");
 const binarySearchBounds = require("../util/binarySearchBounds");
 const memoize = require("../util/memoize");
 const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
@@ -138,7 +138,7 @@ class VariableInfo {
 /**
  * @typedef {Object} ScopeInfo
  * @property {StackedMap<string, VariableInfo | ScopeInfo>} definitions
- * @property {WriteOnlyStackedSet<string>} guards
+ * @property {AppendOnlyStackedSet<string>} guards
  * @property {boolean | "arrow"} topLevelScope
  * @property {boolean | string} inShorthand
  * @property {boolean} inTaggedTemplateTag
@@ -4259,7 +4259,7 @@ class JavascriptParser extends Parser {
 			isStrict: false,
 			isAsmJs: false,
 			definitions: new StackedMap(),
-			guards: new WriteOnlyStackedSet()
+			guards: new AppendOnlyStackedSet()
 		};
 		/** @type {ParserState} */
 		this.state = state;

diff --git a/lib/util/WriteOnlyStackedSet.js → lib/util/AppendOnlyStackedSet.js b/lib/util/WriteOnlyStackedSet.js → lib/util/AppendOnlyStackedSet.js
@@ -8,7 +8,7 @@
 /**
  * @template T
  */
-class WriteOnlyStackedSet {
+class AppendOnlyStackedSet {
 	constructor(sets = []) {
 		this._sets = sets;
 		this._current = undefined;
@@ -42,8 +42,10 @@ class WriteOnlyStackedSet {
 	}
 
 	createChild() {
-		return new WriteOnlyStackedSet(this._sets.length ? this._sets.slice() : []);
+		return new AppendOnlyStackedSet(
+			this._sets.length ? this._sets.slice() : []
+		);
 	}
 }
 
-module.exports = WriteOnlyStackedSet;
+module.exports = AppendOnlyStackedSet;
diff --git a/types.d.ts b/types.d.ts
@@ -229,6 +229,12 @@ type AliasOptionNewRequest = string | false | string[];
 declare interface AliasOptions {
 	[index: string]: AliasOptionNewRequest;
 }
+declare abstract class AppendOnlyStackedSet<T> {
+	add(el: T): void;
+	has(el: T): boolean;
+	clear(): void;
+	createChild(): AppendOnlyStackedSet<any>;
+}
 declare interface Argument {
 	description: string;
 	simpleType: "string" | "number" | "boolean";
@@ -12923,7 +12929,7 @@ declare interface RuntimeValueOptions {
  */
 declare interface ScopeInfo {
 	definitions: StackedMap<string, ScopeInfo | VariableInfo>;
-	guards: WriteOnlyStackedSet<string>;
+	guards: AppendOnlyStackedSet<string>;
 	topLevelScope: boolean | "arrow";
 	inShorthand: string | boolean;
 	inTaggedTemplateTag: boolean;
@@ -14790,12 +14796,6 @@ type WriteFileOptions =
 declare interface WriteOnlySet<T> {
 	add: (item: T) => void;
 }
-declare abstract class WriteOnlyStackedSet<T> {
-	add(el: T): void;
-	has(el: T): boolean;
-	clear(): void;
-	createChild(): WriteOnlyStackedSet<any>;
-}
 
 declare interface WriteStreamOptions {
 	flags?: string;