refactor(ast): add astkind for TSInterfaceBody

Author: camc314

crates/oxc_ast/src/ast_kind_impl.rs

@@ -405,6 +405,7 @@ impl AstKind<'_> {
             Self::TSConstructSignatureDeclaration(_) => "TSConstructSignatureDeclaration".into(),
             Self::TSExportAssignment(_) => "TSExportAssignment".into(),
             Self::TSConstructorType(_) => "TSConstructorType".into(),
+            Self::TSInterfaceBody(_) => "TSInterfaceBody".into(),
             Self::TSIndexSignature(_) => "TSIndexSignature".into(),
             Self::V8IntrinsicExpression(_) => "V8IntrinsicExpression".into(),
 

crates/oxc_ast/src/generated/ast_kind.rs

@@ -170,36 +170,37 @@ pub enum AstType {
     TSTypeAliasDeclaration = 153,
     TSClassImplements = 154,
     TSInterfaceDeclaration = 155,
-    TSPropertySignature = 156,
-    TSIndexSignature = 157,
-    TSCallSignatureDeclaration = 158,
-    TSMethodSignature = 159,
-    TSConstructSignatureDeclaration = 160,
-    TSIndexSignatureName = 161,
-    TSInterfaceHeritage = 162,
-    TSTypePredicate = 163,
-    TSModuleDeclaration = 164,
-    TSModuleBlock = 165,
-    TSTypeLiteral = 166,
-    TSInferType = 167,
-    TSTypeQuery = 168,
-    TSImportType = 169,
-    TSConstructorType = 170,
-    TSMappedType = 171,
-    TSTemplateLiteralType = 172,
-    TSAsExpression = 173,
-    TSSatisfiesExpression = 174,
-    TSTypeAssertion = 175,
-    TSImportEqualsDeclaration = 176,
-    TSExternalModuleReference = 177,
-    TSNonNullExpression = 178,
-    Decorator = 179,
-    TSExportAssignment = 180,
-    TSNamespaceExportDeclaration = 181,
-    TSInstantiationExpression = 182,
-    JSDocNullableType = 183,
-    JSDocNonNullableType = 184,
-    JSDocUnknownType = 185,
+    TSInterfaceBody = 156,
+    TSPropertySignature = 157,
+    TSIndexSignature = 158,
+    TSCallSignatureDeclaration = 159,
+    TSMethodSignature = 160,
+    TSConstructSignatureDeclaration = 161,
+    TSIndexSignatureName = 162,
+    TSInterfaceHeritage = 163,
+    TSTypePredicate = 164,
+    TSModuleDeclaration = 165,
+    TSModuleBlock = 166,
+    TSTypeLiteral = 167,
+    TSInferType = 168,
+    TSTypeQuery = 169,
+    TSImportType = 170,
+    TSConstructorType = 171,
+    TSMappedType = 172,
+    TSTemplateLiteralType = 173,
+    TSAsExpression = 174,
+    TSSatisfiesExpression = 175,
+    TSTypeAssertion = 176,
+    TSImportEqualsDeclaration = 177,
+    TSExternalModuleReference = 178,
+    TSNonNullExpression = 179,
+    Decorator = 180,
+    TSExportAssignment = 181,
+    TSNamespaceExportDeclaration = 182,
+    TSInstantiationExpression = 183,
+    JSDocNullableType = 184,
+    JSDocNonNullableType = 185,
+    JSDocUnknownType = 186,
 }
 
 /// Untyped AST Node Kind
@@ -372,6 +373,7 @@ pub enum AstKind<'a> {
     TSTypeAliasDeclaration(&'a TSTypeAliasDeclaration<'a>) = AstType::TSTypeAliasDeclaration as u8,
     TSClassImplements(&'a TSClassImplements<'a>) = AstType::TSClassImplements as u8,
     TSInterfaceDeclaration(&'a TSInterfaceDeclaration<'a>) = AstType::TSInterfaceDeclaration as u8,
+    TSInterfaceBody(&'a TSInterfaceBody<'a>) = AstType::TSInterfaceBody as u8,
     TSPropertySignature(&'a TSPropertySignature<'a>) = AstType::TSPropertySignature as u8,
     TSIndexSignature(&'a TSIndexSignature<'a>) = AstType::TSIndexSignature as u8,
     TSCallSignatureDeclaration(&'a TSCallSignatureDeclaration<'a>) =
@@ -581,6 +583,7 @@ impl GetSpan for AstKind<'_> {
             Self::TSTypeAliasDeclaration(it) => it.span(),
             Self::TSClassImplements(it) => it.span(),
             Self::TSInterfaceDeclaration(it) => it.span(),
+            Self::TSInterfaceBody(it) => it.span(),
             Self::TSPropertySignature(it) => it.span(),
             Self::TSIndexSignature(it) => it.span(),
             Self::TSCallSignatureDeclaration(it) => it.span(),
@@ -774,6 +777,7 @@ impl GetAddress for AstKind<'_> {
             Self::TSTypeAliasDeclaration(it) => Address::from_ptr(it),
             Self::TSClassImplements(it) => Address::from_ptr(it),
             Self::TSInterfaceDeclaration(it) => Address::from_ptr(it),
+            Self::TSInterfaceBody(it) => Address::from_ptr(it),
             Self::TSPropertySignature(it) => Address::from_ptr(it),
             Self::TSIndexSignature(it) => Address::from_ptr(it),
             Self::TSCallSignatureDeclaration(it) => Address::from_ptr(it),
@@ -1591,6 +1595,11 @@ impl<'a> AstKind<'a> {
         if let Self::TSInterfaceDeclaration(v) = self { Some(v) } else { None }
     }
 
+    #[inline]
+    pub fn as_ts_interface_body(self) -> Option<&'a TSInterfaceBody<'a>> {
+        if let Self::TSInterfaceBody(v) = self { Some(v) } else { None }
+    }
+
     #[inline]
     pub fn as_ts_property_signature(self) -> Option<&'a TSPropertySignature<'a>> {
         if let Self::TSPropertySignature(v) = self { Some(v) } else { None }

crates/oxc_ast_visit/src/generated/visit.rs

@@ -3656,9 +3656,11 @@ pub mod walk {
 
     #[inline]
     pub fn walk_ts_interface_body<'a, V: Visit<'a>>(visitor: &mut V, it: &TSInterfaceBody<'a>) {
-        // No `AstKind` for this type
+        let kind = AstKind::TSInterfaceBody(visitor.alloc(it));
+        visitor.enter_node(kind);
         visitor.visit_span(&it.span);
         visitor.visit_ts_signatures(&it.body);
+        visitor.leave_node(kind);
     }
 
     #[inline]

crates/oxc_ast_visit/src/generated/visit_mut.rs

@@ -3856,9 +3856,11 @@ pub mod walk_mut {
         visitor: &mut V,
         it: &mut TSInterfaceBody<'a>,
     ) {
-        // No `AstType` for this type
+        let kind = AstType::TSInterfaceBody;
+        visitor.enter_node(kind);
         visitor.visit_span(&mut it.span);
         visitor.visit_ts_signatures(&mut it.body);
+        visitor.leave_node(kind);
     }
 
     #[inline]

crates/oxc_formatter/src/generated/ast_nodes.rs

@@ -183,6 +183,7 @@ pub enum AstNodes<'a> {
     TSTypeAliasDeclaration(&'a AstNode<'a, TSTypeAliasDeclaration<'a>>),
     TSClassImplements(&'a AstNode<'a, TSClassImplements<'a>>),
     TSInterfaceDeclaration(&'a AstNode<'a, TSInterfaceDeclaration<'a>>),
+    TSInterfaceBody(&'a AstNode<'a, TSInterfaceBody<'a>>),
     TSPropertySignature(&'a AstNode<'a, TSPropertySignature<'a>>),
     TSIndexSignature(&'a AstNode<'a, TSIndexSignature<'a>>),
     TSCallSignatureDeclaration(&'a AstNode<'a, TSCallSignatureDeclaration<'a>>),
@@ -2469,6 +2470,7 @@ impl<'a> AstNodes<'a> {
             Self::TSTypeAliasDeclaration(n) => n.span(),
             Self::TSClassImplements(n) => n.span(),
             Self::TSInterfaceDeclaration(n) => n.span(),
+            Self::TSInterfaceBody(n) => n.span(),
             Self::TSPropertySignature(n) => n.span(),
             Self::TSIndexSignature(n) => n.span(),
             Self::TSCallSignatureDeclaration(n) => n.span(),
@@ -2661,6 +2663,7 @@ impl<'a> AstNodes<'a> {
             Self::TSTypeAliasDeclaration(n) => n.parent,
             Self::TSClassImplements(n) => n.parent,
             Self::TSInterfaceDeclaration(n) => n.parent,
+            Self::TSInterfaceBody(n) => n.parent,
             Self::TSPropertySignature(n) => n.parent,
             Self::TSIndexSignature(n) => n.parent,
             Self::TSCallSignatureDeclaration(n) => n.parent,
@@ -2853,6 +2856,7 @@ impl<'a> AstNodes<'a> {
             Self::TSTypeAliasDeclaration(n) => SiblingNode::from(n.inner),
             Self::TSClassImplements(n) => SiblingNode::from(n.inner),
             Self::TSInterfaceDeclaration(n) => SiblingNode::from(n.inner),
+            Self::TSInterfaceBody(n) => SiblingNode::from(n.inner),
             Self::TSPropertySignature(n) => SiblingNode::from(n.inner),
             Self::TSIndexSignature(n) => SiblingNode::from(n.inner),
             Self::TSCallSignatureDeclaration(n) => SiblingNode::from(n.inner),
@@ -3045,6 +3049,7 @@ impl<'a> AstNodes<'a> {
             Self::TSTypeAliasDeclaration(_) => "TSTypeAliasDeclaration",
             Self::TSClassImplements(_) => "TSClassImplements",
             Self::TSInterfaceDeclaration(_) => "TSInterfaceDeclaration",
+            Self::TSInterfaceBody(_) => "TSInterfaceBody",
             Self::TSPropertySignature(_) => "TSPropertySignature",
             Self::TSIndexSignature(_) => "TSIndexSignature",
             Self::TSCallSignatureDeclaration(_) => "TSCallSignatureDeclaration",
@@ -9879,7 +9884,7 @@ impl<'a> AstNode<'a, TSInterfaceBody<'a>> {
         self.allocator.alloc(AstNode {
             inner: &self.inner.body,
             allocator: self.allocator,
-            parent: self.parent,
+            parent: self.allocator.alloc(AstNodes::TSInterfaceBody(transmute_self(self))),
             following_node,
         })
     }

crates/oxc_formatter/src/generated/format.rs

@@ -2553,7 +2553,15 @@ impl<'a> Format<'a> for AstNode<'a, TSInterfaceDeclaration<'a>> {
 
 impl<'a> Format<'a> for AstNode<'a, TSInterfaceBody<'a>> {
     fn fmt(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
-        self.write(f)
+        format_leading_comments(self.span).fmt(f)?;
+        let result = self.write(f);
+        format_trailing_comments(
+            &self.parent.as_sibling_node(),
+            &SiblingNode::from(self.inner),
+            self.following_node.as_ref(),
+        )
+        .fmt(f)?;
+        result
     }
 }
 

crates/oxc_semantic/tests/fixtures/oxc/ts/exports/named/interface-heritage.snap

@@ -27,7 +27,7 @@ input_file: crates/oxc_semantic/tests/fixtures/oxc/ts/exports/named/interface-he
             "flags": "ReferenceFlags(Read)",
             "id": 1,
             "name": "forwardRef",
-            "node_id": 19
+            "node_id": 20
           }
         ]
       },

crates/oxc_semantic/tests/fixtures/oxc/ts/interfaces/property-with-type-import.snap

@@ -41,13 +41,13 @@ input_file: crates/oxc_semantic/tests/fixtures/oxc/ts/interfaces/property-with-t
             "flags": "ReferenceFlags(Type)",
             "id": 0,
             "name": "X",
-            "node_id": 15
+            "node_id": 16
           },
           {
             "flags": "ReferenceFlags(Type)",
             "id": 2,
             "name": "X",
-            "node_id": 27
+            "node_id": 29
           }
         ]
       },
@@ -61,13 +61,13 @@ input_file: crates/oxc_semantic/tests/fixtures/oxc/ts/interfaces/property-with-t
             "flags": "ReferenceFlags(Type)",
             "id": 1,
             "name": "B",
-            "node_id": 19
+            "node_id": 20
           },
           {
             "flags": "ReferenceFlags(Type)",
             "id": 3,
             "name": "B",
-            "node_id": 32
+            "node_id": 34
           }
         ]
       },

crates/oxc_semantic/tests/fixtures/typescript-eslint/class/declaration/implements-generic.snap

@@ -49,7 +49,7 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/class/declarati
             "flags": "ReferenceFlags(Type)",
             "id": 0,
             "name": "A",
-            "node_id": 13
+            "node_id": 14
           }
         ]
       },
@@ -63,7 +63,7 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/class/declarati
             "flags": "ReferenceFlags(Type)",
             "id": 1,
             "name": "T",
-            "node_id": 17
+            "node_id": 18
           }
         ]
       },

crates/oxc_semantic/tests/fixtures/typescript-eslint/class/declaration/implements.snap

@@ -34,7 +34,7 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/class/declarati
             "flags": "ReferenceFlags(Type)",
             "id": 0,
             "name": "A",
-            "node_id": 7
+            "node_id": 8
           }
         ]
       },