refactor(ast): add AstKind for TSTupleType

Author: Cameron McHenry

crates/oxc_ast/src/ast_kind_impl.rs

@@ -333,6 +333,7 @@ impl AstKind<'_> {
             Self::TSTemplateLiteralType(_) => "TSTemplateLiteralType".into(),
             Self::TSArrayType(_) => "TSArrayType".into(),
             Self::TSTypeOperator(_) => "TSTypeOperator".into(),
+            Self::TSTupleType(_) => "TSTupleType".into(),
 
             Self::TSIndexedAccessType(_) => "TSIndexedAccessType".into(),
 

crates/oxc_ast/src/generated/ast_kind.rs

@@ -137,57 +137,58 @@ pub enum AstType {
     TSTypeOperator = 121,
     TSArrayType = 122,
     TSIndexedAccessType = 123,
-    TSNamedTupleMember = 124,
-    TSAnyKeyword = 125,
-    TSStringKeyword = 126,
-    TSBooleanKeyword = 127,
-    TSNumberKeyword = 128,
-    TSNeverKeyword = 129,
-    TSIntrinsicKeyword = 130,
-    TSUnknownKeyword = 131,
-    TSNullKeyword = 132,
-    TSUndefinedKeyword = 133,
-    TSVoidKeyword = 134,
-    TSSymbolKeyword = 135,
-    TSThisType = 136,
-    TSObjectKeyword = 137,
-    TSBigIntKeyword = 138,
-    TSTypeReference = 139,
-    TSTypeName = 140,
-    TSQualifiedName = 141,
-    TSTypeParameterInstantiation = 142,
-    TSTypeParameter = 143,
-    TSTypeParameterDeclaration = 144,
-    TSTypeAliasDeclaration = 145,
-    TSClassImplements = 146,
-    TSInterfaceDeclaration = 147,
-    TSPropertySignature = 148,
-    TSCallSignatureDeclaration = 149,
-    TSMethodSignature = 150,
-    TSConstructSignatureDeclaration = 151,
-    TSIndexSignatureName = 152,
-    TSInterfaceHeritage = 153,
-    TSTypePredicate = 154,
-    TSModuleDeclaration = 155,
-    TSModuleBlock = 156,
-    TSTypeLiteral = 157,
-    TSInferType = 158,
-    TSTypeQuery = 159,
-    TSImportType = 160,
-    TSMappedType = 161,
-    TSTemplateLiteralType = 162,
-    TSAsExpression = 163,
-    TSSatisfiesExpression = 164,
-    TSTypeAssertion = 165,
-    TSImportEqualsDeclaration = 166,
-    TSExternalModuleReference = 167,
-    TSNonNullExpression = 168,
-    Decorator = 169,
-    TSExportAssignment = 170,
-    TSInstantiationExpression = 171,
-    JSDocNullableType = 172,
-    JSDocNonNullableType = 173,
-    JSDocUnknownType = 174,
+    TSTupleType = 124,
+    TSNamedTupleMember = 125,
+    TSAnyKeyword = 126,
+    TSStringKeyword = 127,
+    TSBooleanKeyword = 128,
+    TSNumberKeyword = 129,
+    TSNeverKeyword = 130,
+    TSIntrinsicKeyword = 131,
+    TSUnknownKeyword = 132,
+    TSNullKeyword = 133,
+    TSUndefinedKeyword = 134,
+    TSVoidKeyword = 135,
+    TSSymbolKeyword = 136,
+    TSThisType = 137,
+    TSObjectKeyword = 138,
+    TSBigIntKeyword = 139,
+    TSTypeReference = 140,
+    TSTypeName = 141,
+    TSQualifiedName = 142,
+    TSTypeParameterInstantiation = 143,
+    TSTypeParameter = 144,
+    TSTypeParameterDeclaration = 145,
+    TSTypeAliasDeclaration = 146,
+    TSClassImplements = 147,
+    TSInterfaceDeclaration = 148,
+    TSPropertySignature = 149,
+    TSCallSignatureDeclaration = 150,
+    TSMethodSignature = 151,
+    TSConstructSignatureDeclaration = 152,
+    TSIndexSignatureName = 153,
+    TSInterfaceHeritage = 154,
+    TSTypePredicate = 155,
+    TSModuleDeclaration = 156,
+    TSModuleBlock = 157,
+    TSTypeLiteral = 158,
+    TSInferType = 159,
+    TSTypeQuery = 160,
+    TSImportType = 161,
+    TSMappedType = 162,
+    TSTemplateLiteralType = 163,
+    TSAsExpression = 164,
+    TSSatisfiesExpression = 165,
+    TSTypeAssertion = 166,
+    TSImportEqualsDeclaration = 167,
+    TSExternalModuleReference = 168,
+    TSNonNullExpression = 169,
+    Decorator = 170,
+    TSExportAssignment = 171,
+    TSInstantiationExpression = 172,
+    JSDocNullableType = 173,
+    JSDocNonNullableType = 174,
+    JSDocUnknownType = 175,
 }
 
 /// Untyped AST Node Kind
@@ -325,6 +326,7 @@ pub enum AstKind<'a> {
     TSTypeOperator(&'a TSTypeOperator<'a>) = AstType::TSTypeOperator as u8,
     TSArrayType(&'a TSArrayType<'a>) = AstType::TSArrayType as u8,
     TSIndexedAccessType(&'a TSIndexedAccessType<'a>) = AstType::TSIndexedAccessType as u8,
+    TSTupleType(&'a TSTupleType<'a>) = AstType::TSTupleType as u8,
     TSNamedTupleMember(&'a TSNamedTupleMember<'a>) = AstType::TSNamedTupleMember as u8,
     TSAnyKeyword(&'a TSAnyKeyword) = AstType::TSAnyKeyword as u8,
     TSStringKeyword(&'a TSStringKeyword) = AstType::TSStringKeyword as u8,
@@ -524,6 +526,7 @@ impl GetSpan for AstKind<'_> {
             Self::TSTypeOperator(it) => it.span(),
             Self::TSArrayType(it) => it.span(),
             Self::TSIndexedAccessType(it) => it.span(),
+            Self::TSTupleType(it) => it.span(),
             Self::TSNamedTupleMember(it) => it.span(),
             Self::TSAnyKeyword(it) => it.span(),
             Self::TSStringKeyword(it) => it.span(),
@@ -1200,6 +1203,11 @@ impl<'a> AstKind<'a> {
         if let Self::TSIndexedAccessType(v) = self { Some(v) } else { None }
     }
 
+    #[inline]
+    pub fn as_ts_tuple_type(self) -> Option<&'a TSTupleType<'a>> {
+        if let Self::TSTupleType(v) = self { Some(v) } else { None }
+    }
+
     #[inline]
     pub fn as_ts_named_tuple_member(self) -> Option<&'a TSNamedTupleMember<'a>> {
         if let Self::TSNamedTupleMember(v) = self { Some(v) } else { None }

crates/oxc_ast_visit/src/generated/visit.rs

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

crates/oxc_ast_visit/src/generated/visit_mut.rs

@@ -3530,9 +3530,11 @@ pub mod walk_mut {
 
     #[inline]
     pub fn walk_ts_tuple_type<'a, V: VisitMut<'a>>(visitor: &mut V, it: &mut TSTupleType<'a>) {
-        // No `AstType` for this type
+        let kind = AstType::TSTupleType;
+        visitor.enter_node(kind);
         visitor.visit_span(&mut it.span);
         visitor.visit_ts_tuple_elements(&mut it.element_types);
+        visitor.leave_node(kind);
     }
 
     #[inline]

crates/oxc_formatter/src/generated/ast_nodes.rs

@@ -151,6 +151,7 @@ pub enum AstNodes<'a> {
     TSTypeOperator(&'a AstNode<'a, TSTypeOperator<'a>>),
     TSArrayType(&'a AstNode<'a, TSArrayType<'a>>),
     TSIndexedAccessType(&'a AstNode<'a, TSIndexedAccessType<'a>>),
+    TSTupleType(&'a AstNode<'a, TSTupleType<'a>>),
     TSNamedTupleMember(&'a AstNode<'a, TSNamedTupleMember<'a>>),
     TSAnyKeyword(&'a AstNode<'a, TSAnyKeyword>),
     TSStringKeyword(&'a AstNode<'a, TSStringKeyword>),
@@ -332,6 +333,7 @@ impl<'a> AstNodes<'a> {
             Self::TSTypeOperator(n) => n.span(),
             Self::TSArrayType(n) => n.span(),
             Self::TSIndexedAccessType(n) => n.span(),
+            Self::TSTupleType(n) => n.span(),
             Self::TSNamedTupleMember(n) => n.span(),
             Self::TSAnyKeyword(n) => n.span(),
             Self::TSStringKeyword(n) => n.span(),
@@ -513,6 +515,7 @@ impl<'a> AstNodes<'a> {
             Self::TSTypeOperator(n) => n.parent,
             Self::TSArrayType(n) => n.parent,
             Self::TSIndexedAccessType(n) => n.parent,
+            Self::TSTupleType(n) => n.parent,
             Self::TSNamedTupleMember(n) => n.parent,
             Self::TSAnyKeyword(n) => n.parent,
             Self::TSStringKeyword(n) => n.parent,
@@ -694,6 +697,7 @@ impl<'a> AstNodes<'a> {
             Self::TSTypeOperator(_) => "TSTypeOperator",
             Self::TSArrayType(_) => "TSArrayType",
             Self::TSIndexedAccessType(_) => "TSIndexedAccessType",
+            Self::TSTupleType(_) => "TSTupleType",
             Self::TSNamedTupleMember(_) => "TSNamedTupleMember",
             Self::TSAnyKeyword(_) => "TSAnyKeyword",
             Self::TSStringKeyword(_) => "TSStringKeyword",
@@ -5750,11 +5754,11 @@ impl<'a> AstNode<'a, TSType<'a>> {
                 parent,
                 allocator: self.allocator,
             })),
-            TSType::TSTupleType(s) => {
-                panic!(
-                    "No kind for current enum variant yet, please see `tasks/ast_tools/src/generators/ast_kind.rs`"
-                )
-            }
+            TSType::TSTupleType(s) => AstNodes::TSTupleType(self.allocator.alloc(AstNode {
+                inner: s.as_ref(),
+                parent,
+                allocator: self.allocator,
+            })),
             TSType::TSTypeLiteral(s) => AstNodes::TSTypeLiteral(self.allocator.alloc(AstNode {
                 inner: s.as_ref(),
                 parent,
@@ -5987,7 +5991,7 @@ impl<'a> AstNode<'a, TSTupleType<'a>> {
         self.allocator.alloc(AstNode {
             inner: &self.inner.element_types,
             allocator: self.allocator,
-            parent: self.parent,
+            parent: self.allocator.alloc(AstNodes::TSTupleType(transmute_self(self))),
         })
     }
 }

crates/oxc_formatter/src/generated/format.rs

@@ -1537,7 +1537,10 @@ impl<'a> Format<'a> for AstNode<'a, TSIndexedAccessType<'a>> {
 
 impl<'a> Format<'a> for AstNode<'a, TSTupleType<'a>> {
     fn fmt(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
-        self.write(f)
+        format_leading_comments(self.span().start).fmt(f)?;
+        let result = self.write(f);
+        format_trailing_comments(self.span().end).fmt(f)?;
+        result
     }
 }
 

crates/oxc_semantic/tests/fixtures/typescript-eslint/type-annotation/parameter-array-destructure.snap

@@ -42,7 +42,7 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/type-annotation
             "flags": "ReferenceFlags(Type)",
             "id": 0,
             "name": "T",
-            "node_id": 12
+            "node_id": 13
           }
         ]
       },

crates/oxc_semantic/tests/fixtures/typescript-eslint/type-annotation/variable-array-destructure.snap

@@ -27,7 +27,7 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/type-annotation
             "flags": "ReferenceFlags(Type)",
             "id": 0,
             "name": "T",
-            "node_id": 10
+            "node_id": 11
           }
         ]
       },

crates/oxc_semantic/tests/fixtures/typescript-eslint/type-declaration/tuple-labelled-rest.snap

@@ -34,7 +34,7 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/type-declaratio
             "flags": "ReferenceFlags(Type)",
             "id": 0,
             "name": "T",
-            "node_id": 12
+            "node_id": 13
           }
         ]
       },

crates/oxc_semantic/tests/fixtures/typescript-eslint/type-declaration/tuple-labelled.snap

@@ -41,7 +41,7 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/type-declaratio
             "flags": "ReferenceFlags(Type)",
             "id": 0,
             "name": "T1",
-            "node_id": 15
+            "node_id": 16
           }
         ]
       },
@@ -55,7 +55,7 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/type-declaratio
             "flags": "ReferenceFlags(Type)",
             "id": 1,
             "name": "T2",
-            "node_id": 20
+            "node_id": 21
           }
         ]
       },