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

Turbopack: add flags to AvailabilityInfo (#85771)

### What?

Change AvailabilityInfo from an enum to a struct with flags.
parent 6499a155
......@@ -9587,6 +9587,7 @@ dependencies = [
"anyhow",
"async-trait",
"auto-hash-map",
"bitfield",
"browserslist-rs",
"bytes-str",
"const_format",
......
......@@ -1247,7 +1247,7 @@ impl AppEndpoint {
client_shared_chunk_group.assets.owned().await?,
)
} else {
(AvailabilityInfo::Root, vec![])
(AvailabilityInfo::root(), vec![])
};
let per_page_module_graph = *project.per_page_module_graph().await?;
......@@ -1710,7 +1710,7 @@ impl AppEndpoint {
.collect(),
),
module_graph,
AvailabilityInfo::Root,
AvailabilityInfo::root(),
);
let chunk_group2_assets = chunking_context.evaluated_chunk_group_assets(
......@@ -1752,7 +1752,7 @@ impl AppEndpoint {
// TODO this should be ChunkGroup::Shared
ChunkGroup::Entry(server_utils),
module_graph,
AvailabilityInfo::Root,
AvailabilityInfo::root(),
)
.to_resolved()
.await?;
......
......@@ -107,7 +107,7 @@ impl InstrumentationEndpoint {
module.ident(),
ChunkGroup::Entry(vec![module]),
module_graph,
AvailabilityInfo::Root,
AvailabilityInfo::root(),
))
}
......@@ -134,7 +134,7 @@ impl InstrumentationEndpoint {
module_graph,
OutputAssets::empty(),
OutputAssets::empty(),
AvailabilityInfo::Root,
AvailabilityInfo::root(),
)
.await?;
Ok(*chunk)
......
......@@ -119,7 +119,7 @@ impl MiddlewareEndpoint {
module.ident(),
ChunkGroup::Entry(vec![module]),
module_graph,
AvailabilityInfo::Root,
AvailabilityInfo::root(),
);
Ok(edge_chunk_grou)
}
......@@ -147,7 +147,7 @@ impl MiddlewareEndpoint {
module_graph,
OutputAssets::empty(),
OutputAssets::empty(),
AvailabilityInfo::Root,
AvailabilityInfo::root(),
)
.await?;
Ok(*chunk)
......
......@@ -781,7 +781,7 @@ impl PageEndpoint {
AssetIdent::from_path(this.page.await?.base_path.clone()),
ChunkGroup::Entry(evaluatable_assets),
module_graph,
AvailabilityInfo::Root,
AvailabilityInfo::root(),
);
Ok(client_chunk_group)
......
......@@ -33,7 +33,7 @@ pub async fn get_app_client_shared_chunk_group(
.collect(),
),
module_graph,
AvailabilityInfo::Root,
AvailabilityInfo::root(),
)
.resolve()
.await
......
......@@ -680,15 +680,9 @@ impl ChunkingContext for BrowserChunkingContext {
if this.enable_hot_module_replacement {
let mut ident = ident;
match input_availability_info {
AvailabilityInfo::Root => {}
AvailabilityInfo::Untracked => {
ident = ident.with_modifier(rcstr!("untracked"));
}
AvailabilityInfo::Complete { available_modules } => {
ident =
ident.with_modifier(available_modules.hash().await?.to_string().into());
}
if let Some(input_availability_info_ident) = input_availability_info.ident().await?
{
ident = ident.with_modifier(input_availability_info_ident);
}
let other_assets = Vc::cell(assets.clone());
assets.push(
......@@ -764,15 +758,9 @@ impl ChunkingContext for BrowserChunkingContext {
if this.enable_hot_module_replacement {
let mut ident = ident;
match input_availability_info {
AvailabilityInfo::Root => {}
AvailabilityInfo::Untracked => {
ident = ident.with_modifier(rcstr!("untracked"));
}
AvailabilityInfo::Complete { available_modules } => {
ident =
ident.with_modifier(available_modules.hash().await?.to_string().into());
}
if let Some(input_availability_info_ident) = input_availability_info.ident().await?
{
ident = ident.with_modifier(input_availability_info_ident);
}
assets.push(
self.generate_chunk_list_register_chunk(
......
......@@ -444,7 +444,7 @@ async fn build_internal(
[ResolvedVc::upcast(ecmascript)].into_iter().collect(),
),
module_graph,
AvailabilityInfo::Root,
AvailabilityInfo::root(),
),
Target::Node => OutputAssetsWithReferenced {
assets: ResolvedVc::cell(vec![
......@@ -464,7 +464,7 @@ async fn build_internal(
module_graph,
OutputAssets::empty(),
OutputAssets::empty(),
AvailabilityInfo::Root,
AvailabilityInfo::root(),
)
.await?
.asset,
......
......@@ -16,6 +16,7 @@ workspace = true
anyhow = { workspace = true }
async-trait = { workspace = true }
auto-hash-map = { workspace = true }
bitfield = { workspace = true }
browserslist-rs = { workspace = true }
bytes-str = { workspace = true }
const_format = { workspace = true }
......
use anyhow::Result;
use bitfield::bitfield;
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr;
use turbo_tasks::{NonLocalValue, ResolvedVc, TaskInput, Vc, trace::TraceRawVcs};
use super::available_modules::{AvailableModules, AvailableModulesSet};
bitfield! {
#[derive(Clone, Copy, Default, TaskInput, TraceRawVcs, NonLocalValue, Serialize, Deserialize, PartialEq, Eq, Hash)]
pub struct AvailabilityFlags(u8);
impl Debug;
}
#[derive(
Eq,
PartialEq,
......@@ -17,40 +25,48 @@ use super::available_modules::{AvailableModules, AvailableModulesSet};
Serialize,
Deserialize,
)]
pub enum AvailabilityInfo {
/// Availability of modules is not tracked
Untracked,
/// Availability of modules is tracked, but no modules are available
Root,
pub struct AvailabilityInfo {
flags: AvailabilityFlags,
/// There are modules already available.
Complete {
available_modules: ResolvedVc<AvailableModules>,
},
available_modules: Option<ResolvedVc<AvailableModules>>,
}
impl AvailabilityInfo {
pub fn available_modules(&self) -> Option<ResolvedVc<AvailableModules>> {
match self {
Self::Untracked => None,
Self::Root => None,
Self::Complete {
available_modules, ..
} => Some(*available_modules),
pub fn root() -> Self {
Self {
flags: AvailabilityFlags::default(),
available_modules: None,
}
}
pub fn available_modules(&self) -> Option<ResolvedVc<AvailableModules>> {
self.available_modules
}
pub async fn with_modules(self, modules: Vc<AvailableModulesSet>) -> Result<Self> {
Ok(match self {
AvailabilityInfo::Untracked => AvailabilityInfo::Untracked,
AvailabilityInfo::Root => AvailabilityInfo::Complete {
available_modules: AvailableModules::new(modules).to_resolved().await?,
},
AvailabilityInfo::Complete { available_modules } => AvailabilityInfo::Complete {
available_modules: available_modules
.with_modules(modules)
.to_resolved()
.await?,
},
Ok(if let Some(available_modules) = self.available_modules {
Self {
flags: self.flags,
available_modules: Some(
available_modules
.with_modules(modules)
.to_resolved()
.await?,
),
}
} else {
Self {
flags: self.flags,
available_modules: Some(AvailableModules::new(modules).to_resolved().await?),
}
})
}
pub async fn ident(&self) -> Result<Option<RcStr>> {
Ok(if let Some(available_modules) = self.available_modules {
Some(available_modules.hash().await?.to_string().into())
} else {
None
})
}
}
......@@ -104,7 +104,7 @@ impl ChunkGroupResult {
assets: ResolvedVc::cell(vec![]),
referenced_assets: ResolvedVc::cell(vec![]),
references: ResolvedVc::cell(vec![]),
availability_info: AvailabilityInfo::Root,
availability_info: AvailabilityInfo::root(),
}
.cell()
}
......@@ -114,7 +114,7 @@ impl ChunkGroupResult {
assets: ResolvedVc::cell(vec![]),
referenced_assets: ResolvedVc::cell(vec![]),
references: ResolvedVc::cell(vec![]),
availability_info: AvailabilityInfo::Root,
availability_info: AvailabilityInfo::root(),
}
.resolved_cell()
}
......@@ -521,7 +521,7 @@ impl<T: ChunkingContext + Send + Upcast<Box<dyn ChunkingContext>>> ChunkingConte
chunk_group: ChunkGroup,
module_graph: Vc<ModuleGraph>,
) -> Vc<ChunkGroupResult> {
self.chunk_group(ident, chunk_group, module_graph, AvailabilityInfo::Root)
self.chunk_group(ident, chunk_group, module_graph, AvailabilityInfo::root())
}
fn root_chunk_group_assets(
......@@ -588,7 +588,7 @@ impl<T: ChunkingContext + Send + Upcast<Box<dyn ChunkingContext>>> ChunkingConte
module_graph,
extra_chunks,
extra_referenced_assets,
AvailabilityInfo::Root,
AvailabilityInfo::root(),
)
}
......@@ -607,7 +607,7 @@ impl<T: ChunkingContext + Send + Upcast<Box<dyn ChunkingContext>>> ChunkingConte
module_graph,
extra_chunks,
extra_referenced_assets,
AvailabilityInfo::Root,
AvailabilityInfo::root(),
)
}
......
......@@ -163,7 +163,7 @@ impl DevHtmlAsset {
.collect(),
),
*module_graph,
AvailabilityInfo::Root,
AvailabilityInfo::root(),
)
.await?
} else {
......
......@@ -40,7 +40,7 @@ impl WorkerLoaderChunkItem {
module.inner.ident().with_modifier(rcstr!("worker")),
ChunkGroup::Isolated(ResolvedVc::upcast(module.inner)),
*self.module_graph,
AvailabilityInfo::Root,
AvailabilityInfo::root(),
))
}
......
......@@ -518,7 +518,7 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> {
entry_module.ident(),
ChunkGroup::Entry(entry_modules.into_iter().collect()),
module_graph,
AvailabilityInfo::Root,
AvailabilityInfo::root(),
),
Runtime::NodeJs => {
OutputAssetsWithReferenced {
......@@ -535,7 +535,7 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> {
module_graph,
OutputAssets::empty(),
OutputAssets::empty(),
AvailabilityInfo::Root,
AvailabilityInfo::root(),
)
.await?
.asset,
......
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