refactor(syntax): remove ModuleRecord::exported_bindings_duplicated because it is a syntax error (#7577)

This commit is contained in:
Boshen 2024-12-02 08:48:01 +00:00
parent 17663f55d3
commit d476660b0b
5 changed files with 12 additions and 43 deletions

View file

@ -79,9 +79,6 @@ pub struct ModuleRecord {
/// Local exported bindings
pub exported_bindings: FxHashMap<CompactStr, Span>,
/// Local duplicated exported bindings, for diagnostics
pub exported_bindings_duplicated: Vec<NameSpan>,
/// Reexported bindings from `export * from 'specifier'`
/// Keyed by resolved path
pub exported_bindings_from_star_export: FxDashMap<PathBuf, Vec<CompactStr>>,
@ -111,7 +108,6 @@ impl fmt::Debug for ModuleRecord {
.field("indirect_export_entries", &self.indirect_export_entries)
.field("star_export_entries", &self.star_export_entries)
.field("exported_bindings", &self.exported_bindings)
.field("exported_bindings_duplicated", &self.exported_bindings_duplicated)
.field("exported_bindings_from_star_export", &self.exported_bindings_from_star_export)
.field("export_default", &self.export_default)
.finish()
@ -468,11 +464,6 @@ impl ModuleRecord {
.iter()
.map(|(name, span)| (CompactStr::from(name.as_str()), *span))
.collect(),
exported_bindings_duplicated: other
.exported_bindings_duplicated
.iter()
.map(NameSpan::from)
.collect(),
export_default: other.export_default,
..ModuleRecord::default()
}

View file

@ -92,12 +92,6 @@ impl Rule for Export {
})
.collect::<Vec<_>>();
for name_span in &module_record.exported_bindings_duplicated {
if name == name_span.name() {
spans.push(name_span.span());
}
}
if !spans.is_empty() {
spans.push(*span);
let labels = spans.into_iter().map(LabeledSpan::underline).collect::<Vec<_>>();
@ -344,16 +338,6 @@ fn test() {
// export const Foo = 'bar';
// export namespace Foo { }
// "),
(r#"
// declare module "a" {
// const Foo = 1;
// export {Foo as default};
// }
const Bar = 2;
export {Bar as default};
const Baz = 3;
export {Baz as default};
"#),
];
Tester::new(Export::NAME, Export::CATEGORY, pass, fail)
@ -364,7 +348,14 @@ fn test() {
{
let pass = vec!["export * from './module'"];
let fail = vec![];
let fail = vec![
("
const Bar = 2;
export {Bar as default};
const Baz = 3;
export {Baz as default};
"),
];
Tester::new(Export::NAME, Export::CATEGORY, pass, fail)
.with_import_plugin(true)
.change_rule_path("export-star-4/index.js")

View file

@ -97,14 +97,3 @@ snapshot_kind: text
· ╰── It can not be redeclared here
4 │ export namespace Foo { }
╰────
⚠ eslint-plugin-import(export): Multiple exports of name 'default'.
╭─[index.ts:7:32]
6 │ const Bar = 2;
7 │ export {Bar as default};
· ───────
8 │ const Baz = 3;
9 │ export {Baz as default};
· ───────
10 │
╰────

View file

@ -12,6 +12,7 @@ pub struct ModuleRecordBuilder<'a> {
module_record: ModuleRecord<'a>,
export_entries: Vec<ExportEntry<'a>>,
export_default_duplicated: Vec<Span>,
exported_bindings_duplicated: Vec<NameSpan<'a>>,
}
impl<'a> ModuleRecordBuilder<'a> {
@ -21,6 +22,7 @@ impl<'a> ModuleRecordBuilder<'a> {
module_record: ModuleRecord::new(allocator),
export_entries: vec![],
export_default_duplicated: vec![],
exported_bindings_duplicated: vec![],
}
}
@ -37,7 +39,7 @@ impl<'a> ModuleRecordBuilder<'a> {
let module_record = &self.module_record;
// It is a Syntax Error if the ExportedNames of ModuleItemList contains any duplicate entries.
for name_span in &module_record.exported_bindings_duplicated {
for name_span in &self.exported_bindings_duplicated {
let old_span = module_record.exported_bindings[&name_span.name];
errors.push(diagnostics::duplicate_export(&name_span.name, name_span.span, old_span));
}
@ -88,7 +90,7 @@ impl<'a> ModuleRecordBuilder<'a> {
fn add_export_binding(&mut self, name: Atom<'a>, span: Span) {
if let Some(old_node) = self.module_record.exported_bindings.insert(name.clone(), span) {
self.module_record.exported_bindings_duplicated.push(NameSpan::new(name, old_node));
self.exported_bindings_duplicated.push(NameSpan::new(name, old_node));
}
}

View file

@ -56,9 +56,6 @@ pub struct ModuleRecord<'a> {
/// Local exported bindings
pub exported_bindings: FxHashMap<Atom<'a>, Span>,
/// Local duplicated exported bindings, for diagnostics
pub exported_bindings_duplicated: Vec<'a, NameSpan<'a>>,
/// `export default name`
/// ^^^^^^^ span
pub export_default: Option<Span>,
@ -75,7 +72,6 @@ impl<'a> ModuleRecord<'a> {
indirect_export_entries: Vec::new_in(allocator),
star_export_entries: Vec::new_in(allocator),
exported_bindings: FxHashMap::default(),
exported_bindings_duplicated: Vec::new_in(allocator),
export_default: None,
}
}