refactor(semantic): move determining references flags for export spec…

…ifier to visit_export_named_declaration
oxc-project · Dec 15, 2024 · 33fa028 · 33fa028
1 parent b49caf3
commit 33fa028
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/crates/oxc_semantic/src/builder.rs b/crates/oxc_semantic/src/builder.rs
@@ -1865,10 +1865,20 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {
         if let Some(declaration) = &it.declaration {
             self.visit_declaration(declaration);
         }
-        if it.export_kind.is_type() {
-            self.current_reference_flags = ReferenceFlags::Type;
+
+        for specifier in &it.specifiers {
+            // `export type { a }` or `export { type a }` -> `a` is a type reference
+            if it.export_kind.is_type() || specifier.export_kind.is_type() {
+                self.current_reference_flags = ReferenceFlags::Type;
+            } else {
+                // If the export specifier is not a explicit type export, we consider it as a potential
+                // type and value reference. If it references to a value in the end, we would delete the
+                // `ReferenceFlags::Type` flag in `fn resolve_references_for_current_scope`.
+                self.current_reference_flags = ReferenceFlags::Read | ReferenceFlags::Type;
+            }
+            self.visit_export_specifier(specifier);
         }
-        self.visit_export_specifiers(&it.specifiers);
+
         if let Some(source) = &it.source {
             self.visit_string_literal(source);
         }
@@ -1884,21 +1894,10 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {
         self.visit_span(&it.span);
 
         self.current_node_flags |= NodeFlags::ExportSpecifier;
-        let prev_reference_flags = self.current_reference_flags;
-        // `export type { a }` or `export { type a }` -> `a` is a type reference
-        if prev_reference_flags.is_type() || it.export_kind.is_type() {
-            self.current_reference_flags = ReferenceFlags::Type;
-        } else {
-            // If the export specifier is not a explicit type export, we consider it as a potential
-            // type and value reference. If it references to a value in the end, we would delete the
-            // `ReferenceFlags::Type` flag in `fn resolve_references_for_current_scope`.
-            self.current_reference_flags = ReferenceFlags::Read | ReferenceFlags::Type;
-        }
 
         self.visit_module_export_name(&it.local);
         self.visit_module_export_name(&it.exported);
 
-        self.current_reference_flags = prev_reference_flags;
         self.current_node_flags -= NodeFlags::ExportSpecifier;
 
         self.leave_node(kind);