From 2958ff7480bd707a8923b29a8184e2e35dba8051 Mon Sep 17 00:00:00 2001 From: overlookmotel <557937+overlookmotel@users.noreply.github.com> Date: Mon, 12 May 2025 14:31:19 +0000 Subject: [PATCH] refactor(ast/estree): rename serializers (#10969) Pure refactor. Rename `AssignmentTargetPropertyIdentifierInit` and `JSXElementOpeningElement` serializers, to follow the naming convention of ``. --- crates/oxc_ast/src/ast/js.rs | 2 +- crates/oxc_ast/src/ast/jsx.rs | 2 +- crates/oxc_ast/src/generated/derive_estree.rs | 7 +++++-- crates/oxc_ast/src/serialize/js.rs | 4 ++-- crates/oxc_ast/src/serialize/jsx.rs | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/crates/oxc_ast/src/ast/js.rs b/crates/oxc_ast/src/ast/js.rs index 30cd21b2f5cd7..4bcdb249813bb 100644 --- a/crates/oxc_ast/src/ast/js.rs +++ b/crates/oxc_ast/src/ast/js.rs @@ -962,7 +962,7 @@ pub struct AssignmentTargetPropertyIdentifier<'a> { pub span: Span, #[estree(rename = "key")] pub binding: IdentifierReference<'a>, - #[estree(rename = "value", via = AssignmentTargetPropertyIdentifierValue)] + #[estree(rename = "value", via = AssignmentTargetPropertyIdentifierInit)] pub init: Option>, } diff --git a/crates/oxc_ast/src/ast/jsx.rs b/crates/oxc_ast/src/ast/jsx.rs index 2039ecdf5ff20..b78477dea718e 100644 --- a/crates/oxc_ast/src/ast/jsx.rs +++ b/crates/oxc_ast/src/ast/jsx.rs @@ -38,7 +38,7 @@ pub struct JSXElement<'a> { /// Node location in source code pub span: Span, /// Opening tag of the element. - #[estree(via = JSXElementOpening)] + #[estree(via = JSXElementOpeningElement)] pub opening_element: Box<'a, JSXOpeningElement<'a>>, /// Children of the element. /// This can be text, other elements, or expressions. diff --git a/crates/oxc_ast/src/generated/derive_estree.rs b/crates/oxc_ast/src/generated/derive_estree.rs index 67cb1c4dc4bdc..05810ddb422b7 100644 --- a/crates/oxc_ast/src/generated/derive_estree.rs +++ b/crates/oxc_ast/src/generated/derive_estree.rs @@ -725,7 +725,7 @@ impl ESTree for AssignmentTargetPropertyIdentifier<'_> { state.serialize_field("key", &self.binding); state.serialize_field( "value", - &crate::serialize::js::AssignmentTargetPropertyIdentifierValue(self), + &crate::serialize::js::AssignmentTargetPropertyIdentifierInit(self), ); state.serialize_field("kind", &crate::serialize::basic::Init(self)); state.serialize_ts_field("optional", &crate::serialize::basic::TsFalse(self)); @@ -1999,7 +1999,10 @@ impl ESTree for JSXElement<'_> { state.serialize_field("type", &JsonSafeString("JSXElement")); state.serialize_field("start", &self.span.start); state.serialize_field("end", &self.span.end); - state.serialize_field("openingElement", &crate::serialize::jsx::JSXElementOpening(self)); + state.serialize_field( + "openingElement", + &crate::serialize::jsx::JSXElementOpeningElement(self), + ); state.serialize_field("closingElement", &self.closing_element); state.serialize_field("children", &self.children); state.end(); diff --git a/crates/oxc_ast/src/serialize/js.rs b/crates/oxc_ast/src/serialize/js.rs index f541232119502..a82c89e39ba9d 100644 --- a/crates/oxc_ast/src/serialize/js.rs +++ b/crates/oxc_ast/src/serialize/js.rs @@ -375,11 +375,11 @@ impl ESTree for ArrowFunctionExpressionBody<'_> { value " )] -pub struct AssignmentTargetPropertyIdentifierValue<'a>( +pub struct AssignmentTargetPropertyIdentifierInit<'a>( pub &'a AssignmentTargetPropertyIdentifier<'a>, ); -impl ESTree for AssignmentTargetPropertyIdentifierValue<'_> { +impl ESTree for AssignmentTargetPropertyIdentifierInit<'_> { fn serialize(&self, serializer: S) { if let Some(init) = &self.0.init { let mut state = serializer.serialize_struct(); diff --git a/crates/oxc_ast/src/serialize/jsx.rs b/crates/oxc_ast/src/serialize/jsx.rs index 8d590729704f4..7e7f2f84bb531 100644 --- a/crates/oxc_ast/src/serialize/jsx.rs +++ b/crates/oxc_ast/src/serialize/jsx.rs @@ -17,9 +17,9 @@ use super::EmptyArray; openingElement " )] -pub struct JSXElementOpening<'a, 'b>(pub &'b JSXElement<'a>); +pub struct JSXElementOpeningElement<'a, 'b>(pub &'b JSXElement<'a>); -impl ESTree for JSXElementOpening<'_, '_> { +impl ESTree for JSXElementOpeningElement<'_, '_> { fn serialize(&self, serializer: S) { let element = self.0; let opening_element = element.opening_element.as_ref();