From be2579f2f8da3874d40e3660e4f050a73ad3ae8a Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Wed, 5 Apr 2023 21:47:08 -0400
Subject: [PATCH 01/16] spiking glimmer template parser extension

---
 crates/swc_ecma_ast/src/class.rs              |  4 ++
 crates/swc_ecma_ast/src/expr.rs               |  5 +++
 crates/swc_ecma_ast/src/glimmer.rs            | 14 +++++++
 crates/swc_ecma_ast/src/lib.rs                |  2 +
 crates/swc_ecma_parser/src/lexer/mod.rs       | 39 +++++++++++++++++++
 crates/swc_ecma_parser/src/lexer/state.rs     | 18 +++++++++
 crates/swc_ecma_parser/src/macros.rs          |  8 ++++
 .../src/parser/class_and_fn.rs                |  8 ++++
 crates/swc_ecma_parser/src/parser/expr.rs     | 28 +++++++++++++
 crates/swc_ecma_parser/src/parser/util.rs     |  2 +
 crates/swc_ecma_parser/src/token.rs           |  9 +++++
 11 files changed, 137 insertions(+)
 create mode 100644 crates/swc_ecma_ast/src/glimmer.rs

diff --git a/crates/swc_ecma_ast/src/class.rs b/crates/swc_ecma_ast/src/class.rs
index 975d48e9dd12..a117107343f0 100644
--- a/crates/swc_ecma_ast/src/class.rs
+++ b/crates/swc_ecma_ast/src/class.rs
@@ -6,6 +6,7 @@ use swc_common::{ast_node, util::take::Take, EqIgnoreSpan, Span, DUMMY_SP};
 use crate::{
     expr::Expr,
     function::{Function, ParamOrTsParamProp},
+    glimmer::GlimmerTemplate,
     ident::PrivateName,
     prop::PropName,
     stmt::BlockStmt,
@@ -88,6 +89,9 @@ pub enum ClassMember {
     /// Stage 3
     #[tag("AutoAccessor")]
     AutoAccessor(AutoAccessor),
+
+    #[tag("GlimmerTemplate")]
+    GlimmerTemplate(GlimmerTemplate),
 }
 
 impl Take for ClassMember {
diff --git a/crates/swc_ecma_ast/src/expr.rs b/crates/swc_ecma_ast/src/expr.rs
index e90e15f3ec59..29ce8ef1fb1a 100644
--- a/crates/swc_ecma_ast/src/expr.rs
+++ b/crates/swc_ecma_ast/src/expr.rs
@@ -15,6 +15,7 @@ use swc_common::{ast_node, util::take::Take, BytePos, EqIgnoreSpan, Span, Spanne
 use crate::{
     class::Class,
     function::Function,
+    glimmer::GlimmerTemplate,
     ident::{Ident, PrivateName},
     jsx::{JSXElement, JSXEmptyExpr, JSXFragment, JSXMemberExpr, JSXNamespacedName},
     lit::Lit,
@@ -143,6 +144,9 @@ pub enum Expr {
     #[tag("JSXFragment")]
     JSXFragment(JSXFragment),
 
+    #[tag("GlimmerTemplate")]
+    GlimmerTemplate(GlimmerTemplate),
+
     #[tag("TsTypeAssertion")]
     TsTypeAssertion(TsTypeAssertion),
 
@@ -268,6 +272,7 @@ impl Clone for Expr {
             JSXEmpty(e) => JSXEmpty(e.clone()),
             JSXElement(e) => JSXElement(e.clone()),
             JSXFragment(e) => JSXFragment(e.clone()),
+            GlimmerTemplate(e) => GlimmerTemplate(e.clone()),
             TsTypeAssertion(e) => TsTypeAssertion(e.clone()),
             TsConstAssertion(e) => TsConstAssertion(e.clone()),
             TsNonNull(e) => TsNonNull(e.clone()),
diff --git a/crates/swc_ecma_ast/src/glimmer.rs b/crates/swc_ecma_ast/src/glimmer.rs
new file mode 100644
index 000000000000..6999bc1a245d
--- /dev/null
+++ b/crates/swc_ecma_ast/src/glimmer.rs
@@ -0,0 +1,14 @@
+use swc_atoms::JsWord;
+use swc_common::{ast_node, EqIgnoreSpan, Span};
+
+#[ast_node("GlimmerTemplate")]
+#[derive(Eq, Hash, EqIgnoreSpan)]
+pub struct GlimmerTemplate {
+    pub span: Span,
+
+    #[cfg_attr(
+        any(feature = "rkyv-impl", feature = "rkyv-bytecheck-impl"),
+        with(swc_atoms::EncodeJsWord)
+    )]
+    pub contents: JsWord,
+}
diff --git a/crates/swc_ecma_ast/src/lib.rs b/crates/swc_ecma_ast/src/lib.rs
index 301c26afd774..237435bbe0d0 100644
--- a/crates/swc_ecma_ast/src/lib.rs
+++ b/crates/swc_ecma_ast/src/lib.rs
@@ -30,6 +30,7 @@ pub use self::{
         SuperPropExpr, TaggedTpl, ThisExpr, Tpl, TplElement, UnaryExpr, UpdateExpr, YieldExpr,
     },
     function::{Function, Param, ParamOrTsParamProp},
+    glimmer::GlimmerTemplate,
     ident::{BindingIdent, Id, Ident, IdentExt, PrivateName},
     jsx::{
         JSXAttr, JSXAttrName, JSXAttrOrSpread, JSXAttrValue, JSXClosingElement, JSXClosingFragment,
@@ -85,6 +86,7 @@ mod class;
 mod decl;
 mod expr;
 mod function;
+mod glimmer;
 mod ident;
 mod jsx;
 mod list;
diff --git a/crates/swc_ecma_parser/src/lexer/mod.rs b/crates/swc_ecma_parser/src/lexer/mod.rs
index d513df1658c8..7a81a7f25cb8 100644
--- a/crates/swc_ecma_parser/src/lexer/mod.rs
+++ b/crates/swc_ecma_parser/src/lexer/mod.rs
@@ -21,6 +21,7 @@ pub use self::{
 };
 use crate::{
     error::{Error, SyntaxError},
+    lexer::state::GlimmerTemplateState,
     token::*,
     Context, Syntax,
 };
@@ -634,6 +635,35 @@ impl<'a> Lexer<'a> {
         }))
     }
 
+    fn read_glimmer_template(&mut self) -> LexResult<Token> {
+        let start = self.cur_pos();
+        loop {
+            if !self.cur().is_some() {
+                return self.error(start, SyntaxError::Eof);
+            }
+            if self.is_str("</template>") {
+                self.state.glimmer_template = GlimmerTemplateState::Ending;
+                let slice_end = self.cur_pos();
+                return Ok(GlimmerTemplateContent {
+                    value: self.input.slice(start, slice_end).into(),
+                });
+            }
+            self.bump();
+        }
+    }
+
+    fn end_glimmer_template(&mut self) -> LexResult<Token> {
+        let start = self.cur_pos();
+        if !self.cur().is_some() || !self.is_str("</template>") {
+            return self.error(start, SyntaxError::Eof);
+        }
+        for _ in 0..11 {
+            self.bump();
+        }
+        self.state.glimmer_template = GlimmerTemplateState::None;
+        return Ok(GlimmerTemplateEnd);
+    }
+
     #[inline(never)]
     fn read_token_lt_gt(&mut self) -> LexResult<Option<Token>> {
         debug_assert!(self.cur() == Some('<') || self.cur() == Some('>'));
@@ -643,6 +673,15 @@ impl<'a> Lexer<'a> {
         let c = self.cur().unwrap();
         self.bump();
 
+        if c == '<' && self.is_str("template>") {
+            // consume the rest of the opening <template> tag
+            for _ in 0..9 {
+                self.bump();
+            }
+            self.state.glimmer_template = GlimmerTemplateState::Reading;
+            return Ok(Some(GlimmerTemplateStart));
+        }
+
         // XML style comment. `<!--`
         if c == '<' && self.is(b'!') && self.peek() == Some('-') && self.peek_ahead() == Some('-') {
             self.skip_line_comment(3);
diff --git a/crates/swc_ecma_parser/src/lexer/state.rs b/crates/swc_ecma_parser/src/lexer/state.rs
index 363b8d6edbd7..d65ca0676dbb 100644
--- a/crates/swc_ecma_parser/src/lexer/state.rs
+++ b/crates/swc_ecma_parser/src/lexer/state.rs
@@ -37,6 +37,15 @@ pub(super) struct State {
     syntax: Syntax,
 
     token_type: Option<TokenType>,
+
+    pub glimmer_template: GlimmerTemplateState,
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub enum GlimmerTemplateState {
+    None,
+    Reading,
+    Ending,
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -198,6 +207,14 @@ impl<'a> Iterator for Lexer<'a> {
         let mut start = self.cur_pos();
 
         let res = (|| -> Result<Option<_>, _> {
+            if self.state.glimmer_template == GlimmerTemplateState::Reading {
+                return Ok(Some(self.read_glimmer_template()?));
+            }
+
+            if self.state.glimmer_template == GlimmerTemplateState::Ending {
+                return Ok(Some(self.end_glimmer_template()?));
+            }
+
             if let Some(start) = self.state.next_regexp {
                 return Ok(Some(self.read_regexp(start)?));
             }
@@ -387,6 +404,7 @@ impl State {
             line_start: BytePos(0),
             cur_line: 1,
             syntax,
+            glimmer_template: GlimmerTemplateState::None,
         }
     }
 }
diff --git a/crates/swc_ecma_parser/src/macros.rs b/crates/swc_ecma_parser/src/macros.rs
index b63d34bff5e1..a224f3b1ffff 100644
--- a/crates/swc_ecma_parser/src/macros.rs
+++ b/crates/swc_ecma_parser/src/macros.rs
@@ -300,6 +300,14 @@ macro_rules! tok {
         crate::token::Token::JSXTagEnd
     };
 
+    (GlimmerTemplateStart) => {
+        crate::token::Token::GlimmerTemplateStart
+    };
+
+    (GlimmerTemplateEnd) => {
+        crate::token::Token::GlimmerTemplateEnd
+    };
+
     // ----------
     // Typescript
     // ----------
diff --git a/crates/swc_ecma_parser/src/parser/class_and_fn.rs b/crates/swc_ecma_parser/src/parser/class_and_fn.rs
index d1fe9d395a7e..ddac885af61d 100644
--- a/crates/swc_ecma_parser/src/parser/class_and_fn.rs
+++ b/crates/swc_ecma_parser/src/parser/class_and_fn.rs
@@ -379,6 +379,14 @@ impl<I: Tokens> Parser<I> {
         trace_cur!(self, parse_class_member);
 
         let start = cur_pos!(self);
+
+        if is!(self, GlimmerTemplateStart) {
+            return match self.parse_glimmer_template() {
+                Ok(glimmer_template) => Ok(ClassMember::GlimmerTemplate(glimmer_template)),
+                Err(err) => Err(err),
+            };
+        }
+
         let decorators = self.parse_decorators(false)?;
         let declare = self.syntax().typescript() && eat!(self, "declare");
         let accessibility = if self.input.syntax().typescript() {
diff --git a/crates/swc_ecma_parser/src/parser/expr.rs b/crates/swc_ecma_parser/src/parser/expr.rs
index 0728f870f61e..6a25be762ea2 100644
--- a/crates/swc_ecma_parser/src/parser/expr.rs
+++ b/crates/swc_ecma_parser/src/parser/expr.rs
@@ -393,6 +393,15 @@ impl<I: Tokens> Parser<I> {
                     return self.parse_paren_expr_or_arrow_fn(can_be_arrow, None);
                 }
 
+                Token::GlimmerTemplateStart => {
+                    return match self.parse_glimmer_template() {
+                        Ok(glimmer_template) => {
+                            Ok(Box::new(Expr::GlimmerTemplate(glimmer_template)))
+                        }
+                        Err(err) => Err(err),
+                    }
+                }
+
                 _ => {}
             }
         }
@@ -505,6 +514,25 @@ impl<I: Tokens> Parser<I> {
         syntax_error!(self, self.input.cur_span(), SyntaxError::TS1109)
     }
 
+    pub fn parse_glimmer_template(&mut self) -> PResult<GlimmerTemplate> {
+        assert_and_bump!(self, GlimmerTemplateStart);
+        let start = cur_pos!(self);
+
+        match bump!(self) {
+            Token::GlimmerTemplateContent { value } => {
+                let span = span!(self, start);
+                assert_and_bump!(self, GlimmerTemplateEnd);
+                return Ok(GlimmerTemplate {
+                    span,
+                    contents: value.into(),
+                });
+            }
+            _ => {
+                unexpected!(self, "glimmer template");
+            }
+        }
+    }
+
     #[cfg_attr(feature = "debug", tracing::instrument(skip_all))]
     fn parse_array_lit(&mut self) -> PResult<Box<Expr>> {
         trace_cur!(self, parse_array_lit);
diff --git a/crates/swc_ecma_parser/src/parser/util.rs b/crates/swc_ecma_parser/src/parser/util.rs
index 0c96d9f56742..5c70d2e33a9e 100644
--- a/crates/swc_ecma_parser/src/parser/util.rs
+++ b/crates/swc_ecma_parser/src/parser/util.rs
@@ -310,6 +310,8 @@ pub(super) trait ExprExt {
             | Expr::JSXElement(..)
             | Expr::JSXFragment(..) => false,
 
+            Expr::GlimmerTemplate(..) => false,
+
             // typescript
             Expr::TsNonNull(TsNonNullExpr { ref expr, .. })
             | Expr::TsTypeAssertion(TsTypeAssertion { ref expr, .. })
diff --git a/crates/swc_ecma_parser/src/token.rs b/crates/swc_ecma_parser/src/token.rs
index f5ca0e42defa..c4b44ea237ed 100644
--- a/crates/swc_ecma_parser/src/token.rs
+++ b/crates/swc_ecma_parser/src/token.rs
@@ -116,6 +116,12 @@ pub enum Token {
 
     Shebang(Atom),
     Error(Error),
+
+    GlimmerTemplateStart,
+    GlimmerTemplateContent {
+        value: JsWord,
+    },
+    GlimmerTemplateEnd,
 }
 
 impl Token {
@@ -671,6 +677,9 @@ impl Debug for Token {
             JSXTagEnd => write!(f, "> (jsx tag end)")?,
             Shebang(_) => write!(f, "#!")?,
             Token::Error(e) => write!(f, "<lexing error: {:?}>", e)?,
+            GlimmerTemplateStart => write!(f, "<template>")?,
+            GlimmerTemplateContent { value } => write!(f, "{}", value)?,
+            GlimmerTemplateEnd => write!(f, "</template>")?,
         }
 
         Ok(())

From 2a2686f74666e16797cc62386b4353d471035526 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Wed, 5 Apr 2023 22:04:29 -0400
Subject: [PATCH 02/16] use separate AST nodes for expression vs member

---
 crates/swc_ecma_ast/src/class.rs                | 15 +++++++++++++--
 crates/swc_ecma_ast/src/expr.rs                 | 17 ++++++++++++++---
 crates/swc_ecma_ast/src/glimmer.rs              | 14 --------------
 crates/swc_ecma_ast/src/lib.rs                  | 15 +++++++--------
 .../swc_ecma_parser/src/parser/class_and_fn.rs  |  5 ++++-
 crates/swc_ecma_parser/src/parser/expr.rs       |  4 ++--
 6 files changed, 40 insertions(+), 30 deletions(-)
 delete mode 100644 crates/swc_ecma_ast/src/glimmer.rs

diff --git a/crates/swc_ecma_ast/src/class.rs b/crates/swc_ecma_ast/src/class.rs
index a117107343f0..1e90bfab9dba 100644
--- a/crates/swc_ecma_ast/src/class.rs
+++ b/crates/swc_ecma_ast/src/class.rs
@@ -6,7 +6,6 @@ use swc_common::{ast_node, util::take::Take, EqIgnoreSpan, Span, DUMMY_SP};
 use crate::{
     expr::Expr,
     function::{Function, ParamOrTsParamProp},
-    glimmer::GlimmerTemplate,
     ident::PrivateName,
     prop::PropName,
     stmt::BlockStmt,
@@ -61,6 +60,18 @@ impl Take for Class {
     }
 }
 
+#[ast_node("GlimmerTemplateMember")]
+#[derive(Eq, Hash, EqIgnoreSpan)]
+pub struct GlimmerTemplateMember {
+    pub span: Span,
+
+    #[cfg_attr(
+        any(feature = "rkyv-impl", feature = "rkyv-bytecheck-impl"),
+        with(swc_atoms::EncodeJsWord)
+    )]
+    pub contents: swc_atoms::JsWord,
+}
+
 #[ast_node]
 #[derive(Eq, Hash, Is, EqIgnoreSpan)]
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
@@ -91,7 +102,7 @@ pub enum ClassMember {
     AutoAccessor(AutoAccessor),
 
     #[tag("GlimmerTemplate")]
-    GlimmerTemplate(GlimmerTemplate),
+    GlimmerTemplate(GlimmerTemplateMember),
 }
 
 impl Take for ClassMember {
diff --git a/crates/swc_ecma_ast/src/expr.rs b/crates/swc_ecma_ast/src/expr.rs
index 29ce8ef1fb1a..1066c629824e 100644
--- a/crates/swc_ecma_ast/src/expr.rs
+++ b/crates/swc_ecma_ast/src/expr.rs
@@ -9,13 +9,12 @@ use serde::{
     Deserialize, Deserializer,
 };
 use string_enum::StringEnum;
-use swc_atoms::{js_word, Atom};
+use swc_atoms::{js_word, Atom, JsWord};
 use swc_common::{ast_node, util::take::Take, BytePos, EqIgnoreSpan, Span, Spanned, DUMMY_SP};
 
 use crate::{
     class::Class,
     function::Function,
-    glimmer::GlimmerTemplate,
     ident::{Ident, PrivateName},
     jsx::{JSXElement, JSXEmptyExpr, JSXFragment, JSXMemberExpr, JSXNamespacedName},
     lit::Lit,
@@ -145,7 +144,7 @@ pub enum Expr {
     JSXFragment(JSXFragment),
 
     #[tag("GlimmerTemplate")]
-    GlimmerTemplate(GlimmerTemplate),
+    GlimmerTemplate(GlimmerTemplateExpression),
 
     #[tag("TsTypeAssertion")]
     TsTypeAssertion(TsTypeAssertion),
@@ -525,6 +524,18 @@ pub struct FnExpr {
     pub function: Box<Function>,
 }
 
+#[ast_node("GlimmerTemplateExpression")]
+#[derive(Eq, Hash, EqIgnoreSpan)]
+pub struct GlimmerTemplateExpression {
+    pub span: Span,
+
+    #[cfg_attr(
+        any(feature = "rkyv-impl", feature = "rkyv-bytecheck-impl"),
+        with(swc_atoms::EncodeJsWord)
+    )]
+    pub contents: JsWord,
+}
+
 impl Take for FnExpr {
     fn dummy() -> Self {
         FnExpr {
diff --git a/crates/swc_ecma_ast/src/glimmer.rs b/crates/swc_ecma_ast/src/glimmer.rs
deleted file mode 100644
index 6999bc1a245d..000000000000
--- a/crates/swc_ecma_ast/src/glimmer.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use swc_atoms::JsWord;
-use swc_common::{ast_node, EqIgnoreSpan, Span};
-
-#[ast_node("GlimmerTemplate")]
-#[derive(Eq, Hash, EqIgnoreSpan)]
-pub struct GlimmerTemplate {
-    pub span: Span,
-
-    #[cfg_attr(
-        any(feature = "rkyv-impl", feature = "rkyv-bytecheck-impl"),
-        with(swc_atoms::EncodeJsWord)
-    )]
-    pub contents: JsWord,
-}
diff --git a/crates/swc_ecma_ast/src/lib.rs b/crates/swc_ecma_ast/src/lib.rs
index 237435bbe0d0..160c8961c908 100644
--- a/crates/swc_ecma_ast/src/lib.rs
+++ b/crates/swc_ecma_ast/src/lib.rs
@@ -18,19 +18,19 @@ use swc_common::{ast_node, EqIgnoreSpan, Span};
 
 pub use self::{
     class::{
-        AutoAccessor, Class, ClassMember, ClassMethod, ClassProp, Constructor, Decorator, Key,
-        MethodKind, PrivateMethod, PrivateProp, StaticBlock,
+        AutoAccessor, Class, ClassMember, ClassMethod, ClassProp, Constructor, Decorator,
+        GlimmerTemplateMember, Key, MethodKind, PrivateMethod, PrivateProp, StaticBlock,
     },
     decl::{ClassDecl, Decl, FnDecl, VarDecl, VarDeclKind, VarDeclarator},
     expr::{
         ArrayLit, ArrowExpr, AssignExpr, AwaitExpr, BinExpr, BlockStmtOrExpr, CallExpr, Callee,
-        ClassExpr, CondExpr, Expr, ExprOrSpread, FnExpr, Import, MemberExpr, MemberProp,
-        MetaPropExpr, MetaPropKind, NewExpr, ObjectLit, OptCall, OptChainBase, OptChainExpr,
-        ParenExpr, PatOrExpr, PropOrSpread, SeqExpr, SpreadElement, Super, SuperProp,
-        SuperPropExpr, TaggedTpl, ThisExpr, Tpl, TplElement, UnaryExpr, UpdateExpr, YieldExpr,
+        ClassExpr, CondExpr, Expr, ExprOrSpread, FnExpr, GlimmerTemplateExpression, Import,
+        MemberExpr, MemberProp, MetaPropExpr, MetaPropKind, NewExpr, ObjectLit, OptCall,
+        OptChainBase, OptChainExpr, ParenExpr, PatOrExpr, PropOrSpread, SeqExpr, SpreadElement,
+        Super, SuperProp, SuperPropExpr, TaggedTpl, ThisExpr, Tpl, TplElement, UnaryExpr,
+        UpdateExpr, YieldExpr,
     },
     function::{Function, Param, ParamOrTsParamProp},
-    glimmer::GlimmerTemplate,
     ident::{BindingIdent, Id, Ident, IdentExt, PrivateName},
     jsx::{
         JSXAttr, JSXAttrName, JSXAttrOrSpread, JSXAttrValue, JSXClosingElement, JSXClosingFragment,
@@ -86,7 +86,6 @@ mod class;
 mod decl;
 mod expr;
 mod function;
-mod glimmer;
 mod ident;
 mod jsx;
 mod list;
diff --git a/crates/swc_ecma_parser/src/parser/class_and_fn.rs b/crates/swc_ecma_parser/src/parser/class_and_fn.rs
index ddac885af61d..ac944d5a28ce 100644
--- a/crates/swc_ecma_parser/src/parser/class_and_fn.rs
+++ b/crates/swc_ecma_parser/src/parser/class_and_fn.rs
@@ -382,7 +382,10 @@ impl<I: Tokens> Parser<I> {
 
         if is!(self, GlimmerTemplateStart) {
             return match self.parse_glimmer_template() {
-                Ok(glimmer_template) => Ok(ClassMember::GlimmerTemplate(glimmer_template)),
+                Ok(glimmer_template) => Ok(ClassMember::GlimmerTemplate(GlimmerTemplateMember {
+                    span: glimmer_template.span,
+                    contents: glimmer_template.contents,
+                })),
                 Err(err) => Err(err),
             };
         }
diff --git a/crates/swc_ecma_parser/src/parser/expr.rs b/crates/swc_ecma_parser/src/parser/expr.rs
index 6a25be762ea2..bc003702481d 100644
--- a/crates/swc_ecma_parser/src/parser/expr.rs
+++ b/crates/swc_ecma_parser/src/parser/expr.rs
@@ -514,7 +514,7 @@ impl<I: Tokens> Parser<I> {
         syntax_error!(self, self.input.cur_span(), SyntaxError::TS1109)
     }
 
-    pub fn parse_glimmer_template(&mut self) -> PResult<GlimmerTemplate> {
+    pub fn parse_glimmer_template(&mut self) -> PResult<GlimmerTemplateExpression> {
         assert_and_bump!(self, GlimmerTemplateStart);
         let start = cur_pos!(self);
 
@@ -522,7 +522,7 @@ impl<I: Tokens> Parser<I> {
             Token::GlimmerTemplateContent { value } => {
                 let span = span!(self, start);
                 assert_and_bump!(self, GlimmerTemplateEnd);
-                return Ok(GlimmerTemplate {
+                return Ok(GlimmerTemplateExpression {
                     span,
                     contents: value.into(),
                 });

From f1e77b95baf4b6a47e566f29577eb60701781762 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Wed, 5 Apr 2023 22:14:32 -0400
Subject: [PATCH 03/16] clarifying

---
 crates/swc_ecma_ast/src/class.rs                  | 2 +-
 crates/swc_ecma_ast/src/expr.rs                   | 4 ++--
 crates/swc_ecma_parser/src/parser/class_and_fn.rs | 9 ++++-----
 crates/swc_ecma_parser/src/parser/expr.rs         | 9 +++------
 crates/swc_ecma_parser/src/parser/util.rs         | 2 +-
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/crates/swc_ecma_ast/src/class.rs b/crates/swc_ecma_ast/src/class.rs
index 1e90bfab9dba..964eed6e5869 100644
--- a/crates/swc_ecma_ast/src/class.rs
+++ b/crates/swc_ecma_ast/src/class.rs
@@ -102,7 +102,7 @@ pub enum ClassMember {
     AutoAccessor(AutoAccessor),
 
     #[tag("GlimmerTemplate")]
-    GlimmerTemplate(GlimmerTemplateMember),
+    GlimmerTemplateMember(GlimmerTemplateMember),
 }
 
 impl Take for ClassMember {
diff --git a/crates/swc_ecma_ast/src/expr.rs b/crates/swc_ecma_ast/src/expr.rs
index 1066c629824e..304d45b133fc 100644
--- a/crates/swc_ecma_ast/src/expr.rs
+++ b/crates/swc_ecma_ast/src/expr.rs
@@ -144,7 +144,7 @@ pub enum Expr {
     JSXFragment(JSXFragment),
 
     #[tag("GlimmerTemplate")]
-    GlimmerTemplate(GlimmerTemplateExpression),
+    GlimmerTemplateExpression(GlimmerTemplateExpression),
 
     #[tag("TsTypeAssertion")]
     TsTypeAssertion(TsTypeAssertion),
@@ -271,7 +271,7 @@ impl Clone for Expr {
             JSXEmpty(e) => JSXEmpty(e.clone()),
             JSXElement(e) => JSXElement(e.clone()),
             JSXFragment(e) => JSXFragment(e.clone()),
-            GlimmerTemplate(e) => GlimmerTemplate(e.clone()),
+            GlimmerTemplateExpression(e) => GlimmerTemplateExpression(e.clone()),
             TsTypeAssertion(e) => TsTypeAssertion(e.clone()),
             TsConstAssertion(e) => TsConstAssertion(e.clone()),
             TsNonNull(e) => TsNonNull(e.clone()),
diff --git a/crates/swc_ecma_parser/src/parser/class_and_fn.rs b/crates/swc_ecma_parser/src/parser/class_and_fn.rs
index ac944d5a28ce..133c1241c758 100644
--- a/crates/swc_ecma_parser/src/parser/class_and_fn.rs
+++ b/crates/swc_ecma_parser/src/parser/class_and_fn.rs
@@ -381,13 +381,12 @@ impl<I: Tokens> Parser<I> {
         let start = cur_pos!(self);
 
         if is!(self, GlimmerTemplateStart) {
-            return match self.parse_glimmer_template() {
-                Ok(glimmer_template) => Ok(ClassMember::GlimmerTemplate(GlimmerTemplateMember {
+            return self.parse_glimmer_template().map(|glimmer_template| {
+                ClassMember::GlimmerTemplateMember(GlimmerTemplateMember {
                     span: glimmer_template.span,
                     contents: glimmer_template.contents,
-                })),
-                Err(err) => Err(err),
-            };
+                })
+            });
         }
 
         let decorators = self.parse_decorators(false)?;
diff --git a/crates/swc_ecma_parser/src/parser/expr.rs b/crates/swc_ecma_parser/src/parser/expr.rs
index bc003702481d..e7f423a1c0f5 100644
--- a/crates/swc_ecma_parser/src/parser/expr.rs
+++ b/crates/swc_ecma_parser/src/parser/expr.rs
@@ -394,12 +394,9 @@ impl<I: Tokens> Parser<I> {
                 }
 
                 Token::GlimmerTemplateStart => {
-                    return match self.parse_glimmer_template() {
-                        Ok(glimmer_template) => {
-                            Ok(Box::new(Expr::GlimmerTemplate(glimmer_template)))
-                        }
-                        Err(err) => Err(err),
-                    }
+                    return self.parse_glimmer_template().map(|glimmer_template| {
+                        Box::new(Expr::GlimmerTemplateExpression(glimmer_template))
+                    })
                 }
 
                 _ => {}
diff --git a/crates/swc_ecma_parser/src/parser/util.rs b/crates/swc_ecma_parser/src/parser/util.rs
index 5c70d2e33a9e..29d6d12e4fe3 100644
--- a/crates/swc_ecma_parser/src/parser/util.rs
+++ b/crates/swc_ecma_parser/src/parser/util.rs
@@ -310,7 +310,7 @@ pub(super) trait ExprExt {
             | Expr::JSXElement(..)
             | Expr::JSXFragment(..) => false,
 
-            Expr::GlimmerTemplate(..) => false,
+            Expr::GlimmerTemplateExpression(..) => false,
 
             // typescript
             Expr::TsNonNull(TsNonNullExpr { ref expr, .. })

From 1135943e07fe15d1cd438071b6ef35041323f881 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Tue, 25 Apr 2023 16:00:06 -0400
Subject: [PATCH 04/16] type completeness

---
 .vscode/settings.json                                |  5 +++--
 crates/swc_ecma_codegen/src/lib.rs                   | 12 ++++++++++++
 crates/swc_ecma_codegen/src/util.rs                  |  2 ++
 .../src/compress/optimize/sequences.rs               |  1 +
 crates/swc_ecma_minifier/src/util/size.rs            |  1 +
 crates/swc_ecma_quote_macros/src/ast/class.rs        |  2 ++
 crates/swc_ecma_quote_macros/src/ast/expr.rs         |  5 ++++-
 crates/swc_ecma_quote_macros/src/ast/mod.rs          |  3 ++-
 .../src/es2015/classes/mod.rs                        |  3 +++
 .../src/es2015/destructuring.rs                      |  1 +
 .../src/es2022/class_properties/mod.rs               |  5 +++++
 .../src/simplify/dce/mod.rs                          |  1 +
 crates/swc_ecma_utils/src/lib.rs                     |  4 ++++
 crates/swc_ecma_visit/src/lib.rs                     |  2 ++
 crates/swc_estree_compat/src/babelify/class.rs       |  1 +
 crates/swc_estree_compat/src/babelify/expr.rs        |  4 ++++
 16 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 206e9cbd61d2..c0503319b257 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -35,5 +35,6 @@
         "rust-analyzer",
         "rkyv-impl",
         "debug"
-    ]
-}
\ No newline at end of file
+    ],
+    "editor.inlayHints.enabled": "off"
+}
diff --git a/crates/swc_ecma_codegen/src/lib.rs b/crates/swc_ecma_codegen/src/lib.rs
index d7c5e0d85860..17722c6135e3 100644
--- a/crates/swc_ecma_codegen/src/lib.rs
+++ b/crates/swc_ecma_codegen/src/lib.rs
@@ -802,6 +802,7 @@ where
             Expr::TsSatisfies(n) => {
                 emit!(n)
             }
+            Expr::GlimmerTemplateExpression(ref n) => emit!(n),
         }
 
         if self.comments.is_some() {
@@ -847,6 +848,16 @@ where
         self.wr.write_str_lit(n.span, "<invalid>")?;
     }
 
+    #[emitter]
+    fn emit_glimmer_template_expr(&mut self, n: &GlimmerTemplateExpression) -> Result {
+        self.wr.write_str_lit(n.span, "<template goes here>")?;
+    }
+
+    #[emitter]
+    fn emit_glimmer_template_member(&mut self, n: &GlimmerTemplateMember) -> Result {
+        self.wr.write_str_lit(n.span, "<template goes here>")?;
+    }
+
     #[emitter]
     fn emit_call_expr(&mut self, node: &CallExpr) -> Result {
         self.wr.commit_pending_semi()?;
@@ -1273,6 +1284,7 @@ where
             ClassMember::Empty(ref n) => emit!(n),
             ClassMember::StaticBlock(ref n) => emit!(n),
             ClassMember::AutoAccessor(ref n) => emit!(n),
+            ClassMember::GlimmerTemplateMember(ref n) => emit!(n),
         }
     }
 
diff --git a/crates/swc_ecma_codegen/src/util.rs b/crates/swc_ecma_codegen/src/util.rs
index e765f8a80d6a..80d424bc3336 100644
--- a/crates/swc_ecma_codegen/src/util.rs
+++ b/crates/swc_ecma_codegen/src/util.rs
@@ -149,6 +149,8 @@ impl StartsWithAlphaNum for Expr {
                 OptChainBase::Call(base) => base.callee.starts_with_alpha_num(),
             },
 
+            Expr::GlimmerTemplateExpression(..) => false,
+
             Expr::Invalid(..) => true,
         }
     }
diff --git a/crates/swc_ecma_minifier/src/compress/optimize/sequences.rs b/crates/swc_ecma_minifier/src/compress/optimize/sequences.rs
index 370681be0200..a75ecdfb93d0 100644
--- a/crates/swc_ecma_minifier/src/compress/optimize/sequences.rs
+++ b/crates/swc_ecma_minifier/src/compress/optimize/sequences.rs
@@ -1213,6 +1213,7 @@ where
             }
 
             Expr::Lit(..) => true,
+            Expr::GlimmerTemplateExpression(..) => true,
 
             Expr::Yield(..) | Expr::Await(..) => false,
 
diff --git a/crates/swc_ecma_minifier/src/util/size.rs b/crates/swc_ecma_minifier/src/util/size.rs
index 386b1d1040c2..9db07d185462 100644
--- a/crates/swc_ecma_minifier/src/util/size.rs
+++ b/crates/swc_ecma_minifier/src/util/size.rs
@@ -199,6 +199,7 @@ impl SizeWithCtxt for Expr {
             Expr::TsAs(_) => TODO,
             Expr::TsInstantiation(_) => TODO,
             Expr::TsSatisfies(_) => TODO,
+            Expr::GlimmerTemplateExpression(_) => TODO,
         }
     }
 }
diff --git a/crates/swc_ecma_quote_macros/src/ast/class.rs b/crates/swc_ecma_quote_macros/src/ast/class.rs
index decd01eab9d3..62e289e354ed 100644
--- a/crates/swc_ecma_quote_macros/src/ast/class.rs
+++ b/crates/swc_ecma_quote_macros/src/ast/class.rs
@@ -82,3 +82,5 @@ impl_struct!(
         accessibility
     ]
 );
+
+impl_struct!(GlimmerTemplateMember, [span, contents]);
diff --git a/crates/swc_ecma_quote_macros/src/ast/expr.rs b/crates/swc_ecma_quote_macros/src/ast/expr.rs
index 75e1f6af819b..d2d7961dd30d 100644
--- a/crates/swc_ecma_quote_macros/src/ast/expr.rs
+++ b/crates/swc_ecma_quote_macros/src/ast/expr.rs
@@ -41,7 +41,8 @@ impl_enum!(
         TsSatisfies,
         PrivateName,
         OptChain,
-        Invalid
+        Invalid,
+        GlimmerTemplateExpression
     ],
     true
 );
@@ -136,3 +137,5 @@ impl_enum!(JSXExpr, [Expr, JSXEmptyExpr]);
 impl_struct!(OptCall, [span, callee, args, type_args]);
 
 impl_enum!(Callee, [Super, Import, Expr]);
+
+impl_struct!(GlimmerTemplateExpression, [span, contents]);
diff --git a/crates/swc_ecma_quote_macros/src/ast/mod.rs b/crates/swc_ecma_quote_macros/src/ast/mod.rs
index aecd85dd9e43..fd308ad32c3c 100644
--- a/crates/swc_ecma_quote_macros/src/ast/mod.rs
+++ b/crates/swc_ecma_quote_macros/src/ast/mod.rs
@@ -157,7 +157,8 @@ impl_enum!(
         TsIndexSignature,
         Empty,
         StaticBlock,
-        AutoAccessor
+        AutoAccessor,
+        GlimmerTemplateMember
     ]
 );
 impl_enum!(ObjectPatProp, [KeyValue, Assign, Rest]);
diff --git a/crates/swc_ecma_transforms_compat/src/es2015/classes/mod.rs b/crates/swc_ecma_transforms_compat/src/es2015/classes/mod.rs
index 27719cc14dc7..00d3d8c77fd6 100644
--- a/crates/swc_ecma_transforms_compat/src/es2015/classes/mod.rs
+++ b/crates/swc_ecma_transforms_compat/src/es2015/classes/mod.rs
@@ -563,6 +563,9 @@ where
                 ClassMember::StaticBlock(..) => unreachable!(
                     "classes pass: static blocks\nstatic_blocks pass should remove this"
                 ),
+                ClassMember::GlimmerTemplateMember(..) => unreachable!(
+                    "classes pass: glimmer template member\ntranspiler should remove this"
+                ),
                 ClassMember::AutoAccessor(..) => {
                     unreachable!(
                         "classes pass: auto accessor \nauto_accesssors pass should remove this"
diff --git a/crates/swc_ecma_transforms_compat/src/es2015/destructuring.rs b/crates/swc_ecma_transforms_compat/src/es2015/destructuring.rs
index b14c42a5b722..40d4fbf26537 100644
--- a/crates/swc_ecma_transforms_compat/src/es2015/destructuring.rs
+++ b/crates/swc_ecma_transforms_compat/src/es2015/destructuring.rs
@@ -1159,6 +1159,7 @@ fn can_be_null(e: &Expr) -> bool {
         | Expr::MetaProp(..) => true,
 
         Expr::Lit(..) => false,
+        Expr::GlimmerTemplateExpression(..) => false,
 
         Expr::Array(..)
         | Expr::Arrow(..)
diff --git a/crates/swc_ecma_transforms_compat/src/es2022/class_properties/mod.rs b/crates/swc_ecma_transforms_compat/src/es2022/class_properties/mod.rs
index 046c5b4b3776..cb78c9b944a1 100644
--- a/crates/swc_ecma_transforms_compat/src/es2022/class_properties/mod.rs
+++ b/crates/swc_ecma_transforms_compat/src/es2022/class_properties/mod.rs
@@ -537,6 +537,7 @@ impl<C: Comments> ClassProperties<C> {
             ClassMember::ClassProp(_)
             | ClassMember::AutoAccessor(_)
             | ClassMember::PrivateProp(_)
+            | ClassMember::GlimmerTemplateMember(_)
             | ClassMember::StaticBlock(_) => true,
         });
 
@@ -935,6 +936,10 @@ impl<C: Comments> ClassProperties<C> {
                     unreachable!("static_blocks pass should remove this")
                 }
 
+                ClassMember::GlimmerTemplateMember(..) => {
+                    unreachable!("glimmer template compiler pass should remove this")
+                }
+
                 ClassMember::AutoAccessor(..) => {
                     unreachable!("auto_accessor pass should remove this")
                 }
diff --git a/crates/swc_ecma_transforms_optimization/src/simplify/dce/mod.rs b/crates/swc_ecma_transforms_optimization/src/simplify/dce/mod.rs
index 05fb002617cd..f4bccab6f40e 100644
--- a/crates/swc_ecma_transforms_optimization/src/simplify/dce/mod.rs
+++ b/crates/swc_ecma_transforms_optimization/src/simplify/dce/mod.rs
@@ -731,6 +731,7 @@ impl VisitMut for TreeShaker {
                             .map_or(false, |e| e.may_have_side_effects(&self.expr_ctx)),
 
                         ClassMember::StaticBlock(_) => false,
+                        ClassMember::GlimmerTemplateMember(_) => false,
 
                         ClassMember::TsIndexSignature(_)
                         | ClassMember::Empty(_)
diff --git a/crates/swc_ecma_utils/src/lib.rs b/crates/swc_ecma_utils/src/lib.rs
index 938755a14ff8..f1c2616fc328 100644
--- a/crates/swc_ecma_utils/src/lib.rs
+++ b/crates/swc_ecma_utils/src/lib.rs
@@ -1516,6 +1516,8 @@ pub trait ExprExt {
                 expr.may_have_side_effects(ctx)
             }
 
+            Expr::GlimmerTemplateExpression(..) => false,
+
             Expr::Invalid(..) => true,
         }
     }
@@ -2593,6 +2595,8 @@ impl ExprCtx {
                 self.extract_side_effects_to(to, (*child).into())
             }
 
+            Expr::GlimmerTemplateExpression(..) => {}
+
             Expr::Invalid(..) => unreachable!(),
         }
     }
diff --git a/crates/swc_ecma_visit/src/lib.rs b/crates/swc_ecma_visit/src/lib.rs
index ab4ff87a48b1..d0a149f253f2 100644
--- a/crates/swc_ecma_visit/src/lib.rs
+++ b/crates/swc_ecma_visit/src/lib.rs
@@ -558,6 +558,7 @@ define!({
         Empty(EmptyStmt),
         StaticBlock(StaticBlock),
         AutoAccessor(AutoAccessor),
+        GlimmerTemplateMember(GlimmerTemplateMember),
     }
 
     pub struct ClassProp {
@@ -706,6 +707,7 @@ define!({
         PrivateName(PrivateName),
         OptChain(OptChainExpr),
         Invalid(Invalid),
+        GlimmerTemplateExpression(GlimmerTemplateExpression),
     }
     pub struct ThisExpr {
         pub span: Span,
diff --git a/crates/swc_estree_compat/src/babelify/class.rs b/crates/swc_estree_compat/src/babelify/class.rs
index 2002f0f3a49a..d791bb816f92 100644
--- a/crates/swc_estree_compat/src/babelify/class.rs
+++ b/crates/swc_estree_compat/src/babelify/class.rs
@@ -61,6 +61,7 @@ impl Babelify for ClassMember {
             ),
             ClassMember::StaticBlock(s) => ClassBodyEl::StaticBlock(s.babelify(ctx)),
             ClassMember::AutoAccessor(..) => todo!("auto accessor"),
+            ClassMember::GlimmerTemplateMember(..) => todo!("glimmer template member"),
         }
     }
 }
diff --git a/crates/swc_estree_compat/src/babelify/expr.rs b/crates/swc_estree_compat/src/babelify/expr.rs
index cb1a990531e8..16d0755e0c53 100644
--- a/crates/swc_estree_compat/src/babelify/expr.rs
+++ b/crates/swc_estree_compat/src/babelify/expr.rs
@@ -169,6 +169,10 @@ impl Babelify for Expr {
                 "illegal conversion: Cannot convert {:?} to ExprOutput - babel has no equivalent",
                 &self
             ),
+            Expr::GlimmerTemplateExpression(_) => panic!(
+                "illegal conversion: Cannot convert {:?} to ExprOutput - babel has no equivalent",
+                &self
+            ),
         }
     }
 }

From b7ed37e1b67a1003590d1e6e96c0dfa8ef95e49a Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Tue, 25 Apr 2023 16:23:53 -0400
Subject: [PATCH 05/16] correct emitter

---
 crates/swc_ecma_codegen/src/lib.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/crates/swc_ecma_codegen/src/lib.rs b/crates/swc_ecma_codegen/src/lib.rs
index 17722c6135e3..b9ca21efb968 100644
--- a/crates/swc_ecma_codegen/src/lib.rs
+++ b/crates/swc_ecma_codegen/src/lib.rs
@@ -850,12 +850,16 @@ where
 
     #[emitter]
     fn emit_glimmer_template_expr(&mut self, n: &GlimmerTemplateExpression) -> Result {
-        self.wr.write_str_lit(n.span, "<template goes here>")?;
+        self.wr.write_str_lit(n.span, "<template>")?;
+        self.wr.write_str_lit(n.span, &n.contents)?;
+        self.wr.write_str_lit(n.span, "</template>")?;
     }
 
     #[emitter]
     fn emit_glimmer_template_member(&mut self, n: &GlimmerTemplateMember) -> Result {
-        self.wr.write_str_lit(n.span, "<template goes here>")?;
+        self.wr.write_str_lit(n.span, "<template>")?;
+        self.wr.write_str_lit(n.span, &n.contents)?;
+        self.wr.write_str_lit(n.span, "</template>")?;
     }
 
     #[emitter]

From fb558aaf0e5de35a522e17c5fd506ff4221a4604 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Thu, 25 May 2023 10:20:20 -0400
Subject: [PATCH 06/16] renaming to content tag

---
 crates/swc_ecma_ast/src/class.rs                   |  8 ++++----
 crates/swc_ecma_ast/src/expr.rs                    | 10 +++++-----
 crates/swc_ecma_ast/src/lib.rs                     | 13 ++++++-------
 crates/swc_ecma_codegen/src/lib.rs                 |  8 ++++----
 crates/swc_ecma_codegen/src/util.rs                |  2 +-
 .../src/compress/optimize/sequences.rs             |  2 +-
 crates/swc_ecma_minifier/src/util/size.rs          |  2 +-
 crates/swc_ecma_parser/src/lexer/mod.rs            | 14 +++++++-------
 crates/swc_ecma_parser/src/lexer/state.rs          | 10 +++++-----
 crates/swc_ecma_parser/src/macros.rs               |  8 ++++----
 crates/swc_ecma_parser/src/parser/class_and_fn.rs  |  4 ++--
 crates/swc_ecma_parser/src/parser/expr.rs          | 14 +++++++-------
 crates/swc_ecma_parser/src/parser/util.rs          |  2 +-
 crates/swc_ecma_parser/src/token.rs                | 12 ++++++------
 crates/swc_ecma_quote_macros/src/ast/class.rs      |  2 +-
 crates/swc_ecma_quote_macros/src/ast/expr.rs       |  4 ++--
 crates/swc_ecma_quote_macros/src/ast/mod.rs        |  2 +-
 .../src/es2015/classes/mod.rs                      |  2 +-
 .../src/es2015/destructuring.rs                    |  2 +-
 .../src/es2022/class_properties/mod.rs             |  4 ++--
 .../src/simplify/dce/mod.rs                        |  2 +-
 crates/swc_ecma_utils/src/lib.rs                   |  4 ++--
 crates/swc_ecma_visit/src/lib.rs                   |  4 ++--
 crates/swc_estree_compat/src/babelify/class.rs     |  2 +-
 crates/swc_estree_compat/src/babelify/expr.rs      |  2 +-
 25 files changed, 69 insertions(+), 70 deletions(-)

diff --git a/crates/swc_ecma_ast/src/class.rs b/crates/swc_ecma_ast/src/class.rs
index e22d8c65a133..2a01a672c4bb 100644
--- a/crates/swc_ecma_ast/src/class.rs
+++ b/crates/swc_ecma_ast/src/class.rs
@@ -58,9 +58,9 @@ impl Take for Class {
     }
 }
 
-#[ast_node("GlimmerTemplateMember")]
+#[ast_node("ContentTagMember")]
 #[derive(Eq, Hash, EqIgnoreSpan)]
-pub struct GlimmerTemplateMember {
+pub struct ContentTagMember {
     pub span: Span,
 
     #[cfg_attr(
@@ -99,8 +99,8 @@ pub enum ClassMember {
     #[tag("AutoAccessor")]
     AutoAccessor(AutoAccessor),
 
-    #[tag("GlimmerTemplate")]
-    GlimmerTemplateMember(GlimmerTemplateMember),
+    #[tag("ContentTag")]
+    ContentTagMember(ContentTagMember),
 }
 
 impl Take for ClassMember {
diff --git a/crates/swc_ecma_ast/src/expr.rs b/crates/swc_ecma_ast/src/expr.rs
index 47b4d8996652..fffe89bdf1e9 100644
--- a/crates/swc_ecma_ast/src/expr.rs
+++ b/crates/swc_ecma_ast/src/expr.rs
@@ -141,8 +141,8 @@ pub enum Expr {
     #[tag("JSXFragment")]
     JSXFragment(JSXFragment),
 
-    #[tag("GlimmerTemplate")]
-    GlimmerTemplateExpression(GlimmerTemplateExpression),
+    #[tag("ContentTag")]
+    ContentTagExpression(ContentTagExpression),
 
     #[tag("TsTypeAssertion")]
     TsTypeAssertion(TsTypeAssertion),
@@ -269,7 +269,7 @@ impl Clone for Expr {
             JSXEmpty(e) => JSXEmpty(e.clone()),
             JSXElement(e) => JSXElement(e.clone()),
             JSXFragment(e) => JSXFragment(e.clone()),
-            GlimmerTemplateExpression(e) => GlimmerTemplateExpression(e.clone()),
+            ContentTagExpression(e) => ContentTagExpression(e.clone()),
             TsTypeAssertion(e) => TsTypeAssertion(e.clone()),
             TsConstAssertion(e) => TsConstAssertion(e.clone()),
             TsNonNull(e) => TsNonNull(e.clone()),
@@ -522,9 +522,9 @@ pub struct FnExpr {
     pub function: Box<Function>,
 }
 
-#[ast_node("GlimmerTemplateExpression")]
+#[ast_node("ContentTagExpression")]
 #[derive(Eq, Hash, EqIgnoreSpan)]
-pub struct GlimmerTemplateExpression {
+pub struct ContentTagExpression {
     pub span: Span,
 
     #[cfg_attr(
diff --git a/crates/swc_ecma_ast/src/lib.rs b/crates/swc_ecma_ast/src/lib.rs
index 90c721023a1a..3676fba570d9 100644
--- a/crates/swc_ecma_ast/src/lib.rs
+++ b/crates/swc_ecma_ast/src/lib.rs
@@ -15,17 +15,16 @@ use swc_common::{ast_node, EqIgnoreSpan, Span};
 
 pub use self::{
     class::{
-        AutoAccessor, Class, ClassMember, ClassMethod, ClassProp, Constructor, Decorator,
-        GlimmerTemplateMember, Key, MethodKind, PrivateMethod, PrivateProp, StaticBlock,
+        AutoAccessor, Class, ClassMember, ClassMethod, ClassProp, Constructor, ContentTagMember,
+        Decorator, Key, MethodKind, PrivateMethod, PrivateProp, StaticBlock,
     },
     decl::{ClassDecl, Decl, FnDecl, UsingDecl, VarDecl, VarDeclKind, VarDeclarator},
     expr::{
         ArrayLit, ArrowExpr, AssignExpr, AwaitExpr, BinExpr, BlockStmtOrExpr, CallExpr, Callee,
-        ClassExpr, CondExpr, Expr, ExprOrSpread, FnExpr, GlimmerTemplateExpression, Import,
-        MemberExpr, MemberProp, MetaPropExpr, MetaPropKind, NewExpr, ObjectLit, OptCall,
-        OptChainBase, OptChainExpr, ParenExpr, PatOrExpr, PropOrSpread, SeqExpr, SpreadElement,
-        Super, SuperProp, SuperPropExpr, TaggedTpl, ThisExpr, Tpl, TplElement, UnaryExpr,
-        UpdateExpr, YieldExpr,
+        ClassExpr, CondExpr, ContentTagExpression, Expr, ExprOrSpread, FnExpr, Import, MemberExpr,
+        MemberProp, MetaPropExpr, MetaPropKind, NewExpr, ObjectLit, OptCall, OptChainBase,
+        OptChainExpr, ParenExpr, PatOrExpr, PropOrSpread, SeqExpr, SpreadElement, Super, SuperProp,
+        SuperPropExpr, TaggedTpl, ThisExpr, Tpl, TplElement, UnaryExpr, UpdateExpr, YieldExpr,
     },
     function::{Function, Param, ParamOrTsParamProp},
     ident::{BindingIdent, Id, Ident, IdentExt, PrivateName},
diff --git a/crates/swc_ecma_codegen/src/lib.rs b/crates/swc_ecma_codegen/src/lib.rs
index 068ce5293059..81e246a6f83d 100644
--- a/crates/swc_ecma_codegen/src/lib.rs
+++ b/crates/swc_ecma_codegen/src/lib.rs
@@ -798,7 +798,7 @@ where
             Expr::TsSatisfies(n) => {
                 emit!(n)
             }
-            Expr::GlimmerTemplateExpression(ref n) => emit!(n),
+            Expr::ContentTagExpression(ref n) => emit!(n),
         }
 
         if self.comments.is_some() {
@@ -845,14 +845,14 @@ where
     }
 
     #[emitter]
-    fn emit_glimmer_template_expr(&mut self, n: &GlimmerTemplateExpression) -> Result {
+    fn emit_glimmer_template_expr(&mut self, n: &ContentTagExpression) -> Result {
         self.wr.write_str_lit(n.span, "<template>")?;
         self.wr.write_str_lit(n.span, &n.contents)?;
         self.wr.write_str_lit(n.span, "</template>")?;
     }
 
     #[emitter]
-    fn emit_glimmer_template_member(&mut self, n: &GlimmerTemplateMember) -> Result {
+    fn emit_glimmer_template_member(&mut self, n: &ContentTagMember) -> Result {
         self.wr.write_str_lit(n.span, "<template>")?;
         self.wr.write_str_lit(n.span, &n.contents)?;
         self.wr.write_str_lit(n.span, "</template>")?;
@@ -1282,7 +1282,7 @@ where
             ClassMember::Empty(ref n) => emit!(n),
             ClassMember::StaticBlock(ref n) => emit!(n),
             ClassMember::AutoAccessor(ref n) => emit!(n),
-            ClassMember::GlimmerTemplateMember(ref n) => emit!(n),
+            ClassMember::ContentTagMember(ref n) => emit!(n),
         }
     }
 
diff --git a/crates/swc_ecma_codegen/src/util.rs b/crates/swc_ecma_codegen/src/util.rs
index f17291f77d51..e95aa9927d1a 100644
--- a/crates/swc_ecma_codegen/src/util.rs
+++ b/crates/swc_ecma_codegen/src/util.rs
@@ -162,7 +162,7 @@ impl StartsWithAlphaNum for Expr {
                 OptChainBase::Call(base) => base.callee.starts_with_alpha_num(),
             },
 
-            Expr::GlimmerTemplateExpression(..) => false,
+            Expr::ContentTagExpression(..) => false,
 
             Expr::Invalid(..) => true,
         }
diff --git a/crates/swc_ecma_minifier/src/compress/optimize/sequences.rs b/crates/swc_ecma_minifier/src/compress/optimize/sequences.rs
index 47081fe39a98..970849befec3 100644
--- a/crates/swc_ecma_minifier/src/compress/optimize/sequences.rs
+++ b/crates/swc_ecma_minifier/src/compress/optimize/sequences.rs
@@ -1242,7 +1242,7 @@ where
             }
 
             Expr::Lit(..) => true,
-            Expr::GlimmerTemplateExpression(..) => true,
+            Expr::ContentTagExpression(..) => true,
 
             Expr::Yield(..) | Expr::Await(..) => false,
 
diff --git a/crates/swc_ecma_minifier/src/util/size.rs b/crates/swc_ecma_minifier/src/util/size.rs
index 9db07d185462..a9720ccdf8c1 100644
--- a/crates/swc_ecma_minifier/src/util/size.rs
+++ b/crates/swc_ecma_minifier/src/util/size.rs
@@ -199,7 +199,7 @@ impl SizeWithCtxt for Expr {
             Expr::TsAs(_) => TODO,
             Expr::TsInstantiation(_) => TODO,
             Expr::TsSatisfies(_) => TODO,
-            Expr::GlimmerTemplateExpression(_) => TODO,
+            Expr::ContentTagExpression(_) => TODO,
         }
     }
 }
diff --git a/crates/swc_ecma_parser/src/lexer/mod.rs b/crates/swc_ecma_parser/src/lexer/mod.rs
index bafd1c2510fd..db586236074f 100644
--- a/crates/swc_ecma_parser/src/lexer/mod.rs
+++ b/crates/swc_ecma_parser/src/lexer/mod.rs
@@ -21,7 +21,7 @@ pub use self::{
 };
 use crate::{
     error::{Error, SyntaxError},
-    lexer::state::GlimmerTemplateState,
+    lexer::state::ContentTagState,
     token::*,
     Context, Syntax,
 };
@@ -636,9 +636,9 @@ impl<'a> Lexer<'a> {
                 return self.error(start, SyntaxError::Eof);
             }
             if self.is_str("</template>") {
-                self.state.glimmer_template = GlimmerTemplateState::Ending;
+                self.state.glimmer_template = ContentTagState::Ending;
                 let slice_end = self.cur_pos();
-                return Ok(GlimmerTemplateContent {
+                return Ok(ContentTagContent {
                     value: self.input.slice(start, slice_end).into(),
                 });
             }
@@ -654,8 +654,8 @@ impl<'a> Lexer<'a> {
         for _ in 0..11 {
             self.bump();
         }
-        self.state.glimmer_template = GlimmerTemplateState::None;
-        return Ok(GlimmerTemplateEnd);
+        self.state.glimmer_template = ContentTagState::None;
+        return Ok(ContentTagEnd);
     }
 
     #[inline(never)]
@@ -672,8 +672,8 @@ impl<'a> Lexer<'a> {
             for _ in 0..9 {
                 self.bump();
             }
-            self.state.glimmer_template = GlimmerTemplateState::Reading;
-            return Ok(Some(GlimmerTemplateStart));
+            self.state.glimmer_template = ContentTagState::Reading;
+            return Ok(Some(ContentTagStart));
         }
 
         if self.syntax.typescript() && self.ctx.in_type && !self.ctx.should_not_lex_lt_or_gt_as_type
diff --git a/crates/swc_ecma_parser/src/lexer/state.rs b/crates/swc_ecma_parser/src/lexer/state.rs
index 39c30bd33f5d..a62905edfcb7 100644
--- a/crates/swc_ecma_parser/src/lexer/state.rs
+++ b/crates/swc_ecma_parser/src/lexer/state.rs
@@ -38,11 +38,11 @@ pub(super) struct State {
 
     token_type: Option<TokenType>,
 
-    pub glimmer_template: GlimmerTemplateState,
+    pub glimmer_template: ContentTagState,
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum GlimmerTemplateState {
+pub enum ContentTagState {
     None,
     Reading,
     Ending,
@@ -207,11 +207,11 @@ impl<'a> Iterator for Lexer<'a> {
         let mut start = self.cur_pos();
 
         let res = (|| -> Result<Option<_>, _> {
-            if self.state.glimmer_template == GlimmerTemplateState::Reading {
+            if self.state.glimmer_template == ContentTagState::Reading {
                 return Ok(Some(self.read_glimmer_template()?));
             }
 
-            if self.state.glimmer_template == GlimmerTemplateState::Ending {
+            if self.state.glimmer_template == ContentTagState::Ending {
                 return Ok(Some(self.end_glimmer_template()?));
             }
 
@@ -394,7 +394,7 @@ impl State {
             line_start: BytePos(0),
             cur_line: 1,
             syntax,
-            glimmer_template: GlimmerTemplateState::None,
+            glimmer_template: ContentTagState::None,
         }
     }
 }
diff --git a/crates/swc_ecma_parser/src/macros.rs b/crates/swc_ecma_parser/src/macros.rs
index 73b401d693bd..60870479fd8a 100644
--- a/crates/swc_ecma_parser/src/macros.rs
+++ b/crates/swc_ecma_parser/src/macros.rs
@@ -300,12 +300,12 @@ macro_rules! tok {
         crate::token::Token::JSXTagEnd
     };
 
-    (GlimmerTemplateStart) => {
-        crate::token::Token::GlimmerTemplateStart
+    (ContentTagStart) => {
+        crate::token::Token::ContentTagStart
     };
 
-    (GlimmerTemplateEnd) => {
-        crate::token::Token::GlimmerTemplateEnd
+    (ContentTagEnd) => {
+        crate::token::Token::ContentTagEnd
     };
 
     // ----------
diff --git a/crates/swc_ecma_parser/src/parser/class_and_fn.rs b/crates/swc_ecma_parser/src/parser/class_and_fn.rs
index 8774ed10dad8..b3c1076af601 100644
--- a/crates/swc_ecma_parser/src/parser/class_and_fn.rs
+++ b/crates/swc_ecma_parser/src/parser/class_and_fn.rs
@@ -380,9 +380,9 @@ impl<I: Tokens> Parser<I> {
 
         let start = cur_pos!(self);
 
-        if is!(self, GlimmerTemplateStart) {
+        if is!(self, ContentTagStart) {
             return self.parse_glimmer_template().map(|glimmer_template| {
-                ClassMember::GlimmerTemplateMember(GlimmerTemplateMember {
+                ClassMember::ContentTagMember(ContentTagMember {
                     span: glimmer_template.span,
                     contents: glimmer_template.contents,
                 })
diff --git a/crates/swc_ecma_parser/src/parser/expr.rs b/crates/swc_ecma_parser/src/parser/expr.rs
index bc9e8992c670..a2085c4c5ef4 100644
--- a/crates/swc_ecma_parser/src/parser/expr.rs
+++ b/crates/swc_ecma_parser/src/parser/expr.rs
@@ -393,9 +393,9 @@ impl<I: Tokens> Parser<I> {
                     return self.parse_paren_expr_or_arrow_fn(can_be_arrow, None);
                 }
 
-                Token::GlimmerTemplateStart => {
+                Token::ContentTagStart => {
                     return self.parse_glimmer_template().map(|glimmer_template| {
-                        Box::new(Expr::GlimmerTemplateExpression(glimmer_template))
+                        Box::new(Expr::ContentTagExpression(glimmer_template))
                     })
                 }
 
@@ -511,15 +511,15 @@ impl<I: Tokens> Parser<I> {
         syntax_error!(self, self.input.cur_span(), SyntaxError::TS1109)
     }
 
-    pub fn parse_glimmer_template(&mut self) -> PResult<GlimmerTemplateExpression> {
-        assert_and_bump!(self, GlimmerTemplateStart);
+    pub fn parse_glimmer_template(&mut self) -> PResult<ContentTagExpression> {
+        assert_and_bump!(self, ContentTagStart);
         let start = cur_pos!(self);
 
         match bump!(self) {
-            Token::GlimmerTemplateContent { value } => {
+            Token::ContentTagContent { value } => {
                 let span = span!(self, start);
-                assert_and_bump!(self, GlimmerTemplateEnd);
-                return Ok(GlimmerTemplateExpression {
+                assert_and_bump!(self, ContentTagEnd);
+                return Ok(ContentTagExpression {
                     span,
                     contents: value.into(),
                 });
diff --git a/crates/swc_ecma_parser/src/parser/util.rs b/crates/swc_ecma_parser/src/parser/util.rs
index 29d6d12e4fe3..3ea6a0bed7a1 100644
--- a/crates/swc_ecma_parser/src/parser/util.rs
+++ b/crates/swc_ecma_parser/src/parser/util.rs
@@ -310,7 +310,7 @@ pub(super) trait ExprExt {
             | Expr::JSXElement(..)
             | Expr::JSXFragment(..) => false,
 
-            Expr::GlimmerTemplateExpression(..) => false,
+            Expr::ContentTagExpression(..) => false,
 
             // typescript
             Expr::TsNonNull(TsNonNullExpr { ref expr, .. })
diff --git a/crates/swc_ecma_parser/src/token.rs b/crates/swc_ecma_parser/src/token.rs
index e9cd25f19f51..40beaf41e9c0 100644
--- a/crates/swc_ecma_parser/src/token.rs
+++ b/crates/swc_ecma_parser/src/token.rs
@@ -115,11 +115,11 @@ pub enum Token {
     Shebang(Atom),
     Error(Error),
 
-    GlimmerTemplateStart,
-    GlimmerTemplateContent {
+    ContentTagStart,
+    ContentTagContent {
         value: JsWord,
     },
-    GlimmerTemplateEnd,
+    ContentTagEnd,
 }
 
 impl Token {
@@ -673,9 +673,9 @@ impl Debug for Token {
             JSXTagEnd => write!(f, "> (jsx tag end)")?,
             Shebang(_) => write!(f, "#!")?,
             Token::Error(e) => write!(f, "<lexing error: {:?}>", e)?,
-            GlimmerTemplateStart => write!(f, "<template>")?,
-            GlimmerTemplateContent { value } => write!(f, "{}", value)?,
-            GlimmerTemplateEnd => write!(f, "</template>")?,
+            ContentTagStart => write!(f, "<template>")?,
+            ContentTagContent { value } => write!(f, "{}", value)?,
+            ContentTagEnd => write!(f, "</template>")?,
         }
 
         Ok(())
diff --git a/crates/swc_ecma_quote_macros/src/ast/class.rs b/crates/swc_ecma_quote_macros/src/ast/class.rs
index 62e289e354ed..13f0db566995 100644
--- a/crates/swc_ecma_quote_macros/src/ast/class.rs
+++ b/crates/swc_ecma_quote_macros/src/ast/class.rs
@@ -83,4 +83,4 @@ impl_struct!(
     ]
 );
 
-impl_struct!(GlimmerTemplateMember, [span, contents]);
+impl_struct!(ContentTagMember, [span, contents]);
diff --git a/crates/swc_ecma_quote_macros/src/ast/expr.rs b/crates/swc_ecma_quote_macros/src/ast/expr.rs
index d2d7961dd30d..9bc298c45652 100644
--- a/crates/swc_ecma_quote_macros/src/ast/expr.rs
+++ b/crates/swc_ecma_quote_macros/src/ast/expr.rs
@@ -42,7 +42,7 @@ impl_enum!(
         PrivateName,
         OptChain,
         Invalid,
-        GlimmerTemplateExpression
+        ContentTagExpression
     ],
     true
 );
@@ -138,4 +138,4 @@ impl_struct!(OptCall, [span, callee, args, type_args]);
 
 impl_enum!(Callee, [Super, Import, Expr]);
 
-impl_struct!(GlimmerTemplateExpression, [span, contents]);
+impl_struct!(ContentTagExpression, [span, contents]);
diff --git a/crates/swc_ecma_quote_macros/src/ast/mod.rs b/crates/swc_ecma_quote_macros/src/ast/mod.rs
index fd308ad32c3c..6da4572d81a6 100644
--- a/crates/swc_ecma_quote_macros/src/ast/mod.rs
+++ b/crates/swc_ecma_quote_macros/src/ast/mod.rs
@@ -158,7 +158,7 @@ impl_enum!(
         Empty,
         StaticBlock,
         AutoAccessor,
-        GlimmerTemplateMember
+        ContentTagMember
     ]
 );
 impl_enum!(ObjectPatProp, [KeyValue, Assign, Rest]);
diff --git a/crates/swc_ecma_transforms_compat/src/es2015/classes/mod.rs b/crates/swc_ecma_transforms_compat/src/es2015/classes/mod.rs
index 6f350074f1ef..cb756eb29bea 100644
--- a/crates/swc_ecma_transforms_compat/src/es2015/classes/mod.rs
+++ b/crates/swc_ecma_transforms_compat/src/es2015/classes/mod.rs
@@ -563,7 +563,7 @@ where
                 ClassMember::StaticBlock(..) => unreachable!(
                     "classes pass: static blocks\nstatic_blocks pass should remove this"
                 ),
-                ClassMember::GlimmerTemplateMember(..) => unreachable!(
+                ClassMember::ContentTagMember(..) => unreachable!(
                     "classes pass: glimmer template member\ntranspiler should remove this"
                 ),
                 ClassMember::AutoAccessor(..) => {
diff --git a/crates/swc_ecma_transforms_compat/src/es2015/destructuring.rs b/crates/swc_ecma_transforms_compat/src/es2015/destructuring.rs
index b8b3ae7e9d5d..6977e4d1676b 100644
--- a/crates/swc_ecma_transforms_compat/src/es2015/destructuring.rs
+++ b/crates/swc_ecma_transforms_compat/src/es2015/destructuring.rs
@@ -1162,7 +1162,7 @@ fn can_be_null(e: &Expr) -> bool {
         | Expr::MetaProp(..) => true,
 
         Expr::Lit(..) => false,
-        Expr::GlimmerTemplateExpression(..) => false,
+        Expr::ContentTagExpression(..) => false,
 
         Expr::Array(..)
         | Expr::Arrow(..)
diff --git a/crates/swc_ecma_transforms_compat/src/es2022/class_properties/mod.rs b/crates/swc_ecma_transforms_compat/src/es2022/class_properties/mod.rs
index a1f4b97b09ad..2e46f40c8e3d 100644
--- a/crates/swc_ecma_transforms_compat/src/es2022/class_properties/mod.rs
+++ b/crates/swc_ecma_transforms_compat/src/es2022/class_properties/mod.rs
@@ -537,7 +537,7 @@ impl<C: Comments> ClassProperties<C> {
             ClassMember::ClassProp(_)
             | ClassMember::AutoAccessor(_)
             | ClassMember::PrivateProp(_)
-            | ClassMember::GlimmerTemplateMember(_)
+            | ClassMember::ContentTagMember(_)
             | ClassMember::StaticBlock(_) => true,
         });
 
@@ -930,7 +930,7 @@ impl<C: Comments> ClassProperties<C> {
                     unreachable!("static_blocks pass should remove this")
                 }
 
-                ClassMember::GlimmerTemplateMember(..) => {
+                ClassMember::ContentTagMember(..) => {
                     unreachable!("glimmer template compiler pass should remove this")
                 }
 
diff --git a/crates/swc_ecma_transforms_optimization/src/simplify/dce/mod.rs b/crates/swc_ecma_transforms_optimization/src/simplify/dce/mod.rs
index db30370666c2..52824611b7d4 100644
--- a/crates/swc_ecma_transforms_optimization/src/simplify/dce/mod.rs
+++ b/crates/swc_ecma_transforms_optimization/src/simplify/dce/mod.rs
@@ -731,7 +731,7 @@ impl VisitMut for TreeShaker {
                             .map_or(false, |e| e.may_have_side_effects(&self.expr_ctx)),
 
                         ClassMember::StaticBlock(_) => false,
-                        ClassMember::GlimmerTemplateMember(_) => false,
+                        ClassMember::ContentTagMember(_) => false,
 
                         ClassMember::TsIndexSignature(_)
                         | ClassMember::Empty(_)
diff --git a/crates/swc_ecma_utils/src/lib.rs b/crates/swc_ecma_utils/src/lib.rs
index 3d371e26fb85..fce9e19f0ac4 100644
--- a/crates/swc_ecma_utils/src/lib.rs
+++ b/crates/swc_ecma_utils/src/lib.rs
@@ -1516,7 +1516,7 @@ pub trait ExprExt {
                 expr.may_have_side_effects(ctx)
             }
 
-            Expr::GlimmerTemplateExpression(..) => false,
+            Expr::ContentTagExpression(..) => false,
 
             Expr::Invalid(..) => true,
         }
@@ -2595,7 +2595,7 @@ impl ExprCtx {
                 self.extract_side_effects_to(to, (*child).into())
             }
 
-            Expr::GlimmerTemplateExpression(..) => {}
+            Expr::ContentTagExpression(..) => {}
 
             Expr::Invalid(..) => unreachable!(),
         }
diff --git a/crates/swc_ecma_visit/src/lib.rs b/crates/swc_ecma_visit/src/lib.rs
index c931427a5a3b..3e9e3eb57e61 100644
--- a/crates/swc_ecma_visit/src/lib.rs
+++ b/crates/swc_ecma_visit/src/lib.rs
@@ -558,7 +558,7 @@ define!({
         Empty(EmptyStmt),
         StaticBlock(StaticBlock),
         AutoAccessor(AutoAccessor),
-        GlimmerTemplateMember(GlimmerTemplateMember),
+        ContentTagMember(ContentTagMember),
     }
 
     pub struct ClassProp {
@@ -708,7 +708,7 @@ define!({
         PrivateName(PrivateName),
         OptChain(OptChainExpr),
         Invalid(Invalid),
-        GlimmerTemplateExpression(GlimmerTemplateExpression),
+        ContentTagExpression(ContentTagExpression),
     }
     pub struct ThisExpr {
         pub span: Span,
diff --git a/crates/swc_estree_compat/src/babelify/class.rs b/crates/swc_estree_compat/src/babelify/class.rs
index d791bb816f92..d565535217f2 100644
--- a/crates/swc_estree_compat/src/babelify/class.rs
+++ b/crates/swc_estree_compat/src/babelify/class.rs
@@ -61,7 +61,7 @@ impl Babelify for ClassMember {
             ),
             ClassMember::StaticBlock(s) => ClassBodyEl::StaticBlock(s.babelify(ctx)),
             ClassMember::AutoAccessor(..) => todo!("auto accessor"),
-            ClassMember::GlimmerTemplateMember(..) => todo!("glimmer template member"),
+            ClassMember::ContentTagMember(..) => todo!("glimmer template member"),
         }
     }
 }
diff --git a/crates/swc_estree_compat/src/babelify/expr.rs b/crates/swc_estree_compat/src/babelify/expr.rs
index 16d0755e0c53..01efc12b5312 100644
--- a/crates/swc_estree_compat/src/babelify/expr.rs
+++ b/crates/swc_estree_compat/src/babelify/expr.rs
@@ -169,7 +169,7 @@ impl Babelify for Expr {
                 "illegal conversion: Cannot convert {:?} to ExprOutput - babel has no equivalent",
                 &self
             ),
-            Expr::GlimmerTemplateExpression(_) => panic!(
+            Expr::ContentTagExpression(_) => panic!(
                 "illegal conversion: Cannot convert {:?} to ExprOutput - babel has no equivalent",
                 &self
             ),

From 0a1d1680f9c90f37e580b487ba0408e84ef92a73 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Thu, 25 May 2023 10:29:07 -0400
Subject: [PATCH 07/16] more naming consistency

---
 crates/swc_ecma_codegen/src/lib.rs                 |  4 ++--
 crates/swc_ecma_parser/src/lexer/mod.rs            | 10 +++++-----
 crates/swc_ecma_parser/src/lexer/state.rs          | 12 ++++++------
 crates/swc_ecma_parser/src/parser/class_and_fn.rs  | 14 ++++++++------
 crates/swc_ecma_parser/src/parser/expr.rs          | 12 +++++++-----
 .../src/es2015/classes/mod.rs                      |  6 +++---
 .../src/es2022/class_properties/mod.rs             |  2 +-
 crates/swc_estree_compat/src/babelify/class.rs     |  2 +-
 8 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/crates/swc_ecma_codegen/src/lib.rs b/crates/swc_ecma_codegen/src/lib.rs
index 81e246a6f83d..b096f0377d0b 100644
--- a/crates/swc_ecma_codegen/src/lib.rs
+++ b/crates/swc_ecma_codegen/src/lib.rs
@@ -845,14 +845,14 @@ where
     }
 
     #[emitter]
-    fn emit_glimmer_template_expr(&mut self, n: &ContentTagExpression) -> Result {
+    fn emit_content_tag_template_expr(&mut self, n: &ContentTagExpression) -> Result {
         self.wr.write_str_lit(n.span, "<template>")?;
         self.wr.write_str_lit(n.span, &n.contents)?;
         self.wr.write_str_lit(n.span, "</template>")?;
     }
 
     #[emitter]
-    fn emit_glimmer_template_member(&mut self, n: &ContentTagMember) -> Result {
+    fn emit_content_tag_template_member(&mut self, n: &ContentTagMember) -> Result {
         self.wr.write_str_lit(n.span, "<template>")?;
         self.wr.write_str_lit(n.span, &n.contents)?;
         self.wr.write_str_lit(n.span, "</template>")?;
diff --git a/crates/swc_ecma_parser/src/lexer/mod.rs b/crates/swc_ecma_parser/src/lexer/mod.rs
index db586236074f..7e4827a4abe4 100644
--- a/crates/swc_ecma_parser/src/lexer/mod.rs
+++ b/crates/swc_ecma_parser/src/lexer/mod.rs
@@ -629,14 +629,14 @@ impl<'a> Lexer<'a> {
         }))
     }
 
-    fn read_glimmer_template(&mut self) -> LexResult<Token> {
+    fn read_content_tag_template(&mut self) -> LexResult<Token> {
         let start = self.cur_pos();
         loop {
             if !self.cur().is_some() {
                 return self.error(start, SyntaxError::Eof);
             }
             if self.is_str("</template>") {
-                self.state.glimmer_template = ContentTagState::Ending;
+                self.state.content_tag_template = ContentTagState::Ending;
                 let slice_end = self.cur_pos();
                 return Ok(ContentTagContent {
                     value: self.input.slice(start, slice_end).into(),
@@ -646,7 +646,7 @@ impl<'a> Lexer<'a> {
         }
     }
 
-    fn end_glimmer_template(&mut self) -> LexResult<Token> {
+    fn end_content_tag_template(&mut self) -> LexResult<Token> {
         let start = self.cur_pos();
         if !self.cur().is_some() || !self.is_str("</template>") {
             return self.error(start, SyntaxError::Eof);
@@ -654,7 +654,7 @@ impl<'a> Lexer<'a> {
         for _ in 0..11 {
             self.bump();
         }
-        self.state.glimmer_template = ContentTagState::None;
+        self.state.content_tag_template = ContentTagState::None;
         return Ok(ContentTagEnd);
     }
 
@@ -672,7 +672,7 @@ impl<'a> Lexer<'a> {
             for _ in 0..9 {
                 self.bump();
             }
-            self.state.glimmer_template = ContentTagState::Reading;
+            self.state.content_tag_template = ContentTagState::Reading;
             return Ok(Some(ContentTagStart));
         }
 
diff --git a/crates/swc_ecma_parser/src/lexer/state.rs b/crates/swc_ecma_parser/src/lexer/state.rs
index a62905edfcb7..f6b6dab40bcf 100644
--- a/crates/swc_ecma_parser/src/lexer/state.rs
+++ b/crates/swc_ecma_parser/src/lexer/state.rs
@@ -38,7 +38,7 @@ pub(super) struct State {
 
     token_type: Option<TokenType>,
 
-    pub glimmer_template: ContentTagState,
+    pub content_tag_template: ContentTagState,
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -207,12 +207,12 @@ impl<'a> Iterator for Lexer<'a> {
         let mut start = self.cur_pos();
 
         let res = (|| -> Result<Option<_>, _> {
-            if self.state.glimmer_template == ContentTagState::Reading {
-                return Ok(Some(self.read_glimmer_template()?));
+            if self.state.content_tag_template == ContentTagState::Reading {
+                return Ok(Some(self.read_content_tag_template()?));
             }
 
-            if self.state.glimmer_template == ContentTagState::Ending {
-                return Ok(Some(self.end_glimmer_template()?));
+            if self.state.content_tag_template == ContentTagState::Ending {
+                return Ok(Some(self.end_content_tag_template()?));
             }
 
             if let Some(start) = self.state.next_regexp {
@@ -394,7 +394,7 @@ impl State {
             line_start: BytePos(0),
             cur_line: 1,
             syntax,
-            glimmer_template: ContentTagState::None,
+            content_tag_template: ContentTagState::None,
         }
     }
 }
diff --git a/crates/swc_ecma_parser/src/parser/class_and_fn.rs b/crates/swc_ecma_parser/src/parser/class_and_fn.rs
index b3c1076af601..ea8fdc0a0003 100644
--- a/crates/swc_ecma_parser/src/parser/class_and_fn.rs
+++ b/crates/swc_ecma_parser/src/parser/class_and_fn.rs
@@ -381,12 +381,14 @@ impl<I: Tokens> Parser<I> {
         let start = cur_pos!(self);
 
         if is!(self, ContentTagStart) {
-            return self.parse_glimmer_template().map(|glimmer_template| {
-                ClassMember::ContentTagMember(ContentTagMember {
-                    span: glimmer_template.span,
-                    contents: glimmer_template.contents,
-                })
-            });
+            return self
+                .parse_content_tag_template()
+                .map(|content_tag_template| {
+                    ClassMember::ContentTagMember(ContentTagMember {
+                        span: content_tag_template.span,
+                        contents: content_tag_template.contents,
+                    })
+                });
         }
 
         let decorators = self.parse_decorators(false)?;
diff --git a/crates/swc_ecma_parser/src/parser/expr.rs b/crates/swc_ecma_parser/src/parser/expr.rs
index a2085c4c5ef4..eeaa3f08df8d 100644
--- a/crates/swc_ecma_parser/src/parser/expr.rs
+++ b/crates/swc_ecma_parser/src/parser/expr.rs
@@ -394,9 +394,11 @@ impl<I: Tokens> Parser<I> {
                 }
 
                 Token::ContentTagStart => {
-                    return self.parse_glimmer_template().map(|glimmer_template| {
-                        Box::new(Expr::ContentTagExpression(glimmer_template))
-                    })
+                    return self
+                        .parse_content_tag_template()
+                        .map(|content_tag_template| {
+                            Box::new(Expr::ContentTagExpression(content_tag_template))
+                        })
                 }
 
                 _ => {}
@@ -511,7 +513,7 @@ impl<I: Tokens> Parser<I> {
         syntax_error!(self, self.input.cur_span(), SyntaxError::TS1109)
     }
 
-    pub fn parse_glimmer_template(&mut self) -> PResult<ContentTagExpression> {
+    pub fn parse_content_tag_template(&mut self) -> PResult<ContentTagExpression> {
         assert_and_bump!(self, ContentTagStart);
         let start = cur_pos!(self);
 
@@ -525,7 +527,7 @@ impl<I: Tokens> Parser<I> {
                 });
             }
             _ => {
-                unexpected!(self, "glimmer template");
+                unexpected!(self, "content tag");
             }
         }
     }
diff --git a/crates/swc_ecma_transforms_compat/src/es2015/classes/mod.rs b/crates/swc_ecma_transforms_compat/src/es2015/classes/mod.rs
index cb756eb29bea..498a37ec2719 100644
--- a/crates/swc_ecma_transforms_compat/src/es2015/classes/mod.rs
+++ b/crates/swc_ecma_transforms_compat/src/es2015/classes/mod.rs
@@ -563,9 +563,9 @@ where
                 ClassMember::StaticBlock(..) => unreachable!(
                     "classes pass: static blocks\nstatic_blocks pass should remove this"
                 ),
-                ClassMember::ContentTagMember(..) => unreachable!(
-                    "classes pass: glimmer template member\ntranspiler should remove this"
-                ),
+                ClassMember::ContentTagMember(..) => {
+                    unreachable!("classes pass: content tag member\ntranspiler should remove this")
+                }
                 ClassMember::AutoAccessor(..) => {
                     unreachable!(
                         "classes pass: auto accessor \nauto_accesssors pass should remove this"
diff --git a/crates/swc_ecma_transforms_compat/src/es2022/class_properties/mod.rs b/crates/swc_ecma_transforms_compat/src/es2022/class_properties/mod.rs
index 2e46f40c8e3d..0c4ecf20742e 100644
--- a/crates/swc_ecma_transforms_compat/src/es2022/class_properties/mod.rs
+++ b/crates/swc_ecma_transforms_compat/src/es2022/class_properties/mod.rs
@@ -931,7 +931,7 @@ impl<C: Comments> ClassProperties<C> {
                 }
 
                 ClassMember::ContentTagMember(..) => {
-                    unreachable!("glimmer template compiler pass should remove this")
+                    unreachable!("content tag: compiler pass should remove this")
                 }
 
                 ClassMember::AutoAccessor(..) => {
diff --git a/crates/swc_estree_compat/src/babelify/class.rs b/crates/swc_estree_compat/src/babelify/class.rs
index d565535217f2..53c2adcec4f5 100644
--- a/crates/swc_estree_compat/src/babelify/class.rs
+++ b/crates/swc_estree_compat/src/babelify/class.rs
@@ -61,7 +61,7 @@ impl Babelify for ClassMember {
             ),
             ClassMember::StaticBlock(s) => ClassBodyEl::StaticBlock(s.babelify(ctx)),
             ClassMember::AutoAccessor(..) => todo!("auto accessor"),
-            ClassMember::ContentTagMember(..) => todo!("glimmer template member"),
+            ClassMember::ContentTagMember(..) => todo!("content tag member"),
         }
     }
 }

From e74f7b3a09a97597937241d9d170f3401c0e3a18 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Wed, 30 Aug 2023 20:52:25 -0400
Subject: [PATCH 08/16] updates to follow upstream

---
 crates/swc_ecma_parser/src/lexer/mod.rs            | 7 ++++++-
 crates/swc_ecma_usage_analyzer/src/analyzer/mod.rs | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/crates/swc_ecma_parser/src/lexer/mod.rs b/crates/swc_ecma_parser/src/lexer/mod.rs
index 92469b4fc961..e285e8396f41 100644
--- a/crates/swc_ecma_parser/src/lexer/mod.rs
+++ b/crates/swc_ecma_parser/src/lexer/mod.rs
@@ -673,7 +673,12 @@ impl<'a> Lexer<'a> {
                 self.state.content_tag_template = ContentTagState::Ending;
                 let slice_end = self.cur_pos();
                 return Ok(ContentTagContent {
-                    value: self.input.slice(start, slice_end).into(),
+                    value: unsafe {
+                        // safety: we know start and slice_end are valid cursor
+                        // positions because that's where we got them from
+                        self.input.slice(start, slice_end)
+                    }
+                    .into(),
                 });
             }
             self.bump();
diff --git a/crates/swc_ecma_usage_analyzer/src/analyzer/mod.rs b/crates/swc_ecma_usage_analyzer/src/analyzer/mod.rs
index c4fa2462bc4e..4536efec0014 100644
--- a/crates/swc_ecma_usage_analyzer/src/analyzer/mod.rs
+++ b/crates/swc_ecma_usage_analyzer/src/analyzer/mod.rs
@@ -1469,6 +1469,7 @@ fn for_each_id_ref_in_class(c: &Class, op: &mut impl FnMut(&Ident)) {
 
         ClassMember::Empty(..)
         | ClassMember::StaticBlock(..)
+        | ClassMember::ContentTagMember(..)
         | ClassMember::TsIndexSignature(..) => {}
     });
 }

From 0a1132a5c9abed0d21d8471076abf5c3bfd33ba4 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Thu, 14 Sep 2023 14:50:04 -0400
Subject: [PATCH 09/16] track more detailed span information

---
 crates/swc_ecma_ast/src/class.rs              | 19 +++++++----
 crates/swc_ecma_ast/src/expr.rs               | 32 ++++++++++++++++++-
 crates/swc_ecma_ast/src/lib.rs                |  9 +++---
 crates/swc_ecma_codegen/src/lib.rs            |  4 +--
 .../src/parser/class_and_fn.rs                |  2 ++
 crates/swc_ecma_parser/src/parser/expr.rs     | 29 +++++++++++++----
 crates/swc_ecma_quote_macros/src/ast/expr.rs  |  2 ++
 7 files changed, 78 insertions(+), 19 deletions(-)

diff --git a/crates/swc_ecma_ast/src/class.rs b/crates/swc_ecma_ast/src/class.rs
index 2a01a672c4bb..e7aa610a2aca 100644
--- a/crates/swc_ecma_ast/src/class.rs
+++ b/crates/swc_ecma_ast/src/class.rs
@@ -11,7 +11,8 @@ use crate::{
         Accessibility, TsExprWithTypeArgs, TsIndexSignature, TsTypeAnn, TsTypeParamDecl,
         TsTypeParamInstantiation,
     },
-    BigInt, ComputedPropName, EmptyStmt, Id, Ident, Number,
+    BigInt, ComputedPropName, ContentTagContent, ContentTagEnd, ContentTagStart, EmptyStmt, Id,
+    Ident, Number,
 };
 
 #[ast_node]
@@ -63,11 +64,17 @@ impl Take for Class {
 pub struct ContentTagMember {
     pub span: Span,
 
-    #[cfg_attr(
-        any(feature = "rkyv-impl", feature = "rkyv-bytecheck-impl"),
-        with(swc_atoms::EncodeJsWord)
-    )]
-    pub contents: swc_atoms::JsWord,
+    #[cfg_attr(feature = "serde-impl", serde(flatten))]
+    #[span]
+    pub opening: Box<ContentTagStart>,
+
+    #[cfg_attr(feature = "serde-impl", serde(flatten))]
+    #[span]
+    pub contents: Box<ContentTagContent>,
+
+    #[cfg_attr(feature = "serde-impl", serde(flatten))]
+    #[span]
+    pub closing: Box<ContentTagEnd>,
 }
 
 #[ast_node]
diff --git a/crates/swc_ecma_ast/src/expr.rs b/crates/swc_ecma_ast/src/expr.rs
index 888309036653..48c33ae3ba06 100644
--- a/crates/swc_ecma_ast/src/expr.rs
+++ b/crates/swc_ecma_ast/src/expr.rs
@@ -527,11 +527,41 @@ pub struct FnExpr {
 pub struct ContentTagExpression {
     pub span: Span,
 
+    #[cfg_attr(feature = "serde-impl", serde(flatten))]
+    #[span]
+    pub opening: Box<ContentTagStart>,
+
+    #[cfg_attr(feature = "serde-impl", serde(flatten))]
+    #[span]
+    pub contents: Box<ContentTagContent>,
+
+    #[cfg_attr(feature = "serde-impl", serde(flatten))]
+    #[span]
+    pub closing: Box<ContentTagEnd>,
+}
+
+#[ast_node("ContentTagStart")]
+#[derive(Eq, Hash, EqIgnoreSpan, Copy)]
+pub struct ContentTagStart {
+    pub span: Span,
+}
+
+#[ast_node("ContentTagEnd")]
+#[derive(Eq, Hash, EqIgnoreSpan, Copy)]
+pub struct ContentTagEnd {
+    pub span: Span,
+}
+
+#[ast_node("ContentTagContent")]
+#[derive(Eq, Hash, EqIgnoreSpan)]
+pub struct ContentTagContent {
+    pub span: Span,
+
     #[cfg_attr(
         any(feature = "rkyv-impl", feature = "rkyv-bytecheck-impl"),
         with(swc_atoms::EncodeJsWord)
     )]
-    pub contents: JsWord,
+    pub value: JsWord,
 }
 
 impl Take for FnExpr {
diff --git a/crates/swc_ecma_ast/src/lib.rs b/crates/swc_ecma_ast/src/lib.rs
index ceccd6d3af24..90a5d1242b56 100644
--- a/crates/swc_ecma_ast/src/lib.rs
+++ b/crates/swc_ecma_ast/src/lib.rs
@@ -21,10 +21,11 @@ pub use self::{
     decl::{ClassDecl, Decl, FnDecl, UsingDecl, VarDecl, VarDeclKind, VarDeclarator},
     expr::{
         ArrayLit, ArrowExpr, AssignExpr, AwaitExpr, BinExpr, BlockStmtOrExpr, CallExpr, Callee,
-        ClassExpr, CondExpr, ContentTagExpression, Expr, ExprOrSpread, FnExpr, Import, MemberExpr,
-        MemberProp, MetaPropExpr, MetaPropKind, NewExpr, ObjectLit, OptCall, OptChainBase,
-        OptChainExpr, ParenExpr, PatOrExpr, PropOrSpread, SeqExpr, SpreadElement, Super, SuperProp,
-        SuperPropExpr, TaggedTpl, ThisExpr, Tpl, TplElement, UnaryExpr, UpdateExpr, YieldExpr,
+        ClassExpr, CondExpr, ContentTagContent, ContentTagEnd, ContentTagExpression,
+        ContentTagStart, Expr, ExprOrSpread, FnExpr, Import, MemberExpr, MemberProp, MetaPropExpr,
+        MetaPropKind, NewExpr, ObjectLit, OptCall, OptChainBase, OptChainExpr, ParenExpr,
+        PatOrExpr, PropOrSpread, SeqExpr, SpreadElement, Super, SuperProp, SuperPropExpr,
+        TaggedTpl, ThisExpr, Tpl, TplElement, UnaryExpr, UpdateExpr, YieldExpr,
     },
     function::{Function, Param, ParamOrTsParamProp},
     ident::{BindingIdent, Id, Ident, IdentExt, PrivateName},
diff --git a/crates/swc_ecma_codegen/src/lib.rs b/crates/swc_ecma_codegen/src/lib.rs
index 36907f8625ba..d7e4a953bc39 100644
--- a/crates/swc_ecma_codegen/src/lib.rs
+++ b/crates/swc_ecma_codegen/src/lib.rs
@@ -854,14 +854,14 @@ where
     #[emitter]
     fn emit_content_tag_template_expr(&mut self, n: &ContentTagExpression) -> Result {
         self.wr.write_str_lit(n.span, "<template>")?;
-        self.wr.write_str_lit(n.span, &n.contents)?;
+        self.wr.write_str_lit(n.span, &n.contents.value)?;
         self.wr.write_str_lit(n.span, "</template>")?;
     }
 
     #[emitter]
     fn emit_content_tag_template_member(&mut self, n: &ContentTagMember) -> Result {
         self.wr.write_str_lit(n.span, "<template>")?;
-        self.wr.write_str_lit(n.span, &n.contents)?;
+        self.wr.write_str_lit(n.span, &n.contents.value)?;
         self.wr.write_str_lit(n.span, "</template>")?;
     }
 
diff --git a/crates/swc_ecma_parser/src/parser/class_and_fn.rs b/crates/swc_ecma_parser/src/parser/class_and_fn.rs
index 47c4424e2cb2..4e6a24f4409d 100644
--- a/crates/swc_ecma_parser/src/parser/class_and_fn.rs
+++ b/crates/swc_ecma_parser/src/parser/class_and_fn.rs
@@ -386,7 +386,9 @@ impl<I: Tokens> Parser<I> {
                 .map(|content_tag_template| {
                     ClassMember::ContentTagMember(ContentTagMember {
                         span: content_tag_template.span,
+                        opening: content_tag_template.opening,
                         contents: content_tag_template.contents,
+                        closing: content_tag_template.closing,
                     })
                 });
         }
diff --git a/crates/swc_ecma_parser/src/parser/expr.rs b/crates/swc_ecma_parser/src/parser/expr.rs
index 7507dbe39a0a..8aecde8ff134 100644
--- a/crates/swc_ecma_parser/src/parser/expr.rs
+++ b/crates/swc_ecma_parser/src/parser/expr.rs
@@ -513,17 +513,14 @@ impl<I: Tokens> Parser<I> {
         syntax_error!(self, self.input.cur_span(), SyntaxError::TS1109)
     }
 
-    pub fn parse_content_tag_template(&mut self) -> PResult<ContentTagExpression> {
-        assert_and_bump!(self, ContentTagStart);
+    fn parse_content_tag_contents(&mut self) -> PResult<ContentTagContent> {
         let start = cur_pos!(self);
-
         match bump!(self) {
             Token::ContentTagContent { value } => {
                 let span = span!(self, start);
-                assert_and_bump!(self, ContentTagEnd);
-                return Ok(ContentTagExpression {
+                return Ok(ContentTagContent {
                     span,
-                    contents: value.into(),
+                    value: value.into(),
                 });
             }
             _ => {
@@ -532,6 +529,26 @@ impl<I: Tokens> Parser<I> {
         }
     }
 
+    pub fn parse_content_tag_template(&mut self) -> PResult<ContentTagExpression> {
+        let opening_start = cur_pos!(self);
+        assert_and_bump!(self, ContentTagStart);
+        let opening = ContentTagStart {
+            span: span!(self, opening_start),
+        };
+        let contents = self.parse_content_tag_contents()?;
+        let closing_start = cur_pos!(self);
+        assert_and_bump!(self, ContentTagEnd);
+        let closing = ContentTagEnd {
+            span: span!(self, closing_start),
+        };
+        return Ok(ContentTagExpression {
+            span: span!(self, opening_start),
+            opening: opening.into(),
+            contents: contents.into(),
+            closing: closing.into(),
+        });
+    }
+
     #[cfg_attr(feature = "debug", tracing::instrument(skip_all))]
     fn parse_array_lit(&mut self) -> PResult<Box<Expr>> {
         trace_cur!(self, parse_array_lit);
diff --git a/crates/swc_ecma_quote_macros/src/ast/expr.rs b/crates/swc_ecma_quote_macros/src/ast/expr.rs
index c9518edeca83..4c0bd14bc776 100644
--- a/crates/swc_ecma_quote_macros/src/ast/expr.rs
+++ b/crates/swc_ecma_quote_macros/src/ast/expr.rs
@@ -139,3 +139,5 @@ impl_struct!(OptCall, [span, callee, args, type_args]);
 impl_enum!(Callee, [Super, Import, Expr]);
 
 impl_struct!(ContentTagExpression, [span, contents]);
+
+impl_struct!(ContentTagContent, [span, value]);

From 2a5826456800d83777aa97769dac69ac9cf2fe42 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 14 Sep 2023 15:58:50 -0600
Subject: [PATCH 10/16] run CI on content-tag branch

---
 .github/workflows/CI.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index fd40afce8186..c309444a6e7e 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - main
+      - content-tag
 
 env:
   CI: 1

From fa105713ed7fe3172b0df81590798a2368fd3a11 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 14 Sep 2023 16:43:54 -0600
Subject: [PATCH 11/16] Fix clippy

---
 crates/swc_ecma_parser/src/lexer/mod.rs   | 2 +-
 crates/swc_ecma_parser/src/parser/expr.rs | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/crates/swc_ecma_parser/src/lexer/mod.rs b/crates/swc_ecma_parser/src/lexer/mod.rs
index e285e8396f41..19eb9a02fe0a 100644
--- a/crates/swc_ecma_parser/src/lexer/mod.rs
+++ b/crates/swc_ecma_parser/src/lexer/mod.rs
@@ -694,7 +694,7 @@ impl<'a> Lexer<'a> {
             self.bump();
         }
         self.state.content_tag_template = ContentTagState::None;
-        return Ok(ContentTagEnd);
+        Ok(ContentTagEnd)
     }
 
     #[inline(never)]
diff --git a/crates/swc_ecma_parser/src/parser/expr.rs b/crates/swc_ecma_parser/src/parser/expr.rs
index 8aecde8ff134..eeda4cd1ada7 100644
--- a/crates/swc_ecma_parser/src/parser/expr.rs
+++ b/crates/swc_ecma_parser/src/parser/expr.rs
@@ -518,10 +518,7 @@ impl<I: Tokens> Parser<I> {
         match bump!(self) {
             Token::ContentTagContent { value } => {
                 let span = span!(self, start);
-                return Ok(ContentTagContent {
-                    span,
-                    value: value.into(),
-                });
+                Ok(ContentTagContent { span, value })
             }
             _ => {
                 unexpected!(self, "content tag");
@@ -541,12 +538,12 @@ impl<I: Tokens> Parser<I> {
         let closing = ContentTagEnd {
             span: span!(self, closing_start),
         };
-        return Ok(ContentTagExpression {
+        Ok(ContentTagExpression {
             span: span!(self, opening_start),
             opening: opening.into(),
             contents: contents.into(),
             closing: closing.into(),
-        });
+        })
     }
 
     #[cfg_attr(feature = "debug", tracing::instrument(skip_all))]

From 5477f2aab663c68ef6e5ce75a7803dc7406a9a43 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Thu, 28 Sep 2023 17:50:00 -0400
Subject: [PATCH 12/16] we can use Atom here instead

---
 crates/swc_ecma_ast/src/expr.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/crates/swc_ecma_ast/src/expr.rs b/crates/swc_ecma_ast/src/expr.rs
index 48c33ae3ba06..c0f0ceb48c35 100644
--- a/crates/swc_ecma_ast/src/expr.rs
+++ b/crates/swc_ecma_ast/src/expr.rs
@@ -7,7 +7,7 @@ use serde::{
     Deserialize, Deserializer,
 };
 use string_enum::StringEnum;
-use swc_atoms::{js_word, Atom, JsWord};
+use swc_atoms::{js_word, Atom};
 use swc_common::{ast_node, util::take::Take, BytePos, EqIgnoreSpan, Span, Spanned, DUMMY_SP};
 
 use crate::{
@@ -556,12 +556,7 @@ pub struct ContentTagEnd {
 #[derive(Eq, Hash, EqIgnoreSpan)]
 pub struct ContentTagContent {
     pub span: Span,
-
-    #[cfg_attr(
-        any(feature = "rkyv-impl", feature = "rkyv-bytecheck-impl"),
-        with(swc_atoms::EncodeJsWord)
-    )]
-    pub value: JsWord,
+    pub value: Atom,
 }
 
 impl Take for FnExpr {

From e6e38dfc73b9027c981e818cc5f85dfc8c430ecf Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Fri, 6 Oct 2023 09:28:05 -0400
Subject: [PATCH 13/16] post merge updates

---
 crates/swc_ecma_parser/src/token.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/crates/swc_ecma_parser/src/token.rs b/crates/swc_ecma_parser/src/token.rs
index 587caf2566ef..97d827d0d663 100644
--- a/crates/swc_ecma_parser/src/token.rs
+++ b/crates/swc_ecma_parser/src/token.rs
@@ -184,6 +184,10 @@ pub enum TokenKind {
     JSXTagStart,
     JSXTagEnd,
 
+    ContentTagStart,
+    ContentTagContent,
+    ContentTagEnd,
+
     Shebang,
     Error,
 }
@@ -290,7 +294,7 @@ pub enum Token {
 
     ContentTagStart,
     ContentTagContent {
-        value: JsWord,
+        value: Atom,
     },
     ContentTagEnd,
 }
@@ -330,6 +334,9 @@ impl Token {
             Self::JSXText { .. } => TokenKind::JSXText,
             Self::JSXTagStart => TokenKind::JSXTagStart,
             Self::JSXTagEnd => TokenKind::JSXTagEnd,
+            Self::ContentTagStart => TokenKind::ContentTagStart,
+            Self::ContentTagContent { .. } => TokenKind::ContentTagContent,
+            Self::ContentTagEnd => TokenKind::ContentTagEnd,
             Self::Shebang(..) => TokenKind::Shebang,
             Self::Error(..) => TokenKind::Error,
             Self::Word(w) => TokenKind::Word(w.kind()),

From ac6123fd8b5d931de21ae0b8b5689e4cc285ce36 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Fri, 6 Oct 2023 09:29:33 -0400
Subject: [PATCH 14/16] post-merge format update

---
 crates/swc_ecma_parser/src/lexer/mod.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crates/swc_ecma_parser/src/lexer/mod.rs b/crates/swc_ecma_parser/src/lexer/mod.rs
index 0f4bc1ee098b..29fa2b0131e6 100644
--- a/crates/swc_ecma_parser/src/lexer/mod.rs
+++ b/crates/swc_ecma_parser/src/lexer/mod.rs
@@ -22,8 +22,7 @@ pub use self::{
 use crate::{
     error::{Error, SyntaxError},
     lexer::state::ContentTagState,
-    token::*,
-    token::{BinOpToken, Token, Word},
+    token::{BinOpToken, Token, Word, *},
     Context, Syntax,
 };
 

From a74ccdd6b4c3a39e8361c15fa16b83a5cc12c260 Mon Sep 17 00:00:00 2001
From: patrickpircher <pa.trickjlp@gmail.com>
Date: Wed, 29 Nov 2023 13:00:46 +0100
Subject: [PATCH 15/16] do not flatten

---
 crates/swc_ecma_ast/src/class.rs | 9 +++------
 crates/swc_ecma_ast/src/expr.rs  | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/crates/swc_ecma_ast/src/class.rs b/crates/swc_ecma_ast/src/class.rs
index e7aa610a2aca..2d74c70a898b 100644
--- a/crates/swc_ecma_ast/src/class.rs
+++ b/crates/swc_ecma_ast/src/class.rs
@@ -64,16 +64,13 @@ impl Take for Class {
 pub struct ContentTagMember {
     pub span: Span,
 
-    #[cfg_attr(feature = "serde-impl", serde(flatten))]
-    #[span]
+    #[cfg_attr(feature = "serde-impl", serde())]
     pub opening: Box<ContentTagStart>,
 
-    #[cfg_attr(feature = "serde-impl", serde(flatten))]
-    #[span]
+    #[cfg_attr(feature = "serde-impl", serde())]
     pub contents: Box<ContentTagContent>,
 
-    #[cfg_attr(feature = "serde-impl", serde(flatten))]
-    #[span]
+    #[cfg_attr(feature = "serde-impl", serde())]
     pub closing: Box<ContentTagEnd>,
 }
 
diff --git a/crates/swc_ecma_ast/src/expr.rs b/crates/swc_ecma_ast/src/expr.rs
index c0f0ceb48c35..6a00a2e23d2d 100644
--- a/crates/swc_ecma_ast/src/expr.rs
+++ b/crates/swc_ecma_ast/src/expr.rs
@@ -527,16 +527,13 @@ pub struct FnExpr {
 pub struct ContentTagExpression {
     pub span: Span,
 
-    #[cfg_attr(feature = "serde-impl", serde(flatten))]
-    #[span]
+    #[cfg_attr(feature = "serde-impl", serde())]
     pub opening: Box<ContentTagStart>,
 
-    #[cfg_attr(feature = "serde-impl", serde(flatten))]
-    #[span]
+    #[cfg_attr(feature = "serde-impl", serde())]
     pub contents: Box<ContentTagContent>,
 
-    #[cfg_attr(feature = "serde-impl", serde(flatten))]
-    #[span]
+    #[cfg_attr(feature = "serde-impl", serde())]
     pub closing: Box<ContentTagEnd>,
 }
 

From e2dd8cee5fcb16d87e1e389ae2aac6d44d14ee9a Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Sat, 2 Mar 2024 11:12:40 -0500
Subject: [PATCH 16/16] post-merge cleanup

---
 crates/swc_ecma_ast/src/lib.rs          |   8 --
 crates/swc_ecma_parser/src/lexer/mod.rs |   5 +-
 crates/swc_ecma_parser/src/macros.rs    | 122 ------------------------
 3 files changed, 3 insertions(+), 132 deletions(-)

diff --git a/crates/swc_ecma_ast/src/lib.rs b/crates/swc_ecma_ast/src/lib.rs
index 4d57baf28a54..300c1e664e12 100644
--- a/crates/swc_ecma_ast/src/lib.rs
+++ b/crates/swc_ecma_ast/src/lib.rs
@@ -19,14 +19,6 @@ pub use self::{
         Decorator, Key, MethodKind, PrivateMethod, PrivateProp, StaticBlock,
     },
     decl::{ClassDecl, Decl, FnDecl, UsingDecl, VarDecl, VarDeclKind, VarDeclarator},
-    expr::{
-        ArrayLit, ArrowExpr, AssignExpr, AwaitExpr, BinExpr, BlockStmtOrExpr, CallExpr, Callee,
-        ClassExpr, CondExpr, ContentTagContent, ContentTagEnd, ContentTagExpression,
-        ContentTagStart, Expr, ExprOrSpread, FnExpr, Import, MemberExpr, MemberProp, MetaPropExpr,
-        MetaPropKind, NewExpr, ObjectLit, OptCall, OptChainBase, OptChainExpr, ParenExpr,
-        PatOrExpr, PropOrSpread, SeqExpr, SpreadElement, Super, SuperProp, SuperPropExpr,
-        TaggedTpl, ThisExpr, Tpl, TplElement, UnaryExpr, UpdateExpr, YieldExpr,
-    },
     expr::*,
     function::{Function, Param, ParamOrTsParamProp},
     ident::{BindingIdent, Id, Ident, IdentExt, PrivateName},
diff --git a/crates/swc_ecma_parser/src/lexer/mod.rs b/crates/swc_ecma_parser/src/lexer/mod.rs
index 57934af0b964..ba8eb3d3df58 100644
--- a/crates/swc_ecma_parser/src/lexer/mod.rs
+++ b/crates/swc_ecma_parser/src/lexer/mod.rs
@@ -22,8 +22,9 @@ pub use self::{
 use crate::{
     error::{Error, SyntaxError},
     lexer::state::ContentTagState,
-    token::{BinOpToken, Token, Word, *},
-    token::{BinOpToken, IdentLike, Token, Word},
+    token::{
+        BinOpToken, ContentTagContent, ContentTagEnd, ContentTagStart, IdentLike, Token, Word,
+    },
     Context, Syntax,
 };
 
diff --git a/crates/swc_ecma_parser/src/macros.rs b/crates/swc_ecma_parser/src/macros.rs
index f726edc68ad2..a3a1b8e16f50 100644
--- a/crates/swc_ecma_parser/src/macros.rs
+++ b/crates/swc_ecma_parser/src/macros.rs
@@ -290,128 +290,6 @@ macro_rules! tok {
         crate::token::Token::ContentTagEnd
     };
 
-    // ----------
-    // Typescript
-    // ----------
-    ("asserts") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("asserts")))
-    };
-    ("implements") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("implements")))
-    };
-    ("is") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("is")))
-    };
-    ("new") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("new")))
-    };
-    ("keyof") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("keyof")))
-    };
-    ("unique") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("unique")))
-    };
-    ("object") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("object")))
-    };
-    ("global") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("global")))
-    };
-    ("require") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("require")))
-    };
-    ("enum") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("enum")))
-    };
-    ("readonly") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("readonly")))
-    };
-    ("as") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("as")))
-    };
-    ("satisfies") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("satisfies")))
-    };
-    ("namespace") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("namespace")))
-    };
-    ("abstract") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("abstract")))
-    };
-    ("infer") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("infer")))
-    };
-    ("any") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("any")))
-    };
-    ("boolean") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("boolean")))
-    };
-    ("bigint") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("bigint")))
-    };
-    ("intrinsic") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("intrinsic")))
-    };
-    ("never") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("never")))
-    };
-    ("number") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("number")))
-    };
-    ("string") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("string")))
-    };
-    ("symbol") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("symbol")))
-    };
-    ("unknown") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("unknown")))
-    };
-    ("require") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("require")))
-    };
-    ("interface") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("interface")))
-    };
-    ("declare") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("declare")))
-    };
-    ("override") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("override")))
-    };
-    ("undefined") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("undefined")))
-    };
-    ("meta") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("meta")))
-    };
-    ("type") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("type")))
-    };
-    ("assert") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("assert")))
-    };
-    ("get") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("get")))
-    };
-    ("set") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("set")))
-    };
-    ("out") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("out")))
-    };
-    ("public") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("public")))
-    };
-    ("private") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("private")))
-    };
-    ("protected") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("protected")))
-    };
-    ("using") => {
-        crate::token::Token::Word(crate::token::Word::Ident(swc_atoms::js_word!("using")))
     ($tt:tt) => {
         crate::token::Token::Word(crate::token::Word::Ident(crate::token::IdentLike::Known(
             known_ident!($tt),