Unverified Commit 37c97d69 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: refactor codegen (#78685)

Refactor codegen in preparation for scope hoisting

Now, you can easily get the AST of the code-gen-ed module (which I need to merge them together)

Part of PACK-2960
parent e6ea4b75
...@@ -266,6 +266,9 @@ impl<T> ReadRef<T> ...@@ -266,6 +266,9 @@ impl<T> ReadRef<T>
where where
T: VcValueType, T: VcValueType,
{ {
/// Returns the inner value, if this [`ReadRef`] has exactly one strong reference.
///
/// Otherwise, an [`Err`] is returned with the same [`ReadRef`] that was passed in.
pub fn try_unwrap(this: Self) -> Result<VcReadTarget<T>, Self> { pub fn try_unwrap(this: Self) -> Result<VcReadTarget<T>, Self> {
match triomphe::Arc::try_unwrap(this.0) { match triomphe::Arc::try_unwrap(this.0) {
Ok(value) => Ok(T::Read::value_to_target(value)), Ok(value) => Ok(T::Read::value_to_target(value)),
......
...@@ -50,12 +50,13 @@ pub use references::{AnalyzeEcmascriptModuleResult, TURBOPACK_HELPER}; ...@@ -50,12 +50,13 @@ pub use references::{AnalyzeEcmascriptModuleResult, TURBOPACK_HELPER};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
pub use static_code::StaticEcmascriptCode; pub use static_code::StaticEcmascriptCode;
use swc_core::{ use swc_core::{
common::{comments::Comments, util::take::Take, Globals, Mark, GLOBALS}, common::{comments::Comments, util::take::Take, Globals, Mark, SourceMap, DUMMY_SP, GLOBALS},
ecma::{ ecma::{
ast::{self, ModuleItem, Program, Script}, ast::{self, Expr, ModuleItem, Program, Script},
codegen::{text_writer::JsWriter, Emitter}, codegen::{text_writer::JsWriter, Emitter},
visit::{VisitMutWith, VisitMutWithAstPath}, visit::{VisitMutWith, VisitMutWithAstPath},
}, },
quote,
}; };
use tracing::Instrument; use tracing::Instrument;
pub use transform::{ pub use transform::{
...@@ -99,6 +100,7 @@ use crate::{ ...@@ -99,6 +100,7 @@ use crate::{
analyse_ecmascript_module, async_module::OptionAsyncModule, esm::base::EsmAssetReferences, analyse_ecmascript_module, async_module::OptionAsyncModule, esm::base::EsmAssetReferences,
}, },
side_effect_optimization::reference::EcmascriptModulePartReference, side_effect_optimization::reference::EcmascriptModulePartReference,
swc_comments::ImmutableComments,
transform::remove_shebang, transform::remove_shebang,
}; };
...@@ -287,7 +289,7 @@ pub trait EcmascriptParsable { ...@@ -287,7 +289,7 @@ pub trait EcmascriptParsable {
} }
#[turbo_tasks::value_trait] #[turbo_tasks::value_trait]
pub trait EcmascriptAnalyzable { pub trait EcmascriptAnalyzable: Module + Asset {
fn analyze(self: Vc<Self>) -> Vc<AnalyzeEcmascriptModuleResult>; fn analyze(self: Vc<Self>) -> Vc<AnalyzeEcmascriptModuleResult>;
/// Generates module contents without an analysis pass. This is useful for /// Generates module contents without an analysis pass. This is useful for
...@@ -297,12 +299,25 @@ pub trait EcmascriptAnalyzable { ...@@ -297,12 +299,25 @@ pub trait EcmascriptAnalyzable {
generate_source_map: bool, generate_source_map: bool,
) -> Result<Vc<EcmascriptModuleContent>>; ) -> Result<Vc<EcmascriptModuleContent>>;
async fn module_content_options(
self: Vc<Self>,
module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
async_module_info: Option<Vc<AsyncModuleInfo>>,
) -> Result<Vc<EcmascriptModuleContentOptions>>;
async fn module_content( async fn module_content(
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>>,
async_module_info: Option<Vc<AsyncModuleInfo>>, async_module_info: Option<Vc<AsyncModuleInfo>>,
) -> Result<Vc<EcmascriptModuleContent>>; ) -> Vc<EcmascriptModuleContent> {
EcmascriptModuleContent::new(self.module_content_options(
module_graph,
chunking_context,
async_module_info,
))
}
} }
impl EcmascriptModuleAsset { impl EcmascriptModuleAsset {
...@@ -413,12 +428,12 @@ impl EcmascriptAnalyzable for EcmascriptModuleAsset { ...@@ -413,12 +428,12 @@ impl EcmascriptAnalyzable for EcmascriptModuleAsset {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
async fn module_content( async fn module_content_options(
self: Vc<Self>, self: Vc<Self>,
module_graph: ResolvedVc<ModuleGraph>, module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>, chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
async_module_info: Option<ResolvedVc<AsyncModuleInfo>>, async_module_info: Option<ResolvedVc<AsyncModuleInfo>>,
) -> Result<Vc<EcmascriptModuleContent>> { ) -> Result<Vc<EcmascriptModuleContentOptions>> {
let parsed = self.parse().to_resolved().await?; let parsed = self.parse().to_resolved().await?;
let analyze = self.analyze(); let analyze = self.analyze();
...@@ -429,8 +444,7 @@ impl EcmascriptAnalyzable for EcmascriptModuleAsset { ...@@ -429,8 +444,7 @@ impl EcmascriptAnalyzable for EcmascriptModuleAsset {
.reference_module_source_maps(Vc::upcast(self)) .reference_module_source_maps(Vc::upcast(self))
.await?; .await?;
Ok(EcmascriptModuleContent::new( Ok(EcmascriptModuleContentOptions {
EcmascriptModuleContentOptions {
parsed, parsed,
ident: self.ident().to_resolved().await?, ident: self.ident().to_resolved().await?,
specified_module_type: module_type_result.module_type, specified_module_type: module_type_result.module_type,
...@@ -445,8 +459,8 @@ impl EcmascriptAnalyzable for EcmascriptModuleAsset { ...@@ -445,8 +459,8 @@ impl EcmascriptAnalyzable for EcmascriptModuleAsset {
original_source_map: analyze_ref.source_map, original_source_map: analyze_ref.source_map,
exports: analyze_ref.exports, exports: analyze_ref.exports,
async_module_info, async_module_info,
}, }
)) .cell())
} }
} }
...@@ -783,7 +797,7 @@ impl EcmascriptChunkItem for ModuleChunkItem { ...@@ -783,7 +797,7 @@ impl EcmascriptChunkItem for ModuleChunkItem {
} }
/// The transformed contents of an Ecmascript module. /// The transformed contents of an Ecmascript module.
#[turbo_tasks::value] #[turbo_tasks::value(shared)]
pub struct EcmascriptModuleContent { pub struct EcmascriptModuleContent {
pub inner_code: Rope, pub inner_code: Rope,
pub source_map: Option<Rope>, pub source_map: Option<Rope>,
...@@ -791,7 +805,8 @@ pub struct EcmascriptModuleContent { ...@@ -791,7 +805,8 @@ pub struct EcmascriptModuleContent {
// pub refresh: bool, // pub refresh: bool,
} }
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, TaskInput, TraceRawVcs)] #[turbo_tasks::value(shared)]
#[derive(Clone, Debug, Hash, TaskInput)]
pub struct EcmascriptModuleContentOptions { pub struct EcmascriptModuleContentOptions {
parsed: ResolvedVc<ParseResult>, parsed: ResolvedVc<ParseResult>,
ident: ResolvedVc<AssetIdent>, ident: ResolvedVc<AssetIdent>,
...@@ -809,15 +824,10 @@ pub struct EcmascriptModuleContentOptions { ...@@ -809,15 +824,10 @@ pub struct EcmascriptModuleContentOptions {
async_module_info: Option<ResolvedVc<AsyncModuleInfo>>, async_module_info: Option<ResolvedVc<AsyncModuleInfo>>,
} }
#[turbo_tasks::value_impl] impl EcmascriptModuleContentOptions {
impl EcmascriptModuleContent { async fn merged_code_gens(&self) -> Result<Vec<CodeGeneration>> {
/// Creates a new [`Vc<EcmascriptModuleContent>`].
#[turbo_tasks::function]
pub async fn new(input: EcmascriptModuleContentOptions) -> Result<Vc<Self>> {
let EcmascriptModuleContentOptions { let EcmascriptModuleContentOptions {
parsed, parsed,
ident,
specified_module_type,
module_graph, module_graph,
chunking_context, chunking_context,
references, references,
...@@ -825,21 +835,20 @@ impl EcmascriptModuleContent { ...@@ -825,21 +835,20 @@ impl EcmascriptModuleContent {
part_references, part_references,
code_generation, code_generation,
async_module, async_module,
generate_source_map,
original_source_map,
exports, exports,
async_module_info, async_module_info,
} = input; ..
} = self;
let (esm_code_gens, part_code_gens, additional_code_gens, code_gens) = async { async {
let additional_code_gens = [ let additional_code_gens = [
if let Some(async_module) = &*async_module.await? { if let Some(async_module) = &*async_module.await? {
Some( Some(
async_module async_module
.code_generation( .code_generation(
async_module_info.map(|info| *info), async_module_info.map(|info| *info),
*references, **references,
*chunking_context, **chunking_context,
) )
.await?, .await?,
) )
...@@ -849,7 +858,7 @@ impl EcmascriptModuleContent { ...@@ -849,7 +858,7 @@ impl EcmascriptModuleContent {
if let EcmascriptExports::EsmExports(exports) = *exports.await? { if let EcmascriptExports::EsmExports(exports) = *exports.await? {
Some( Some(
exports exports
.code_generation(*module_graph, *chunking_context, Some(*parsed)) .code_generation(**module_graph, **chunking_context, Some(**parsed))
.await?, .await?,
) )
} else { } else {
...@@ -860,47 +869,64 @@ impl EcmascriptModuleContent { ...@@ -860,47 +869,64 @@ impl EcmascriptModuleContent {
let esm_code_gens = esm_references let esm_code_gens = esm_references
.await? .await?
.iter() .iter()
.map(|r| r.code_generation(*chunking_context)) .map(|r| r.code_generation(**chunking_context))
.try_join() .try_join()
.await?; .await?;
let part_code_gens = part_references let part_code_gens = part_references
.iter() .iter()
.map(|r| r.code_generation(*chunking_context)) .map(|r| r.code_generation(**chunking_context))
.try_join() .try_join()
.await?; .await?;
let code_gens = code_generation let code_gens = code_generation
.await? .await?
.iter() .iter()
.map(|c| c.code_generation(*module_graph, *chunking_context)) .map(|c| c.code_generation(**module_graph, **chunking_context))
.try_join() .try_join()
.await?; .await?;
anyhow::Ok(( anyhow::Ok(
esm_code_gens, esm_code_gens
part_code_gens, .into_iter()
additional_code_gens, .chain(part_code_gens.into_iter())
code_gens, .chain(additional_code_gens.into_iter().flatten())
)) .chain(code_gens.into_iter())
.collect(),
)
} }
.instrument(tracing::info_span!("precompute code generation")) .instrument(tracing::info_span!("precompute code generation"))
.await?; .await
}
let code_gens = esm_code_gens }
.iter()
.chain(part_code_gens.iter())
.chain(additional_code_gens.iter().flatten())
.chain(code_gens.iter());
gen_content_with_code_gens( #[turbo_tasks::value_impl]
impl EcmascriptModuleContent {
/// Creates a new [`Vc<EcmascriptModuleContent>`].
#[turbo_tasks::function]
pub async fn new(input: Vc<EcmascriptModuleContentOptions>) -> Result<Vc<Self>> {
let input = input.await?;
let EcmascriptModuleContentOptions {
parsed, parsed,
*ident, ident,
specified_module_type, specified_module_type,
code_gens,
generate_source_map, generate_source_map,
original_source_map, original_source_map,
..
} = &*input;
let code_gens = input.merged_code_gens().await?;
async {
let content = process_parse_result(
*parsed,
**ident,
*specified_module_type,
code_gens,
*generate_source_map,
*original_source_map,
) )
.await?;
emit_content(content).await
}
.instrument(tracing::info_span!("gen content with code gens")) .instrument(tracing::info_span!("gen content with code gens"))
.await .await
} }
...@@ -913,29 +939,39 @@ impl EcmascriptModuleContent { ...@@ -913,29 +939,39 @@ impl EcmascriptModuleContent {
specified_module_type: SpecifiedModuleType, specified_module_type: SpecifiedModuleType,
generate_source_map: bool, generate_source_map: bool,
) -> Result<Vc<Self>> { ) -> Result<Vc<Self>> {
gen_content_with_code_gens( let content = process_parse_result(
parsed.to_resolved().await?, parsed.to_resolved().await?,
ident, ident,
specified_module_type, specified_module_type,
&[], vec![],
generate_source_map, generate_source_map,
OptionStringifiedSourceMap::none().to_resolved().await?, OptionStringifiedSourceMap::none().to_resolved().await?,
) )
.await .await?;
emit_content(content).await
} }
} }
async fn gen_content_with_code_gens( struct CodeGenResult {
program: Program,
source_map: Arc<SourceMap>,
comments: Either<ImmutableComments, Arc<ImmutableComments>>,
is_esm: bool,
generate_source_map: bool,
original_source_map: Option<ResolvedVc<OptionStringifiedSourceMap>>,
}
async fn process_parse_result(
parsed: ResolvedVc<ParseResult>, parsed: ResolvedVc<ParseResult>,
ident: Vc<AssetIdent>, ident: Vc<AssetIdent>,
specified_module_type: SpecifiedModuleType, specified_module_type: SpecifiedModuleType,
code_gens: impl IntoIterator<Item = &CodeGeneration>, code_gens: Vec<CodeGeneration>,
generate_source_map: bool, generate_source_map: bool,
original_source_map: ResolvedVc<OptionStringifiedSourceMap>, original_source_map: ResolvedVc<OptionStringifiedSourceMap>,
) -> Result<Vc<EcmascriptModuleContent>> { ) -> Result<CodeGenResult> {
let parsed = parsed.final_read_hint().await?; let parsed = parsed.final_read_hint().await?;
match &*parsed { Ok(match &*parsed {
ParseResult::Ok { .. } => { ParseResult::Ok { .. } => {
// We need a mutable version of the AST. We try to avoid cloning it by unwrapping the // We need a mutable version of the AST. We try to avoid cloning it by unwrapping the
// ReadRef. // ReadRef.
...@@ -978,13 +1014,85 @@ async fn gen_content_with_code_gens( ...@@ -978,13 +1014,85 @@ async fn gen_content_with_code_gens(
} }
_ => unreachable!(), _ => unreachable!(),
}; };
let top_level_mark = eval_context.top_level_mark;
let is_esm = eval_context.is_esm(specified_module_type);
process_content_with_code_gens( process_content_with_code_gens(&mut program, globals, Some(top_level_mark), code_gens);
&mut program,
globals, CodeGenResult {
Some(eval_context.top_level_mark), program,
code_gens, source_map: source_map.clone(),
); comments,
is_esm,
generate_source_map,
original_source_map: Some(original_source_map),
}
}
ParseResult::Unparseable { messages } => {
let path = ident.path().to_string().await?;
let error_messages = messages
.as_ref()
.and_then(|m| m.first().map(|f| format!("\n{}", f)))
.unwrap_or("".into());
let msg = format!("Could not parse module '{path}'\n{error_messages}");
let body = vec![
quote!(
"const e = new Error($msg);" as Stmt,
msg: Expr = Expr::Lit(msg.into()),
),
quote!("e.code = 'MODULE_UNPARSEABLE';" as Stmt),
quote!("throw e;" as Stmt),
];
CodeGenResult {
program: Program::Script(Script {
span: DUMMY_SP,
body,
shebang: None,
}),
source_map: Arc::new(SourceMap::default()),
comments: Either::Left(Default::default()),
is_esm: false,
generate_source_map: false,
original_source_map: None,
}
}
ParseResult::NotFound => {
let path = ident.path().to_string().await?;
let msg = format!("Could not parse module '{path}'");
let body = vec![
quote!(
"const e = new Error($msg);" as Stmt,
msg: Expr = Expr::Lit(msg.into()),
),
quote!("e.code = 'MODULE_UNPARSEABLE';" as Stmt),
quote!("throw e;" as Stmt),
];
CodeGenResult {
program: Program::Script(Script {
span: DUMMY_SP,
body,
shebang: None,
}),
source_map: Arc::new(SourceMap::default()),
comments: Either::Left(Default::default()),
is_esm: false,
generate_source_map: false,
original_source_map: None,
}
}
})
}
async fn emit_content(content: CodeGenResult) -> Result<Vc<EcmascriptModuleContent>> {
let CodeGenResult {
program,
source_map,
comments,
is_esm,
generate_source_map,
original_source_map,
} = content;
let mut bytes: Vec<u8> = vec![]; let mut bytes: Vec<u8> = vec![];
// TODO: Insert this as a sourceless segment so that sourcemaps aren't affected. // TODO: Insert this as a sourceless segment so that sourcemaps aren't affected.
...@@ -1018,11 +1126,15 @@ async fn gen_content_with_code_gens( ...@@ -1018,11 +1126,15 @@ async fn gen_content_with_code_gens(
} }
let source_map = if generate_source_map { let source_map = if generate_source_map {
if let Some(original_source_map) = original_source_map {
Some(generate_js_source_map( Some(generate_js_source_map(
source_map.clone(), source_map.clone(),
mappings, mappings,
original_source_map.await?.as_ref(), original_source_map.await?.as_ref(),
)?) )?)
} else {
Some(generate_js_source_map(source_map.clone(), mappings, None)?)
}
} else { } else {
None None
}; };
...@@ -1030,50 +1142,22 @@ async fn gen_content_with_code_gens( ...@@ -1030,50 +1142,22 @@ async fn gen_content_with_code_gens(
Ok(EcmascriptModuleContent { Ok(EcmascriptModuleContent {
inner_code: bytes.into(), inner_code: bytes.into(),
source_map, source_map,
is_esm: eval_context.is_esm(specified_module_type), is_esm,
} }
.cell()) .cell())
}
ParseResult::Unparseable { messages } => Ok(EcmascriptModuleContent {
inner_code: format!(
"const e = new Error(`Could not parse module \
'{path}'\n{error_messages}`);\ne.code = 'MODULE_UNPARSEABLE';\nthrow e;",
path = ident.path().to_string().await?,
error_messages = messages
.as_ref()
.and_then(|m| { m.first().map(|f| format!("\n{}", f)) })
.unwrap_or("".into())
)
.into(),
source_map: None,
is_esm: false,
}
.cell()),
ParseResult::NotFound => Ok(EcmascriptModuleContent {
inner_code: format!(
"const e = new Error(\"Could not parse module '{path}'\");\ne.code = \
'MODULE_UNPARSEABLE';\nthrow e;",
path = ident.path().to_string().await?
)
.into(),
source_map: None,
is_esm: false,
}
.cell()),
}
} }
fn process_content_with_code_gens<'a>( fn process_content_with_code_gens(
program: &mut Program, program: &mut Program,
globals: &Globals, globals: &Globals,
top_level_mark: Option<Mark>, top_level_mark: Option<Mark>,
code_gens: impl IntoIterator<Item = &'a CodeGeneration>, code_gens: Vec<CodeGeneration>,
) { ) {
let mut visitors = Vec::new(); let mut visitors = Vec::new();
let mut root_visitors = Vec::new(); let mut root_visitors = Vec::new();
let mut early_hoisted_stmts = FxIndexMap::default(); let mut early_hoisted_stmts = FxIndexMap::default();
let mut hoisted_stmts = FxIndexMap::default(); let mut hoisted_stmts = FxIndexMap::default();
for code_gen in code_gens { for code_gen in &code_gens {
for CodeGenerationHoistedStmt { key, stmt } in &code_gen.hoisted_stmts { for CodeGenerationHoistedStmt { key, stmt } in &code_gen.hoisted_stmts {
hoisted_stmts.entry(key.clone()).or_insert(stmt.clone()); hoisted_stmts.entry(key.clone()).or_insert(stmt.clone());
} }
......
...@@ -204,16 +204,15 @@ impl EcmascriptAnalyzable for EcmascriptModuleFacadeModule { ...@@ -204,16 +204,15 @@ impl EcmascriptAnalyzable for EcmascriptModuleFacadeModule {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
async fn module_content( async fn module_content_options(
self: Vc<Self>, self: Vc<Self>,
module_graph: ResolvedVc<ModuleGraph>, module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>, chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
async_module_info: Option<ResolvedVc<AsyncModuleInfo>>, async_module_info: Option<ResolvedVc<AsyncModuleInfo>>,
) -> Result<Vc<EcmascriptModuleContent>> { ) -> Result<Vc<EcmascriptModuleContentOptions>> {
let (esm_references, part_references) = self.await?.specific_references().await?; let (esm_references, part_references) = self.await?.specific_references().await?;
Ok(EcmascriptModuleContent::new( Ok(EcmascriptModuleContentOptions {
EcmascriptModuleContentOptions {
parsed: ParseResult::empty().to_resolved().await?, parsed: ParseResult::empty().to_resolved().await?,
ident: self.ident().to_resolved().await?, ident: self.ident().to_resolved().await?,
specified_module_type: SpecifiedModuleType::EcmaScript, specified_module_type: SpecifiedModuleType::EcmaScript,
...@@ -228,8 +227,8 @@ impl EcmascriptAnalyzable for EcmascriptModuleFacadeModule { ...@@ -228,8 +227,8 @@ impl EcmascriptAnalyzable for EcmascriptModuleFacadeModule {
original_source_map: OptionStringifiedSourceMap::none().to_resolved().await?, original_source_map: OptionStringifiedSourceMap::none().to_resolved().await?,
exports: self.get_exports().to_resolved().await?, exports: self.get_exports().to_resolved().await?,
async_module_info, async_module_info,
}, }
)) .cell())
} }
} }
......
...@@ -92,12 +92,12 @@ impl EcmascriptAnalyzable for EcmascriptModuleLocalsModule { ...@@ -92,12 +92,12 @@ impl EcmascriptAnalyzable for EcmascriptModuleLocalsModule {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
async fn module_content( async fn module_content_options(
self: Vc<Self>, self: Vc<Self>,
module_graph: ResolvedVc<ModuleGraph>, module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>, chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
async_module_info: Option<ResolvedVc<AsyncModuleInfo>>, async_module_info: Option<ResolvedVc<AsyncModuleInfo>>,
) -> Result<Vc<EcmascriptModuleContent>> { ) -> Result<Vc<EcmascriptModuleContentOptions>> {
let exports = self.get_exports().to_resolved().await?; let exports = self.get_exports().to_resolved().await?;
let original_module = self.await?.module; let original_module = self.await?.module;
let parsed = original_module.parse().to_resolved().await?; let parsed = original_module.parse().to_resolved().await?;
...@@ -110,8 +110,7 @@ impl EcmascriptAnalyzable for EcmascriptModuleLocalsModule { ...@@ -110,8 +110,7 @@ impl EcmascriptAnalyzable for EcmascriptModuleLocalsModule {
.reference_module_source_maps(Vc::upcast(self)) .reference_module_source_maps(Vc::upcast(self))
.await?; .await?;
Ok(EcmascriptModuleContent::new( Ok(EcmascriptModuleContentOptions {
EcmascriptModuleContentOptions {
parsed, parsed,
ident: self.ident().to_resolved().await?, ident: self.ident().to_resolved().await?,
specified_module_type: module_type_result.module_type, specified_module_type: module_type_result.module_type,
...@@ -126,8 +125,8 @@ impl EcmascriptAnalyzable for EcmascriptModuleLocalsModule { ...@@ -126,8 +125,8 @@ impl EcmascriptAnalyzable for EcmascriptModuleLocalsModule {
original_source_map: analyze_result.source_map, original_source_map: analyze_result.source_map,
exports, exports,
async_module_info, async_module_info,
}, }
)) .cell())
} }
} }
......
...@@ -75,12 +75,12 @@ impl EcmascriptAnalyzable for EcmascriptModulePartAsset { ...@@ -75,12 +75,12 @@ impl EcmascriptAnalyzable for EcmascriptModulePartAsset {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
async fn module_content( async fn module_content_options(
self: Vc<Self>, self: Vc<Self>,
module_graph: ResolvedVc<ModuleGraph>, module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>, chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
async_module_info: Option<ResolvedVc<AsyncModuleInfo>>, async_module_info: Option<ResolvedVc<AsyncModuleInfo>>,
) -> Result<Vc<EcmascriptModuleContent>> { ) -> Result<Vc<EcmascriptModuleContentOptions>> {
let module = self.await?; let module = self.await?;
let split_data = split_module(*module.full_module); let split_data = split_module(*module.full_module);
...@@ -96,8 +96,7 @@ impl EcmascriptAnalyzable for EcmascriptModulePartAsset { ...@@ -96,8 +96,7 @@ impl EcmascriptAnalyzable for EcmascriptModulePartAsset {
.reference_module_source_maps(Vc::upcast(self)) .reference_module_source_maps(Vc::upcast(self))
.await?; .await?;
Ok(EcmascriptModuleContent::new( Ok(EcmascriptModuleContentOptions {
EcmascriptModuleContentOptions {
parsed, parsed,
ident: self.ident().to_resolved().await?, ident: self.ident().to_resolved().await?,
specified_module_type: module_type_result.module_type, specified_module_type: module_type_result.module_type,
...@@ -112,8 +111,8 @@ impl EcmascriptAnalyzable for EcmascriptModulePartAsset { ...@@ -112,8 +111,8 @@ impl EcmascriptAnalyzable for EcmascriptModulePartAsset {
original_source_map: analyze_ref.source_map, original_source_map: analyze_ref.source_map,
exports: analyze_ref.exports, exports: analyze_ref.exports,
async_module_info, async_module_info,
}, }
)) .cell())
} }
} }
......
...@@ -6,5 +6,6 @@ var { g: global, __dirname, m: module, e: exports } = __turbopack_context__; ...@@ -6,5 +6,6 @@ var { g: global, __dirname, m: module, e: exports } = __turbopack_context__;
{ {
const e = new Error("Could not parse module '[project]/turbopack/crates/turbopack-tests/tests/snapshot/comptime/unreachable/input/index.js'"); const e = new Error("Could not parse module '[project]/turbopack/crates/turbopack-tests/tests/snapshot/comptime/unreachable/input/index.js'");
e.code = 'MODULE_UNPARSEABLE'; e.code = 'MODULE_UNPARSEABLE';
throw e;}}), throw e;
}}),
}]); }]);
\ No newline at end of file
...@@ -6,5 +6,6 @@ var { g: global, __dirname, m: module, e: exports } = __turbopack_context__; ...@@ -6,5 +6,6 @@ var { g: global, __dirname, m: module, e: exports } = __turbopack_context__;
{ {
const e = new Error("Could not parse module '[project]/turbopack/crates/turbopack-tests/tests/snapshot/mdx/error/input/index.js'"); const e = new Error("Could not parse module '[project]/turbopack/crates/turbopack-tests/tests/snapshot/mdx/error/input/index.js'");
e.code = 'MODULE_UNPARSEABLE'; e.code = 'MODULE_UNPARSEABLE';
throw e;}}), throw e;
}}),
}]); }]);
\ No newline at end of file
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