Commit 3e95502a authored by Matt Mastracci's avatar Matt Mastracci

ChunkItem -> ChunkedItem

parent 40ac0bbd
......@@ -27,7 +27,7 @@ use turbo_tasks_fs::{self, File, FileContent, FileSystemPath, rope::RopeBuilder}
use turbopack_core::{
asset::AssetContent,
chunk::{
ChunkItem, ChunkItemExt, ChunkingContext, ChunkingContextExt, EvaluatableAsset, ModuleId,
ChunkedItem, ChunkItemExt, ChunkingContext, ChunkingContextExt, EvaluatableAsset, ModuleId,
},
context::AssetContext,
file_source::FileSource,
......@@ -158,7 +158,7 @@ async fn build_manifest(
page_name: RcStr,
runtime: NextRuntime,
actions: Vc<AllActions>,
chunk_item: Vc<Box<dyn ChunkItem>>,
chunk_item: Vc<Box<dyn ChunkedItem>>,
async_module_info: Vc<AsyncModulesInfo>,
) -> Result<ResolvedVc<Box<dyn OutputAsset>>> {
let manifest_path_prefix = &page_name;
......
......@@ -8,7 +8,7 @@ use turbo_tasks::{
};
use turbopack_browser::ecmascript::EcmascriptBrowserChunk;
use turbopack_core::{
chunk::{Chunk, ChunkItem, ChunkItemExt, ModuleId},
chunk::{Chunk, ChunkedItem, ChunkItemExt, ModuleId},
module::Module,
module_graph::ModuleGraph,
output::{OutputAsset, OutputAssetsReference},
......@@ -25,7 +25,7 @@ where
{
let mut assets = vec![];
let mut chunks = vec![];
let mut chunk_items: FxIndexMap<Vc<Box<dyn ChunkItem>>, FxIndexSet<RcStr>> =
let mut chunk_items: FxIndexMap<Vc<Box<dyn ChunkedItem>>, FxIndexSet<RcStr>> =
FxIndexMap::default();
let entry_assets = entry_assets.into_iter().collect::<Vec<_>>();
......
......@@ -8,7 +8,7 @@ use turbo_tasks_fs::{File, FileContent};
use turbopack_core::{
asset::AssetContent,
chunk::{
AsyncModuleInfo, ChunkGroupType, ChunkItem, ChunkType, ChunkableModule, ChunkingContext,
AsyncModuleInfo, ChunkGroupType, ChunkedItem, ChunkType, ChunkableModule, ChunkingContext,
ChunkingContextExt, ChunkingType, ChunkingTypeOption,
},
code_builder::CodeBuilder,
......@@ -256,7 +256,7 @@ impl ChunkableModule for EcmascriptClientReferenceModule {
self: ResolvedVc<Self>,
module_graph: Vc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Result<Vc<Box<dyn ChunkItem>>> {
) -> Result<Vc<Box<dyn ChunkedItem>>> {
let item = chunking_context.chunk_item(
Vc::upcast(self.proxy_module()),
module_graph,
......@@ -310,7 +310,7 @@ struct EcmascriptClientReferenceProxyChunkItem {
impl OutputAssetsReference for EcmascriptClientReferenceProxyChunkItem {}
#[turbo_tasks::value_impl]
impl ChunkItem for EcmascriptClientReferenceProxyChunkItem {
impl ChunkedItem for EcmascriptClientReferenceProxyChunkItem {
#[turbo_tasks::function]
fn asset_ident(&self) -> Vc<AssetIdent> {
self.inner_module.ident()
......
......@@ -11,7 +11,7 @@ use turbo_tasks_hash::{DeterministicHash, HashAlgorithm};
use turbopack_core::{
asset::Asset,
chunk::{
AssetSuffix, Chunk, ChunkGroupResult, ChunkItem, ChunkType, ChunkableModule,
AssetSuffix, Chunk, ChunkGroupResult, ChunkedItem, ChunkType, ChunkableModule,
ChunkingConfig, ChunkingConfigs, ChunkingContext, ChunkingContextExt,
EntryChunkGroupResult, EvaluatableAsset, EvaluatableAssets, MinifyType,
SourceMapSourceType, SourceMapsType, UnusedReferences, UrlBehavior,
......@@ -907,7 +907,7 @@ impl ChunkingContext for BrowserChunkingContext {
module: Vc<Box<dyn ChunkableModule>>,
module_graph: Vc<ModuleGraph>,
availability_info: AvailabilityInfo,
) -> Result<Vc<Box<dyn ChunkItem>>> {
) -> Result<Vc<Box<dyn ChunkedItem>>> {
let chunking_context = ResolvedVc::upcast::<Box<dyn ChunkingContext>>(self);
Ok(if self.await?.manifest_chunks {
let manifest_asset = ManifestAsyncModule::new(
......
......@@ -7,7 +7,7 @@ use turbo_tasks::{
use turbo_tasks_hash::hash_xxh3_hash64;
use super::ModuleId;
use crate::{chunk::ChunkItem, ident::AssetIdent, module::Module};
use crate::{chunk::ChunkedItem, ident::AssetIdent, module::Module};
#[turbo_tasks::value(transparent, cell = "keyed")]
pub struct ModuleIds(FxHashMap<ResolvedVc<AssetIdent>, ModuleId>);
......@@ -29,7 +29,7 @@ pub struct ModuleIdStrategy {
}
impl ModuleIdStrategy {
pub async fn get_id(&self, chunk_item: Vc<Box<dyn ChunkItem>>) -> Result<ModuleId> {
pub async fn get_id(&self, chunk_item: Vc<Box<dyn ChunkedItem>>) -> Result<ModuleId> {
let ident = chunk_item.asset_ident();
self.get_id_from_ident(ident).await
}
......
......@@ -12,7 +12,7 @@ use turbo_tasks::{
use crate::{
chunk::{
ChunkItem, ChunkItemWithAsyncModuleInfo, ChunkType, ChunkableModule, ChunkingContext,
ChunkedItem, ChunkItemWithAsyncModuleInfo, ChunkType, ChunkableModule, ChunkingContext,
chunking_context::ChunkingContextExt,
},
module_graph::{
......
......@@ -8,7 +8,7 @@ use tracing::Level;
use turbo_tasks::{FxIndexMap, ResolvedVc, TryJoinIterExt, ValueToString};
use crate::chunk::{
ChunkItem, ChunkItemWithAsyncModuleInfo, ChunkType, ChunkingContext,
ChunkedItem, ChunkItemWithAsyncModuleInfo, ChunkType, ChunkingContext,
chunking::{ChunkItemOrBatchWithInfo, SplitContext, make_chunk},
};
......
......@@ -13,7 +13,7 @@ use turbo_tasks::{
use crate::{
chunk::{
Chunk, ChunkItem, ChunkItemWithAsyncModuleInfo, ChunkType, ChunkingContext, Chunks,
Chunk, ChunkedItem, ChunkItemWithAsyncModuleInfo, ChunkType, ChunkingContext, Chunks,
batch_info,
chunk_item_batch::{
ChunkItemBatchGroup, ChunkItemBatchGroups, ChunkItemBatchWithAsyncModuleInfo,
......@@ -33,7 +33,7 @@ mod production;
mod style_production;
#[turbo_tasks::value]
struct ChunkItemsWithInfo {
struct ChunkedItemsWithInfo {
#[allow(clippy::type_complexity)]
by_type: SmallVec<
[(
......@@ -45,8 +45,8 @@ struct ChunkItemsWithInfo {
}
#[turbo_tasks::value(transparent)]
struct BatchChunkItemsWithInfo(
FxHashMap<ChunkItemOrBatchWithAsyncModuleInfo, ResolvedVc<ChunkItemsWithInfo>>,
struct BatchChunkedItemsWithInfo(
FxHashMap<ChunkItemOrBatchWithAsyncModuleInfo, ResolvedVc<ChunkedItemsWithInfo>>,
);
#[derive(Clone, PartialEq, Eq, TraceRawVcs, NonLocalValue, ValueDebugFormat, Encode, Decode)]
......@@ -101,7 +101,7 @@ async fn batch_size(
async fn plain_chunk_items_with_info(
chunk_item_or_batch: ChunkItemOrBatchWithAsyncModuleInfo,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<ChunkItemsWithInfo> {
) -> Result<ChunkedItemsWithInfo> {
Ok(match chunk_item_or_batch {
ChunkItemOrBatchWithAsyncModuleInfo::ChunkItem(chunk_item_with_info) => {
let ChunkItemWithAsyncModuleInfo {
......@@ -115,7 +115,7 @@ async fn plain_chunk_items_with_info(
let chunk_item_size =
ty.chunk_item_size(chunking_context, *chunk_item, async_info.map(|info| *info));
ChunkItemsWithInfo {
ChunkedItemsWithInfo {
by_type: smallvec![(
ty.to_resolved().await?,
smallvec![ChunkItemOrBatchWithInfo::ChunkItem {
......@@ -141,7 +141,7 @@ async fn plain_chunk_items_with_info(
})
.try_join()
.await?;
ChunkItemsWithInfo {
ChunkedItemsWithInfo {
by_type: by_type.into_iter().collect(),
}
}
......@@ -194,7 +194,7 @@ async fn plain_chunk_items_with_info_with_type(
async fn chunk_items_with_info(
chunk_item_or_batch: ChunkItemOrBatchWithAsyncModuleInfo,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<ChunkItemsWithInfo>> {
) -> Result<Vc<ChunkedItemsWithInfo>> {
let chunk_items_with_info =
plain_chunk_items_with_info(chunk_item_or_batch, chunking_context).await?;
Ok(chunk_items_with_info.cell())
......@@ -206,7 +206,7 @@ async fn chunk_items_with_info_with_type(
ty: ResolvedVc<Box<dyn ChunkType>>,
batch_group: Option<ResolvedVc<ChunkItemBatchGroup>>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<ChunkItemsWithInfo>> {
) -> Result<Vc<ChunkedItemsWithInfo>> {
let result = plain_chunk_items_with_info_with_type(
&chunk_item_or_batch,
ty,
......@@ -214,7 +214,7 @@ async fn chunk_items_with_info_with_type(
chunking_context,
)
.await?;
Ok(ChunkItemsWithInfo {
Ok(ChunkedItemsWithInfo {
by_type: smallvec![result],
}
.cell())
......@@ -224,7 +224,7 @@ async fn chunk_items_with_info_with_type(
async fn batch_chunk_items_with_info(
batch_group: Vc<ChunkItemBatchGroup>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<BatchChunkItemsWithInfo>> {
) -> Result<Vc<BatchChunkedItemsWithInfo>> {
let split_batch_group = batch_group.split_by_chunk_type().await?;
if split_batch_group.len() == 1 {
let &(ty, batch) = split_batch_group.into_iter().next().unwrap();
......@@ -255,7 +255,7 @@ async fn batch_chunk_items_with_info_with_type(
batch_group: Vc<ChunkItemBatchGroup>,
ty: Vc<Box<dyn ChunkType>>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<BatchChunkItemsWithInfo>> {
) -> Result<Vc<BatchChunkedItemsWithInfo>> {
let map = batch_group
.await?
.items
......@@ -298,7 +298,7 @@ pub async fn make_chunks(
chunk_items_or_batches = chunk_items_or_batches.len(),
batch_groups = batch_groups.len()
);
let chunk_items: Vec<ReadRef<ChunkItemsWithInfo>> = batch_info(
let chunk_items: Vec<ReadRef<ChunkedItemsWithInfo>> = batch_info(
&batch_groups,
&chunk_items_or_batches,
|batch_group| batch_chunk_items_with_info(batch_group, *chunking_context).into_future(),
......
......@@ -40,12 +40,12 @@ pub async fn make_production_chunks(
let merged_modules = module_graph.merged_modules().await?;
#[derive(Default)]
struct GroupedChunkItems<'l> {
struct GroupedChunkedItems<'l> {
chunk_items: Vec<&'l ChunkItemOrBatchWithInfo>,
batch_group: Option<ResolvedVc<ChunkItemBatchGroup>>,
}
let mut grouped_chunk_items = FxIndexMap::<_, GroupedChunkItems<'_>>::default();
let mut grouped_chunk_items = FxIndexMap::<_, GroupedChunkedItems<'_>>::default();
enum Prepared {
ChunkItem(MappedReadRef<ModuleToChunkGroups, RoaringBitmapWrapper>),
......@@ -143,7 +143,7 @@ pub async fn make_production_chunks(
.map(
|(
key,
GroupedChunkItems {
GroupedChunkedItems {
chunk_items,
batch_group,
},
......
......@@ -12,7 +12,7 @@ use turbo_tasks_hash::DeterministicHash;
use crate::{
asset::Asset,
chunk::{
ChunkItem, ChunkType, ChunkableModule, EvaluatableAssets,
ChunkedItem, ChunkType, ChunkableModule, EvaluatableAssets,
availability_info::AvailabilityInfo, chunk_id_strategy::ModuleIdStrategy,
},
environment::Environment,
......@@ -430,7 +430,7 @@ pub trait ChunkingContext {
module: Vc<Box<dyn ChunkableModule>>,
module_graph: Vc<ModuleGraph>,
availability_info: AvailabilityInfo,
) -> Vc<Box<dyn ChunkItem>>;
) -> Vc<Box<dyn ChunkedItem>>;
#[turbo_tasks::function]
fn async_loader_chunk_item_ident(&self, module: Vc<Box<dyn ChunkableModule>>)
-> Vc<AssetIdent>;
......@@ -586,7 +586,7 @@ pub trait ChunkingContextExt {
self: Vc<Self>,
module: Vc<Box<dyn Module>>,
module_graph: Vc<ModuleGraph>,
) -> Vc<Box<dyn ChunkItem>>
) -> Vc<Box<dyn ChunkedItem>>
where
Self: Send;
}
......@@ -712,7 +712,7 @@ impl<T: ChunkingContext + Send + Upcast<Box<dyn ChunkingContext>>> ChunkingConte
self: Vc<Self>,
module: Vc<Box<dyn Module>>,
module_graph: Vc<ModuleGraph>,
) -> Vc<Box<dyn ChunkItem>> {
) -> Vc<Box<dyn ChunkedItem>> {
chunk_item(Vc::upcast_non_strict(self), module, module_graph)
}
}
......@@ -722,7 +722,7 @@ async fn chunk_item(
chunking_context: Vc<Box<dyn ChunkingContext>>,
module: Vc<Box<dyn Module>>,
module_graph: Vc<ModuleGraph>,
) -> Result<Vc<Box<dyn ChunkItem>>> {
) -> Result<Vc<Box<dyn ChunkedItem>>> {
let module = module.to_resolved().await?;
let Some(chunkable) = ResolvedVc::try_sidecast::<Box<dyn ChunkableModule>>(module) else {
bail!(
......
......@@ -85,7 +85,7 @@ pub trait ChunkableModule: Module {
self: Vc<Self>,
module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn ChunkItem>>;
) -> Vc<Box<dyn ChunkedItem>>;
}
/// Implements `ChunkableModule` for a type that implements `EcmascriptChunkPlaceable`.
......@@ -113,7 +113,7 @@ macro_rules! chunk_item {
chunking_context: turbo_tasks::ResolvedVc<
Box<dyn turbopack_core::chunk::ChunkingContext>,
>,
) -> turbo_tasks::Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
) -> turbo_tasks::Vc<Box<dyn ChunkedItem>> {
$chunk_item_fn(
turbo_tasks::ResolvedVc::upcast(self),
module_graph,
......@@ -425,7 +425,7 @@ pub struct ChunkGroupContent {
}
#[turbo_tasks::value_trait]
pub trait ChunkItem: OutputAssetsReference {
pub trait ChunkedItem: OutputAssetsReference {
/// The [AssetIdent] of the [Module] that this [ChunkItem] was created from.
/// For most chunk types this must uniquely identify the chunk item at
/// runtime as it's the source of the module id used at runtime.
......@@ -473,7 +473,7 @@ pub trait ChunkType: ValueToString {
fn chunk_item_size(
&self,
chunking_context: Vc<Box<dyn ChunkingContext>>,
chunk_item: Vc<Box<dyn ChunkItem>>,
chunk_item: Vc<Box<dyn ChunkedItem>>,
async_module_info: Option<Vc<AsyncModuleInfo>>,
) -> Vc<usize>;
}
......@@ -484,7 +484,15 @@ pub fn round_chunk_item_size(size: usize) -> usize {
}
#[turbo_tasks::value(transparent)]
pub struct ChunkItems(pub Vec<ResolvedVc<Box<dyn ChunkItem>>>);
pub struct ChunkItems(pub Vec<ResolvedVc<Box<dyn ChunkedItem>>>);
/// A wrapper around a `ResolvedVc<Box<dyn ChunkedItem>>` that provides direct method access
/// without needing the `ChunkedItem` trait in scope.
#[derive(
Debug, Clone, PartialEq, Eq, Hash, TraceRawVcs, NonLocalValue, TaskInput, Encode, Decode,
)]
#[repr(transparent)]
pub struct ChunkItem(pub ResolvedVc<Box<dyn ChunkedItem>>);
#[turbo_tasks::value]
pub struct AsyncModuleInfo {
......@@ -506,13 +514,13 @@ impl AsyncModuleInfo {
Debug, Clone, PartialEq, Eq, Hash, TraceRawVcs, TaskInput, NonLocalValue, Encode, Decode,
)]
pub struct ChunkItemWithAsyncModuleInfo {
pub chunk_item: ResolvedVc<Box<dyn ChunkItem>>,
pub chunk_item: ResolvedVc<Box<dyn ChunkedItem>>,
pub module: Option<ResolvedVc<Box<dyn ChunkableModule>>>,
pub async_info: Option<ResolvedVc<AsyncModuleInfo>>,
}
#[turbo_tasks::value(transparent)]
pub struct ChunkItemsWithAsyncModuleInfo(Vec<ChunkItemWithAsyncModuleInfo>);
pub struct ChunkedItemsWithAsyncModuleInfo(Vec<ChunkItemWithAsyncModuleInfo>);
pub trait ChunkItemExt {
/// Returns the module id of this chunk item.
......@@ -521,7 +529,7 @@ pub trait ChunkItemExt {
impl<T> ChunkItemExt for T
where
T: Upcast<Box<dyn ChunkItem>> + Send,
T: Upcast<Box<dyn ChunkedItem>> + Send,
{
/// Returns the module id of this chunk item.
async fn id(self: Vc<Self>) -> Result<ModuleId> {
......
......@@ -12,7 +12,7 @@ use turbo_tasks::{
use crate::{
chunk::{
ChunkItem, ChunkItemBatchWithAsyncModuleInfo, ChunkItemWithAsyncModuleInfo, ChunkType,
ChunkedItem, ChunkItemBatchWithAsyncModuleInfo, ChunkItemWithAsyncModuleInfo, ChunkType,
ChunkableModule, ChunkingContext, chunk_item_batch::attach_async_info_to_chunkable_module,
},
module::{Module, StyleModule, StyleType},
......
......@@ -3,7 +3,7 @@ use turbo_rcstr::rcstr;
use turbo_tasks::{IntoTraitRef, ResolvedVc, TryJoinIterExt, ValueToString, Vc};
use turbo_tasks_fs::{FileContent, FileSystemPath};
use turbopack_core::{
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, ChunkingContextExt, MinifyType},
chunk::{ChunkedItem, ChunkType, ChunkableModule, ChunkingContext, ChunkingContextExt, MinifyType},
context::AssetContext,
environment::Environment,
ident::AssetIdent,
......@@ -177,7 +177,7 @@ impl ChunkableModule for CssModuleAsset {
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
) -> Vc<Box<dyn ChunkedItem>> {
Vc::upcast(CssModuleChunkItem::cell(CssModuleChunkItem {
module: self,
module_graph,
......@@ -231,7 +231,7 @@ impl OutputAssetsReference for CssModuleChunkItem {
}
#[turbo_tasks::value_impl]
impl ChunkItem for CssModuleChunkItem {
impl ChunkedItem for CssModuleChunkItem {
#[turbo_tasks::function]
fn asset_ident(&self) -> Vc<AssetIdent> {
self.module.ident()
......
......@@ -13,7 +13,7 @@ use turbo_tasks_fs::{
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{
AsyncModuleInfo, Chunk, ChunkItem, ChunkItemBatchGroup, ChunkItemExt,
AsyncModuleInfo, Chunk, ChunkedItem, ChunkItemBatchGroup, ChunkItemExt,
ChunkItemOrBatchWithAsyncModuleInfo, ChunkItemWithAsyncModuleInfo, ChunkType,
ChunkableModule, ChunkingContext, ChunkingContextExt, MinifyType, OutputChunk,
OutputChunkRuntimeInfo, SourceMapSourceType, round_chunk_item_size,
......@@ -464,7 +464,7 @@ pub struct CssChunkItemContent {
}
#[turbo_tasks::value_trait]
pub trait CssChunkItem: ChunkItem + OutputAssetsReference {
pub trait CssChunkItem: ChunkedItem + OutputAssetsReference {
#[turbo_tasks::function]
fn content(self: Vc<Self>) -> Vc<CssChunkItemContent>;
}
......@@ -577,7 +577,7 @@ impl ChunkType for CssChunkType {
async fn chunk_item_size(
&self,
_chunking_context: Vc<Box<dyn ChunkingContext>>,
chunk_item: ResolvedVc<Box<dyn ChunkItem>>,
chunk_item: ResolvedVc<Box<dyn ChunkedItem>>,
_async_module_info: Option<Vc<AsyncModuleInfo>>,
) -> Result<Vc<usize>> {
let Some(chunk_item) = ResolvedVc::try_downcast::<Box<dyn CssChunkItem>>(chunk_item) else {
......
......@@ -6,7 +6,7 @@ use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{File, FileContent, FileSystemPath, rope::RopeBuilder};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{Chunk, ChunkItem, ChunkingContext, MinifyType},
chunk::{Chunk, ChunkedItem, ChunkingContext, MinifyType},
code_builder::{Code, CodeBuilder},
ident::AssetIdent,
introspect::Introspectable,
......
use anyhow::{Result, bail};
use turbo_tasks::{ResolvedVc, TryJoinIterExt, ValueDefault, ValueToString, Vc};
use turbopack_core::chunk::{
AsyncModuleInfo, Chunk, ChunkItem, ChunkItemBatchGroup, ChunkItemOrBatchWithAsyncModuleInfo,
AsyncModuleInfo, Chunk, ChunkedItem, ChunkItemBatchGroup, ChunkItemOrBatchWithAsyncModuleInfo,
ChunkType, ChunkingContext, round_chunk_item_size,
};
......@@ -50,7 +50,7 @@ impl ChunkType for EcmascriptChunkType {
async fn chunk_item_size(
&self,
_chunking_context: Vc<Box<dyn ChunkingContext>>,
chunk_item: ResolvedVc<Box<dyn ChunkItem>>,
chunk_item: ResolvedVc<Box<dyn ChunkedItem>>,
async_module_info: Option<Vc<AsyncModuleInfo>>,
) -> Result<Vc<usize>> {
let Some(chunk_item) = ResolvedVc::try_downcast::<Box<dyn EcmascriptChunkItem>>(chunk_item)
......
......@@ -3,7 +3,7 @@ use std::future::IntoFuture;
use anyhow::Result;
use either::Either;
use turbo_tasks::{ReadRef, ResolvedVc, TryJoinIterExt, Vc};
use turbopack_core::chunk::{ChunkItem, ChunkItems, batch_info};
use turbopack_core::chunk::{ChunkedItem, ChunkItems, batch_info};
use crate::chunk::{
CodeAndIds,
......@@ -41,7 +41,7 @@ impl EcmascriptChunkContent {
Either::Right(batch.chunk_items.iter().map(|item| item.chunk_item))
}
})
.map(ResolvedVc::upcast::<Box<dyn ChunkItem>>)
.map(ResolvedVc::upcast::<Box<dyn ChunkedItem>>)
.collect(),
)
.cell())
......
......@@ -11,7 +11,7 @@ use turbo_tasks::{
use turbo_tasks_fs::{FileSystemPath, rope::Rope};
use turbopack_core::{
chunk::{
AsyncModuleInfo, ChunkItem, ChunkItemWithAsyncModuleInfo, ChunkType, ChunkingContext,
AsyncModuleInfo, ChunkedItem, ChunkItemWithAsyncModuleInfo, ChunkType, ChunkingContext,
ChunkingContextExt, ModuleId, SourceMapSourceType,
},
code_builder::{Code, CodeBuilder},
......@@ -227,7 +227,7 @@ impl EcmascriptChunkItemWithAsyncInfo {
}
#[turbo_tasks::value_trait]
pub trait EcmascriptChunkItem: ChunkItem + OutputAssetsReference {
pub trait EcmascriptChunkItem: ChunkedItem + OutputAssetsReference {
#[turbo_tasks::function]
fn content(self: Vc<Self>) -> Vc<EcmascriptChunkItemContent>;
......@@ -316,7 +316,7 @@ pub fn ecmascript_chunk_item(
module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn ChunkItem>> {
) -> Vc<Box<dyn ChunkedItem>> {
Vc::upcast(
EcmascriptModuleChunkItem {
module,
......@@ -328,7 +328,7 @@ pub fn ecmascript_chunk_item(
}
#[turbo_tasks::value_impl]
impl ChunkItem for EcmascriptModuleChunkItem {
impl ChunkedItem for EcmascriptModuleChunkItem {
#[turbo_tasks::function]
fn asset_ident(&self) -> Vc<AssetIdent> {
self.module.ident()
......
......@@ -13,7 +13,7 @@ use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, TryJoinIterExt, ValueToString, Vc};
use turbo_tasks_fs::FileSystem;
use turbopack_core::{
chunk::{Chunk, ChunkItem, ChunkItems, ChunkingContext, ModuleIds},
chunk::{Chunk, ChunkedItem, ChunkItems, ChunkingContext, ModuleIds},
ident::AssetIdent,
introspect::{
Introspectable, IntrospectableChildren, module::IntrospectableModule,
......
......@@ -6,7 +6,7 @@ use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{
asset::Asset,
chunk::{
AssetSuffix, Chunk, ChunkGroupResult, ChunkItem, ChunkType, ChunkableModule,
AssetSuffix, Chunk, ChunkGroupResult, ChunkedItem, ChunkType, ChunkableModule,
ChunkingConfig, ChunkingConfigs, ChunkingContext, ChunkingContextExt,
EntryChunkGroupResult, EvaluatableAssets, MinifyType, SourceMapSourceType, SourceMapsType,
UnusedReferences, UrlBehavior,
......@@ -639,7 +639,7 @@ impl ChunkingContext for NodeJsChunkingContext {
module: Vc<Box<dyn ChunkableModule>>,
module_graph: Vc<ModuleGraph>,
availability_info: AvailabilityInfo,
) -> Result<Vc<Box<dyn ChunkItem>>> {
) -> Result<Vc<Box<dyn ChunkedItem>>> {
let chunking_context: ResolvedVc<Box<dyn ChunkingContext>> =
Vc::upcast::<Box<dyn ChunkingContext>>(self)
.to_resolved()
......
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