Consume new vargraph data to set liveness

Author: lukesandberg

turbopack/crates/turbopack-ecmascript/src/references/esm/export.rs

@@ -387,7 +387,7 @@ async fn get_all_export_names(
             star_export_names
                 .esm_exports
                 .iter()
-                .map(|(k, &v)| (k.clone(), v)),
+                .map(|(k, (_liveness, v))| (k.clone(), *v)),
         );
         dynamic_exporting_modules
             .extend(star_export_names.dynamic_exporting_modules.iter().copied());
@@ -402,7 +402,7 @@ async fn get_all_export_names(
 
 #[turbo_tasks::value]
 pub struct ExpandStarResult {
-    pub esm_exports: FxIndexMap<RcStr, ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>>,
+    pub esm_exports: FxIndexMap<RcStr, (Liveness, ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>)>,
     pub dynamic_exporting_modules: Vec<ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>>,
 }
 
@@ -419,11 +419,13 @@ pub async fn expand_star_exports(
         match &*exports.await? {
             EcmascriptExports::EsmExports(exports) => {
                 let exports = exports.await?;
-                for key in exports.exports.keys() {
+                for (key, export) in exports.exports.iter() {
                     if key == "default" {
                         continue;
                     }
-                    esm_exports.entry(key.clone()).or_insert_with(|| asset);
+                    esm_exports
+                        .entry(key.clone())
+                        .or_insert_with(|| (export.liveness(), asset));
                 }
                 for esm_ref in exports.star_exports.iter() {
                     if let ReferencedAsset::Some(asset) =

turbopack/crates/turbopack-ecmascript/src/references/mod.rs

@@ -782,8 +782,12 @@ pub(crate) async fn analyse_ecmascript_module_internal(
         let (webpack_runtime, webpack_entry, webpack_chunks, mut esm_exports) =
             set_handler_and_globals(&handler, globals, || {
                 // TODO migrate to effects
-                let mut visitor =
-                    ModuleReferencesVisitor::new(eval_context, &import_references, &mut analysis);
+                let mut visitor = ModuleReferencesVisitor::new(
+                    eval_context,
+                    &import_references,
+                    &mut analysis,
+                    &var_graph,
+                );
                 // ModuleReferencesVisitor has already called analysis.add_esm_reexport_reference
                 // for any references in esm_exports
                 program.visit_with_ast_path(&mut visitor, &mut Default::default());
@@ -3200,13 +3204,15 @@ struct ModuleReferencesVisitor<'a> {
     webpack_runtime: Option<(RcStr, Span)>,
     webpack_entry: bool,
     webpack_chunks: Vec<Lit>,
+    var_graph: &'a VarGraph,
 }
 
 impl<'a> ModuleReferencesVisitor<'a> {
     fn new(
         eval_context: &'a EvalContext,
         import_references: &'a [ResolvedVc<EsmAssetReference>],
         analysis: &'a mut AnalyzeEcmascriptModuleResultBuilder,
+        var_graph: &'a VarGraph,
     ) -> Self {
         Self {
             eval_context,
@@ -3217,6 +3223,7 @@ impl<'a> ModuleReferencesVisitor<'a> {
             webpack_runtime: None,
             webpack_entry: false,
             webpack_chunks: Vec::new(),
+            var_graph,
         }
     }
 }
@@ -3225,10 +3232,10 @@ fn as_parent_path(ast_path: &AstNodePath<AstParentNodeRef<'_>>) -> Vec<AstParent
     ast_path.iter().map(|n| n.kind()).collect()
 }
 
-fn for_each_ident_in_pat(pat: &Pat, f: &mut impl FnMut(RcStr)) {
+fn for_each_ident_in_pat(pat: &Pat, f: &mut impl FnMut(&Ident)) {
     match pat {
         Pat::Ident(BindingIdent { id, .. }) => {
-            f(id.sym.as_str().into());
+            f(id);
         }
         Pat::Array(ArrayPat { elems, .. }) => elems.iter().for_each(|e| {
             if let Some(e) = e {
@@ -3244,7 +3251,7 @@ fn for_each_ident_in_pat(pat: &Pat, f: &mut impl FnMut(RcStr)) {
                     for_each_ident_in_pat(value, f);
                 }
                 ObjectPatProp::Assign(AssignPatProp { key, .. }) => {
-                    f(key.sym.as_str().into());
+                    f(&key.id);
                 }
                 ObjectPatProp::Rest(RestPat { arg, .. }) => {
                     for_each_ident_in_pat(arg, f);
@@ -3283,6 +3290,7 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> {
             .map(find_turbopack_part_id_in_asserts)
             .is_some();
 
+        // This is for a statement like `export {a, b as c}` with no `from` clause.
         if export.src.is_none() {
             for spec in export.specifiers.iter() {
                 fn to_rcstr(name: &ModuleExportName) -> RcStr {
@@ -3361,30 +3369,27 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> {
     ) {
         {
             let decl: &Decl = &export.decl;
-            let insert_export_binding = &mut |name: RcStr, liveness: Liveness| {
+            let insert_export_binding = &mut |id: &Ident| {
+                let liveness = if self.is_export_ident_live(id) {
+                    Liveness::Live
+                } else {
+                    Liveness::Constant
+                };
+                let name: RcStr = id.sym.as_str().into();
                 self.esm_exports
                     .insert(name.clone(), EsmExport::LocalBinding(name, liveness));
             };
             match decl {
                 Decl::Class(ClassDecl { ident, .. }) | Decl::Fn(FnDecl { ident, .. }) => {
-                    // TODO: examine whether the value is ever mutated rather than just checking
-                    // 'const'
-                    insert_export_binding(ident.sym.as_str().into(), Liveness::Live);
+                    insert_export_binding(ident);
                 }
                 Decl::Var(var_decl) => {
-                    // TODO: examine whether the value is ever mutated rather than just checking
-                    // 'const'
-                    let liveness = match var_decl.kind {
-                        VarDeclKind::Var => Liveness::Live,
-                        VarDeclKind::Let => Liveness::Live,
-                        VarDeclKind::Const => Liveness::Constant,
-                    };
-                    let decls = &*var_decl.decls;
-                    decls.iter().for_each(|VarDeclarator { name, .. }| {
-                        for_each_ident_in_pat(name, &mut |name| {
-                            insert_export_binding(name, liveness)
-                        })
-                    });
+                    var_decl
+                        .decls
+                        .iter()
+                        .for_each(|VarDeclarator { name, .. }| {
+                            for_each_ident_in_pat(name, insert_export_binding);
+                        });
                 }
                 Decl::Using(_) => {
                     // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/export#:~:text=You%20cannot%20use%20export%20on%20a%20using%20or%20await%20using%20declaration
@@ -3428,17 +3433,22 @@ impl VisitAstPath for ModuleReferencesVisitor<'_> {
     ) {
         match &export.decl {
             DefaultDecl::Class(ClassExpr { ident, .. }) | DefaultDecl::Fn(FnExpr { ident, .. }) => {
-                self.esm_exports.insert(
-                    rcstr!("default"),
-                    EsmExport::LocalBinding(
-                        ident
-                            .as_ref()
-                            .map(|i| i.sym.as_str().into())
-                            .unwrap_or_else(|| magic_identifier::mangle("default export").into()),
-                        // Default export expressions cannot be mutated
+                let export = match ident {
+                    Some(ident) => EsmExport::LocalBinding(
+                        ident.sym.as_str().into(),
+                        if self.is_export_ident_live(ident) {
+                            Liveness::Live
+                        } else {
+                            Liveness::Constant
+                        },
+                    ),
+                    // If there is no name, like `export default function(){}` then it is not live.
+                    None => EsmExport::LocalBinding(
+                        magic_identifier::mangle("default export").into(),
                         Liveness::Constant,
                     ),
-                );
+                };
+                self.esm_exports.insert(rcstr!("default"), export);
             }
             DefaultDecl::TsInterfaceDecl(..) => {
                 // ignore

turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/issues/Error evaluating Node.js code-02628d.txt

@@ -0,0 +1,33 @@
+error - [transform] /turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/input/index.js  Error evaluating Node.js code
+  
+  Error: Cannot find module './side-effects/reexport-internal.js'
+      [at WORKSPACE_ROOT/turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/output/40cd4_turbopack_async-modules_async-reexport-side-effects-split_input_eae6bde3._.js:6:15]
+      [at {module evaluation} (WORKSPACE_ROOT/turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/output/40cd4_turbopack_async-modules_async-reexport-side-effects-split_input_eae6bde3._.js:9:3)]
+      at instantiateModule (turbopack:///[turbopack]/nodejs/runtime.ts:228:5) [WORKSPACE_ROOT/turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/output/[turbopack]_runtime.js:713:9]
+      at getOrInstantiateModuleFromParent (turbopack:///[turbopack]/nodejs/runtime.ts:261:10) [WORKSPACE_ROOT/turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/output/[turbopack]_runtime.js:736:12]
+      at Context.esmImport [as i] (turbopack:///[turbopack]/shared/runtime-utils.ts:347:18) [WORKSPACE_ROOT/turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/output/[turbopack]_runtime.js:228:20]
+      at <unknown> (turbopack/crates/turbopack-tests/js/jest-entry.ts:68:1) [WORKSPACE_ROOT/turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/output/[root-of-the-server]__4a7dfbc1._.js:85:16]
+      64 |     jestResult,
+      65 |     uncaughtExceptions,
+      66 |     unhandledRejections,
+      67 |   }
+         | v
+      68 + }
+         | ^
+      69 | 
+  
+      [at process.processTicksAndRejections (node:internal/process/task_queues:95:5)]
+      at async run (turbopack/crates/turbopack-tests/js/jest-entry.ts:40:3) [WORKSPACE_ROOT/turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/output/[root-of-the-server]__4a7dfbc1._.js:49:5]
+      36 | 
+      37 | export default async function run() {
+      38 |   setupGlobals()
+      39 | 
+         |   v
+      40 +   await import('TESTS')
+         |   ^
+      41 | 
+      42 |   let jestResult = await jest.run()
+      43 |   // Jest test results can contain references to arbitrary objects.
+      44 |   // Defensively remove circular references to avoid breaking our serialization protocol.
+  
+      at async run (turbopack:///[turbopack-node]/ipc/evaluate.ts:92:23) [WORKSPACE_ROOT/turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/output/[turbopack-node]__0ef06507._.js:407:31]

turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/issues/__l___Module not found____c__ Can't resolve __c_'.-151d5d.txt

@@ -0,0 +1,30 @@
+error - [resolve] /turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/input/side-effects/reexport-internal-test.js:1:0  Module not found: Can't resolve './reexport-internal.js'
+  
+         + v----------------------------------------------v
+       1 + import { a, b, c } from './reexport-internal.js'
+         + ^----------------------------------------------^
+       2 | 
+       3 | export default {
+       4 |   a,
+       5 |   b,
+  
+  all exported names should be analyzed
+  
+  Debug info:
+  - Execution of <ModuleAssetContext as AssetContext>::process_resolve_result failed
+  - Execution of apply_module_type failed
+  - Execution of *EcmascriptExports::split_locals_and_reexports failed
+  - Execution of <EcmascriptModuleAsset as EcmascriptChunkPlaceable>::get_exports failed
+  - Execution of analyse_ecmascript_module failed
+  - all exported names should be analyzed
+  
+  
+  | An error happened during resolving.
+  | Parsed request as written in source code: relative './reexport-internal.js'
+  | Path where resolving has started: [project]/turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/input/side-effects/reexport-internal-test.js
+  | Type of request: EcmaScript Modules (part) request
+  | 
+  Import trace:
+    test:
+      ./turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/input/side-effects/reexport-internal-test.js
+      ./turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/input/index.js

turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/issues/__l___Module not found____c__ Can't resolve __c_'.-1b17c5.txt

@@ -0,0 +1,30 @@
+error - [resolve] /turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/input/index.js:11:4  Module not found: Can't resolve './side-effect-free/reexport-internal.js'
+  
+       7 |     (await import('./side-effects/reexport-internal-test.js')).default,
+       8 |   'async module with side effects via require': () =>
+       9 |     require('./side-effects/reexport-internal.js'),
+      10 |   'async module flagged side-effect-free via dynamic import': () =>
+         +     v-----------------------------------------------v
+      11 +     import('./side-effect-free/reexport-internal.js'),
+         +     ^-----------------------------------------------^
+      12 |   'async module flagged side-effect-free via esm import': async () =>
+      13 |     (await import('./side-effect-free/reexport-internal-test.js')).default,
+      14 |   'async module flagged side-effect-free via require': () =>
+      15 |     require('./side-effect-free/reexport-internal.js'),
+  
+  all exported names should be analyzed
+  
+  Debug info:
+  - Execution of <ModuleAssetContext as AssetContext>::process_resolve_result failed
+  - Execution of apply_module_type failed
+  - Execution of *EcmascriptExports::split_locals_and_reexports failed
+  - Execution of <EcmascriptModuleAsset as EcmascriptChunkPlaceable>::get_exports failed
+  - Execution of analyse_ecmascript_module failed
+  - all exported names should be analyzed
+  
+  
+  | An error happened during resolving.
+  | Parsed request as written in source code: relative './side-effect-free/reexport-internal.js'
+  | Path where resolving has started: [project]/turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/input/index.js
+  | Type of request: EcmaScript Modules request
+  |

turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/issues/__l___Module not found____c__ Can't resolve __c_'.-2bbd70.txt

@@ -0,0 +1,30 @@
+error - [resolve] /turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/input/side-effects/reexport-external-test.js:1:0  Module not found: Can't resolve './reexport-external.js'
+  
+         + v----------------------------------------------v
+       1 + import { a, b, c } from './reexport-external.js'
+         + ^----------------------------------------------^
+       2 | 
+       3 | export default {
+       4 |   a,
+       5 |   b,
+  
+  all exported names should be analyzed
+  
+  Debug info:
+  - Execution of <ModuleAssetContext as AssetContext>::process_resolve_result failed
+  - Execution of apply_module_type failed
+  - Execution of *EcmascriptExports::split_locals_and_reexports failed
+  - Execution of <EcmascriptModuleAsset as EcmascriptChunkPlaceable>::get_exports failed
+  - Execution of analyse_ecmascript_module failed
+  - all exported names should be analyzed
+  
+  
+  | An error happened during resolving.
+  | Parsed request as written in source code: relative './reexport-external.js'
+  | Path where resolving has started: [project]/turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/input/side-effects/reexport-external-test.js
+  | Type of request: EcmaScript Modules (part) request
+  | 
+  Import trace:
+    test:
+      ./turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/input/side-effects/reexport-external-test.js
+      ./turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/input/index.js

turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/issues/__l___Module not found____c__ Can't resolve __c_'.-58368f.txt

@@ -0,0 +1,30 @@
+error - [resolve] /turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/input/index.js:15:4  Module not found: Can't resolve './side-effect-free/reexport-internal.js'
+  
+      11 |     import('./side-effect-free/reexport-internal.js'),
+      12 |   'async module flagged side-effect-free via esm import': async () =>
+      13 |     (await import('./side-effect-free/reexport-internal-test.js')).default,
+      14 |   'async module flagged side-effect-free via require': () =>
+         +     v------------------------------------------------v
+      15 +     require('./side-effect-free/reexport-internal.js'),
+         +     ^------------------------------------------------^
+      16 |   'module with externals with side effects via dynamic import': () =>
+      17 |     import('./side-effects/reexport-external.js'),
+      18 |   'module with externals with side effects via esm import': async () =>
+      19 |     (await import('./side-effects/reexport-external-test.js')).default,
+  
+  all exported names should be analyzed
+  
+  Debug info:
+  - Execution of <ModuleAssetContext as AssetContext>::process_resolve_result failed
+  - Execution of apply_module_type failed
+  - Execution of *EcmascriptExports::split_locals_and_reexports failed
+  - Execution of <EcmascriptModuleAsset as EcmascriptChunkPlaceable>::get_exports failed
+  - Execution of analyse_ecmascript_module failed
+  - all exported names should be analyzed
+  
+  
+  | An error happened during resolving.
+  | Parsed request as written in source code: relative './side-effect-free/reexport-internal.js'
+  | Path where resolving has started: [project]/turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/input/index.js
+  | Type of request: commonjs request
+  |

turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/issues/__l___Module not found____c__ Can't resolve __c_'.-90af44.txt

@@ -0,0 +1,30 @@
+error - [resolve] /turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/input/index.js:5:4  Module not found: Can't resolve './side-effects/reexport-internal.js'
+  
+       1 | import { a as a1, b as b1, c as c1 } from './side-effects/reexport-internal.js'
+       2 | 
+       3 | const cases = {
+       4 |   'async module with side effects via dynamic import': () =>
+         +     v-------------------------------------------v
+       5 +     import('./side-effects/reexport-internal.js'),
+         +     ^-------------------------------------------^
+       6 |   'async module with side effects via esm import': async () =>
+       7 |     (await import('./side-effects/reexport-internal-test.js')).default,
+       8 |   'async module with side effects via require': () =>
+       9 |     require('./side-effects/reexport-internal.js'),
+  
+  all exported names should be analyzed
+  
+  Debug info:
+  - Execution of <ModuleAssetContext as AssetContext>::process_resolve_result failed
+  - Execution of apply_module_type failed
+  - Execution of *EcmascriptExports::split_locals_and_reexports failed
+  - Execution of <EcmascriptModuleAsset as EcmascriptChunkPlaceable>::get_exports failed
+  - Execution of analyse_ecmascript_module failed
+  - all exported names should be analyzed
+  
+  
+  | An error happened during resolving.
+  | Parsed request as written in source code: relative './side-effects/reexport-internal.js'
+  | Path where resolving has started: [project]/turbopack/crates/turbopack-tests/tests/execution/turbopack/async-modules/async-reexport-side-effects-split/input/index.js
+  | Type of request: EcmaScript Modules request
+  |