-
Notifications
You must be signed in to change notification settings - Fork 27.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Turbopack chunking: use ChunkableModules in
chunk_content, not Chun…
…kItems (#74040) This: - Replaces all use of chunk items in the interface for `chunk_content` with ChunkableModules - Moves `is_self_async` from `ChunkItem` to `Module` - Renames `AvailableChunkItems` to `AvailableModules` and all associated structs and methods, using modules in place of chunk items --------- Co-authored-by: Tobias Koppers <[email protected]>
- Loading branch information
1 parent
40a4c3b
commit 4ef926b
Showing
31 changed files
with
652 additions
and
468 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
turbopack/crates/turbopack-core/src/chunk/available_modules.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| use anyhow::Result; | ||
| use serde::{Deserialize, Serialize}; | ||
| use turbo_tasks::{ | ||
| debug::ValueDebugFormat, trace::TraceRawVcs, FxIndexMap, NonLocalValue, ResolvedVc, | ||
| TryFlatJoinIterExt, TryJoinIterExt, ValueToString, Vc, | ||
| }; | ||
| use turbo_tasks_hash::Xxh3Hash64Hasher; | ||
|
|
||
| use super::ChunkableModule; | ||
| use crate::module::Module; | ||
|
|
||
| #[derive( | ||
| PartialEq, Eq, TraceRawVcs, Copy, Clone, Serialize, Deserialize, ValueDebugFormat, NonLocalValue, | ||
| )] | ||
| pub struct AvailableModulesInfo { | ||
| pub is_async: bool, | ||
| } | ||
|
|
||
| #[turbo_tasks::value(transparent)] | ||
| pub struct OptionAvailableModulesInfo(Option<AvailableModulesInfo>); | ||
|
|
||
| #[turbo_tasks::value(transparent)] | ||
| pub struct AvailableModuleInfoMap( | ||
| FxIndexMap<ResolvedVc<Box<dyn ChunkableModule>>, AvailableModulesInfo>, | ||
| ); | ||
|
|
||
| /// Allows to gather information about which assets are already available. | ||
| /// Adding more roots will form a linked list like structure to allow caching | ||
| /// `include` queries. | ||
| #[turbo_tasks::value] | ||
| pub struct AvailableModules { | ||
| parent: Option<ResolvedVc<AvailableModules>>, | ||
| modules: ResolvedVc<AvailableModuleInfoMap>, | ||
| } | ||
|
|
||
| #[turbo_tasks::value_impl] | ||
| impl AvailableModules { | ||
| #[turbo_tasks::function] | ||
| pub fn new(modules: ResolvedVc<AvailableModuleInfoMap>) -> Vc<Self> { | ||
| AvailableModules { | ||
| parent: None, | ||
| modules, | ||
| } | ||
| .cell() | ||
| } | ||
|
|
||
| #[turbo_tasks::function] | ||
| pub async fn with_modules( | ||
| self: ResolvedVc<Self>, | ||
| modules: ResolvedVc<AvailableModuleInfoMap>, | ||
| ) -> Result<Vc<Self>> { | ||
| let modules = modules | ||
| .await? | ||
| .into_iter() | ||
| .map(|(&module, &info)| async move { | ||
| Ok(self.get(*module).await?.is_none().then_some((module, info))) | ||
| }) | ||
| .try_flat_join() | ||
| .await?; | ||
| Ok(AvailableModules { | ||
| parent: Some(self), | ||
| modules: ResolvedVc::cell(modules.into_iter().collect()), | ||
| } | ||
| .cell()) | ||
| } | ||
|
|
||
| #[turbo_tasks::function] | ||
| pub async fn hash(&self) -> Result<Vc<u64>> { | ||
| let mut hasher = Xxh3Hash64Hasher::new(); | ||
| if let Some(parent) = self.parent { | ||
| hasher.write_value(parent.hash().await?); | ||
| } else { | ||
| hasher.write_value(0u64); | ||
| } | ||
| let item_idents = self | ||
| .modules | ||
| .await? | ||
| .iter() | ||
| .map(|(&module, _)| module.ident().to_string()) | ||
| .try_join() | ||
| .await?; | ||
| for ident in item_idents { | ||
| hasher.write_value(ident); | ||
| } | ||
| Ok(Vc::cell(hasher.finish())) | ||
| } | ||
|
|
||
| #[turbo_tasks::function] | ||
| pub async fn get( | ||
| &self, | ||
| module: ResolvedVc<Box<dyn ChunkableModule>>, | ||
| ) -> Result<Vc<OptionAvailableModulesInfo>> { | ||
| if let Some(&info) = self.modules.await?.get(&module) { | ||
| return Ok(Vc::cell(Some(info))); | ||
| }; | ||
| if let Some(parent) = self.parent { | ||
| return Ok(parent.get(*module)); | ||
| } | ||
| Ok(Vc::cell(None)) | ||
| } | ||
| } |
Oops, something went wrong.