Skip to content

Perf: dedupe import resolution #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
longlho merged 1 commit into from
May 23, 2026
Merged

Perf: dedupe import resolution #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 33 additions & 40 deletions crates/codescythe/analyze.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,51 +381,44 @@ pub fn analyze_path(
let file = files.get(index)?.clone();
let public_entry = entry_indexes.contains(&index) && !config.include_entry_exports;

let mut static_imports_by_source = BTreeMap::<&str, BTreeSet<Option<&str>>>::new();
for import in &file.imports {
match module_resolver.resolve(&file, &import.source)? {
ImportResolution::Project(target) => {
if let Some(name) = &import.imported {
mark_used_export(
target,
name.clone(),
&mut used_files,
&mut used_exports,
&mut queue,
&mut queued_files,
&test_file_indexes,
);
} else {
mark_used_file(
target,
&test_file_indexes,
&mut used_files,
&mut queue,
&mut queued_files,
);
}
}
ImportResolution::Unresolved => {
unresolved_policy.record(
&mut unresolved,
&mut ignored_unresolved_imports_by_pattern,
&file.relative,
&import.source,
)?;
}
ImportResolution::External => {}
}
static_imports_by_source
.entry(import.source.as_str())
.or_default()
.insert(import.imported.as_deref());
}

for source in &file.side_effect_imports {
static_imports_by_source
.entry(source.as_str())
.or_default()
.insert(None);
}

for (source, imported_names) in static_imports_by_source {
match module_resolver.resolve(&file, source)? {
ImportResolution::Project(target) => {
mark_used_file(
target,
&test_file_indexes,
&mut used_files,
&mut queue,
&mut queued_files,
);
for imported in imported_names {
if let Some(name) = imported {
mark_used_export(
target,
name.to_string(),
&mut used_files,
&mut used_exports,
&mut queue,
&mut queued_files,
&test_file_indexes,
);
} else {
mark_used_file(
target,
&test_file_indexes,
&mut used_files,
&mut queue,
&mut queued_files,
);
}
}
}
ImportResolution::Unresolved => {
unresolved_policy.record(
Expand Down
19 changes: 17 additions & 2 deletions crates/codescythe/analyze/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ pub(super) struct ExportInfo {
pub(super) namespace_source: Option<String>,
}

#[derive(Debug, Clone)]
#[derive(Debug, Clone, Eq, Ord, PartialEq, PartialOrd)]
pub(super) struct ImportRecord {
pub(super) source: String,
pub(super) imported: Option<String>,
Expand Down Expand Up @@ -241,7 +241,14 @@ impl FileVisitor {
}
}

fn finish(self) -> FileData {
fn finish(mut self) -> FileData {
dedupe_preserving_order(&mut self.imports);
dedupe_preserving_order(&mut self.side_effect_imports);
dedupe_preserving_order(&mut self.dynamic_imports);
dedupe_preserving_order(&mut self.glob_imports);
dedupe_preserving_order(&mut self.member_uses);
dedupe_preserving_order(&mut self.reexport_all);

FileData {
path: self.path,
relative: self.relative,
Expand Down Expand Up @@ -486,6 +493,14 @@ impl<'a> Visit<'a> for FileVisitor {
}
}

fn dedupe_preserving_order<T>(items: &mut Vec<T>)
where
T: Clone + Ord,
{
let mut seen = BTreeSet::new();
items.retain(|item| seen.insert(item.clone()));
}

impl FileVisitor {
fn add_declaration_exports(
&mut self,
Expand Down
Loading