Unverified Commit 406878fb authored by Alexander Lyon's avatar Alexander Lyon Committed by GitHub

port turbopack-ecmascript to ResolvedVc (#73226)

### What?

We are in the process of porting some of the API to ResolvedVc. This does that for the turbopack-ecmascript crate.
parent f8fddfa1
...@@ -121,14 +121,13 @@ impl Debug for NativeFunction { ...@@ -121,14 +121,13 @@ impl Debug for NativeFunction {
} }
impl NativeFunction { impl NativeFunction {
pub fn new_function<Mode, Inputs, I>( pub fn new_function<Mode, Inputs>(
name: String, name: String,
function_meta: FunctionMeta, function_meta: FunctionMeta,
implementation: I, implementation: impl IntoTaskFn<Mode, Inputs>,
) -> Self ) -> Self
where where
Inputs: TaskInput + Serialize + for<'de> Deserialize<'de> + 'static, Inputs: TaskInput + Serialize + for<'de> Deserialize<'de> + 'static,
I: IntoTaskFn<Mode, Inputs>,
{ {
Self { Self {
name, name,
......
...@@ -396,17 +396,23 @@ impl EcmascriptChunkItem for ModuleChunkItem { ...@@ -396,17 +396,23 @@ impl EcmascriptChunkItem for ModuleChunkItem {
inner_code: code.clone().into(), inner_code: code.clone().into(),
// We generate a minimal map for runtime code so that the filename is // We generate a minimal map for runtime code so that the filename is
// displayed in dev tools. // displayed in dev tools.
source_map: Some(Vc::upcast(generate_minimal_source_map( source_map: Some(Vc::upcast(
self.module.ident().to_string().await?.to_string(), generate_minimal_source_map(
code, self.module.ident().to_string().await?.to_string(),
))), code,
)
.await?,
)),
..Default::default() ..Default::default()
} }
.cell()) .cell())
} }
} }
fn generate_minimal_source_map(filename: String, source: String) -> Vc<ParseResultSourceMap> { async fn generate_minimal_source_map(
filename: String,
source: String,
) -> Result<Vc<ParseResultSourceMap>> {
let mut mappings = vec![]; let mut mappings = vec![];
// Start from 1 because 0 is reserved for dummy spans in SWC. // Start from 1 because 0 is reserved for dummy spans in SWC.
let mut pos = 1; let mut pos = 1;
...@@ -422,8 +428,8 @@ fn generate_minimal_source_map(filename: String, source: String) -> Vc<ParseResu ...@@ -422,8 +428,8 @@ fn generate_minimal_source_map(filename: String, source: String) -> Vc<ParseResu
} }
let sm: Arc<SourceMap> = Default::default(); let sm: Arc<SourceMap> = Default::default();
sm.new_source_file(FileName::Custom(filename).into(), source); sm.new_source_file(FileName::Custom(filename).into(), source);
let map = ParseResultSourceMap::new(sm, mappings, OptionSourceMap::none()); let map = ParseResultSourceMap::new(sm, mappings, OptionSourceMap::none().to_resolved().await?);
map.cell() Ok(map.cell())
} }
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
......
...@@ -191,12 +191,12 @@ fn modifier() -> Vc<RcStr> { ...@@ -191,12 +191,12 @@ fn modifier() -> Vc<RcStr> {
#[derive(Clone)] #[derive(Clone)]
pub struct EcmascriptModuleAssetBuilder { pub struct EcmascriptModuleAssetBuilder {
source: Vc<Box<dyn Source>>, source: ResolvedVc<Box<dyn Source>>,
asset_context: Vc<Box<dyn AssetContext>>, asset_context: ResolvedVc<Box<dyn AssetContext>>,
ty: EcmascriptModuleAssetType, ty: EcmascriptModuleAssetType,
transforms: Vc<EcmascriptInputTransforms>, transforms: ResolvedVc<EcmascriptInputTransforms>,
options: Vc<EcmascriptOptions>, options: ResolvedVc<EcmascriptOptions>,
compile_time_info: Vc<CompileTimeInfo>, compile_time_info: ResolvedVc<CompileTimeInfo>,
inner_assets: Option<ResolvedVc<InnerAssets>>, inner_assets: Option<ResolvedVc<InnerAssets>>,
} }
...@@ -214,22 +214,22 @@ impl EcmascriptModuleAssetBuilder { ...@@ -214,22 +214,22 @@ impl EcmascriptModuleAssetBuilder {
pub fn build(self) -> Vc<EcmascriptModuleAsset> { pub fn build(self) -> Vc<EcmascriptModuleAsset> {
if let Some(inner_assets) = self.inner_assets { if let Some(inner_assets) = self.inner_assets {
EcmascriptModuleAsset::new_with_inner_assets( EcmascriptModuleAsset::new_with_inner_assets(
self.source, *self.source,
self.asset_context, *self.asset_context,
Value::new(self.ty), Value::new(self.ty),
self.transforms, *self.transforms,
self.options, *self.options,
self.compile_time_info, *self.compile_time_info,
*inner_assets, *inner_assets,
) )
} else { } else {
EcmascriptModuleAsset::new( EcmascriptModuleAsset::new(
self.source, *self.source,
self.asset_context, *self.asset_context,
Value::new(self.ty), Value::new(self.ty),
self.transforms, *self.transforms,
self.options, *self.options,
self.compile_time_info, *self.compile_time_info,
) )
} }
} }
...@@ -275,11 +275,11 @@ pub trait EcmascriptAnalyzable { ...@@ -275,11 +275,11 @@ pub trait EcmascriptAnalyzable {
impl EcmascriptModuleAsset { impl EcmascriptModuleAsset {
pub fn builder( pub fn builder(
source: Vc<Box<dyn Source>>, source: ResolvedVc<Box<dyn Source>>,
asset_context: Vc<Box<dyn AssetContext>>, asset_context: ResolvedVc<Box<dyn AssetContext>>,
transforms: Vc<EcmascriptInputTransforms>, transforms: ResolvedVc<EcmascriptInputTransforms>,
options: Vc<EcmascriptOptions>, options: ResolvedVc<EcmascriptOptions>,
compile_time_info: Vc<CompileTimeInfo>, compile_time_info: ResolvedVc<CompileTimeInfo>,
) -> EcmascriptModuleAssetBuilder { ) -> EcmascriptModuleAssetBuilder {
EcmascriptModuleAssetBuilder { EcmascriptModuleAssetBuilder {
source, source,
...@@ -394,7 +394,7 @@ impl EcmascriptAnalyzable for EcmascriptModuleAsset { ...@@ -394,7 +394,7 @@ impl EcmascriptAnalyzable for EcmascriptModuleAsset {
*analyze.references, *analyze.references,
*analyze.code_generation, *analyze.code_generation,
*analyze.async_module, *analyze.async_module,
analyze.source_map, *analyze.source_map,
*analyze.exports, *analyze.exports,
async_module_info, async_module_info,
)) ))
...@@ -714,8 +714,8 @@ impl EcmascriptModuleContent { ...@@ -714,8 +714,8 @@ impl EcmascriptModuleContent {
/// Creates a new [`Vc<EcmascriptModuleContent>`]. /// Creates a new [`Vc<EcmascriptModuleContent>`].
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn new( pub async fn new(
parsed: Vc<ParseResult>, parsed: ResolvedVc<ParseResult>,
ident: Vc<AssetIdent>, ident: ResolvedVc<AssetIdent>,
specified_module_type: SpecifiedModuleType, specified_module_type: SpecifiedModuleType,
chunking_context: Vc<Box<dyn ChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
references: Vc<ModuleReferences>, references: Vc<ModuleReferences>,
...@@ -763,8 +763,14 @@ impl EcmascriptModuleContent { ...@@ -763,8 +763,14 @@ impl EcmascriptModuleContent {
let code_gens = code_gens.into_iter().try_join().await?; let code_gens = code_gens.into_iter().try_join().await?;
let code_gens = code_gens.iter().map(|cg| &**cg).collect::<Vec<_>>(); let code_gens = code_gens.iter().map(|cg| &**cg).collect::<Vec<_>>();
gen_content_with_code_gens(parsed, ident, specified_module_type, &code_gens, source_map) gen_content_with_code_gens(
.await parsed,
ident,
specified_module_type,
&code_gens,
source_map.to_resolved().await?,
)
.await
} }
/// Creates a new [`Vc<EcmascriptModuleContent>`] without an analysis pass. /// Creates a new [`Vc<EcmascriptModuleContent>`] without an analysis pass.
...@@ -775,22 +781,22 @@ impl EcmascriptModuleContent { ...@@ -775,22 +781,22 @@ impl EcmascriptModuleContent {
specified_module_type: SpecifiedModuleType, specified_module_type: SpecifiedModuleType,
) -> Result<Vc<Self>> { ) -> Result<Vc<Self>> {
gen_content_with_code_gens( gen_content_with_code_gens(
parsed, parsed.to_resolved().await?,
ident, ident.to_resolved().await?,
specified_module_type, specified_module_type,
&[], &[],
OptionSourceMap::none(), OptionSourceMap::none().to_resolved().await?,
) )
.await .await
} }
} }
async fn gen_content_with_code_gens( async fn gen_content_with_code_gens(
parsed: Vc<ParseResult>, parsed: ResolvedVc<ParseResult>,
ident: Vc<AssetIdent>, ident: ResolvedVc<AssetIdent>,
specified_module_type: SpecifiedModuleType, specified_module_type: SpecifiedModuleType,
code_gens: &[&CodeGeneration], code_gens: &[&CodeGeneration],
original_src_map: Vc<OptionSourceMap>, original_src_map: ResolvedVc<OptionSourceMap>,
) -> Result<Vc<EcmascriptModuleContent>> { ) -> Result<Vc<EcmascriptModuleContent>> {
let parsed = parsed.await?; let parsed = parsed.await?;
......
...@@ -31,7 +31,7 @@ use crate::ParseResultSourceMap; ...@@ -31,7 +31,7 @@ use crate::ParseResultSourceMap;
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn minify(path: Vc<FileSystemPath>, code: Vc<Code>) -> Result<Vc<Code>> { pub async fn minify(path: Vc<FileSystemPath>, code: Vc<Code>) -> Result<Vc<Code>> {
let path = path.await?; let path = path.await?;
let original_map = code.generate_source_map(); let original_map = code.generate_source_map().to_resolved().await?;
let code = code.await?; let code = code.await?;
let cm = Arc::new(SwcSourceMap::new(FilePathMapping::empty())); let cm = Arc::new(SwcSourceMap::new(FilePathMapping::empty()));
......
...@@ -87,7 +87,7 @@ pub struct ParseResultSourceMap { ...@@ -87,7 +87,7 @@ pub struct ParseResultSourceMap {
/// An input's original source map, if one exists. This will be used to /// An input's original source map, if one exists. This will be used to
/// trace locations back to the input's pre-transformed sources. /// trace locations back to the input's pre-transformed sources.
original_source_map: Vc<OptionSourceMap>, original_source_map: ResolvedVc<OptionSourceMap>,
} }
impl PartialEq for ParseResultSourceMap { impl PartialEq for ParseResultSourceMap {
...@@ -100,7 +100,7 @@ impl ParseResultSourceMap { ...@@ -100,7 +100,7 @@ impl ParseResultSourceMap {
pub fn new( pub fn new(
files_map: Arc<swc_core::common::SourceMap>, files_map: Arc<swc_core::common::SourceMap>,
mappings: Vec<(BytePos, LineCol)>, mappings: Vec<(BytePos, LineCol)>,
original_source_map: Vc<OptionSourceMap>, original_source_map: ResolvedVc<OptionSourceMap>,
) -> Self { ) -> Self {
ParseResultSourceMap { ParseResultSourceMap {
files_map, files_map,
......
...@@ -86,7 +86,7 @@ impl ChunkableModuleReference for AmdDefineAssetReference {} ...@@ -86,7 +86,7 @@ impl ChunkableModuleReference for AmdDefineAssetReference {}
#[derive(ValueDebugFormat, Debug, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, Clone)] #[derive(ValueDebugFormat, Debug, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, Clone)]
pub enum AmdDefineDependencyElement { pub enum AmdDefineDependencyElement {
Request { Request {
request: Vc<Request>, request: ResolvedVc<Request>,
request_str: String, request_str: String,
}, },
Exports, Exports,
...@@ -107,20 +107,20 @@ pub enum AmdDefineFactoryType { ...@@ -107,20 +107,20 @@ pub enum AmdDefineFactoryType {
#[derive(Debug)] #[derive(Debug)]
pub struct AmdDefineWithDependenciesCodeGen { pub struct AmdDefineWithDependenciesCodeGen {
dependencies_requests: Vec<AmdDefineDependencyElement>, dependencies_requests: Vec<AmdDefineDependencyElement>,
origin: Vc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
path: ResolvedVc<AstPath>, path: ResolvedVc<AstPath>,
factory_type: AmdDefineFactoryType, factory_type: AmdDefineFactoryType,
issue_source: Vc<IssueSource>, issue_source: ResolvedVc<IssueSource>,
in_try: bool, in_try: bool,
} }
impl AmdDefineWithDependenciesCodeGen { impl AmdDefineWithDependenciesCodeGen {
pub fn new( pub fn new(
dependencies_requests: Vec<AmdDefineDependencyElement>, dependencies_requests: Vec<AmdDefineDependencyElement>,
origin: Vc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
path: ResolvedVc<AstPath>, path: ResolvedVc<AstPath>,
factory_type: AmdDefineFactoryType, factory_type: AmdDefineFactoryType,
issue_source: Vc<IssueSource>, issue_source: ResolvedVc<IssueSource>,
in_try: bool, in_try: bool,
) -> Vc<Self> { ) -> Vc<Self> {
Self::cell(AmdDefineWithDependenciesCodeGen { Self::cell(AmdDefineWithDependenciesCodeGen {
...@@ -153,13 +153,13 @@ impl CodeGenerateable for AmdDefineWithDependenciesCodeGen { ...@@ -153,13 +153,13 @@ impl CodeGenerateable for AmdDefineWithDependenciesCodeGen {
request_str, request_str,
} => ResolvedElement::PatternMapping { } => ResolvedElement::PatternMapping {
pattern_mapping: PatternMapping::resolve_request( pattern_mapping: PatternMapping::resolve_request(
*request, **request,
self.origin, *self.origin,
Vc::upcast(chunking_context), Vc::upcast(chunking_context),
cjs_resolve( cjs_resolve(
self.origin, *self.origin,
*request, **request,
Some(self.issue_source), Some(*self.issue_source),
self.in_try, self.in_try,
), ),
Value::new(ChunkItem), Value::new(ChunkItem),
......
...@@ -40,14 +40,14 @@ impl EsmBindings { ...@@ -40,14 +40,14 @@ impl EsmBindings {
#[derive(Hash, Clone, Debug, TaskInput, Serialize, Deserialize, PartialEq, Eq, TraceRawVcs)] #[derive(Hash, Clone, Debug, TaskInput, Serialize, Deserialize, PartialEq, Eq, TraceRawVcs)]
pub struct EsmBinding { pub struct EsmBinding {
pub reference: Vc<EsmAssetReference>, pub reference: ResolvedVc<EsmAssetReference>,
pub export: Option<RcStr>, pub export: Option<RcStr>,
pub ast_path: ResolvedVc<AstPath>, pub ast_path: ResolvedVc<AstPath>,
} }
impl EsmBinding { impl EsmBinding {
pub fn new( pub fn new(
reference: Vc<EsmAssetReference>, reference: ResolvedVc<EsmAssetReference>,
export: Option<RcStr>, export: Option<RcStr>,
ast_path: ResolvedVc<AstPath>, ast_path: ResolvedVc<AstPath>,
) -> Self { ) -> Self {
......
...@@ -118,14 +118,14 @@ pub enum FoundExportType { ...@@ -118,14 +118,14 @@ pub enum FoundExportType {
#[turbo_tasks::value] #[turbo_tasks::value]
pub struct FollowExportsResult { pub struct FollowExportsResult {
pub module: Vc<Box<dyn EcmascriptChunkPlaceable>>, pub module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
pub export_name: Option<RcStr>, pub export_name: Option<RcStr>,
pub ty: FoundExportType, pub ty: FoundExportType,
} }
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn follow_reexports( pub async fn follow_reexports(
module: Vc<Box<dyn EcmascriptChunkPlaceable>>, module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
export_name: RcStr, export_name: RcStr,
side_effect_free_packages: Vc<Glob>, side_effect_free_packages: Vc<Glob>,
ignore_side_effect_of_entry: bool, ignore_side_effect_of_entry: bool,
...@@ -160,7 +160,7 @@ pub async fn follow_reexports( ...@@ -160,7 +160,7 @@ pub async fn follow_reexports(
.await? .await?
{ {
ControlFlow::Continue((m, n)) => { ControlFlow::Continue((m, n)) => {
module = m; module = m.to_resolved().await?;
export_name = n; export_name = n;
continue; continue;
} }
...@@ -172,9 +172,9 @@ pub async fn follow_reexports( ...@@ -172,9 +172,9 @@ pub async fn follow_reexports(
// Try to find the export in the star exports // Try to find the export in the star exports
if !exports_ref.star_exports.is_empty() && &*export_name != "default" { if !exports_ref.star_exports.is_empty() && &*export_name != "default" {
let result = get_all_export_names(module).await?; let result = get_all_export_names(*module).await?;
if let Some(m) = result.esm_exports.get(&export_name) { if let Some(m) = result.esm_exports.get(&export_name) {
module = *m; module = m.to_resolved().await?;
continue; continue;
} }
return match &result.dynamic_exporting_modules[..] { return match &result.dynamic_exporting_modules[..] {
...@@ -208,7 +208,7 @@ pub async fn follow_reexports( ...@@ -208,7 +208,7 @@ pub async fn follow_reexports(
} }
async fn handle_declared_export( async fn handle_declared_export(
module: Vc<Box<dyn EcmascriptChunkPlaceable>>, module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
export_name: RcStr, export_name: RcStr,
export: &EsmExport, export: &EsmExport,
side_effect_free_packages: Vc<Glob>, side_effect_free_packages: Vc<Glob>,
...@@ -223,7 +223,7 @@ async fn handle_declared_export( ...@@ -223,7 +223,7 @@ async fn handle_declared_export(
.await? .await?
{ {
return Ok(ControlFlow::Break(FollowExportsResult { return Ok(ControlFlow::Break(FollowExportsResult {
module: *module, module,
export_name: Some(name.clone()), export_name: Some(name.clone()),
ty: FoundExportType::SideEffects, ty: FoundExportType::SideEffects,
})); }));
...@@ -232,11 +232,11 @@ async fn handle_declared_export( ...@@ -232,11 +232,11 @@ async fn handle_declared_export(
} }
} }
EsmExport::ImportedNamespace(reference) => { EsmExport::ImportedNamespace(reference) => {
if let ReferencedAsset::Some(m) = if let ReferencedAsset::Some(module) =
*ReferencedAsset::from_resolve_result(reference.resolve_reference()).await? *ReferencedAsset::from_resolve_result(reference.resolve_reference()).await?
{ {
return Ok(ControlFlow::Break(FollowExportsResult { return Ok(ControlFlow::Break(FollowExportsResult {
module: *m, module,
export_name: None, export_name: None,
ty: FoundExportType::Found, ty: FoundExportType::Found,
})); }));
...@@ -266,13 +266,13 @@ async fn handle_declared_export( ...@@ -266,13 +266,13 @@ async fn handle_declared_export(
#[turbo_tasks::value] #[turbo_tasks::value]
struct AllExportNamesResult { struct AllExportNamesResult {
esm_exports: FxIndexMap<RcStr, Vc<Box<dyn EcmascriptChunkPlaceable>>>, esm_exports: FxIndexMap<RcStr, ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>>,
dynamic_exporting_modules: Vec<Vc<Box<dyn EcmascriptChunkPlaceable>>>, dynamic_exporting_modules: Vec<ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>>,
} }
#[turbo_tasks::function] #[turbo_tasks::function]
async fn get_all_export_names( async fn get_all_export_names(
module: Vc<Box<dyn EcmascriptChunkPlaceable>>, module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
) -> Result<Vc<AllExportNamesResult>> { ) -> Result<Vc<AllExportNamesResult>> {
let exports = module.get_exports().await?; let exports = module.get_exports().await?;
let EcmascriptExports::EsmExports(exports) = &*exports else { let EcmascriptExports::EsmExports(exports) = &*exports else {
......
use anyhow::Result; use anyhow::Result;
use swc_core::{ecma::ast::Expr, quote}; use swc_core::{ecma::ast::Expr, quote};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::Vc; use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::chunk::ChunkingContext; use turbopack_core::chunk::ChunkingContext;
use super::AstPath; use super::AstPath;
...@@ -13,14 +13,17 @@ use crate::{ ...@@ -13,14 +13,17 @@ use crate::{
#[turbo_tasks::value] #[turbo_tasks::value]
pub struct IdentReplacement { pub struct IdentReplacement {
value: RcStr, value: RcStr,
path: Vc<AstPath>, path: ResolvedVc<AstPath>,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl IdentReplacement { impl IdentReplacement {
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn new(value: RcStr, path: Vc<AstPath>) -> Vc<Self> { pub async fn new(value: RcStr, path: Vc<AstPath>) -> Result<Vc<Self>> {
Self::cell(IdentReplacement { value, path }) Ok(Self::cell(IdentReplacement {
value,
path: path.to_resolved().await?,
}))
} }
} }
......
...@@ -56,7 +56,7 @@ impl EcmascriptChunkItem for EcmascriptModuleLocalsChunkItem { ...@@ -56,7 +56,7 @@ impl EcmascriptChunkItem for EcmascriptModuleLocalsChunkItem {
*analyze_result.local_references, *analyze_result.local_references,
*analyze_result.code_generation, *analyze_result.code_generation,
*analyze_result.async_module, *analyze_result.async_module,
analyze_result.source_map, *analyze_result.source_map,
exports, exports,
async_module_info, async_module_info,
); );
......
...@@ -17,7 +17,7 @@ use crate::EcmascriptAnalyzable; ...@@ -17,7 +17,7 @@ use crate::EcmascriptAnalyzable;
#[turbo_tasks::value] #[turbo_tasks::value]
pub struct StaticEcmascriptCode { pub struct StaticEcmascriptCode {
asset_context: ResolvedVc<Box<dyn AssetContext>>, asset_context: ResolvedVc<Box<dyn AssetContext>>,
asset: Vc<Box<dyn EcmascriptAnalyzable>>, asset: ResolvedVc<Box<dyn EcmascriptAnalyzable>>,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
...@@ -33,8 +33,10 @@ impl StaticEcmascriptCode { ...@@ -33,8 +33,10 @@ impl StaticEcmascriptCode {
Vc::upcast(FileSource::new(*asset_path)), Vc::upcast(FileSource::new(*asset_path)),
Value::new(ReferenceType::Runtime), Value::new(ReferenceType::Runtime),
) )
.module(); .module()
let Some(asset) = Vc::try_resolve_sidecast::<Box<dyn EcmascriptAnalyzable>>(module).await? .to_resolved()
.await?;
let Some(asset) = ResolvedVc::try_sidecast::<Box<dyn EcmascriptAnalyzable>>(module).await?
else { else {
bail!("asset is not an Ecmascript module") bail!("asset is not an Ecmascript module")
}; };
......
...@@ -160,24 +160,32 @@ impl EcmascriptModulePartAsset { ...@@ -160,24 +160,32 @@ impl EcmascriptModulePartAsset {
if *new_export == export_name { if *new_export == export_name {
*final_module *final_module
} else { } else {
Vc::upcast(EcmascriptModuleFacadeModule::new( ResolvedVc::upcast(
*final_module, EcmascriptModuleFacadeModule::new(
ModulePart::renamed_export(new_export.clone(), export_name.clone()), **final_module,
)) ModulePart::renamed_export(new_export.clone(), export_name.clone()),
)
.to_resolved()
.await?,
)
} }
} else { } else {
Vc::upcast(EcmascriptModuleFacadeModule::new( ResolvedVc::upcast(
*final_module, EcmascriptModuleFacadeModule::new(
ModulePart::renamed_namespace(export_name.clone()), **final_module,
)) ModulePart::renamed_namespace(export_name.clone()),
)
.to_resolved()
.await?,
)
}; };
if side_effects.is_empty() { if side_effects.is_empty() {
return Ok(Vc::upcast(final_module)); return Ok(*ResolvedVc::upcast(final_module));
} }
let side_effects_module = let side_effects_module =
SideEffectsModule::new(module, *part, final_module, side_effects.to_vec()); SideEffectsModule::new(module, *part, *final_module, side_effects.to_vec());
return Ok(Vc::upcast(side_effects_module)); return Ok(Vc::upcast(side_effects_module));
} }
...@@ -201,12 +209,12 @@ impl EcmascriptModulePartAsset { ...@@ -201,12 +209,12 @@ impl EcmascriptModulePartAsset {
#[turbo_tasks::value] #[turbo_tasks::value]
struct FollowExportsWithSideEffectsResult { struct FollowExportsWithSideEffectsResult {
side_effects: Vec<Vc<Box<dyn EcmascriptChunkPlaceable>>>, side_effects: Vec<Vc<Box<dyn EcmascriptChunkPlaceable>>>,
result: Vc<FollowExportsResult>, result: ResolvedVc<FollowExportsResult>,
} }
#[turbo_tasks::function] #[turbo_tasks::function]
async fn follow_reexports_with_side_effects( async fn follow_reexports_with_side_effects(
module: Vc<Box<dyn EcmascriptChunkPlaceable>>, module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
export_name: RcStr, export_name: RcStr,
side_effect_free_packages: Vc<Glob>, side_effect_free_packages: Vc<Glob>,
) -> Result<Vc<FollowExportsWithSideEffectsResult>> { ) -> Result<Vc<FollowExportsWithSideEffectsResult>> {
...@@ -220,16 +228,18 @@ async fn follow_reexports_with_side_effects( ...@@ -220,16 +228,18 @@ async fn follow_reexports_with_side_effects(
.await?; .await?;
if !is_side_effect_free { if !is_side_effect_free {
side_effects.push(only_effects(current_module)); side_effects.push(only_effects(*current_module));
} }
// We ignore the side effect of the entry module here, because we need to proceed. // We ignore the side effect of the entry module here, because we need to proceed.
let result = follow_reexports( let result = follow_reexports(
current_module, *current_module,
current_export_name.clone(), current_export_name.clone(),
side_effect_free_packages, side_effect_free_packages,
true, true,
); )
.to_resolved()
.await?;
let FollowExportsResult { let FollowExportsResult {
module, module,
......
...@@ -60,7 +60,7 @@ impl EcmascriptChunkItem for EcmascriptModulePartChunkItem { ...@@ -60,7 +60,7 @@ impl EcmascriptChunkItem for EcmascriptModulePartChunkItem {
*analyze.references, *analyze.references,
*analyze.code_generation, *analyze.code_generation,
*analyze.async_module, *analyze.async_module,
analyze.source_map, *analyze.source_map,
*analyze.exports, *analyze.exports,
async_module_info, async_module_info,
); );
...@@ -116,8 +116,8 @@ impl ChunkItem for EcmascriptModulePartChunkItem { ...@@ -116,8 +116,8 @@ impl ChunkItem for EcmascriptModulePartChunkItem {
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub(super) struct SideEffectsModuleChunkItem { pub(super) struct SideEffectsModuleChunkItem {
pub module: Vc<SideEffectsModule>, pub module: ResolvedVc<SideEffectsModule>,
pub chunking_context: Vc<Box<dyn ChunkingContext>>, pub chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
...@@ -139,12 +139,12 @@ impl ChunkItem for SideEffectsModuleChunkItem { ...@@ -139,12 +139,12 @@ impl ChunkItem for SideEffectsModuleChunkItem {
#[turbo_tasks::function] #[turbo_tasks::function]
fn module(&self) -> Vc<Box<dyn Module>> { fn module(&self) -> Vc<Box<dyn Module>> {
Vc::upcast(self.module) *ResolvedVc::upcast(self.module)
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> { fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
self.chunking_context *self.chunking_context
} }
} }
...@@ -215,6 +215,6 @@ impl EcmascriptChunkItem for SideEffectsModuleChunkItem { ...@@ -215,6 +215,6 @@ impl EcmascriptChunkItem for SideEffectsModuleChunkItem {
#[turbo_tasks::function] #[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> { fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
self.chunking_context *self.chunking_context
} }
} }
...@@ -20,11 +20,11 @@ use crate::{ ...@@ -20,11 +20,11 @@ use crate::{
#[turbo_tasks::value] #[turbo_tasks::value]
pub(super) struct SideEffectsModule { pub(super) struct SideEffectsModule {
/// Original module /// Original module
pub module: Vc<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
pub part: ResolvedVc<ModulePart>, pub part: ResolvedVc<ModulePart>,
/// The module that is the binding /// The module that is the binding
pub resolved_as: Vc<Box<dyn EcmascriptChunkPlaceable>>, pub resolved_as: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
/// Side effects from the original module to the binding. /// Side effects from the original module to the binding.
pub side_effects: Vec<Vc<Box<dyn EcmascriptChunkPlaceable>>>, pub side_effects: Vec<Vc<Box<dyn EcmascriptChunkPlaceable>>>,
} }
...@@ -33,9 +33,9 @@ pub(super) struct SideEffectsModule { ...@@ -33,9 +33,9 @@ pub(super) struct SideEffectsModule {
impl SideEffectsModule { impl SideEffectsModule {
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn new( pub fn new(
module: Vc<EcmascriptModuleAsset>, module: ResolvedVc<EcmascriptModuleAsset>,
part: ResolvedVc<ModulePart>, part: ResolvedVc<ModulePart>,
resolved_as: Vc<Box<dyn EcmascriptChunkPlaceable>>, resolved_as: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
side_effects: Vec<Vc<Box<dyn EcmascriptChunkPlaceable>>>, side_effects: Vec<Vc<Box<dyn EcmascriptChunkPlaceable>>>,
) -> Vc<Self> { ) -> Vc<Self> {
SideEffectsModule { SideEffectsModule {
...@@ -84,7 +84,7 @@ impl Module for SideEffectsModule { ...@@ -84,7 +84,7 @@ impl Module for SideEffectsModule {
} }
references.push(Vc::upcast(SingleChunkableModuleReference::new( references.push(Vc::upcast(SingleChunkableModuleReference::new(
Vc::upcast(self.resolved_as), *ResolvedVc::upcast(self.resolved_as),
Vc::cell(RcStr::from("resolved as")), Vc::cell(RcStr::from("resolved as")),
))); )));
...@@ -122,8 +122,8 @@ impl ChunkableModule for SideEffectsModule { ...@@ -122,8 +122,8 @@ impl ChunkableModule for SideEffectsModule {
) -> Result<Vc<Box<dyn turbopack_core::chunk::ChunkItem>>> { ) -> Result<Vc<Box<dyn turbopack_core::chunk::ChunkItem>>> {
Ok(Vc::upcast( Ok(Vc::upcast(
SideEffectsModuleChunkItem { SideEffectsModuleChunkItem {
module: self, module: self.to_resolved().await?,
chunking_context, chunking_context: chunking_context.to_resolved().await?,
} }
.cell(), .cell(),
)) ))
......
...@@ -77,7 +77,7 @@ impl Asset for WebpackModuleAsset { ...@@ -77,7 +77,7 @@ impl Asset for WebpackModuleAsset {
pub struct WebpackChunkAssetReference { pub struct WebpackChunkAssetReference {
#[turbo_tasks(trace_ignore)] #[turbo_tasks(trace_ignore)]
pub chunk_id: Lit, pub chunk_id: Lit,
pub runtime: Vc<WebpackRuntime>, pub runtime: ResolvedVc<WebpackRuntime>,
pub transforms: ResolvedVc<EcmascriptInputTransforms>, pub transforms: ResolvedVc<EcmascriptInputTransforms>,
} }
...@@ -101,7 +101,7 @@ impl ModuleReference for WebpackChunkAssetReference { ...@@ -101,7 +101,7 @@ impl ModuleReference for WebpackChunkAssetReference {
let source = Vc::upcast(FileSource::new(context_path.join(filename))); let source = Vc::upcast(FileSource::new(context_path.join(filename)));
ModuleResolveResult::module(ResolvedVc::upcast( ModuleResolveResult::module(ResolvedVc::upcast(
WebpackModuleAsset::new(source, self.runtime, *self.transforms) WebpackModuleAsset::new(source, *self.runtime, *self.transforms)
.to_resolved() .to_resolved()
.await?, .await?,
)) ))
...@@ -128,7 +128,7 @@ impl ValueToString for WebpackChunkAssetReference { ...@@ -128,7 +128,7 @@ impl ValueToString for WebpackChunkAssetReference {
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub struct WebpackEntryAssetReference { pub struct WebpackEntryAssetReference {
pub source: ResolvedVc<Box<dyn Source>>, pub source: ResolvedVc<Box<dyn Source>>,
pub runtime: Vc<WebpackRuntime>, pub runtime: ResolvedVc<WebpackRuntime>,
pub transforms: ResolvedVc<EcmascriptInputTransforms>, pub transforms: ResolvedVc<EcmascriptInputTransforms>,
} }
...@@ -137,7 +137,7 @@ impl ModuleReference for WebpackEntryAssetReference { ...@@ -137,7 +137,7 @@ impl ModuleReference for WebpackEntryAssetReference {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn resolve_reference(&self) -> Result<Vc<ModuleResolveResult>> { async fn resolve_reference(&self) -> Result<Vc<ModuleResolveResult>> {
Ok(ModuleResolveResult::module(ResolvedVc::upcast( Ok(ModuleResolveResult::module(ResolvedVc::upcast(
WebpackModuleAsset::new(*self.source, self.runtime, *self.transforms) WebpackModuleAsset::new(*self.source, *self.runtime, *self.transforms)
.to_resolved() .to_resolved()
.await?, .await?,
)) ))
...@@ -156,8 +156,8 @@ impl ValueToString for WebpackEntryAssetReference { ...@@ -156,8 +156,8 @@ impl ValueToString for WebpackEntryAssetReference {
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub struct WebpackRuntimeAssetReference { pub struct WebpackRuntimeAssetReference {
pub origin: ResolvedVc<Box<dyn ResolveOrigin>>, pub origin: ResolvedVc<Box<dyn ResolveOrigin>>,
pub request: Vc<Request>, pub request: ResolvedVc<Request>,
pub runtime: Vc<WebpackRuntime>, pub runtime: ResolvedVc<WebpackRuntime>,
pub transforms: ResolvedVc<EcmascriptInputTransforms>, pub transforms: ResolvedVc<EcmascriptInputTransforms>,
} }
...@@ -173,7 +173,7 @@ impl ModuleReference for WebpackRuntimeAssetReference { ...@@ -173,7 +173,7 @@ impl ModuleReference for WebpackRuntimeAssetReference {
let resolved = resolve( let resolved = resolve(
self.origin.origin_path().parent().resolve().await?, self.origin.origin_path().parent().resolve().await?,
Value::new(ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined)), Value::new(ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined)),
self.request, *self.request,
options, options,
); );
...@@ -181,7 +181,7 @@ impl ModuleReference for WebpackRuntimeAssetReference { ...@@ -181,7 +181,7 @@ impl ModuleReference for WebpackRuntimeAssetReference {
.await? .await?
.map_module(|source| async move { .map_module(|source| async move {
Ok(ModuleResolveResultItem::Module(ResolvedVc::upcast( Ok(ModuleResolveResultItem::Module(ResolvedVc::upcast(
WebpackModuleAsset::new(*source, self.runtime, *self.transforms) WebpackModuleAsset::new(*source, *self.runtime, *self.transforms)
.to_resolved() .to_resolved()
.await?, .await?,
))) )))
......
...@@ -22,7 +22,7 @@ use crate::{ ...@@ -22,7 +22,7 @@ use crate::{
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn module_references( pub async fn module_references(
source: ResolvedVc<Box<dyn Source>>, source: ResolvedVc<Box<dyn Source>>,
runtime: Vc<WebpackRuntime>, runtime: ResolvedVc<WebpackRuntime>,
transforms: ResolvedVc<EcmascriptInputTransforms>, transforms: ResolvedVc<EcmascriptInputTransforms>,
) -> Result<Vc<ModuleReferences>> { ) -> Result<Vc<ModuleReferences>> {
let parsed = parse( let parsed = parse(
...@@ -62,7 +62,7 @@ pub async fn module_references( ...@@ -62,7 +62,7 @@ pub async fn module_references(
} }
struct ModuleReferencesVisitor<'a> { struct ModuleReferencesVisitor<'a> {
runtime: Vc<WebpackRuntime>, runtime: ResolvedVc<WebpackRuntime>,
references: &'a mut Vec<Vc<Box<dyn ModuleReference>>>, references: &'a mut Vec<Vc<Box<dyn ModuleReference>>>,
transforms: ResolvedVc<EcmascriptInputTransforms>, transforms: ResolvedVc<EcmascriptInputTransforms>,
} }
......
...@@ -71,7 +71,7 @@ use crate::module_options::CustomModuleType; ...@@ -71,7 +71,7 @@ use crate::module_options::CustomModuleType;
#[turbo_tasks::function] #[turbo_tasks::function]
async fn apply_module_type( async fn apply_module_type(
source: Vc<Box<dyn Source>>, source: ResolvedVc<Box<dyn Source>>,
module_asset_context: Vc<ModuleAssetContext>, module_asset_context: Vc<ModuleAssetContext>,
module_type: Vc<ModuleType>, module_type: Vc<ModuleType>,
reference_type: Value<ReferenceType>, reference_type: Value<ReferenceType>,
...@@ -103,13 +103,18 @@ async fn apply_module_type( ...@@ -103,13 +103,18 @@ async fn apply_module_type(
module_asset_context.with_types_resolving_enabled() module_asset_context.with_types_resolving_enabled()
} }
_ => module_asset_context, _ => module_asset_context,
}; }
.to_resolved()
.await?;
let mut builder = EcmascriptModuleAsset::builder( let mut builder = EcmascriptModuleAsset::builder(
source, source,
Vc::upcast(context_for_module), ResolvedVc::upcast(context_for_module),
**transforms, *transforms,
**options, *options,
module_asset_context.compile_time_info(), module_asset_context
.compile_time_info()
.to_resolved()
.await?,
); );
match module_type { match module_type {
ModuleType::Ecmascript { .. } => { ModuleType::Ecmascript { .. } => {
...@@ -220,22 +225,22 @@ async fn apply_module_type( ...@@ -220,22 +225,22 @@ async fn apply_module_type(
.await? .await?
} }
} }
ModuleType::Json => ResolvedVc::upcast(JsonModuleAsset::new(source).to_resolved().await?), ModuleType::Json => ResolvedVc::upcast(JsonModuleAsset::new(*source).to_resolved().await?),
ModuleType::Raw => ResolvedVc::upcast(RawModule::new(source).to_resolved().await?), ModuleType::Raw => ResolvedVc::upcast(RawModule::new(*source).to_resolved().await?),
ModuleType::CssGlobal => { ModuleType::CssGlobal => {
return Ok(module_asset_context.process( return Ok(module_asset_context.process(
source, *source,
Value::new(ReferenceType::Css(CssReferenceSubType::Internal)), Value::new(ReferenceType::Css(CssReferenceSubType::Internal)),
)) ))
} }
ModuleType::CssModule => ResolvedVc::upcast( ModuleType::CssModule => ResolvedVc::upcast(
ModuleCssAsset::new(source, Vc::upcast(module_asset_context)) ModuleCssAsset::new(*source, Vc::upcast(module_asset_context))
.to_resolved() .to_resolved()
.await?, .await?,
), ),
ModuleType::Css { ty } => ResolvedVc::upcast( ModuleType::Css { ty } => ResolvedVc::upcast(
CssModuleAsset::new( CssModuleAsset::new(
source, *source,
Vc::upcast(module_asset_context), Vc::upcast(module_asset_context),
*ty, *ty,
module_asset_context module_asset_context
...@@ -255,13 +260,13 @@ async fn apply_module_type( ...@@ -255,13 +260,13 @@ async fn apply_module_type(
.await?, .await?,
), ),
ModuleType::Static => ResolvedVc::upcast( ModuleType::Static => ResolvedVc::upcast(
StaticModuleAsset::new(source, Vc::upcast(module_asset_context)) StaticModuleAsset::new(*source, Vc::upcast(module_asset_context))
.to_resolved() .to_resolved()
.await?, .await?,
), ),
ModuleType::WebAssembly { source_ty } => ResolvedVc::upcast( ModuleType::WebAssembly { source_ty } => ResolvedVc::upcast(
WebAssemblyModuleAsset::new( WebAssemblyModuleAsset::new(
WebAssemblySource::new(source, *source_ty), WebAssemblySource::new(*source, *source_ty),
Vc::upcast(module_asset_context), Vc::upcast(module_asset_context),
) )
.to_resolved() .to_resolved()
...@@ -269,7 +274,7 @@ async fn apply_module_type( ...@@ -269,7 +274,7 @@ async fn apply_module_type(
), ),
ModuleType::Custom(custom) => { ModuleType::Custom(custom) => {
custom custom
.create_module(source, module_asset_context, part) .create_module(*source, module_asset_context, part)
.to_resolved() .to_resolved()
.await? .await?
} }
...@@ -298,16 +303,16 @@ async fn apply_reexport_tree_shaking( ...@@ -298,16 +303,16 @@ async fn apply_reexport_tree_shaking(
.await?; .await?;
let module = if let Some(new_export) = new_export { let module = if let Some(new_export) = new_export {
if *new_export == *export { if *new_export == *export {
Vc::upcast(*final_module) Vc::upcast(**final_module)
} else { } else {
Vc::upcast(EcmascriptModuleFacadeModule::new( Vc::upcast(EcmascriptModuleFacadeModule::new(
*final_module, **final_module,
ModulePart::renamed_export(new_export.clone(), export.clone_value()), ModulePart::renamed_export(new_export.clone(), export.clone_value()),
)) ))
} }
} else { } else {
Vc::upcast(EcmascriptModuleFacadeModule::new( Vc::upcast(EcmascriptModuleFacadeModule::new(
*final_module, **final_module,
ModulePart::renamed_namespace(export.clone_value()), ModulePart::renamed_namespace(export.clone_value()),
)) ))
}; };
......
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