Unverified Commit d854b8b1 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: less CodeGenerateable for references (#75963)

Get rid of `CodeGenerateable` for `EsmExports` and all references, except for `EsmAssetReference`, which unfortunately represents 99% of all references, but is also the most complicated one (esp regarding order and tree shaking).

```
testing against 0293c96cf32


canary 71d8bfcc
14.8gb
529.67s user 81.57s system 883% cpu 1:09.18 total

mischnic/codegen-fewer-tasks 72eba1ead2
14.8gb
533.13s user 82.01s system 874% cpu 1:10.32 total

mischnic/codegen-fewer-tasks don't store twice
14.6gb
529.85s user 82.35s system 875% cpu 1:09.90 total
```
parent 0153bc2d
...@@ -6,7 +6,7 @@ use std::{ ...@@ -6,7 +6,7 @@ use std::{
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use swc_core::ecma::preset_env::{Version, Versions}; use swc_core::ecma::preset_env::{Version, Versions};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Value, Vc}; use turbo_tasks::{ResolvedVc, TaskInput, Value, Vc};
use turbo_tasks_env::ProcessEnv; use turbo_tasks_env::ProcessEnv;
use crate::target::CompileTarget; use crate::target::CompileTarget;
...@@ -14,7 +14,7 @@ use crate::target::CompileTarget; ...@@ -14,7 +14,7 @@ use crate::target::CompileTarget;
static DEFAULT_NODEJS_VERSION: &str = "16.0.0"; static DEFAULT_NODEJS_VERSION: &str = "16.0.0";
#[turbo_tasks::value] #[turbo_tasks::value]
#[derive(Default)] #[derive(Clone, Copy, Default, Hash, TaskInput, Debug)]
pub enum Rendering { pub enum Rendering {
#[default] #[default]
None, None,
......
...@@ -5,19 +5,30 @@ use swc_core::ecma::{ ...@@ -5,19 +5,30 @@ use swc_core::ecma::{
visit::{AstParentKind, VisitMut}, visit::{AstParentKind, VisitMut},
}; };
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{debug::ValueDebugFormat, trace::TraceRawVcs, NonLocalValue, Vc}; use turbo_tasks::{debug::ValueDebugFormat, trace::TraceRawVcs, NonLocalValue, ResolvedVc, Vc};
use turbopack_core::{chunk::ChunkingContext, module_graph::ModuleGraph}; use turbopack_core::{
chunk::ChunkingContext, module_graph::ModuleGraph, reference::ModuleReference,
};
use crate::references::{ use crate::references::{
amd::AmdDefineWithDependenciesCodeGen, amd::AmdDefineWithDependenciesCodeGen,
cjs::CjsRequireCacheAccess, cjs::{
CjsRequireAssetReferenceCodeGen, CjsRequireCacheAccess,
CjsRequireResolveAssetReferenceCodeGen,
},
constant_condition::ConstantConditionCodeGen, constant_condition::ConstantConditionCodeGen,
constant_value::ConstantValueCodeGen, constant_value::ConstantValueCodeGen,
dynamic_expression::DynamicExpression, dynamic_expression::DynamicExpression,
esm::{EsmBinding, EsmModuleItem, ImportMetaBinding, ImportMetaRef}, esm::{
dynamic::EsmAsyncAssetReferenceCodeGen, module_id::EsmModuleIdAssetReferenceCodeGen,
url::UrlAssetReferenceCodeGen, EsmBinding, EsmModuleItem, ImportMetaBinding, ImportMetaRef,
},
ident::IdentReplacement, ident::IdentReplacement,
member::MemberReplacement, member::MemberReplacement,
require_context::RequireContextAssetReferenceCodeGen,
unreachable::Unreachable, unreachable::Unreachable,
worker::WorkerAssetReferenceCodeGen,
AstPath,
}; };
/// impl of code generation inferred from a ModuleReference. /// impl of code generation inferred from a ModuleReference.
...@@ -39,11 +50,10 @@ pub struct CodeGeneration { ...@@ -39,11 +50,10 @@ pub struct CodeGeneration {
} }
impl CodeGeneration { impl CodeGeneration {
pub fn empty() -> Vc<Self> { pub fn empty() -> Self {
CodeGeneration { CodeGeneration {
..Default::default() ..Default::default()
} }
.cell()
} }
pub fn new( pub fn new(
...@@ -109,7 +119,7 @@ pub trait CodeGenerateable { ...@@ -109,7 +119,7 @@ pub trait CodeGenerateable {
#[derive(PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, NonLocalValue)] #[derive(PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, NonLocalValue)]
pub enum CodeGen { pub enum CodeGen {
// AMD occurs very rarely and makes the enum more than 2x bigger // AMD occurs very rarely and makes the enum much bigger
AmdDefineWithDependenciesCodeGen(Box<AmdDefineWithDependenciesCodeGen>), AmdDefineWithDependenciesCodeGen(Box<AmdDefineWithDependenciesCodeGen>),
CjsRequireCacheAccess(CjsRequireCacheAccess), CjsRequireCacheAccess(CjsRequireCacheAccess),
ConstantConditionCodeGen(ConstantConditionCodeGen), ConstantConditionCodeGen(ConstantConditionCodeGen),
...@@ -122,6 +132,13 @@ pub enum CodeGen { ...@@ -122,6 +132,13 @@ pub enum CodeGen {
ImportMetaRef(ImportMetaRef), ImportMetaRef(ImportMetaRef),
MemberReplacement(MemberReplacement), MemberReplacement(MemberReplacement),
Unreachable(Unreachable), Unreachable(Unreachable),
CjsRequireAssetReferenceCodeGen(CjsRequireAssetReferenceCodeGen),
CjsRequireResolveAssetReferenceCodeGen(CjsRequireResolveAssetReferenceCodeGen),
EsmAsyncAssetReferenceCodeGen(EsmAsyncAssetReferenceCodeGen),
EsmModuleIdAssetReferenceCodeGen(EsmModuleIdAssetReferenceCodeGen),
RequireContextAssetReferenceCodeGen(RequireContextAssetReferenceCodeGen),
UrlAssetReferenceCodeGen(UrlAssetReferenceCodeGen),
WorkerAssetReferenceCodeGen(WorkerAssetReferenceCodeGen),
} }
impl CodeGen { impl CodeGen {
...@@ -143,6 +160,13 @@ impl CodeGen { ...@@ -143,6 +160,13 @@ impl CodeGen {
Self::ImportMetaRef(v) => v.code_generation(g, ctx).await, Self::ImportMetaRef(v) => v.code_generation(g, ctx).await,
Self::MemberReplacement(v) => v.code_generation(g, ctx).await, Self::MemberReplacement(v) => v.code_generation(g, ctx).await,
Self::Unreachable(v) => v.code_generation(g, ctx).await, Self::Unreachable(v) => v.code_generation(g, ctx).await,
Self::CjsRequireAssetReferenceCodeGen(v) => v.code_generation(g, ctx).await,
Self::CjsRequireResolveAssetReferenceCodeGen(v) => v.code_generation(g, ctx).await,
Self::EsmAsyncAssetReferenceCodeGen(v) => v.code_generation(g, ctx).await,
Self::EsmModuleIdAssetReferenceCodeGen(v) => v.code_generation(g, ctx).await,
Self::RequireContextAssetReferenceCodeGen(v) => v.code_generation(g, ctx).await,
Self::UrlAssetReferenceCodeGen(v) => v.code_generation(g, ctx).await,
Self::WorkerAssetReferenceCodeGen(v) => v.code_generation(g, ctx).await,
} }
} }
} }
...@@ -150,6 +174,13 @@ impl CodeGen { ...@@ -150,6 +174,13 @@ impl CodeGen {
#[turbo_tasks::value(transparent)] #[turbo_tasks::value(transparent)]
pub struct CodeGens(Vec<CodeGen>); pub struct CodeGens(Vec<CodeGen>);
pub trait IntoCodeGenReference {
fn into_code_gen_reference(
self,
path: AstPath,
) -> (ResolvedVc<Box<dyn ModuleReference>>, CodeGen);
}
pub fn path_to( pub fn path_to(
path: &[AstParentKind], path: &[AstParentKind],
f: impl FnMut(&AstParentKind) -> bool, f: impl FnMut(&AstParentKind) -> bool,
......
...@@ -780,17 +780,32 @@ impl EcmascriptModuleContent { ...@@ -780,17 +780,32 @@ impl EcmascriptModuleContent {
code_gen_cells.push(code_gen.code_generation(module_graph, chunking_context)); code_gen_cells.push(code_gen.code_generation(module_graph, chunking_context));
} }
} }
if let Some(async_module) = *async_module.await? {
code_gen_cells.push(async_module.code_generation( let additional_code_gens = [
async_module_info, if let Some(async_module) = &*async_module.await? {
references, Some(
module_graph, async_module
chunking_context, .code_generation(
)); async_module_info,
} references,
if let EcmascriptExports::EsmExports(exports) = *exports.await? { module_graph,
code_gen_cells.push(exports.code_generation(module_graph, chunking_context)); chunking_context,
} )
.await?,
)
} else {
None
},
if let EcmascriptExports::EsmExports(exports) = *exports.await? {
Some(
exports
.code_generation(module_graph, chunking_context)
.await?,
)
} else {
None
},
];
let code_gens = code_generation let code_gens = code_generation
.await? .await?
...@@ -800,7 +815,11 @@ impl EcmascriptModuleContent { ...@@ -800,7 +815,11 @@ impl EcmascriptModuleContent {
.await?; .await?;
let code_gen_cells = code_gen_cells.into_iter().try_join().await?; let code_gen_cells = code_gen_cells.into_iter().try_join().await?;
let code_gens = code_gen_cells.iter().map(|c| &**c).chain(code_gens.iter()); let code_gens = code_gen_cells
.iter()
.map(|c| &**c)
.chain(additional_code_gens.iter().flatten())
.chain(code_gens.iter());
gen_content_with_code_gens( gen_content_with_code_gens(
parsed, parsed,
ident, ident,
......
...@@ -190,15 +190,16 @@ impl AsyncModule { ...@@ -190,15 +190,16 @@ impl AsyncModule {
has_top_level_await: self.has_top_level_await, has_top_level_await: self.has_top_level_await,
})) }))
} }
}
#[turbo_tasks::function] impl AsyncModule {
pub async fn code_generation( pub async fn code_generation(
self: Vc<Self>, self: Vc<Self>,
async_module_info: Option<Vc<AsyncModuleInfo>>, async_module_info: Option<Vc<AsyncModuleInfo>>,
references: Vc<ModuleReferences>, references: Vc<ModuleReferences>,
module_graph: Vc<ModuleGraph>, module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<CodeGeneration>> { ) -> Result<CodeGeneration> {
if let Some(async_module_info) = async_module_info { if let Some(async_module_info) = async_module_info {
let async_idents = self let async_idents = self
.get_async_idents( .get_async_idents(
...@@ -245,7 +246,7 @@ impl AsyncModule { ...@@ -245,7 +246,7 @@ impl AsyncModule {
type_ann: None, type_ann: None,
}.into(), }.into(),
)), )),
].to_vec()).cell()); ].to_vec()));
} }
} }
......
...@@ -19,7 +19,7 @@ use turbopack_core::{ ...@@ -19,7 +19,7 @@ use turbopack_core::{
use turbopack_resolve::ecmascript::cjs_resolve; use turbopack_resolve::ecmascript::cjs_resolve;
use crate::{ use crate::{
code_gen::{CodeGen, CodeGenerateable, CodeGeneration}, code_gen::{CodeGen, CodeGeneration, IntoCodeGenReference},
create_visitor, create_visitor,
references::{ references::{
pattern_mapping::{PatternMapping, ResolveType}, pattern_mapping::{PatternMapping, ResolveType},
...@@ -86,28 +86,23 @@ impl ChunkableModuleReference for CjsAssetReference {} ...@@ -86,28 +86,23 @@ impl ChunkableModuleReference for CjsAssetReference {}
pub struct CjsRequireAssetReference { pub struct CjsRequireAssetReference {
pub origin: ResolvedVc<Box<dyn ResolveOrigin>>, pub origin: ResolvedVc<Box<dyn ResolveOrigin>>,
pub request: ResolvedVc<Request>, pub request: ResolvedVc<Request>,
pub path: AstPath,
pub issue_source: IssueSource, pub issue_source: IssueSource,
pub in_try: bool, pub in_try: bool,
} }
#[turbo_tasks::value_impl]
impl CjsRequireAssetReference { impl CjsRequireAssetReference {
#[turbo_tasks::function]
pub fn new( pub fn new(
origin: ResolvedVc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
request: ResolvedVc<Request>, request: ResolvedVc<Request>,
path: AstPath,
issue_source: IssueSource, issue_source: IssueSource,
in_try: bool, in_try: bool,
) -> Vc<Self> { ) -> Self {
Self::cell(CjsRequireAssetReference { CjsRequireAssetReference {
origin, origin,
request, request,
path,
issue_source, issue_source,
in_try, in_try,
}) }
} }
} }
...@@ -137,25 +132,42 @@ impl ValueToString for CjsRequireAssetReference { ...@@ -137,25 +132,42 @@ impl ValueToString for CjsRequireAssetReference {
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl ChunkableModuleReference for CjsRequireAssetReference {} impl ChunkableModuleReference for CjsRequireAssetReference {}
#[turbo_tasks::value_impl] impl IntoCodeGenReference for CjsRequireAssetReference {
impl CodeGenerateable for CjsRequireAssetReference { fn into_code_gen_reference(
#[turbo_tasks::function] self,
async fn code_generation( path: AstPath,
) -> (ResolvedVc<Box<dyn ModuleReference>>, CodeGen) {
let reference = self.resolved_cell();
(
ResolvedVc::upcast(reference),
CodeGen::CjsRequireAssetReferenceCodeGen(CjsRequireAssetReferenceCodeGen {
reference,
path,
}),
)
}
}
#[derive(PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, NonLocalValue)]
pub struct CjsRequireAssetReferenceCodeGen {
reference: ResolvedVc<CjsRequireAssetReference>,
path: AstPath,
}
impl CjsRequireAssetReferenceCodeGen {
pub async fn code_generation(
&self, &self,
module_graph: Vc<ModuleGraph>, module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<CodeGeneration>> { ) -> Result<CodeGeneration> {
let reference = self.reference.await?;
let pm = PatternMapping::resolve_request( let pm = PatternMapping::resolve_request(
*self.request, *reference.request,
*self.origin, *reference.origin,
module_graph, module_graph,
Vc::upcast(chunking_context), Vc::upcast(chunking_context),
cjs_resolve( self.reference.resolve_reference(),
*self.origin,
*self.request,
Some(self.issue_source.clone()),
self.in_try,
),
ResolveType::ChunkItem, ResolveType::ChunkItem,
) )
.await?; .await?;
...@@ -185,7 +197,7 @@ impl CodeGenerateable for CjsRequireAssetReference { ...@@ -185,7 +197,7 @@ impl CodeGenerateable for CjsRequireAssetReference {
); );
})); }));
Ok(CodeGeneration::visitors(visitors).cell()) Ok(CodeGeneration::visitors(visitors))
} }
} }
...@@ -194,28 +206,23 @@ impl CodeGenerateable for CjsRequireAssetReference { ...@@ -194,28 +206,23 @@ impl CodeGenerateable for CjsRequireAssetReference {
pub struct CjsRequireResolveAssetReference { pub struct CjsRequireResolveAssetReference {
pub origin: ResolvedVc<Box<dyn ResolveOrigin>>, pub origin: ResolvedVc<Box<dyn ResolveOrigin>>,
pub request: ResolvedVc<Request>, pub request: ResolvedVc<Request>,
pub path: AstPath,
pub issue_source: IssueSource, pub issue_source: IssueSource,
pub in_try: bool, pub in_try: bool,
} }
#[turbo_tasks::value_impl]
impl CjsRequireResolveAssetReference { impl CjsRequireResolveAssetReference {
#[turbo_tasks::function]
pub fn new( pub fn new(
origin: ResolvedVc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
request: ResolvedVc<Request>, request: ResolvedVc<Request>,
path: AstPath,
issue_source: IssueSource, issue_source: IssueSource,
in_try: bool, in_try: bool,
) -> Vc<Self> { ) -> Self {
Self::cell(CjsRequireResolveAssetReference { CjsRequireResolveAssetReference {
origin, origin,
request, request,
path,
issue_source, issue_source,
in_try, in_try,
}) }
} }
} }
...@@ -245,25 +252,41 @@ impl ValueToString for CjsRequireResolveAssetReference { ...@@ -245,25 +252,41 @@ impl ValueToString for CjsRequireResolveAssetReference {
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl ChunkableModuleReference for CjsRequireResolveAssetReference {} impl ChunkableModuleReference for CjsRequireResolveAssetReference {}
#[turbo_tasks::value_impl] impl IntoCodeGenReference for CjsRequireResolveAssetReference {
impl CodeGenerateable for CjsRequireResolveAssetReference { fn into_code_gen_reference(
#[turbo_tasks::function] self,
async fn code_generation( path: AstPath,
) -> (ResolvedVc<Box<dyn ModuleReference>>, CodeGen) {
let reference = self.resolved_cell();
(
ResolvedVc::upcast(reference),
CodeGen::CjsRequireResolveAssetReferenceCodeGen(
CjsRequireResolveAssetReferenceCodeGen { reference, path },
),
)
}
}
#[derive(PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, NonLocalValue)]
pub struct CjsRequireResolveAssetReferenceCodeGen {
reference: ResolvedVc<CjsRequireResolveAssetReference>,
path: AstPath,
}
impl CjsRequireResolveAssetReferenceCodeGen {
pub async fn code_generation(
&self, &self,
module_graph: Vc<ModuleGraph>, module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<CodeGeneration>> { ) -> Result<CodeGeneration> {
let reference = self.reference.await?;
let pm = PatternMapping::resolve_request( let pm = PatternMapping::resolve_request(
*self.request, *reference.request,
*self.origin, *reference.origin,
module_graph, module_graph,
Vc::upcast(chunking_context), Vc::upcast(chunking_context),
cjs_resolve( self.reference.resolve_reference(),
*self.origin,
*self.request,
Some(self.issue_source.clone()),
self.in_try,
),
ResolveType::ChunkItem, ResolveType::ChunkItem,
) )
.await?; .await?;
...@@ -297,7 +320,7 @@ impl CodeGenerateable for CjsRequireResolveAssetReference { ...@@ -297,7 +320,7 @@ impl CodeGenerateable for CjsRequireResolveAssetReference {
// but we can ignore that as it will be recomputed anyway. // but we can ignore that as it will be recomputed anyway.
})); }));
Ok(CodeGeneration::visitors(visitors).cell()) Ok(CodeGeneration::visitors(visitors))
} }
} }
......
...@@ -110,7 +110,7 @@ impl ReferencedAsset { ...@@ -110,7 +110,7 @@ impl ReferencedAsset {
} }
} }
#[turbo_tasks::value] #[turbo_tasks::value(shared)]
#[derive(Hash, Debug)] #[derive(Hash, Debug)]
pub struct EsmAssetReference { pub struct EsmAssetReference {
pub origin: ResolvedVc<Box<dyn ResolveOrigin>>, pub origin: ResolvedVc<Box<dyn ResolveOrigin>>,
...@@ -139,15 +139,15 @@ impl EsmAssetReference { ...@@ -139,15 +139,15 @@ impl EsmAssetReference {
annotations: Value<ImportAnnotations>, annotations: Value<ImportAnnotations>,
export_name: Option<ModulePart>, export_name: Option<ModulePart>,
import_externals: bool, import_externals: bool,
) -> Vc<Self> { ) -> Self {
Self::cell(EsmAssetReference { EsmAssetReference {
origin, origin,
request, request,
issue_source, issue_source,
annotations: annotations.into_value(), annotations: annotations.into_value(),
export_name, export_name,
import_externals, import_externals,
}) }
} }
} }
...@@ -394,7 +394,7 @@ impl CodeGenerateable for EsmAssetReference { ...@@ -394,7 +394,7 @@ impl CodeGenerateable for EsmAssetReference {
if let Some((key, stmt)) = result { if let Some((key, stmt)) = result {
Ok(CodeGeneration::hoisted_stmt(key, stmt).cell()) Ok(CodeGeneration::hoisted_stmt(key, stmt).cell())
} else { } else {
Ok(CodeGeneration::empty()) Ok(CodeGeneration::empty().cell())
} }
} }
} }
......
use anyhow::Result; use anyhow::Result;
use serde::{Deserialize, Serialize};
use swc_core::{ use swc_core::{
common::{util::take::Take, DUMMY_SP}, common::{util::take::Take, DUMMY_SP},
ecma::ast::{CallExpr, Callee, Expr, ExprOrSpread, Lit}, ecma::ast::{CallExpr, Callee, Expr, ExprOrSpread, Lit},
quote_expr, quote_expr,
}; };
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Value, ValueToString, Vc}; use turbo_tasks::{
debug::ValueDebugFormat, trace::TraceRawVcs, NonLocalValue, ResolvedVc, Value, ValueToString,
Vc,
};
use turbopack_core::{ use turbopack_core::{
chunk::{ChunkableModuleReference, ChunkingContext, ChunkingType, ChunkingTypeOption}, chunk::{ChunkableModuleReference, ChunkingContext, ChunkingType, ChunkingTypeOption},
environment::ChunkLoading, environment::ChunkLoading,
...@@ -24,7 +28,7 @@ use turbopack_resolve::ecmascript::esm_resolve; ...@@ -24,7 +28,7 @@ use turbopack_resolve::ecmascript::esm_resolve;
use super::super::pattern_mapping::{PatternMapping, ResolveType}; use super::super::pattern_mapping::{PatternMapping, ResolveType};
use crate::{ use crate::{
analyzer::imports::ImportAnnotations, analyzer::imports::ImportAnnotations,
code_gen::{CodeGenerateable, CodeGeneration}, code_gen::{CodeGen, CodeGeneration, IntoCodeGenReference},
create_visitor, create_visitor,
references::AstPath, references::AstPath,
}; };
...@@ -34,7 +38,6 @@ use crate::{ ...@@ -34,7 +38,6 @@ use crate::{
pub struct EsmAsyncAssetReference { pub struct EsmAsyncAssetReference {
pub origin: ResolvedVc<Box<dyn ResolveOrigin>>, pub origin: ResolvedVc<Box<dyn ResolveOrigin>>,
pub request: ResolvedVc<Request>, pub request: ResolvedVc<Request>,
pub path: AstPath,
pub annotations: ImportAnnotations, pub annotations: ImportAnnotations,
pub issue_source: IssueSource, pub issue_source: IssueSource,
pub in_try: bool, pub in_try: bool,
...@@ -51,27 +54,23 @@ impl EsmAsyncAssetReference { ...@@ -51,27 +54,23 @@ impl EsmAsyncAssetReference {
} }
} }
#[turbo_tasks::value_impl]
impl EsmAsyncAssetReference { impl EsmAsyncAssetReference {
#[turbo_tasks::function]
pub fn new( pub fn new(
origin: ResolvedVc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
request: ResolvedVc<Request>, request: ResolvedVc<Request>,
path: AstPath,
issue_source: IssueSource, issue_source: IssueSource,
annotations: Value<ImportAnnotations>, annotations: Value<ImportAnnotations>,
in_try: bool, in_try: bool,
import_externals: bool, import_externals: bool,
) -> Vc<Self> { ) -> Self {
Self::cell(EsmAsyncAssetReference { EsmAsyncAssetReference {
origin, origin,
request, request,
path,
issue_source, issue_source,
annotations: annotations.into_value(), annotations: annotations.into_value(),
in_try, in_try,
import_externals, import_externals,
}) }
} }
} }
...@@ -108,27 +107,42 @@ impl ChunkableModuleReference for EsmAsyncAssetReference { ...@@ -108,27 +107,42 @@ impl ChunkableModuleReference for EsmAsyncAssetReference {
} }
} }
#[turbo_tasks::value_impl] impl IntoCodeGenReference for EsmAsyncAssetReference {
impl CodeGenerateable for EsmAsyncAssetReference { fn into_code_gen_reference(
#[turbo_tasks::function] self,
async fn code_generation( path: AstPath,
) -> (ResolvedVc<Box<dyn ModuleReference>>, CodeGen) {
let reference = self.resolved_cell();
(
ResolvedVc::upcast(reference),
CodeGen::EsmAsyncAssetReferenceCodeGen(EsmAsyncAssetReferenceCodeGen {
reference,
path,
}),
)
}
}
#[derive(PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, NonLocalValue)]
pub struct EsmAsyncAssetReferenceCodeGen {
path: AstPath,
reference: ResolvedVc<EsmAsyncAssetReference>,
}
impl EsmAsyncAssetReferenceCodeGen {
pub async fn code_generation(
&self, &self,
module_graph: Vc<ModuleGraph>, module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<CodeGeneration>> { ) -> Result<CodeGeneration> {
let reference = self.reference.await?;
let pm = PatternMapping::resolve_request( let pm = PatternMapping::resolve_request(
*self.request, *reference.request,
*self.origin, *reference.origin,
module_graph, module_graph,
Vc::upcast(chunking_context), Vc::upcast(chunking_context),
esm_resolve( self.reference.resolve_reference(),
self.get_origin().resolve().await?,
*self.request,
Value::new(EcmaScriptModulesReferenceSubType::DynamicImport),
self.in_try,
Some(self.issue_source.clone()),
)
.await?,
if matches!( if matches!(
*chunking_context.environment().chunk_loading().await?, *chunking_context.environment().chunk_loading().await?,
ChunkLoading::Edge ChunkLoading::Edge
...@@ -140,7 +154,7 @@ impl CodeGenerateable for EsmAsyncAssetReference { ...@@ -140,7 +154,7 @@ impl CodeGenerateable for EsmAsyncAssetReference {
) )
.await?; .await?;
let import_externals = self.import_externals; let import_externals = reference.import_externals;
let visitor = create_visitor!(self.path, visit_mut_expr(expr: &mut Expr) { let visitor = create_visitor!(self.path, visit_mut_expr(expr: &mut Expr) {
let old_expr = expr.take(); let old_expr = expr.take();
...@@ -176,6 +190,6 @@ impl CodeGenerateable for EsmAsyncAssetReference { ...@@ -176,6 +190,6 @@ impl CodeGenerateable for EsmAsyncAssetReference {
}); });
}); });
Ok(CodeGeneration::visitors(vec![visitor]).cell()) Ok(CodeGeneration::visitors(vec![visitor]))
} }
} }
...@@ -29,7 +29,7 @@ use turbopack_core::{ ...@@ -29,7 +29,7 @@ use turbopack_core::{
use super::base::ReferencedAsset; use super::base::ReferencedAsset;
use crate::{ use crate::{
chunk::{EcmascriptChunkPlaceable, EcmascriptExports}, chunk::{EcmascriptChunkPlaceable, EcmascriptExports},
code_gen::{CodeGenerateable, CodeGeneration, CodeGenerationHoistedStmt}, code_gen::{CodeGeneration, CodeGenerationHoistedStmt},
magic_identifier, magic_identifier,
runtime_functions::{TURBOPACK_DYNAMIC, TURBOPACK_ESM}, runtime_functions::{TURBOPACK_DYNAMIC, TURBOPACK_ESM},
}; };
...@@ -489,14 +489,12 @@ impl EsmExports { ...@@ -489,14 +489,12 @@ impl EsmExports {
} }
} }
#[turbo_tasks::value_impl] impl EsmExports {
impl CodeGenerateable for EsmExports { pub async fn code_generation(
#[turbo_tasks::function]
async fn code_generation(
self: Vc<Self>, self: Vc<Self>,
module_graph: Vc<ModuleGraph>, module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<CodeGeneration>> { ) -> Result<CodeGeneration> {
let expanded = self.expand_exports().await?; let expanded = self.expand_exports().await?;
let mut dynamic_exports = Vec::<Box<Expr>>::new(); let mut dynamic_exports = Vec::<Box<Expr>>::new();
...@@ -639,7 +637,6 @@ impl CodeGenerateable for EsmExports { ...@@ -639,7 +637,6 @@ impl CodeGenerateable for EsmExports {
getters: Expr = getters.clone() getters: Expr = getters.clone()
), ),
)], )],
) ))
.cell())
} }
} }
use anyhow::Result; use anyhow::Result;
use serde::{Deserialize, Serialize};
use swc_core::quote; use swc_core::quote;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, ValueToString, Vc}; use turbo_tasks::{
debug::ValueDebugFormat, trace::TraceRawVcs, NonLocalValue, ResolvedVc, ValueToString, Vc,
};
use turbopack_core::{ use turbopack_core::{
chunk::{ chunk::{
ChunkItemExt, ChunkableModule, ChunkableModuleReference, ChunkingContext, ChunkItemExt, ChunkableModule, ChunkableModuleReference, ChunkingContext,
...@@ -14,7 +17,7 @@ use turbopack_core::{ ...@@ -14,7 +17,7 @@ use turbopack_core::{
use super::{base::ReferencedAsset, EsmAssetReference}; use super::{base::ReferencedAsset, EsmAssetReference};
use crate::{ use crate::{
code_gen::{CodeGenerateable, CodeGeneration}, code_gen::{CodeGen, CodeGeneration, IntoCodeGenReference},
create_visitor, create_visitor,
references::AstPath, references::AstPath,
utils::module_id_to_lit, utils::module_id_to_lit,
...@@ -24,14 +27,11 @@ use crate::{ ...@@ -24,14 +27,11 @@ use crate::{
#[derive(Hash, Debug)] #[derive(Hash, Debug)]
pub struct EsmModuleIdAssetReference { pub struct EsmModuleIdAssetReference {
inner: ResolvedVc<EsmAssetReference>, inner: ResolvedVc<EsmAssetReference>,
ast_path: AstPath,
} }
#[turbo_tasks::value_impl]
impl EsmModuleIdAssetReference { impl EsmModuleIdAssetReference {
#[turbo_tasks::function] pub fn new(inner: ResolvedVc<EsmAssetReference>) -> Self {
pub fn new(inner: ResolvedVc<EsmAssetReference>, ast_path: AstPath) -> Vc<Self> { EsmModuleIdAssetReference { inner }
Self::cell(EsmModuleIdAssetReference { inner, ast_path })
} }
} }
...@@ -61,38 +61,56 @@ impl ChunkableModuleReference for EsmModuleIdAssetReference { ...@@ -61,38 +61,56 @@ impl ChunkableModuleReference for EsmModuleIdAssetReference {
} }
} }
#[turbo_tasks::value_impl] impl IntoCodeGenReference for EsmModuleIdAssetReference {
impl CodeGenerateable for EsmModuleIdAssetReference { fn into_code_gen_reference(
#[turbo_tasks::function] self,
async fn code_generation( path: AstPath,
) -> (ResolvedVc<Box<dyn ModuleReference>>, CodeGen) {
let reference = self.resolved_cell();
(
ResolvedVc::upcast(reference),
CodeGen::EsmModuleIdAssetReferenceCodeGen(EsmModuleIdAssetReferenceCodeGen {
reference,
path,
}),
)
}
}
#[derive(PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, NonLocalValue)]
pub struct EsmModuleIdAssetReferenceCodeGen {
path: AstPath,
reference: ResolvedVc<EsmModuleIdAssetReference>,
}
impl EsmModuleIdAssetReferenceCodeGen {
pub async fn code_generation(
&self, &self,
module_graph: Vc<ModuleGraph>, module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<CodeGeneration>> { ) -> Result<CodeGeneration> {
let mut visitors = Vec::new(); let mut visitors = Vec::new();
if let ReferencedAsset::Some(asset) = &*self.inner.get_referenced_asset().await? { if let ReferencedAsset::Some(asset) =
&*self.reference.await?.inner.get_referenced_asset().await?
{
let id = asset let id = asset
.as_chunk_item(module_graph, Vc::upcast(chunking_context)) .as_chunk_item(module_graph, Vc::upcast(chunking_context))
.id() .id()
.await?; .await?;
let id = module_id_to_lit(&id); let id = module_id_to_lit(&id);
visitors.push( visitors.push(create_visitor!(self.path, visit_mut_expr(expr: &mut Expr) {
create_visitor!(self.ast_path, visit_mut_expr(expr: &mut Expr) { *expr = id.clone()
*expr = id.clone() }));
}),
);
} else { } else {
// If the referenced asset can't be found, replace the expression with null. // If the referenced asset can't be found, replace the expression with null.
// This can happen if the referenced asset is an external, or doesn't resolve // This can happen if the referenced asset is an external, or doesn't resolve
// to anything. // to anything.
visitors.push( visitors.push(create_visitor!(self.path, visit_mut_expr(expr: &mut Expr) {
create_visitor!(self.ast_path, visit_mut_expr(expr: &mut Expr) { *expr = quote!("null" as Expr);
*expr = quote!("null" as Expr); }));
}),
);
} }
Ok(CodeGeneration::visitors(visitors).cell()) Ok(CodeGeneration::visitors(visitors))
} }
} }
...@@ -6,7 +6,8 @@ use swc_core::{ ...@@ -6,7 +6,8 @@ use swc_core::{
}; };
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
trace::TraceRawVcs, NonLocalValue, ResolvedVc, TaskInput, Value, ValueToString, Vc, debug::ValueDebugFormat, trace::TraceRawVcs, NonLocalValue, ResolvedVc, TaskInput, Value,
ValueToString, Vc,
}; };
use turbopack_core::{ use turbopack_core::{
chunk::{ chunk::{
...@@ -25,7 +26,7 @@ use turbopack_core::{ ...@@ -25,7 +26,7 @@ use turbopack_core::{
use super::base::ReferencedAsset; use super::base::ReferencedAsset;
use crate::{ use crate::{
code_gen::{CodeGenerateable, CodeGeneration}, code_gen::{CodeGen, CodeGeneration, IntoCodeGenReference},
create_visitor, create_visitor,
references::AstPath, references::AstPath,
runtime_functions::{ runtime_functions::{
...@@ -68,38 +69,31 @@ pub enum UrlRewriteBehavior { ...@@ -68,38 +69,31 @@ pub enum UrlRewriteBehavior {
pub struct UrlAssetReference { pub struct UrlAssetReference {
origin: ResolvedVc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
request: ResolvedVc<Request>, request: ResolvedVc<Request>,
rendering: ResolvedVc<Rendering>, rendering: Rendering,
ast_path: AstPath,
issue_source: IssueSource, issue_source: IssueSource,
in_try: bool, in_try: bool,
url_rewrite_behavior: UrlRewriteBehavior, url_rewrite_behavior: UrlRewriteBehavior,
} }
#[turbo_tasks::value_impl]
impl UrlAssetReference { impl UrlAssetReference {
#[turbo_tasks::function]
pub fn new( pub fn new(
origin: ResolvedVc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
request: ResolvedVc<Request>, request: ResolvedVc<Request>,
rendering: ResolvedVc<Rendering>, rendering: Rendering,
ast_path: AstPath,
issue_source: IssueSource, issue_source: IssueSource,
in_try: bool, in_try: bool,
url_rewrite_behavior: UrlRewriteBehavior, url_rewrite_behavior: UrlRewriteBehavior,
) -> Vc<Self> { ) -> Self {
UrlAssetReference { UrlAssetReference {
origin, origin,
request, request,
rendering, rendering,
ast_path,
issue_source, issue_source,
in_try, in_try,
url_rewrite_behavior, url_rewrite_behavior,
} }
.cell()
} }
#[turbo_tasks::function]
pub(crate) fn get_referenced_asset(self: Vc<Self>) -> Vc<ReferencedAsset> { pub(crate) fn get_referenced_asset(self: Vc<Self>) -> Vc<ReferencedAsset> {
ReferencedAsset::from_resolve_result(self.resolve_reference()) ReferencedAsset::from_resolve_result(self.resolve_reference())
} }
...@@ -137,8 +131,26 @@ impl ChunkableModuleReference for UrlAssetReference { ...@@ -137,8 +131,26 @@ impl ChunkableModuleReference for UrlAssetReference {
} }
} }
#[turbo_tasks::value_impl] impl IntoCodeGenReference for UrlAssetReference {
impl CodeGenerateable for UrlAssetReference { fn into_code_gen_reference(
self,
path: AstPath,
) -> (ResolvedVc<Box<dyn ModuleReference>>, CodeGen) {
let reference = self.resolved_cell();
(
ResolvedVc::upcast(reference),
CodeGen::UrlAssetReferenceCodeGen(UrlAssetReferenceCodeGen { reference, path }),
)
}
}
#[derive(PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, NonLocalValue)]
pub struct UrlAssetReferenceCodeGen {
reference: ResolvedVc<UrlAssetReference>,
path: AstPath,
}
impl UrlAssetReferenceCodeGen {
/// Rewrites call to the `new URL()` ctor depends on the current /// Rewrites call to the `new URL()` ctor depends on the current
/// conditions. Generated code will point to the output path of the asset, /// conditions. Generated code will point to the output path of the asset,
/// as similar to the webpack's behavior. This is based on the /// as similar to the webpack's behavior. This is based on the
...@@ -156,18 +168,18 @@ impl CodeGenerateable for UrlAssetReference { ...@@ -156,18 +168,18 @@ impl CodeGenerateable for UrlAssetReference {
│ None │ new URL(url, base) │ new URL(url, base) │ new URL(url, base) │ │ None │ new URL(url, base) │ new URL(url, base) │ new URL(url, base) │
└───────────────────────────────┴─────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────┴───────────────────────┘ └───────────────────────────────┴─────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────┴───────────────────────┘
*/ */
#[turbo_tasks::function] pub async fn code_generation(
async fn code_generation( &self,
self: Vc<Self>,
module_graph: Vc<ModuleGraph>, module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<CodeGeneration>> { ) -> Result<CodeGeneration> {
let this = self.await?;
let mut visitors = vec![]; let mut visitors = vec![];
match this.url_rewrite_behavior { let reference = self.reference.await?;
match reference.url_rewrite_behavior {
UrlRewriteBehavior::Relative => { UrlRewriteBehavior::Relative => {
let referenced_asset = self.get_referenced_asset().await?; let referenced_asset = self.reference.get_referenced_asset().await?;
// if the referenced url is in the module graph of turbopack, replace it into // if the referenced url is in the module graph of turbopack, replace it into
// the chunk item will be emitted into output path to point the // the chunk item will be emitted into output path to point the
...@@ -184,7 +196,7 @@ impl CodeGenerateable for UrlAssetReference { ...@@ -184,7 +196,7 @@ impl CodeGenerateable for UrlAssetReference {
.id() .id()
.await?; .await?;
visitors.push(create_visitor!(this.ast_path, visit_mut_expr(new_expr: &mut Expr) { visitors.push(create_visitor!(self.path, visit_mut_expr(new_expr: &mut Expr) {
let should_rewrite_to_relative = if let Expr::New(NewExpr { args: Some(args), .. }) = new_expr { let should_rewrite_to_relative = if let Expr::New(NewExpr { args: Some(args), .. }) = new_expr {
matches!(args.first(), Some(ExprOrSpread { .. })) matches!(args.first(), Some(ExprOrSpread { .. }))
} else { } else {
...@@ -203,7 +215,7 @@ impl CodeGenerateable for UrlAssetReference { ...@@ -203,7 +215,7 @@ impl CodeGenerateable for UrlAssetReference {
} }
ReferencedAsset::External(request, ExternalType::Url) => { ReferencedAsset::External(request, ExternalType::Url) => {
let request = request.to_string(); let request = request.to_string();
visitors.push(create_visitor!(this.ast_path, visit_mut_expr(new_expr: &mut Expr) { visitors.push(create_visitor!(self.path, visit_mut_expr(new_expr: &mut Expr) {
let should_rewrite_to_relative = if let Expr::New(NewExpr { args: Some(args), .. }) = new_expr { let should_rewrite_to_relative = if let Expr::New(NewExpr { args: Some(args), .. }) = new_expr {
matches!(args.first(), Some(ExprOrSpread { .. })) matches!(args.first(), Some(ExprOrSpread { .. }))
} else { } else {
...@@ -230,7 +242,7 @@ impl CodeGenerateable for UrlAssetReference { ...@@ -230,7 +242,7 @@ impl CodeGenerateable for UrlAssetReference {
} }
} }
UrlRewriteBehavior::Full => { UrlRewriteBehavior::Full => {
let referenced_asset = self.get_referenced_asset().await?; let referenced_asset = self.reference.get_referenced_asset().await?;
// For rendering environments (CSR), we rewrite the `import.meta.url` to // For rendering environments (CSR), we rewrite the `import.meta.url` to
// be a location.origin because it allows us to access files from the root of // be a location.origin because it allows us to access files from the root of
...@@ -238,7 +250,7 @@ impl CodeGenerateable for UrlAssetReference { ...@@ -238,7 +250,7 @@ impl CodeGenerateable for UrlAssetReference {
// //
// By default for the remaining environments, turbopack's runtime have overriden // By default for the remaining environments, turbopack's runtime have overriden
// `import.meta.url`. // `import.meta.url`.
let rewrite_url_base = match &*this.rendering.await? { let rewrite_url_base = match reference.rendering {
Rendering::Client => Some(quote!("location.origin" as Expr)), Rendering::Client => Some(quote!("location.origin" as Expr)),
Rendering::None | Rendering::Server => None, Rendering::None | Rendering::Server => None,
}; };
...@@ -274,7 +286,7 @@ impl CodeGenerateable for UrlAssetReference { ...@@ -274,7 +286,7 @@ impl CodeGenerateable for UrlAssetReference {
) )
}; };
visitors.push(create_visitor!(this.ast_path, visit_mut_expr(new_expr: &mut Expr) { visitors.push(create_visitor!(self.path, visit_mut_expr(new_expr: &mut Expr) {
if let Expr::New(NewExpr { args: Some(args), .. }) = new_expr { if let Expr::New(NewExpr { args: Some(args), .. }) = new_expr {
if let Some(ExprOrSpread { box expr, spread: None }) = args.get_mut(0) { if let Some(ExprOrSpread { box expr, spread: None }) = args.get_mut(0) {
*expr = url_segment_resolver.clone(); *expr = url_segment_resolver.clone();
...@@ -294,7 +306,7 @@ impl CodeGenerateable for UrlAssetReference { ...@@ -294,7 +306,7 @@ impl CodeGenerateable for UrlAssetReference {
} }
ReferencedAsset::External(request, ExternalType::Url) => { ReferencedAsset::External(request, ExternalType::Url) => {
let request = request.to_string(); let request = request.to_string();
visitors.push(create_visitor!(this.ast_path, visit_mut_expr(new_expr: &mut Expr) { visitors.push(create_visitor!(self.path, visit_mut_expr(new_expr: &mut Expr) {
if let Expr::New(NewExpr { args: Some(args), .. }) = new_expr { if let Expr::New(NewExpr { args: Some(args), .. }) = new_expr {
if let Some(ExprOrSpread { box expr, spread: None }) = args.get_mut(0) { if let Some(ExprOrSpread { box expr, spread: None }) = args.get_mut(0) {
*expr = request.as_str().into() *expr = request.as_str().into()
...@@ -323,6 +335,6 @@ impl CodeGenerateable for UrlAssetReference { ...@@ -323,6 +335,6 @@ impl CodeGenerateable for UrlAssetReference {
} }
}; };
Ok(CodeGeneration::visitors(visitors).cell()) Ok(CodeGeneration::visitors(visitors))
} }
} }
use std::{borrow::Cow, collections::VecDeque, sync::Arc}; use std::{borrow::Cow, collections::VecDeque, sync::Arc};
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use serde::{Deserialize, Serialize};
use swc_core::{ use swc_core::{
common::DUMMY_SP, common::DUMMY_SP,
ecma::{ ecma::{
...@@ -13,7 +14,10 @@ use swc_core::{ ...@@ -13,7 +14,10 @@ use swc_core::{
quote, quote_expr, quote, quote_expr,
}; };
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{primitives::Regex, FxIndexMap, ResolvedVc, Value, ValueToString, Vc}; use turbo_tasks::{
debug::ValueDebugFormat, primitives::Regex, trace::TraceRawVcs, FxIndexMap, NonLocalValue,
ResolvedVc, Value, ValueToString, Vc,
};
use turbo_tasks_fs::{DirectoryContent, DirectoryEntry, FileSystemPath}; use turbo_tasks_fs::{DirectoryContent, DirectoryEntry, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
...@@ -35,7 +39,7 @@ use crate::{ ...@@ -35,7 +39,7 @@ use crate::{
chunk::{ chunk::{
EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkType, EcmascriptExports, EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkType, EcmascriptExports,
}, },
code_gen::CodeGeneration, code_gen::{CodeGen, CodeGeneration, IntoCodeGenReference},
create_visitor, create_visitor,
references::{ references::{
pattern_mapping::{PatternMapping, ResolveType}, pattern_mapping::{PatternMapping, ResolveType},
...@@ -43,7 +47,7 @@ use crate::{ ...@@ -43,7 +47,7 @@ use crate::{
}, },
runtime_functions::{TURBOPACK_EXPORT_VALUE, TURBOPACK_MODULE_CONTEXT, TURBOPACK_REQUIRE}, runtime_functions::{TURBOPACK_EXPORT_VALUE, TURBOPACK_MODULE_CONTEXT, TURBOPACK_REQUIRE},
utils::module_id_to_lit, utils::module_id_to_lit,
CodeGenerateable, EcmascriptChunkPlaceable, EcmascriptChunkPlaceable,
}; };
#[turbo_tasks::value] #[turbo_tasks::value]
...@@ -212,24 +216,20 @@ pub struct RequireContextAssetReference { ...@@ -212,24 +216,20 @@ pub struct RequireContextAssetReference {
pub dir: RcStr, pub dir: RcStr,
pub include_subdirs: bool, pub include_subdirs: bool,
pub path: AstPath,
pub issue_source: Option<IssueSource>, pub issue_source: Option<IssueSource>,
pub in_try: bool, pub in_try: bool,
} }
#[turbo_tasks::value_impl]
impl RequireContextAssetReference { impl RequireContextAssetReference {
#[turbo_tasks::function]
pub async fn new( pub async fn new(
source: ResolvedVc<Box<dyn Source>>, source: ResolvedVc<Box<dyn Source>>,
origin: ResolvedVc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
dir: RcStr, dir: RcStr,
include_subdirs: bool, include_subdirs: bool,
filter: Vc<Regex>, filter: Vc<Regex>,
path: AstPath,
issue_source: Option<IssueSource>, issue_source: Option<IssueSource>,
in_try: bool, in_try: bool,
) -> Result<Vc<Self>> { ) -> Result<Self> {
let map = RequireContextMap::generate( let map = RequireContextMap::generate(
*origin, *origin,
origin.origin_path().parent().join(dir.clone()), origin.origin_path().parent().join(dir.clone()),
...@@ -250,14 +250,13 @@ impl RequireContextAssetReference { ...@@ -250,14 +250,13 @@ impl RequireContextAssetReference {
} }
.resolved_cell(); .resolved_cell();
Ok(Self::cell(RequireContextAssetReference { Ok(RequireContextAssetReference {
inner, inner,
dir, dir,
include_subdirs, include_subdirs,
path,
issue_source, issue_source,
in_try, in_try,
})) })
} }
} }
...@@ -287,15 +286,37 @@ impl ValueToString for RequireContextAssetReference { ...@@ -287,15 +286,37 @@ impl ValueToString for RequireContextAssetReference {
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl ChunkableModuleReference for RequireContextAssetReference {} impl ChunkableModuleReference for RequireContextAssetReference {}
#[turbo_tasks::value_impl] impl IntoCodeGenReference for RequireContextAssetReference {
impl CodeGenerateable for RequireContextAssetReference { fn into_code_gen_reference(
#[turbo_tasks::function] self,
async fn code_generation( path: AstPath,
) -> (ResolvedVc<Box<dyn ModuleReference>>, CodeGen) {
let reference = self.resolved_cell();
(
ResolvedVc::upcast(reference),
CodeGen::RequireContextAssetReferenceCodeGen(RequireContextAssetReferenceCodeGen {
reference,
path,
}),
)
}
}
#[derive(PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, NonLocalValue)]
pub struct RequireContextAssetReferenceCodeGen {
path: AstPath,
reference: ResolvedVc<RequireContextAssetReference>,
}
impl RequireContextAssetReferenceCodeGen {
pub async fn code_generation(
&self, &self,
module_graph: Vc<ModuleGraph>, module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<CodeGeneration>> { ) -> Result<CodeGeneration> {
let chunk_item = self let chunk_item = self
.reference
.await?
.inner .inner
.as_chunk_item(module_graph, Vc::upcast(chunking_context)); .as_chunk_item(module_graph, Vc::upcast(chunking_context));
let module_id = chunk_item.id().owned().await?; let module_id = chunk_item.id().owned().await?;
...@@ -313,7 +334,7 @@ impl CodeGenerateable for RequireContextAssetReference { ...@@ -313,7 +334,7 @@ impl CodeGenerateable for RequireContextAssetReference {
} }
})); }));
Ok(CodeGeneration::visitors(visitors).cell()) Ok(CodeGeneration::visitors(visitors))
} }
} }
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use serde::{Deserialize, Serialize};
use swc_core::{ use swc_core::{
common::util::take::Take, common::util::take::Take,
ecma::ast::{Expr, ExprOrSpread, Lit, NewExpr}, ecma::ast::{Expr, ExprOrSpread, Lit, NewExpr},
quote_expr, quote_expr,
}; };
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Value, ValueToString, Vc}; use turbo_tasks::{
debug::ValueDebugFormat, trace::TraceRawVcs, NonLocalValue, ResolvedVc, Value, ValueToString,
Vc,
};
use turbopack_core::{ use turbopack_core::{
chunk::{ChunkableModule, ChunkableModuleReference, ChunkingContext}, chunk::{ChunkableModule, ChunkableModuleReference, ChunkingContext},
issue::{code_gen::CodeGenerationIssue, IssueExt, IssueSeverity, IssueSource, StyledString}, issue::{code_gen::CodeGenerationIssue, IssueExt, IssueSeverity, IssueSource, StyledString},
...@@ -17,7 +21,7 @@ use turbopack_core::{ ...@@ -17,7 +21,7 @@ use turbopack_core::{
}; };
use crate::{ use crate::{
code_gen::{CodeGenerateable, CodeGeneration}, code_gen::{CodeGen, CodeGeneration, IntoCodeGenReference},
create_visitor, create_visitor,
references::AstPath, references::AstPath,
runtime_functions::TURBOPACK_REQUIRE, runtime_functions::TURBOPACK_REQUIRE,
...@@ -29,28 +33,23 @@ use crate::{ ...@@ -29,28 +33,23 @@ use crate::{
pub struct WorkerAssetReference { pub struct WorkerAssetReference {
pub origin: ResolvedVc<Box<dyn ResolveOrigin>>, pub origin: ResolvedVc<Box<dyn ResolveOrigin>>,
pub request: ResolvedVc<Request>, pub request: ResolvedVc<Request>,
pub path: AstPath,
pub issue_source: IssueSource, pub issue_source: IssueSource,
pub in_try: bool, pub in_try: bool,
} }
#[turbo_tasks::value_impl]
impl WorkerAssetReference { impl WorkerAssetReference {
#[turbo_tasks::function]
pub fn new( pub fn new(
origin: ResolvedVc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
request: ResolvedVc<Request>, request: ResolvedVc<Request>,
path: AstPath,
issue_source: IssueSource, issue_source: IssueSource,
in_try: bool, in_try: bool,
) -> Vc<Self> { ) -> Self {
Self::cell(WorkerAssetReference { WorkerAssetReference {
origin, origin,
request, request,
path,
issue_source, issue_source,
in_try, in_try,
}) }
} }
} }
...@@ -115,15 +114,32 @@ impl ValueToString for WorkerAssetReference { ...@@ -115,15 +114,32 @@ impl ValueToString for WorkerAssetReference {
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl ChunkableModuleReference for WorkerAssetReference {} impl ChunkableModuleReference for WorkerAssetReference {}
#[turbo_tasks::value_impl] impl IntoCodeGenReference for WorkerAssetReference {
impl CodeGenerateable for WorkerAssetReference { fn into_code_gen_reference(
#[turbo_tasks::function] self,
async fn code_generation( path: AstPath,
) -> (ResolvedVc<Box<dyn ModuleReference>>, CodeGen) {
let reference = self.resolved_cell();
(
ResolvedVc::upcast(reference),
CodeGen::WorkerAssetReferenceCodeGen(WorkerAssetReferenceCodeGen { reference, path }),
)
}
}
#[derive(PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, NonLocalValue)]
pub struct WorkerAssetReferenceCodeGen {
reference: ResolvedVc<WorkerAssetReference>,
path: AstPath,
}
impl WorkerAssetReferenceCodeGen {
pub async fn code_generation(
&self, &self,
_module_graph: Vc<ModuleGraph>, _module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<CodeGeneration>> { ) -> Result<CodeGeneration> {
let Some(loader) = self.worker_loader_module().await? else { let Some(loader) = self.reference.await?.worker_loader_module().await? else {
bail!("Worker loader could not be created"); bail!("Worker loader could not be created");
}; };
...@@ -174,6 +190,6 @@ impl CodeGenerateable for WorkerAssetReference { ...@@ -174,6 +190,6 @@ impl CodeGenerateable for WorkerAssetReference {
); );
}); });
Ok(CodeGeneration::visitors(vec![visitor]).cell()) Ok(CodeGeneration::visitors(vec![visitor]))
} }
} }
...@@ -69,21 +69,32 @@ impl EcmascriptChunkItem for EcmascriptModuleFacadeChunkItem { ...@@ -69,21 +69,32 @@ impl EcmascriptChunkItem for EcmascriptModuleFacadeChunkItem {
let references = self.module.references(); let references = self.module.references();
let references_ref = references.await?; let references_ref = references.await?;
let mut code_gens = Vec::with_capacity(references_ref.len() + 2); let mut code_gens_cells = Vec::with_capacity(references_ref.len() + 2);
for r in &references_ref { for r in &references_ref {
if let Some(code_gen) = ResolvedVc::try_sidecast::<Box<dyn CodeGenerateable>>(*r) { if let Some(code_gen) = ResolvedVc::try_sidecast::<Box<dyn CodeGenerateable>>(*r) {
code_gens.push(code_gen.code_generation(*self.module_graph, *chunking_context)); code_gens_cells
.push(code_gen.code_generation(*self.module_graph, *chunking_context));
} }
} }
code_gens.push(self.module.async_module().code_generation( let additional_code_gens = [
async_module_info, self.module
references, .async_module()
*self.module_graph, .code_generation(
*chunking_context, async_module_info,
)); references,
code_gens.push(exports.code_generation(*self.module_graph, *chunking_context)); *self.module_graph,
let code_gens = code_gens.into_iter().try_join().await?; *chunking_context,
let code_gens = code_gens.iter().map(|cg| &**cg); )
.await?,
exports
.code_generation(*self.module_graph, *chunking_context)
.await?,
];
let code_gen_cells = code_gens_cells.into_iter().try_join().await?;
let code_gens = code_gen_cells
.iter()
.map(|cg| &**cg)
.chain(additional_code_gens.iter());
let mut program = Program::Module(swc_core::ecma::ast::Module::dummy()); let mut program = Program::Module(swc_core::ecma::ast::Module::dummy());
process_content_with_code_gens(&mut program, &Globals::new(), None, code_gens); process_content_with_code_gens(&mut program, &Globals::new(), None, code_gens);
......
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