refactor(atoms): Remove JsWord alias (#10071)

**Description:**

This is a refactoring I always wanted to do

Author: kdy1

.changeset/silly-chefs-deliver.md

@@ -0,0 +1,5 @@
+---
+swc_atoms: major
+---
+
+refactor(atoms): Remove `JsWord` alias

bindings/binding_core_node/src/bundle.rs

@@ -11,7 +11,7 @@ use napi::{
 use rustc_hash::FxHashMap;
 use serde::Deserialize;
 use swc_core::{
-    atoms::JsWord,
+    atoms::Atom,
     base::{
         config::SourceMapsConfig,
         resolver::{environment_resolver, paths_resolver},
@@ -61,7 +61,7 @@ impl Task for BundleTask {
             NODE_BUILTINS
                 .iter()
                 .copied()
-                .map(JsWord::from)
+                .map(Atom::from)
                 .collect::<Vec<_>>()
         } else {
             Vec::new()

bindings/binding_html_node/src/lib.rs

@@ -13,7 +13,7 @@ use lightningcss::{
 };
 use napi::{bindgen_prelude::*, Task};
 use serde::{Deserialize, Serialize};
-use swc_atoms::js_word;
+use swc_atoms::atom;
 use swc_cached::regex::CachedRegex;
 use swc_common::{sync::Lrc, FileName, FilePathMapping, SourceMap, DUMMY_SP};
 use swc_html::{
@@ -522,7 +522,7 @@ fn minify_inner(
                     Some(context_element) => create_element(context_element)?,
                     _ => swc_html_ast::Element {
                         span: DUMMY_SP,
-                        tag_name: js_word!("template"),
+                        tag_name: atom!("template"),
                         namespace: Namespace::HTML,
                         attributes: vec![],
                         children: vec![],

crates/jsdoc/src/ast.rs

@@ -1,12 +1,12 @@
-use swc_atoms::JsWord;
+use swc_atoms::Atom;
 use swc_common::{ast_node, Span};
 
 /// Spanned text
 #[ast_node]
 #[derive(Eq)]
 pub struct Text {
     pub span: Span,
-    pub value: JsWord,
+    pub value: Atom,
 }
 
 #[ast_node]

crates/swc/src/builder.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use compat::es2015::regenerator;
 use either::Either;
 use rustc_hash::FxHashMap;
-use swc_atoms::JsWord;
+use swc_atoms::Atom;
 use swc_common::{
     comments::Comments, errors::Handler, sync::Lrc, util::take::Take, FileName, Mark, SourceMap,
 };
@@ -124,7 +124,7 @@ impl<'a, 'b, P: Pass> PassBuilder<'a, 'b, P> {
 
     pub fn const_modules(
         self,
-        globals: FxHashMap<JsWord, FxHashMap<JsWord, String>>,
+        globals: FxHashMap<Atom, FxHashMap<Atom, String>>,
     ) -> PassBuilder<'a, 'b, (P, impl Pass)> {
         let cm = self.cm.clone();
         self.then(const_modules(cm, globals))

crates/swc/src/config/mod.rs

@@ -11,7 +11,7 @@ use indexmap::IndexMap;
 use once_cell::sync::Lazy;
 use rustc_hash::{FxBuildHasher, FxHashMap, FxHashSet};
 use serde::{Deserialize, Serialize};
-use swc_atoms::JsWord;
+use swc_atoms::Atom;
 use swc_cached::regex::CachedRegex;
 #[allow(unused)]
 use swc_common::plugin::metadata::TransformPluginMetadataContext;
@@ -1490,7 +1490,7 @@ pub struct HiddenTransformConfig {
 #[serde(deny_unknown_fields, rename_all = "camelCase")]
 pub struct ConstModulesConfig {
     #[serde(default)]
-    pub globals: FxHashMap<JsWord, FxHashMap<JsWord, String>>,
+    pub globals: FxHashMap<Atom, FxHashMap<Atom, String>>,
 }
 
 #[derive(Debug, Default, Clone, Serialize, Deserialize, Merge)]
@@ -1551,19 +1551,19 @@ pub struct ErrorConfig {
 #[serde(deny_unknown_fields, rename_all = "camelCase")]
 pub struct GlobalPassOption {
     #[serde(default)]
-    pub vars: IndexMap<JsWord, JsWord, FxBuildHasher>,
+    pub vars: IndexMap<Atom, Atom, FxBuildHasher>,
     #[serde(default)]
     pub envs: GlobalInliningPassEnvs,
 
     #[serde(default)]
-    pub typeofs: FxHashMap<JsWord, JsWord>,
+    pub typeofs: FxHashMap<Atom, Atom>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum GlobalInliningPassEnvs {
     List(FxHashSet<String>),
-    Map(FxHashMap<JsWord, JsWord>),
+    Map(FxHashMap<Atom, Atom>),
 }
 
 impl Default for GlobalInliningPassEnvs {
@@ -1578,7 +1578,7 @@ impl Default for GlobalInliningPassEnvs {
 
 impl GlobalPassOption {
     pub fn build(self, cm: &SourceMap, handler: &Handler) -> impl 'static + Pass {
-        type ValuesMap = Arc<FxHashMap<JsWord, Expr>>;
+        type ValuesMap = Arc<FxHashMap<Atom, Expr>>;
 
         fn expr(cm: &SourceMap, handler: &Handler, src: String) -> Box<Expr> {
             let fm = cm.new_source_file(FileName::Anon.into(), src);
@@ -1605,7 +1605,7 @@ impl GlobalPassOption {
         fn mk_map(
             cm: &SourceMap,
             handler: &Handler,
-            values: impl Iterator<Item = (JsWord, JsWord)>,
+            values: impl Iterator<Item = (Atom, Atom)>,
             is_env: bool,
         ) -> ValuesMap {
             let mut m = HashMap::default();
@@ -1652,7 +1652,7 @@ impl GlobalPassOption {
                 }
 
                 GlobalInliningPassEnvs::Map(map) => {
-                    static CACHE: Lazy<DashMap<Vec<(JsWord, JsWord)>, ValuesMap, FxBuildHasher>> =
+                    static CACHE: Lazy<DashMap<Vec<(Atom, Atom)>, ValuesMap, FxBuildHasher>> =
                         Lazy::new(Default::default);
 
                     let cache_key = self
@@ -1677,7 +1677,7 @@ impl GlobalPassOption {
         };
 
         let global_exprs = {
-            static CACHE: Lazy<DashMap<Vec<(JsWord, JsWord)>, GlobalExprMap, FxBuildHasher>> =
+            static CACHE: Lazy<DashMap<Vec<(Atom, Atom)>, GlobalExprMap, FxBuildHasher>> =
                 Lazy::new(Default::default);
 
             let cache_key = self
@@ -1708,7 +1708,7 @@ impl GlobalPassOption {
         };
 
         let global_map = {
-            static CACHE: Lazy<DashMap<Vec<(JsWord, JsWord)>, ValuesMap, FxBuildHasher>> =
+            static CACHE: Lazy<DashMap<Vec<(Atom, Atom)>, ValuesMap, FxBuildHasher>> =
                 Lazy::new(Default::default);
 
             let cache_key = self

crates/swc/src/lib.rs

@@ -19,13 +19,13 @@
 //!
 //!
 //!
-//! ### What is [JsWord](swc_atoms::JsWord)?
+//! ### What is [Atom](swc_atoms::Atom)?
 //!
 //! It's basically an interned string. See [swc_atoms].
 //!
-//! ### Choosing between [JsWord](swc_atoms::JsWord) vs String
+//! ### Choosing between [Atom](swc_atoms::Atom) vs String
 //!
-//! You should  prefer [JsWord](swc_atoms::JsWord) over [String] if it's going
+//! You should  prefer [Atom](swc_atoms::Atom) over [String] if it's going
 //! to be stored in an AST node.
 //!
 //! See [swc_atoms] for detailed description.

crates/swc_atoms/src/lib.rs

@@ -1,4 +1,4 @@
-//! See [JsWord] and [Atom]
+//! See [Atom] and [UnsafeAtom]
 
 #![allow(clippy::unreadable_literal)]
 
@@ -21,7 +21,6 @@ use std::{
 use once_cell::sync::Lazy;
 use serde::Serializer;
 
-pub use self::{atom as js_word, Atom as JsWord};
 pub use crate::fast::UnsafeAtom;
 
 mod fast;

crates/swc_bundler/src/bundler/export.rs

@@ -1,6 +1,6 @@
 use indexmap::IndexMap;
 use rustc_hash::FxBuildHasher;
-use swc_atoms::JsWord;
+use swc_atoms::Atom;
 use swc_common::{FileName, SyntaxContext};
 use swc_ecma_ast::*;
 use swc_ecma_utils::find_pat_ids;
@@ -69,7 +69,7 @@ where
     R: Resolve,
 {
     /// Returns `(local, export)`.
-    fn ctxt_for(&self, src: &JsWord) -> Option<(SyntaxContext, SyntaxContext)> {
+    fn ctxt_for(&self, src: &Atom) -> Option<(SyntaxContext, SyntaxContext)> {
         // Don't apply mark if it's a core module.
         if self
             .bundler
@@ -89,7 +89,7 @@ where
         ))
     }
 
-    fn mark_as_wrapping_required(&self, src: &JsWord) {
+    fn mark_as_wrapping_required(&self, src: &Atom) {
         // Don't apply mark if it's a core module.
         if self
             .bundler

crates/swc_bundler/src/bundler/import/mod.rs

@@ -1,6 +1,6 @@
 use anyhow::{Context, Error};
 use rustc_hash::{FxHashMap, FxHashSet};
-use swc_atoms::JsWord;
+use swc_atoms::Atom;
 use swc_common::{sync::Lrc, FileName, Mark, Spanned, SyntaxContext, DUMMY_SP};
 use swc_ecma_ast::*;
 use swc_ecma_utils::find_pat_ids;
@@ -92,7 +92,7 @@ pub(super) struct RawImports {
     /// function bar() {}
     /// foo[bar()]
     /// ```
-    pub forced_ns: FxHashSet<JsWord>,
+    pub forced_ns: FxHashSet<Atom>,
 }
 
 /// This type implements two operation (analysis, deglobbing) to reduce binary
@@ -146,7 +146,7 @@ where
     R: Resolve,
 {
     /// Returns (local, export)
-    fn ctxt_for(&self, src: &JsWord) -> Option<(SyntaxContext, SyntaxContext)> {
+    fn ctxt_for(&self, src: &Atom) -> Option<(SyntaxContext, SyntaxContext)> {
         // Don't apply mark if it's a core module.
         if self.bundler.is_external(src) {
             return None;
@@ -160,7 +160,7 @@ where
         ))
     }
 
-    fn mark_as_wrapping_required(&self, src: &JsWord) {
+    fn mark_as_wrapping_required(&self, src: &Atom) {
         // Don't apply mark if it's a core module.
         if self.bundler.is_external(src) {
             return;
@@ -175,7 +175,7 @@ where
         self.bundler.scope.mark_as_wrapping_required(id);
     }
 
-    fn mark_as_cjs(&self, src: &JsWord) {
+    fn mark_as_cjs(&self, src: &Atom) {
         let path = self.bundler.resolve(self.path, src);
         let path = match path {
             Ok(v) => v,

crates/swc_bundler/src/bundler/mod.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use anyhow::{Context, Error};
 use rustc_hash::FxHashMap;
-use swc_atoms::JsWord;
+use swc_atoms::Atom;
 use swc_common::{sync::Lrc, FileName, Globals, Mark, SourceMap, SyntaxContext, GLOBALS};
 use swc_ecma_ast::Module;
 
@@ -41,7 +41,7 @@ pub struct Config {
     pub disable_dce: bool,
 
     /// List of modules which should be preserved.
-    pub external_modules: Vec<JsWord>,
+    pub external_modules: Vec<Atom>,
 
     /// Type of emitted module
     pub module: ModuleType,
@@ -139,7 +139,7 @@ where
         })
     }
 
-    pub(crate) fn is_external(&self, src: &JsWord) -> bool {
+    pub(crate) fn is_external(&self, src: &Atom) -> bool {
         self.config.external_modules.iter().any(|v| v == src)
     }
 

crates/swc_bundler/src/id.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use rustc_hash::FxHashMap;
-use swc_atoms::JsWord;
+use swc_atoms::Atom;
 use swc_common::{sync::Lock, FileName, Mark, SyntaxContext, DUMMY_SP};
 use swc_ecma_ast::{Expr, Ident};
 use swc_ecma_utils::ident::IdentLike;
@@ -49,7 +49,7 @@ impl ModuleIdGenerator {
 }
 
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct Id(JsWord, SyntaxContext);
+pub struct Id(Atom, SyntaxContext);
 
 impl fmt::Debug for Id {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -58,11 +58,11 @@ impl fmt::Debug for Id {
 }
 
 impl Id {
-    pub fn new(sym: JsWord, ctxt: SyntaxContext) -> Self {
+    pub fn new(sym: Atom, ctxt: SyntaxContext) -> Self {
         Id(sym, ctxt)
     }
 
-    pub fn sym(&self) -> &JsWord {
+    pub fn sym(&self) -> &Atom {
         &self.0
     }
 
@@ -85,11 +85,11 @@ impl IdentLike for Id {
         i.into()
     }
 
-    fn to_id(&self) -> (JsWord, SyntaxContext) {
+    fn to_id(&self) -> (Atom, SyntaxContext) {
         (self.0.clone(), self.1)
     }
 
-    fn into_id(self) -> (JsWord, SyntaxContext) {
+    fn into_id(self) -> (Atom, SyntaxContext) {
         (self.0, self.1)
     }
 }
@@ -112,8 +112,8 @@ impl PartialEq<Ident> for Id {
     }
 }
 
-impl PartialEq<JsWord> for Id {
-    fn eq(&self, other: &JsWord) -> bool {
+impl PartialEq<Atom> for Id {
+    fn eq(&self, other: &Atom) -> bool {
         self.0 == *other
     }
 }

crates/swc_common/src/errors/mod.rs

@@ -340,11 +340,11 @@ impl error::Error for ExplicitBug {
 ///         handler
 ///             .struct_span_err(
 ///                 span,
-///                 &format!("`{}` used as parameter more than once", js_word),
+///                 &format!("`{}` used as parameter more than once", atom),
 ///             )
 ///             .span_note(
 ///                 old_span,
-///                 &format!("previous definition of `{}` here", js_word),
+///                 &format!("previous definition of `{}` here", atom),
 ///             )
 ///             .emit();
 ///     });