Commit d21aef63 authored by Matt Mastracci's avatar Matt Mastracci

Macro-tize ChunkableModule

parent 0d49dd88
......@@ -7,8 +7,8 @@ use turbo_tasks_fs::{FileSystem, VirtualFileSystem, rope::RopeBuilder};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{
AsyncModuleInfo, ChunkItem, ChunkableModule, ChunkingContext, ChunkingType,
ChunkingTypeOption, EvaluatableAsset,
AsyncModuleInfo, ChunkableModule, ChunkingContext, ChunkingType, ChunkingTypeOption,
EvaluatableAsset,
},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
......@@ -20,7 +20,7 @@ use turbopack_core::{
use turbopack_ecmascript::{
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkItemOptions, EcmascriptChunkPlaceable,
EcmascriptExports, ecmascript_chunk_item,
EcmascriptExports,
},
runtime_functions::TURBOPACK_REQUIRE,
utils::StringifyJs,
......@@ -81,17 +81,7 @@ impl Module for HmrEntryModule {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for HmrEntryModule {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(HmrEntryModule, ecmascript);
#[turbo_tasks::value_impl]
impl Asset for HmrEntryModule {
......
......@@ -3,7 +3,7 @@ use indoc::formatdoc;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{
chunk::{AsyncModuleInfo, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
chunk::{AsyncModuleInfo, ChunkingContext, ModuleChunkItemIdExt},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
module_graph::ModuleGraph,
......@@ -12,11 +12,8 @@ use turbopack_core::{
source::OptionSource,
};
use turbopack_ecmascript::{
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
ecmascript_chunk_item,
},
references::esm::EsmExports,
chunk::{EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports},
references::esm::{EsmExport, EsmExports},
runtime_functions::{TURBOPACK_EXPORT_NAMESPACE, TURBOPACK_IMPORT},
utils::StringifyJs,
};
......@@ -73,17 +70,7 @@ impl Module for NextDynamicEntryModule {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for NextDynamicEntryModule {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(NextDynamicEntryModule, ecmascript);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for NextDynamicEntryModule {
......
......@@ -4,7 +4,7 @@ use turbo_rcstr::rcstr;
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{
chunk::{AsyncModuleInfo, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
chunk::{AsyncModuleInfo, ChunkingContext, ModuleChunkItemIdExt},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
module_graph::ModuleGraph,
......@@ -12,11 +12,8 @@ use turbopack_core::{
source::OptionSource,
};
use turbopack_ecmascript::{
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
ecmascript_chunk_item,
},
references::esm::EsmExports,
chunk::{EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports},
references::esm::{EsmExport, EsmExports},
runtime_functions::{TURBOPACK_EXPORT_NAMESPACE, TURBOPACK_IMPORT},
utils::StringifyJs,
};
......@@ -90,17 +87,7 @@ impl Module for NextServerComponentModule {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for NextServerComponentModule {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(NextServerComponentModule, ecmascript);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for NextServerComponentModule {
......
......@@ -4,7 +4,7 @@ use turbo_rcstr::rcstr;
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{
chunk::{AsyncModuleInfo, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
chunk::{AsyncModuleInfo, ChunkingContext, ModuleChunkItemIdExt},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
module_graph::ModuleGraph,
......@@ -12,11 +12,8 @@ use turbopack_core::{
source::OptionSource,
};
use turbopack_ecmascript::{
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
ecmascript_chunk_item,
},
references::esm::EsmExports,
chunk::{EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports},
references::esm::{EsmExport, EsmExports},
runtime_functions::{TURBOPACK_EXPORT_NAMESPACE, TURBOPACK_IMPORT},
utils::StringifyJs,
};
......@@ -71,17 +68,7 @@ impl Module for NextServerUtilityModule {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for NextServerUtilityModule {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(NextServerUtilityModule, ecmascript);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for NextServerUtilityModule {
......
......@@ -11,7 +11,7 @@ use turbo_tasks_fs::{FileContent, rope::Rope};
use turbopack::{ModuleAssetContext, module_options::CustomModuleType};
use turbopack_core::{
asset::Asset,
chunk::{AsyncModuleInfo, ChunkableModule, ChunkingContext},
chunk::{AsyncModuleInfo, ChunkingContext},
code_builder::CodeBuilder,
compile_time_info::{
CompileTimeDefineValue, CompileTimeInfo, DefinableNameSegmentRef, DefinableNameSegmentRefs,
......@@ -29,7 +29,7 @@ use turbopack_ecmascript::{
EcmascriptInputTransforms,
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkItemOptions, EcmascriptChunkPlaceable,
EcmascriptExports, ecmascript_chunk_item,
EcmascriptExports,
},
source_map::{extract_source_mapping_url_from_content, parse_source_map_comment},
utils::StringifyJs,
......@@ -104,17 +104,7 @@ impl Module for RawEcmascriptModule {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for RawEcmascriptModule {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(RawEcmascriptModule, ecmascript);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for RawEcmascriptModule {
......
......@@ -114,6 +114,7 @@ pub fn get_type_ident(ty: &Type) -> Option<Ident> {
match ty {
Type::Path(path) => Some(get_path_ident(&path.path)),
Type::Tuple(tuple) => Some(Ident::new("unit", tuple.span())),
Type::Group(group) => get_type_ident(&group.elem),
_ => {
ty.span()
.unwrap()
......
......@@ -88,6 +88,42 @@ pub trait ChunkableModule: Module {
) -> Vc<Box<dyn ChunkItem>>;
}
/// Implements `ChunkableModule` for a type that implements `EcmascriptChunkPlaceable`.
///
/// Usage:
/// turbopack_core::chunk_item!(MyModule, ecmascript);
///
/// When called from within `turbopack-ecmascript` itself, use the explicit path form:
/// turbopack_core::chunk_item!(MyModule, crate::chunk::item::ecmascript_chunk_item);
///
/// This generates the standard `impl ChunkableModule` that delegates to
/// `ecmascript_chunk_item()`.
#[macro_export]
macro_rules! chunk_item {
($ty:ty, ecmascript) => {
turbopack_core::chunk_item!($ty, turbopack_ecmascript::chunk::ecmascript_chunk_item);
};
($ty:ty, $chunk_item_fn:path) => {
#[turbo_tasks::value_impl]
impl turbopack_core::chunk::ChunkableModule for $ty {
#[turbo_tasks::function]
fn as_chunk_item(
self: turbo_tasks::ResolvedVc<Self>,
module_graph: turbo_tasks::ResolvedVc<turbopack_core::module_graph::ModuleGraph>,
chunking_context: turbo_tasks::ResolvedVc<
Box<dyn turbopack_core::chunk::ChunkingContext>,
>,
) -> turbo_tasks::Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
$chunk_item_fn(
turbo_tasks::ResolvedVc::upcast(self),
module_graph,
chunking_context,
)
}
}
};
}
#[turbo_tasks::value(transparent)]
pub struct ChunkableModules(Vec<ResolvedVc<Box<dyn ChunkableModule>>>);
......
......@@ -8,7 +8,7 @@ use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{FxIndexMap, IntoTraitRef, ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{FileSystemPath, rope::Rope};
use turbopack_core::{
chunk::{AsyncModuleInfo, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
chunk::{AsyncModuleInfo, ChunkingContext, ModuleChunkItemIdExt},
context::{AssetContext, ProcessResult},
ident::AssetIdent,
issue::{
......@@ -23,10 +23,7 @@ use turbopack_core::{
source::{OptionSource, Source},
};
use turbopack_ecmascript::{
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
ecmascript_chunk_item,
},
chunk::{EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports},
parse::generate_js_source_map,
runtime_functions::{TURBOPACK_EXPORT_VALUE, TURBOPACK_IMPORT},
utils::StringifyJs,
......@@ -244,17 +241,7 @@ impl ModuleCssAsset {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for ModuleCssAsset {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(ModuleCssAsset, ecmascript);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for ModuleCssAsset {
......
......@@ -20,7 +20,7 @@ use turbopack_core::{
use crate::{
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
data::EcmascriptChunkData, ecmascript_chunk_item,
data::EcmascriptChunkData,
},
runtime_functions::{TURBOPACK_EXPORT_VALUE, TURBOPACK_LOAD},
utils::{StringifyJs, StringifyModuleId},
......@@ -134,17 +134,7 @@ impl Module for AsyncLoaderModule {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for AsyncLoaderModule {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(AsyncLoaderModule, crate::chunk::ecmascript_chunk_item);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for AsyncLoaderModule {
......
......@@ -83,9 +83,9 @@ use turbo_tasks::{
use turbo_tasks_fs::{FileJsonContent, FileSystemPath, glob::Glob, rope::Rope};
use turbopack_core::{
chunk::{
AsyncModuleInfo, ChunkItem, ChunkableModule, ChunkingContext, EvaluatableAsset,
MergeableModule, MergeableModuleExposure, MergeableModules, MergeableModulesExposed,
MinifyType, ModuleChunkItemIdExt, ModuleId,
AsyncModuleInfo, ChunkableModule, ChunkingContext, EvaluatableAsset, MergeableModule,
MergeableModuleExposure, MergeableModules, MergeableModulesExposed, MinifyType,
ModuleChunkItemIdExt, ModuleId,
},
compile_time_info::CompileTimeInfo,
context::AssetContext,
......@@ -106,7 +106,6 @@ use crate::{
analyzer::graph::EvalContext,
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
ecmascript_chunk_item,
placeable::{SideEffectsDeclaration, get_side_effect_free_declaration},
},
code_gen::{CodeGeneration, CodeGenerationHoistedStmt, CodeGens, ModifiableAst},
......@@ -784,17 +783,7 @@ impl Module for EcmascriptModuleAsset {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for EcmascriptModuleAsset {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(EcmascriptModuleAsset, crate::chunk::ecmascript_chunk_item);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for EcmascriptModuleAsset {
......
......@@ -19,7 +19,7 @@ use turbopack_core::{
use crate::{
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
data::EcmascriptChunkData, ecmascript_chunk_item,
data::EcmascriptChunkData,
},
runtime_functions::TURBOPACK_EXPORT_VALUE,
utils::StringifyJs,
......@@ -174,17 +174,7 @@ impl Module for ManifestAsyncModule {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for ManifestAsyncModule {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(ManifestAsyncModule, crate::chunk::ecmascript_chunk_item);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for ManifestAsyncModule {
......
......@@ -20,7 +20,7 @@ use super::chunk_asset::ManifestAsyncModule;
use crate::{
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
data::EcmascriptChunkData, ecmascript_chunk_item,
data::EcmascriptChunkData,
},
runtime_functions::{TURBOPACK_EXPORT_VALUE, TURBOPACK_LOAD, TURBOPACK_REQUIRE},
utils::{StringifyJs, StringifyModuleId},
......@@ -96,17 +96,7 @@ impl Module for ManifestLoaderModule {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for ManifestLoaderModule {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(ManifestLoaderModule, crate::chunk::ecmascript_chunk_item);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for ManifestLoaderModule {
......
......@@ -2,8 +2,8 @@ use anyhow::{Context, Result};
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{
chunk::{
AsyncModuleInfo, ChunkableModule, ChunkingContext, MergeableModuleExposure,
MergeableModules, MergeableModulesExposed,
AsyncModuleInfo, ChunkingContext, MergeableModuleExposure, MergeableModules,
MergeableModulesExposed,
},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
......@@ -13,10 +13,7 @@ use turbopack_core::{
use crate::{
EcmascriptAnalyzable, EcmascriptModuleContent, EcmascriptOptions,
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
ecmascript_chunk_item,
},
chunk::{EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports},
};
#[turbo_tasks::value(shared)]
......@@ -91,17 +88,7 @@ impl Module for MergedEcmascriptModule {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for MergedEcmascriptModule {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(MergedEcmascriptModule, crate::chunk::ecmascript_chunk_item);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for MergedEcmascriptModule {
......
......@@ -8,7 +8,7 @@ use turbo_tasks_fs::{FileSystem, FileSystemPath, LinkType, VirtualFileSystem, ro
use turbo_tasks_hash::{encode_hex, hash_xxh3_hash64};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{AsyncModuleInfo, ChunkableModule, ChunkingContext},
chunk::{AsyncModuleInfo, ChunkingContext},
ident::{AssetIdent, Layer},
module::{Module, ModuleSideEffects},
module_graph::ModuleGraph,
......@@ -29,10 +29,7 @@ use turbopack_resolve::ecmascript::{cjs_resolve, esm_resolve};
use crate::{
EcmascriptModuleContent,
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
ecmascript_chunk_item,
},
chunk::{EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports},
references::async_module::{AsyncModule, OptionAsyncModule},
runtime_functions::{
TURBOPACK_EXPORT_NAMESPACE, TURBOPACK_EXPORT_VALUE, TURBOPACK_EXTERNAL_IMPORT,
......@@ -370,17 +367,7 @@ impl Module for CachedExternalModule {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for CachedExternalModule {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(CachedExternalModule, crate::chunk::ecmascript_chunk_item);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for CachedExternalModule {
......
......@@ -22,8 +22,8 @@ use turbo_tasks::{
use turbo_tasks_fs::{DirectoryContent, DirectoryEntry, FileSystemPath};
use turbopack_core::{
chunk::{
AsyncModuleInfo, ChunkableModule, ChunkingContext, ChunkingType, ChunkingTypeOption,
MinifyType, ModuleChunkItemIdExt,
AsyncModuleInfo, ChunkingContext, ChunkingType, ChunkingTypeOption, MinifyType,
ModuleChunkItemIdExt,
},
ident::AssetIdent,
issue::IssueSource,
......@@ -38,7 +38,7 @@ use turbopack_resolve::ecmascript::cjs_resolve;
use crate::{
EcmascriptChunkPlaceable,
chunk::{EcmascriptChunkItemContent, EcmascriptExports, ecmascript_chunk_item},
chunk::{EcmascriptChunkItemContent, EcmascriptExports},
code_gen::{CodeGen, CodeGeneration, IntoCodeGenReference},
create_visitor,
references::{
......@@ -435,17 +435,7 @@ impl Module for RequireContextAsset {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for RequireContextAsset {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(RequireContextAsset, crate::chunk::ecmascript_chunk_item);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for RequireContextAsset {
......
......@@ -18,10 +18,7 @@ use crate::{
AnalyzeEcmascriptModuleResult, EcmascriptAnalyzable, EcmascriptAnalyzableExt,
EcmascriptModuleContent, EcmascriptModuleContentOptions, EcmascriptOptions,
MergedEcmascriptModule, SpecifiedModuleType,
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
ecmascript_chunk_item,
},
chunk::{EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports},
code_gen::CodeGens,
export::Liveness,
references::{
......@@ -367,17 +364,10 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for EcmascriptModuleFacadeModule {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(
EcmascriptModuleFacadeModule,
crate::chunk::ecmascript_chunk_item
);
#[turbo_tasks::value_impl]
impl EvaluatableAsset for EcmascriptModuleFacadeModule {}
......
......@@ -18,10 +18,7 @@ use crate::{
AnalyzeEcmascriptModuleResult, EcmascriptAnalyzable, EcmascriptAnalyzableExt,
EcmascriptModuleAsset, EcmascriptModuleContent, EcmascriptModuleContentOptions,
MergedEcmascriptModule,
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
ecmascript_chunk_item,
},
chunk::{EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports},
references::{
async_module::OptionAsyncModule,
esm::{EsmExport, EsmExports},
......@@ -193,17 +190,10 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleLocalsModule {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for EcmascriptModuleLocalsModule {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(
EcmascriptModuleLocalsModule,
crate::chunk::ecmascript_chunk_item
);
#[turbo_tasks::value_impl]
impl MergeableModule for EcmascriptModuleLocalsModule {
......
......@@ -2,7 +2,7 @@ use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{
chunk::{AsyncModuleInfo, ChunkableModule, ChunkingContext, EvaluatableAsset},
chunk::{AsyncModuleInfo, ChunkingContext, EvaluatableAsset},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
module_graph::ModuleGraph,
......@@ -15,10 +15,7 @@ use crate::{
AnalyzeEcmascriptModuleResult, EcmascriptAnalyzable, EcmascriptAnalyzableExt,
EcmascriptModuleAsset, EcmascriptModuleAssetType, EcmascriptModuleContent,
EcmascriptModuleContentOptions, EcmascriptParsable,
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
ecmascript_chunk_item,
},
chunk::{EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports},
parse::ParseResult,
references::{
FollowExportsResult, analyze_ecmascript_module, esm::FoundExportType, follow_reexports,
......@@ -372,17 +369,10 @@ impl EcmascriptChunkPlaceable for EcmascriptModulePartAsset {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for EcmascriptModulePartAsset {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(
EcmascriptModulePartAsset,
crate::chunk::ecmascript_chunk_item
);
#[turbo_tasks::value_impl]
impl EcmascriptModulePartAsset {
......
......@@ -3,9 +3,7 @@ use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, TryJoinIterExt, Vc};
use turbo_tasks_fs::rope::RopeBuilder;
use turbopack_core::{
chunk::{
AsyncModuleInfo, ChunkableModule, ChunkingContext, EvaluatableAsset, ModuleChunkItemIdExt,
},
chunk::{AsyncModuleInfo, ChunkingContext, EvaluatableAsset, ModuleChunkItemIdExt},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
module_graph::ModuleGraph,
......@@ -17,7 +15,7 @@ use crate::{
EcmascriptModuleAsset,
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkItemOptions, EcmascriptChunkPlaceable,
EcmascriptExports, ecmascript_chunk_item, item::RewriteSourcePath,
EcmascriptExports, item::RewriteSourcePath,
},
references::async_module::AsyncModuleOptions,
runtime_functions::{TURBOPACK_EXPORT_NAMESPACE, TURBOPACK_IMPORT},
......@@ -204,17 +202,7 @@ impl EcmascriptChunkPlaceable for SideEffectsModule {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for SideEffectsModule {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(SideEffectsModule, crate::chunk::ecmascript_chunk_item);
#[turbo_tasks::value_impl]
impl EvaluatableAsset for SideEffectsModule {}
......@@ -21,7 +21,7 @@ use super::worker_type::WorkerType;
use crate::{
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
data::EcmascriptChunkData, ecmascript_chunk_item,
data::EcmascriptChunkData,
},
runtime_functions::{TURBOPACK_CREATE_WORKER, TURBOPACK_EXPORT_VALUE},
utils::StringifyJs,
......@@ -173,17 +173,7 @@ impl Module for WorkerLoaderModule {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for WorkerLoaderModule {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(WorkerLoaderModule, crate::chunk::ecmascript_chunk_item);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for WorkerLoaderModule {
......
......@@ -2,7 +2,7 @@ use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{
chunk::{AssetSuffix, AsyncModuleInfo, ChunkableModule, ChunkingContext},
chunk::{AssetSuffix, AsyncModuleInfo, ChunkingContext},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
module_graph::ModuleGraph,
......@@ -10,10 +10,7 @@ use turbopack_core::{
source::Source,
};
use turbopack_ecmascript::{
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
ecmascript_chunk_item,
},
chunk::{EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports},
runtime_functions::{TURBOPACK_EXPORT_URL, TURBOPACK_EXPORT_VALUE},
utils::StringifyJs,
};
......@@ -68,17 +65,7 @@ impl Module for StaticUrlJsModule {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for StaticUrlJsModule {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(StaticUrlJsModule, ecmascript);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for StaticUrlJsModule {
......
......@@ -3,9 +3,7 @@ use turbo_rcstr::rcstr;
use turbo_tasks::{IntoTraitRef, ResolvedVc, Vc, fxindexmap};
use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{
chunk::{
AsyncModuleInfo, ChunkableModule, ChunkingContext, chunk_group::references_to_output_assets,
},
chunk::{AsyncModuleInfo, ChunkingContext, chunk_group::references_to_output_assets},
context::AssetContext,
ident::AssetIdent,
module::{Module, ModuleSideEffects, OptionModule},
......@@ -17,10 +15,7 @@ use turbopack_core::{
source::{OptionSource, Source},
};
use turbopack_ecmascript::{
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
ecmascript_chunk_item,
},
chunk::{EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports},
references::async_module::OptionAsyncModule,
};
......@@ -152,17 +147,7 @@ impl Module for WebAssemblyModuleAsset {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for WebAssemblyModuleAsset {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(WebAssemblyModuleAsset, ecmascript);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for WebAssemblyModuleAsset {
......
......@@ -2,7 +2,7 @@ use anyhow::{Result, bail};
use turbo_rcstr::rcstr;
use turbo_tasks::{IntoTraitRef, ResolvedVc, Vc};
use turbopack_core::{
chunk::{AsyncModuleInfo, ChunkableModule, ChunkingContext},
chunk::{AsyncModuleInfo, ChunkingContext},
context::AssetContext,
ident::AssetIdent,
module::{Module, ModuleSideEffects},
......@@ -11,10 +11,7 @@ use turbopack_core::{
source::{OptionSource, Source},
};
use turbopack_ecmascript::{
chunk::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
ecmascript_chunk_item,
},
chunk::{EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports},
runtime_functions::TURBOPACK_EXPORT_URL,
utils::StringifyJs,
};
......@@ -71,17 +68,7 @@ impl Module for RawWebAssemblyModuleAsset {
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for RawWebAssemblyModuleAsset {
#[turbo_tasks::function]
fn as_chunk_item(
self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
) -> Vc<Box<dyn turbopack_core::chunk::ChunkItem>> {
ecmascript_chunk_item(ResolvedVc::upcast(self), module_graph, chunking_context)
}
}
turbopack_core::chunk_item!(RawWebAssemblyModuleAsset, ecmascript);
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for RawWebAssemblyModuleAsset {
......
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