fix(linter): eslint-plugin-import no-named-as-default-member rule (#2071)

Fixed false positives and early return @mysteryven 
#1988

64de6e9265 (r1453429430)
This commit is contained in:
Valerii Smirnov 2024-01-18 02:32:40 +01:00 committed by GitHub
parent 29dc5e69ff
commit d7ecd21801
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -3,7 +3,7 @@ use std::collections::HashMap;
use dashmap::mapref::one::Ref; use dashmap::mapref::one::Ref;
use oxc_ast::{ use oxc_ast::{
ast::{BindingPatternKind, Expression, MemberExpression}, ast::{BindingPatternKind, Expression, IdentifierReference, MemberExpression},
AstKind, AstKind,
}; };
use oxc_diagnostics::{ use oxc_diagnostics::{
@ -11,6 +11,7 @@ use oxc_diagnostics::{
thiserror::Error, thiserror::Error,
}; };
use oxc_macros::declare_oxc_lint; use oxc_macros::declare_oxc_lint;
use oxc_semantic::SymbolId;
use oxc_span::{Atom, Span}; use oxc_span::{Atom, Span};
use oxc_syntax::module_record::ImportImportName; use oxc_syntax::module_record::ImportImportName;
@ -44,12 +45,21 @@ declare_oxc_lint!(
NoNamedAsDefaultMember, NoNamedAsDefaultMember,
nursery nursery
); );
fn get_symbol_id_from_ident(
ctx: &LintContext<'_>,
ident: &IdentifierReference,
) -> Option<SymbolId> {
let reference_id = ident.reference_id.get().unwrap();
let reference = &ctx.symbols().references[reference_id];
reference.symbol_id()
}
impl Rule for NoNamedAsDefaultMember { impl Rule for NoNamedAsDefaultMember {
fn run_once(&self, ctx: &LintContext<'_>) { fn run_once(&self, ctx: &LintContext<'_>) {
let module_record = ctx.semantic().module_record(); let module_record = ctx.semantic().module_record();
let mut has_members_map: HashMap<&Atom, (Ref<'_, Atom, _, _>, Atom)> = HashMap::default(); let mut has_members_map: HashMap<SymbolId, (Ref<'_, Atom, _, _>, Atom)> =
HashMap::default();
for import_entry in &module_record.import_entries { for import_entry in &module_record.import_entries {
let ImportImportName::Default(_) = import_entry.import_name else { let ImportImportName::Default(_) = import_entry.import_name else {
continue; continue;
@ -62,7 +72,7 @@ impl Rule for NoNamedAsDefaultMember {
if !remote_module_record_ref.exported_bindings.is_empty() { if !remote_module_record_ref.exported_bindings.is_empty() {
has_members_map.insert( has_members_map.insert(
import_entry.local_name.name(), ctx.symbols().get_symbol_id_from_span(&import_entry.local_name.span()).unwrap(),
(remote_module_record_ref, import_entry.module_request.name().to_owned()), (remote_module_record_ref, import_entry.module_request.name().to_owned()),
); );
} }
@ -71,15 +81,18 @@ impl Rule for NoNamedAsDefaultMember {
if has_members_map.is_empty() { if has_members_map.is_empty() {
return; return;
}; };
let get_external_module_name_if_has_entry = |module_name: &Atom, entry_name: &Atom| { let get_external_module_name_if_has_entry =
has_members_map.get(&module_name).and_then(|it| { |ident: &IdentifierReference, entry_name: &Atom| {
if it.0.exported_bindings.contains_key(entry_name) { get_symbol_id_from_ident(ctx, ident)
Some(it.1.to_string()) .and_then(|symbol_id| has_members_map.get(&symbol_id))
} else { .and_then(|it| {
None if it.0.exported_bindings.contains_key(entry_name) {
} Some(it.1.to_string())
}) } else {
}; None
}
})
};
let process_member_expr = |member_expr: &MemberExpression| { let process_member_expr = |member_expr: &MemberExpression| {
let Expression::Identifier(ident) = member_expr.object() else { let Expression::Identifier(ident) = member_expr.object() else {
@ -89,7 +102,7 @@ impl Rule for NoNamedAsDefaultMember {
return; return;
}; };
if let Some(module_name) = if let Some(module_name) =
get_external_module_name_if_has_entry(&ident.name, &Atom::new_inline(prop_str)) get_external_module_name_if_has_entry(ident, &Atom::new_inline(prop_str))
{ {
ctx.diagnostic(NoNamedAsDefaultMemberDignostic( ctx.diagnostic(NoNamedAsDefaultMemberDignostic(
match member_expr { match member_expr {
@ -108,21 +121,19 @@ impl Rule for NoNamedAsDefaultMember {
match item.kind() { match item.kind() {
AstKind::MemberExpression(member_expr) => process_member_expr(member_expr), AstKind::MemberExpression(member_expr) => process_member_expr(member_expr),
AstKind::VariableDeclarator(decl) => { AstKind::VariableDeclarator(decl) => {
if let Some(Expression::MemberExpression(member_expr)) = &decl.init {
process_member_expr(member_expr);
return;
}
let Some(Expression::Identifier(ident)) = &decl.init else { let Some(Expression::Identifier(ident)) = &decl.init else {
return; continue;
}; };
let BindingPatternKind::ObjectPattern(object_pattern) = &decl.id.kind else { let BindingPatternKind::ObjectPattern(object_pattern) = &decl.id.kind else {
return; continue;
}; };
for prop in &*object_pattern.properties { for prop in &*object_pattern.properties {
let Some(name) = prop.key.static_name() else { return }; let Some(name) = prop.key.static_name() else {
continue;
};
if let Some(module_name) = if let Some(module_name) =
get_external_module_name_if_has_entry(&ident.name, &name) get_external_module_name_if_has_entry(ident, &name)
{ {
ctx.diagnostic(NoNamedAsDefaultMemberDignostic( ctx.diagnostic(NoNamedAsDefaultMemberDignostic(
decl.span, decl.span,