refactor(es/ast): Cherry-pick #10763 (#11060)

kdy1 · magic-akari · web-flow · commit a99a9ec8bcdc · 2025-09-06T05:03:42.000Z
**Description:** Cherry pick e39a909 from #10739 because we are going to make a Wasm-breaking change anyway --------- Co-authored-by: magic-akari <akari.ccino@gmail.com>
diff --git a/bindings/binding_core_wasm/src/types.rs b/bindings/binding_core_wasm/src/types.rs
@@ -1725,7 +1725,7 @@ export interface JSXAttribute extends Node, HasSpan {
 export type JSXAttributeName = Identifier | JSXNamespacedName;
 
 export type JSXAttrValue =
-  | Literal
+  | StringLiteral
   | JSXExpressionContainer
   | JSXElement
   | JSXFragment;
diff --git a/bindings/binding_minifier_wasm/src/types.rs b/bindings/binding_minifier_wasm/src/types.rs
@@ -1726,7 +1726,7 @@ export interface JSXAttribute extends Node, HasSpan {
 export type JSXAttributeName = Identifier | JSXNamespacedName;
 
 export type JSXAttrValue =
-  | Literal
+  | StringLiteral
   | JSXExpressionContainer
   | JSXElement
   | JSXFragment;
diff --git a/crates/swc_ecma_ast/src/jsx.rs b/crates/swc_ecma_ast/src/jsx.rs
@@ -5,9 +5,8 @@ use swc_common::{ast_node, util::take::Take, EqIgnoreSpan, Span, DUMMY_SP};
 use crate::{
     expr::{Expr, SpreadElement},
     ident::Ident,
-    lit::Lit,
     typescript::TsTypeParamInstantiation,
-    IdentName,
+    IdentName, Str,
 };
 
 /// Used for `obj` property of `JSXMemberExpr`.
@@ -190,12 +189,7 @@ pub enum JSXAttrName {
 #[cfg_attr(feature = "shrink-to-fit", derive(shrink_to_fit::ShrinkToFit))]
 pub enum JSXAttrValue {
     #[tag("StringLiteral")]
-    #[tag("BooleanLiteral")]
-    #[tag("NullLiteral")]
-    #[tag("NumericLiteral")]
-    #[tag("RegExpLiteral")]
-    #[tag("JSXText")]
-    Lit(Lit),
+    Str(Str),
 
     #[tag("JSXExpressionContainer")]
     JSXExprContainer(JSXExprContainer),
diff --git a/crates/swc_ecma_ast/src/lib.rs b/crates/swc_ecma_ast/src/lib.rs
@@ -588,10 +588,13 @@ mod rkyv_layout_assert {
     assert_size!(ArchivedPrivateName, 16);
 
     // JSX types
-    assert_size!(ArchivedJSXAttr, 112);
+    assert_size!(ArchivedJSXAttr, 92);
     assert_size!(ArchivedJSXAttrName, 44);
-    assert_size!(ArchivedJSXAttrOrSpread, 120);
-    assert_size!(ArchivedJSXAttrValue, 48);
+    assert_size!(ArchivedJSXAttrOrSpread, 96);
+    assert_size!(ArchivedJSXAttrValue, 36);
+    assert_size!(ArchivedJSXClosingElement, 68);
+    assert_size!(ArchivedJSXAttrOrSpread, 96);
+    assert_size!(ArchivedJSXAttrValue, 36);
     assert_size!(ArchivedJSXClosingElement, 68);
     assert_size!(ArchivedJSXClosingFragment, 8);
     assert_size!(ArchivedJSXElement, 176);
diff --git a/crates/swc_ecma_codegen/src/jsx.rs b/crates/swc_ecma_codegen/src/jsx.rs
@@ -85,7 +85,7 @@ impl MacroNode for JSXAttr {
 impl MacroNode for JSXAttrValue {
     fn emit(&mut self, emitter: &mut Macro) -> Result {
         match *self {
-            JSXAttrValue::Lit(ref n) => emit!(n),
+            JSXAttrValue::Str(ref n) => emit!(n),
             JSXAttrValue::JSXExprContainer(ref n) => emit!(n),
             JSXAttrValue::JSXElement(ref n) => emit!(n),
             JSXAttrValue::JSXFragment(ref n) => emit!(n),
diff --git a/crates/swc_ecma_lexer/src/common/parser/jsx.rs b/crates/swc_ecma_lexer/src/common/parser/jsx.rs
@@ -166,7 +166,7 @@ fn parse_jsx_attr_value<'a, P: Parser<'a>>(p: &mut P) -> PResult<JSXAttrValue> {
         let node = parse_jsx_expr_container(p)?;
         jsx_expr_container_to_jsx_attr_value(p, start, node)
     } else if cur.is_str() {
-        Ok(JSXAttrValue::Lit(Lit::Str(parse_str_lit(p))))
+        Ok(JSXAttrValue::Str(parse_str_lit(p)))
     } else if cur.is_jsx_tag_start() {
         let expr = parse_jsx_element(p)?;
         match expr {
diff --git a/crates/swc_ecma_parser/src/parser/jsx/mod.rs b/crates/swc_ecma_parser/src/parser/jsx/mod.rs
@@ -252,7 +252,7 @@ impl<I: Tokens> Parser<I> {
             match cur.token {
                 Token::Str => {
                     let value = parse_str_lit(self);
-                    Ok(Some(JSXAttrValue::Lit(Lit::Str(value))))
+                    Ok(Some(JSXAttrValue::Str(value)))
                 }
                 Token::LBrace => {
                     let start = self.cur_pos();
@@ -501,11 +501,11 @@ mod tests {
                     attrs: vec![JSXAttrOrSpread::JSXAttr(JSXAttr {
                         span,
                         name: JSXAttrName::Ident(IdentName::new(atom!("id"), span)),
-                        value: Some(JSXAttrValue::Lit(Lit::Str(Str {
+                        value: Some(JSXAttrValue::Str(Str {
                             span,
                             value: atom!("w < w"),
                             raw: Some(atom!("\"w &lt; w\"")),
-                        }))),
+                        })),
                     })],
                     name: JSXElementName::Ident(Ident::new_no_ctxt(atom!("div"), span)),
                     self_closing: true,
diff --git a/crates/swc_ecma_parser/tests/typescript/issue-10993/input.ts.json b/crates/swc_ecma_parser/tests/typescript/issue-10993/input.ts.json
@@ -50,6 +50,7 @@
                       "end": 18
                     },
                     "ctxt": 0,
+                    "nodeId": 4294967295,
                     "value": "Foo",
                     "optional": false,
                     "typeAnnotation": {
@@ -71,6 +72,7 @@
                             "end": 21
                           },
                           "ctxt": 0,
+                          "nodeId": 4294967295,
                           "value": "T",
                           "optional": false
                         },
@@ -108,6 +110,7 @@
                                         "end": 24
                                       },
                                       "ctxt": 0,
+                                      "nodeId": 4294967295,
                                       "value": "S",
                                       "optional": false
                                     },
diff --git a/crates/swc_ecma_quote_macros/src/ast/expr.rs b/crates/swc_ecma_quote_macros/src/ast/expr.rs
@@ -145,7 +145,7 @@ impl_struct!(JSXAttr, [span, name, value]);
 
 impl_enum!(
     JSXAttrValue,
-    [Lit, JSXExprContainer, JSXElement, JSXFragment]
+    [Str, JSXExprContainer, JSXElement, JSXFragment]
 );
 
 impl_enum!(JSXAttrName, [Ident, JSXNamespacedName]);
diff --git a/crates/swc_ecma_transforms_react/src/jsx/mod.rs b/crates/swc_ecma_transforms_react/src/jsx/mod.rs
@@ -1005,14 +1005,14 @@ where
         let value = a
             .value
             .map(|v| match v {
-                JSXAttrValue::Lit(Lit::Str(s)) => {
+                JSXAttrValue::Str(s) => {
                     let value = transform_jsx_attr_str(&s.value);
 
-                    Lit::Str(Str {
+                    Str {
                         span: s.span,
                         raw: None,
                         value: value.into(),
-                    })
+                    }
                     .into()
                 }
                 JSXAttrValue::JSXExprContainer(JSXExprContainer {
@@ -1021,7 +1021,6 @@ where
                 }) => e,
                 JSXAttrValue::JSXElement(element) => Box::new(self.jsx_elem_to_expr(*element)),
                 JSXAttrValue::JSXFragment(fragment) => Box::new(self.jsx_frag_to_expr(fragment)),
-                JSXAttrValue::Lit(lit) => Box::new(lit.into()),
                 JSXAttrValue::JSXExprContainer(JSXExprContainer {
                     span: _,
                     expr: JSXExpr::JSXEmptyExpr(_),
@@ -1481,7 +1480,7 @@ fn add_line_of_jsx_text<'a>(
 
 fn jsx_attr_value_to_expr(v: JSXAttrValue) -> Option<Box<Expr>> {
     Some(match v {
-        JSXAttrValue::Lit(Lit::Str(s)) => {
+        JSXAttrValue::Str(s) => {
             let value = transform_jsx_attr_str(&s.value);
 
             Lit::Str(Str {
@@ -1491,7 +1490,6 @@ fn jsx_attr_value_to_expr(v: JSXAttrValue) -> Option<Box<Expr>> {
             })
             .into()
         }
-        JSXAttrValue::Lit(lit) => Box::new(lit.into()),
         JSXAttrValue::JSXExprContainer(e) => match e.expr {
             JSXExpr::JSXEmptyExpr(_) => None?,
             JSXExpr::Expr(e) => e,
diff --git a/crates/swc_ecma_visit/src/generated.rs b/crates/swc_ecma_visit/src/generated.rs
@@ -11706,8 +11706,8 @@ impl<V: ?Sized + Visit> VisitWith<V> for JSXAttrValue {
 
     fn visit_children_with(&self, visitor: &mut V) {
         match self {
-            JSXAttrValue::Lit { 0: _field_0 } => {
-                <Lit as VisitWith<V>>::visit_with(_field_0, visitor);
+            JSXAttrValue::Str { 0: _field_0 } => {
+                <Str as VisitWith<V>>::visit_with(_field_0, visitor);
             }
             JSXAttrValue::JSXExprContainer { 0: _field_0 } => {
                 <JSXExprContainer as VisitWith<V>>::visit_with(_field_0, visitor);
@@ -37776,12 +37776,12 @@ impl<V: ?Sized + VisitAstPath> VisitWithAstPath<V> for JSXAttrValue {
         __ast_path: &mut AstNodePath<'r>,
     ) {
         match self {
-            JSXAttrValue::Lit { 0: _field_0 } => {
+            JSXAttrValue::Str { 0: _field_0 } => {
                 let mut __ast_path = __ast_path.with_guard(AstParentNodeRef::JSXAttrValue(
                     self,
-                    self::fields::JSXAttrValueField::Lit,
+                    self::fields::JSXAttrValueField::Str,
                 ));
-                <Lit as VisitWithAstPath<V>>::visit_with_ast_path(
+                <Str as VisitWithAstPath<V>>::visit_with_ast_path(
                     _field_0,
                     visitor,
                     &mut *__ast_path,
@@ -60786,8 +60786,8 @@ impl<V: ?Sized + VisitMut> VisitMutWith<V> for JSXAttrValue {
 
     fn visit_mut_children_with(&mut self, visitor: &mut V) {
         match self {
-            JSXAttrValue::Lit { 0: _field_0 } => {
-                <Lit as VisitMutWith<V>>::visit_mut_with(_field_0, visitor);
+            JSXAttrValue::Str { 0: _field_0 } => {
+                <Str as VisitMutWith<V>>::visit_mut_with(_field_0, visitor);
             }
             JSXAttrValue::JSXExprContainer { 0: _field_0 } => {
                 <JSXExprContainer as VisitMutWith<V>>::visit_mut_with(_field_0, visitor);
@@ -83399,11 +83399,11 @@ impl<V: ?Sized + VisitMutAstPath> VisitMutWithAstPath<V> for JSXAttrValue {
 
     fn visit_mut_children_with_ast_path(&mut self, visitor: &mut V, __ast_path: &mut AstKindPath) {
         match self {
-            JSXAttrValue::Lit { 0: _field_0 } => {
+            JSXAttrValue::Str { 0: _field_0 } => {
                 let mut __ast_path = __ast_path.with_guard(AstParentKind::JSXAttrValue(
-                    self::fields::JSXAttrValueField::Lit,
+                    self::fields::JSXAttrValueField::Str,
                 ));
-                <Lit as VisitMutWithAstPath<V>>::visit_mut_with_ast_path(
+                <Str as VisitMutWithAstPath<V>>::visit_mut_with_ast_path(
                     _field_0,
                     visitor,
                     &mut *__ast_path,
@@ -104178,9 +104178,9 @@ impl<V: ?Sized + Fold> FoldWith<V> for JSXAttrValue {
 
     fn fold_children_with(self, visitor: &mut V) -> Self {
         match self {
-            JSXAttrValue::Lit { 0: _field_0 } => {
-                let _field_0 = <Lit as FoldWith<V>>::fold_with(_field_0, visitor);
-                JSXAttrValue::Lit { 0: _field_0 }
+            JSXAttrValue::Str { 0: _field_0 } => {
+                let _field_0 = <Str as FoldWith<V>>::fold_with(_field_0, visitor);
+                JSXAttrValue::Str { 0: _field_0 }
             }
             JSXAttrValue::JSXExprContainer { 0: _field_0 } => {
                 let _field_0 = <JSXExprContainer as FoldWith<V>>::fold_with(_field_0, visitor);
@@ -127838,16 +127838,16 @@ impl<V: ?Sized + FoldAstPath> FoldWithAstPath<V> for JSXAttrValue {
 
     fn fold_children_with_ast_path(self, visitor: &mut V, __ast_path: &mut AstKindPath) -> Self {
         match self {
-            JSXAttrValue::Lit { 0: _field_0 } => {
+            JSXAttrValue::Str { 0: _field_0 } => {
                 let mut __ast_path = __ast_path.with_guard(AstParentKind::JSXAttrValue(
-                    self::fields::JSXAttrValueField::Lit,
+                    self::fields::JSXAttrValueField::Str,
                 ));
-                let _field_0 = <Lit as FoldWithAstPath<V>>::fold_with_ast_path(
+                let _field_0 = <Str as FoldWithAstPath<V>>::fold_with_ast_path(
                     _field_0,
                     visitor,
                     &mut *__ast_path,
                 );
-                JSXAttrValue::Lit { 0: _field_0 }
+                JSXAttrValue::Str { 0: _field_0 }
             }
             JSXAttrValue::JSXExprContainer { 0: _field_0 } => {
                 let mut __ast_path = __ast_path.with_guard(AstParentKind::JSXAttrValue(
@@ -138528,8 +138528,8 @@ pub mod fields {
     #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
     #[cfg_attr(feature = "serde-impl", derive(serde::Serialize, serde::Deserialize))]
     pub enum JSXAttrValueField {
-        #[doc = "Represents [`JSXAttrValue::Lit`]"]
-        Lit,
+        #[doc = "Represents [`JSXAttrValue::Str`]"]
+        Str,
         #[doc = "Represents [`JSXAttrValue::JSXExprContainer`]"]
         JsxexprContainer,
         #[doc = "Represents [`JSXAttrValue::JSXElement`]"]
@@ -145134,7 +145134,7 @@ impl<'ast> NodeRef<'ast> {
                 _ => Box::new(::std::iter::empty::<NodeRef<'ast>>()),
             },
             NodeRef::JSXAttrValue(node) => match node {
-                JSXAttrValue::Lit(v0) => Box::new(::std::iter::once(NodeRef::Lit(v0))),
+                JSXAttrValue::Str(v0) => Box::new(::std::iter::once(NodeRef::Str(v0))),
                 JSXAttrValue::JSXExprContainer(v0) => {
                     Box::new(::std::iter::once(NodeRef::JSXExprContainer(v0)))
                 }
diff --git a/crates/swc_estree_compat/src/babelify/jsx.rs b/crates/swc_estree_compat/src/babelify/jsx.rs
@@ -4,7 +4,7 @@ use swc_ecma_ast::{
     JSXAttr, JSXAttrName, JSXAttrOrSpread, JSXAttrValue, JSXClosingElement, JSXClosingFragment,
     JSXElement, JSXElementChild, JSXElementName, JSXEmptyExpr, JSXExpr, JSXExprContainer,
     JSXFragment, JSXMemberExpr, JSXNamespacedName, JSXObject, JSXOpeningElement,
-    JSXOpeningFragment, JSXSpreadChild, JSXText, Lit,
+    JSXOpeningFragment, JSXSpreadChild, JSXText,
 };
 use swc_estree_ast::{
     flavor::Flavor, JSXAttrName as BabelJSXAttrName, JSXAttrVal, JSXAttribute,
@@ -212,17 +212,7 @@ impl Babelify for JSXAttrValue {
 
     fn babelify(self, ctx: &Context) -> Self::Output {
         match self {
-            JSXAttrValue::Lit(lit) => {
-                // TODO(dwoznicki): Babel only seems to accept string literals here. Is that
-                // right?
-                match lit {
-                    Lit::Str(s) => JSXAttrVal::String(s.babelify(ctx)),
-                    _ => panic!(
-                        "illegal conversion: Cannot convert {:?} to JsxAttrVal::Lit",
-                        &lit
-                    ),
-                }
-            }
+            JSXAttrValue::Str(s) => JSXAttrVal::String(s.babelify(ctx)),
             JSXAttrValue::JSXExprContainer(e) => JSXAttrVal::Expr(e.babelify(ctx)),
             JSXAttrValue::JSXElement(e) => JSXAttrVal::Element(e.babelify(ctx)),
             JSXAttrValue::JSXFragment(f) => JSXAttrVal::Fragment(f.babelify(ctx)),
diff --git a/crates/swc_estree_compat/src/swcify/expr.rs b/crates/swc_estree_compat/src/swcify/expr.rs
@@ -942,7 +942,7 @@ impl Swcify for JSXAttrVal {
         match self {
             JSXAttrVal::Element(v) => JSXAttrValue::JSXElement(Box::new(v.swcify(ctx))),
             JSXAttrVal::Fragment(v) => JSXAttrValue::JSXFragment(v.swcify(ctx)),
-            JSXAttrVal::String(v) => JSXAttrValue::Lit(Lit::Str(v.swcify(ctx))),
+            JSXAttrVal::String(v) => JSXAttrValue::Str(v.swcify(ctx)),
             JSXAttrVal::Expr(v) => JSXAttrValue::JSXExprContainer(v.swcify(ctx)),
         }
     }
diff --git a/crates/swc_plugin_backend_wasmer/src/lib.rs b/crates/swc_plugin_backend_wasmer/src/lib.rs
@@ -25,6 +25,7 @@ static ENGINE: Lazy<Mutex<wasmer::Engine>> = Lazy::new(|| {
     // Use empty enumset to disable simd.
     use enumset::EnumSet;
     use wasmer::sys::{BaseTunables, CompilerConfig, EngineBuilder, Target, Triple};
+    #[allow(unused_mut)]
     let mut set = EnumSet::new();
 
     // [TODO]: Should we use is_x86_feature_detected! macro instead?
diff --git a/packages/core/src/Visitor.ts b/packages/core/src/Visitor.ts
@@ -1628,14 +1628,6 @@ export class Visitor {
         if (!n) return n;
 
         switch (n.type) {
-            case "BooleanLiteral":
-                return this.visitBooleanLiteral(n);
-            case "NullLiteral":
-                return this.visitNullLiteral(n);
-            case "NumericLiteral":
-                return this.visitNumericLiteral(n);
-            case "JSXText":
-                return this.visitJSXText(n);
             case "StringLiteral":
                 return this.visitStringLiteral(n);
 
diff --git a/packages/types/index.ts b/packages/types/index.ts
@@ -1797,7 +1797,7 @@ export interface JSXAttribute extends Node, HasSpan {
 export type JSXAttributeName = Identifier | JSXNamespacedName;
 
 export type JSXAttrValue =
-    | Literal
+    | StringLiteral
     | JSXExpressionContainer
     | JSXElement
     | JSXFragment;
