refactor(ast): remove AstKind for ModuleDeclaration (#12022)

- Part of #11490

Similar to how we handled member expressions, I've added a new `enum` that narrows `AstKind` down to just things that are `ModuleDeclaration`s.

Author: camchenry

crates/oxc_ast/src/ast_kind_impl.rs

@@ -18,10 +18,30 @@ impl<'a> AstKind<'a> {
     pub fn is_declaration(self) -> bool {
         matches!(self, Self::Function(func) if func.is_declaration())
         || matches!(self, Self::Class(class) if class.is_declaration())
-        || matches!(self, Self::ModuleDeclaration(_) | Self::TSEnumDeclaration(_) | Self::TSModuleDeclaration(_)
+        || matches!(self, Self::TSEnumDeclaration(_) | Self::TSModuleDeclaration(_)
             | Self::VariableDeclaration(_) | Self::TSInterfaceDeclaration(_)
             | Self::TSTypeAliasDeclaration(_) | Self::TSImportEqualsDeclaration(_) | Self::PropertyDefinition(_)
-        )
+        ) || self.is_module_declaration()
+    }
+
+    pub fn is_module_declaration(self) -> bool {
+        self.as_module_declaration_kind().is_some()
+    }
+
+    pub fn as_module_declaration_kind(&self) -> Option<ModuleDeclarationKind<'a>> {
+        match self {
+            Self::ImportDeclaration(decl) => Some(ModuleDeclarationKind::Import(decl)),
+            Self::ExportAllDeclaration(decl) => Some(ModuleDeclarationKind::ExportAll(decl)),
+            Self::ExportNamedDeclaration(decl) => Some(ModuleDeclarationKind::ExportNamed(decl)),
+            Self::ExportDefaultDeclaration(decl) => {
+                Some(ModuleDeclarationKind::ExportDefault(decl))
+            }
+            Self::TSExportAssignment(decl) => Some(ModuleDeclarationKind::TSExportAssignment(decl)),
+            Self::TSNamespaceExportDeclaration(decl) => {
+                Some(ModuleDeclarationKind::TSNamespaceExport(decl))
+            }
+            _ => None,
+        }
     }
 
     #[rustfmt::skip]
@@ -309,7 +329,6 @@ impl AstKind<'_> {
 
             Self::Decorator(_) => "Decorator".into(),
 
-            Self::ModuleDeclaration(_) => "ModuleDeclaration".into(),
             Self::ImportDeclaration(_) => "ImportDeclaration".into(),
             Self::ImportSpecifier(i) => format!("ImportSpecifier({})", i.local.name).into(),
             Self::ExportSpecifier(e) => format!("ExportSpecifier({})", e.local.name()).into(),
@@ -505,3 +524,39 @@ impl GetSpan for MemberExpressionKind<'_> {
         }
     }
 }
+
+pub enum ModuleDeclarationKind<'a> {
+    Import(&'a ImportDeclaration<'a>),
+    ExportAll(&'a ExportAllDeclaration<'a>),
+    ExportNamed(&'a ExportNamedDeclaration<'a>),
+    ExportDefault(&'a ExportDefaultDeclaration<'a>),
+    TSExportAssignment(&'a TSExportAssignment<'a>),
+    TSNamespaceExport(&'a TSNamespaceExportDeclaration<'a>),
+}
+
+impl ModuleDeclarationKind<'_> {
+    /// Returns whether this module declaration is an `export` declaration.
+    pub fn is_export(&self) -> bool {
+        matches!(
+            self,
+            Self::ExportAll(_)
+                | Self::ExportNamed(_)
+                | Self::ExportDefault(_)
+                | Self::TSExportAssignment(_)
+                | Self::TSNamespaceExport(_)
+        )
+    }
+}
+
+impl GetSpan for ModuleDeclarationKind<'_> {
+    fn span(&self) -> Span {
+        match self {
+            Self::Import(decl) => decl.span,
+            Self::ExportAll(decl) => decl.span,
+            Self::ExportNamed(decl) => decl.span,
+            Self::ExportDefault(decl) => decl.span,
+            Self::TSExportAssignment(decl) => decl.span,
+            Self::TSNamespaceExport(decl) => decl.span,
+        }
+    }
+}

crates/oxc_ast/src/generated/ast_kind.rs

@@ -99,111 +99,110 @@ pub enum AstType {
     PropertyDefinition = 82,
     PrivateIdentifier = 83,
     StaticBlock = 84,
-    ModuleDeclaration = 85,
-    AccessorProperty = 86,
-    ImportExpression = 87,
-    ImportDeclaration = 88,
-    ImportSpecifier = 89,
-    ImportDefaultSpecifier = 90,
-    ImportNamespaceSpecifier = 91,
-    WithClause = 92,
-    ImportAttribute = 93,
-    ExportNamedDeclaration = 94,
-    ExportDefaultDeclaration = 95,
-    ExportAllDeclaration = 96,
-    ExportSpecifier = 97,
-    V8IntrinsicExpression = 98,
-    BooleanLiteral = 99,
-    NullLiteral = 100,
-    NumericLiteral = 101,
-    StringLiteral = 102,
-    BigIntLiteral = 103,
-    RegExpLiteral = 104,
-    JSXElement = 105,
-    JSXOpeningElement = 106,
-    JSXClosingElement = 107,
-    JSXFragment = 108,
-    JSXOpeningFragment = 109,
-    JSXClosingFragment = 110,
-    JSXNamespacedName = 111,
-    JSXMemberExpression = 112,
-    JSXExpressionContainer = 113,
-    JSXEmptyExpression = 114,
-    JSXAttribute = 115,
-    JSXSpreadAttribute = 116,
-    JSXIdentifier = 117,
-    JSXSpreadChild = 118,
-    JSXText = 119,
-    TSThisParameter = 120,
-    TSEnumDeclaration = 121,
-    TSEnumBody = 122,
-    TSEnumMember = 123,
-    TSTypeAnnotation = 124,
-    TSLiteralType = 125,
-    TSConditionalType = 126,
-    TSUnionType = 127,
-    TSIntersectionType = 128,
-    TSParenthesizedType = 129,
-    TSTypeOperator = 130,
-    TSArrayType = 131,
-    TSIndexedAccessType = 132,
-    TSTupleType = 133,
-    TSNamedTupleMember = 134,
-    TSOptionalType = 135,
-    TSRestType = 136,
-    TSAnyKeyword = 137,
-    TSStringKeyword = 138,
-    TSBooleanKeyword = 139,
-    TSNumberKeyword = 140,
-    TSNeverKeyword = 141,
-    TSIntrinsicKeyword = 142,
-    TSUnknownKeyword = 143,
-    TSNullKeyword = 144,
-    TSUndefinedKeyword = 145,
-    TSVoidKeyword = 146,
-    TSSymbolKeyword = 147,
-    TSThisType = 148,
-    TSObjectKeyword = 149,
-    TSBigIntKeyword = 150,
-    TSTypeReference = 151,
-    TSQualifiedName = 152,
-    TSTypeParameterInstantiation = 153,
-    TSTypeParameter = 154,
-    TSTypeParameterDeclaration = 155,
-    TSTypeAliasDeclaration = 156,
-    TSClassImplements = 157,
-    TSInterfaceDeclaration = 158,
-    TSInterfaceBody = 159,
-    TSPropertySignature = 160,
-    TSIndexSignature = 161,
-    TSCallSignatureDeclaration = 162,
-    TSMethodSignature = 163,
-    TSConstructSignatureDeclaration = 164,
-    TSIndexSignatureName = 165,
-    TSInterfaceHeritage = 166,
-    TSTypePredicate = 167,
-    TSModuleDeclaration = 168,
-    TSModuleBlock = 169,
-    TSTypeLiteral = 170,
-    TSInferType = 171,
-    TSTypeQuery = 172,
-    TSImportType = 173,
-    TSConstructorType = 174,
-    TSMappedType = 175,
-    TSTemplateLiteralType = 176,
-    TSAsExpression = 177,
-    TSSatisfiesExpression = 178,
-    TSTypeAssertion = 179,
-    TSImportEqualsDeclaration = 180,
-    TSExternalModuleReference = 181,
-    TSNonNullExpression = 182,
-    Decorator = 183,
-    TSExportAssignment = 184,
-    TSNamespaceExportDeclaration = 185,
-    TSInstantiationExpression = 186,
-    JSDocNullableType = 187,
-    JSDocNonNullableType = 188,
-    JSDocUnknownType = 189,
+    AccessorProperty = 85,
+    ImportExpression = 86,
+    ImportDeclaration = 87,
+    ImportSpecifier = 88,
+    ImportDefaultSpecifier = 89,
+    ImportNamespaceSpecifier = 90,
+    WithClause = 91,
+    ImportAttribute = 92,
+    ExportNamedDeclaration = 93,
+    ExportDefaultDeclaration = 94,
+    ExportAllDeclaration = 95,
+    ExportSpecifier = 96,
+    V8IntrinsicExpression = 97,
+    BooleanLiteral = 98,
+    NullLiteral = 99,
+    NumericLiteral = 100,
+    StringLiteral = 101,
+    BigIntLiteral = 102,
+    RegExpLiteral = 103,
+    JSXElement = 104,
+    JSXOpeningElement = 105,
+    JSXClosingElement = 106,
+    JSXFragment = 107,
+    JSXOpeningFragment = 108,
+    JSXClosingFragment = 109,
+    JSXNamespacedName = 110,
+    JSXMemberExpression = 111,
+    JSXExpressionContainer = 112,
+    JSXEmptyExpression = 113,
+    JSXAttribute = 114,
+    JSXSpreadAttribute = 115,
+    JSXIdentifier = 116,
+    JSXSpreadChild = 117,
+    JSXText = 118,
+    TSThisParameter = 119,
+    TSEnumDeclaration = 120,
+    TSEnumBody = 121,
+    TSEnumMember = 122,
+    TSTypeAnnotation = 123,
+    TSLiteralType = 124,
+    TSConditionalType = 125,
+    TSUnionType = 126,
+    TSIntersectionType = 127,
+    TSParenthesizedType = 128,
+    TSTypeOperator = 129,
+    TSArrayType = 130,
+    TSIndexedAccessType = 131,
+    TSTupleType = 132,
+    TSNamedTupleMember = 133,
+    TSOptionalType = 134,
+    TSRestType = 135,
+    TSAnyKeyword = 136,
+    TSStringKeyword = 137,
+    TSBooleanKeyword = 138,
+    TSNumberKeyword = 139,
+    TSNeverKeyword = 140,
+    TSIntrinsicKeyword = 141,
+    TSUnknownKeyword = 142,
+    TSNullKeyword = 143,
+    TSUndefinedKeyword = 144,
+    TSVoidKeyword = 145,
+    TSSymbolKeyword = 146,
+    TSThisType = 147,
+    TSObjectKeyword = 148,
+    TSBigIntKeyword = 149,
+    TSTypeReference = 150,
+    TSQualifiedName = 151,
+    TSTypeParameterInstantiation = 152,
+    TSTypeParameter = 153,
+    TSTypeParameterDeclaration = 154,
+    TSTypeAliasDeclaration = 155,
+    TSClassImplements = 156,
+    TSInterfaceDeclaration = 157,
+    TSInterfaceBody = 158,
+    TSPropertySignature = 159,
+    TSIndexSignature = 160,
+    TSCallSignatureDeclaration = 161,
+    TSMethodSignature = 162,
+    TSConstructSignatureDeclaration = 163,
+    TSIndexSignatureName = 164,
+    TSInterfaceHeritage = 165,
+    TSTypePredicate = 166,
+    TSModuleDeclaration = 167,
+    TSModuleBlock = 168,
+    TSTypeLiteral = 169,
+    TSInferType = 170,
+    TSTypeQuery = 171,
+    TSImportType = 172,
+    TSConstructorType = 173,
+    TSMappedType = 174,
+    TSTemplateLiteralType = 175,
+    TSAsExpression = 176,
+    TSSatisfiesExpression = 177,
+    TSTypeAssertion = 178,
+    TSImportEqualsDeclaration = 179,
+    TSExternalModuleReference = 180,
+    TSNonNullExpression = 181,
+    Decorator = 182,
+    TSExportAssignment = 183,
+    TSNamespaceExportDeclaration = 184,
+    TSInstantiationExpression = 185,
+    JSDocNullableType = 186,
+    JSDocNonNullableType = 187,
+    JSDocUnknownType = 188,
 }
 
 /// Untyped AST Node Kind
@@ -303,7 +302,6 @@ pub enum AstKind<'a> {
     PropertyDefinition(&'a PropertyDefinition<'a>) = AstType::PropertyDefinition as u8,
     PrivateIdentifier(&'a PrivateIdentifier<'a>) = AstType::PrivateIdentifier as u8,
     StaticBlock(&'a StaticBlock<'a>) = AstType::StaticBlock as u8,
-    ModuleDeclaration(&'a ModuleDeclaration<'a>) = AstType::ModuleDeclaration as u8,
     AccessorProperty(&'a AccessorProperty<'a>) = AstType::AccessorProperty as u8,
     ImportExpression(&'a ImportExpression<'a>) = AstType::ImportExpression as u8,
     ImportDeclaration(&'a ImportDeclaration<'a>) = AstType::ImportDeclaration as u8,
@@ -520,7 +518,6 @@ impl GetSpan for AstKind<'_> {
             Self::PropertyDefinition(it) => it.span(),
             Self::PrivateIdentifier(it) => it.span(),
             Self::StaticBlock(it) => it.span(),
-            Self::ModuleDeclaration(it) => it.span(),
             Self::AccessorProperty(it) => it.span(),
             Self::ImportExpression(it) => it.span(),
             Self::ImportDeclaration(it) => it.span(),
@@ -717,7 +714,6 @@ impl GetAddress for AstKind<'_> {
             Self::PropertyDefinition(it) => Address::from_ptr(it),
             Self::PrivateIdentifier(it) => Address::from_ptr(it),
             Self::StaticBlock(it) => Address::from_ptr(it),
-            Self::ModuleDeclaration(it) => it.address(),
             Self::AccessorProperty(it) => Address::from_ptr(it),
             Self::ImportExpression(it) => Address::from_ptr(it),
             Self::ImportDeclaration(it) => Address::from_ptr(it),
@@ -1256,11 +1252,6 @@ impl<'a> AstKind<'a> {
         if let Self::StaticBlock(v) = self { Some(v) } else { None }
     }
 
-    #[inline]
-    pub fn as_module_declaration(self) -> Option<&'a ModuleDeclaration<'a>> {
-        if let Self::ModuleDeclaration(v) = self { Some(v) } else { None }
-    }
-
     #[inline]
     pub fn as_accessor_property(self) -> Option<&'a AccessorProperty<'a>> {
         if let Self::AccessorProperty(v) = self { Some(v) } else { None }

crates/oxc_ast/src/lib.rs

@@ -76,7 +76,7 @@ pub use crate::{
     ast::comment::{Comment, CommentContent, CommentKind, CommentPosition},
     ast_builder_impl::{AstBuilder, NONE},
     ast_kind::{AstKind, AstType},
-    ast_kind_impl::MemberExpressionKind,
+    ast_kind_impl::{MemberExpressionKind, ModuleDeclarationKind},
     trivia::{CommentsRange, comments_range, has_comments_between},
 };
 

crates/oxc_ast_visit/src/generated/visit.rs

@@ -2638,8 +2638,7 @@ pub mod walk {
     }
 
     pub fn walk_module_declaration<'a, V: Visit<'a>>(visitor: &mut V, it: &ModuleDeclaration<'a>) {
-        let kind = AstKind::ModuleDeclaration(visitor.alloc(it));
-        visitor.enter_node(kind);
+        // No `AstKind` for this type
         match it {
             ModuleDeclaration::ImportDeclaration(it) => visitor.visit_import_declaration(it),
             ModuleDeclaration::ExportAllDeclaration(it) => visitor.visit_export_all_declaration(it),
@@ -2654,7 +2653,6 @@ pub mod walk {
                 visitor.visit_ts_namespace_export_declaration(it)
             }
         }
-        visitor.leave_node(kind);
     }
 
     #[inline]

crates/oxc_ast_visit/src/generated/visit_mut.rs

@@ -2733,8 +2733,7 @@ pub mod walk_mut {
         visitor: &mut V,
         it: &mut ModuleDeclaration<'a>,
     ) {
-        let kind = AstType::ModuleDeclaration;
-        visitor.enter_node(kind);
+        // No `AstType` for this type
         match it {
             ModuleDeclaration::ImportDeclaration(it) => visitor.visit_import_declaration(it),
             ModuleDeclaration::ExportAllDeclaration(it) => visitor.visit_export_all_declaration(it),
@@ -2749,7 +2748,6 @@ pub mod walk_mut {
                 visitor.visit_ts_namespace_export_declaration(it)
             }
         }
-        visitor.leave_node(kind);
     }
 
     #[inline]