Unverified Commit ad030d78 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: Tree shaking fixes and code organization (#89295)

## Summary

A series of bug fixes, refactors, and code organization improvements to Turbopack's tree shaking and side effect optimization:

- **Fix `ModulePart` handling for `FreeVarReference::EcmaScriptModule`** — pass `ModulePart` correctly so free variable references resolve to the right module part
- **Extract `EcmascriptModuleRenameModule`** — split the rename/reexport logic (`RenamedExport`, `RenamedNamespace`) out of `EcmascriptModuleFacadeModule` into a dedicated `rename` module, shared between side effects optimization and tree shaking
- **Simplify `EcmascriptModuleFacadeModule`** — now only handles the `Facade` case (locals + reexports), no longer overloaded with rename variants
- **Reorganize tree shaking code** — moved `asset.rs` → `part/module.rs`, `chunk_item.rs` → `part/chunk_item.rs` + `side_effects/chunk_item.rs`, `side_effect_module.rs` → `side_effects/module.rs` for clearer separation between part modules and side effect modules
- **Use `EsmExport` in `FindExportFromReexportsResult`** — reduces code duplication by reusing the existing `EsmExport` enum
- **Minor simplifications** — code deduplication, reordered checks, and general cleanup
parent 286a73f8
...@@ -42,7 +42,7 @@ use turbopack_core::{ ...@@ -42,7 +42,7 @@ use turbopack_core::{
}; };
use turbopack_ecmascript::{ use turbopack_ecmascript::{
EcmascriptParsable, chunk::EcmascriptChunkPlaceable, parse::ParseResult, EcmascriptParsable, chunk::EcmascriptChunkPlaceable, parse::ParseResult,
tree_shake::asset::EcmascriptModulePartAsset, tree_shake::part::module::EcmascriptModulePartAsset,
}; };
/// Metadata for a server action: (layer, exported_name, filename) /// Metadata for a server action: (layer, exported_name, filename)
......
...@@ -40,6 +40,20 @@ fn dynamic_ref_description() -> RcStr { ...@@ -40,6 +40,20 @@ fn dynamic_ref_description() -> RcStr {
rcstr!("next/dynamic reference") rcstr!("next/dynamic reference")
} }
impl NextDynamicEntryModule {
async fn module_reference(&self) -> Result<ResolvedVc<Box<dyn ModuleReference>>> {
Ok(ResolvedVc::upcast(
SingleChunkableModuleReference::new(
Vc::upcast(*self.module),
dynamic_ref_description(),
ExportUsage::all(),
)
.to_resolved()
.await?,
))
}
}
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl Module for NextDynamicEntryModule { impl Module for NextDynamicEntryModule {
#[turbo_tasks::function] #[turbo_tasks::function]
...@@ -56,15 +70,7 @@ impl Module for NextDynamicEntryModule { ...@@ -56,15 +70,7 @@ impl Module for NextDynamicEntryModule {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn references(&self) -> Result<Vc<ModuleReferences>> { async fn references(&self) -> Result<Vc<ModuleReferences>> {
Ok(Vc::cell(vec![ResolvedVc::upcast( Ok(Vc::cell(vec![self.module_reference().await?]))
SingleChunkableModuleReference::new(
Vc::upcast(*self.module),
dynamic_ref_description(),
ExportUsage::all(),
)
.to_resolved()
.await?,
)]))
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> { fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
......
...@@ -61,6 +61,16 @@ impl NextServerComponentModule { ...@@ -61,6 +61,16 @@ impl NextServerComponentModule {
} }
} }
impl NextServerComponentModule {
async fn module_reference(&self) -> Result<ResolvedVc<Box<dyn ModuleReference>>> {
Ok(ResolvedVc::upcast(
NextServerComponentModuleReference::new(Vc::upcast(*self.module))
.to_resolved()
.await?,
))
}
}
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl Module for NextServerComponentModule { impl Module for NextServerComponentModule {
#[turbo_tasks::function] #[turbo_tasks::function]
...@@ -77,11 +87,7 @@ impl Module for NextServerComponentModule { ...@@ -77,11 +87,7 @@ impl Module for NextServerComponentModule {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn references(&self) -> Result<Vc<ModuleReferences>> { async fn references(&self) -> Result<Vc<ModuleReferences>> {
Ok(Vc::cell(vec![ResolvedVc::upcast( Ok(Vc::cell(vec![self.module_reference().await?]))
NextServerComponentModuleReference::new(Vc::upcast(*self.module))
.to_resolved()
.await?,
)]))
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> { fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
......
...@@ -41,6 +41,16 @@ impl NextServerUtilityModule { ...@@ -41,6 +41,16 @@ impl NextServerUtilityModule {
} }
} }
impl NextServerUtilityModule {
async fn module_reference(&self) -> Result<ResolvedVc<Box<dyn ModuleReference>>> {
Ok(ResolvedVc::upcast(
NextServerUtilityModuleReference::new(Vc::upcast(*self.module))
.to_resolved()
.await?,
))
}
}
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl Module for NextServerUtilityModule { impl Module for NextServerUtilityModule {
#[turbo_tasks::function] #[turbo_tasks::function]
...@@ -57,11 +67,7 @@ impl Module for NextServerUtilityModule { ...@@ -57,11 +67,7 @@ impl Module for NextServerUtilityModule {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn references(&self) -> Result<Vc<ModuleReferences>> { async fn references(&self) -> Result<Vc<ModuleReferences>> {
Ok(Vc::cell(vec![ResolvedVc::upcast( Ok(Vc::cell(vec![self.module_reference().await?]))
NextServerUtilityModuleReference::new(Vc::upcast(*self.module))
.to_resolved()
.await?,
)]))
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
...@@ -23,6 +23,7 @@ pub mod minify; ...@@ -23,6 +23,7 @@ pub mod minify;
pub mod parse; pub mod parse;
mod path_visitor; mod path_visitor;
pub mod references; pub mod references;
pub mod rename;
pub mod runtime_functions; pub mod runtime_functions;
pub mod side_effect_optimization; pub mod side_effect_optimization;
pub mod single_file_ecmascript_output; pub mod single_file_ecmascript_output;
...@@ -95,7 +96,7 @@ use turbopack_core::{ ...@@ -95,7 +96,7 @@ use turbopack_core::{
reference::ModuleReferences, reference::ModuleReferences,
reference_type::InnerAssets, reference_type::InnerAssets,
resolve::{ resolve::{
FindContextFileResult, ModulePart, find_context_file, origin::ResolveOrigin, package_json, FindContextFileResult, find_context_file, origin::ResolveOrigin, package_json,
parse::Request, parse::Request,
}, },
source::Source, source::Source,
...@@ -118,10 +119,7 @@ use crate::{ ...@@ -118,10 +119,7 @@ use crate::{
async_module::OptionAsyncModule, async_module::OptionAsyncModule,
esm::{UrlRewriteBehavior, base::EsmAssetReferences, export}, esm::{UrlRewriteBehavior, base::EsmAssetReferences, export},
}, },
side_effect_optimization::{ side_effect_optimization::reference::EcmascriptModulePartReference,
facade::module::EcmascriptModuleFacadeModule, locals::module::EcmascriptModuleLocalsModule,
reference::EcmascriptModulePartReference,
},
swc_comments::{CowComments, ImmutableComments}, swc_comments::{CowComments, ImmutableComments},
transform::{remove_directives, remove_shebang}, transform::{remove_directives, remove_shebang},
}; };
...@@ -832,44 +830,6 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleAsset { ...@@ -832,44 +830,6 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleAsset {
} }
} }
#[turbo_tasks::value_impl]
impl EcmascriptModuleAsset {
/// Returns the locals module if the module should be split (has re-exports), otherwise self.
///
/// The locals module contains only the local bindings and evaluation side effects,
/// while re-exports are handled separately by the facade module.
#[turbo_tasks::function]
pub async fn get_locals_if_split(
self: Vc<Self>,
) -> Result<Vc<Box<dyn EcmascriptChunkPlaceable>>> {
let should_split = *self.get_exports().split_locals_and_reexports().await?;
Ok(if should_split {
Vc::upcast(EcmascriptModuleLocalsModule::new(self))
} else {
Vc::upcast(self)
})
}
/// Returns the facade module if the module should be split (has re-exports), otherwise self.
///
/// The facade module re-exports all exports from the original module, including
/// both local bindings (via the locals module) and re-exports from other modules.
#[turbo_tasks::function]
pub async fn get_facade_if_split(
self: Vc<Self>,
) -> Result<Vc<Box<dyn EcmascriptChunkPlaceable>>> {
let should_split = *self.get_exports().split_locals_and_reexports().await?;
Ok(if should_split {
Vc::upcast(EcmascriptModuleFacadeModule::new(
Vc::upcast(self),
ModulePart::Facade,
))
} else {
Vc::upcast(self)
})
}
}
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl MergeableModule for EcmascriptModuleAsset { impl MergeableModule for EcmascriptModuleAsset {
#[turbo_tasks::function] #[turbo_tasks::function]
......
...@@ -49,7 +49,7 @@ use crate::{ ...@@ -49,7 +49,7 @@ use crate::{
util::throw_module_not_found_expr, util::throw_module_not_found_expr,
}, },
runtime_functions::{TURBOPACK_EXTERNAL_IMPORT, TURBOPACK_EXTERNAL_REQUIRE, TURBOPACK_IMPORT}, runtime_functions::{TURBOPACK_EXTERNAL_IMPORT, TURBOPACK_EXTERNAL_REQUIRE, TURBOPACK_IMPORT},
tree_shake::{TURBOPACK_PART_IMPORT_SOURCE, asset::EcmascriptModulePartAsset}, tree_shake::{TURBOPACK_PART_IMPORT_SOURCE, part::module::EcmascriptModulePartAsset},
utils::module_id_to_lit, utils::module_id_to_lit,
}; };
......
...@@ -2,6 +2,7 @@ use std::{borrow::Cow, collections::BTreeMap, ops::ControlFlow}; ...@@ -2,6 +2,7 @@ use std::{borrow::Cow, collections::BTreeMap, ops::ControlFlow};
use anyhow::{Result, bail}; use anyhow::{Result, bail};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use indexmap::map::Entry;
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use swc_core::{ use swc_core::{
common::{DUMMY_SP, SyntaxContext}, common::{DUMMY_SP, SyntaxContext},
...@@ -32,7 +33,7 @@ use crate::{ ...@@ -32,7 +33,7 @@ use crate::{
magic_identifier, magic_identifier,
references::esm::base::ReferencedAsset, references::esm::base::ReferencedAsset,
runtime_functions::{TURBOPACK_DYNAMIC, TURBOPACK_ESM}, runtime_functions::{TURBOPACK_DYNAMIC, TURBOPACK_ESM},
tree_shake::asset::EcmascriptModulePartAsset, tree_shake::part::module::EcmascriptModulePartAsset,
utils::module_id_to_lit, utils::module_id_to_lit,
}; };
...@@ -157,15 +158,6 @@ pub async fn follow_reexports( ...@@ -157,15 +158,6 @@ pub async fn follow_reexports(
let mut module = module; let mut module = module;
let mut export_name = export_name; let mut export_name = export_name;
loop { loop {
let exports = module.get_exports().await?;
let EcmascriptExports::EsmExports(exports) = &*exports else {
return Ok(FollowExportsResult::cell(FollowExportsResult {
module,
export_name: Some(export_name),
ty: FoundExportType::Dynamic,
}));
};
if !ignore_side_effects if !ignore_side_effects
&& *module.side_effects().await? != ModuleSideEffects::SideEffectFree && *module.side_effects().await? != ModuleSideEffects::SideEffectFree
{ {
...@@ -180,6 +172,15 @@ pub async fn follow_reexports( ...@@ -180,6 +172,15 @@ pub async fn follow_reexports(
} }
ignore_side_effects = false; ignore_side_effects = false;
let exports = module.get_exports().await?;
let EcmascriptExports::EsmExports(exports) = &*exports else {
return Ok(FollowExportsResult::cell(FollowExportsResult {
module,
export_name: Some(export_name),
ty: FoundExportType::Dynamic,
}));
};
// Try to find the export in the local exports // Try to find the export in the local exports
let exports_ref = exports.await?; let exports_ref = exports.await?;
if let Some(export) = exports_ref.exports.get(&export_name) { if let Some(export) = exports_ref.exports.get(&export_name) {
...@@ -198,17 +199,29 @@ pub async fn follow_reexports( ...@@ -198,17 +199,29 @@ 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 {
}
return match &result.dynamic_exporting_modules[..] {
[] => Ok(FollowExportsResult {
module, module,
export_name: Some(export_name), export_name: Some(export_name),
ty: FoundExportType::NotFound, ty: FoundExportType::NotFound,
}));
} }
.cell()), FindExportFromReexportsResult::EsmExport(esm_export) => {
match handle_declared_export(module, export_name, esm_export).await? {
ControlFlow::Continue((m, n)) => {
module = m.to_resolved().await?;
export_name = n;
continue;
}
ControlFlow::Break(result) => {
return Ok(result.cell());
}
}
}
FindExportFromReexportsResult::Dynamic(dynamic_exporting_modules) => {
return match &dynamic_exporting_modules[..] {
[] => unreachable!(),
[module] => Ok(FollowExportsResult { [module] => Ok(FollowExportsResult {
module: *module, module: *module,
export_name: Some(export_name), export_name: Some(export_name),
...@@ -223,6 +236,8 @@ pub async fn follow_reexports( ...@@ -223,6 +236,8 @@ pub async fn follow_reexports(
.cell()), .cell()),
}; };
} }
}
}
return Ok(FollowExportsResult::cell(FollowExportsResult { return Ok(FollowExportsResult::cell(FollowExportsResult {
module, module,
...@@ -279,9 +294,10 @@ async fn handle_declared_export( ...@@ -279,9 +294,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]
...@@ -310,18 +326,26 @@ async fn find_export_from_reexports( ...@@ -310,18 +326,26 @@ 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
} else {
FindExportFromReexportsResult::Dynamic(
all_export_names.dynamic_exporting_modules.clone(),
)
} }
.cell()) .cell(),
)
} }
#[turbo_tasks::value] #[turbo_tasks::value]
struct AllExportNamesResult { struct AllExportNamesResult {
/// A map from export name to how each export is defined.
#[bincode(with = "turbo_bincode::indexmap")] #[bincode(with = "turbo_bincode::indexmap")]
esm_exports: FxIndexMap<RcStr, ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>>, 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>>>,
} }
...@@ -341,7 +365,12 @@ async fn get_all_export_names( ...@@ -341,7 +365,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()
...@@ -350,7 +379,7 @@ async fn get_all_export_names( ...@@ -350,7 +379,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
}, },
...@@ -364,7 +393,7 @@ async fn get_all_export_names( ...@@ -364,7 +393,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());
...@@ -380,35 +409,45 @@ async fn get_all_export_names( ...@@ -380,35 +409,45 @@ async fn get_all_export_names(
#[turbo_tasks::value] #[turbo_tasks::value]
pub struct ExpandStarResult { pub struct ExpandStarResult {
#[bincode(with = "turbo_bincode::indexmap")] #[bincode(with = "turbo_bincode::indexmap")]
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(asset); if let Entry::Vacant(entry) = esm_exports.entry(key.clone()) {
entry.insert(match esm_export {
EsmExport::LocalBinding(_, liveness) => EsmExport::ImportedBinding(
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()));
} }
} }
} }
...@@ -559,7 +598,7 @@ impl EsmExports { ...@@ -559,7 +598,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" {
......
...@@ -3087,12 +3087,7 @@ async fn handle_free_var_reference( ...@@ -3087,12 +3087,7 @@ async fn handle_free_var_reference(
span.hi.to_u32(), span.hi.to_u32(),
), ),
Default::default(), Default::default(),
match state.tree_shaking_mode { export.clone().map(ModulePart::export),
Some(
TreeShakingMode::ModuleFragments | TreeShakingMode::ReexportsOnly,
) => export.clone().map(ModulePart::export),
None => None,
},
ImportUsage::TopLevel, ImportUsage::TopLevel,
state.import_externals, state.import_externals,
state.tree_shaking_mode, state.tree_shaking_mode,
......
This diff is collapsed.
...@@ -31,35 +31,19 @@ use crate::{ ...@@ -31,35 +31,19 @@ use crate::{
side_effect_optimization::reference::EcmascriptModulePartReference, side_effect_optimization::reference::EcmascriptModulePartReference,
}; };
/// A module derived from an original ecmascript module that only contains all /// A module derived from an original ecmascript module that contains all
/// the reexports from that module and also reexports the locals from /// the reexports from that module and also reexports the locals from
/// [EcmascriptModuleLocalsModule]. It allows to follow /// [EcmascriptModuleLocalsModule].
#[turbo_tasks::value] #[turbo_tasks::value]
pub struct EcmascriptModuleFacadeModule { pub struct EcmascriptModuleFacadeModule {
module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>, module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
/// The part of the module that this facade represents.
/// ModulePart::Facade | ModulePart::RenamedExport |
/// ModulePart::RenamedNamespace
part: ModulePart,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl EcmascriptModuleFacadeModule { impl EcmascriptModuleFacadeModule {
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn new( pub fn new(module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>) -> Vc<Self> {
module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>, EcmascriptModuleFacadeModule { module }.cell()
part: ModulePart,
) -> Vc<Self> {
debug_assert!(
matches!(
part,
ModulePart::Facade
| ModulePart::RenamedExport { .. }
| ModulePart::RenamedNamespace { .. }
),
"{part:?} is unexpected for EcmascriptModuleFacadeModule"
);
EcmascriptModuleFacadeModule { module, part }.cell()
} }
#[turbo_tasks::function] #[turbo_tasks::function]
...@@ -88,10 +72,7 @@ impl EcmascriptModuleFacadeModule { ...@@ -88,10 +72,7 @@ impl EcmascriptModuleFacadeModule {
Vec<ResolvedVc<EcmascriptModulePartReference>>, Vec<ResolvedVc<EcmascriptModulePartReference>>,
ResolvedVc<EsmAssetReferences>, ResolvedVc<EsmAssetReferences>,
)> { )> {
Ok(match &self.part { let Some(module) = ResolvedVc::try_sidecast::<Box<dyn EcmascriptAnalyzable>>(self.module)
ModulePart::Facade => {
let Some(module) =
ResolvedVc::try_sidecast::<Box<dyn EcmascriptAnalyzable>>(self.module)
else { else {
bail!( bail!(
"Expected EcmascriptModuleAsset for a EcmascriptModuleFacadeModule with \ "Expected EcmascriptModuleAsset for a EcmascriptModuleFacadeModule with \
...@@ -99,7 +80,7 @@ impl EcmascriptModuleFacadeModule { ...@@ -99,7 +80,7 @@ impl EcmascriptModuleFacadeModule {
); );
}; };
let result = module.analyze().await?; let result = module.analyze().await?;
( Ok((
vec![ vec![
// TODO skip if side effect free and no local exports // TODO skip if side effect free and no local exports
EcmascriptModulePartReference::new_part( EcmascriptModulePartReference::new_part(
...@@ -111,38 +92,7 @@ impl EcmascriptModuleFacadeModule { ...@@ -111,38 +92,7 @@ impl EcmascriptModuleFacadeModule {
.await?, .await?,
], ],
result.esm_reexport_references, result.esm_reexport_references,
) ))
}
ModulePart::RenamedNamespace { .. } => (
vec![
EcmascriptModulePartReference::new_normal(
*self.module,
self.part.clone(),
ExportUsage::all(),
)
.to_resolved()
.await?,
],
EsmAssetReferences::empty().to_resolved().await?,
),
ModulePart::RenamedExport {
original_export, ..
} => (
vec![
EcmascriptModulePartReference::new_normal(
*self.module,
self.part.clone(),
ExportUsage::named(original_export.clone()),
)
.to_resolved()
.await?,
],
EsmAssetReferences::empty().to_resolved().await?,
),
_ => {
bail!("Unexpected ModulePart for EcmascriptModuleFacadeModule");
}
})
} }
} }
...@@ -150,7 +100,7 @@ impl EcmascriptModuleFacadeModule { ...@@ -150,7 +100,7 @@ impl EcmascriptModuleFacadeModule {
impl Module for EcmascriptModuleFacadeModule { impl Module for EcmascriptModuleFacadeModule {
#[turbo_tasks::function] #[turbo_tasks::function]
fn ident(&self) -> Vc<AssetIdent> { fn ident(&self) -> Vc<AssetIdent> {
self.module.ident().with_part(self.part.clone()) self.module.ident().with_part(ModulePart::Facade)
} }
#[turbo_tasks::function] #[turbo_tasks::function]
...@@ -183,14 +133,8 @@ impl Module for EcmascriptModuleFacadeModule { ...@@ -183,14 +133,8 @@ impl Module for EcmascriptModuleFacadeModule {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn side_effects(&self) -> Result<Vc<ModuleSideEffects>> { fn side_effects(&self) -> Vc<ModuleSideEffects> {
Ok(match self.part { ModuleSideEffects::ModuleEvaluationIsSideEffectFree.cell()
ModulePart::Facade => self.module.side_effects(),
ModulePart::RenamedExport { .. } | ModulePart::RenamedNamespace { .. } => {
ModuleSideEffects::SideEffectFree.cell()
}
_ => bail!("Unexpected ModulePart for EcmascriptModuleFacadeModule"),
})
} }
} }
...@@ -246,13 +190,8 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -246,13 +190,8 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule {
let mut exports = BTreeMap::new(); let mut exports = BTreeMap::new();
let mut star_exports = Vec::new(); let mut star_exports = Vec::new();
match &self.part { let EcmascriptExports::EsmExports(esm_exports) = &*self.module.get_exports().await? else {
ModulePart::Facade => { bail!("EcmascriptModuleFacadeModule must only be used on modules with EsmExports");
let EcmascriptExports::EsmExports(esm_exports) = *self.module.get_exports().await?
else {
bail!(
"EcmascriptModuleFacadeModule must only be used on modules with EsmExports"
);
}; };
let esm_exports = esm_exports.await?; let esm_exports = esm_exports.await?;
for (name, export) in &esm_exports.exports { for (name, export) in &esm_exports.exports {
...@@ -282,11 +221,7 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -282,11 +221,7 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule {
EsmExport::ImportedBinding(reference, imported_name, mutable) => { EsmExport::ImportedBinding(reference, imported_name, mutable) => {
exports.insert( exports.insert(
name, name,
EsmExport::ImportedBinding( EsmExport::ImportedBinding(*reference, imported_name.clone(), *mutable),
*reference,
imported_name.clone(),
*mutable,
),
); );
} }
EsmExport::Error => { EsmExport::Error => {
...@@ -295,44 +230,6 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -295,44 +230,6 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule {
} }
} }
star_exports.extend(esm_exports.star_exports.iter().copied()); star_exports.extend(esm_exports.star_exports.iter().copied());
}
ModulePart::RenamedExport {
original_export,
export,
} => {
exports.insert(
export.clone(),
EsmExport::ImportedBinding(
ResolvedVc::upcast(
EcmascriptModulePartReference::new_normal(
*self.module,
self.part.clone(),
ExportUsage::named(original_export.clone()),
)
.to_resolved()
.await?,
),
original_export.clone(),
false,
),
);
}
ModulePart::RenamedNamespace { export } => {
exports.insert(
export.clone(),
EsmExport::ImportedNamespace(ResolvedVc::upcast(
EcmascriptModulePartReference::new_normal(
*self.module,
self.part.clone(),
ExportUsage::all(),
)
.to_resolved()
.await?,
)),
);
}
_ => bail!("Unexpected ModulePart for EcmascriptModuleFacadeModule"),
}
let exports = EsmExports { let exports = EsmExports {
exports, exports,
......
...@@ -18,6 +18,7 @@ use crate::{ ...@@ -18,6 +18,7 @@ use crate::{
chunk::EcmascriptChunkPlaceable, chunk::EcmascriptChunkPlaceable,
code_gen::{CodeGeneration, CodeGenerationHoistedStmt}, code_gen::{CodeGeneration, CodeGenerationHoistedStmt},
references::esm::base::{ReferencedAsset, ReferencedAssetIdent}, references::esm::base::{ReferencedAsset, ReferencedAssetIdent},
rename::module::EcmascriptModuleRenameModule,
runtime_functions::TURBOPACK_IMPORT, runtime_functions::TURBOPACK_IMPORT,
side_effect_optimization::{ side_effect_optimization::{
facade::module::EcmascriptModuleFacadeModule, locals::module::EcmascriptModuleLocalsModule, facade::module::EcmascriptModuleFacadeModule, locals::module::EcmascriptModuleLocalsModule,
...@@ -101,11 +102,15 @@ impl ModuleReference for EcmascriptModulePartReference { ...@@ -101,11 +102,15 @@ impl ModuleReference for EcmascriptModulePartReference {
}; };
Vc::upcast::<Box<dyn Module>>(EcmascriptModuleLocalsModule::new(*module)) Vc::upcast::<Box<dyn Module>>(EcmascriptModuleLocalsModule::new(*module))
} }
ModulePart::Facade ModulePart::Facade => {
| ModulePart::RenamedExport { .. } Vc::upcast(EcmascriptModuleFacadeModule::new(*self.module))
| ModulePart::RenamedNamespace { .. } => Vc::upcast( }
EcmascriptModuleFacadeModule::new(*self.module, self.part.clone()), ModulePart::RenamedExport { .. } | ModulePart::RenamedNamespace { .. } => {
), Vc::upcast(EcmascriptModuleRenameModule::new(
*self.module,
self.part.clone(),
))
}
_ => { _ => {
bail!( bail!(
"Unexpected ModulePart \"{}\" for EcmascriptModulePartReference", "Unexpected ModulePart \"{}\" for EcmascriptModulePartReference",
......
...@@ -24,11 +24,11 @@ use crate::{ ...@@ -24,11 +24,11 @@ use crate::{
EcmascriptModuleAsset, EcmascriptParsable, analyzer::graph::EvalContext, parse::ParseResult, EcmascriptModuleAsset, EcmascriptParsable, analyzer::graph::EvalContext, parse::ParseResult,
}; };
pub mod asset;
mod graph; mod graph;
pub mod merge; pub mod merge;
mod optimizations; mod optimizations;
pub mod side_effect_module; pub mod part;
pub mod side_effects;
#[cfg(test)] #[cfg(test)]
mod tests; mod tests;
mod util; mod util;
......
...@@ -10,7 +10,6 @@ use turbopack_core::{ ...@@ -10,7 +10,6 @@ use turbopack_core::{
resolve::{ExportUsage, ModulePart}, resolve::{ExportUsage, ModulePart},
}; };
use super::{SplitResult, get_part_id, part_of_module, split_module};
use crate::{ use crate::{
AnalyzeEcmascriptModuleResult, EcmascriptAnalyzable, EcmascriptAnalyzableExt, AnalyzeEcmascriptModuleResult, EcmascriptAnalyzable, EcmascriptAnalyzableExt,
EcmascriptModuleAsset, EcmascriptModuleAssetType, EcmascriptModuleContent, EcmascriptModuleAsset, EcmascriptModuleAssetType, EcmascriptModuleContent,
...@@ -23,8 +22,11 @@ use crate::{ ...@@ -23,8 +22,11 @@ use crate::{
references::{ references::{
FollowExportsResult, analyze_ecmascript_module, esm::FoundExportType, follow_reexports, FollowExportsResult, analyze_ecmascript_module, esm::FoundExportType, follow_reexports,
}, },
side_effect_optimization::facade::module::EcmascriptModuleFacadeModule, rename::module::EcmascriptModuleRenameModule,
tree_shake::{Key, side_effect_module::SideEffectsModule}, tree_shake::{
Key, SplitResult, get_part_id, part_of_module, side_effects::module::SideEffectsModule,
split_module,
},
}; };
/// A reference to part of an ES module. /// A reference to part of an ES module.
...@@ -41,6 +43,7 @@ impl EcmascriptParsable for EcmascriptModulePartAsset { ...@@ -41,6 +43,7 @@ impl EcmascriptParsable for EcmascriptModulePartAsset {
#[turbo_tasks::function] #[turbo_tasks::function]
fn failsafe_parse(&self) -> Result<Vc<ParseResult>> { fn failsafe_parse(&self) -> Result<Vc<ParseResult>> {
let split_data = split_module(*self.full_module); let split_data = split_module(*self.full_module);
assert_ne!(self.part, ModulePart::Facade);
Ok(part_of_module(split_data, self.part.clone())) Ok(part_of_module(split_data, self.part.clone()))
} }
#[turbo_tasks::function] #[turbo_tasks::function]
...@@ -187,7 +190,7 @@ impl EcmascriptModulePartAsset { ...@@ -187,7 +190,7 @@ impl EcmascriptModulePartAsset {
*final_module *final_module
} else { } else {
ResolvedVc::upcast( ResolvedVc::upcast(
EcmascriptModuleFacadeModule::new( EcmascriptModuleRenameModule::new(
**final_module, **final_module,
ModulePart::renamed_export(new_export.clone(), export.clone()), ModulePart::renamed_export(new_export.clone(), export.clone()),
) )
...@@ -197,7 +200,7 @@ impl EcmascriptModulePartAsset { ...@@ -197,7 +200,7 @@ impl EcmascriptModulePartAsset {
} }
} else { } else {
ResolvedVc::upcast( ResolvedVc::upcast(
EcmascriptModuleFacadeModule::new( EcmascriptModuleRenameModule::new(
**final_module, **final_module,
ModulePart::renamed_namespace(export.clone()), ModulePart::renamed_namespace(export.clone()),
) )
......
...@@ -25,7 +25,7 @@ use crate::{ ...@@ -25,7 +25,7 @@ use crate::{
}; };
#[turbo_tasks::value] #[turbo_tasks::value]
pub(super) struct SideEffectsModule { pub struct SideEffectsModule {
/// Original module /// Original module
pub module: ResolvedVc<EcmascriptModuleAsset>, pub module: ResolvedVc<EcmascriptModuleAsset>,
/// The part of the original module that is the binding /// The part of the original module that is the binding
......
...@@ -54,8 +54,11 @@ use turbopack_ecmascript::{ ...@@ -54,8 +54,11 @@ use turbopack_ecmascript::{
external_module::{CachedExternalModule, CachedExternalTracingMode, CachedExternalType}, external_module::{CachedExternalModule, CachedExternalTracingMode, CachedExternalType},
follow_reexports, follow_reexports,
}, },
side_effect_optimization::facade::module::EcmascriptModuleFacadeModule, rename::module::EcmascriptModuleRenameModule,
tree_shake::asset::EcmascriptModulePartAsset, side_effect_optimization::{
facade::module::EcmascriptModuleFacadeModule, locals::module::EcmascriptModuleLocalsModule,
},
tree_shake::part::module::EcmascriptModulePartAsset,
}; };
use turbopack_node::transforms::webpack::{WebpackLoaderItem, WebpackLoaderItems, WebpackLoaders}; use turbopack_node::transforms::webpack::{WebpackLoaderItem, WebpackLoaderItems, WebpackLoaders};
use turbopack_resolve::{ use turbopack_resolve::{
...@@ -196,22 +199,36 @@ async fn apply_module_type( ...@@ -196,22 +199,36 @@ async fn apply_module_type(
)) ))
} }
Some(TreeShakingMode::ReexportsOnly) => { Some(TreeShakingMode::ReexportsOnly) => {
// Returns the split module if necessary due to re-exports if *module.get_exports().split_locals_and_reexports().await? {
if let Some(part) = part { if let Some(part) = part {
match part { match part {
ModulePart::Evaluation => Vc::upcast(module.get_locals_if_split()), ModulePart::Evaluation => {
Vc::upcast(EcmascriptModuleLocalsModule::new(*module))
}
ModulePart::Export(_) => { ModulePart::Export(_) => {
apply_reexport_tree_shaking(module.get_facade_if_split(), part) apply_reexport_tree_shaking(
Vc::upcast(
EcmascriptModuleFacadeModule::new(Vc::upcast(
*module,
))
.resolve()
.await?,
),
part,
)
.await? .await?
} }
_ => bail!( _ => bail!(
"Invalid module part \"{}\" for reexports only tree shaking \ "Invalid module part \"{}\" for reexports only tree \
mode", shaking mode",
part part
), ),
} }
} else { } else {
Vc::upcast(module.get_facade_if_split()) Vc::upcast(EcmascriptModuleFacadeModule::new(Vc::upcast(*module)))
}
} else {
Vc::upcast(*module)
} }
} }
None => Vc::upcast(*module), None => Vc::upcast(*module),
...@@ -292,13 +309,13 @@ async fn apply_reexport_tree_shaking( ...@@ -292,13 +309,13 @@ async fn apply_reexport_tree_shaking(
if *new_export == *export { if *new_export == *export {
Vc::upcast(**final_module) Vc::upcast(**final_module)
} else { } else {
Vc::upcast(EcmascriptModuleFacadeModule::new( Vc::upcast(EcmascriptModuleRenameModule::new(
**final_module, **final_module,
ModulePart::renamed_export(new_export.clone(), export.clone()), ModulePart::renamed_export(new_export.clone(), export.clone()),
)) ))
} }
} else { } else {
Vc::upcast(EcmascriptModuleFacadeModule::new( Vc::upcast(EcmascriptModuleRenameModule::new(
**final_module, **final_module,
ModulePart::renamed_namespace(export.clone()), ModulePart::renamed_namespace(export.clone()),
)) ))
......
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