refactor(ast): reorder fields to reflect their visit order. (#3994)

oxc-project · Jul 1, 2024 · 0fe22a8 · 0fe22a8
1 parent bdee156
commit 0fe22a8
Show file tree

Hide file tree

Showing 5 changed files with 196 additions and 192 deletions.
diff --git a/crates/oxc_ast/src/ast/js.rs b/crates/oxc_ast/src/ast/js.rs
@@ -453,10 +453,10 @@ pub struct PrivateFieldExpression<'a> {
 pub struct CallExpression<'a> {
     #[cfg_attr(feature = "serialize", serde(flatten))]
     pub span: Span,
-    pub callee: Expression<'a>,
     pub arguments: Vec<'a, Argument<'a>>,
-    pub optional: bool, // for optional chaining
+    pub callee: Expression<'a>,
     pub type_parameters: Option<Box<'a, TSTypeParameterInstantiation<'a>>>,
+    pub optional: bool, // for optional chaining
 }
 
 /// New Expression
@@ -1659,6 +1659,7 @@ pub struct PropertyDefinition<'a> {
     pub r#type: PropertyDefinitionType,
     #[cfg_attr(feature = "serialize", serde(flatten))]
     pub span: Span,
+    pub decorators: Vec<'a, Decorator<'a>>,
     pub key: PropertyKey<'a>,
     pub value: Option<Expression<'a>>,
     pub computed: bool,
@@ -1670,7 +1671,6 @@ pub struct PropertyDefinition<'a> {
     pub readonly: bool,
     pub type_annotation: Option<Box<'a, TSTypeAnnotation<'a>>>,
     pub accessibility: Option<TSAccessibility>,
-    pub decorators: Vec<'a, Decorator<'a>>,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]

diff --git a/crates/oxc_ast/src/ast/ts.rs b/crates/oxc_ast/src/ast/ts.rs
@@ -612,8 +612,8 @@ pub struct TSTypeAliasDeclaration<'a> {
     #[cfg_attr(feature = "serialize", serde(flatten))]
     pub span: Span,
     pub id: BindingIdentifier<'a>,
-    pub type_annotation: TSType<'a>,
     pub type_parameters: Option<Box<'a, TSTypeParameterDeclaration<'a>>>,
+    pub type_annotation: TSType<'a>,
     pub declare: bool,
 }
 
@@ -648,9 +648,9 @@ pub struct TSInterfaceDeclaration<'a> {
     #[cfg_attr(feature = "serialize", serde(flatten))]
     pub span: Span,
     pub id: BindingIdentifier<'a>,
-    pub body: Box<'a, TSInterfaceBody<'a>>,
-    pub type_parameters: Option<Box<'a, TSTypeParameterDeclaration<'a>>>,
     pub extends: Option<Vec<'a, TSInterfaceHeritage<'a>>>,
+    pub type_parameters: Option<Box<'a, TSTypeParameterDeclaration<'a>>>,
+    pub body: Box<'a, TSInterfaceBody<'a>>,
     pub declare: bool,
 }
 

diff --git a/crates/oxc_ast/src/ast_builder.rs b/crates/oxc_ast/src/ast_builder.rs
@@ -608,10 +608,10 @@ impl<'a> AstBuilder<'a> {
     ) -> Expression<'a> {
         Expression::CallExpression(self.alloc(CallExpression {
             span,
-            callee,
             arguments,
-            optional,
+            callee,
             type_parameters,
+            optional,
         }))
     }
 
@@ -1067,6 +1067,7 @@ impl<'a> AstBuilder<'a> {
         ClassElement::PropertyDefinition(self.alloc(PropertyDefinition {
             r#type,
             span,
+            decorators,
             key,
             value,
             computed,
@@ -1078,7 +1079,6 @@ impl<'a> AstBuilder<'a> {
             readonly,
             type_annotation,
             accessibility,
-            decorators,
         }))
     }
 
@@ -1860,9 +1860,9 @@ impl<'a> AstBuilder<'a> {
         Declaration::TSInterfaceDeclaration(self.alloc(TSInterfaceDeclaration {
             span,
             id,
-            body,
-            type_parameters,
             extends,
+            type_parameters,
+            body,
             declare,
         }))
     }
@@ -1879,8 +1879,8 @@ impl<'a> AstBuilder<'a> {
         Declaration::TSTypeAliasDeclaration(self.alloc(TSTypeAliasDeclaration {
             span,
             id,
-            type_annotation,
             type_parameters,
+            type_annotation,
             declare,
         }))
     }