Skip to content

perf: improve exports info #11524

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
merged 1 commit into from
Sep 4, 2025
Merged

perf: improve exports info #11524

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
25 changes: 11 additions & 14 deletions crates/rspack_core/src/exports/exports_info_getter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use std::sync::Arc;

use either::Either;
use itertools::Itertools;
use rspack_collections::UkeyMap;
use rspack_util::{atom::Atom, ext::DynHash};
use rustc_hash::FxHashMap as HashMap;

use super::{
ExportInfoData, ExportProvided, ExportsInfo, ProvidedExports, UsageState, UsedName, UsedNameItem,
Expand Down Expand Up @@ -31,7 +31,7 @@ pub struct PrefetchedExportsInfoWrapper<'a> {
* stored in a map to prevent circular references
* When redirect, this data can be cloned to generate a new PrefetchedExportsInfoWrapper with a new entry
*/
exports: Arc<HashMap<ExportsInfo, &'a ExportsInfoData>>,
exports: Arc<UkeyMap<ExportsInfo, &'a ExportsInfoData>>,
/**
* The entry of the current exports info
*/
Expand Down Expand Up @@ -569,7 +569,7 @@ impl ExportsInfoGetter {
fn prefetch_exports<'a>(
id: &ExportsInfo,
mg: &'a ModuleGraph,
res: &mut HashMap<ExportsInfo, &'a ExportsInfoData>,
res: &mut UkeyMap<ExportsInfo, &'a ExportsInfoData>,
mode: PrefetchExportsInfoMode<'a>,
) {
if res.contains_key(id) {
Expand All @@ -581,15 +581,12 @@ impl ExportsInfoGetter {
match mode {
PrefetchExportsInfoMode::Default => {}
PrefetchExportsInfoMode::Nested(names) => {
for (key, export_info) in exports_info.exports().iter() {
if names.first().is_some_and(|name| name == key)
&& let Some(nested_exports_info) = export_info.exports_info()
{
nested_exports.push((
nested_exports_info,
PrefetchExportsInfoMode::Nested(&names[1..]),
));
}
if let Some(nested) = names
.first()
.and_then(|name| exports_info.exports().get(name))
.and_then(|export_info| export_info.exports_info())
{
nested_exports.push((nested, PrefetchExportsInfoMode::Nested(&names[1..])));
}
}
PrefetchExportsInfoMode::Full => {
Expand Down Expand Up @@ -620,7 +617,7 @@ impl ExportsInfoGetter {
}
}

let mut res = HashMap::default();
let mut res = UkeyMap::default();
prefetch_exports(id, mg, &mut res, mode.clone());
PrefetchedExportsInfoWrapper {
exports: Arc::new(res),
Expand Down Expand Up @@ -748,7 +745,7 @@ impl ExportsInfoGetter {
let exports = exports
.into_iter()
.map(|e| (e, mg.get_exports_info_by_id(&e)))
.collect::<HashMap<_, _>>();
.collect::<UkeyMap<_, _>>();

PrefetchedExportsInfoWrapper {
exports: Arc::new(exports),
Expand Down
Loading