Commit 817ec9bd authored by Tobias Koppers's avatar Tobias Koppers

Turbopack: organize tree shaking code

parent b1cc500f
...@@ -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)
......
...@@ -46,7 +46,7 @@ use crate::{ ...@@ -46,7 +46,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,
}; };
......
...@@ -34,7 +34,7 @@ use crate::{ ...@@ -34,7 +34,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,
}; };
......
...@@ -24,12 +24,11 @@ use crate::{ ...@@ -24,12 +24,11 @@ use crate::{
EcmascriptModuleAsset, EcmascriptParsable, analyzer::graph::EvalContext, parse::ParseResult, EcmascriptModuleAsset, EcmascriptParsable, analyzer::graph::EvalContext, parse::ParseResult,
}; };
pub mod asset;
pub mod chunk_item;
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;
......
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, EcmascriptChunkType},
tree_shake::part::module::EcmascriptModulePartAsset,
};
/// This is an implementation of [ChunkItem] for
/// [Vc<EcmascriptModulePartAsset>].
///
/// This is a pointer to a part of an ES module.
#[turbo_tasks::value(shared)]
pub struct EcmascriptModulePartChunkItem {
pub(super) module: ResolvedVc<EcmascriptModulePartAsset>,
pub(super) chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
}
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for EcmascriptModulePartChunkItem {
#[turbo_tasks::function]
fn content(self: Vc<Self>) -> Vc<EcmascriptChunkItemContent> {
panic!("content() should never be called");
}
#[turbo_tasks::function]
async fn content_with_async_module_info(
&self,
async_module_info: Option<Vc<AsyncModuleInfo>>,
_estimated: bool,
) -> Result<Vc<EcmascriptChunkItemContent>> {
let analyze = self.module.analyze();
let analyze_ref = analyze.await?;
let async_module_options = analyze_ref.async_module.module_options(async_module_info);
let content = self
.module
.module_content(*self.chunking_context, async_module_info);
Ok(EcmascriptChunkItemContent::new(
content,
*self.chunking_context,
async_module_options,
))
}
}
#[turbo_tasks::value_impl]
impl OutputAssetsReference for EcmascriptModulePartChunkItem {}
#[turbo_tasks::value_impl]
impl ChunkItem for EcmascriptModulePartChunkItem {
#[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)
}
}
...@@ -10,10 +10,6 @@ use turbopack_core::{ ...@@ -10,10 +10,6 @@ use turbopack_core::{
resolve::{ExportUsage, ModulePart}, resolve::{ExportUsage, ModulePart},
}; };
use super::{
SplitResult, chunk_item::EcmascriptModulePartChunkItem, get_part_id, part_of_module,
split_module,
};
use crate::{ use crate::{
AnalyzeEcmascriptModuleResult, EcmascriptAnalyzable, EcmascriptModuleAsset, AnalyzeEcmascriptModuleResult, EcmascriptAnalyzable, EcmascriptModuleAsset,
EcmascriptModuleAssetType, EcmascriptModuleContent, EcmascriptModuleContentOptions, EcmascriptModuleAssetType, EcmascriptModuleContent, EcmascriptModuleContentOptions,
...@@ -24,7 +20,10 @@ use crate::{ ...@@ -24,7 +20,10 @@ use crate::{
FollowExportsResult, analyze_ecmascript_module, esm::FoundExportType, follow_reexports, FollowExportsResult, analyze_ecmascript_module, esm::FoundExportType, follow_reexports,
}, },
side_effect_optimization::facade::module::EcmascriptModuleFacadeModule, side_effect_optimization::facade::module::EcmascriptModuleFacadeModule,
tree_shake::{Key, side_effect_module::SideEffectsModule}, tree_shake::{
Key, SplitResult, get_part_id, part::chunk_item::EcmascriptModulePartChunkItem,
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 +40,7 @@ impl EcmascriptParsable for EcmascriptModulePartAsset { ...@@ -41,6 +40,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]
......
...@@ -2,93 +2,24 @@ use anyhow::Result; ...@@ -2,93 +2,24 @@ use anyhow::Result;
use turbo_tasks::{ResolvedVc, ValueDefault, Vc}; use turbo_tasks::{ResolvedVc, ValueDefault, Vc};
use turbo_tasks_fs::rope::RopeBuilder; use turbo_tasks_fs::rope::RopeBuilder;
use turbopack_core::{ use turbopack_core::{
chunk::{AsyncModuleInfo, ChunkItem, ChunkType, ChunkingContext, ModuleChunkItemIdExt}, chunk::{ChunkItem, ChunkType, ChunkingContext, ModuleChunkItemIdExt},
ident::AssetIdent, ident::AssetIdent,
module::Module, module::Module,
module_graph::ModuleGraph, module_graph::ModuleGraph,
output::OutputAssetsReference, output::OutputAssetsReference,
}; };
use super::asset::EcmascriptModulePartAsset;
use crate::{ use crate::{
EcmascriptAnalyzableExt,
chunk::{ chunk::{
EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkItemOptions, EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkItemOptions,
EcmascriptChunkPlaceable, EcmascriptChunkType, item::RewriteSourcePath, EcmascriptChunkPlaceable, EcmascriptChunkType, item::RewriteSourcePath,
}, },
references::async_module::AsyncModuleOptions, references::async_module::AsyncModuleOptions,
runtime_functions::{TURBOPACK_EXPORT_NAMESPACE, TURBOPACK_IMPORT}, runtime_functions::{TURBOPACK_EXPORT_NAMESPACE, TURBOPACK_IMPORT},
tree_shake::side_effect_module::SideEffectsModule, tree_shake::side_effects::module::SideEffectsModule,
utils::StringifyModuleId, utils::StringifyModuleId,
}; };
/// This is an implementation of [ChunkItem] for
/// [Vc<EcmascriptModulePartAsset>].
///
/// This is a pointer to a part of an ES module.
#[turbo_tasks::value(shared)]
pub struct EcmascriptModulePartChunkItem {
pub(super) module: ResolvedVc<EcmascriptModulePartAsset>,
pub(super) chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
}
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for EcmascriptModulePartChunkItem {
#[turbo_tasks::function]
fn content(self: Vc<Self>) -> Vc<EcmascriptChunkItemContent> {
panic!("content() should never be called");
}
#[turbo_tasks::function]
async fn content_with_async_module_info(
&self,
async_module_info: Option<Vc<AsyncModuleInfo>>,
_estimated: bool,
) -> Result<Vc<EcmascriptChunkItemContent>> {
let analyze = self.module.analyze();
let analyze_ref = analyze.await?;
let async_module_options = analyze_ref.async_module.module_options(async_module_info);
let content = self
.module
.module_content(*self.chunking_context, async_module_info);
Ok(EcmascriptChunkItemContent::new(
content,
*self.chunking_context,
async_module_options,
))
}
}
#[turbo_tasks::value_impl]
impl OutputAssetsReference for EcmascriptModulePartChunkItem {}
#[turbo_tasks::value_impl]
impl ChunkItem for EcmascriptModulePartChunkItem {
#[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)
}
}
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub(super) struct SideEffectsModuleChunkItem { pub(super) struct SideEffectsModuleChunkItem {
pub module: ResolvedVc<SideEffectsModule>, pub module: ResolvedVc<SideEffectsModule>,
......
...@@ -13,11 +13,11 @@ use turbopack_core::{ ...@@ -13,11 +13,11 @@ use turbopack_core::{
use crate::{ use crate::{
EcmascriptModuleAsset, EcmascriptModuleAsset,
chunk::{EcmascriptChunkPlaceable, EcmascriptExports}, chunk::{EcmascriptChunkPlaceable, EcmascriptExports},
tree_shake::chunk_item::SideEffectsModuleChunkItem, tree_shake::side_effects::chunk_item::SideEffectsModuleChunkItem,
}; };
#[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,7 +54,7 @@ use turbopack_ecmascript::{ ...@@ -54,7 +54,7 @@ use turbopack_ecmascript::{
side_effect_optimization::{ side_effect_optimization::{
facade::module::EcmascriptModuleFacadeModule, locals::module::EcmascriptModuleLocalsModule, facade::module::EcmascriptModuleFacadeModule, locals::module::EcmascriptModuleLocalsModule,
}, },
tree_shake::asset::EcmascriptModulePartAsset, tree_shake::part::module::EcmascriptModulePartAsset,
}; };
use turbopack_json::JsonModuleAsset; use turbopack_json::JsonModuleAsset;
use turbopack_resolve::{ use turbopack_resolve::{
......
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