Change ModuleGraph API to iterator

Author: hardfist

crates/rspack_binding_api/src/compilation/mod.rs

@@ -187,12 +187,12 @@ impl JsCompilation {
     let compilation = self.as_ref()?;
     let module_graph = compilation.get_module_graph();
     let modules = module_graph.modules();
-    let mut arr = env.create_array(modules.len() as u32)?;
-    for (i, identifier) in modules.keys().enumerate() {
+    let mut arr = env.create_array(module_graph.module_count() as u32)?;
+    for (i, (identifier, _)) in modules.enumerate() {
       arr.set(
         i as u32,
         compilation
-          .module_by_identifier(identifier)
+          .module_by_identifier(&identifier)
           .map(|module| ModuleObject::with_ref(module.as_ref(), compilation.compiler_id())),
       )?;
     }

crates/rspack_core/src/cache/persistent/occasion/make/module_graph.rs

@@ -200,6 +200,6 @@ pub async fn recovery_module_graph(
     mg.cache_recovery_connection(connection);
   }
 
-  tracing::debug!("recovery {} module", mg.modules().len());
+  tracing::debug!("recovery {} module", mg.module_count());
   Ok((mg, module_to_lazy_make, entry_dependencies))
 }

crates/rspack_core/src/compilation/build_chunk_graph/incremental.rs

@@ -504,9 +504,9 @@ impl CodeSplitter {
     // Thanks!
     let module_graph = compilation.get_module_graph();
     let ordinal_by_module = &mut self.ordinal_by_module;
-    for m in module_graph.modules().keys() {
-      if !ordinal_by_module.contains_key(m) {
-        ordinal_by_module.insert(*m, ordinal_by_module.len() as u64 + 1);
+    for (m, _) in module_graph.modules() {
+      if !ordinal_by_module.contains_key(&m) {
+        ordinal_by_module.insert(m, ordinal_by_module.len() as u64 + 1);
       }
     }
     for chunk in compilation.build_chunk_graph_artifact.chunk_by_ukey.keys() {
@@ -551,8 +551,7 @@ impl CodeSplitter {
         compilation
           .get_module_graph()
           .modules()
-          .keys()
-          .copied()
+          .map(|(module_identifier, _)| module_identifier)
           .collect(),
         Default::default(),
       )

crates/rspack_core/src/compilation/build_chunk_graph/mod.rs

@@ -25,8 +25,7 @@ pub fn build_chunk_graph(compilation: &mut Compilation) -> rspack_error::Result<
   let all_modules = compilation
     .get_module_graph()
     .modules()
-    .keys()
-    .copied()
+    .map(|(module_identifier, _)| module_identifier)
     .collect::<Vec<_>>();
 
   splitter.prepare(&all_modules, compilation)?;

crates/rspack_core/src/compilation/build_module_graph/graph_updater/cutout/mod.rs

@@ -50,7 +50,7 @@ impl Cutout {
           clean_entry_dependencies = true;
         }
         UpdateParam::CheckNeedBuild => {
-          force_build_modules.extend(module_graph.modules().values().filter_map(|module| {
+          force_build_modules.extend(module_graph.modules().filter_map(|(_, module)| {
             if module.need_build(&compilation.value_cache_versions) {
               Some(module.identifier())
             } else {

crates/rspack_core/src/compilation/code_generation/mod.rs

@@ -55,16 +55,15 @@ async fn code_generation_pass_impl(compilation: &mut Compilation) -> Result<()>
     logger.log(format!(
       "{} modules are affected, {} in total",
       modules.len(),
-      compilation.get_module_graph().modules().len()
+      compilation.get_module_graph().module_count()
     ));
     modules
   } else {
     *compilation.code_generation_results = Default::default();
     compilation
       .get_module_graph()
       .modules()
-      .keys()
-      .copied()
+      .map(|(module_identifier, _)| module_identifier)
       .collect()
   };
   compilation.code_generation(code_generation_modules).await?;

crates/rspack_core/src/compilation/create_module_hashes/mod.rs

@@ -49,17 +49,17 @@ async fn create_module_hashes_pass_impl(compilation: &mut Compilation) -> Result
 
     // check if module runtime changes
     let mg = compilation.get_module_graph();
-    for mi in mg.modules().keys() {
+    for (mi, _) in mg.modules() {
       let module_runtimes = compilation
         .build_chunk_graph_artifact
         .chunk_graph
-        .get_module_runtimes(*mi, &compilation.build_chunk_graph_artifact.chunk_by_ukey);
+        .get_module_runtimes(mi, &compilation.build_chunk_graph_artifact.chunk_by_ukey);
       let module_runtime_keys = module_runtimes
         .values()
         .map(get_runtime_key)
         .collect::<HashSet<_>>();
 
-      if let Some(runtime_map) = compilation.cgm_hash_artifact.get_runtime_map(mi) {
+      if let Some(runtime_map) = compilation.cgm_hash_artifact.get_runtime_map(&mi) {
         if module_runtimes.is_empty() {
           // module has no runtime, skip
           continue;
@@ -76,23 +76,23 @@ async fn create_module_hashes_pass_impl(compilation: &mut Compilation) -> Result
                 .next()
                 .expect("should have at least one runtime")
           {
-            modules.insert(*mi);
+            modules.insert(mi);
           }
         } else {
           // multiple runtimes
           if matches!(runtime_map.mode, RuntimeMode::SingleEntry) {
-            modules.insert(*mi);
+            modules.insert(mi);
             continue;
           }
 
           if runtime_map.map.len() != module_runtimes.len() {
-            modules.insert(*mi);
+            modules.insert(mi);
             continue;
           }
 
           for runtime_key in runtime_map.map.keys() {
             if !module_runtime_keys.contains(runtime_key) {
-              modules.insert(*mi);
+              modules.insert(mi);
               break;
             }
           }
@@ -105,16 +105,15 @@ async fn create_module_hashes_pass_impl(compilation: &mut Compilation) -> Result
     logger.log(format!(
       "{} modules are affected, {} in total",
       modules.len(),
-      mg.modules().len()
+      mg.module_count()
     ));
 
     modules
   } else {
     compilation
       .get_module_graph()
       .modules()
-      .keys()
-      .copied()
+      .map(|(module_identifier, _)| module_identifier)
       .collect()
   };
   compilation

crates/rspack_core/src/compilation/finish_modules/mod.rs

@@ -120,18 +120,26 @@ impl Compilation {
           logger.log(format!(
             "{} modules are affected, {} in total",
             modules.len(),
-            self.get_module_graph().modules().len()
+            self.get_module_graph().module_count()
           ));
           (modules, true)
         } else {
           (
-            self.get_module_graph().modules().keys().copied().collect(),
+            self
+              .get_module_graph()
+              .modules()
+              .map(|(module_identifier, _)| module_identifier)
+              .collect(),
             true,
           )
         }
       } else {
         (
-          self.get_module_graph().modules().keys().copied().collect(),
+          self
+            .get_module_graph()
+            .modules()
+            .map(|(module_identifier, _)| module_identifier)
+            .collect(),
           false,
         )
       }

crates/rspack_core/src/compilation/module_ids/mod.rs

@@ -16,7 +16,7 @@ fn get_modules_needing_ids(
   compilation
     .get_module_graph()
     .modules()
-    .values()
+    .map(|(_, module)| module)
     .filter(|m| {
       m.need_id()
         && ChunkGraph::get_module_id(module_ids_artifact, m.identifier()).is_none()

crates/rspack_core/src/compilation/runtime_requirements/mod.rs

@@ -53,7 +53,7 @@ async fn runtime_requirements_pass_impl(compilation: &mut Compilation) -> Result
     logger.log(format!(
       "{} modules are affected, {} in total",
       modules.len(),
-      compilation.get_module_graph().modules().len()
+      compilation.get_module_graph().module_count()
     ));
     modules
   } else {
@@ -62,8 +62,7 @@ async fn runtime_requirements_pass_impl(compilation: &mut Compilation) -> Result
     compilation
       .get_module_graph()
       .modules()
-      .keys()
-      .copied()
+      .map(|(module_identifier, _)| module_identifier)
       .collect()
   };
   compilation