Unverified Commit 7d474930 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: fix hanging problem with reexport cycles (#81620)

### What?

Fix a hanging compilation in a specific case when reexports modules in a cycle.

Fix reported issues for tree shaken modules
parent 2368e1c3
...@@ -13,7 +13,7 @@ use swc_core::{ ...@@ -13,7 +13,7 @@ use swc_core::{
}; };
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
FxIndexMap, FxIndexSet, NonLocalValue, ResolvedVc, TryFlatJoinIterExt, ValueToString, Vc, FxIndexMap, NonLocalValue, ResolvedVc, TryFlatJoinIterExt, ValueToString, Vc,
trace::TraceRawVcs, trace::TraceRawVcs,
}; };
use turbo_tasks_fs::glob::Glob; use turbo_tasks_fs::glob::Glob;
...@@ -345,7 +345,7 @@ async fn get_all_export_names( ...@@ -345,7 +345,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(get_all_export_names(*m)) Some(expand_star_exports(*m))
} else { } else {
None None
}, },
...@@ -374,16 +374,16 @@ async fn get_all_export_names( ...@@ -374,16 +374,16 @@ async fn get_all_export_names(
#[turbo_tasks::value] #[turbo_tasks::value]
pub struct ExpandStarResult { pub struct ExpandStarResult {
pub star_exports: Vec<RcStr>, pub esm_exports: FxIndexMap<RcStr, ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>>,
pub has_dynamic_exports: bool, 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_module: Vc<Box<dyn EcmascriptChunkPlaceable>>, root_module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
) -> Result<Vc<ExpandStarResult>> { ) -> Result<Vc<ExpandStarResult>> {
let mut set = FxIndexSet::default(); let mut esm_exports = FxIndexMap::default();
let mut has_dynamic_exports = false; 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_module, root_module.get_exports())];
...@@ -391,13 +391,18 @@ pub async fn expand_star_exports( ...@@ -391,13 +391,18 @@ pub async fn expand_star_exports(
match &*exports.await? { match &*exports.await? {
EcmascriptExports::EsmExports(exports) => { EcmascriptExports::EsmExports(exports) => {
let exports = exports.await?; let exports = exports.await?;
set.extend(exports.exports.keys().filter(|n| *n != "default").cloned()); for key in exports.exports.keys() {
if key == "default" {
continue;
}
esm_exports.entry(key.clone()).or_insert_with(|| asset);
}
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((*asset, asset.get_exports()));
} }
} }
} }
...@@ -429,7 +434,7 @@ pub async fn expand_star_exports( ...@@ -429,7 +434,7 @@ pub async fn expand_star_exports(
.await? .await?
} }
EcmascriptExports::CommonJs => { EcmascriptExports::CommonJs => {
has_dynamic_exports = true; dynamic_exporting_modules.push(asset);
emit_star_exports_issue( emit_star_exports_issue(
asset.ident(), asset.ident(),
format!( format!(
...@@ -444,18 +449,18 @@ pub async fn expand_star_exports( ...@@ -444,18 +449,18 @@ pub async fn expand_star_exports(
.await?; .await?;
} }
EcmascriptExports::DynamicNamespace => { EcmascriptExports::DynamicNamespace => {
has_dynamic_exports = true; dynamic_exporting_modules.push(asset);
} }
EcmascriptExports::Unknown => { EcmascriptExports::Unknown => {
// Propagate the Unknown export type to a certain extent. // Propagate the Unknown export type to a certain extent.
has_dynamic_exports = true; dynamic_exporting_modules.push(asset);
} }
} }
} }
Ok(ExpandStarResult { Ok(ExpandStarResult {
star_exports: set.into_iter().collect(), esm_exports,
has_dynamic_exports, dynamic_exporting_modules,
} }
.cell()) .cell())
} }
...@@ -520,7 +525,10 @@ impl EsmExports { ...@@ -520,7 +525,10 @@ impl EsmExports {
let export_info = expand_star_exports(**asset).await?; let export_info = expand_star_exports(**asset).await?;
for export in &export_info.star_exports { for export in export_info.esm_exports.keys() {
if export == "default" {
continue;
}
if !export_usage_info.is_export_used(export) { if !export_usage_info.is_export_used(export) {
continue; continue;
} }
...@@ -537,7 +545,7 @@ impl EsmExports { ...@@ -537,7 +545,7 @@ impl EsmExports {
} }
} }
if export_info.has_dynamic_exports { if !export_info.dynamic_exporting_modules.is_empty() {
dynamic_exports.push(*asset); dynamic_exports.push(*asset);
} }
} }
......
warning - [analysis] /turbopack/crates/turbopack-tests/tests/execution/turbopack/side-effects-optimization/basic/input/node_modules/package-star/not-executed.js unexpected export *
export * used with module [project]/turbopack/crates/turbopack-tests/tests/execution/turbopack/side-effects-optimization/basic/input/node_modules/package-star/not-executed.js [test] (ecmascript) which has no exports
Typescript only: Did you want to export only types with `export type * from "..."`?
Note: Using `export type` is more efficient than `export *` as it won't emit any runtime code.
\ No newline at end of file
export * from './b.js'
export const value = 42
export { value as reexported } from './b.js'
it('should allow reexport cycles', async () => {
const module = await import('./a.js')
expect(module.value).toBe(42)
expect(module.reexported).toBe(42)
})
warning - [analysis] /turbopack/crates/turbopack-tests/tests/execution/turbopack/side-effects-optimization/basic/input/node_modules/package-star/not-executed.js unexpected export *
export * used with module [project]/turbopack/crates/turbopack-tests/tests/execution/turbopack/side-effects-optimization/basic/input/node_modules/package-star/not-executed.js [test] (ecmascript) which has no exports
Typescript only: Did you want to export only types with `export type * from "..."`?
Note: Using `export type` is more efficient than `export *` as it won't emit any runtime code.
\ No newline at end of file
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