Commit a7f3836e authored by Tobias Koppers's avatar Tobias Koppers

use EsmExport in FindExportFromReexportsResult

parent e2639f85
use std::{borrow::Cow, collections::BTreeMap, ops::ControlFlow}; use std::{borrow::Cow, collections::BTreeMap, ops::ControlFlow};
use anyhow::{Result, bail}; use anyhow::{Result, bail};
use indexmap::map::Entry;
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use swc_core::{ use swc_core::{
...@@ -205,30 +206,44 @@ pub async fn follow_reexports( ...@@ -205,30 +206,44 @@ pub async fn follow_reexports(
// Try to find the export in the star exports // Try to find the export in the star exports
if !exports_ref.star_exports.is_empty() && &*export_name != "default" { if !exports_ref.star_exports.is_empty() && &*export_name != "default" {
let result = find_export_from_reexports(*module, export_name.clone()).await?; let result = find_export_from_reexports(*module, export_name.clone()).await?;
if let Some(m) = result.esm_export { match &*result {
module = m; FindExportFromReexportsResult::NotFound => {
continue; return Ok(FollowExportsResult::cell(FollowExportsResult {
} module,
return match &result.dynamic_exporting_modules[..] { export_name: Some(export_name),
[] => Ok(FollowExportsResult { ty: FoundExportType::NotFound,
module, }));
export_name: Some(export_name),
ty: FoundExportType::NotFound,
} }
.cell()), FindExportFromReexportsResult::EsmExport(esm_export) => {
[module] => Ok(FollowExportsResult { match handle_declared_export(module, export_name, esm_export).await? {
module: *module, ControlFlow::Continue((m, n)) => {
export_name: Some(export_name), module = m.to_resolved().await?;
ty: FoundExportType::Dynamic, export_name = n;
continue;
}
ControlFlow::Break(result) => {
return Ok(result.cell());
}
}
} }
.cell()), FindExportFromReexportsResult::Dynamic(dynamic_exporting_modules) => {
_ => Ok(FollowExportsResult { return match &dynamic_exporting_modules[..] {
module, [] => unreachable!(),
export_name: Some(export_name), [module] => Ok(FollowExportsResult {
ty: FoundExportType::Dynamic, module: *module,
export_name: Some(export_name),
ty: FoundExportType::Dynamic,
}
.cell()),
_ => Ok(FollowExportsResult {
module,
export_name: Some(export_name),
ty: FoundExportType::Dynamic,
}
.cell()),
};
} }
.cell()), }
};
} }
return Ok(FollowExportsResult::cell(FollowExportsResult { return Ok(FollowExportsResult::cell(FollowExportsResult {
...@@ -286,9 +301,10 @@ async fn handle_declared_export( ...@@ -286,9 +301,10 @@ async fn handle_declared_export(
} }
#[turbo_tasks::value] #[turbo_tasks::value]
struct FindExportFromReexportsResult { enum FindExportFromReexportsResult {
esm_export: Option<ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>>, NotFound,
dynamic_exporting_modules: Vec<ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>>, EsmExport(EsmExport),
Dynamic(Vec<ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>>),
} }
#[turbo_tasks::function] #[turbo_tasks::function]
...@@ -313,17 +329,25 @@ async fn find_export_from_reexports( ...@@ -313,17 +329,25 @@ async fn find_export_from_reexports(
} }
let all_export_names = get_all_export_names(*module).await?; let all_export_names = get_all_export_names(*module).await?;
let esm_export = all_export_names.esm_exports.get(&export_name).copied(); Ok(
Ok(FindExportFromReexportsResult { if let Some(esm_export) = all_export_names.esm_exports.get(&export_name) {
esm_export, FindExportFromReexportsResult::EsmExport(esm_export.clone())
dynamic_exporting_modules: all_export_names.dynamic_exporting_modules.clone(), } else if all_export_names.dynamic_exporting_modules.is_empty() {
} FindExportFromReexportsResult::NotFound
.cell()) } else {
FindExportFromReexportsResult::Dynamic(
all_export_names.dynamic_exporting_modules.clone(),
)
}
.cell(),
)
} }
#[turbo_tasks::value] #[turbo_tasks::value]
struct AllExportNamesResult { struct AllExportNamesResult {
esm_exports: FxIndexMap<RcStr, ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>>, /// A map from export name to the immediate referenced module.
esm_exports: FxIndexMap<RcStr, EsmExport>,
/// A list of all direct or indirectly referenced modules that are dynamically exporting
dynamic_exporting_modules: Vec<ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>>, dynamic_exporting_modules: Vec<ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>>,
} }
...@@ -343,7 +367,12 @@ async fn get_all_export_names( ...@@ -343,7 +367,12 @@ async fn get_all_export_names(
let exports = exports.await?; let exports = exports.await?;
let mut esm_exports = FxIndexMap::default(); let mut esm_exports = FxIndexMap::default();
let mut dynamic_exporting_modules = Vec::new(); let mut dynamic_exporting_modules = Vec::new();
esm_exports.extend(exports.exports.keys().cloned().map(|n| (n, module))); esm_exports.extend(
exports
.exports
.iter()
.map(|(name, esm_export)| (name.clone(), esm_export.clone())),
);
let star_export_names = exports let star_export_names = exports
.star_exports .star_exports
.iter() .iter()
...@@ -352,7 +381,7 @@ async fn get_all_export_names( ...@@ -352,7 +381,7 @@ async fn get_all_export_names(
if let ReferencedAsset::Some(m) = if let ReferencedAsset::Some(m) =
*ReferencedAsset::from_resolve_result(esm_ref.resolve_reference()).await? *ReferencedAsset::from_resolve_result(esm_ref.resolve_reference()).await?
{ {
Some(expand_star_exports(*m)) Some(expand_star_exports(**esm_ref, *m))
} else { } else {
None None
}, },
...@@ -366,7 +395,7 @@ async fn get_all_export_names( ...@@ -366,7 +395,7 @@ async fn get_all_export_names(
star_export_names star_export_names
.esm_exports .esm_exports
.iter() .iter()
.map(|(k, &v)| (k.clone(), v)), .map(|(k, v)| (k.clone(), v.clone())),
); );
dynamic_exporting_modules dynamic_exporting_modules
.extend(star_export_names.dynamic_exporting_modules.iter().copied()); .extend(star_export_names.dynamic_exporting_modules.iter().copied());
...@@ -381,35 +410,45 @@ async fn get_all_export_names( ...@@ -381,35 +410,45 @@ async fn get_all_export_names(
#[turbo_tasks::value] #[turbo_tasks::value]
pub struct ExpandStarResult { pub struct ExpandStarResult {
pub esm_exports: FxIndexMap<RcStr, ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>>, pub esm_exports: FxIndexMap<RcStr, EsmExport>,
pub dynamic_exporting_modules: Vec<ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>>, pub dynamic_exporting_modules: Vec<ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>>,
} }
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn expand_star_exports( pub async fn expand_star_exports(
root_reference: ResolvedVc<Box<dyn ModuleReference>>,
root_module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>, root_module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
) -> Result<Vc<ExpandStarResult>> { ) -> Result<Vc<ExpandStarResult>> {
let mut esm_exports = FxIndexMap::default(); let mut esm_exports = FxIndexMap::default();
let mut dynamic_exporting_modules = Vec::new(); let mut dynamic_exporting_modules = Vec::new();
let mut checked_modules = FxHashSet::default(); let mut checked_modules = FxHashSet::default();
checked_modules.insert(root_module); checked_modules.insert(root_module);
let mut queue = vec![(root_module, root_module.get_exports())]; let mut queue = vec![(root_reference, root_module, root_module.get_exports())];
while let Some((asset, exports)) = queue.pop() { while let Some((reference, asset, exports)) = queue.pop() {
match &*exports.await? { match &*exports.await? {
EcmascriptExports::EsmExports(exports) => { EcmascriptExports::EsmExports(exports) => {
let exports = exports.await?; let exports = exports.await?;
for key in exports.exports.keys() { for (key, esm_export) in exports.exports.iter() {
if key == "default" { if key == "default" {
continue; continue;
} }
esm_exports.entry(key.clone()).or_insert_with(|| asset); if let Entry::Vacant(entry) = esm_exports.entry(key.clone()) {
entry.insert(match esm_export {
EsmExport::LocalBinding(_, liveness) => EsmExport::ImportedBinding(
ResolvedVc::upcast(reference),
key.clone(),
*liveness == Liveness::Mutable,
),
_ => esm_export.clone(),
});
}
} }
for esm_ref in exports.star_exports.iter() { for esm_ref in exports.star_exports.iter() {
if let ReferencedAsset::Some(asset) = if let ReferencedAsset::Some(asset) =
&*ReferencedAsset::from_resolve_result(esm_ref.resolve_reference()).await? &*ReferencedAsset::from_resolve_result(esm_ref.resolve_reference()).await?
&& checked_modules.insert(*asset) && checked_modules.insert(*asset)
{ {
queue.push((*asset, asset.get_exports())); queue.push((*esm_ref, *asset, asset.get_exports()));
} }
} }
} }
...@@ -530,7 +569,7 @@ impl EsmExports { ...@@ -530,7 +569,7 @@ impl EsmExports {
continue; continue;
}; };
let export_info = expand_star_exports(**asset).await?; let export_info = expand_star_exports(*esm_ref, **asset).await?;
for export in export_info.esm_exports.keys() { for export in export_info.esm_exports.keys() {
if export == "default" { if export == "default" {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment