Unverified Commit 72051802 authored by Benjamin Woodruff's avatar Benjamin Woodruff Committed by GitHub

refactor(turbopack-ecmascript) Use ResolvedVc in EsmExport type (#74508)

This removes the `local` opt-out from `EsmExports`.
parent 4dbb18d6
...@@ -94,10 +94,14 @@ impl ChunkableModule for NextDynamicEntryModule { ...@@ -94,10 +94,14 @@ impl ChunkableModule for NextDynamicEntryModule {
impl EcmascriptChunkPlaceable for NextDynamicEntryModule { impl EcmascriptChunkPlaceable for NextDynamicEntryModule {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn get_exports(&self) -> Result<Vc<EcmascriptExports>> { async fn get_exports(&self) -> Result<Vc<EcmascriptExports>> {
let module_reference = Vc::upcast(SingleChunkableModuleReference::new( let module_reference = ResolvedVc::upcast(
Vc::upcast(*self.module), SingleChunkableModuleReference::new(
dynamic_ref_description(), Vc::upcast(*self.module),
)); dynamic_ref_description(),
)
.to_resolved()
.await?,
);
let mut exports = BTreeMap::new(); let mut exports = BTreeMap::new();
exports.insert( exports.insert(
...@@ -108,7 +112,7 @@ impl EcmascriptChunkPlaceable for NextDynamicEntryModule { ...@@ -108,7 +112,7 @@ impl EcmascriptChunkPlaceable for NextDynamicEntryModule {
Ok(EcmascriptExports::EsmExports( Ok(EcmascriptExports::EsmExports(
EsmExports { EsmExports {
exports, exports,
star_exports: vec![module_reference.to_resolved().await?], star_exports: vec![module_reference],
} }
.resolved_cell(), .resolved_cell(),
) )
......
...@@ -114,9 +114,11 @@ impl ChunkableModule for NextServerComponentModule { ...@@ -114,9 +114,11 @@ impl ChunkableModule for NextServerComponentModule {
impl EcmascriptChunkPlaceable for NextServerComponentModule { impl EcmascriptChunkPlaceable for NextServerComponentModule {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn get_exports(&self) -> Result<Vc<EcmascriptExports>> { async fn get_exports(&self) -> Result<Vc<EcmascriptExports>> {
let module_reference = Vc::upcast(NextServerComponentModuleReference::new(Vc::upcast( let module_reference = ResolvedVc::upcast(
*self.module, NextServerComponentModuleReference::new(Vc::upcast(*self.module))
))); .to_resolved()
.await?,
);
let mut exports = BTreeMap::new(); let mut exports = BTreeMap::new();
exports.insert( exports.insert(
...@@ -127,7 +129,7 @@ impl EcmascriptChunkPlaceable for NextServerComponentModule { ...@@ -127,7 +129,7 @@ impl EcmascriptChunkPlaceable for NextServerComponentModule {
Ok(EcmascriptExports::EsmExports( Ok(EcmascriptExports::EsmExports(
EsmExports { EsmExports {
exports, exports,
star_exports: vec![module_reference.to_resolved().await?], star_exports: vec![module_reference],
} }
.resolved_cell(), .resolved_cell(),
) )
......
...@@ -92,9 +92,11 @@ impl ChunkableModule for NextServerUtilityModule { ...@@ -92,9 +92,11 @@ impl ChunkableModule for NextServerUtilityModule {
impl EcmascriptChunkPlaceable for NextServerUtilityModule { impl EcmascriptChunkPlaceable for NextServerUtilityModule {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn get_exports(&self) -> Result<Vc<EcmascriptExports>> { async fn get_exports(&self) -> Result<Vc<EcmascriptExports>> {
let module_reference = Vc::upcast(NextServerUtilityModuleReference::new(Vc::upcast( let module_reference = ResolvedVc::upcast(
*self.module, NextServerUtilityModuleReference::new(Vc::upcast(*self.module))
))); .to_resolved()
.await?,
);
let mut exports = BTreeMap::new(); let mut exports = BTreeMap::new();
exports.insert( exports.insert(
...@@ -105,7 +107,7 @@ impl EcmascriptChunkPlaceable for NextServerUtilityModule { ...@@ -105,7 +107,7 @@ impl EcmascriptChunkPlaceable for NextServerUtilityModule {
Ok(EcmascriptExports::EsmExports( Ok(EcmascriptExports::EsmExports(
EsmExports { EsmExports {
exports, exports,
star_exports: vec![module_reference.to_resolved().await?], star_exports: vec![module_reference],
} }
.resolved_cell(), .resolved_cell(),
) )
......
...@@ -35,7 +35,7 @@ use crate::{ ...@@ -35,7 +35,7 @@ use crate::{
magic_identifier, magic_identifier,
}; };
#[derive(Clone, Hash, Debug, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs)] #[derive(Clone, Hash, Debug, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, NonLocalValue)]
pub enum EsmExport { pub enum EsmExport {
/// A local binding that is exported (export { a } or export const a = 1) /// A local binding that is exported (export { a } or export const a = 1)
/// ///
...@@ -44,9 +44,9 @@ pub enum EsmExport { ...@@ -44,9 +44,9 @@ pub enum EsmExport {
/// An imported binding that is exported (export { a as b } from "...") /// An imported binding that is exported (export { a as b } from "...")
/// ///
/// The last bool is true if the binding is a mutable binding /// The last bool is true if the binding is a mutable binding
ImportedBinding(Vc<Box<dyn ModuleReference>>, RcStr, bool), ImportedBinding(ResolvedVc<Box<dyn ModuleReference>>, RcStr, bool),
/// An imported namespace that is exported (export * from "...") /// An imported namespace that is exported (export * from "...")
ImportedNamespace(Vc<Box<dyn ModuleReference>>), ImportedNamespace(ResolvedVc<Box<dyn ModuleReference>>),
/// An error occurred while resolving the export /// An error occurred while resolving the export
Error, Error,
} }
...@@ -427,19 +427,18 @@ async fn emit_star_exports_issue(source_ident: Vc<AssetIdent>, message: RcStr) - ...@@ -427,19 +427,18 @@ async fn emit_star_exports_issue(source_ident: Vc<AssetIdent>, message: RcStr) -
Ok(()) Ok(())
} }
#[turbo_tasks::value(shared, local)] #[turbo_tasks::value(shared)]
#[derive(Hash, Debug)] #[derive(Hash, Debug)]
pub struct EsmExports { pub struct EsmExports {
pub exports: BTreeMap<RcStr, EsmExport>, pub exports: BTreeMap<RcStr, EsmExport>,
pub star_exports: Vec<ResolvedVc<Box<dyn ModuleReference>>>, pub star_exports: Vec<ResolvedVc<Box<dyn ModuleReference>>>,
} }
/// The expanded version of [EsmExports], the `exports` field here includes all /// The expanded version of [`EsmExports`], the `exports` field here includes all exports that could
/// exports that could be expanded from `star_exports`. /// be expanded from `star_exports`.
/// ///
/// `star_exports` that could not be (fully) expanded end up in /// [`EsmExports::star_exports`] that could not be (fully) expanded end up in `dynamic_exports`.
/// `dynamic_exports`. #[turbo_tasks::value(shared)]
#[turbo_tasks::value(shared, local)]
#[derive(Hash, Debug)] #[derive(Hash, Debug)]
pub struct ExpandedExports { pub struct ExpandedExports {
pub exports: BTreeMap<RcStr, EsmExport>, pub exports: BTreeMap<RcStr, EsmExport>,
...@@ -469,7 +468,11 @@ impl EsmExports { ...@@ -469,7 +468,11 @@ impl EsmExports {
if !exports.contains_key(export) { if !exports.contains_key(export) {
exports.insert( exports.insert(
export.clone(), export.clone(),
EsmExport::ImportedBinding(Vc::upcast(*esm_ref), export.clone(), false), EsmExport::ImportedBinding(
ResolvedVc::upcast(esm_ref),
export.clone(),
false,
),
); );
} }
} }
......
...@@ -653,7 +653,6 @@ pub(crate) async fn analyse_ecmascript_module_internal( ...@@ -653,7 +653,6 @@ pub(crate) async fn analyse_ecmascript_module_internal(
let (webpack_runtime, webpack_entry, webpack_chunks, esm_exports, esm_star_exports) = let (webpack_runtime, webpack_entry, webpack_chunks, esm_exports, esm_star_exports) =
set_handler_and_globals(&handler, globals, || { set_handler_and_globals(&handler, globals, || {
// TODO migrate to effects // TODO migrate to effects
let import_references: Vec<_> = import_references.iter().map(|&rvc| *rvc).collect(); // TODO(ResolvedVc): reinterpret directly
let mut visitor = let mut visitor =
ModuleReferencesVisitor::new(eval_context, &import_references, &mut analysis); ModuleReferencesVisitor::new(eval_context, &import_references, &mut analysis);
...@@ -661,12 +660,14 @@ pub(crate) async fn analyse_ecmascript_module_internal( ...@@ -661,12 +660,14 @@ pub(crate) async fn analyse_ecmascript_module_internal(
let import_ref = import_references[i]; let import_ref = import_references[i];
match reexport { match reexport {
Reexport::Star => { Reexport::Star => {
visitor.esm_star_exports.push(Vc::upcast(import_ref)); visitor
.esm_star_exports
.push(ResolvedVc::upcast(import_ref));
} }
Reexport::Namespace { exported: n } => { Reexport::Namespace { exported: n } => {
visitor.esm_exports.insert( visitor.esm_exports.insert(
n.as_str().into(), n.as_str().into(),
EsmExport::ImportedNamespace(Vc::upcast(import_ref)), EsmExport::ImportedNamespace(ResolvedVc::upcast(import_ref)),
); );
} }
Reexport::Named { Reexport::Named {
...@@ -676,7 +677,7 @@ pub(crate) async fn analyse_ecmascript_module_internal( ...@@ -676,7 +677,7 @@ pub(crate) async fn analyse_ecmascript_module_internal(
visitor.esm_exports.insert( visitor.esm_exports.insert(
e.as_str().into(), e.as_str().into(),
EsmExport::ImportedBinding( EsmExport::ImportedBinding(
Vc::upcast(import_ref), ResolvedVc::upcast(import_ref),
i.to_string().into(), i.to_string().into(),
false, false,
), ),
...@@ -700,26 +701,19 @@ pub(crate) async fn analyse_ecmascript_module_internal( ...@@ -700,26 +701,19 @@ pub(crate) async fn analyse_ecmascript_module_internal(
match *export { match *export {
EsmExport::LocalBinding(..) => {} EsmExport::LocalBinding(..) => {}
EsmExport::ImportedNamespace(reference) => { EsmExport::ImportedNamespace(reference) => {
let reference = reference.to_resolved().await?;
analysis.add_reexport_reference(reference); analysis.add_reexport_reference(reference);
analysis.add_import_reference(reference); analysis.add_import_reference(reference);
} }
EsmExport::ImportedBinding(reference, ..) => { EsmExport::ImportedBinding(reference, ..) => {
let reference = reference.to_resolved().await?;
analysis.add_reexport_reference(reference); analysis.add_reexport_reference(reference);
analysis.add_import_reference(reference); analysis.add_import_reference(reference);
} }
EsmExport::Error => {} EsmExport::Error => {}
} }
} }
for reference in esm_star_exports for reference in &esm_star_exports {
.iter() analysis.add_reexport_reference(*reference);
.map(|r| r.to_resolved()) analysis.add_import_reference(*reference);
.try_join()
.await?
{
analysis.add_reexport_reference(reference);
analysis.add_import_reference(reference);
} }
let mut ignore_effect_span = None; let mut ignore_effect_span = None;
...@@ -780,11 +774,7 @@ pub(crate) async fn analyse_ecmascript_module_internal( ...@@ -780,11 +774,7 @@ pub(crate) async fn analyse_ecmascript_module_internal(
let esm_exports = EsmExports { let esm_exports = EsmExports {
exports: esm_exports, exports: esm_exports,
star_exports: esm_star_exports star_exports: esm_star_exports,
.into_iter()
.map(|v| v.to_resolved())
.try_join()
.await?,
} }
.cell(); .cell();
...@@ -2880,10 +2870,10 @@ impl StaticAnalyser { ...@@ -2880,10 +2870,10 @@ impl StaticAnalyser {
struct ModuleReferencesVisitor<'a> { struct ModuleReferencesVisitor<'a> {
eval_context: &'a EvalContext, eval_context: &'a EvalContext,
old_analyser: StaticAnalyser, old_analyser: StaticAnalyser,
import_references: &'a [Vc<EsmAssetReference>], import_references: &'a [ResolvedVc<EsmAssetReference>],
analysis: &'a mut AnalyzeEcmascriptModuleResultBuilder, analysis: &'a mut AnalyzeEcmascriptModuleResultBuilder,
esm_exports: BTreeMap<RcStr, EsmExport>, esm_exports: BTreeMap<RcStr, EsmExport>,
esm_star_exports: Vec<Vc<Box<dyn ModuleReference>>>, esm_star_exports: Vec<ResolvedVc<Box<dyn ModuleReference>>>,
webpack_runtime: Option<(RcStr, Span)>, webpack_runtime: Option<(RcStr, Span)>,
webpack_entry: bool, webpack_entry: bool,
webpack_chunks: Vec<Lit>, webpack_chunks: Vec<Lit>,
...@@ -2892,7 +2882,7 @@ struct ModuleReferencesVisitor<'a> { ...@@ -2892,7 +2882,7 @@ struct ModuleReferencesVisitor<'a> {
impl<'a> ModuleReferencesVisitor<'a> { impl<'a> ModuleReferencesVisitor<'a> {
fn new( fn new(
eval_context: &'a EvalContext, eval_context: &'a EvalContext,
import_references: &'a [Vc<EsmAssetReference>], import_references: &'a [ResolvedVc<EsmAssetReference>],
analysis: &'a mut AnalyzeEcmascriptModuleResultBuilder, analysis: &'a mut AnalyzeEcmascriptModuleResultBuilder,
) -> Self { ) -> Self {
Self { Self {
...@@ -3025,12 +3015,12 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> { ...@@ -3025,12 +3015,12 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> {
let esm_ref = self.import_references[index]; let esm_ref = self.import_references[index];
if let Some(export) = export { if let Some(export) = export {
EsmExport::ImportedBinding( EsmExport::ImportedBinding(
Vc::upcast(esm_ref), ResolvedVc::upcast(esm_ref),
export, export,
is_fake_esm, is_fake_esm,
) )
} else { } else {
EsmExport::ImportedNamespace(Vc::upcast(esm_ref)) EsmExport::ImportedNamespace(ResolvedVc::upcast(esm_ref))
} }
} else { } else {
EsmExport::LocalBinding(binding_name, is_fake_esm) EsmExport::LocalBinding(binding_name, is_fake_esm)
......
...@@ -186,10 +186,14 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -186,10 +186,14 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule {
exports.insert( exports.insert(
name.clone(), name.clone(),
EsmExport::ImportedBinding( EsmExport::ImportedBinding(
Vc::upcast(EcmascriptModulePartReference::new_part( ResolvedVc::upcast(
*self.module, EcmascriptModulePartReference::new_part(
ModulePart::locals(), *self.module,
)), ModulePart::locals(),
)
.to_resolved()
.await?,
),
name, name,
*mutable, *mutable,
), ),
...@@ -229,10 +233,14 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -229,10 +233,14 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule {
exports.insert( exports.insert(
"default".into(), "default".into(),
EsmExport::ImportedBinding( EsmExport::ImportedBinding(
Vc::upcast(EcmascriptModulePartReference::new_part( ResolvedVc::upcast(
*self.module, EcmascriptModulePartReference::new_part(
ModulePart::exports(), *self.module,
)), ModulePart::exports(),
)
.to_resolved()
.await?,
),
"default".into(), "default".into(),
false, false,
), ),
...@@ -252,7 +260,11 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -252,7 +260,11 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule {
exports.insert( exports.insert(
export.await?.clone_value(), export.await?.clone_value(),
EsmExport::ImportedBinding( EsmExport::ImportedBinding(
Vc::upcast(EcmascriptModulePartReference::new(*self.module)), ResolvedVc::upcast(
EcmascriptModulePartReference::new(*self.module)
.to_resolved()
.await?,
),
original_export.clone_value(), original_export.clone_value(),
false, false,
), ),
...@@ -261,9 +273,11 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -261,9 +273,11 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule {
ModulePart::RenamedNamespace { export } => { ModulePart::RenamedNamespace { export } => {
exports.insert( exports.insert(
export.await?.clone_value(), export.await?.clone_value(),
EsmExport::ImportedNamespace(Vc::upcast(EcmascriptModulePartReference::new( EsmExport::ImportedNamespace(ResolvedVc::upcast(
*self.module, EcmascriptModulePartReference::new(*self.module)
))), .to_resolved()
.await?,
)),
); );
} }
ModulePart::Evaluation => { ModulePart::Evaluation => {
...@@ -276,8 +290,8 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -276,8 +290,8 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule {
exports, exports,
star_exports, star_exports,
} }
.cell(); .resolved_cell();
Ok(EcmascriptExports::EsmExports(exports.to_resolved().await?).cell()) Ok(EcmascriptExports::EsmExports(exports).cell())
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
...@@ -93,8 +93,8 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleLocalsModule { ...@@ -93,8 +93,8 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleLocalsModule {
exports, exports,
star_exports: vec![], star_exports: vec![],
} }
.cell(); .resolved_cell();
Ok(EcmascriptExports::EsmExports(exports.to_resolved().await?).cell()) Ok(EcmascriptExports::EsmExports(exports).cell())
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
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