refactor: nested exports info data of getters part 2

Author: LingyuCoder

crates/rspack_core/src/concatenated_module.rs

@@ -2194,10 +2194,7 @@ impl ConcatenatedModule {
     let exports_info = mg.get_prefetched_exports_info(&info.id(), Some(&export_name));
     // webpack use `get_exports_info` here, https://github.com/webpack/webpack/blob/ac7e531436b0d47cd88451f497cdfd0dad41535d/lib/optimize/ConcatenatedModule.js#L377-L377
     // But in our arch, there is no way to modify module graph during code_generation phase, so we use `get_export_info_without_mut_module_graph` instead.`
-    let export_info = exports_info
-      .data()
-      .id
-      .get_export_info_without_mut_module_graph(mg, &export_name[0]);
+    let export_info = exports_info.get_export_info_without_mut_module_graph(&export_name[0]);
     let export_info_hash_key = export_info.as_hash_key();
 
     if already_visited.contains(&export_info_hash_key) {
@@ -2216,7 +2213,7 @@ impl ConcatenatedModule {
       ModuleInfo::Concatenated(info) => {
         let export_id = export_name.first().cloned();
         if matches!(
-          export_info.provided(mg),
+          export_info.provided(),
           Some(crate::ExportProvided::NotProvided)
         ) {
           needed_namespace_objects.insert(info.module);

crates/rspack_core/src/exports/export_info.rs

@@ -235,9 +235,8 @@ impl ExportInfoData {
       if valid_target_module_filter(&target.module) {
         return FindTargetRetEnum::Value(target);
       }
-      let exports_info = mg.get_exports_info(&target.module);
+      let exports_info = mg.get_prefetched_exports_info(&target.module, None);
       let export_info = exports_info.get_export_info_without_mut_module_graph(
-        mg,
         &target.export.as_ref().expect("should have export")[0],
       );
       let export_info_hash_key = export_info.as_hash_key();
@@ -373,11 +372,11 @@ impl ExportInfoData {
 // and the Static variant represents the most situation which FlagDependencyExportsPlugin can
 // analyze the exports statically.
 #[derive(Debug)]
-pub enum MaybeDynamicTargetExportInfo {
-  Static(ExportInfo),
+pub enum MaybeDynamicTargetExportInfo<'a> {
+  Static(&'a ExportInfoData),
   Dynamic {
     export_name: Atom,
-    other_export_info: ExportInfo,
+    other_export_info: &'a ExportInfoData,
     data: ExportInfoData,
   },
 }
@@ -391,28 +390,26 @@ pub enum MaybeDynamicTargetExportInfoHashKey {
   },
 }
 
-impl MaybeDynamicTargetExportInfo {
+impl<'a> MaybeDynamicTargetExportInfo<'a> {
   pub fn as_hash_key(&self) -> MaybeDynamicTargetExportInfoHashKey {
     match self {
       MaybeDynamicTargetExportInfo::Static(export_info) => {
-        MaybeDynamicTargetExportInfoHashKey::ExportInfo(*export_info)
+        MaybeDynamicTargetExportInfoHashKey::ExportInfo(export_info.id())
       }
       MaybeDynamicTargetExportInfo::Dynamic {
         export_name,
         other_export_info,
         ..
       } => MaybeDynamicTargetExportInfoHashKey::TemporaryData {
         export_name: export_name.clone(),
-        other_export_info: *other_export_info,
+        other_export_info: other_export_info.id(),
       },
     }
   }
 
-  pub fn provided<'a>(&'a self, mg: &'a ModuleGraph) -> Option<&'a ExportProvided> {
+  pub fn provided(&'a self) -> Option<&'a ExportProvided> {
     match self {
-      MaybeDynamicTargetExportInfo::Static(export_info) => {
-        ExportInfoGetter::provided(export_info.as_data(mg))
-      }
+      MaybeDynamicTargetExportInfo::Static(export_info) => ExportInfoGetter::provided(export_info),
       MaybeDynamicTargetExportInfo::Dynamic { data, .. } => data.provided.as_ref(),
     }
   }
@@ -433,8 +430,7 @@ impl MaybeDynamicTargetExportInfo {
   ) -> FindTargetRetEnum {
     match self {
       MaybeDynamicTargetExportInfo::Static(export_info) => {
-        let data = export_info.as_data(mg);
-        data.find_target_impl(mg, valid_target_module_filter, visited)
+        export_info.find_target_impl(mg, valid_target_module_filter, visited)
       }
       MaybeDynamicTargetExportInfo::Dynamic { data, .. } => {
         data.find_target_impl(mg, valid_target_module_filter, visited)
@@ -462,8 +458,7 @@ impl MaybeDynamicTargetExportInfo {
   ) -> Option<ResolvedExportInfoTargetWithCircular> {
     match self {
       MaybeDynamicTargetExportInfo::Static(export_info) => {
-        let export_info_data = export_info.as_data(mg);
-        export_info_data.get_target_proxy(mg, resolve_filter, already_visited)
+        export_info.get_target_proxy(mg, resolve_filter, already_visited)
       }
       MaybeDynamicTargetExportInfo::Dynamic { data, .. } => {
         if !data.target_is_set || data.target.is_empty() {
@@ -479,14 +474,10 @@ impl MaybeDynamicTargetExportInfo {
     }
   }
 
-  fn get_max_target<'a>(
-    &'a self,
-    mg: &'a ModuleGraph,
-  ) -> Cow<'a, HashMap<Option<DependencyId>, ExportInfoTargetValue>> {
+  fn get_max_target(&self) -> Cow<HashMap<Option<DependencyId>, ExportInfoTargetValue>> {
     match self {
       MaybeDynamicTargetExportInfo::Static(export_info) => {
-        let data = export_info.as_data(mg);
-        ExportInfoGetter::get_max_target(data)
+        ExportInfoGetter::get_max_target(export_info)
       }
       MaybeDynamicTargetExportInfo::Dynamic { data, .. } => ExportInfoGetter::get_max_target(data),
     }
@@ -498,11 +489,11 @@ impl MaybeDynamicTargetExportInfo {
     resolve_filter: ResolveFilterFnTy,
   ) -> Option<ResolvedExportInfoTarget> {
     let data = match self {
-      MaybeDynamicTargetExportInfo::Static(export_info) => export_info.as_data(mg),
+      MaybeDynamicTargetExportInfo::Static(export_info) => *export_info,
       MaybeDynamicTargetExportInfo::Dynamic { data, .. } => data,
     };
     let target = data.get_target_with_filter(mg, resolve_filter)?;
-    let max_target = self.get_max_target(mg);
+    let max_target = self.get_max_target();
     let original_target = max_target
       .values()
       .next()
@@ -568,8 +559,8 @@ fn resolve_target(
         return Some(ResolvedExportInfoTargetWithCircular::Target(target));
       };
 
-      let exports_info = mg.get_exports_info(&target.module);
-      let export_info = exports_info.get_export_info_without_mut_module_graph(mg, name);
+      let exports_info = mg.get_prefetched_exports_info(&target.module, None);
+      let export_info = exports_info.get_export_info_without_mut_module_graph(name);
       let export_info_hash_key = export_info.as_hash_key();
       if already_visited.contains(&export_info_hash_key) {
         return Some(ResolvedExportInfoTargetWithCircular::Circular);

crates/rspack_core/src/exports/exports_info.rs

@@ -7,8 +7,8 @@ use rspack_util::atom::Atom;
 use serde::Serialize;
 
 use super::{
-  ExportInfo, ExportInfoData, ExportInfoGetter, ExportInfoSetter, ExportProvided,
-  MaybeDynamicTargetExportInfo, UsageKey, UsageState, NEXT_EXPORTS_INFO_UKEY,
+  ExportInfo, ExportInfoData, ExportInfoGetter, ExportInfoSetter, ExportProvided, UsageKey,
+  UsageState, NEXT_EXPORTS_INFO_UKEY,
 };
 use crate::{Compilation, DependencyId, ModuleGraph, Nullable, RuntimeSpec};
 
@@ -241,34 +241,6 @@ impl ExportsInfo {
     new_info_id
   }
 
-  // An alternative version of `get_export_info`, and don't need `&mut ModuleGraph`.
-  // You can use this when you can't or don't want to use `&mut ModuleGraph`.
-  // Currently this function is used to finding a reexport's target.
-  pub fn get_export_info_without_mut_module_graph(
-    &self,
-    mg: &ModuleGraph,
-    name: &Atom,
-  ) -> MaybeDynamicTargetExportInfo {
-    let exports_info = self.as_exports_info(mg);
-    let redirect_id = exports_info.redirect_to;
-    let other_exports_info_id = exports_info.other_exports_info;
-    let export_info_id = exports_info.exports.get(name);
-    if let Some(export_info_id) = export_info_id {
-      return MaybeDynamicTargetExportInfo::Static(*export_info_id);
-    }
-    if let Some(redirect_id) = redirect_id {
-      return redirect_id.get_export_info_without_mut_module_graph(mg, name);
-    }
-
-    let other_export_info = mg.get_export_info_by_id(&other_exports_info_id);
-    let data = ExportInfoData::new(Some(name.clone()), Some(other_export_info));
-    MaybeDynamicTargetExportInfo::Dynamic {
-      export_name: name.clone(),
-      other_export_info: other_exports_info_id,
-      data,
-    }
-  }
-
   pub fn set_has_use_info(&self, mg: &mut ModuleGraph) {
     let exports_info = self.as_exports_info(mg);
     let side_effects_only_info_id = exports_info.side_effects_only_info;

crates/rspack_core/src/exports/exports_info_getter.rs

@@ -7,7 +7,7 @@ use super::{
   ExportInfoData, ExportInfoGetter, ExportProvided, ExportsInfo, ProvidedExports, UsageState,
   UsedName,
 };
-use crate::{ModuleGraph, RuntimeSpec, UsedExports};
+use crate::{MaybeDynamicTargetExportInfo, ModuleGraph, RuntimeSpec, UsedExports};
 
 /**
  * Used to store data pre-fetched from Module Graph
@@ -291,6 +291,39 @@ impl<'a> PrefetchedExportsInfoWrapper<'a> {
     }
     ProvidedExports::ProvidedNames(ret)
   }
+
+  // An alternative version of `get_export_info`, and don't need `&mut ModuleGraph`.
+  // You can use this when you can't or don't want to use `&mut ModuleGraph`.
+  // Currently this function is used to finding a reexport's target.
+  pub fn get_export_info_without_mut_module_graph(
+    &self,
+    name: &Atom,
+  ) -> MaybeDynamicTargetExportInfo {
+    self.get_export_info_without_mut_module_graph_impl(&self.entry, name)
+  }
+
+  fn get_export_info_without_mut_module_graph_impl(
+    &self,
+    exports_info: &ExportsInfo,
+    name: &Atom,
+  ) -> MaybeDynamicTargetExportInfo {
+    let data = self
+      .exports
+      .get(exports_info)
+      .expect("should have nested exports info");
+    if let Some(export_info) = data.exports.get(name) {
+      return MaybeDynamicTargetExportInfo::Static(export_info.inner);
+    }
+    if let Some(redirect) = &data.redirect_to {
+      return self.get_export_info_without_mut_module_graph_impl(redirect, name);
+    }
+
+    MaybeDynamicTargetExportInfo::Dynamic {
+      export_name: name.clone(),
+      other_export_info: data.other_exports_info.inner,
+      data: ExportInfoData::new(Some(name.clone()), Some(data.other_exports_info.inner)),
+    }
+  }
 }
 
 #[derive(Debug, Clone)]

crates/rspack_core/src/module_graph/mod.rs

@@ -1067,13 +1067,9 @@ impl<'a> ModuleGraph<'a> {
     active_partial.exports_info_map.insert(id, info);
   }
 
-  pub fn try_get_export_info_by_id(&self, id: &ExportInfo) -> Option<&ExportInfoData> {
-    self.loop_partials(|p| p.export_info_map.get(id))
-  }
-
   pub fn get_export_info_by_id(&self, id: &ExportInfo) -> &ExportInfoData {
     self
-      .try_get_export_info_by_id(id)
+      .loop_partials(|p| p.export_info_map.get(id))
       .expect("should have export info")
   }
 

crates/rspack_plugin_javascript/src/plugin/side_effects_flag_plugin.rs

@@ -851,8 +851,8 @@ fn can_optimize_connection(
   if let Some(dep) = dep.downcast_ref::<ESMExportImportedSpecifierDependency>()
     && let Some(name) = &dep.name
   {
-    let exports_info = module_graph.get_exports_info(&original_module);
-    let export_info = exports_info.get_export_info_without_mut_module_graph(module_graph, name);
+    let exports_info = module_graph.get_prefetched_exports_info(&original_module, None);
+    let export_info = exports_info.get_export_info_without_mut_module_graph(name);
 
     let target = export_info.can_move_target(
       module_graph,
@@ -876,7 +876,7 @@ fn can_optimize_connection(
       .unwrap_or_else(|| ids.get(1..).unwrap_or_default().to_vec());
     let need_move_target = match export_info {
       MaybeDynamicTargetExportInfo::Static(export_info) => Some(SideEffectsDoOptimizeMoveTarget {
-        export_info,
+        export_info: export_info.id(),
         target_export: target.export,
       }),
       MaybeDynamicTargetExportInfo::Dynamic { .. } => None,
@@ -894,8 +894,9 @@ fn can_optimize_connection(
     && let ids = dep.get_ids(module_graph)
     && !ids.is_empty()
   {
-    let exports_info = module_graph.get_exports_info(connection.module_identifier());
-    let export_info = exports_info.get_export_info_without_mut_module_graph(module_graph, &ids[0]);
+    let exports_info =
+      module_graph.get_prefetched_exports_info(connection.module_identifier(), None);
+    let export_info = exports_info.get_export_info_without_mut_module_graph(&ids[0]);
 
     let target = export_info.get_target_with_filter(
       module_graph,