Unverified Commit 22812d49 authored by Donny/강동윤's avatar Donny/강동윤 Committed by GitHub

fix(turbopack): Use correct `SyntaxContext` for `__turbopack_esm__` (#73544)

### What?

### Why?

For description about the `resolver`/`hygiene` system, please see https://rustdoc.swc.rs/swc_core/ecma/transforms/base/fn.resolver.html

### How?

 - Closes https://github.com/vercel/next.js/issues/72232
 - Closes PACK-3372


 - Closes https://github.com/vercel/next.js/issues/73383
 - Closes PACK-3586

---------
Co-authored-by: 's avatarBenjamin Woodruff <benjamin.woodruff@vercel.com>
Co-authored-by: 's avatarTobias Koppers <tobias.koppers@googlemail.com>
parent a84d7476
...@@ -7,6 +7,7 @@ use swc_core::{ ...@@ -7,6 +7,7 @@ use swc_core::{
ecma::{ ecma::{
ast::*, ast::*,
atoms::{atom, Atom}, atoms::{atom, Atom},
utils::find_pat_ids,
visit::{Visit, VisitWith}, visit::{Visit, VisitWith},
}, },
}; };
...@@ -178,6 +179,8 @@ pub(crate) struct ImportMap { ...@@ -178,6 +179,8 @@ pub(crate) struct ImportMap {
/// The module specifiers of star imports that are accessed dynamically and should be imported /// The module specifiers of star imports that are accessed dynamically and should be imported
/// as a whole. /// as a whole.
full_star_imports: FxHashSet<Atom>, full_star_imports: FxHashSet<Atom>,
pub(crate) exports: FxHashMap<RcStr, Id>,
} }
/// Represents a collection of [webpack-style "magic comments"][magic] that override import /// Represents a collection of [webpack-style "magic comments"][magic] that override import
...@@ -605,7 +608,28 @@ impl Visit for Analyzer<'_> { ...@@ -605,7 +608,28 @@ impl Visit for Analyzer<'_> {
// only visit children if we potentially need to mark import / requires // only visit children if we potentially need to mark import / requires
n.visit_children_with(self); n.visit_children_with(self);
} }
match &n.decl {
Decl::Class(n) => {
self.data
.exports
.insert(n.ident.sym.as_str().into(), n.ident.to_id());
}
Decl::Fn(n) => {
self.data
.exports
.insert(n.ident.sym.as_str().into(), n.ident.to_id());
}
Decl::Var(..) | Decl::Using(..) => {
let ids: Vec<Id> = find_pat_ids(&n.decl);
for id in ids {
self.data.exports.insert(id.0.as_str().into(), id);
} }
}
_ => {}
}
}
fn visit_export_default_decl(&mut self, n: &ExportDefaultDecl) { fn visit_export_default_decl(&mut self, n: &ExportDefaultDecl) {
self.data.has_exports = true; self.data.has_exports = true;
...@@ -623,6 +647,28 @@ impl Visit for Analyzer<'_> { ...@@ -623,6 +647,28 @@ impl Visit for Analyzer<'_> {
} }
} }
fn visit_export_named_specifier(&mut self, n: &ExportNamedSpecifier) {
if let ModuleExportName::Ident(ident) = &n.exported.as_ref().unwrap_or(&n.orig) {
self.data
.exports
.insert(ident.sym.as_str().into(), ident.to_id());
}
}
fn visit_export_default_specifier(&mut self, n: &ExportDefaultSpecifier) {
self.data
.exports
.insert("default".into(), n.exported.to_id());
}
fn visit_export_namespace_specifier(&mut self, n: &ExportNamespaceSpecifier) {
if let ModuleExportName::Ident(ident) = &n.name {
self.data
.exports
.insert(ident.sym.as_str().into(), ident.to_id());
}
}
fn visit_program(&mut self, m: &Program) { fn visit_program(&mut self, m: &Program) {
self.data.has_top_level_await = has_top_level_await(m).is_some(); self.data.has_top_level_await = has_top_level_await(m).is_some();
......
...@@ -809,7 +809,7 @@ impl EcmascriptModuleContent { ...@@ -809,7 +809,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) .code_generation(module_graph, chunking_context, *parsed)
.await?, .await?,
) )
} else { } else {
......
...@@ -31,6 +31,7 @@ use crate::{ ...@@ -31,6 +31,7 @@ use crate::{
chunk::{EcmascriptChunkPlaceable, EcmascriptExports}, chunk::{EcmascriptChunkPlaceable, EcmascriptExports},
code_gen::{CodeGeneration, CodeGenerationHoistedStmt}, code_gen::{CodeGeneration, CodeGenerationHoistedStmt},
magic_identifier, magic_identifier,
parse::ParseResult,
runtime_functions::{TURBOPACK_DYNAMIC, TURBOPACK_ESM}, runtime_functions::{TURBOPACK_DYNAMIC, TURBOPACK_ESM},
}; };
...@@ -494,8 +495,14 @@ impl EsmExports { ...@@ -494,8 +495,14 @@ impl EsmExports {
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>>,
parsed: Vc<ParseResult>,
) -> Result<CodeGeneration> { ) -> Result<CodeGeneration> {
let expanded = self.expand_exports().await?; let expanded = self.expand_exports().await?;
let parsed = parsed.await?;
let eval_context = match &*parsed {
ParseResult::Ok { eval_context, .. } => Some(eval_context),
_ => None,
};
let mut dynamic_exports = Vec::<Box<Expr>>::new(); let mut dynamic_exports = Vec::<Box<Expr>>::new();
for dynamic_export_asset in &expanded.dynamic_exports { for dynamic_export_asset in &expanded.dynamic_exports {
...@@ -522,20 +529,22 @@ impl EsmExports { ...@@ -522,20 +529,22 @@ impl EsmExports {
} else { } else {
Cow::Borrowed(name.as_str()) Cow::Borrowed(name.as_str())
}; };
let ctxt = eval_context
.and_then(|eval_context| {
eval_context.imports.exports.get(name).map(|id| id.1)
})
.unwrap_or_default();
if *mutable { if *mutable {
Some(quote!( Some(quote!(
"([() => $local, ($new) => $local = $new])" as Expr, "([() => $local, ($new) => $local = $new])" as Expr,
local = Ident::new(local.into(), DUMMY_SP, Default::default()), local = Ident::new(local.into(), DUMMY_SP, ctxt),
new = Ident::new( new = Ident::new(format!("new_{name}").into(), DUMMY_SP, ctxt),
format!("new_{name}").into(),
DUMMY_SP,
Default::default()
),
)) ))
} else { } else {
Some(quote!( Some(quote!(
"(() => $local)" as Expr, "(() => $local)" as Expr,
local = Ident::new((name as &str).into(), DUMMY_SP, Default::default()) local = Ident::new((name as &str).into(), DUMMY_SP, ctxt)
)) ))
} }
} }
......
...@@ -68,7 +68,11 @@ impl EcmascriptChunkItem for EcmascriptModuleFacadeChunkItem { ...@@ -68,7 +68,11 @@ impl EcmascriptChunkItem for EcmascriptModuleFacadeChunkItem {
let esm_code_gens = self let esm_code_gens = self
.module .module
.code_generation(*self.module_graph, *chunking_context) .code_generation(
*self.module_graph,
*chunking_context,
*self.module.await?.parsed,
)
.await?; .await?;
let additional_code_gens = [ let additional_code_gens = [
self.module self.module
...@@ -80,7 +84,11 @@ impl EcmascriptChunkItem for EcmascriptModuleFacadeChunkItem { ...@@ -80,7 +84,11 @@ impl EcmascriptChunkItem for EcmascriptModuleFacadeChunkItem {
) )
.await?, .await?,
exports exports
.code_generation(*self.module_graph, *chunking_context) .code_generation(
*self.module_graph,
*chunking_context,
*self.module.await?.parsed,
)
.await?, .await?,
]; ];
let code_gens = esm_code_gens.iter().chain(additional_code_gens.iter()); let code_gens = esm_code_gens.iter().chain(additional_code_gens.iter());
......
...@@ -17,7 +17,7 @@ use super::{ ...@@ -17,7 +17,7 @@ use super::{
facade::module::EcmascriptModuleFacadeModule, locals::module::EcmascriptModuleLocalsModule, facade::module::EcmascriptModuleFacadeModule, locals::module::EcmascriptModuleLocalsModule,
}; };
use crate::{ use crate::{
chunk::EcmascriptChunkPlaceable, code_gen::CodeGeneration, chunk::EcmascriptChunkPlaceable, code_gen::CodeGeneration, parse::ParseResult,
references::esm::base::ReferencedAsset, runtime_functions::TURBOPACK_IMPORT, references::esm::base::ReferencedAsset, runtime_functions::TURBOPACK_IMPORT,
utils::module_id_to_lit, utils::module_id_to_lit,
}; };
...@@ -27,6 +27,7 @@ use crate::{ ...@@ -27,6 +27,7 @@ use crate::{
#[turbo_tasks::value] #[turbo_tasks::value]
pub struct EcmascriptModulePartReference { pub struct EcmascriptModulePartReference {
pub module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>, pub module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
pub parsed: ResolvedVc<ParseResult>,
pub part: Option<ModulePart>, pub part: Option<ModulePart>,
} }
...@@ -35,18 +36,28 @@ impl EcmascriptModulePartReference { ...@@ -35,18 +36,28 @@ impl EcmascriptModulePartReference {
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn new_part( pub fn new_part(
module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>, module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
parsed: ResolvedVc<ParseResult>,
part: ModulePart, part: ModulePart,
) -> Vc<Self> { ) -> Vc<Self> {
EcmascriptModulePartReference { EcmascriptModulePartReference {
module, module,
parsed,
part: Some(part), part: Some(part),
} }
.cell() .cell()
} }
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn new(module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>) -> Vc<Self> { pub fn new(
EcmascriptModulePartReference { module, part: None }.cell() module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
parsed: ResolvedVc<ParseResult>,
) -> Vc<Self> {
EcmascriptModulePartReference {
module,
parsed,
part: None,
}
.cell()
} }
} }
...@@ -81,7 +92,7 @@ impl ModuleReference for EcmascriptModulePartReference { ...@@ -81,7 +92,7 @@ impl ModuleReference for EcmascriptModulePartReference {
| ModulePart::Facade | ModulePart::Facade
| ModulePart::RenamedExport { .. } | ModulePart::RenamedExport { .. }
| ModulePart::RenamedNamespace { .. } => Vc::upcast( | ModulePart::RenamedNamespace { .. } => Vc::upcast(
EcmascriptModuleFacadeModule::new(*self.module, part.clone()), EcmascriptModuleFacadeModule::new(*self.module, *self.parsed, part.clone()),
), ),
ModulePart::Export(..) ModulePart::Export(..)
| ModulePart::Internal(..) | ModulePart::Internal(..)
......
...@@ -162,6 +162,8 @@ impl EcmascriptModulePartAsset { ...@@ -162,6 +162,8 @@ impl EcmascriptModulePartAsset {
.. ..
} = &*result.await?; } = &*result.await?;
let parsed = module.parse();
let final_module = if let Some(new_export) = new_export { let final_module = if let Some(new_export) = new_export {
if *new_export == export { if *new_export == export {
*final_module *final_module
...@@ -169,6 +171,7 @@ impl EcmascriptModulePartAsset { ...@@ -169,6 +171,7 @@ impl EcmascriptModulePartAsset {
ResolvedVc::upcast( ResolvedVc::upcast(
EcmascriptModuleFacadeModule::new( EcmascriptModuleFacadeModule::new(
**final_module, **final_module,
parsed,
ModulePart::renamed_export(new_export.clone(), export.clone()), ModulePart::renamed_export(new_export.clone(), export.clone()),
) )
.to_resolved() .to_resolved()
...@@ -179,6 +182,7 @@ impl EcmascriptModulePartAsset { ...@@ -179,6 +182,7 @@ impl EcmascriptModulePartAsset {
ResolvedVc::upcast( ResolvedVc::upcast(
EcmascriptModuleFacadeModule::new( EcmascriptModuleFacadeModule::new(
**final_module, **final_module,
parsed,
ModulePart::renamed_namespace(export.clone()), ModulePart::renamed_namespace(export.clone()),
) )
.to_resolved() .to_resolved()
......
...@@ -54,6 +54,7 @@ use turbopack_core::{ ...@@ -54,6 +54,7 @@ use turbopack_core::{
pub use turbopack_css as css; pub use turbopack_css as css;
pub use turbopack_ecmascript as ecmascript; pub use turbopack_ecmascript as ecmascript;
use turbopack_ecmascript::{ use turbopack_ecmascript::{
parse::ParseResult,
references::external_module::{CachedExternalModule, CachedExternalType}, references::external_module::{CachedExternalModule, CachedExternalType},
tree_shake::asset::EcmascriptModulePartAsset, tree_shake::asset::EcmascriptModulePartAsset,
}; };
...@@ -157,6 +158,7 @@ async fn apply_module_type( ...@@ -157,6 +158,7 @@ async fn apply_module_type(
} }
} }
let parsed = module.parse();
let options = options.await?; let options = options.await?;
match options.tree_shaking_mode { match options.tree_shaking_mode {
Some(TreeShakingMode::ModuleFragments) => { Some(TreeShakingMode::ModuleFragments) => {
...@@ -172,6 +174,7 @@ async fn apply_module_type( ...@@ -172,6 +174,7 @@ async fn apply_module_type(
if *module.get_exports().needs_facade().await? { if *module.get_exports().needs_facade().await? {
Vc::upcast(EcmascriptModuleFacadeModule::new( Vc::upcast(EcmascriptModuleFacadeModule::new(
Vc::upcast(module), Vc::upcast(module),
parsed,
part, part,
)) ))
} else { } else {
...@@ -189,17 +192,20 @@ async fn apply_module_type( ...@@ -189,17 +192,20 @@ async fn apply_module_type(
Vc::upcast( Vc::upcast(
EcmascriptModuleFacadeModule::new( EcmascriptModuleFacadeModule::new(
Vc::upcast(module), Vc::upcast(module),
parsed,
ModulePart::exports(), ModulePart::exports(),
) )
.resolve() .resolve()
.await?, .await?,
), ),
parsed,
part, part,
side_effect_free_packages, side_effect_free_packages,
) )
} else { } else {
apply_reexport_tree_shaking( apply_reexport_tree_shaking(
Vc::upcast(module.resolve().await?), Vc::upcast(module.resolve().await?),
parsed,
part, part,
side_effect_free_packages, side_effect_free_packages,
) )
...@@ -214,6 +220,7 @@ async fn apply_module_type( ...@@ -214,6 +220,7 @@ async fn apply_module_type(
} else if *module.get_exports().needs_facade().await? { } else if *module.get_exports().needs_facade().await? {
Vc::upcast(EcmascriptModuleFacadeModule::new( Vc::upcast(EcmascriptModuleFacadeModule::new(
Vc::upcast(module), Vc::upcast(module),
parsed,
ModulePart::facade(), ModulePart::facade(),
)) ))
} else { } else {
...@@ -276,6 +283,7 @@ async fn apply_module_type( ...@@ -276,6 +283,7 @@ async fn apply_module_type(
#[turbo_tasks::function] #[turbo_tasks::function]
async fn apply_reexport_tree_shaking( async fn apply_reexport_tree_shaking(
module: Vc<Box<dyn EcmascriptChunkPlaceable>>, module: Vc<Box<dyn EcmascriptChunkPlaceable>>,
parsed: Vc<ParseResult>,
part: ModulePart, part: ModulePart,
side_effect_free_packages: Vc<Glob>, side_effect_free_packages: Vc<Glob>,
) -> Result<Vc<Box<dyn Module>>> { ) -> Result<Vc<Box<dyn Module>>> {
...@@ -291,12 +299,14 @@ async fn apply_reexport_tree_shaking( ...@@ -291,12 +299,14 @@ async fn apply_reexport_tree_shaking(
} else { } else {
Vc::upcast(EcmascriptModuleFacadeModule::new( Vc::upcast(EcmascriptModuleFacadeModule::new(
**final_module, **final_module,
parsed,
ModulePart::renamed_export(new_export.clone(), export.clone()), ModulePart::renamed_export(new_export.clone(), export.clone()),
)) ))
} }
} else { } else {
Vc::upcast(EcmascriptModuleFacadeModule::new( Vc::upcast(EcmascriptModuleFacadeModule::new(
**final_module, **final_module,
parsed,
ModulePart::renamed_namespace(export.clone()), ModulePart::renamed_namespace(export.clone()),
)) ))
}; };
......
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