Commit 7e21afc6 authored by Tobias Koppers's avatar Tobias Koppers

Turbopack: Extract rename module and share between side effects optimization and tree shaking

parent 817ec9bd
...@@ -22,6 +22,7 @@ pub mod minify; ...@@ -22,6 +22,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;
......
use anyhow::Result;
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{
chunk::{AsyncModuleInfo, ChunkItem, ChunkType, ChunkingContext},
ident::AssetIdent,
module::Module,
output::OutputAssetsReference,
};
use crate::{
EcmascriptAnalyzableExt,
chunk::{
EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkPlaceable,
EcmascriptChunkType,
},
rename::module::EcmascriptModuleRenameModule,
};
/// The chunk item for [EcmascriptModuleRenameModule].
#[turbo_tasks::value(shared)]
pub struct EcmascriptModuleRenameChunkItem {
pub(crate) module: ResolvedVc<EcmascriptModuleRenameModule>,
pub(crate) chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
}
impl OutputAssetsReference for EcmascriptModuleRenameChunkItem {}
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for EcmascriptModuleRenameChunkItem {
#[turbo_tasks::function]
fn content(self: Vc<Self>) -> Vc<EcmascriptChunkItemContent> {
panic!("content() should never be called");
}
#[turbo_tasks::function]
fn content_with_async_module_info(
&self,
async_module_info: Option<Vc<AsyncModuleInfo>>,
_estimated: bool,
) -> Result<Vc<EcmascriptChunkItemContent>> {
let chunking_context = self.chunking_context;
let content = self
.module
.module_content(*chunking_context, async_module_info);
let async_module_options = self
.module
.get_async_module()
.module_options(async_module_info);
Ok(EcmascriptChunkItemContent::new(
content,
*chunking_context,
async_module_options,
))
}
}
#[turbo_tasks::value_impl]
impl ChunkItem for EcmascriptModuleRenameChunkItem {
#[turbo_tasks::function]
fn asset_ident(&self) -> Vc<AssetIdent> {
self.module.ident()
}
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
async fn ty(&self) -> Result<Vc<Box<dyn ChunkType>>> {
Ok(Vc::upcast(
Vc::<EcmascriptChunkType>::default().resolve().await?,
))
}
#[turbo_tasks::function]
fn module(&self) -> Vc<Box<dyn Module>> {
*ResolvedVc::upcast(self.module)
}
}
This diff is collapsed.
...@@ -28,35 +28,19 @@ use crate::{ ...@@ -28,35 +28,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]
...@@ -85,10 +69,7 @@ impl EcmascriptModuleFacadeModule { ...@@ -85,10 +69,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 \
...@@ -96,7 +77,7 @@ impl EcmascriptModuleFacadeModule { ...@@ -96,7 +77,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(
...@@ -108,38 +89,7 @@ impl EcmascriptModuleFacadeModule { ...@@ -108,38 +89,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");
}
})
} }
} }
...@@ -147,7 +97,7 @@ impl EcmascriptModuleFacadeModule { ...@@ -147,7 +97,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]
...@@ -180,14 +130,8 @@ impl Module for EcmascriptModuleFacadeModule { ...@@ -180,14 +130,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"),
})
} }
} }
...@@ -243,13 +187,8 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -243,13 +187,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 {
...@@ -279,11 +218,7 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -279,11 +218,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 => {
...@@ -292,44 +227,6 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -292,44 +227,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,
......
...@@ -19,6 +19,7 @@ use crate::{ ...@@ -19,6 +19,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,
...@@ -108,11 +109,15 @@ impl ModuleReference for EcmascriptModulePartReference { ...@@ -108,11 +109,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",
......
...@@ -19,7 +19,7 @@ use crate::{ ...@@ -19,7 +19,7 @@ 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::{ tree_shake::{
Key, SplitResult, get_part_id, part::chunk_item::EcmascriptModulePartChunkItem, Key, SplitResult, get_part_id, part::chunk_item::EcmascriptModulePartChunkItem,
part_of_module, side_effects::module::SideEffectsModule, split_module, part_of_module, side_effects::module::SideEffectsModule, split_module,
...@@ -187,7 +187,7 @@ impl EcmascriptModulePartAsset { ...@@ -187,7 +187,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 +197,7 @@ impl EcmascriptModulePartAsset { ...@@ -197,7 +197,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()),
) )
......
...@@ -51,6 +51,7 @@ use turbopack_ecmascript::{ ...@@ -51,6 +51,7 @@ use turbopack_ecmascript::{
external_module::{CachedExternalModule, CachedExternalTracingMode, CachedExternalType}, external_module::{CachedExternalModule, CachedExternalTracingMode, CachedExternalType},
follow_reexports, follow_reexports,
}, },
rename::module::EcmascriptModuleRenameModule,
side_effect_optimization::{ side_effect_optimization::{
facade::module::EcmascriptModuleFacadeModule, locals::module::EcmascriptModuleLocalsModule, facade::module::EcmascriptModuleFacadeModule, locals::module::EcmascriptModuleLocalsModule,
}, },
...@@ -202,10 +203,9 @@ async fn apply_module_type( ...@@ -202,10 +203,9 @@ async fn apply_module_type(
ModulePart::Export(_) => { ModulePart::Export(_) => {
apply_reexport_tree_shaking( apply_reexport_tree_shaking(
Vc::upcast( Vc::upcast(
EcmascriptModuleFacadeModule::new( EcmascriptModuleFacadeModule::new(Vc::upcast(
Vc::upcast(*module), *module,
ModulePart::facade(), ))
)
.resolve() .resolve()
.await?, .await?,
), ),
...@@ -220,10 +220,7 @@ async fn apply_module_type( ...@@ -220,10 +220,7 @@ async fn apply_module_type(
), ),
} }
} else { } else {
Vc::upcast(EcmascriptModuleFacadeModule::new( Vc::upcast(EcmascriptModuleFacadeModule::new(Vc::upcast(*module)))
Vc::upcast(*module),
ModulePart::facade(),
))
} }
} else { } else {
Vc::upcast(*module) Vc::upcast(*module)
...@@ -308,13 +305,13 @@ async fn apply_reexport_tree_shaking( ...@@ -308,13 +305,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