diff --git a/crates/oxc_ast/src/ast/ts.rs b/crates/oxc_ast/src/ast/ts.rs index fde09f4132ea1..e96b3ad41996a 100644 --- a/crates/oxc_ast/src/ast/ts.rs +++ b/crates/oxc_ast/src/ast/ts.rs @@ -107,8 +107,8 @@ pub struct TSEnumMember<'a> { #[derive(Debug)] #[generate_derive(CloneIn, GetSpan, GetSpanMut, ContentEq, ContentHash, ESTree)] pub enum TSEnumMemberName<'a> { - StaticIdentifier(Box<'a, IdentifierName<'a>>) = 0, - StaticStringLiteral(Box<'a, StringLiteral<'a>>) = 1, + Identifier(Box<'a, IdentifierName<'a>>) = 0, + String(Box<'a, StringLiteral<'a>>) = 1, } /// TypeScript Type Annotation diff --git a/crates/oxc_ast/src/ast_impl/ts.rs b/crates/oxc_ast/src/ast_impl/ts.rs index 6a749430eb5ef..4eff1693778d4 100644 --- a/crates/oxc_ast/src/ast_impl/ts.rs +++ b/crates/oxc_ast/src/ast_impl/ts.rs @@ -14,8 +14,8 @@ impl<'a> TSEnumMemberName<'a> { /// Get the name of this enum member. pub fn static_name(&self) -> Atom<'a> { match self { - Self::StaticIdentifier(ident) => ident.name.clone(), - Self::StaticStringLiteral(lit) => lit.value.clone(), + Self::Identifier(ident) => ident.name.clone(), + Self::String(lit) => lit.value.clone(), } } } diff --git a/crates/oxc_ast/src/generated/ast_builder.rs b/crates/oxc_ast/src/generated/ast_builder.rs index dc5fa1f0f26e5..26f315dfa07b0 100644 --- a/crates/oxc_ast/src/generated/ast_builder.rs +++ b/crates/oxc_ast/src/generated/ast_builder.rs @@ -7745,7 +7745,7 @@ impl<'a> AstBuilder<'a> { Box::new_in(self.ts_enum_member(span, id, initializer), self.allocator) } - /// Build a [`TSEnumMemberName::StaticIdentifier`] + /// Build a [`TSEnumMemberName::Identifier`] /// /// This node contains an [`IdentifierName`] that will be stored in the memory arena. /// @@ -7757,10 +7757,10 @@ impl<'a> AstBuilder<'a> { where A: IntoIn<'a, Atom<'a>>, { - TSEnumMemberName::StaticIdentifier(self.alloc(self.identifier_name(span, name))) + TSEnumMemberName::Identifier(self.alloc(self.identifier_name(span, name))) } - /// Build a [`TSEnumMemberName::StaticStringLiteral`] + /// Build a [`TSEnumMemberName::String`] /// /// This node contains a [`StringLiteral`] that will be stored in the memory arena. /// @@ -7772,7 +7772,7 @@ impl<'a> AstBuilder<'a> { where A: IntoIn<'a, Atom<'a>>, { - TSEnumMemberName::StaticStringLiteral(self.alloc(self.string_literal(span, value))) + TSEnumMemberName::String(self.alloc(self.string_literal(span, value))) } /// Build a [`TSTypeAnnotation`]. diff --git a/crates/oxc_ast/src/generated/derive_clone_in.rs b/crates/oxc_ast/src/generated/derive_clone_in.rs index f55805e8c21a3..9c7dce6c51a99 100644 --- a/crates/oxc_ast/src/generated/derive_clone_in.rs +++ b/crates/oxc_ast/src/generated/derive_clone_in.rs @@ -2593,12 +2593,8 @@ impl<'old_alloc, 'new_alloc> CloneIn<'new_alloc> for TSEnumMemberName<'old_alloc type Cloned = TSEnumMemberName<'new_alloc>; fn clone_in(&self, allocator: &'new_alloc Allocator) -> Self::Cloned { match self { - Self::StaticIdentifier(it) => { - TSEnumMemberName::StaticIdentifier(CloneIn::clone_in(it, allocator)) - } - Self::StaticStringLiteral(it) => { - TSEnumMemberName::StaticStringLiteral(CloneIn::clone_in(it, allocator)) - } + Self::Identifier(it) => TSEnumMemberName::Identifier(CloneIn::clone_in(it, allocator)), + Self::String(it) => TSEnumMemberName::String(CloneIn::clone_in(it, allocator)), } } } diff --git a/crates/oxc_ast/src/generated/derive_content_eq.rs b/crates/oxc_ast/src/generated/derive_content_eq.rs index 8a5ecf2afc833..db3045bdedab0 100644 --- a/crates/oxc_ast/src/generated/derive_content_eq.rs +++ b/crates/oxc_ast/src/generated/derive_content_eq.rs @@ -2579,12 +2579,12 @@ impl<'a> ContentEq for TSEnumMember<'a> { impl<'a> ContentEq for TSEnumMemberName<'a> { fn content_eq(&self, other: &Self) -> bool { match self { - Self::StaticIdentifier(it) => match other { - Self::StaticIdentifier(other) if ContentEq::content_eq(it, other) => true, + Self::Identifier(it) => match other { + Self::Identifier(other) if ContentEq::content_eq(it, other) => true, _ => false, }, - Self::StaticStringLiteral(it) => match other { - Self::StaticStringLiteral(other) if ContentEq::content_eq(it, other) => true, + Self::String(it) => match other { + Self::String(other) if ContentEq::content_eq(it, other) => true, _ => false, }, } diff --git a/crates/oxc_ast/src/generated/derive_content_hash.rs b/crates/oxc_ast/src/generated/derive_content_hash.rs index 8f8342d5ca4b3..063ab168b0391 100644 --- a/crates/oxc_ast/src/generated/derive_content_hash.rs +++ b/crates/oxc_ast/src/generated/derive_content_hash.rs @@ -1416,8 +1416,8 @@ impl<'a> ContentHash for TSEnumMemberName<'a> { fn content_hash(&self, state: &mut H) { ContentHash::content_hash(&discriminant(self), state); match self { - Self::StaticIdentifier(it) => ContentHash::content_hash(it, state), - Self::StaticStringLiteral(it) => ContentHash::content_hash(it, state), + Self::Identifier(it) => ContentHash::content_hash(it, state), + Self::String(it) => ContentHash::content_hash(it, state), } } } diff --git a/crates/oxc_ast/src/generated/derive_estree.rs b/crates/oxc_ast/src/generated/derive_estree.rs index 54962b124a687..f8a76c4d4e71b 100644 --- a/crates/oxc_ast/src/generated/derive_estree.rs +++ b/crates/oxc_ast/src/generated/derive_estree.rs @@ -1975,8 +1975,8 @@ impl<'a> Serialize for TSEnumMember<'a> { impl<'a> Serialize for TSEnumMemberName<'a> { fn serialize(&self, serializer: S) -> Result { match self { - TSEnumMemberName::StaticIdentifier(x) => Serialize::serialize(x, serializer), - TSEnumMemberName::StaticStringLiteral(x) => Serialize::serialize(x, serializer), + TSEnumMemberName::Identifier(x) => Serialize::serialize(x, serializer), + TSEnumMemberName::String(x) => Serialize::serialize(x, serializer), } } } diff --git a/crates/oxc_ast/src/generated/derive_get_span.rs b/crates/oxc_ast/src/generated/derive_get_span.rs index eeb137c6ed617..eab8bc509eecf 100644 --- a/crates/oxc_ast/src/generated/derive_get_span.rs +++ b/crates/oxc_ast/src/generated/derive_get_span.rs @@ -1272,8 +1272,8 @@ impl<'a> GetSpan for TSEnumMember<'a> { impl<'a> GetSpan for TSEnumMemberName<'a> { fn span(&self) -> Span { match self { - Self::StaticIdentifier(it) => GetSpan::span(it.as_ref()), - Self::StaticStringLiteral(it) => GetSpan::span(it.as_ref()), + Self::Identifier(it) => GetSpan::span(it.as_ref()), + Self::String(it) => GetSpan::span(it.as_ref()), } } } diff --git a/crates/oxc_ast/src/generated/derive_get_span_mut.rs b/crates/oxc_ast/src/generated/derive_get_span_mut.rs index 20d674124258a..67ace8a3cefe1 100644 --- a/crates/oxc_ast/src/generated/derive_get_span_mut.rs +++ b/crates/oxc_ast/src/generated/derive_get_span_mut.rs @@ -1272,8 +1272,8 @@ impl<'a> GetSpanMut for TSEnumMember<'a> { impl<'a> GetSpanMut for TSEnumMemberName<'a> { fn span_mut(&mut self) -> &mut Span { match self { - Self::StaticIdentifier(it) => GetSpanMut::span_mut(&mut **it), - Self::StaticStringLiteral(it) => GetSpanMut::span_mut(&mut **it), + Self::Identifier(it) => GetSpanMut::span_mut(&mut **it), + Self::String(it) => GetSpanMut::span_mut(&mut **it), } } } diff --git a/crates/oxc_ast/src/generated/visit.rs b/crates/oxc_ast/src/generated/visit.rs index aeeb5f8689115..06d8fbcf2d0c6 100644 --- a/crates/oxc_ast/src/generated/visit.rs +++ b/crates/oxc_ast/src/generated/visit.rs @@ -3806,8 +3806,8 @@ pub mod walk { #[inline] pub fn walk_ts_enum_member_name<'a, V: Visit<'a>>(visitor: &mut V, it: &TSEnumMemberName<'a>) { match it { - TSEnumMemberName::StaticIdentifier(it) => visitor.visit_identifier_name(it), - TSEnumMemberName::StaticStringLiteral(it) => visitor.visit_string_literal(it), + TSEnumMemberName::Identifier(it) => visitor.visit_identifier_name(it), + TSEnumMemberName::String(it) => visitor.visit_string_literal(it), } } diff --git a/crates/oxc_ast/src/generated/visit_mut.rs b/crates/oxc_ast/src/generated/visit_mut.rs index 31f1745c183c4..f0072a152aecb 100644 --- a/crates/oxc_ast/src/generated/visit_mut.rs +++ b/crates/oxc_ast/src/generated/visit_mut.rs @@ -4024,8 +4024,8 @@ pub mod walk_mut { it: &mut TSEnumMemberName<'a>, ) { match it { - TSEnumMemberName::StaticIdentifier(it) => visitor.visit_identifier_name(it), - TSEnumMemberName::StaticStringLiteral(it) => visitor.visit_string_literal(it), + TSEnumMemberName::Identifier(it) => visitor.visit_identifier_name(it), + TSEnumMemberName::String(it) => visitor.visit_string_literal(it), } } diff --git a/crates/oxc_codegen/src/gen.rs b/crates/oxc_codegen/src/gen.rs index 1e38433d7b5d0..41c95d908fd59 100644 --- a/crates/oxc_codegen/src/gen.rs +++ b/crates/oxc_codegen/src/gen.rs @@ -3607,8 +3607,8 @@ impl<'a> Gen for TSEnumDeclaration<'a> { impl<'a> Gen for TSEnumMember<'a> { fn gen(&self, p: &mut Codegen, ctx: Context) { match &self.id { - TSEnumMemberName::StaticIdentifier(decl) => decl.print(p, ctx), - TSEnumMemberName::StaticStringLiteral(decl) => decl.print(p, ctx), + TSEnumMemberName::Identifier(decl) => decl.print(p, ctx), + TSEnumMemberName::String(decl) => decl.print(p, ctx), } if let Some(init) = &self.initializer { p.print_soft_space(); diff --git a/crates/oxc_isolated_declarations/src/enum.rs b/crates/oxc_isolated_declarations/src/enum.rs index 15b48dc920986..bf48897bff556 100644 --- a/crates/oxc_isolated_declarations/src/enum.rs +++ b/crates/oxc_isolated_declarations/src/enum.rs @@ -46,8 +46,8 @@ impl<'a> IsolatedDeclarations<'a> { if let Some(value) = &value { let member_name = match &member.id { - TSEnumMemberName::StaticIdentifier(id) => &id.name, - TSEnumMemberName::StaticStringLiteral(str) => &str.value, + TSEnumMemberName::Identifier(id) => &id.name, + TSEnumMemberName::String(str) => &str.value, }; prev_members.insert(member_name.clone(), value.clone()); } diff --git a/crates/oxc_linter/src/rules/typescript/prefer_enum_initializers.rs b/crates/oxc_linter/src/rules/typescript/prefer_enum_initializers.rs index 1edc9eb20a0c9..916faea281994 100644 --- a/crates/oxc_linter/src/rules/typescript/prefer_enum_initializers.rs +++ b/crates/oxc_linter/src/rules/typescript/prefer_enum_initializers.rs @@ -52,7 +52,7 @@ impl Rule for PreferEnumInitializers { for (index, member) in decl.members.iter().enumerate() { if member.initializer.is_none() { - if let TSEnumMemberName::StaticIdentifier(i) = &member.id { + if let TSEnumMemberName::Identifier(i) = &member.id { ctx.diagnostic(prefer_enum_initializers_diagnostic( i.name.as_str(), index + 1, diff --git a/crates/oxc_parser/src/ts/statement.rs b/crates/oxc_parser/src/ts/statement.rs index e6d2b508f459a..b0649c48f5f19 100644 --- a/crates/oxc_parser/src/ts/statement.rs +++ b/crates/oxc_parser/src/ts/statement.rs @@ -64,12 +64,10 @@ impl<'a> ParserImpl<'a> { match self.cur_kind() { Kind::Str => { let literal = self.parse_literal_string()?; - Ok(TSEnumMemberName::StaticStringLiteral(self.alloc(literal))) + Ok(TSEnumMemberName::String(self.alloc(literal))) } Kind::LBrack => match self.parse_computed_property_name()? { - Expression::StringLiteral(literal) => { - Ok(TSEnumMemberName::StaticStringLiteral(literal)) - } + Expression::StringLiteral(literal) => Ok(TSEnumMemberName::String(literal)), Expression::TemplateLiteral(template) if template.is_no_substitution_template() => { Ok(self.ast.ts_enum_member_name_string_literal( template.span, @@ -89,7 +87,7 @@ impl<'a> ParserImpl<'a> { } _ => { let ident_name = self.parse_identifier_name()?; - Ok(TSEnumMemberName::StaticIdentifier(self.alloc(ident_name))) + Ok(TSEnumMemberName::Identifier(self.alloc(ident_name))) } } } diff --git a/crates/oxc_prettier/src/format/mod.rs b/crates/oxc_prettier/src/format/mod.rs index b7ff5bb84c58e..bf2e9f9eb1105 100644 --- a/crates/oxc_prettier/src/format/mod.rs +++ b/crates/oxc_prettier/src/format/mod.rs @@ -1256,8 +1256,8 @@ impl<'a> Format<'a> for TSEnumMember<'a> { impl<'a> Format<'a> for TSEnumMemberName<'a> { fn format(&self, p: &mut Prettier<'a>) -> Doc<'a> { match self { - TSEnumMemberName::StaticIdentifier(identifier) => identifier.format(p), - TSEnumMemberName::StaticStringLiteral(string_literal) => string_literal.format(p), + TSEnumMemberName::Identifier(identifier) => identifier.format(p), + TSEnumMemberName::String(string_literal) => string_literal.format(p), } } } diff --git a/crates/oxc_transformer/src/typescript/enum.rs b/crates/oxc_transformer/src/typescript/enum.rs index 06827c8078310..5866d4b8325f8 100644 --- a/crates/oxc_transformer/src/typescript/enum.rs +++ b/crates/oxc_transformer/src/typescript/enum.rs @@ -193,8 +193,8 @@ impl<'a> TypeScriptEnum<'a> { for member in members.iter_mut() { let member_name: &Atom<'_> = match &member.id { - TSEnumMemberName::StaticIdentifier(id) => &id.name, - TSEnumMemberName::StaticStringLiteral(str) => &str.value, + TSEnumMemberName::Identifier(id) => &id.name, + TSEnumMemberName::String(str) => &str.value, }; let init = if let Some(initializer) = &mut member.initializer { diff --git a/crates/oxc_traverse/src/generated/walk.rs b/crates/oxc_traverse/src/generated/walk.rs index a5fd5988d2111..40817ec6fa0e6 100644 --- a/crates/oxc_traverse/src/generated/walk.rs +++ b/crates/oxc_traverse/src/generated/walk.rs @@ -3715,10 +3715,10 @@ pub(crate) unsafe fn walk_ts_enum_member_name<'a, Tr: Traverse<'a>>( ) { traverser.enter_ts_enum_member_name(&mut *node, ctx); match &mut *node { - TSEnumMemberName::StaticIdentifier(node) => { + TSEnumMemberName::Identifier(node) => { walk_identifier_name(traverser, (&mut **node) as *mut _, ctx) } - TSEnumMemberName::StaticStringLiteral(node) => { + TSEnumMemberName::String(node) => { walk_string_literal(traverser, (&mut **node) as *mut _, ctx) } }