From 198eea0bced2722fffbd6504953ad226356f21bd Mon Sep 17 00:00:00 2001 From: Ali Rezvani <3788964+rzvxa@users.noreply.github.com> Date: Mon, 25 Mar 2024 06:14:29 +0330 Subject: [PATCH] refactor(ast): add walk functions to Visit trait. (#2791) closes #2442 --- crates/oxc_ast/src/lib.rs | 2 +- crates/oxc_ast/src/visit.rs | 3155 ++++++++++++++++--------- crates/oxc_module_lexer/src/lib.rs | 313 +-- crates/oxc_parser/examples/visitor.rs | 25 +- 4 files changed, 2261 insertions(+), 1234 deletions(-) diff --git a/crates/oxc_ast/src/lib.rs b/crates/oxc_ast/src/lib.rs index 332ebd83e..2276ebba3 100644 --- a/crates/oxc_ast/src/lib.rs +++ b/crates/oxc_ast/src/lib.rs @@ -28,7 +28,7 @@ pub use crate::{ ast_builder::AstBuilder, ast_kind::{AstKind, AstType}, trivia::{Comment, CommentKind, Trivias, TriviasMap}, - visit::Visit, + visit::{walk, Visit}, visit_mut::VisitMut, }; diff --git a/crates/oxc_ast/src/visit.rs b/crates/oxc_ast/src/visit.rs index eeb60e390..7f1d7b39d 100644 --- a/crates/oxc_ast/src/visit.rs +++ b/crates/oxc_ast/src/visit.rs @@ -10,6 +10,8 @@ use oxc_syntax::scope::ScopeFlags; use crate::{ast::*, ast_kind::AstKind}; +use walk::*; + /// Syntax tree traversal pub trait Visit<'a>: Sized { fn enter_node(&mut self, _kind: AstKind<'a>) {} @@ -26,480 +28,1288 @@ pub trait Visit<'a>: Sized { } fn visit_program(&mut self, program: &Program<'a>) { - let kind = AstKind::Program(self.alloc(program)); - self.enter_scope({ + walk_program(self, program); + } + + /* ---------- Statement ---------- */ + + fn visit_statements(&mut self, stmts: &Vec<'a, Statement<'a>>) { + walk_statements(self, stmts); + } + + fn visit_statement(&mut self, stmt: &Statement<'a>) { + walk_statement(self, stmt); + } + + fn visit_block_statement(&mut self, stmt: &BlockStatement<'a>) { + walk_block_statement(self, stmt); + } + + fn visit_break_statement(&mut self, stmt: &BreakStatement<'a>) { + walk_break_statement(self, stmt); + } + + fn visit_continue_statement(&mut self, stmt: &ContinueStatement<'a>) { + walk_continue_statement(self, stmt); + } + + fn visit_debugger_statement(&mut self, stmt: &DebuggerStatement) { + walk_debugger_statement(self, stmt); + } + + fn visit_do_while_statement(&mut self, stmt: &DoWhileStatement<'a>) { + walk_do_while_statement(self, stmt); + } + + fn visit_empty_statement(&mut self, stmt: &EmptyStatement) { + walk_empty_statement(self, stmt); + } + + fn visit_expression_statement(&mut self, stmt: &ExpressionStatement<'a>) { + walk_expression_statement(self, stmt); + } + + fn visit_for_statement(&mut self, stmt: &ForStatement<'a>) { + walk_for_statement(self, stmt); + } + + fn visit_for_statement_init(&mut self, init: &ForStatementInit<'a>) { + walk_for_statement_init(self, init); + } + + fn visit_for_in_statement(&mut self, stmt: &ForInStatement<'a>) { + walk_for_in_statement(self, stmt); + } + + fn visit_for_of_statement(&mut self, stmt: &ForOfStatement<'a>) { + walk_for_of_statement(self, stmt); + } + + fn visit_for_statement_left(&mut self, left: &ForStatementLeft<'a>) { + walk_for_statement_left(self, left); + } + + fn visit_if_statement(&mut self, stmt: &IfStatement<'a>) { + walk_if_statement(self, stmt); + } + + fn visit_labeled_statement(&mut self, stmt: &LabeledStatement<'a>) { + walk_labeled_statement(self, stmt); + } + + fn visit_return_statement(&mut self, stmt: &ReturnStatement<'a>) { + walk_return_statement(self, stmt); + } + + fn visit_switch_statement(&mut self, stmt: &SwitchStatement<'a>) { + walk_switch_statement(self, stmt); + } + + fn visit_switch_case(&mut self, case: &SwitchCase<'a>) { + walk_switch_case(self, case); + } + + fn visit_throw_statement(&mut self, stmt: &ThrowStatement<'a>) { + walk_throw_statement(self, stmt); + } + + fn visit_try_statement(&mut self, stmt: &TryStatement<'a>) { + walk_try_statement(self, stmt); + } + + fn visit_catch_clause(&mut self, clause: &CatchClause<'a>) { + walk_catch_clause(self, clause); + } + + fn visit_finally_clause(&mut self, clause: &BlockStatement<'a>) { + walk_finally_clause(self, clause); + } + + fn visit_while_statement(&mut self, stmt: &WhileStatement<'a>) { + walk_while_statement(self, stmt); + } + + fn visit_with_statement(&mut self, stmt: &WithStatement<'a>) { + walk_with_statement(self, stmt); + } + + fn visit_directive(&mut self, directive: &Directive<'a>) { + walk_directive(self, directive); + } + + /* ---------- Declaration ---------- */ + + fn visit_variable_declaration(&mut self, decl: &VariableDeclaration<'a>) { + walk_variable_declaration(self, decl); + } + + fn visit_variable_declarator(&mut self, declarator: &VariableDeclarator<'a>) { + walk_variable_declarator(self, declarator); + } + + /* ---------- Function ---------- */ + + fn visit_function(&mut self, func: &Function<'a>, flags: Option) { + walk_function(self, func, flags); + } + + fn visit_function_body(&mut self, body: &FunctionBody<'a>) { + walk_function_body(self, body); + } + + fn visit_formal_parameters(&mut self, params: &FormalParameters<'a>) { + walk_formal_parameters(self, params); + } + + fn visit_formal_parameter(&mut self, param: &FormalParameter<'a>) { + walk_formal_parameter(self, param); + } + + /* ---------- Class ---------- */ + + fn visit_decorator(&mut self, decorator: &Decorator<'a>) { + walk_decorator(self, decorator); + } + + fn visit_class(&mut self, class: &Class<'a>) { + walk_class(self, class); + } + + fn visit_class_heritage(&mut self, expr: &Expression<'a>) { + walk_class_heritage(self, expr); + } + + fn visit_class_body(&mut self, body: &ClassBody<'a>) { + walk_class_body(self, body); + } + + fn visit_class_element(&mut self, elem: &ClassElement<'a>) { + walk_class_element(self, elem); + } + + fn visit_static_block(&mut self, block: &StaticBlock<'a>) { + walk_static_block(self, block); + } + + fn visit_method_definition(&mut self, def: &MethodDefinition<'a>) { + walk_method_definition(self, def); + } + + fn visit_property_definition(&mut self, def: &PropertyDefinition<'a>) { + walk_property_definition(self, def); + } + + fn visit_using_declaration(&mut self, decl: &UsingDeclaration<'a>) { + walk_using_declaration(self, decl); + } + + /* ---------- Expression ---------- */ + + fn visit_expression(&mut self, expr: &Expression<'a>) { + walk_expression(self, expr); + } + + fn visit_meta_property(&mut self, meta: &MetaProperty<'a>) { + walk_meta_property(self, meta); + } + + fn visit_array_expression(&mut self, expr: &ArrayExpression<'a>) { + walk_array_expression(self, expr); + } + + fn visit_array_expression_element(&mut self, arg: &ArrayExpressionElement<'a>) { + walk_array_expression_element(self, arg); + } + + fn visit_argument(&mut self, arg: &Argument<'a>) { + walk_argument(self, arg); + } + + fn visit_spread_element(&mut self, elem: &SpreadElement<'a>) { + walk_spread_element(self, elem); + } + + fn visit_expression_array_element(&mut self, expr: &Expression<'a>) { + walk_expression_array_element(self, expr); + } + + fn visit_elision(&mut self, span: Span) { + walk_elision(self, span); + } + + fn visit_assignment_expression(&mut self, expr: &AssignmentExpression<'a>) { + walk_assignment_expression(self, expr); + } + + fn visit_arrow_expression(&mut self, expr: &ArrowFunctionExpression<'a>) { + walk_arrow_expression(self, expr); + } + + fn visit_await_expression(&mut self, expr: &AwaitExpression<'a>) { + walk_await_expression(self, expr); + } + + fn visit_binary_expression(&mut self, expr: &BinaryExpression<'a>) { + walk_binary_expression(self, expr); + } + + fn visit_call_expression(&mut self, expr: &CallExpression<'a>) { + walk_call_expression(self, expr); + } + + fn visit_chain_expression(&mut self, expr: &ChainExpression<'a>) { + walk_chain_expression(self, expr); + } + + fn visit_chain_element(&mut self, elem: &ChainElement<'a>) { + walk_chain_element(self, elem); + } + + fn visit_conditional_expression(&mut self, expr: &ConditionalExpression<'a>) { + walk_conditional_expression(self, expr); + } + + fn visit_import_expression(&mut self, expr: &ImportExpression<'a>) { + walk_import_expression(self, expr); + } + + fn visit_logical_expression(&mut self, expr: &LogicalExpression<'a>) { + walk_logical_expression(self, expr); + } + + fn visit_member_expression(&mut self, expr: &MemberExpression<'a>) { + walk_member_expression(self, expr); + } + + fn visit_computed_member_expression(&mut self, expr: &ComputedMemberExpression<'a>) { + walk_computed_member_expression(self, expr); + } + + fn visit_static_member_expression(&mut self, expr: &StaticMemberExpression<'a>) { + walk_static_member_expression(self, expr); + } + + fn visit_private_field_expression(&mut self, expr: &PrivateFieldExpression<'a>) { + walk_private_field_expression(self, expr); + } + + fn visit_new_expression(&mut self, expr: &NewExpression<'a>) { + walk_new_expression(self, expr); + } + + fn visit_object_expression(&mut self, expr: &ObjectExpression<'a>) { + walk_object_expression(self, expr); + } + + fn visit_object_property_kind(&mut self, prop: &ObjectPropertyKind<'a>) { + walk_object_property_kind(self, prop); + } + + fn visit_object_property(&mut self, prop: &ObjectProperty<'a>) { + walk_object_property(self, prop); + } + + fn visit_property_key(&mut self, key: &PropertyKey<'a>) { + walk_property_key(self, key); + } + + fn visit_parenthesized_expression(&mut self, expr: &ParenthesizedExpression<'a>) { + walk_parenthesized_expression(self, expr); + } + + fn visit_private_in_expression(&mut self, expr: &PrivateInExpression<'a>) { + walk_private_in_expression(self, expr); + } + + fn visit_sequence_expression(&mut self, expr: &SequenceExpression<'a>) { + walk_sequence_expression(self, expr); + } + + fn visit_tagged_template_expression(&mut self, expr: &TaggedTemplateExpression<'a>) { + walk_tagged_template_expression(self, expr); + } + + fn visit_this_expression(&mut self, expr: &ThisExpression) { + walk_this_expression(self, expr); + } + + fn visit_unary_expression(&mut self, expr: &UnaryExpression<'a>) { + walk_unary_expression(self, expr); + } + + fn visit_update_expression(&mut self, expr: &UpdateExpression<'a>) { + walk_update_expression(self, expr); + } + + fn visit_yield_expression(&mut self, expr: &YieldExpression<'a>) { + walk_yield_expression(self, expr); + } + + fn visit_super(&mut self, expr: &Super) { + walk_super(self, expr); + } + + fn visit_assignment_target(&mut self, target: &AssignmentTarget<'a>) { + walk_assignment_target(self, target); + } + + fn visit_simple_assignment_target(&mut self, target: &SimpleAssignmentTarget<'a>) { + walk_simple_assignment_target(self, target); + } + + fn visit_assignment_target_pattern(&mut self, pat: &AssignmentTargetPattern<'a>) { + walk_assignment_target_pattern(self, pat); + } + + fn visit_array_assignment_target(&mut self, target: &ArrayAssignmentTarget<'a>) { + walk_array_assignment_target(self, target); + } + + fn visit_assignment_target_maybe_default(&mut self, target: &AssignmentTargetMaybeDefault<'a>) { + walk_assignment_target_maybe_default(self, target); + } + + fn visit_assignment_target_with_default(&mut self, target: &AssignmentTargetWithDefault<'a>) { + walk_assignment_target_with_default(self, target); + } + + fn visit_object_assignment_target(&mut self, target: &ObjectAssignmentTarget<'a>) { + walk_object_assignment_target(self, target); + } + + fn visit_assignment_target_property(&mut self, property: &AssignmentTargetProperty<'a>) { + walk_assignment_target_property(self, property); + } + + fn visit_assignment_target_property_identifier( + &mut self, + ident: &AssignmentTargetPropertyIdentifier<'a>, + ) { + walk_assignment_target_property_identifier(self, ident); + } + + fn visit_assignment_target_property_property( + &mut self, + property: &AssignmentTargetPropertyProperty<'a>, + ) { + walk_assignment_target_property_property(self, property); + } + + fn visit_assignment_target_rest(&mut self, rest: &AssignmentTargetRest<'a>) { + walk_assignment_target_rest(self, rest); + } + + /* ---------- Expression ---------- */ + + fn visit_jsx_element(&mut self, elem: &JSXElement<'a>) { + walk_jsx_element(self, elem); + } + + fn visit_jsx_opening_element(&mut self, elem: &JSXOpeningElement<'a>) { + walk_jsx_opening_element(self, elem); + } + + fn visit_jsx_closing_element(&mut self, elem: &JSXClosingElement<'a>) { + walk_jsx_closing_element(self, elem); + } + + fn visit_jsx_element_name(&mut self, name: &JSXElementName<'a>) { + walk_jsx_element_name(self, name); + } + + fn visit_jsx_identifier(&mut self, ident: &JSXIdentifier<'a>) { + walk_jsx_identifier(self, ident); + } + + fn visit_jsx_member_expression(&mut self, expr: &JSXMemberExpression<'a>) { + walk_jsx_member_expression(self, expr); + } + + fn visit_jsx_member_expression_object(&mut self, expr: &JSXMemberExpressionObject<'a>) { + walk_jsx_member_expression_object(self, expr); + } + + fn visit_jsx_namespaced_name(&mut self, name: &JSXNamespacedName<'a>) { + walk_jsx_namespaced_name(self, name); + } + + fn visit_jsx_attribute_item(&mut self, item: &JSXAttributeItem<'a>) { + walk_jsx_attribute_item(self, item); + } + + fn visit_jsx_attribute(&mut self, attribute: &JSXAttribute<'a>) { + walk_jsx_attribute(self, attribute); + } + + fn visit_jsx_spread_attribute(&mut self, attribute: &JSXSpreadAttribute<'a>) { + walk_jsx_spread_attribute(self, attribute); + } + + fn visit_jsx_attribute_value(&mut self, value: &JSXAttributeValue<'a>) { + walk_jsx_attribute_value(self, value); + } + + fn visit_jsx_expression_container(&mut self, expr: &JSXExpressionContainer<'a>) { + walk_jsx_expression_container(self, expr); + } + + fn visit_jsx_expression(&mut self, expr: &JSXExpression<'a>) { + walk_jsx_expression(self, expr); + } + + fn visit_jsx_fragment(&mut self, elem: &JSXFragment<'a>) { + walk_jsx_fragment(self, elem); + } + + fn visit_jsx_child(&mut self, child: &JSXChild<'a>) { + walk_jsx_child(self, child); + } + + fn visit_jsx_spread_child(&mut self, child: &JSXSpreadChild<'a>) { + walk_jsx_spread_child(self, child); + } + + fn visit_jsx_text(&mut self, child: &JSXText<'a>) { + walk_jsx_text(self, child); + } + + /* ---------- Pattern ---------- */ + + fn visit_binding_pattern(&mut self, pat: &BindingPattern<'a>) { + walk_binding_pattern(self, pat); + } + + fn visit_binding_identifier(&mut self, ident: &BindingIdentifier<'a>) { + walk_binding_identifier(self, ident); + } + + fn visit_object_pattern(&mut self, pat: &ObjectPattern<'a>) { + walk_object_pattern(self, pat); + } + + fn visit_binding_property(&mut self, prop: &BindingProperty<'a>) { + walk_binding_property(self, prop); + } + + fn visit_array_pattern(&mut self, pat: &ArrayPattern<'a>) { + walk_array_pattern(self, pat); + } + + fn visit_rest_element(&mut self, pat: &BindingRestElement<'a>) { + walk_rest_element(self, pat); + } + + fn visit_assignment_pattern(&mut self, pat: &AssignmentPattern<'a>) { + walk_assignment_pattern(self, pat); + } + + /* ---------- Identifier ---------- */ + + fn visit_identifier_reference(&mut self, ident: &IdentifierReference<'a>) { + walk_identifier_reference(self, ident); + } + + fn visit_private_identifier(&mut self, ident: &PrivateIdentifier<'a>) { + walk_private_identifier(self, ident); + } + + fn visit_label_identifier(&mut self, ident: &LabelIdentifier<'a>) { + walk_label_identifier(self, ident); + } + + fn visit_identifier_name(&mut self, ident: &IdentifierName<'a>) { + walk_identifier_name(self, ident); + } + + /* ---------- Literal ---------- */ + + fn visit_number_literal(&mut self, lit: &NumericLiteral<'a>) { + walk_number_literal(self, lit); + } + + fn visit_boolean_literal(&mut self, lit: &BooleanLiteral) { + walk_boolean_literal(self, lit); + } + + fn visit_null_literal(&mut self, lit: &NullLiteral) { + walk_null_literal(self, lit); + } + + fn visit_bigint_literal(&mut self, lit: &BigIntLiteral<'a>) { + walk_bigint_literal(self, lit); + } + + fn visit_string_literal(&mut self, lit: &StringLiteral<'a>) { + walk_string_literal(self, lit); + } + + fn visit_template_literal(&mut self, lit: &TemplateLiteral<'a>) { + walk_template_literal(self, lit); + } + + fn visit_reg_expr_literal(&mut self, lit: &RegExpLiteral<'a>) { + walk_reg_expr_literal(self, lit); + } + + fn visit_template_element(&mut self, elem: &TemplateElement) { + walk_template_element(self, elem); + } + + /* ---------- Module ---------- */ + + fn visit_module_declaration(&mut self, decl: &ModuleDeclaration<'a>) { + walk_module_declaration(self, decl); + } + + fn visit_import_declaration(&mut self, decl: &ImportDeclaration<'a>) { + walk_import_declaration(self, decl); + } + + fn visit_with_clause(&mut self, with_clause: &WithClause<'a>) { + walk_with_clause(self, with_clause); + } + + fn visit_import_attribute(&mut self, attribute: &ImportAttribute<'a>) { + walk_import_attribute(self, attribute); + } + + fn visit_import_attribute_key(&mut self, key: &ImportAttributeKey<'a>) { + walk_import_attribute_key(self, key); + } + + fn visit_import_declaration_specifier(&mut self, specifier: &ImportDeclarationSpecifier<'a>) { + walk_import_declaration_specifier(self, specifier); + } + + fn visit_import_specifier(&mut self, specifier: &ImportSpecifier<'a>) { + walk_import_specifier(self, specifier); + } + + fn visit_import_default_specifier(&mut self, specifier: &ImportDefaultSpecifier<'a>) { + walk_import_default_specifier(self, specifier); + } + + fn visit_import_name_specifier(&mut self, specifier: &ImportNamespaceSpecifier<'a>) { + walk_import_name_specifier(self, specifier); + } + + fn visit_export_all_declaration(&mut self, decl: &ExportAllDeclaration<'a>) { + walk_export_all_declaration(self, decl); + } + + fn visit_export_default_declaration(&mut self, decl: &ExportDefaultDeclaration<'a>) { + walk_export_default_declaration(self, decl); + } + + fn visit_export_named_declaration(&mut self, decl: &ExportNamedDeclaration<'a>) { + walk_export_named_declaration(self, decl); + } + + fn visit_enum_member(&mut self, member: &TSEnumMember<'a>) { + walk_enum_member(self, member); + } + + fn visit_enum(&mut self, decl: &TSEnumDeclaration<'a>) { + walk_enum(self, decl); + } + + fn visit_declaration(&mut self, decl: &Declaration<'a>) { + walk_declaration(self, decl); + } + + fn visit_ts_import_equals_declaration(&mut self, decl: &TSImportEqualsDeclaration<'a>) { + walk_ts_import_equals_declaration(self, decl); + } + + fn visit_ts_module_reference(&mut self, reference: &TSModuleReference<'a>) { + walk_ts_module_reference(self, reference); + } + + fn visit_ts_type_name(&mut self, name: &TSTypeName<'a>) { + walk_ts_type_name(self, name); + } + + fn visit_ts_external_module_reference(&mut self, reference: &TSExternalModuleReference<'a>) { + walk_ts_external_module_reference(self, reference); + } + + fn visit_ts_qualified_name(&mut self, name: &TSQualifiedName<'a>) { + walk_ts_qualified_name(self, name); + } + + fn visit_ts_module_declaration(&mut self, decl: &TSModuleDeclaration<'a>) { + walk_ts_module_declaration(self, decl); + } + + fn visit_ts_module_block(&mut self, block: &TSModuleBlock<'a>) { + walk_ts_module_block(self, block); + } + + fn visit_ts_type_alias_declaration(&mut self, decl: &TSTypeAliasDeclaration<'a>) { + walk_ts_type_alias_declaration(self, decl); + } + + fn visit_ts_interface_declaration(&mut self, decl: &TSInterfaceDeclaration<'a>) { + walk_ts_interface_declaration(self, decl); + } + + fn visit_ts_as_expression(&mut self, expr: &TSAsExpression<'a>) { + walk_ts_as_expression(self, expr); + } + + fn visit_ts_satisfies_expression(&mut self, expr: &TSSatisfiesExpression<'a>) { + walk_ts_satisfies_expression(self, expr); + } + + fn visit_ts_non_null_expression(&mut self, expr: &TSNonNullExpression<'a>) { + walk_ts_non_null_expression(self, expr); + } + + fn visit_ts_type_assertion(&mut self, expr: &TSTypeAssertion<'a>) { + walk_ts_type_assertion(self, expr); + } + + fn visit_ts_instantiation_expression(&mut self, expr: &TSInstantiationExpression<'a>) { + walk_ts_instantiation_expression(self, expr); + } + + fn visit_ts_type_annotation(&mut self, annotation: &TSTypeAnnotation<'a>) { + walk_ts_type_annotation(self, annotation); + } + + fn visit_ts_type(&mut self, ty: &TSType<'a>) { + walk_ts_type(self, ty); + } + + fn visit_ts_type_literal(&mut self, ty: &TSTypeLiteral<'a>) { + walk_ts_type_literal(self, ty); + } + + fn visit_ts_indexed_access_type(&mut self, ty: &TSIndexedAccessType<'a>) { + walk_ts_indexed_access_type(self, ty); + } + + fn visit_ts_type_predicate(&mut self, ty: &TSTypePredicate<'a>) { + walk_ts_type_predicate(self, ty); + } + + fn visit_ts_type_operator_type(&mut self, ty: &TSTypeOperator<'a>) { + walk_ts_type_operator_type(self, ty); + } + + fn visit_ts_tuple_type(&mut self, ty: &TSTupleType<'a>) { + walk_ts_tuple_type(self, ty); + } + + fn visit_ts_tuple_element(&mut self, ty: &TSTupleElement<'a>) { + walk_ts_tuple_element(self, ty); + } + + fn visit_ts_mapped_type(&mut self, ty: &TSMappedType<'a>) { + walk_ts_mapped_type(self, ty); + } + + fn visit_ts_function_type(&mut self, ty: &TSFunctionType<'a>) { + walk_ts_function_type(self, ty); + } + + fn visit_ts_type_parameter(&mut self, ty: &TSTypeParameter<'a>) { + walk_ts_type_parameter(self, ty); + } + + fn visit_ts_type_parameter_instantiation(&mut self, ty: &TSTypeParameterInstantiation<'a>) { + walk_ts_type_parameter_instantiation(self, ty); + } + + fn visit_ts_type_parameter_declaration(&mut self, ty: &TSTypeParameterDeclaration<'a>) { + walk_ts_type_parameter_declaration(self, ty); + } + + fn visit_ts_constructor_type(&mut self, ty: &TSConstructorType<'a>) { + walk_ts_constructor_type(self, ty); + } + + fn visit_ts_conditional_type(&mut self, ty: &TSConditionalType<'a>) { + walk_ts_conditional_type(self, ty); + } + + fn visit_ts_array_type(&mut self, ty: &TSArrayType<'a>) { + walk_ts_array_type(self, ty); + } + + fn visit_ts_null_keyword(&mut self, ty: &TSNullKeyword) { + walk_ts_null_keyword(self, ty); + } + + fn visit_ts_any_keyword(&mut self, ty: &TSAnyKeyword) { + walk_ts_any_keyword(self, ty); + } + + fn visit_ts_void_keyword(&mut self, ty: &TSVoidKeyword) { + walk_ts_void_keyword(self, ty); + } + + fn visit_ts_intersection_type(&mut self, ty: &TSIntersectionType<'a>) { + walk_ts_intersection_type(self, ty); + } + + fn visit_ts_type_reference(&mut self, ty: &TSTypeReference<'a>) { + walk_ts_type_reference(self, ty); + } + + fn visit_ts_union_type(&mut self, ty: &TSUnionType<'a>) { + walk_ts_union_type(self, ty); + } + + fn visit_ts_literal_type(&mut self, ty: &TSLiteralType<'a>) { + walk_ts_literal_type(self, ty); + } + + fn visit_ts_signature(&mut self, signature: &TSSignature<'a>) { + walk_ts_signature(self, signature); + } + + fn visit_ts_construct_signature_declaration( + &mut self, + signature: &TSConstructSignatureDeclaration<'a>, + ) { + walk_ts_construct_signature_declaration(self, signature); + } + + fn visit_ts_method_signature(&mut self, signature: &TSMethodSignature<'a>) { + walk_ts_method_signature(self, signature); + } + + fn visit_ts_index_signature_name(&mut self, name: &TSIndexSignatureName<'a>) { + walk_ts_index_signature_name(self, name); + } + + fn visit_ts_index_signature(&mut self, signature: &TSIndexSignature<'a>) { + walk_ts_index_signature(self, signature); + } + + fn visit_ts_property_signature(&mut self, signature: &TSPropertySignature<'a>) { + walk_ts_property_signature(self, signature); + } + + fn visit_ts_call_signature_declaration(&mut self, signature: &TSCallSignatureDeclaration<'a>) { + walk_ts_call_signature_declaration(self, signature); + } + + fn visit_ts_type_query(&mut self, ty: &TSTypeQuery<'a>) { + walk_ts_type_query(self, ty); + } + + fn visit_ts_import_type(&mut self, ty: &TSImportType<'a>) { + walk_ts_import_type(self, ty); + } + + fn visit_ts_import_attributes(&mut self, attributes: &TSImportAttributes<'a>) { + walk_ts_import_attributes(self, attributes); + } + + fn visit_ts_import_attribute(&mut self, attribute: &TSImportAttribute<'a>) { + walk_ts_import_attribute(self, attribute); + } + + fn visit_ts_import_attribute_name(&mut self, name: &TSImportAttributeName<'a>) { + walk_ts_import_attribute_name(self, name); + } +} + +pub mod walk { + use super::*; + + pub fn walk_program<'a, V: Visit<'a>>(visitor: &mut V, program: &Program<'a>) { + let kind = AstKind::Program(visitor.alloc(program)); + visitor.enter_scope({ let mut flags = ScopeFlags::Top; if program.is_strict() { flags |= ScopeFlags::StrictMode; } flags }); - self.enter_node(kind); + visitor.enter_node(kind); for directive in &program.directives { - self.visit_directive(directive); + visitor.visit_directive(directive); } - self.visit_statements(&program.body); - self.leave_node(kind); - self.leave_scope(); + visitor.visit_statements(&program.body); + visitor.leave_node(kind); + visitor.leave_scope(); } /* ---------- Statement ---------- */ - fn visit_statements(&mut self, stmts: &Vec<'a, Statement<'a>>) { + pub fn walk_statements<'a, V: Visit<'a>>(visitor: &mut V, stmts: &Vec<'a, Statement<'a>>) { for stmt in stmts { - self.visit_statement(stmt); + visitor.visit_statement(stmt); } } - fn visit_statement(&mut self, stmt: &Statement<'a>) { - self.visit_statement_match(stmt); - } - - fn visit_statement_match(&mut self, stmt: &Statement<'a>) { + pub fn walk_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &Statement<'a>) { match stmt { - Statement::BlockStatement(stmt) => self.visit_block_statement(stmt), - Statement::BreakStatement(stmt) => self.visit_break_statement(stmt), - Statement::ContinueStatement(stmt) => self.visit_continue_statement(stmt), - Statement::DebuggerStatement(stmt) => self.visit_debugger_statement(stmt), - Statement::DoWhileStatement(stmt) => self.visit_do_while_statement(stmt), - Statement::EmptyStatement(stmt) => self.visit_empty_statement(stmt), - Statement::ExpressionStatement(stmt) => self.visit_expression_statement(stmt), - Statement::ForInStatement(stmt) => self.visit_for_in_statement(stmt), - Statement::ForOfStatement(stmt) => self.visit_for_of_statement(stmt), - Statement::ForStatement(stmt) => self.visit_for_statement(stmt), - Statement::IfStatement(stmt) => self.visit_if_statement(stmt), - Statement::LabeledStatement(stmt) => self.visit_labeled_statement(stmt), - Statement::ReturnStatement(stmt) => self.visit_return_statement(stmt), - Statement::SwitchStatement(stmt) => self.visit_switch_statement(stmt), - Statement::ThrowStatement(stmt) => self.visit_throw_statement(stmt), - Statement::TryStatement(stmt) => self.visit_try_statement(stmt), - Statement::WhileStatement(stmt) => self.visit_while_statement(stmt), - Statement::WithStatement(stmt) => self.visit_with_statement(stmt), + Statement::BlockStatement(stmt) => visitor.visit_block_statement(stmt), + Statement::BreakStatement(stmt) => visitor.visit_break_statement(stmt), + Statement::ContinueStatement(stmt) => visitor.visit_continue_statement(stmt), + Statement::DebuggerStatement(stmt) => visitor.visit_debugger_statement(stmt), + Statement::DoWhileStatement(stmt) => visitor.visit_do_while_statement(stmt), + Statement::EmptyStatement(stmt) => visitor.visit_empty_statement(stmt), + Statement::ExpressionStatement(stmt) => visitor.visit_expression_statement(stmt), + Statement::ForInStatement(stmt) => visitor.visit_for_in_statement(stmt), + Statement::ForOfStatement(stmt) => visitor.visit_for_of_statement(stmt), + Statement::ForStatement(stmt) => visitor.visit_for_statement(stmt), + Statement::IfStatement(stmt) => visitor.visit_if_statement(stmt), + Statement::LabeledStatement(stmt) => visitor.visit_labeled_statement(stmt), + Statement::ReturnStatement(stmt) => visitor.visit_return_statement(stmt), + Statement::SwitchStatement(stmt) => visitor.visit_switch_statement(stmt), + Statement::ThrowStatement(stmt) => visitor.visit_throw_statement(stmt), + Statement::TryStatement(stmt) => visitor.visit_try_statement(stmt), + Statement::WhileStatement(stmt) => visitor.visit_while_statement(stmt), + Statement::WithStatement(stmt) => visitor.visit_with_statement(stmt), - Statement::ModuleDeclaration(decl) => self.visit_module_declaration(decl), - Statement::Declaration(decl) => self.visit_declaration(decl), + Statement::ModuleDeclaration(decl) => visitor.visit_module_declaration(decl), + Statement::Declaration(decl) => visitor.visit_declaration(decl), } } - fn visit_block_statement(&mut self, stmt: &BlockStatement<'a>) { - let kind = AstKind::BlockStatement(self.alloc(stmt)); - self.enter_scope(ScopeFlags::empty()); - self.enter_node(kind); - self.visit_statements(&stmt.body); - self.leave_node(kind); - self.leave_scope(); + pub fn walk_block_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &BlockStatement<'a>) { + let kind = AstKind::BlockStatement(visitor.alloc(stmt)); + visitor.enter_scope(ScopeFlags::empty()); + visitor.enter_node(kind); + visitor.visit_statements(&stmt.body); + visitor.leave_node(kind); + visitor.leave_scope(); } - fn visit_break_statement(&mut self, stmt: &BreakStatement<'a>) { - let kind = AstKind::BreakStatement(self.alloc(stmt)); - self.enter_node(kind); + pub fn walk_break_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &BreakStatement<'a>) { + let kind = AstKind::BreakStatement(visitor.alloc(stmt)); + visitor.enter_node(kind); if let Some(break_target) = &stmt.label { - self.visit_label_identifier(break_target); + visitor.visit_label_identifier(break_target); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_continue_statement(&mut self, stmt: &ContinueStatement<'a>) { - let kind = AstKind::ContinueStatement(self.alloc(stmt)); - self.enter_node(kind); + pub fn walk_continue_statement<'a, V: Visit<'a>>( + visitor: &mut V, + stmt: &ContinueStatement<'a>, + ) { + let kind = AstKind::ContinueStatement(visitor.alloc(stmt)); + visitor.enter_node(kind); if let Some(continue_target) = &stmt.label { - self.visit_label_identifier(continue_target); + visitor.visit_label_identifier(continue_target); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_debugger_statement(&mut self, stmt: &DebuggerStatement) { - let kind = AstKind::DebuggerStatement(self.alloc(stmt)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_debugger_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &DebuggerStatement) { + let kind = AstKind::DebuggerStatement(visitor.alloc(stmt)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_do_while_statement(&mut self, stmt: &DoWhileStatement<'a>) { - let kind = AstKind::DoWhileStatement(self.alloc(stmt)); - self.enter_node(kind); - self.visit_statement(&stmt.body); - self.visit_expression(&stmt.test); - self.leave_node(kind); + pub fn walk_do_while_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &DoWhileStatement<'a>) { + let kind = AstKind::DoWhileStatement(visitor.alloc(stmt)); + visitor.enter_node(kind); + visitor.visit_statement(&stmt.body); + visitor.visit_expression(&stmt.test); + visitor.leave_node(kind); } - fn visit_empty_statement(&mut self, stmt: &EmptyStatement) { - let kind = AstKind::EmptyStatement(self.alloc(stmt)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_empty_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &EmptyStatement) { + let kind = AstKind::EmptyStatement(visitor.alloc(stmt)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_expression_statement(&mut self, stmt: &ExpressionStatement<'a>) { - let kind = AstKind::ExpressionStatement(self.alloc(stmt)); - self.enter_node(kind); - self.visit_expression(&stmt.expression); - self.leave_node(kind); + pub fn walk_expression_statement<'a, V: Visit<'a>>( + visitor: &mut V, + stmt: &ExpressionStatement<'a>, + ) { + let kind = AstKind::ExpressionStatement(visitor.alloc(stmt)); + visitor.enter_node(kind); + visitor.visit_expression(&stmt.expression); + visitor.leave_node(kind); } - fn visit_for_statement(&mut self, stmt: &ForStatement<'a>) { - let kind = AstKind::ForStatement(self.alloc(stmt)); + pub fn walk_for_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &ForStatement<'a>) { + let kind = AstKind::ForStatement(visitor.alloc(stmt)); let is_lexical_declaration = stmt.init.as_ref().is_some_and(ForStatementInit::is_lexical_declaration); if is_lexical_declaration { - self.enter_scope(ScopeFlags::empty()); + visitor.enter_scope(ScopeFlags::empty()); } - self.enter_node(kind); + visitor.enter_node(kind); if let Some(init) = &stmt.init { - self.visit_for_statement_init(init); + visitor.visit_for_statement_init(init); } if let Some(test) = &stmt.test { - self.visit_expression(test); + visitor.visit_expression(test); } if let Some(update) = &stmt.update { - self.visit_expression(update); + visitor.visit_expression(update); } - self.visit_statement(&stmt.body); - self.leave_node(kind); + visitor.visit_statement(&stmt.body); + visitor.leave_node(kind); if is_lexical_declaration { - self.leave_scope(); + visitor.leave_scope(); } } - fn visit_for_statement_init(&mut self, init: &ForStatementInit<'a>) { - let kind = AstKind::ForStatementInit(self.alloc(init)); - self.enter_node(kind); + pub fn walk_for_statement_init<'a, V: Visit<'a>>(visitor: &mut V, init: &ForStatementInit<'a>) { + let kind = AstKind::ForStatementInit(visitor.alloc(init)); + visitor.enter_node(kind); match init { ForStatementInit::UsingDeclaration(decl) => { - self.visit_using_declaration(decl); + visitor.visit_using_declaration(decl); } ForStatementInit::VariableDeclaration(decl) => { - self.visit_variable_declaration(decl); + visitor.visit_variable_declaration(decl); } - ForStatementInit::Expression(expr) => self.visit_expression(expr), + ForStatementInit::Expression(expr) => visitor.visit_expression(expr), } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_for_in_statement(&mut self, stmt: &ForInStatement<'a>) { - let kind = AstKind::ForInStatement(self.alloc(stmt)); + pub fn walk_for_in_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &ForInStatement<'a>) { + let kind = AstKind::ForInStatement(visitor.alloc(stmt)); let is_lexical_declaration = stmt.left.is_lexical_declaration(); if is_lexical_declaration { - self.enter_scope(ScopeFlags::empty()); + visitor.enter_scope(ScopeFlags::empty()); } - self.enter_node(kind); - self.visit_for_statement_left(&stmt.left); - self.visit_expression(&stmt.right); - self.visit_statement(&stmt.body); - self.leave_node(kind); + visitor.enter_node(kind); + visitor.visit_for_statement_left(&stmt.left); + visitor.visit_expression(&stmt.right); + visitor.visit_statement(&stmt.body); + visitor.leave_node(kind); if is_lexical_declaration { - self.leave_scope(); + visitor.leave_scope(); } } - fn visit_for_of_statement(&mut self, stmt: &ForOfStatement<'a>) { - let kind = AstKind::ForOfStatement(self.alloc(stmt)); + pub fn walk_for_of_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &ForOfStatement<'a>) { + let kind = AstKind::ForOfStatement(visitor.alloc(stmt)); let is_lexical_declaration = stmt.left.is_lexical_declaration(); if is_lexical_declaration { - self.enter_scope(ScopeFlags::empty()); + visitor.enter_scope(ScopeFlags::empty()); } - self.enter_node(kind); - self.visit_for_statement_left(&stmt.left); - self.visit_expression(&stmt.right); - self.visit_statement(&stmt.body); - self.leave_node(kind); + visitor.enter_node(kind); + visitor.visit_for_statement_left(&stmt.left); + visitor.visit_expression(&stmt.right); + visitor.visit_statement(&stmt.body); + visitor.leave_node(kind); if is_lexical_declaration { - self.leave_scope(); + visitor.leave_scope(); } } - fn visit_for_statement_left(&mut self, left: &ForStatementLeft<'a>) { + pub fn walk_for_statement_left<'a, V: Visit<'a>>(visitor: &mut V, left: &ForStatementLeft<'a>) { match left { ForStatementLeft::VariableDeclaration(decl) => { - self.visit_variable_declaration(decl); + visitor.visit_variable_declaration(decl); } - ForStatementLeft::AssignmentTarget(target) => self.visit_assignment_target(target), + ForStatementLeft::AssignmentTarget(target) => visitor.visit_assignment_target(target), ForStatementLeft::UsingDeclaration(decl) => { - self.visit_using_declaration(decl); + visitor.visit_using_declaration(decl); } } } - fn visit_if_statement(&mut self, stmt: &IfStatement<'a>) { - let kind = AstKind::IfStatement(self.alloc(stmt)); - self.enter_node(kind); - self.visit_expression(&stmt.test); - self.visit_statement(&stmt.consequent); + pub fn walk_if_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &IfStatement<'a>) { + let kind = AstKind::IfStatement(visitor.alloc(stmt)); + visitor.enter_node(kind); + visitor.visit_expression(&stmt.test); + visitor.visit_statement(&stmt.consequent); if let Some(alternate) = &stmt.alternate { - self.visit_statement(alternate); + visitor.visit_statement(alternate); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_labeled_statement(&mut self, stmt: &LabeledStatement<'a>) { - let kind = AstKind::LabeledStatement(self.alloc(stmt)); - self.enter_node(kind); - self.visit_label_identifier(&stmt.label); - self.visit_statement(&stmt.body); - self.leave_node(kind); + pub fn walk_labeled_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &LabeledStatement<'a>) { + let kind = AstKind::LabeledStatement(visitor.alloc(stmt)); + visitor.enter_node(kind); + visitor.visit_label_identifier(&stmt.label); + visitor.visit_statement(&stmt.body); + visitor.leave_node(kind); } - fn visit_return_statement(&mut self, stmt: &ReturnStatement<'a>) { - let kind = AstKind::ReturnStatement(self.alloc(stmt)); - self.enter_node(kind); + pub fn walk_return_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &ReturnStatement<'a>) { + let kind = AstKind::ReturnStatement(visitor.alloc(stmt)); + visitor.enter_node(kind); if let Some(arg) = &stmt.argument { - self.visit_expression(arg); + visitor.visit_expression(arg); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_switch_statement(&mut self, stmt: &SwitchStatement<'a>) { - let kind = AstKind::SwitchStatement(self.alloc(stmt)); - self.enter_node(kind); - self.visit_expression(&stmt.discriminant); - self.enter_scope(ScopeFlags::empty()); + pub fn walk_switch_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &SwitchStatement<'a>) { + let kind = AstKind::SwitchStatement(visitor.alloc(stmt)); + visitor.enter_node(kind); + visitor.visit_expression(&stmt.discriminant); + visitor.enter_scope(ScopeFlags::empty()); for case in &stmt.cases { - self.visit_switch_case(case); + visitor.visit_switch_case(case); } - self.leave_scope(); - self.leave_node(kind); + visitor.leave_scope(); + visitor.leave_node(kind); } - fn visit_switch_case(&mut self, case: &SwitchCase<'a>) { - let kind = AstKind::SwitchCase(self.alloc(case)); - self.enter_node(kind); + pub fn walk_switch_case<'a, V: Visit<'a>>(visitor: &mut V, case: &SwitchCase<'a>) { + let kind = AstKind::SwitchCase(visitor.alloc(case)); + visitor.enter_node(kind); if let Some(expr) = &case.test { - self.visit_expression(expr); + visitor.visit_expression(expr); } - self.visit_statements(&case.consequent); - self.leave_node(kind); + visitor.visit_statements(&case.consequent); + visitor.leave_node(kind); } - fn visit_throw_statement(&mut self, stmt: &ThrowStatement<'a>) { - let kind = AstKind::ThrowStatement(self.alloc(stmt)); - self.enter_node(kind); - self.visit_expression(&stmt.argument); - self.leave_node(kind); + pub fn walk_throw_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &ThrowStatement<'a>) { + let kind = AstKind::ThrowStatement(visitor.alloc(stmt)); + visitor.enter_node(kind); + visitor.visit_expression(&stmt.argument); + visitor.leave_node(kind); } - fn visit_try_statement(&mut self, stmt: &TryStatement<'a>) { - let kind = AstKind::TryStatement(self.alloc(stmt)); - self.enter_node(kind); - self.visit_block_statement(&stmt.block); + pub fn walk_try_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &TryStatement<'a>) { + let kind = AstKind::TryStatement(visitor.alloc(stmt)); + visitor.enter_node(kind); + visitor.visit_block_statement(&stmt.block); if let Some(handler) = &stmt.handler { - self.visit_catch_clause(handler); + visitor.visit_catch_clause(handler); } if let Some(finalizer) = &stmt.finalizer { - self.visit_finally_clause(finalizer); + visitor.visit_finally_clause(finalizer); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_catch_clause(&mut self, clause: &CatchClause<'a>) { - let kind = AstKind::CatchClause(self.alloc(clause)); - self.enter_scope(ScopeFlags::empty()); - self.enter_node(kind); + pub fn walk_catch_clause<'a, V: Visit<'a>>(visitor: &mut V, clause: &CatchClause<'a>) { + let kind = AstKind::CatchClause(visitor.alloc(clause)); + visitor.enter_scope(ScopeFlags::empty()); + visitor.enter_node(kind); if let Some(param) = &clause.param { - self.visit_binding_pattern(param); + visitor.visit_binding_pattern(param); } - self.visit_statements(&clause.body.body); - self.leave_node(kind); - self.leave_scope(); + visitor.visit_statements(&clause.body.body); + visitor.leave_node(kind); + visitor.leave_scope(); } - fn visit_finally_clause(&mut self, clause: &BlockStatement<'a>) { - let kind = AstKind::FinallyClause(self.alloc(clause)); - self.enter_node(kind); - self.visit_block_statement(clause); - self.leave_node(kind); + pub fn walk_finally_clause<'a, V: Visit<'a>>(visitor: &mut V, clause: &BlockStatement<'a>) { + let kind = AstKind::FinallyClause(visitor.alloc(clause)); + visitor.enter_node(kind); + visitor.visit_block_statement(clause); + visitor.leave_node(kind); } - fn visit_while_statement(&mut self, stmt: &WhileStatement<'a>) { - let kind = AstKind::WhileStatement(self.alloc(stmt)); - self.enter_node(kind); - self.visit_expression(&stmt.test); - self.visit_statement(&stmt.body); - self.leave_node(kind); + pub fn walk_while_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &WhileStatement<'a>) { + let kind = AstKind::WhileStatement(visitor.alloc(stmt)); + visitor.enter_node(kind); + visitor.visit_expression(&stmt.test); + visitor.visit_statement(&stmt.body); + visitor.leave_node(kind); } - fn visit_with_statement(&mut self, stmt: &WithStatement<'a>) { - let kind = AstKind::WithStatement(self.alloc(stmt)); - self.enter_node(kind); - self.visit_expression(&stmt.object); - self.visit_statement(&stmt.body); - self.leave_node(kind); + pub fn walk_with_statement<'a, V: Visit<'a>>(visitor: &mut V, stmt: &WithStatement<'a>) { + let kind = AstKind::WithStatement(visitor.alloc(stmt)); + visitor.enter_node(kind); + visitor.visit_expression(&stmt.object); + visitor.visit_statement(&stmt.body); + visitor.leave_node(kind); } - fn visit_directive(&mut self, directive: &Directive<'a>) { - let kind = AstKind::Directive(self.alloc(directive)); - self.enter_node(kind); - self.visit_string_literal(&directive.expression); - self.leave_node(kind); + pub fn walk_directive<'a, V: Visit<'a>>(visitor: &mut V, directive: &Directive<'a>) { + let kind = AstKind::Directive(visitor.alloc(directive)); + visitor.enter_node(kind); + visitor.visit_string_literal(&directive.expression); + visitor.leave_node(kind); } /* ---------- Declaration ---------- */ - fn visit_variable_declaration(&mut self, decl: &VariableDeclaration<'a>) { - let kind = AstKind::VariableDeclaration(self.alloc(decl)); - self.enter_node(kind); + pub fn walk_variable_declaration<'a, V: Visit<'a>>( + visitor: &mut V, + decl: &VariableDeclaration<'a>, + ) { + let kind = AstKind::VariableDeclaration(visitor.alloc(decl)); + visitor.enter_node(kind); for declarator in &decl.declarations { - self.visit_variable_declarator(declarator); + visitor.visit_variable_declarator(declarator); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_variable_declarator(&mut self, declarator: &VariableDeclarator<'a>) { - let kind = AstKind::VariableDeclarator(self.alloc(declarator)); - self.enter_node(kind); - self.visit_binding_pattern(&declarator.id); + pub fn walk_variable_declarator<'a, V: Visit<'a>>( + visitor: &mut V, + declarator: &VariableDeclarator<'a>, + ) { + let kind = AstKind::VariableDeclarator(visitor.alloc(declarator)); + visitor.enter_node(kind); + visitor.visit_binding_pattern(&declarator.id); if let Some(init) = &declarator.init { - self.visit_expression(init); + visitor.visit_expression(init); } - self.leave_node(kind); + visitor.leave_node(kind); } /* ---------- Function ---------- */ - fn visit_function(&mut self, func: &Function<'a>, flags: Option) { - let kind = AstKind::Function(self.alloc(func)); - self.enter_scope({ + pub fn walk_function<'a, V: Visit<'a>>( + visitor: &mut V, + func: &Function<'a>, + flags: Option, + ) { + let kind = AstKind::Function(visitor.alloc(func)); + visitor.enter_scope({ let mut flags = flags.unwrap_or(ScopeFlags::empty()) | ScopeFlags::Function; if func.is_strict() { flags |= ScopeFlags::StrictMode; } flags }); - self.enter_node(kind); + visitor.enter_node(kind); if let Some(ident) = &func.id { - self.visit_binding_identifier(ident); + visitor.visit_binding_identifier(ident); } - self.visit_formal_parameters(&func.params); + visitor.visit_formal_parameters(&func.params); if let Some(body) = &func.body { - self.visit_function_body(body); + visitor.visit_function_body(body); } if let Some(parameters) = &func.type_parameters { - self.visit_ts_type_parameter_declaration(parameters); + visitor.visit_ts_type_parameter_declaration(parameters); } if let Some(annotation) = &func.return_type { - self.visit_ts_type_annotation(annotation); + visitor.visit_ts_type_annotation(annotation); } - self.leave_node(kind); - self.leave_scope(); + visitor.leave_node(kind); + visitor.leave_scope(); } - fn visit_function_body(&mut self, body: &FunctionBody<'a>) { - let kind = AstKind::FunctionBody(self.alloc(body)); - self.enter_node(kind); + pub fn walk_function_body<'a, V: Visit<'a>>(visitor: &mut V, body: &FunctionBody<'a>) { + let kind = AstKind::FunctionBody(visitor.alloc(body)); + visitor.enter_node(kind); for directive in &body.directives { - self.visit_directive(directive); + visitor.visit_directive(directive); } - self.visit_statements(&body.statements); - self.leave_node(kind); + visitor.visit_statements(&body.statements); + visitor.leave_node(kind); } - fn visit_formal_parameters(&mut self, params: &FormalParameters<'a>) { - let kind = AstKind::FormalParameters(self.alloc(params)); - self.enter_node(kind); + pub fn walk_formal_parameters<'a, V: Visit<'a>>( + visitor: &mut V, + params: &FormalParameters<'a>, + ) { + let kind = AstKind::FormalParameters(visitor.alloc(params)); + visitor.enter_node(kind); for param in ¶ms.items { - self.visit_formal_parameter(param); + visitor.visit_formal_parameter(param); } if let Some(rest) = ¶ms.rest { - self.visit_rest_element(rest); + visitor.visit_rest_element(rest); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_formal_parameter(&mut self, param: &FormalParameter<'a>) { - let kind = AstKind::FormalParameter(self.alloc(param)); - self.enter_node(kind); + pub fn walk_formal_parameter<'a, V: Visit<'a>>(visitor: &mut V, param: &FormalParameter<'a>) { + let kind = AstKind::FormalParameter(visitor.alloc(param)); + visitor.enter_node(kind); for decorator in ¶m.decorators { - self.visit_decorator(decorator); + visitor.visit_decorator(decorator); } - self.visit_binding_pattern(¶m.pattern); - self.leave_node(kind); + visitor.visit_binding_pattern(¶m.pattern); + visitor.leave_node(kind); } /* ---------- Class ---------- */ - fn visit_decorator(&mut self, decorator: &Decorator<'a>) { - let kind = AstKind::Decorator(self.alloc(decorator)); - self.enter_node(kind); - self.visit_expression(&decorator.expression); - self.leave_node(kind); + pub fn walk_decorator<'a, V: Visit<'a>>(visitor: &mut V, decorator: &Decorator<'a>) { + let kind = AstKind::Decorator(visitor.alloc(decorator)); + visitor.enter_node(kind); + visitor.visit_expression(&decorator.expression); + visitor.leave_node(kind); } - fn visit_class(&mut self, class: &Class<'a>) { + pub fn walk_class<'a, V: Visit<'a>>(visitor: &mut V, class: &Class<'a>) { // Class level decorators are transpiled as functions outside of the class taking the class - // itself as argument. They should be visited before class is entered. E.g., they inherit + // itvisitor as argument. They should be visited before class is entered. E.g., they inherit // strict mode from the enclosing scope rather than from class. for decorator in &class.decorators { - self.visit_decorator(decorator); + visitor.visit_decorator(decorator); } - let kind = AstKind::Class(self.alloc(class)); + let kind = AstKind::Class(visitor.alloc(class)); // FIXME(don): Should we enter a scope when visiting class declarations? let is_class_expr = class.r#type == ClassType::ClassExpression; if is_class_expr { // Class expressions create a temporary scope with the class name as its only variable // E.g., `let c = class A { foo() { console.log(A) } }` - self.enter_scope(ScopeFlags::empty()); + visitor.enter_scope(ScopeFlags::empty()); } - self.enter_node(kind); + visitor.enter_node(kind); if let Some(id) = &class.id { - self.visit_binding_identifier(id); + visitor.visit_binding_identifier(id); } if let Some(parameters) = &class.type_parameters { - self.visit_ts_type_parameter_declaration(parameters); + visitor.visit_ts_type_parameter_declaration(parameters); } if let Some(super_class) = &class.super_class { - self.visit_class_heritage(super_class); + visitor.visit_class_heritage(super_class); } if let Some(super_parameters) = &class.super_type_parameters { - self.visit_ts_type_parameter_instantiation(super_parameters); + visitor.visit_ts_type_parameter_instantiation(super_parameters); } - self.visit_class_body(&class.body); - self.leave_node(kind); + visitor.visit_class_body(&class.body); + visitor.leave_node(kind); if is_class_expr { - self.leave_scope(); + visitor.leave_scope(); } } - fn visit_class_heritage(&mut self, expr: &Expression<'a>) { - let kind = AstKind::ClassHeritage(self.alloc(expr)); - self.enter_node(kind); - self.visit_expression(expr); - self.leave_node(kind); + pub fn walk_class_heritage<'a, V: Visit<'a>>(visitor: &mut V, expr: &Expression<'a>) { + let kind = AstKind::ClassHeritage(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_expression(expr); + visitor.leave_node(kind); } - fn visit_class_body(&mut self, body: &ClassBody<'a>) { - let kind = AstKind::ClassBody(self.alloc(body)); - self.enter_node(kind); + pub fn walk_class_body<'a, V: Visit<'a>>(visitor: &mut V, body: &ClassBody<'a>) { + let kind = AstKind::ClassBody(visitor.alloc(body)); + visitor.enter_node(kind); for elem in &body.body { - self.visit_class_element(elem); + visitor.visit_class_element(elem); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_class_element(&mut self, elem: &ClassElement<'a>) { + pub fn walk_class_element<'a, V: Visit<'a>>(visitor: &mut V, elem: &ClassElement<'a>) { match elem { - ClassElement::StaticBlock(block) => self.visit_static_block(block), - ClassElement::MethodDefinition(def) => self.visit_method_definition(def), - ClassElement::PropertyDefinition(def) => self.visit_property_definition(def), + ClassElement::StaticBlock(block) => visitor.visit_static_block(block), + ClassElement::MethodDefinition(def) => visitor.visit_method_definition(def), + ClassElement::PropertyDefinition(def) => visitor.visit_property_definition(def), ClassElement::AccessorProperty(_def) => { /* TODO */ } - ClassElement::TSIndexSignature(sig) => self.visit_ts_index_signature(sig), + ClassElement::TSIndexSignature(sig) => visitor.visit_ts_index_signature(sig), } } - fn visit_static_block(&mut self, block: &StaticBlock<'a>) { - let kind = AstKind::StaticBlock(self.alloc(block)); - self.enter_scope(ScopeFlags::ClassStaticBlock); - self.enter_node(kind); - self.visit_statements(&block.body); - self.leave_node(kind); - self.leave_scope(); + pub fn walk_static_block<'a, V: Visit<'a>>(visitor: &mut V, block: &StaticBlock<'a>) { + let kind = AstKind::StaticBlock(visitor.alloc(block)); + visitor.enter_scope(ScopeFlags::ClassStaticBlock); + visitor.enter_node(kind); + visitor.visit_statements(&block.body); + visitor.leave_node(kind); + visitor.leave_scope(); } - fn visit_method_definition(&mut self, def: &MethodDefinition<'a>) { - let kind = AstKind::MethodDefinition(self.alloc(def)); - self.enter_node(kind); + pub fn walk_method_definition<'a, V: Visit<'a>>(visitor: &mut V, def: &MethodDefinition<'a>) { + let kind = AstKind::MethodDefinition(visitor.alloc(def)); + visitor.enter_node(kind); for decorator in &def.decorators { - self.visit_decorator(decorator); + visitor.visit_decorator(decorator); } let flags = match def.kind { MethodDefinitionKind::Get => ScopeFlags::GetAccessor, @@ -507,1434 +1317,1635 @@ pub trait Visit<'a>: Sized { MethodDefinitionKind::Constructor => ScopeFlags::Constructor, MethodDefinitionKind::Method => ScopeFlags::empty(), }; - self.visit_property_key(&def.key); - self.visit_function(&def.value, Some(flags)); - self.leave_node(kind); + visitor.visit_property_key(&def.key); + visitor.visit_function(&def.value, Some(flags)); + visitor.leave_node(kind); } - fn visit_property_definition(&mut self, def: &PropertyDefinition<'a>) { - let kind = AstKind::PropertyDefinition(self.alloc(def)); - self.enter_node(kind); + pub fn walk_property_definition<'a, V: Visit<'a>>( + visitor: &mut V, + def: &PropertyDefinition<'a>, + ) { + let kind = AstKind::PropertyDefinition(visitor.alloc(def)); + visitor.enter_node(kind); for decorator in &def.decorators { - self.visit_decorator(decorator); + visitor.visit_decorator(decorator); } - self.visit_property_key(&def.key); + visitor.visit_property_key(&def.key); if let Some(value) = &def.value { - self.visit_expression(value); + visitor.visit_expression(value); } if let Some(annotation) = &def.type_annotation { - self.visit_ts_type_annotation(annotation); + visitor.visit_ts_type_annotation(annotation); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_using_declaration(&mut self, decl: &UsingDeclaration<'a>) { - let kind = AstKind::UsingDeclaration(self.alloc(decl)); - self.enter_node(kind); + pub fn walk_using_declaration<'a, V: Visit<'a>>(visitor: &mut V, decl: &UsingDeclaration<'a>) { + let kind = AstKind::UsingDeclaration(visitor.alloc(decl)); + visitor.enter_node(kind); for decl in &decl.declarations { - self.visit_variable_declarator(decl); + visitor.visit_variable_declarator(decl); } - self.leave_node(kind); + visitor.leave_node(kind); } /* ---------- Expression ---------- */ - fn visit_expression(&mut self, expr: &Expression<'a>) { - self.visit_expression_match(expr); - } - - fn visit_expression_match(&mut self, expr: &Expression<'a>) { + pub fn walk_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &Expression<'a>) { match expr { - Expression::BigintLiteral(lit) => self.visit_bigint_literal(lit), - Expression::BooleanLiteral(lit) => self.visit_boolean_literal(lit), - Expression::NullLiteral(lit) => self.visit_null_literal(lit), - Expression::NumericLiteral(lit) => self.visit_number_literal(lit), - Expression::RegExpLiteral(lit) => self.visit_reg_expr_literal(lit), - Expression::StringLiteral(lit) => self.visit_string_literal(lit), - Expression::TemplateLiteral(lit) => self.visit_template_literal(lit), - Expression::Identifier(ident) => self.visit_identifier_reference(ident), - Expression::MetaProperty(meta) => self.visit_meta_property(meta), + Expression::BigintLiteral(lit) => visitor.visit_bigint_literal(lit), + Expression::BooleanLiteral(lit) => visitor.visit_boolean_literal(lit), + Expression::NullLiteral(lit) => visitor.visit_null_literal(lit), + Expression::NumericLiteral(lit) => visitor.visit_number_literal(lit), + Expression::RegExpLiteral(lit) => visitor.visit_reg_expr_literal(lit), + Expression::StringLiteral(lit) => visitor.visit_string_literal(lit), + Expression::TemplateLiteral(lit) => visitor.visit_template_literal(lit), + Expression::Identifier(ident) => visitor.visit_identifier_reference(ident), + Expression::MetaProperty(meta) => visitor.visit_meta_property(meta), - Expression::ArrayExpression(expr) => self.visit_array_expression(expr), - Expression::ArrowFunctionExpression(expr) => self.visit_arrow_expression(expr), - Expression::AssignmentExpression(expr) => self.visit_assignment_expression(expr), - Expression::AwaitExpression(expr) => self.visit_await_expression(expr), - Expression::BinaryExpression(expr) => self.visit_binary_expression(expr), - Expression::CallExpression(expr) => self.visit_call_expression(expr), - Expression::ChainExpression(expr) => self.visit_chain_expression(expr), + Expression::ArrayExpression(expr) => visitor.visit_array_expression(expr), + Expression::ArrowFunctionExpression(expr) => visitor.visit_arrow_expression(expr), + Expression::AssignmentExpression(expr) => visitor.visit_assignment_expression(expr), + Expression::AwaitExpression(expr) => visitor.visit_await_expression(expr), + Expression::BinaryExpression(expr) => visitor.visit_binary_expression(expr), + Expression::CallExpression(expr) => visitor.visit_call_expression(expr), + Expression::ChainExpression(expr) => visitor.visit_chain_expression(expr), Expression::ClassExpression(expr) => { debug_assert_eq!(expr.r#type, ClassType::ClassExpression); - self.visit_class(expr); + visitor.visit_class(expr); } - Expression::ConditionalExpression(expr) => self.visit_conditional_expression(expr), - Expression::FunctionExpression(expr) => self.visit_function(expr, None), - Expression::ImportExpression(expr) => self.visit_import_expression(expr), - Expression::LogicalExpression(expr) => self.visit_logical_expression(expr), - Expression::MemberExpression(expr) => self.visit_member_expression(expr), - Expression::NewExpression(expr) => self.visit_new_expression(expr), - Expression::ObjectExpression(expr) => self.visit_object_expression(expr), + Expression::ConditionalExpression(expr) => visitor.visit_conditional_expression(expr), + Expression::FunctionExpression(expr) => visitor.visit_function(expr, None), + Expression::ImportExpression(expr) => visitor.visit_import_expression(expr), + Expression::LogicalExpression(expr) => visitor.visit_logical_expression(expr), + Expression::MemberExpression(expr) => visitor.visit_member_expression(expr), + Expression::NewExpression(expr) => visitor.visit_new_expression(expr), + Expression::ObjectExpression(expr) => visitor.visit_object_expression(expr), Expression::ParenthesizedExpression(expr) => { - self.visit_parenthesized_expression(expr); + visitor.visit_parenthesized_expression(expr); } - Expression::PrivateInExpression(expr) => self.visit_private_in_expression(expr), - Expression::SequenceExpression(expr) => self.visit_sequence_expression(expr), + Expression::PrivateInExpression(expr) => visitor.visit_private_in_expression(expr), + Expression::SequenceExpression(expr) => visitor.visit_sequence_expression(expr), Expression::TaggedTemplateExpression(expr) => { - self.visit_tagged_template_expression(expr); + visitor.visit_tagged_template_expression(expr); } - Expression::ThisExpression(expr) => self.visit_this_expression(expr), - Expression::UnaryExpression(expr) => self.visit_unary_expression(expr), - Expression::UpdateExpression(expr) => self.visit_update_expression(expr), - Expression::YieldExpression(expr) => self.visit_yield_expression(expr), - Expression::Super(expr) => self.visit_super(expr), - Expression::JSXElement(elem) => self.visit_jsx_element(elem), - Expression::JSXFragment(elem) => self.visit_jsx_fragment(elem), + Expression::ThisExpression(expr) => visitor.visit_this_expression(expr), + Expression::UnaryExpression(expr) => visitor.visit_unary_expression(expr), + Expression::UpdateExpression(expr) => visitor.visit_update_expression(expr), + Expression::YieldExpression(expr) => visitor.visit_yield_expression(expr), + Expression::Super(expr) => visitor.visit_super(expr), + Expression::JSXElement(elem) => visitor.visit_jsx_element(elem), + Expression::JSXFragment(elem) => visitor.visit_jsx_fragment(elem), - Expression::TSAsExpression(expr) => self.visit_ts_as_expression(expr), - Expression::TSSatisfiesExpression(expr) => self.visit_ts_satisfies_expression(expr), - Expression::TSNonNullExpression(expr) => self.visit_ts_non_null_expression(expr), - Expression::TSTypeAssertion(expr) => self.visit_ts_type_assertion(expr), + Expression::TSAsExpression(expr) => visitor.visit_ts_as_expression(expr), + Expression::TSSatisfiesExpression(expr) => visitor.visit_ts_satisfies_expression(expr), + Expression::TSNonNullExpression(expr) => visitor.visit_ts_non_null_expression(expr), + Expression::TSTypeAssertion(expr) => visitor.visit_ts_type_assertion(expr), Expression::TSInstantiationExpression(expr) => { - self.visit_ts_instantiation_expression(expr); + visitor.visit_ts_instantiation_expression(expr); } } } - fn visit_meta_property(&mut self, meta: &MetaProperty<'a>) { - let kind = AstKind::MetaProperty(self.alloc(meta)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_meta_property<'a, V: Visit<'a>>(visitor: &mut V, meta: &MetaProperty<'a>) { + let kind = AstKind::MetaProperty(visitor.alloc(meta)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_array_expression(&mut self, expr: &ArrayExpression<'a>) { - let kind = AstKind::ArrayExpression(self.alloc(expr)); - self.enter_node(kind); + pub fn walk_array_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &ArrayExpression<'a>) { + let kind = AstKind::ArrayExpression(visitor.alloc(expr)); + visitor.enter_node(kind); for elem in &expr.elements { - self.visit_array_expression_element(elem); + visitor.visit_array_expression_element(elem); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_array_expression_element(&mut self, arg: &ArrayExpressionElement<'a>) { - let kind = AstKind::ArrayExpressionElement(self.alloc(arg)); - self.enter_node(kind); + pub fn walk_array_expression_element<'a, V: Visit<'a>>( + visitor: &mut V, + arg: &ArrayExpressionElement<'a>, + ) { + let kind = AstKind::ArrayExpressionElement(visitor.alloc(arg)); + visitor.enter_node(kind); match arg { - ArrayExpressionElement::SpreadElement(spread) => self.visit_spread_element(spread), - ArrayExpressionElement::Expression(expr) => self.visit_expression_array_element(expr), - ArrayExpressionElement::Elision(span) => self.visit_elision(*span), + ArrayExpressionElement::SpreadElement(spread) => visitor.visit_spread_element(spread), + ArrayExpressionElement::Expression(expr) => { + visitor.visit_expression_array_element(expr); + } + ArrayExpressionElement::Elision(span) => visitor.visit_elision(*span), } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_argument(&mut self, arg: &Argument<'a>) { - let kind = AstKind::Argument(self.alloc(arg)); - self.enter_node(kind); + pub fn walk_argument<'a, V: Visit<'a>>(visitor: &mut V, arg: &Argument<'a>) { + let kind = AstKind::Argument(visitor.alloc(arg)); + visitor.enter_node(kind); match arg { - Argument::SpreadElement(spread) => self.visit_spread_element(spread), - Argument::Expression(expr) => self.visit_expression(expr), + Argument::SpreadElement(spread) => visitor.visit_spread_element(spread), + Argument::Expression(expr) => visitor.visit_expression(expr), } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_spread_element(&mut self, elem: &SpreadElement<'a>) { - let kind = AstKind::SpreadElement(self.alloc(elem)); - self.enter_node(kind); - self.visit_expression(&elem.argument); - self.leave_node(kind); + pub fn walk_spread_element<'a, V: Visit<'a>>(visitor: &mut V, elem: &SpreadElement<'a>) { + let kind = AstKind::SpreadElement(visitor.alloc(elem)); + visitor.enter_node(kind); + visitor.visit_expression(&elem.argument); + visitor.leave_node(kind); } - fn visit_expression_array_element(&mut self, expr: &Expression<'a>) { - let kind = AstKind::ExpressionArrayElement(self.alloc(expr)); - self.enter_node(kind); - self.visit_expression(expr); - self.leave_node(kind); + pub fn walk_expression_array_element<'a, V: Visit<'a>>(visitor: &mut V, expr: &Expression<'a>) { + let kind = AstKind::ExpressionArrayElement(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_expression(expr); + visitor.leave_node(kind); } - fn visit_elision(&mut self, span: Span) { + pub fn walk_elision<'a, V: Visit<'a>>(visitor: &mut V, span: Span) { let kind = AstKind::Elision(span); - self.enter_node(kind); - self.leave_node(kind); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_assignment_expression(&mut self, expr: &AssignmentExpression<'a>) { - let kind = AstKind::AssignmentExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_assignment_target(&expr.left); - self.visit_expression(&expr.right); - self.leave_node(kind); + pub fn walk_assignment_expression<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &AssignmentExpression<'a>, + ) { + let kind = AstKind::AssignmentExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_assignment_target(&expr.left); + visitor.visit_expression(&expr.right); + visitor.leave_node(kind); } - fn visit_arrow_expression(&mut self, expr: &ArrowFunctionExpression<'a>) { - let kind = AstKind::ArrowFunctionExpression(self.alloc(expr)); - self.enter_scope(ScopeFlags::Function | ScopeFlags::Arrow); - self.enter_node(kind); - self.visit_formal_parameters(&expr.params); - self.visit_function_body(&expr.body); + pub fn walk_arrow_expression<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &ArrowFunctionExpression<'a>, + ) { + let kind = AstKind::ArrowFunctionExpression(visitor.alloc(expr)); + visitor.enter_scope(ScopeFlags::Function | ScopeFlags::Arrow); + visitor.enter_node(kind); + visitor.visit_formal_parameters(&expr.params); + visitor.visit_function_body(&expr.body); if let Some(parameters) = &expr.type_parameters { - self.visit_ts_type_parameter_declaration(parameters); + visitor.visit_ts_type_parameter_declaration(parameters); } - self.leave_node(kind); - self.leave_scope(); + visitor.leave_node(kind); + visitor.leave_scope(); } - fn visit_await_expression(&mut self, expr: &AwaitExpression<'a>) { - let kind = AstKind::AwaitExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_expression(&expr.argument); - self.leave_node(kind); + pub fn walk_await_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &AwaitExpression<'a>) { + let kind = AstKind::AwaitExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_expression(&expr.argument); + visitor.leave_node(kind); } - fn visit_binary_expression(&mut self, expr: &BinaryExpression<'a>) { - let kind = AstKind::BinaryExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_expression(&expr.left); - self.visit_expression(&expr.right); - self.leave_node(kind); + pub fn walk_binary_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &BinaryExpression<'a>) { + let kind = AstKind::BinaryExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_expression(&expr.left); + visitor.visit_expression(&expr.right); + visitor.leave_node(kind); } - fn visit_call_expression(&mut self, expr: &CallExpression<'a>) { - let kind = AstKind::CallExpression(self.alloc(expr)); - self.enter_node(kind); + pub fn walk_call_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &CallExpression<'a>) { + let kind = AstKind::CallExpression(visitor.alloc(expr)); + visitor.enter_node(kind); for arg in &expr.arguments { - self.visit_argument(arg); + visitor.visit_argument(arg); } - self.visit_expression(&expr.callee); + visitor.visit_expression(&expr.callee); if let Some(parameters) = &expr.type_parameters { - self.visit_ts_type_parameter_instantiation(parameters); + visitor.visit_ts_type_parameter_instantiation(parameters); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_chain_expression(&mut self, expr: &ChainExpression<'a>) { - let kind = AstKind::ChainExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_chain_element(&expr.expression); - self.leave_node(kind); + pub fn walk_chain_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &ChainExpression<'a>) { + let kind = AstKind::ChainExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_chain_element(&expr.expression); + visitor.leave_node(kind); } - fn visit_chain_element(&mut self, elem: &ChainElement<'a>) { + pub fn walk_chain_element<'a, V: Visit<'a>>(visitor: &mut V, elem: &ChainElement<'a>) { match elem { - ChainElement::CallExpression(expr) => self.visit_call_expression(expr), - ChainElement::MemberExpression(expr) => self.visit_member_expression(expr), + ChainElement::CallExpression(expr) => visitor.visit_call_expression(expr), + ChainElement::MemberExpression(expr) => visitor.visit_member_expression(expr), } } - fn visit_conditional_expression(&mut self, expr: &ConditionalExpression<'a>) { - let kind = AstKind::ConditionalExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_expression(&expr.test); - self.visit_expression(&expr.consequent); - self.visit_expression(&expr.alternate); - self.leave_node(kind); + pub fn walk_conditional_expression<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &ConditionalExpression<'a>, + ) { + let kind = AstKind::ConditionalExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_expression(&expr.test); + visitor.visit_expression(&expr.consequent); + visitor.visit_expression(&expr.alternate); + visitor.leave_node(kind); } - fn visit_import_expression(&mut self, expr: &ImportExpression<'a>) { - let kind = AstKind::ImportExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_expression(&expr.source); + pub fn walk_import_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &ImportExpression<'a>) { + let kind = AstKind::ImportExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_expression(&expr.source); for arg in &expr.arguments { - self.visit_expression(arg); + visitor.visit_expression(arg); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_logical_expression(&mut self, expr: &LogicalExpression<'a>) { - let kind = AstKind::LogicalExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_expression(&expr.left); - self.visit_expression(&expr.right); - self.leave_node(kind); + pub fn walk_logical_expression<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &LogicalExpression<'a>, + ) { + let kind = AstKind::LogicalExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_expression(&expr.left); + visitor.visit_expression(&expr.right); + visitor.leave_node(kind); } - fn visit_member_expression(&mut self, expr: &MemberExpression<'a>) { - let kind = AstKind::MemberExpression(self.alloc(expr)); - self.enter_node(kind); + pub fn walk_member_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &MemberExpression<'a>) { + let kind = AstKind::MemberExpression(visitor.alloc(expr)); + visitor.enter_node(kind); match expr { MemberExpression::ComputedMemberExpression(expr) => { - self.visit_computed_member_expression(expr); + visitor.visit_computed_member_expression(expr); } MemberExpression::StaticMemberExpression(expr) => { - self.visit_static_member_expression(expr); + visitor.visit_static_member_expression(expr); } MemberExpression::PrivateFieldExpression(expr) => { - self.visit_private_field_expression(expr); + visitor.visit_private_field_expression(expr); } } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_computed_member_expression(&mut self, expr: &ComputedMemberExpression<'a>) { - self.visit_expression(&expr.object); - self.visit_expression(&expr.expression); + pub fn walk_computed_member_expression<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &ComputedMemberExpression<'a>, + ) { + visitor.visit_expression(&expr.object); + visitor.visit_expression(&expr.expression); } - fn visit_static_member_expression(&mut self, expr: &StaticMemberExpression<'a>) { - self.visit_expression(&expr.object); - self.visit_identifier_name(&expr.property); + pub fn walk_static_member_expression<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &StaticMemberExpression<'a>, + ) { + visitor.visit_expression(&expr.object); + visitor.visit_identifier_name(&expr.property); } - fn visit_private_field_expression(&mut self, expr: &PrivateFieldExpression<'a>) { - self.visit_expression(&expr.object); - self.visit_private_identifier(&expr.field); + pub fn walk_private_field_expression<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &PrivateFieldExpression<'a>, + ) { + visitor.visit_expression(&expr.object); + visitor.visit_private_identifier(&expr.field); } - fn visit_new_expression(&mut self, expr: &NewExpression<'a>) { - let kind = AstKind::NewExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_expression(&expr.callee); + pub fn walk_new_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &NewExpression<'a>) { + let kind = AstKind::NewExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_expression(&expr.callee); if let Some(parameters) = &expr.type_parameters { - self.visit_ts_type_parameter_instantiation(parameters); + visitor.visit_ts_type_parameter_instantiation(parameters); } for arg in &expr.arguments { - self.visit_argument(arg); + visitor.visit_argument(arg); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_object_expression(&mut self, expr: &ObjectExpression<'a>) { - let kind = AstKind::ObjectExpression(self.alloc(expr)); - self.enter_node(kind); + pub fn walk_object_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &ObjectExpression<'a>) { + let kind = AstKind::ObjectExpression(visitor.alloc(expr)); + visitor.enter_node(kind); for prop in &expr.properties { - self.visit_object_property_kind(prop); + visitor.visit_object_property_kind(prop); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_object_property_kind(&mut self, prop: &ObjectPropertyKind<'a>) { + pub fn walk_object_property_kind<'a, V: Visit<'a>>( + visitor: &mut V, + prop: &ObjectPropertyKind<'a>, + ) { match prop { - ObjectPropertyKind::ObjectProperty(prop) => self.visit_object_property(prop), - ObjectPropertyKind::SpreadProperty(elem) => self.visit_spread_element(elem), + ObjectPropertyKind::ObjectProperty(prop) => visitor.visit_object_property(prop), + ObjectPropertyKind::SpreadProperty(elem) => visitor.visit_spread_element(elem), } } - fn visit_object_property(&mut self, prop: &ObjectProperty<'a>) { - let kind = AstKind::ObjectProperty(self.alloc(prop)); - self.enter_node(kind); - self.visit_property_key(&prop.key); - self.visit_expression(&prop.value); - self.leave_node(kind); + pub fn walk_object_property<'a, V: Visit<'a>>(visitor: &mut V, prop: &ObjectProperty<'a>) { + let kind = AstKind::ObjectProperty(visitor.alloc(prop)); + visitor.enter_node(kind); + visitor.visit_property_key(&prop.key); + visitor.visit_expression(&prop.value); + visitor.leave_node(kind); } - fn visit_property_key(&mut self, key: &PropertyKey<'a>) { - let kind = AstKind::PropertyKey(self.alloc(key)); - self.enter_node(kind); + pub fn walk_property_key<'a, V: Visit<'a>>(visitor: &mut V, key: &PropertyKey<'a>) { + let kind = AstKind::PropertyKey(visitor.alloc(key)); + visitor.enter_node(kind); match key { - PropertyKey::Identifier(ident) => self.visit_identifier_name(ident), - PropertyKey::PrivateIdentifier(ident) => self.visit_private_identifier(ident), - PropertyKey::Expression(expr) => self.visit_expression(expr), + PropertyKey::Identifier(ident) => visitor.visit_identifier_name(ident), + PropertyKey::PrivateIdentifier(ident) => visitor.visit_private_identifier(ident), + PropertyKey::Expression(expr) => visitor.visit_expression(expr), } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_parenthesized_expression(&mut self, expr: &ParenthesizedExpression<'a>) { - let kind = AstKind::ParenthesizedExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_expression(&expr.expression); - self.leave_node(kind); + pub fn walk_parenthesized_expression<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &ParenthesizedExpression<'a>, + ) { + let kind = AstKind::ParenthesizedExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_expression(&expr.expression); + visitor.leave_node(kind); } - fn visit_private_in_expression(&mut self, expr: &PrivateInExpression<'a>) { - let kind = AstKind::PrivateInExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_private_identifier(&expr.left); - self.visit_expression(&expr.right); - self.leave_node(kind); + pub fn walk_private_in_expression<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &PrivateInExpression<'a>, + ) { + let kind = AstKind::PrivateInExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_private_identifier(&expr.left); + visitor.visit_expression(&expr.right); + visitor.leave_node(kind); } - fn visit_sequence_expression(&mut self, expr: &SequenceExpression<'a>) { - let kind = AstKind::SequenceExpression(self.alloc(expr)); - self.enter_node(kind); + pub fn walk_sequence_expression<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &SequenceExpression<'a>, + ) { + let kind = AstKind::SequenceExpression(visitor.alloc(expr)); + visitor.enter_node(kind); for expr in &expr.expressions { - self.visit_expression(expr); + visitor.visit_expression(expr); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_tagged_template_expression(&mut self, expr: &TaggedTemplateExpression<'a>) { - let kind = AstKind::TaggedTemplateExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_expression(&expr.tag); - self.visit_template_literal(&expr.quasi); - self.leave_node(kind); + pub fn walk_tagged_template_expression<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &TaggedTemplateExpression<'a>, + ) { + let kind = AstKind::TaggedTemplateExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_expression(&expr.tag); + visitor.visit_template_literal(&expr.quasi); + visitor.leave_node(kind); } - fn visit_this_expression(&mut self, expr: &ThisExpression) { - let kind = AstKind::ThisExpression(self.alloc(expr)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_this_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &ThisExpression) { + let kind = AstKind::ThisExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_unary_expression(&mut self, expr: &UnaryExpression<'a>) { - let kind = AstKind::UnaryExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_expression(&expr.argument); - self.leave_node(kind); + pub fn walk_unary_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &UnaryExpression<'a>) { + let kind = AstKind::UnaryExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_expression(&expr.argument); + visitor.leave_node(kind); } - fn visit_update_expression(&mut self, expr: &UpdateExpression<'a>) { - let kind = AstKind::UpdateExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_simple_assignment_target(&expr.argument); - self.leave_node(kind); + pub fn walk_update_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &UpdateExpression<'a>) { + let kind = AstKind::UpdateExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_simple_assignment_target(&expr.argument); + visitor.leave_node(kind); } - fn visit_yield_expression(&mut self, expr: &YieldExpression<'a>) { - let kind = AstKind::YieldExpression(self.alloc(expr)); - self.enter_node(kind); + pub fn walk_yield_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &YieldExpression<'a>) { + let kind = AstKind::YieldExpression(visitor.alloc(expr)); + visitor.enter_node(kind); if let Some(argument) = &expr.argument { - self.visit_expression(argument); + visitor.visit_expression(argument); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_super(&mut self, expr: &Super) { - let kind = AstKind::Super(self.alloc(expr)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_super<'a, V: Visit<'a>>(visitor: &mut V, expr: &Super) { + let kind = AstKind::Super(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_assignment_target(&mut self, target: &AssignmentTarget<'a>) { - let kind = AstKind::AssignmentTarget(self.alloc(target)); - self.enter_node(kind); + pub fn walk_assignment_target<'a, V: Visit<'a>>( + visitor: &mut V, + target: &AssignmentTarget<'a>, + ) { + let kind = AstKind::AssignmentTarget(visitor.alloc(target)); + visitor.enter_node(kind); match target { AssignmentTarget::SimpleAssignmentTarget(target) => { - self.visit_simple_assignment_target(target); + visitor.visit_simple_assignment_target(target); } AssignmentTarget::AssignmentTargetPattern(pat) => { - self.visit_assignment_target_pattern(pat); + visitor.visit_assignment_target_pattern(pat); } } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_simple_assignment_target(&mut self, target: &SimpleAssignmentTarget<'a>) { - let kind = AstKind::SimpleAssignmentTarget(self.alloc(target)); - self.enter_node(kind); + pub fn walk_simple_assignment_target<'a, V: Visit<'a>>( + visitor: &mut V, + target: &SimpleAssignmentTarget<'a>, + ) { + let kind = AstKind::SimpleAssignmentTarget(visitor.alloc(target)); + visitor.enter_node(kind); match target { SimpleAssignmentTarget::AssignmentTargetIdentifier(ident) => { - self.visit_identifier_reference(ident); + visitor.visit_identifier_reference(ident); } SimpleAssignmentTarget::MemberAssignmentTarget(expr) => { - self.visit_member_expression(expr); + visitor.visit_member_expression(expr); } SimpleAssignmentTarget::TSAsExpression(expr) => { - self.visit_expression(&expr.expression); + visitor.visit_expression(&expr.expression); } SimpleAssignmentTarget::TSSatisfiesExpression(expr) => { - self.visit_expression(&expr.expression); + visitor.visit_expression(&expr.expression); } SimpleAssignmentTarget::TSNonNullExpression(expr) => { - self.visit_expression(&expr.expression); + visitor.visit_expression(&expr.expression); } SimpleAssignmentTarget::TSTypeAssertion(expr) => { - self.visit_expression(&expr.expression); + visitor.visit_expression(&expr.expression); } } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_assignment_target_pattern(&mut self, pat: &AssignmentTargetPattern<'a>) { + pub fn walk_assignment_target_pattern<'a, V: Visit<'a>>( + visitor: &mut V, + pat: &AssignmentTargetPattern<'a>, + ) { match pat { AssignmentTargetPattern::ArrayAssignmentTarget(target) => { - self.visit_array_assignment_target(target); + visitor.visit_array_assignment_target(target); } AssignmentTargetPattern::ObjectAssignmentTarget(target) => { - self.visit_object_assignment_target(target); + visitor.visit_object_assignment_target(target); } } } - fn visit_array_assignment_target(&mut self, target: &ArrayAssignmentTarget<'a>) { + pub fn walk_array_assignment_target<'a, V: Visit<'a>>( + visitor: &mut V, + target: &ArrayAssignmentTarget<'a>, + ) { for element in target.elements.iter().flatten() { - self.visit_assignment_target_maybe_default(element); + visitor.visit_assignment_target_maybe_default(element); } if let Some(target) = &target.rest { - self.visit_assignment_target_rest(target); + visitor.visit_assignment_target_rest(target); } } - fn visit_assignment_target_maybe_default(&mut self, target: &AssignmentTargetMaybeDefault<'a>) { + pub fn walk_assignment_target_maybe_default<'a, V: Visit<'a>>( + visitor: &mut V, + target: &AssignmentTargetMaybeDefault<'a>, + ) { match target { AssignmentTargetMaybeDefault::AssignmentTarget(target) => { - self.visit_assignment_target(target); + visitor.visit_assignment_target(target); } AssignmentTargetMaybeDefault::AssignmentTargetWithDefault(target) => { - self.visit_assignment_target_with_default(target); + visitor.visit_assignment_target_with_default(target); } } } - fn visit_assignment_target_with_default(&mut self, target: &AssignmentTargetWithDefault<'a>) { - let kind = AstKind::AssignmentTargetWithDefault(self.alloc(target)); - self.enter_node(kind); - self.visit_assignment_target(&target.binding); - self.visit_expression(&target.init); - self.leave_node(kind); + pub fn walk_assignment_target_with_default<'a, V: Visit<'a>>( + visitor: &mut V, + target: &AssignmentTargetWithDefault<'a>, + ) { + let kind = AstKind::AssignmentTargetWithDefault(visitor.alloc(target)); + visitor.enter_node(kind); + visitor.visit_assignment_target(&target.binding); + visitor.visit_expression(&target.init); + visitor.leave_node(kind); } - fn visit_object_assignment_target(&mut self, target: &ObjectAssignmentTarget<'a>) { + pub fn walk_object_assignment_target<'a, V: Visit<'a>>( + visitor: &mut V, + target: &ObjectAssignmentTarget<'a>, + ) { for property in &target.properties { - self.visit_assignment_target_property(property); + visitor.visit_assignment_target_property(property); } if let Some(target) = &target.rest { - self.visit_assignment_target_rest(target); + visitor.visit_assignment_target_rest(target); } } - fn visit_assignment_target_property(&mut self, property: &AssignmentTargetProperty<'a>) { + pub fn walk_assignment_target_property<'a, V: Visit<'a>>( + visitor: &mut V, + property: &AssignmentTargetProperty<'a>, + ) { match property { AssignmentTargetProperty::AssignmentTargetPropertyIdentifier(ident) => { - self.visit_assignment_target_property_identifier(ident); + visitor.visit_assignment_target_property_identifier(ident); } AssignmentTargetProperty::AssignmentTargetPropertyProperty(prop) => { - self.visit_assignment_target_property_property(prop); + visitor.visit_assignment_target_property_property(prop); } } } - fn visit_assignment_target_property_identifier( - &mut self, + pub fn walk_assignment_target_property_identifier<'a, V: Visit<'a>>( + visitor: &mut V, ident: &AssignmentTargetPropertyIdentifier<'a>, ) { - self.visit_identifier_reference(&ident.binding); + visitor.visit_identifier_reference(&ident.binding); if let Some(expr) = &ident.init { - self.visit_expression(expr); + visitor.visit_expression(expr); } } - fn visit_assignment_target_property_property( - &mut self, + pub fn walk_assignment_target_property_property<'a, V: Visit<'a>>( + visitor: &mut V, property: &AssignmentTargetPropertyProperty<'a>, ) { - self.visit_property_key(&property.name); - self.visit_assignment_target_maybe_default(&property.binding); + visitor.visit_property_key(&property.name); + visitor.visit_assignment_target_maybe_default(&property.binding); } - fn visit_assignment_target_rest(&mut self, rest: &AssignmentTargetRest<'a>) { - self.visit_assignment_target(&rest.target); + pub fn walk_assignment_target_rest<'a, V: Visit<'a>>( + visitor: &mut V, + rest: &AssignmentTargetRest<'a>, + ) { + visitor.visit_assignment_target(&rest.target); } /* ---------- Expression ---------- */ - fn visit_jsx_element(&mut self, elem: &JSXElement<'a>) { - let kind = AstKind::JSXElement(self.alloc(elem)); - self.enter_node(kind); - self.visit_jsx_opening_element(&elem.opening_element); + pub fn walk_jsx_element<'a, V: Visit<'a>>(visitor: &mut V, elem: &JSXElement<'a>) { + let kind = AstKind::JSXElement(visitor.alloc(elem)); + visitor.enter_node(kind); + visitor.visit_jsx_opening_element(&elem.opening_element); for child in &elem.children { - self.visit_jsx_child(child); + visitor.visit_jsx_child(child); } if let Some(closing_elem) = &elem.closing_element { - self.visit_jsx_closing_element(closing_elem); + visitor.visit_jsx_closing_element(closing_elem); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_jsx_opening_element(&mut self, elem: &JSXOpeningElement<'a>) { - let kind = AstKind::JSXOpeningElement(self.alloc(elem)); - self.enter_node(kind); - self.visit_jsx_element_name(&elem.name); + pub fn walk_jsx_opening_element<'a, V: Visit<'a>>( + visitor: &mut V, + elem: &JSXOpeningElement<'a>, + ) { + let kind = AstKind::JSXOpeningElement(visitor.alloc(elem)); + visitor.enter_node(kind); + visitor.visit_jsx_element_name(&elem.name); for attribute in &elem.attributes { - self.visit_jsx_attribute_item(attribute); + visitor.visit_jsx_attribute_item(attribute); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_jsx_closing_element(&mut self, elem: &JSXClosingElement<'a>) { - let kind = AstKind::JSXClosingElement(self.alloc(elem)); - self.enter_node(kind); - self.visit_jsx_element_name(&elem.name); - self.leave_node(kind); + pub fn walk_jsx_closing_element<'a, V: Visit<'a>>( + visitor: &mut V, + elem: &JSXClosingElement<'a>, + ) { + let kind = AstKind::JSXClosingElement(visitor.alloc(elem)); + visitor.enter_node(kind); + visitor.visit_jsx_element_name(&elem.name); + visitor.leave_node(kind); } - fn visit_jsx_element_name(&mut self, name: &JSXElementName<'a>) { - let kind = AstKind::JSXElementName(self.alloc(name)); - self.enter_node(kind); + pub fn walk_jsx_element_name<'a, V: Visit<'a>>(visitor: &mut V, name: &JSXElementName<'a>) { + let kind = AstKind::JSXElementName(visitor.alloc(name)); + visitor.enter_node(kind); match name { - JSXElementName::Identifier(ident) => self.visit_jsx_identifier(ident), - JSXElementName::NamespacedName(expr) => self.visit_jsx_namespaced_name(expr), - JSXElementName::MemberExpression(expr) => self.visit_jsx_member_expression(expr), + JSXElementName::Identifier(ident) => visitor.visit_jsx_identifier(ident), + JSXElementName::NamespacedName(expr) => visitor.visit_jsx_namespaced_name(expr), + JSXElementName::MemberExpression(expr) => visitor.visit_jsx_member_expression(expr), } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_jsx_identifier(&mut self, ident: &JSXIdentifier<'a>) { - let kind = AstKind::JSXIdentifier(self.alloc(ident)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_jsx_identifier<'a, V: Visit<'a>>(visitor: &mut V, ident: &JSXIdentifier<'a>) { + let kind = AstKind::JSXIdentifier(visitor.alloc(ident)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_jsx_member_expression(&mut self, expr: &JSXMemberExpression<'a>) { - let kind = AstKind::JSXMemberExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_jsx_member_expression_object(&expr.object); - self.visit_jsx_identifier(&expr.property); - self.leave_node(kind); + pub fn walk_jsx_member_expression<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &JSXMemberExpression<'a>, + ) { + let kind = AstKind::JSXMemberExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_jsx_member_expression_object(&expr.object); + visitor.visit_jsx_identifier(&expr.property); + visitor.leave_node(kind); } - fn visit_jsx_member_expression_object(&mut self, expr: &JSXMemberExpressionObject<'a>) { - let kind = AstKind::JSXMemberExpressionObject(self.alloc(expr)); - self.enter_node(kind); + pub fn walk_jsx_member_expression_object<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &JSXMemberExpressionObject<'a>, + ) { + let kind = AstKind::JSXMemberExpressionObject(visitor.alloc(expr)); + visitor.enter_node(kind); match expr { - JSXMemberExpressionObject::Identifier(ident) => self.visit_jsx_identifier(ident), + JSXMemberExpressionObject::Identifier(ident) => visitor.visit_jsx_identifier(ident), JSXMemberExpressionObject::MemberExpression(expr) => { - self.visit_jsx_member_expression(expr); + visitor.visit_jsx_member_expression(expr); } } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_jsx_namespaced_name(&mut self, name: &JSXNamespacedName<'a>) { - let kind = AstKind::JSXNamespacedName(self.alloc(name)); - self.enter_node(kind); - self.visit_jsx_identifier(&name.namespace); - self.visit_jsx_identifier(&name.property); - self.leave_node(kind); + pub fn walk_jsx_namespaced_name<'a, V: Visit<'a>>( + visitor: &mut V, + name: &JSXNamespacedName<'a>, + ) { + let kind = AstKind::JSXNamespacedName(visitor.alloc(name)); + visitor.enter_node(kind); + visitor.visit_jsx_identifier(&name.namespace); + visitor.visit_jsx_identifier(&name.property); + visitor.leave_node(kind); } - fn visit_jsx_attribute_item(&mut self, item: &JSXAttributeItem<'a>) { - let kind = AstKind::JSXAttributeItem(self.alloc(item)); - self.enter_node(kind); + pub fn walk_jsx_attribute_item<'a, V: Visit<'a>>(visitor: &mut V, item: &JSXAttributeItem<'a>) { + let kind = AstKind::JSXAttributeItem(visitor.alloc(item)); + visitor.enter_node(kind); match &item { - JSXAttributeItem::Attribute(attribute) => self.visit_jsx_attribute(attribute), + JSXAttributeItem::Attribute(attribute) => visitor.visit_jsx_attribute(attribute), JSXAttributeItem::SpreadAttribute(attribute) => { - self.visit_jsx_spread_attribute(attribute); + visitor.visit_jsx_spread_attribute(attribute); } } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_jsx_attribute(&mut self, attribute: &JSXAttribute<'a>) { + pub fn walk_jsx_attribute<'a, V: Visit<'a>>(visitor: &mut V, attribute: &JSXAttribute<'a>) { if let Some(value) = &attribute.value { - self.visit_jsx_attribute_value(value); + visitor.visit_jsx_attribute_value(value); } } - fn visit_jsx_spread_attribute(&mut self, attribute: &JSXSpreadAttribute<'a>) { - self.visit_expression(&attribute.argument); + pub fn walk_jsx_spread_attribute<'a, V: Visit<'a>>( + visitor: &mut V, + attribute: &JSXSpreadAttribute<'a>, + ) { + visitor.visit_expression(&attribute.argument); } - fn visit_jsx_attribute_value(&mut self, value: &JSXAttributeValue<'a>) { + pub fn walk_jsx_attribute_value<'a, V: Visit<'a>>( + visitor: &mut V, + value: &JSXAttributeValue<'a>, + ) { match value { JSXAttributeValue::ExpressionContainer(expr) => { - self.visit_jsx_expression_container(expr); + visitor.visit_jsx_expression_container(expr); } - JSXAttributeValue::Element(elem) => self.visit_jsx_element(elem), - JSXAttributeValue::Fragment(elem) => self.visit_jsx_fragment(elem), - JSXAttributeValue::StringLiteral(lit) => self.visit_string_literal(lit), + JSXAttributeValue::Element(elem) => visitor.visit_jsx_element(elem), + JSXAttributeValue::Fragment(elem) => visitor.visit_jsx_fragment(elem), + JSXAttributeValue::StringLiteral(lit) => visitor.visit_string_literal(lit), } } - fn visit_jsx_expression_container(&mut self, expr: &JSXExpressionContainer<'a>) { - let kind = AstKind::JSXExpressionContainer(self.alloc(expr)); - self.enter_node(kind); - self.visit_jsx_expression(&expr.expression); - self.leave_node(kind); + pub fn walk_jsx_expression_container<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &JSXExpressionContainer<'a>, + ) { + let kind = AstKind::JSXExpressionContainer(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_jsx_expression(&expr.expression); + visitor.leave_node(kind); } - fn visit_jsx_expression(&mut self, expr: &JSXExpression<'a>) { + pub fn walk_jsx_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &JSXExpression<'a>) { match expr { - JSXExpression::Expression(expr) => self.visit_expression(expr), + JSXExpression::Expression(expr) => visitor.visit_expression(expr), JSXExpression::EmptyExpression(_) => {} } } - fn visit_jsx_fragment(&mut self, elem: &JSXFragment<'a>) { - let kind = AstKind::JSXFragment(self.alloc(elem)); - self.enter_node(kind); + pub fn walk_jsx_fragment<'a, V: Visit<'a>>(visitor: &mut V, elem: &JSXFragment<'a>) { + let kind = AstKind::JSXFragment(visitor.alloc(elem)); + visitor.enter_node(kind); for child in &elem.children { - self.visit_jsx_child(child); + visitor.visit_jsx_child(child); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_jsx_child(&mut self, child: &JSXChild<'a>) { + pub fn walk_jsx_child<'a, V: Visit<'a>>(visitor: &mut V, child: &JSXChild<'a>) { match child { - JSXChild::Element(elem) => self.visit_jsx_element(elem), - JSXChild::Fragment(elem) => self.visit_jsx_fragment(elem), - JSXChild::ExpressionContainer(expr) => self.visit_jsx_expression_container(expr), - JSXChild::Spread(expr) => self.visit_jsx_spread_child(expr), - JSXChild::Text(expr) => self.visit_jsx_text(expr), + JSXChild::Element(elem) => visitor.visit_jsx_element(elem), + JSXChild::Fragment(elem) => visitor.visit_jsx_fragment(elem), + JSXChild::ExpressionContainer(expr) => visitor.visit_jsx_expression_container(expr), + JSXChild::Spread(expr) => visitor.visit_jsx_spread_child(expr), + JSXChild::Text(expr) => visitor.visit_jsx_text(expr), } } - fn visit_jsx_spread_child(&mut self, child: &JSXSpreadChild<'a>) { - self.visit_expression(&child.expression); + pub fn walk_jsx_spread_child<'a, V: Visit<'a>>(visitor: &mut V, child: &JSXSpreadChild<'a>) { + visitor.visit_expression(&child.expression); } - fn visit_jsx_text(&mut self, child: &JSXText<'a>) { - let kind = AstKind::JSXText(self.alloc(child)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_jsx_text<'a, V: Visit<'a>>(visitor: &mut V, child: &JSXText<'a>) { + let kind = AstKind::JSXText(visitor.alloc(child)); + visitor.enter_node(kind); + visitor.leave_node(kind); } /* ---------- Pattern ---------- */ - fn visit_binding_pattern(&mut self, pat: &BindingPattern<'a>) { + pub fn walk_binding_pattern<'a, V: Visit<'a>>(visitor: &mut V, pat: &BindingPattern<'a>) { match &pat.kind { BindingPatternKind::BindingIdentifier(ident) => { - self.visit_binding_identifier(ident); + visitor.visit_binding_identifier(ident); } - BindingPatternKind::ObjectPattern(pat) => self.visit_object_pattern(pat), - BindingPatternKind::ArrayPattern(pat) => self.visit_array_pattern(pat), - BindingPatternKind::AssignmentPattern(pat) => self.visit_assignment_pattern(pat), + BindingPatternKind::ObjectPattern(pat) => visitor.visit_object_pattern(pat), + BindingPatternKind::ArrayPattern(pat) => visitor.visit_array_pattern(pat), + BindingPatternKind::AssignmentPattern(pat) => visitor.visit_assignment_pattern(pat), } if let Some(type_annotation) = &pat.type_annotation { - self.visit_ts_type_annotation(type_annotation); + visitor.visit_ts_type_annotation(type_annotation); } } - fn visit_binding_identifier(&mut self, ident: &BindingIdentifier<'a>) { - let kind = AstKind::BindingIdentifier(self.alloc(ident)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_binding_identifier<'a, V: Visit<'a>>( + visitor: &mut V, + ident: &BindingIdentifier<'a>, + ) { + let kind = AstKind::BindingIdentifier(visitor.alloc(ident)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_object_pattern(&mut self, pat: &ObjectPattern<'a>) { - let kind = AstKind::ObjectPattern(self.alloc(pat)); - self.enter_node(kind); + pub fn walk_object_pattern<'a, V: Visit<'a>>(visitor: &mut V, pat: &ObjectPattern<'a>) { + let kind = AstKind::ObjectPattern(visitor.alloc(pat)); + visitor.enter_node(kind); for prop in &pat.properties { - self.visit_binding_property(prop); + visitor.visit_binding_property(prop); } if let Some(rest) = &pat.rest { - self.visit_rest_element(rest); + visitor.visit_rest_element(rest); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_binding_property(&mut self, prop: &BindingProperty<'a>) { - self.visit_property_key(&prop.key); - self.visit_binding_pattern(&prop.value); + pub fn walk_binding_property<'a, V: Visit<'a>>(visitor: &mut V, prop: &BindingProperty<'a>) { + visitor.visit_property_key(&prop.key); + visitor.visit_binding_pattern(&prop.value); } - fn visit_array_pattern(&mut self, pat: &ArrayPattern<'a>) { - let kind = AstKind::ArrayPattern(self.alloc(pat)); - self.enter_node(kind); + pub fn walk_array_pattern<'a, V: Visit<'a>>(visitor: &mut V, pat: &ArrayPattern<'a>) { + let kind = AstKind::ArrayPattern(visitor.alloc(pat)); + visitor.enter_node(kind); for pat in pat.elements.iter().flatten() { - self.visit_binding_pattern(pat); + visitor.visit_binding_pattern(pat); } if let Some(rest) = &pat.rest { - self.visit_rest_element(rest); + visitor.visit_rest_element(rest); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_rest_element(&mut self, pat: &BindingRestElement<'a>) { - let kind = AstKind::BindingRestElement(self.alloc(pat)); - self.enter_node(kind); - self.visit_binding_pattern(&pat.argument); - self.leave_node(kind); + pub fn walk_rest_element<'a, V: Visit<'a>>(visitor: &mut V, pat: &BindingRestElement<'a>) { + let kind = AstKind::BindingRestElement(visitor.alloc(pat)); + visitor.enter_node(kind); + visitor.visit_binding_pattern(&pat.argument); + visitor.leave_node(kind); } - fn visit_assignment_pattern(&mut self, pat: &AssignmentPattern<'a>) { - let kind = AstKind::AssignmentPattern(self.alloc(pat)); - self.enter_node(kind); - self.visit_binding_pattern(&pat.left); - self.visit_expression(&pat.right); - self.leave_node(kind); + pub fn walk_assignment_pattern<'a, V: Visit<'a>>(visitor: &mut V, pat: &AssignmentPattern<'a>) { + let kind = AstKind::AssignmentPattern(visitor.alloc(pat)); + visitor.enter_node(kind); + visitor.visit_binding_pattern(&pat.left); + visitor.visit_expression(&pat.right); + visitor.leave_node(kind); } /* ---------- Identifier ---------- */ - fn visit_identifier_reference(&mut self, ident: &IdentifierReference<'a>) { - let kind = AstKind::IdentifierReference(self.alloc(ident)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_identifier_reference<'a, V: Visit<'a>>( + visitor: &mut V, + ident: &IdentifierReference<'a>, + ) { + let kind = AstKind::IdentifierReference(visitor.alloc(ident)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_private_identifier(&mut self, ident: &PrivateIdentifier<'a>) { - let kind = AstKind::PrivateIdentifier(self.alloc(ident)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_private_identifier<'a, V: Visit<'a>>( + visitor: &mut V, + ident: &PrivateIdentifier<'a>, + ) { + let kind = AstKind::PrivateIdentifier(visitor.alloc(ident)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_label_identifier(&mut self, ident: &LabelIdentifier<'a>) { - let kind = AstKind::LabelIdentifier(self.alloc(ident)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_label_identifier<'a, V: Visit<'a>>(visitor: &mut V, ident: &LabelIdentifier<'a>) { + let kind = AstKind::LabelIdentifier(visitor.alloc(ident)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_identifier_name(&mut self, ident: &IdentifierName<'a>) { - let kind = AstKind::IdentifierName(self.alloc(ident)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_identifier_name<'a, V: Visit<'a>>(visitor: &mut V, ident: &IdentifierName<'a>) { + let kind = AstKind::IdentifierName(visitor.alloc(ident)); + visitor.enter_node(kind); + visitor.leave_node(kind); } /* ---------- Literal ---------- */ - fn visit_number_literal(&mut self, lit: &NumericLiteral<'a>) { - let kind = AstKind::NumericLiteral(self.alloc(lit)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_number_literal<'a, V: Visit<'a>>(visitor: &mut V, lit: &NumericLiteral<'a>) { + let kind = AstKind::NumericLiteral(visitor.alloc(lit)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_boolean_literal(&mut self, lit: &BooleanLiteral) { - let kind = AstKind::BooleanLiteral(self.alloc(lit)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_boolean_literal<'a, V: Visit<'a>>(visitor: &mut V, lit: &BooleanLiteral) { + let kind = AstKind::BooleanLiteral(visitor.alloc(lit)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_null_literal(&mut self, lit: &NullLiteral) { - let kind = AstKind::NullLiteral(self.alloc(lit)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_null_literal<'a, V: Visit<'a>>(visitor: &mut V, lit: &NullLiteral) { + let kind = AstKind::NullLiteral(visitor.alloc(lit)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_bigint_literal(&mut self, lit: &BigIntLiteral<'a>) { - let kind = AstKind::BigintLiteral(self.alloc(lit)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_bigint_literal<'a, V: Visit<'a>>(visitor: &mut V, lit: &BigIntLiteral<'a>) { + let kind = AstKind::BigintLiteral(visitor.alloc(lit)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_string_literal(&mut self, lit: &StringLiteral<'a>) { - let kind = AstKind::StringLiteral(self.alloc(lit)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_string_literal<'a, V: Visit<'a>>(visitor: &mut V, lit: &StringLiteral<'a>) { + let kind = AstKind::StringLiteral(visitor.alloc(lit)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_template_literal(&mut self, lit: &TemplateLiteral<'a>) { - let kind = AstKind::TemplateLiteral(self.alloc(lit)); - self.enter_node(kind); + pub fn walk_template_literal<'a, V: Visit<'a>>(visitor: &mut V, lit: &TemplateLiteral<'a>) { + let kind = AstKind::TemplateLiteral(visitor.alloc(lit)); + visitor.enter_node(kind); for elem in &lit.quasis { - self.visit_template_element(elem); + visitor.visit_template_element(elem); } for expr in &lit.expressions { - self.visit_expression(expr); + visitor.visit_expression(expr); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_reg_expr_literal(&mut self, lit: &RegExpLiteral<'a>) { - let kind = AstKind::RegExpLiteral(self.alloc(lit)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_reg_expr_literal<'a, V: Visit<'a>>(visitor: &mut V, lit: &RegExpLiteral<'a>) { + let kind = AstKind::RegExpLiteral(visitor.alloc(lit)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_template_element(&mut self, _elem: &TemplateElement) {} + pub fn walk_template_element<'a, V: Visit<'a>>(_visitor: &mut V, _elem: &TemplateElement) {} /* ---------- Module ---------- */ - fn visit_module_declaration(&mut self, decl: &ModuleDeclaration<'a>) { - let kind = AstKind::ModuleDeclaration(self.alloc(decl)); - self.enter_node(kind); + pub fn walk_module_declaration<'a, V: Visit<'a>>( + visitor: &mut V, + decl: &ModuleDeclaration<'a>, + ) { + let kind = AstKind::ModuleDeclaration(visitor.alloc(decl)); + visitor.enter_node(kind); match decl { ModuleDeclaration::ImportDeclaration(decl) => { - self.visit_import_declaration(decl); + visitor.visit_import_declaration(decl); } ModuleDeclaration::ExportAllDeclaration(decl) => { - self.visit_export_all_declaration(decl); + visitor.visit_export_all_declaration(decl); } ModuleDeclaration::ExportDefaultDeclaration(decl) => { - self.visit_export_default_declaration(decl); + visitor.visit_export_default_declaration(decl); } ModuleDeclaration::ExportNamedDeclaration(decl) => { - self.visit_export_named_declaration(decl); + visitor.visit_export_named_declaration(decl); } ModuleDeclaration::TSExportAssignment(decl) => { - self.visit_expression(&decl.expression); + visitor.visit_expression(&decl.expression); } ModuleDeclaration::TSNamespaceExportDeclaration(_) => {} } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_import_declaration(&mut self, decl: &ImportDeclaration<'a>) { - let kind = AstKind::ImportDeclaration(self.alloc(decl)); - self.enter_node(kind); + pub fn walk_import_declaration<'a, V: Visit<'a>>( + visitor: &mut V, + decl: &ImportDeclaration<'a>, + ) { + let kind = AstKind::ImportDeclaration(visitor.alloc(decl)); + visitor.enter_node(kind); if let Some(specifiers) = &decl.specifiers { for specifier in specifiers { - self.visit_import_declaration_specifier(specifier); + visitor.visit_import_declaration_specifier(specifier); } } - self.visit_string_literal(&decl.source); + visitor.visit_string_literal(&decl.source); if let Some(with_clause) = &decl.with_clause { - self.visit_with_clause(with_clause); + visitor.visit_with_clause(with_clause); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_with_clause(&mut self, with_clause: &WithClause<'a>) { + pub fn walk_with_clause<'a, V: Visit<'a>>(visitor: &mut V, with_clause: &WithClause<'a>) { for attribute in &with_clause.with_entries { - self.visit_import_attribute(attribute); + visitor.visit_import_attribute(attribute); } } - fn visit_import_attribute(&mut self, attribute: &ImportAttribute<'a>) { - self.visit_import_attribute_key(&attribute.key); - self.visit_string_literal(&attribute.value); + pub fn walk_import_attribute<'a, V: Visit<'a>>( + visitor: &mut V, + attribute: &ImportAttribute<'a>, + ) { + visitor.visit_import_attribute_key(&attribute.key); + visitor.visit_string_literal(&attribute.value); } - fn visit_import_attribute_key(&mut self, key: &ImportAttributeKey<'a>) { + pub fn walk_import_attribute_key<'a, V: Visit<'a>>( + visitor: &mut V, + key: &ImportAttributeKey<'a>, + ) { match key { - ImportAttributeKey::Identifier(ident) => self.visit_identifier_name(ident), - ImportAttributeKey::StringLiteral(ident) => self.visit_string_literal(ident), + ImportAttributeKey::Identifier(ident) => visitor.visit_identifier_name(ident), + ImportAttributeKey::StringLiteral(ident) => visitor.visit_string_literal(ident), } } - fn visit_import_declaration_specifier(&mut self, specifier: &ImportDeclarationSpecifier<'a>) { + pub fn walk_import_declaration_specifier<'a, V: Visit<'a>>( + visitor: &mut V, + specifier: &ImportDeclarationSpecifier<'a>, + ) { match &specifier { ImportDeclarationSpecifier::ImportSpecifier(specifier) => { - self.visit_import_specifier(specifier); + visitor.visit_import_specifier(specifier); } ImportDeclarationSpecifier::ImportDefaultSpecifier(specifier) => { - self.visit_import_default_specifier(specifier); + visitor.visit_import_default_specifier(specifier); } ImportDeclarationSpecifier::ImportNamespaceSpecifier(specifier) => { - self.visit_import_name_specifier(specifier); + visitor.visit_import_name_specifier(specifier); } } } - fn visit_import_specifier(&mut self, specifier: &ImportSpecifier<'a>) { - let kind = AstKind::ImportSpecifier(self.alloc(specifier)); - self.enter_node(kind); + pub fn walk_import_specifier<'a, V: Visit<'a>>( + visitor: &mut V, + specifier: &ImportSpecifier<'a>, + ) { + let kind = AstKind::ImportSpecifier(visitor.alloc(specifier)); + visitor.enter_node(kind); // TODO: imported - self.visit_binding_identifier(&specifier.local); - self.leave_node(kind); + visitor.visit_binding_identifier(&specifier.local); + visitor.leave_node(kind); } - fn visit_import_default_specifier(&mut self, specifier: &ImportDefaultSpecifier<'a>) { - let kind = AstKind::ImportDefaultSpecifier(self.alloc(specifier)); - self.enter_node(kind); - self.visit_binding_identifier(&specifier.local); - self.leave_node(kind); + pub fn walk_import_default_specifier<'a, V: Visit<'a>>( + visitor: &mut V, + specifier: &ImportDefaultSpecifier<'a>, + ) { + let kind = AstKind::ImportDefaultSpecifier(visitor.alloc(specifier)); + visitor.enter_node(kind); + visitor.visit_binding_identifier(&specifier.local); + visitor.leave_node(kind); } - fn visit_import_name_specifier(&mut self, specifier: &ImportNamespaceSpecifier<'a>) { - let kind = AstKind::ImportNamespaceSpecifier(self.alloc(specifier)); - self.enter_node(kind); - self.visit_binding_identifier(&specifier.local); - self.leave_node(kind); + pub fn walk_import_name_specifier<'a, V: Visit<'a>>( + visitor: &mut V, + specifier: &ImportNamespaceSpecifier<'a>, + ) { + let kind = AstKind::ImportNamespaceSpecifier(visitor.alloc(specifier)); + visitor.enter_node(kind); + visitor.visit_binding_identifier(&specifier.local); + visitor.leave_node(kind); } - fn visit_export_all_declaration(&mut self, decl: &ExportAllDeclaration<'a>) { - let kind = AstKind::ExportAllDeclaration(self.alloc(decl)); - self.enter_node(kind); - self.visit_string_literal(&decl.source); - self.leave_node(kind); + pub fn walk_export_all_declaration<'a, V: Visit<'a>>( + visitor: &mut V, + decl: &ExportAllDeclaration<'a>, + ) { + let kind = AstKind::ExportAllDeclaration(visitor.alloc(decl)); + visitor.enter_node(kind); + visitor.visit_string_literal(&decl.source); + visitor.leave_node(kind); } - fn visit_export_default_declaration(&mut self, decl: &ExportDefaultDeclaration<'a>) { - let kind = AstKind::ExportDefaultDeclaration(self.alloc(decl)); - self.enter_node(kind); + pub fn walk_export_default_declaration<'a, V: Visit<'a>>( + visitor: &mut V, + decl: &ExportDefaultDeclaration<'a>, + ) { + let kind = AstKind::ExportDefaultDeclaration(visitor.alloc(decl)); + visitor.enter_node(kind); match &decl.declaration { - ExportDefaultDeclarationKind::Expression(expr) => self.visit_expression(expr), + ExportDefaultDeclarationKind::Expression(expr) => visitor.visit_expression(expr), ExportDefaultDeclarationKind::FunctionDeclaration(func) => { - self.visit_function(func, None); + visitor.visit_function(func, None); } - ExportDefaultDeclarationKind::ClassDeclaration(class) => self.visit_class(class), + ExportDefaultDeclarationKind::ClassDeclaration(class) => visitor.visit_class(class), _ => {} } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_export_named_declaration(&mut self, decl: &ExportNamedDeclaration<'a>) { - let kind = AstKind::ExportNamedDeclaration(self.alloc(decl)); - self.enter_node(kind); + pub fn walk_export_named_declaration<'a, V: Visit<'a>>( + visitor: &mut V, + decl: &ExportNamedDeclaration<'a>, + ) { + let kind = AstKind::ExportNamedDeclaration(visitor.alloc(decl)); + visitor.enter_node(kind); if let Some(decl) = &decl.declaration { - self.visit_declaration(decl); + visitor.visit_declaration(decl); } if let Some(ref source) = decl.source { - self.visit_string_literal(source); + visitor.visit_string_literal(source); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_enum_member(&mut self, member: &TSEnumMember<'a>) { - let kind = AstKind::TSEnumMember(self.alloc(member)); - self.enter_node(kind); + pub fn walk_enum_member<'a, V: Visit<'a>>(visitor: &mut V, member: &TSEnumMember<'a>) { + let kind = AstKind::TSEnumMember(visitor.alloc(member)); + visitor.enter_node(kind); if let Some(initializer) = &member.initializer { - self.visit_expression(initializer); + visitor.visit_expression(initializer); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_enum(&mut self, decl: &TSEnumDeclaration<'a>) { - let kind = AstKind::TSEnumDeclaration(self.alloc(decl)); - self.enter_node(kind); - self.visit_binding_identifier(&decl.id); - self.enter_scope(ScopeFlags::empty()); + pub fn walk_enum<'a, V: Visit<'a>>(visitor: &mut V, decl: &TSEnumDeclaration<'a>) { + let kind = AstKind::TSEnumDeclaration(visitor.alloc(decl)); + visitor.enter_node(kind); + visitor.visit_binding_identifier(&decl.id); + visitor.enter_scope(ScopeFlags::empty()); for member in &decl.members { - self.visit_enum_member(member); + visitor.visit_enum_member(member); } - self.leave_scope(); - self.leave_node(kind); + visitor.leave_scope(); + visitor.leave_node(kind); } - fn visit_declaration(&mut self, decl: &Declaration<'a>) { + pub fn walk_declaration<'a, V: Visit<'a>>(visitor: &mut V, decl: &Declaration<'a>) { match decl { - Declaration::VariableDeclaration(decl) => self.visit_variable_declaration(decl), - Declaration::FunctionDeclaration(func) => self.visit_function(func, None), + Declaration::VariableDeclaration(decl) => visitor.visit_variable_declaration(decl), + Declaration::FunctionDeclaration(func) => visitor.visit_function(func, None), Declaration::ClassDeclaration(class) => { debug_assert_eq!(class.r#type, ClassType::ClassDeclaration); - self.visit_class(class); + visitor.visit_class(class); } - Declaration::UsingDeclaration(decl) => self.visit_using_declaration(decl), + Declaration::UsingDeclaration(decl) => visitor.visit_using_declaration(decl), Declaration::TSModuleDeclaration(module) => { - self.visit_ts_module_declaration(module); + visitor.visit_ts_module_declaration(module); } Declaration::TSTypeAliasDeclaration(decl) => { - self.visit_ts_type_alias_declaration(decl); + visitor.visit_ts_type_alias_declaration(decl); } - Declaration::TSEnumDeclaration(decl) => self.visit_enum(decl), + Declaration::TSEnumDeclaration(decl) => visitor.visit_enum(decl), Declaration::TSImportEqualsDeclaration(decl) => { - self.visit_ts_import_equals_declaration(decl); + visitor.visit_ts_import_equals_declaration(decl); } Declaration::TSInterfaceDeclaration(decl) => { - self.visit_ts_interface_declaration(decl); + visitor.visit_ts_interface_declaration(decl); } } } - fn visit_ts_import_equals_declaration(&mut self, decl: &TSImportEqualsDeclaration<'a>) { - let kind = AstKind::TSImportEqualsDeclaration(self.alloc(decl)); - self.enter_node(kind); - self.visit_binding_identifier(&decl.id); - self.visit_ts_module_reference(&decl.module_reference); - self.leave_node(kind); + /* ---------- TypeScript ---------- */ + + pub fn walk_ts_import_equals_declaration<'a, V: Visit<'a>>( + visitor: &mut V, + decl: &TSImportEqualsDeclaration<'a>, + ) { + let kind = AstKind::TSImportEqualsDeclaration(visitor.alloc(decl)); + visitor.enter_node(kind); + visitor.visit_binding_identifier(&decl.id); + visitor.visit_ts_module_reference(&decl.module_reference); + visitor.leave_node(kind); } - fn visit_ts_module_reference(&mut self, reference: &TSModuleReference<'a>) { + pub fn walk_ts_module_reference<'a, V: Visit<'a>>( + visitor: &mut V, + reference: &TSModuleReference<'a>, + ) { match reference { - TSModuleReference::TypeName(name) => self.visit_ts_type_name(name), + TSModuleReference::TypeName(name) => visitor.visit_ts_type_name(name), TSModuleReference::ExternalModuleReference(reference) => { - self.visit_ts_external_module_reference(reference); + visitor.visit_ts_external_module_reference(reference); } } } - fn visit_ts_type_name(&mut self, name: &TSTypeName<'a>) { - let kind = AstKind::TSTypeName(self.alloc(name)); - self.enter_node(kind); + pub fn walk_ts_type_name<'a, V: Visit<'a>>(visitor: &mut V, name: &TSTypeName<'a>) { + let kind = AstKind::TSTypeName(visitor.alloc(name)); + visitor.enter_node(kind); match &name { - TSTypeName::IdentifierReference(ident) => self.visit_identifier_reference(ident), - TSTypeName::QualifiedName(name) => self.visit_ts_qualified_name(name), + TSTypeName::IdentifierReference(ident) => visitor.visit_identifier_reference(ident), + TSTypeName::QualifiedName(name) => visitor.visit_ts_qualified_name(name), } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_ts_external_module_reference(&mut self, reference: &TSExternalModuleReference<'a>) { - let kind = AstKind::TSExternalModuleReference(self.alloc(reference)); - self.enter_node(kind); - self.visit_string_literal(&reference.expression); - self.leave_node(kind); + pub fn walk_ts_external_module_reference<'a, V: Visit<'a>>( + visitor: &mut V, + reference: &TSExternalModuleReference<'a>, + ) { + let kind = AstKind::TSExternalModuleReference(visitor.alloc(reference)); + visitor.enter_node(kind); + visitor.visit_string_literal(&reference.expression); + visitor.leave_node(kind); } - fn visit_ts_qualified_name(&mut self, name: &TSQualifiedName<'a>) { - let kind = AstKind::TSQualifiedName(self.alloc(name)); - self.enter_node(kind); - self.visit_ts_type_name(&name.left); - self.visit_identifier_name(&name.right); - self.leave_node(kind); + pub fn walk_ts_qualified_name<'a, V: Visit<'a>>(visitor: &mut V, name: &TSQualifiedName<'a>) { + let kind = AstKind::TSQualifiedName(visitor.alloc(name)); + visitor.enter_node(kind); + visitor.visit_ts_type_name(&name.left); + visitor.visit_identifier_name(&name.right); + visitor.leave_node(kind); } - fn visit_ts_module_declaration(&mut self, decl: &TSModuleDeclaration<'a>) { - let kind = AstKind::TSModuleDeclaration(self.alloc(decl)); - self.enter_node(kind); + pub fn walk_ts_module_declaration<'a, V: Visit<'a>>( + visitor: &mut V, + decl: &TSModuleDeclaration<'a>, + ) { + let kind = AstKind::TSModuleDeclaration(visitor.alloc(decl)); + visitor.enter_node(kind); match &decl.id { - TSModuleDeclarationName::Identifier(ident) => self.visit_identifier_name(ident), - TSModuleDeclarationName::StringLiteral(lit) => self.visit_string_literal(lit), + TSModuleDeclarationName::Identifier(ident) => visitor.visit_identifier_name(ident), + TSModuleDeclarationName::StringLiteral(lit) => visitor.visit_string_literal(lit), } match &decl.body { TSModuleDeclarationBody::TSModuleDeclaration(decl) => { - self.visit_ts_module_declaration(decl); + visitor.visit_ts_module_declaration(decl); } - TSModuleDeclarationBody::TSModuleBlock(block) => self.visit_ts_module_block(block), + TSModuleDeclarationBody::TSModuleBlock(block) => visitor.visit_ts_module_block(block), } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_ts_module_block(&mut self, block: &TSModuleBlock<'a>) { - let kind = AstKind::TSModuleBlock(self.alloc(block)); - self.enter_scope(ScopeFlags::TsModuleBlock); - self.enter_node(kind); - self.visit_statements(&block.body); - self.leave_node(kind); - self.leave_scope(); + pub fn walk_ts_module_block<'a, V: Visit<'a>>(visitor: &mut V, block: &TSModuleBlock<'a>) { + let kind = AstKind::TSModuleBlock(visitor.alloc(block)); + visitor.enter_scope(ScopeFlags::TsModuleBlock); + visitor.enter_node(kind); + visitor.visit_statements(&block.body); + visitor.leave_node(kind); + visitor.leave_scope(); } - fn visit_ts_type_alias_declaration(&mut self, decl: &TSTypeAliasDeclaration<'a>) { - let kind = AstKind::TSTypeAliasDeclaration(self.alloc(decl)); - self.enter_node(kind); - self.visit_binding_identifier(&decl.id); + pub fn walk_ts_type_alias_declaration<'a, V: Visit<'a>>( + visitor: &mut V, + decl: &TSTypeAliasDeclaration<'a>, + ) { + let kind = AstKind::TSTypeAliasDeclaration(visitor.alloc(decl)); + visitor.enter_node(kind); + visitor.visit_binding_identifier(&decl.id); if let Some(parameters) = &decl.type_parameters { - self.visit_ts_type_parameter_declaration(parameters); + visitor.visit_ts_type_parameter_declaration(parameters); } - self.visit_ts_type(&decl.type_annotation); - self.leave_node(kind); + visitor.visit_ts_type(&decl.type_annotation); + visitor.leave_node(kind); } - fn visit_ts_interface_declaration(&mut self, decl: &TSInterfaceDeclaration<'a>) { - let kind = AstKind::TSInterfaceDeclaration(self.alloc(decl)); - self.enter_node(kind); - self.visit_binding_identifier(&decl.id); + pub fn walk_ts_interface_declaration<'a, V: Visit<'a>>( + visitor: &mut V, + decl: &TSInterfaceDeclaration<'a>, + ) { + let kind = AstKind::TSInterfaceDeclaration(visitor.alloc(decl)); + visitor.enter_node(kind); + visitor.visit_binding_identifier(&decl.id); if let Some(parameters) = &decl.type_parameters { - self.visit_ts_type_parameter_declaration(parameters); + visitor.visit_ts_type_parameter_declaration(parameters); } for signature in &decl.body.body { - self.visit_ts_signature(signature); + visitor.visit_ts_signature(signature); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_ts_as_expression(&mut self, expr: &TSAsExpression<'a>) { - let kind = AstKind::TSAsExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_expression(&expr.expression); - self.visit_ts_type(&expr.type_annotation); - self.leave_node(kind); + pub fn walk_ts_as_expression<'a, V: Visit<'a>>(visitor: &mut V, expr: &TSAsExpression<'a>) { + let kind = AstKind::TSAsExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_expression(&expr.expression); + visitor.visit_ts_type(&expr.type_annotation); + visitor.leave_node(kind); } - fn visit_ts_satisfies_expression(&mut self, expr: &TSSatisfiesExpression<'a>) { - let kind = AstKind::TSSatisfiesExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_expression(&expr.expression); - self.visit_ts_type(&expr.type_annotation); - self.leave_node(kind); + pub fn walk_ts_satisfies_expression<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &TSSatisfiesExpression<'a>, + ) { + let kind = AstKind::TSSatisfiesExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_expression(&expr.expression); + visitor.visit_ts_type(&expr.type_annotation); + visitor.leave_node(kind); } - fn visit_ts_non_null_expression(&mut self, expr: &TSNonNullExpression<'a>) { - let kind = AstKind::TSNonNullExpression(self.alloc(expr)); - self.enter_node(kind); - self.visit_expression(&expr.expression); - self.leave_node(kind); + pub fn walk_ts_non_null_expression<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &TSNonNullExpression<'a>, + ) { + let kind = AstKind::TSNonNullExpression(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_expression(&expr.expression); + visitor.leave_node(kind); } - fn visit_ts_type_assertion(&mut self, expr: &TSTypeAssertion<'a>) { - let kind = AstKind::TSTypeAssertion(self.alloc(expr)); - self.enter_node(kind); - self.visit_expression(&expr.expression); - self.visit_ts_type(&expr.type_annotation); - self.leave_node(kind); + pub fn walk_ts_type_assertion<'a, V: Visit<'a>>(visitor: &mut V, expr: &TSTypeAssertion<'a>) { + let kind = AstKind::TSTypeAssertion(visitor.alloc(expr)); + visitor.enter_node(kind); + visitor.visit_expression(&expr.expression); + visitor.visit_ts_type(&expr.type_annotation); + visitor.leave_node(kind); } - fn visit_ts_instantiation_expression(&mut self, expr: &TSInstantiationExpression<'a>) { - self.visit_expression(&expr.expression); - self.visit_ts_type_parameter_instantiation(&expr.type_parameters); + pub fn walk_ts_instantiation_expression<'a, V: Visit<'a>>( + visitor: &mut V, + expr: &TSInstantiationExpression<'a>, + ) { + visitor.visit_expression(&expr.expression); + visitor.visit_ts_type_parameter_instantiation(&expr.type_parameters); } - fn visit_ts_type_annotation(&mut self, annotation: &TSTypeAnnotation<'a>) { - let kind = AstKind::TSTypeAnnotation(self.alloc(annotation)); - self.enter_node(kind); - self.visit_ts_type(&annotation.type_annotation); - self.leave_node(kind); + pub fn walk_ts_type_annotation<'a, V: Visit<'a>>( + visitor: &mut V, + annotation: &TSTypeAnnotation<'a>, + ) { + let kind = AstKind::TSTypeAnnotation(visitor.alloc(annotation)); + visitor.enter_node(kind); + visitor.visit_ts_type(&annotation.type_annotation); + visitor.leave_node(kind); } - fn visit_ts_type(&mut self, ty: &TSType<'a>) { + pub fn walk_ts_type<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSType<'a>) { match ty { - TSType::TSAnyKeyword(ty) => self.visit_ts_any_keyword(ty), - TSType::TSNullKeyword(ty) => self.visit_ts_null_keyword(ty), - TSType::TSVoidKeyword(ty) => self.visit_ts_void_keyword(ty), - TSType::TSIntersectionType(ty) => self.visit_ts_intersection_type(ty), - TSType::TSTypeReference(ty) => self.visit_ts_type_reference(ty), - TSType::TSUnionType(ty) => self.visit_ts_union_type(ty), - TSType::TSLiteralType(ty) => self.visit_ts_literal_type(ty), - TSType::TSArrayType(ty) => self.visit_ts_array_type(ty), - TSType::TSConditionalType(ty) => self.visit_ts_conditional_type(ty), - TSType::TSConstructorType(ty) => self.visit_ts_constructor_type(ty), - TSType::TSFunctionType(ty) => self.visit_ts_function_type(ty), - TSType::TSMappedType(ty) => self.visit_ts_mapped_type(ty), - TSType::TSTupleType(ty) => self.visit_ts_tuple_type(ty), - TSType::TSTypeOperatorType(ty) => self.visit_ts_type_operator_type(ty), - TSType::TSTypePredicate(ty) => self.visit_ts_type_predicate(ty), - TSType::TSTypeLiteral(ty) => self.visit_ts_type_literal(ty), - TSType::TSIndexedAccessType(ty) => self.visit_ts_indexed_access_type(ty), - TSType::TSTypeQuery(ty) => self.visit_ts_type_query(ty), + TSType::TSAnyKeyword(ty) => visitor.visit_ts_any_keyword(ty), + TSType::TSNullKeyword(ty) => visitor.visit_ts_null_keyword(ty), + TSType::TSVoidKeyword(ty) => visitor.visit_ts_void_keyword(ty), + TSType::TSIntersectionType(ty) => visitor.visit_ts_intersection_type(ty), + TSType::TSTypeReference(ty) => visitor.visit_ts_type_reference(ty), + TSType::TSUnionType(ty) => visitor.visit_ts_union_type(ty), + TSType::TSLiteralType(ty) => visitor.visit_ts_literal_type(ty), + TSType::TSArrayType(ty) => visitor.visit_ts_array_type(ty), + TSType::TSConditionalType(ty) => visitor.visit_ts_conditional_type(ty), + TSType::TSConstructorType(ty) => visitor.visit_ts_constructor_type(ty), + TSType::TSFunctionType(ty) => visitor.visit_ts_function_type(ty), + TSType::TSMappedType(ty) => visitor.visit_ts_mapped_type(ty), + TSType::TSTupleType(ty) => visitor.visit_ts_tuple_type(ty), + TSType::TSTypeOperatorType(ty) => visitor.visit_ts_type_operator_type(ty), + TSType::TSTypePredicate(ty) => visitor.visit_ts_type_predicate(ty), + TSType::TSTypeLiteral(ty) => visitor.visit_ts_type_literal(ty), + TSType::TSIndexedAccessType(ty) => visitor.visit_ts_indexed_access_type(ty), + TSType::TSTypeQuery(ty) => visitor.visit_ts_type_query(ty), _ => {} } } - fn visit_ts_type_literal(&mut self, ty: &TSTypeLiteral<'a>) { - let kind = AstKind::TSTypeLiteral(self.alloc(ty)); - self.enter_node(kind); + pub fn walk_ts_type_literal<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSTypeLiteral<'a>) { + let kind = AstKind::TSTypeLiteral(visitor.alloc(ty)); + visitor.enter_node(kind); for signature in &ty.members { - self.visit_ts_signature(signature); + visitor.visit_ts_signature(signature); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_ts_indexed_access_type(&mut self, ty: &TSIndexedAccessType<'a>) { - let kind = AstKind::TSIndexedAccessType(self.alloc(ty)); - self.enter_node(kind); - self.visit_ts_type(&ty.object_type); - self.visit_ts_type(&ty.index_type); - self.leave_node(kind); + pub fn walk_ts_indexed_access_type<'a, V: Visit<'a>>( + visitor: &mut V, + ty: &TSIndexedAccessType<'a>, + ) { + let kind = AstKind::TSIndexedAccessType(visitor.alloc(ty)); + visitor.enter_node(kind); + visitor.visit_ts_type(&ty.object_type); + visitor.visit_ts_type(&ty.index_type); + visitor.leave_node(kind); } - fn visit_ts_type_predicate(&mut self, ty: &TSTypePredicate<'a>) { + pub fn walk_ts_type_predicate<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSTypePredicate<'a>) { if let Some(annotation) = &ty.type_annotation { - self.visit_ts_type_annotation(annotation); + visitor.visit_ts_type_annotation(annotation); } } - fn visit_ts_type_operator_type(&mut self, ty: &TSTypeOperator<'a>) { - self.visit_ts_type(&ty.type_annotation); + pub fn walk_ts_type_operator_type<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSTypeOperator<'a>) { + visitor.visit_ts_type(&ty.type_annotation); } - fn visit_ts_tuple_type(&mut self, ty: &TSTupleType<'a>) { + pub fn walk_ts_tuple_type<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSTupleType<'a>) { for element in &ty.element_types { - self.visit_ts_tuple_element(element); + visitor.visit_ts_tuple_element(element); } } - fn visit_ts_tuple_element(&mut self, ty: &TSTupleElement<'a>) { + pub fn walk_ts_tuple_element<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSTupleElement<'a>) { match ty { - TSTupleElement::TSType(ty) => self.visit_ts_type(ty), - TSTupleElement::TSOptionalType(ty) => self.visit_ts_type(&ty.type_annotation), - TSTupleElement::TSRestType(ty) => self.visit_ts_type(&ty.type_annotation), - TSTupleElement::TSNamedTupleMember(ty) => self.visit_ts_type(&ty.element_type), + TSTupleElement::TSType(ty) => visitor.visit_ts_type(ty), + TSTupleElement::TSOptionalType(ty) => visitor.visit_ts_type(&ty.type_annotation), + TSTupleElement::TSRestType(ty) => visitor.visit_ts_type(&ty.type_annotation), + TSTupleElement::TSNamedTupleMember(ty) => visitor.visit_ts_type(&ty.element_type), }; } - fn visit_ts_mapped_type(&mut self, ty: &TSMappedType<'a>) { - self.visit_ts_type_parameter(&ty.type_parameter); + pub fn walk_ts_mapped_type<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSMappedType<'a>) { + visitor.visit_ts_type_parameter(&ty.type_parameter); if let Some(name) = &ty.name_type { - self.visit_ts_type(name); + visitor.visit_ts_type(name); } if let Some(type_annotation) = &ty.type_annotation { - self.visit_ts_type(type_annotation); + visitor.visit_ts_type(type_annotation); } } - fn visit_ts_function_type(&mut self, ty: &TSFunctionType<'a>) { - self.visit_formal_parameters(&ty.params); + pub fn walk_ts_function_type<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSFunctionType<'a>) { + visitor.visit_formal_parameters(&ty.params); if let Some(parameters) = &ty.type_parameters { - self.visit_ts_type_parameter_declaration(parameters); + visitor.visit_ts_type_parameter_declaration(parameters); } - self.visit_ts_type_annotation(&ty.return_type); + visitor.visit_ts_type_annotation(&ty.return_type); } - fn visit_ts_type_parameter(&mut self, ty: &TSTypeParameter<'a>) { - let kind = AstKind::TSTypeParameter(self.alloc(ty)); - self.enter_scope(ScopeFlags::empty()); - self.enter_node(kind); + pub fn walk_ts_type_parameter<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSTypeParameter<'a>) { + let kind = AstKind::TSTypeParameter(visitor.alloc(ty)); + visitor.enter_scope(ScopeFlags::empty()); + visitor.enter_node(kind); if let Some(constraint) = &ty.constraint { - self.visit_ts_type(constraint); + visitor.visit_ts_type(constraint); } if let Some(default) = &ty.default { - self.visit_ts_type(default); + visitor.visit_ts_type(default); } - self.leave_node(kind); - self.leave_scope(); + visitor.leave_node(kind); + visitor.leave_scope(); } - fn visit_ts_type_parameter_instantiation(&mut self, ty: &TSTypeParameterInstantiation<'a>) { - let kind = AstKind::TSTypeParameterInstantiation(self.alloc(ty)); - self.enter_node(kind); + pub fn walk_ts_type_parameter_instantiation<'a, V: Visit<'a>>( + visitor: &mut V, + ty: &TSTypeParameterInstantiation<'a>, + ) { + let kind = AstKind::TSTypeParameterInstantiation(visitor.alloc(ty)); + visitor.enter_node(kind); for ts_parameter in &ty.params { - self.visit_ts_type(ts_parameter); + visitor.visit_ts_type(ts_parameter); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_ts_type_parameter_declaration(&mut self, ty: &TSTypeParameterDeclaration<'a>) { - let kind = AstKind::TSTypeParameterDeclaration(self.alloc(ty)); - self.enter_node(kind); + pub fn walk_ts_type_parameter_declaration<'a, V: Visit<'a>>( + visitor: &mut V, + ty: &TSTypeParameterDeclaration<'a>, + ) { + let kind = AstKind::TSTypeParameterDeclaration(visitor.alloc(ty)); + visitor.enter_node(kind); for ts_parameter in &ty.params { - self.visit_ts_type_parameter(ts_parameter); + visitor.visit_ts_type_parameter(ts_parameter); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_ts_constructor_type(&mut self, ty: &TSConstructorType<'a>) { - self.visit_formal_parameters(&ty.params); + pub fn walk_ts_constructor_type<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSConstructorType<'a>) { + visitor.visit_formal_parameters(&ty.params); if let Some(parameters) = &ty.type_parameters { - self.visit_ts_type_parameter_declaration(parameters); + visitor.visit_ts_type_parameter_declaration(parameters); } - self.visit_ts_type_annotation(&ty.return_type); + visitor.visit_ts_type_annotation(&ty.return_type); } - fn visit_ts_conditional_type(&mut self, ty: &TSConditionalType<'a>) { - self.visit_ts_type(&ty.check_type); - self.visit_ts_type(&ty.extends_type); - self.visit_ts_type(&ty.true_type); - self.visit_ts_type(&ty.false_type); + pub fn walk_ts_conditional_type<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSConditionalType<'a>) { + visitor.visit_ts_type(&ty.check_type); + visitor.visit_ts_type(&ty.extends_type); + visitor.visit_ts_type(&ty.true_type); + visitor.visit_ts_type(&ty.false_type); } - fn visit_ts_array_type(&mut self, ty: &TSArrayType<'a>) { - self.visit_ts_type(&ty.element_type); + pub fn walk_ts_array_type<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSArrayType<'a>) { + visitor.visit_ts_type(&ty.element_type); } - fn visit_ts_null_keyword(&mut self, ty: &TSNullKeyword) { - let kind = AstKind::TSNullKeyword(self.alloc(ty)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_ts_null_keyword<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSNullKeyword) { + let kind = AstKind::TSNullKeyword(visitor.alloc(ty)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_ts_any_keyword(&mut self, ty: &TSAnyKeyword) { - let kind = AstKind::TSAnyKeyword(self.alloc(ty)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_ts_any_keyword<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSAnyKeyword) { + let kind = AstKind::TSAnyKeyword(visitor.alloc(ty)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_ts_void_keyword(&mut self, ty: &TSVoidKeyword) { - let kind = AstKind::TSVoidKeyword(self.alloc(ty)); - self.enter_node(kind); - self.leave_node(kind); + pub fn walk_ts_void_keyword<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSVoidKeyword) { + let kind = AstKind::TSVoidKeyword(visitor.alloc(ty)); + visitor.enter_node(kind); + visitor.leave_node(kind); } - fn visit_ts_intersection_type(&mut self, ty: &TSIntersectionType<'a>) { - let kind = AstKind::TSIntersectionType(self.alloc(ty)); - self.enter_node(kind); + pub fn walk_ts_intersection_type<'a, V: Visit<'a>>( + visitor: &mut V, + ty: &TSIntersectionType<'a>, + ) { + let kind = AstKind::TSIntersectionType(visitor.alloc(ty)); + visitor.enter_node(kind); for ty in &ty.types { - self.visit_ts_type(ty); + visitor.visit_ts_type(ty); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_ts_type_reference(&mut self, ty: &TSTypeReference<'a>) { - let kind = AstKind::TSTypeReference(self.alloc(ty)); - self.enter_node(kind); - self.visit_ts_type_name(&ty.type_name); + pub fn walk_ts_type_reference<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSTypeReference<'a>) { + let kind = AstKind::TSTypeReference(visitor.alloc(ty)); + visitor.enter_node(kind); + visitor.visit_ts_type_name(&ty.type_name); if let Some(parameters) = &ty.type_parameters { - self.visit_ts_type_parameter_instantiation(parameters); + visitor.visit_ts_type_parameter_instantiation(parameters); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_ts_union_type(&mut self, ty: &TSUnionType<'a>) { - let kind = AstKind::TSUnionType(self.alloc(ty)); - self.enter_node(kind); + pub fn walk_ts_union_type<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSUnionType<'a>) { + let kind = AstKind::TSUnionType(visitor.alloc(ty)); + visitor.enter_node(kind); for ty in &ty.types { - self.visit_ts_type(ty); + visitor.visit_ts_type(ty); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_ts_literal_type(&mut self, ty: &TSLiteralType<'a>) { - let kind = AstKind::TSLiteralType(self.alloc(ty)); - self.enter_node(kind); + pub fn walk_ts_literal_type<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSLiteralType<'a>) { + let kind = AstKind::TSLiteralType(visitor.alloc(ty)); + visitor.enter_node(kind); match &ty.literal { - TSLiteral::BigintLiteral(lit) => self.visit_bigint_literal(lit), - TSLiteral::BooleanLiteral(lit) => self.visit_boolean_literal(lit), - TSLiteral::NullLiteral(lit) => self.visit_null_literal(lit), - TSLiteral::NumericLiteral(lit) => self.visit_number_literal(lit), - TSLiteral::RegExpLiteral(lit) => self.visit_reg_expr_literal(lit), - TSLiteral::StringLiteral(lit) => self.visit_string_literal(lit), - TSLiteral::TemplateLiteral(lit) => self.visit_template_literal(lit), - TSLiteral::UnaryExpression(expr) => self.visit_unary_expression(expr), + TSLiteral::BigintLiteral(lit) => visitor.visit_bigint_literal(lit), + TSLiteral::BooleanLiteral(lit) => visitor.visit_boolean_literal(lit), + TSLiteral::NullLiteral(lit) => visitor.visit_null_literal(lit), + TSLiteral::NumericLiteral(lit) => visitor.visit_number_literal(lit), + TSLiteral::RegExpLiteral(lit) => visitor.visit_reg_expr_literal(lit), + TSLiteral::StringLiteral(lit) => visitor.visit_string_literal(lit), + TSLiteral::TemplateLiteral(lit) => visitor.visit_template_literal(lit), + TSLiteral::UnaryExpression(expr) => visitor.visit_unary_expression(expr), } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_ts_signature(&mut self, signature: &TSSignature<'a>) { + pub fn walk_ts_signature<'a, V: Visit<'a>>(visitor: &mut V, signature: &TSSignature<'a>) { match &signature { - TSSignature::TSPropertySignature(sig) => self.visit_ts_property_signature(sig), + TSSignature::TSPropertySignature(sig) => visitor.visit_ts_property_signature(sig), TSSignature::TSCallSignatureDeclaration(sig) => { - self.visit_ts_call_signature_declaration(sig); + visitor.visit_ts_call_signature_declaration(sig); } - TSSignature::TSIndexSignature(sig) => self.visit_ts_index_signature(sig), - TSSignature::TSMethodSignature(sig) => self.visit_ts_method_signature(sig), + TSSignature::TSIndexSignature(sig) => visitor.visit_ts_index_signature(sig), + TSSignature::TSMethodSignature(sig) => visitor.visit_ts_method_signature(sig), TSSignature::TSConstructSignatureDeclaration(sig) => { - self.visit_ts_construct_signature_declaration(sig); + visitor.visit_ts_construct_signature_declaration(sig); } } } - fn visit_ts_construct_signature_declaration( - &mut self, + pub fn walk_ts_construct_signature_declaration<'a, V: Visit<'a>>( + visitor: &mut V, signature: &TSConstructSignatureDeclaration<'a>, ) { - self.visit_formal_parameters(&signature.params); + visitor.visit_formal_parameters(&signature.params); if let Some(parameters) = &signature.type_parameters { - self.visit_ts_type_parameter_declaration(parameters); + visitor.visit_ts_type_parameter_declaration(parameters); } if let Some(annotation) = &signature.return_type { - self.visit_ts_type_annotation(annotation); + visitor.visit_ts_type_annotation(annotation); } } - fn visit_ts_method_signature(&mut self, signature: &TSMethodSignature<'a>) { - let kind = AstKind::TSMethodSignature(self.alloc(signature)); - self.enter_node(kind); - self.visit_formal_parameters(&signature.params); + pub fn walk_ts_method_signature<'a, V: Visit<'a>>( + visitor: &mut V, + signature: &TSMethodSignature<'a>, + ) { + let kind = AstKind::TSMethodSignature(visitor.alloc(signature)); + visitor.enter_node(kind); + visitor.visit_formal_parameters(&signature.params); if let Some(parameters) = &signature.type_parameters { - self.visit_ts_type_parameter_declaration(parameters); + visitor.visit_ts_type_parameter_declaration(parameters); } if let Some(annotation) = &signature.return_type { - self.visit_ts_type_annotation(annotation); + visitor.visit_ts_type_annotation(annotation); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_ts_index_signature_name(&mut self, name: &TSIndexSignatureName<'a>) { - self.visit_ts_type_annotation(&name.type_annotation); + pub fn walk_ts_index_signature_name<'a, V: Visit<'a>>( + visitor: &mut V, + name: &TSIndexSignatureName<'a>, + ) { + visitor.visit_ts_type_annotation(&name.type_annotation); } - fn visit_ts_index_signature(&mut self, signature: &TSIndexSignature<'a>) { + pub fn walk_ts_index_signature<'a, V: Visit<'a>>( + visitor: &mut V, + signature: &TSIndexSignature<'a>, + ) { for name in &signature.parameters { - self.visit_ts_index_signature_name(name); + visitor.visit_ts_index_signature_name(name); } - self.visit_ts_type_annotation(&signature.type_annotation); + visitor.visit_ts_type_annotation(&signature.type_annotation); } - fn visit_ts_property_signature(&mut self, signature: &TSPropertySignature<'a>) { - let kind = AstKind::TSPropertySignature(self.alloc(signature)); - self.enter_node(kind); - self.visit_property_key(&signature.key); + pub fn walk_ts_property_signature<'a, V: Visit<'a>>( + visitor: &mut V, + signature: &TSPropertySignature<'a>, + ) { + let kind = AstKind::TSPropertySignature(visitor.alloc(signature)); + visitor.enter_node(kind); + visitor.visit_property_key(&signature.key); if let Some(annotation) = &signature.type_annotation { - self.visit_ts_type_annotation(annotation); + visitor.visit_ts_type_annotation(annotation); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_ts_call_signature_declaration(&mut self, signature: &TSCallSignatureDeclaration<'a>) { - self.visit_formal_parameters(&signature.params); + pub fn walk_ts_call_signature_declaration<'a, V: Visit<'a>>( + visitor: &mut V, + signature: &TSCallSignatureDeclaration<'a>, + ) { + visitor.visit_formal_parameters(&signature.params); if let Some(parameters) = &signature.type_parameters { - self.visit_ts_type_parameter_declaration(parameters); + visitor.visit_ts_type_parameter_declaration(parameters); } if let Some(annotation) = &signature.return_type { - self.visit_ts_type_annotation(annotation); + visitor.visit_ts_type_annotation(annotation); } } - fn visit_ts_type_query(&mut self, ty: &TSTypeQuery<'a>) { - let kind = AstKind::TSTypeQuery(self.alloc(ty)); - self.enter_node(kind); + pub fn walk_ts_type_query<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSTypeQuery<'a>) { + let kind = AstKind::TSTypeQuery(visitor.alloc(ty)); + visitor.enter_node(kind); match &ty.expr_name { - TSTypeQueryExprName::TSTypeName(name) => self.visit_ts_type_name(name), - TSTypeQueryExprName::TSImportType(import) => self.visit_ts_import_type(import), + TSTypeQueryExprName::TSTypeName(name) => visitor.visit_ts_type_name(name), + TSTypeQueryExprName::TSImportType(import) => visitor.visit_ts_import_type(import), } if let Some(type_parameters) = &ty.type_parameters { - self.visit_ts_type_parameter_instantiation(type_parameters); + visitor.visit_ts_type_parameter_instantiation(type_parameters); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_ts_import_type(&mut self, ty: &TSImportType<'a>) { - let kind = AstKind::TSImportType(self.alloc(ty)); - self.enter_node(kind); - self.visit_ts_type(&ty.argument); + pub fn walk_ts_import_type<'a, V: Visit<'a>>(visitor: &mut V, ty: &TSImportType<'a>) { + let kind = AstKind::TSImportType(visitor.alloc(ty)); + visitor.enter_node(kind); + visitor.visit_ts_type(&ty.argument); if let Some(name) = &ty.qualifier { - self.visit_ts_type_name(name); + visitor.visit_ts_type_name(name); } if let Some(attrs) = &ty.attributes { - self.visit_ts_import_attributes(attrs); + visitor.visit_ts_import_attributes(attrs); } if let Some(type_parameter) = &ty.type_parameters { - self.visit_ts_type_parameter_instantiation(type_parameter); + visitor.visit_ts_type_parameter_instantiation(type_parameter); } - self.leave_node(kind); + visitor.leave_node(kind); } - fn visit_ts_import_attributes(&mut self, attributes: &TSImportAttributes<'a>) { + pub fn walk_ts_import_attributes<'a, V: Visit<'a>>( + visitor: &mut V, + attributes: &TSImportAttributes<'a>, + ) { for element in &attributes.elements { - self.visit_ts_import_attribute(element); + visitor.visit_ts_import_attribute(element); } } - fn visit_ts_import_attribute(&mut self, attribute: &TSImportAttribute<'a>) { - self.visit_ts_import_attribute_name(&attribute.name); - self.visit_expression(&attribute.value); + pub fn walk_ts_import_attribute<'a, V: Visit<'a>>( + visitor: &mut V, + attribute: &TSImportAttribute<'a>, + ) { + visitor.visit_ts_import_attribute_name(&attribute.name); + visitor.visit_expression(&attribute.value); } - fn visit_ts_import_attribute_name(&mut self, name: &TSImportAttributeName<'a>) { + pub fn walk_ts_import_attribute_name<'a, V: Visit<'a>>( + visitor: &mut V, + name: &TSImportAttributeName<'a>, + ) { match name { - TSImportAttributeName::Identifier(ident) => self.visit_identifier_name(ident), - TSImportAttributeName::StringLiteral(ident) => self.visit_string_literal(ident), + TSImportAttributeName::Identifier(ident) => visitor.visit_identifier_name(ident), + TSImportAttributeName::StringLiteral(ident) => visitor.visit_string_literal(ident), } } } diff --git a/crates/oxc_module_lexer/src/lib.rs b/crates/oxc_module_lexer/src/lib.rs index 535e5f224..fdcc2a28f 100644 --- a/crates/oxc_module_lexer/src/lib.rs +++ b/crates/oxc_module_lexer/src/lib.rs @@ -2,8 +2,12 @@ //! //! * +use oxc_ast::walk::{ + walk_export_all_declaration, walk_export_named_declaration, walk_import_declaration, + walk_import_expression, walk_meta_property, walk_module_declaration, walk_statement, +}; #[allow(clippy::wildcard_imports)] -use oxc_ast::{ast::*, syntax_directed_operations::BoundNames, AstKind, Visit}; +use oxc_ast::{ast::*, syntax_directed_operations::BoundNames, Visit}; use oxc_span::{Atom, GetSpan}; #[derive(Debug, Clone)] @@ -109,161 +113,170 @@ impl<'a> ModuleLexer<'a> { } impl<'a> Visit<'a> for ModuleLexer<'a> { - fn enter_node(&mut self, kind: AstKind<'a>) { - match kind { - kind if self.facade && kind.is_statement() => { + fn visit_statement(&mut self, stmt: &Statement<'a>) { + if self.facade + && !matches!(stmt, Statement::ModuleDeclaration(..) | Statement::Declaration(..)) + { + self.facade = false; + } + + walk_statement(self, stmt); + } + + fn visit_module_declaration(&mut self, decl: &ModuleDeclaration<'a>) { + if !self.has_module_syntax { + self.has_module_syntax = true; + } + walk_module_declaration(self, decl); + } + + // import.meta + fn visit_meta_property(&mut self, prop: &MetaProperty<'a>) { + if !self.has_module_syntax { + self.has_module_syntax = true; + } + if prop.meta.name == "import" && prop.property.name == "meta" { + self.imports.push(ImportSpecifier { + n: None, + s: prop.span.start, + e: prop.span.end, + ss: prop.span.start, + se: prop.span.end, + d: ImportType::ImportMeta, + a: None, + }); + } + walk_meta_property(self, prop); + } + + // import("foo") + fn visit_import_expression(&mut self, expr: &ImportExpression<'a>) { + let (source, source_span_start, source_span_end) = + if let Expression::StringLiteral(s) = &expr.source { + (Some(s.value.clone()), s.span.start, s.span.end) + } else { + let span = expr.source.span(); + (None, span.start, span.end) + }; + self.imports.push(ImportSpecifier { + n: source, + s: source_span_start, + e: source_span_end, + ss: expr.span.start, + se: expr.span.end, + d: ImportType::DynamicImport(expr.span.start + 6), + a: expr.arguments.first().map(|e| e.span().start), + }); + walk_import_expression(self, expr); + } + + fn visit_import_declaration(&mut self, decl: &ImportDeclaration<'a>) { + let assertions = decl + .with_clause + .as_ref() + .filter(|c| c.with_entries.first().is_some_and(|a| a.key.as_atom() == "type")) + .map(|c| c.span.start); + self.imports.push(ImportSpecifier { + n: Some(decl.source.value.clone()), + s: decl.source.span.start + 1, // +- 1 for removing string quotes + e: decl.source.span.end - 1, + ss: decl.span.start, + se: decl.span.end, + d: ImportType::StaticImport, + a: assertions, + }); + walk_import_declaration(self, decl); + } + + fn visit_export_named_declaration(&mut self, decl: &ExportNamedDeclaration<'a>) { + if let Some(source) = &decl.source { + // export { named } from 'foo' + self.imports.push(ImportSpecifier { + n: Some(source.value.clone()), + s: source.span.start + 1, + e: source.span.end - 1, + ss: decl.span.start, + se: decl.span.end, + d: ImportType::StaticImport, + a: None, + }); + } + + // export const/let/var/function/class ... + if let Some(decl) = &decl.declaration { + if self.facade { self.facade = false; } - AstKind::ModuleDeclaration(_) if !self.has_module_syntax => { - self.has_module_syntax = true; - } - // import.meta - AstKind::MetaProperty(prop) => { - if !self.has_module_syntax { - self.has_module_syntax = true; - } - if prop.meta.name == "import" && prop.property.name == "meta" { - self.imports.push(ImportSpecifier { - n: None, - s: prop.span.start, - e: prop.span.end, - ss: prop.span.start, - se: prop.span.end, - d: ImportType::ImportMeta, - a: None, - }); - } - } - // import("foo") - AstKind::ImportExpression(expr) => { - let (source, source_span_start, source_span_end) = - if let Expression::StringLiteral(s) = &expr.source { - (Some(s.value.clone()), s.span.start, s.span.end) - } else { - let span = expr.source.span(); - (None, span.start, span.end) - }; - self.imports.push(ImportSpecifier { - n: source, - s: source_span_start, - e: source_span_end, - ss: expr.span.start, - se: expr.span.end, - d: ImportType::DynamicImport(expr.span.start + 6), - a: expr.arguments.first().map(|e| e.span().start), - }); - } - AstKind::ImportDeclaration(decl) => { - let assertions = decl - .with_clause - .as_ref() - .filter(|c| c.with_entries.first().is_some_and(|a| a.key.as_atom() == "type")) - .map(|c| c.span.start); - self.imports.push(ImportSpecifier { - n: Some(decl.source.value.clone()), - s: decl.source.span.start + 1, // +- 1 for removing string quotes - e: decl.source.span.end - 1, - ss: decl.span.start, - se: decl.span.end, - d: ImportType::StaticImport, - a: assertions, - }); - } - AstKind::ExportNamedDeclaration(decl) => { - if let Some(source) = &decl.source { - // export { named } from 'foo' - self.imports.push(ImportSpecifier { - n: Some(source.value.clone()), - s: source.span.start + 1, - e: source.span.end - 1, - ss: decl.span.start, - se: decl.span.end, - d: ImportType::StaticImport, - a: None, - }); - } - - // export const/let/var/function/class ... - if let Some(decl) = &decl.declaration { - if self.facade { - self.facade = false; - } - decl.bound_names(&mut |ident| { - self.exports.push(ExportSpecifier { - n: ident.name.clone(), - ln: Some(ident.name.clone()), - s: ident.span.start, - e: ident.span.end, - ls: None, - le: None, - }); - }); - } - - // export { named } - self.exports.extend(decl.specifiers.iter().map(|s| { - let (exported_start, exported_end) = match &s.exported { - ModuleExportName::Identifier(ident) => (ident.span.start, ident.span.end), - // +1 -1 to remove the string quotes - ModuleExportName::StringLiteral(s) => (s.span.start + 1, s.span.end - 1), - }; - ExportSpecifier { - n: s.exported.name().clone(), - ln: decl.source.is_none().then(|| s.local.name().clone()), - s: exported_start, - e: exported_end, - ls: Some(s.local.span().start), - le: Some(s.local.span().end), - } - })); - } - // export default foo - AstKind::ExportDefaultDeclaration(decl) => { - if self.facade { - self.facade = false; - } - let ln = match &decl.declaration { - ExportDefaultDeclarationKind::FunctionDeclaration(func) => func.id.as_ref(), - ExportDefaultDeclarationKind::ClassDeclaration(class) => class.id.as_ref(), - ExportDefaultDeclarationKind::Expression(_) - | ExportDefaultDeclarationKind::TSInterfaceDeclaration(_) - | ExportDefaultDeclarationKind::TSEnumDeclaration(_) => None, - }; + decl.bound_names(&mut |ident| { self.exports.push(ExportSpecifier { - n: decl.exported.name().clone(), - ln: ln.map(|id| id.name.clone()), - s: decl.exported.span().start, - e: decl.exported.span().end, + n: ident.name.clone(), + ln: Some(ident.name.clone()), + s: ident.span.start, + e: ident.span.end, ls: None, le: None, }); - } - AstKind::ExportAllDeclaration(decl) => { - // export * as ns from 'foo' - if let Some(exported) = &decl.exported { - let n = exported.name().clone(); - let s = exported.span().start; - let e = exported.span().end; - self.exports.push(ExportSpecifier { - n: n.clone(), - ln: None, - s, - e, - ls: None, - le: None, - }); - self.imports.push(ImportSpecifier { - n: Some(n), - s, - e, - ss: decl.span.start, - se: decl.span.end, - d: ImportType::StaticImport, - a: None, - }); - } - } - _ => {} + }); } + + // export { named } + self.exports.extend(decl.specifiers.iter().map(|s| { + let (exported_start, exported_end) = match &s.exported { + ModuleExportName::Identifier(ident) => (ident.span.start, ident.span.end), + // +1 -1 to remove the string quotes + ModuleExportName::StringLiteral(s) => (s.span.start + 1, s.span.end - 1), + }; + ExportSpecifier { + n: s.exported.name().clone(), + ln: decl.source.is_none().then(|| s.local.name().clone()), + s: exported_start, + e: exported_end, + ls: Some(s.local.span().start), + le: Some(s.local.span().end), + } + })); + walk_export_named_declaration(self, decl); + } + + // export default foo + fn visit_export_default_declaration(&mut self, decl: &ExportDefaultDeclaration<'a>) { + if self.facade { + self.facade = false; + } + let ln = match &decl.declaration { + ExportDefaultDeclarationKind::FunctionDeclaration(func) => func.id.as_ref(), + ExportDefaultDeclarationKind::ClassDeclaration(class) => class.id.as_ref(), + ExportDefaultDeclarationKind::Expression(_) + | ExportDefaultDeclarationKind::TSInterfaceDeclaration(_) + | ExportDefaultDeclarationKind::TSEnumDeclaration(_) => None, + }; + self.exports.push(ExportSpecifier { + n: decl.exported.name().clone(), + ln: ln.map(|id| id.name.clone()), + s: decl.exported.span().start, + e: decl.exported.span().end, + ls: None, + le: None, + }); + } + + fn visit_export_all_declaration(&mut self, decl: &ExportAllDeclaration<'a>) { + // export * as ns from 'foo' + if let Some(exported) = &decl.exported { + let n = exported.name().clone(); + let s = exported.span().start; + let e = exported.span().end; + self.exports.push(ExportSpecifier { n: n.clone(), ln: None, s, e, ls: None, le: None }); + self.imports.push(ImportSpecifier { + n: Some(n), + s, + e, + ss: decl.span.start, + se: decl.span.end, + d: ImportType::StaticImport, + a: None, + }); + } + walk_export_all_declaration(self, decl); } } diff --git a/crates/oxc_parser/examples/visitor.rs b/crates/oxc_parser/examples/visitor.rs index 32f3c064a..2d3d55902 100644 --- a/crates/oxc_parser/examples/visitor.rs +++ b/crates/oxc_parser/examples/visitor.rs @@ -1,9 +1,14 @@ use std::{env, path::Path}; use oxc_allocator::Allocator; -use oxc_ast::{AstKind, Visit}; +use oxc_ast::{ + ast::{Class, Function}, + walk::{walk_class, walk_function}, + Visit, +}; use oxc_parser::Parser; use oxc_span::SourceType; +use oxc_syntax::scope::ScopeFlags; // Instruction: // create a `test.js`, @@ -39,15 +44,13 @@ struct ASTPass { } impl<'a> Visit<'a> for ASTPass { - fn enter_node(&mut self, kind: AstKind<'a>) { - match kind { - AstKind::Function(_) => { - self.number_of_functions += 1; - } - AstKind::Class(_) => { - self.number_of_classes += 1; - } - _ => {} - } + fn visit_function(&mut self, func: &Function<'a>, flags: Option) { + self.number_of_functions += 1; + walk_function(self, func, flags); + } + + fn visit_class(&mut self, class: &Class<'a>) { + self.number_of_classes += 1; + walk_class(self, class); } }