dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 20:32:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(semantic): adding binder for ImportSpecifier replaces the ModuleDeclaration's binder (#2230)

Browse source 
close: #2013
This commit is contained in:
Dunqing 2024-01-31 11:57:08 +08:00 committed by GitHub
parent 3d79d77b40
commit 2924258ab9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 65 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/oxc_ast/src/ast_kind.rs
View file

@ -109,6 +109,10 @@ pub enum AstKind<'a> {
Decorator(&'a Decorator<'a>),
ModuleDeclaration(&'a ModuleDeclaration<'a>),
ImportDeclaration(&'a ImportDeclaration<'a>),
ImportSpecifier(&'a ImportSpecifier),
ImportDefaultSpecifier(&'a ImportDefaultSpecifier),
ImportNamespaceSpecifier(&'a ImportNamespaceSpecifier),
// JSX
// Please make sure to add these to `is_jsx` below.
@ -422,6 +426,10 @@ impl<'a> GetSpan for AstKind<'a> {
Self::Decorator(x) => x.span,
Self::ModuleDeclaration(x) => x.span(),
Self::ImportDeclaration(x) => x.span,
Self::ImportSpecifier(x) => x.span,
Self::ImportDefaultSpecifier(x) => x.span,
Self::ImportNamespaceSpecifier(x) => x.span,
Self::JSXOpeningElement(x) => x.span,
Self::JSXClosingElement(x) => x.span,
@ -603,6 +611,10 @@ impl<'a> AstKind<'a> {
Self::Decorator(_) => "Decorator".into(),
Self::ModuleDeclaration(_) => "ModuleDeclaration".into(),
Self::ImportDeclaration(_) => "ImportDeclaration".into(),
Self::ImportSpecifier(_) => "ImportSpecifier".into(),
Self::ImportDefaultSpecifier(_) => "ImportDefaultSpecifier".into(),
Self::ImportNamespaceSpecifier(_) => "ImportNamespaceSpecifier".into(),
Self::JSXOpeningElement(_) => "JSXOpeningElement".into(),
Self::JSXClosingElement(_) => "JSXClosingElement".into(),
Self::JSXElementName(_) => "JSXElementName".into(),

12
crates/oxc_ast/src/visit.rs
View file

@ -1334,6 +1334,8 @@ pub trait Visit<'a>: Sized {
}
fn visit_import_declaration(&mut self, decl: &ImportDeclaration<'a>) {
let kind = AstKind::ImportDeclaration(self.alloc(decl));
self.enter_node(kind);
if let Some(specifiers) = &decl.specifiers {
for specifier in specifiers {
self.visit_import_declaration_specifier(specifier);
@ -1341,6 +1343,7 @@ pub trait Visit<'a>: Sized {
}
self.visit_string_literal(&decl.source);
// TODO: assertions
self.leave_node(kind);
}
fn visit_import_declaration_specifier(&mut self, specifier: &ImportDeclarationSpecifier) {
@ -1358,16 +1361,25 @@ pub trait Visit<'a>: Sized {
}
fn visit_import_specifier(&mut self, specifier: &ImportSpecifier) {
let kind = AstKind::ImportSpecifier(self.alloc(specifier));
self.enter_node(kind);
// TODO: imported
self.visit_binding_identifier(&specifier.local);
self.leave_node(kind);
}
fn visit_import_default_specifier(&mut self, specifier: &ImportDefaultSpecifier) {
let kind = AstKind::ImportDefaultSpecifier(self.alloc(specifier));
self.enter_node(kind);
self.visit_binding_identifier(&specifier.local);
self.leave_node(kind);
}
fn visit_import_name_specifier(&mut self, specifier: &ImportNamespaceSpecifier) {
let kind = AstKind::ImportNamespaceSpecifier(self.alloc(specifier));
self.enter_node(kind);
self.visit_binding_identifier(&specifier.local);
self.leave_node(kind);
}
fn visit_export_all_declaration(&mut self, _decl: &ExportAllDeclaration<'a>) {}

14
crates/oxc_ast/src/visit_mut.rs
View file

@ -1333,13 +1333,16 @@ pub trait VisitMut<'a>: Sized {
}
fn visit_import_declaration(&mut self, decl: &mut ImportDeclaration<'a>) {
let kind = AstKind::ImportDeclaration(self.alloc(decl));
self.enter_node(kind);
if let Some(specifiers) = &mut decl.specifiers {
for specifier in specifiers.iter_mut() {
self.visit_import_declaration_specifier(specifier);
}
}
// TODO: source
self.visit_string_literal(&mut decl.source);
// TODO: assertions
self.leave_node(kind);
}
fn visit_import_declaration_specifier(&mut self, specifier: &mut ImportDeclarationSpecifier) {
@ -1357,16 +1360,25 @@ pub trait VisitMut<'a>: Sized {
}
fn visit_import_specifier(&mut self, specifier: &mut ImportSpecifier) {
let kind = AstKind::ImportSpecifier(self.alloc(specifier));
self.enter_node(kind);
// TODO: imported
self.visit_binding_identifier(&mut specifier.local);
self.leave_node(kind);
}
fn visit_import_default_specifier(&mut self, specifier: &mut ImportDefaultSpecifier) {
let kind = AstKind::ImportDefaultSpecifier(self.alloc(specifier));
self.enter_node(kind);
self.visit_binding_identifier(&mut specifier.local);
self.leave_node(kind);
}
fn visit_import_name_specifier(&mut self, specifier: &mut ImportNamespaceSpecifier) {
let kind = AstKind::ImportNamespaceSpecifier(self.alloc(specifier));
self.enter_node(kind);
self.visit_binding_identifier(&mut specifier.local);
self.leave_node(kind);
}
fn visit_export_all_declaration(&mut self, _decl: &mut ExportAllDeclaration<'a>) {}

28
crates/oxc_semantic/src/binder.rs
View file

@ -288,6 +288,34 @@ impl<'a> Binder for ModuleDeclaration<'a> {
}
}
fn declare_symbol_for_import_specifier(ident: &BindingIdentifier, builder: &mut SemanticBuilder) {
let symbol_id = builder.declare_symbol(
ident.span,
&ident.name,
SymbolFlags::ImportBinding,
SymbolFlags::ImportBindingExcludes,
);
ident.symbol_id.set(Some(symbol_id));
}
impl Binder for ImportSpecifier {
fn bind(&self, builder: &mut SemanticBuilder) {
declare_symbol_for_import_specifier(&self.local, builder);
}
}
impl Binder for ImportDefaultSpecifier {
fn bind(&self, builder: &mut SemanticBuilder) {
declare_symbol_for_import_specifier(&self.local, builder);
}
}
impl Binder for ImportNamespaceSpecifier {
fn bind(&self, builder: &mut SemanticBuilder) {
declare_symbol_for_import_specifier(&self.local, builder);
}
}
impl<'a> Binder for TSTypeAliasDeclaration<'a> {
fn bind(&self, builder: &mut SemanticBuilder) {
let symbol_id = builder.declare_symbol(