refactor: recalculate all chunk ids with cache (#12374)

Author: JSerFeng

crates/rspack_binding_api/src/chunk.rs

@@ -45,7 +45,7 @@ impl Chunk {
   #[napi(getter)]
   pub fn id(&self) -> napi::Result<Either<&str, ()>> {
     let (compilation, chunk) = self.as_ref()?;
-    Ok(match chunk.id(&compilation.chunk_ids_artifact) {
+    Ok(match chunk.id() {
       Some(id) => Either::A(id.as_str()),
       None => Either::B(()),
     })
@@ -54,12 +54,7 @@ impl Chunk {
   #[napi(getter)]
   pub fn ids(&self) -> napi::Result<Vec<&str>> {
     let (compilation, chunk) = self.as_ref()?;
-    Ok(
-      chunk
-        .id(&compilation.chunk_ids_artifact)
-        .map(|id| vec![id.as_str()])
-        .unwrap_or_default(),
-    )
+    Ok(chunk.id().map(|id| vec![id.as_str()]).unwrap_or_default())
   }
 
   #[napi(getter)]

crates/rspack_core/src/artifacts/chunk_ids_artifact.rs

@@ -0,0 +1,33 @@
+use rspack_collections::UkeyMap;
+
+use crate::{ChunkUkey, chunk_graph_chunk::ChunkId};
+
+#[derive(Debug, Default)]
+pub struct ChunkNamedIdArtifact {
+  pub chunk_short_names: UkeyMap<ChunkUkey, String>,
+  pub chunk_long_names: UkeyMap<ChunkUkey, String>,
+  pub chunk_ids: UkeyMap<ChunkUkey, ChunkId>,
+}
+
+impl ChunkNamedIdArtifact {
+  pub fn clear(&mut self) {
+    self.chunk_short_names.clear();
+    self.chunk_long_names.clear();
+    self.chunk_ids.clear();
+  }
+
+  pub fn retain<F>(&mut self, mut f: F)
+  where
+    F: FnMut(&ChunkUkey) -> bool,
+  {
+    self.chunk_short_names.retain(|chunk, _| f(chunk));
+    self.chunk_long_names.retain(|chunk, _| f(chunk));
+    self.chunk_ids.retain(|chunk, _| f(chunk));
+  }
+
+  pub fn remove(&mut self, chunk: &ChunkUkey) {
+    self.chunk_short_names.remove(chunk);
+    self.chunk_long_names.remove(chunk);
+    self.chunk_ids.remove(chunk);
+  }
+}

crates/rspack_core/src/artifacts/mod.rs

@@ -1,11 +1,12 @@
 use rspack_collections::{IdentifierMap, IdentifierSet, UkeyMap};
 use rspack_error::Diagnostic;
 
-use crate::{ChunkRenderResult, ChunkUkey, ModuleId, RuntimeGlobals, chunk_graph_chunk::ChunkId};
+use crate::{ChunkRenderResult, ChunkUkey, ModuleId, RuntimeGlobals};
 
 mod cgm_hash_artifact;
 mod cgm_runtime_requirement_artifact;
 mod chunk_hashes_artifact;
+mod chunk_ids_artifact;
 mod chunk_render_cache_artifact;
 mod code_generation_results;
 mod module_graph_cache_artifact;
@@ -15,6 +16,7 @@ mod side_effects_do_optimize_artifact;
 pub use cgm_hash_artifact::*;
 pub use cgm_runtime_requirement_artifact::*;
 pub use chunk_hashes_artifact::*;
+pub use chunk_ids_artifact::*;
 pub use chunk_render_cache_artifact::ChunkRenderCacheArtifact;
 pub use code_generation_results::*;
 pub use module_graph_cache_artifact::*;
@@ -25,6 +27,5 @@ pub type AsyncModulesArtifact = IdentifierSet;
 pub type ImportedByDeferModulesArtifact = IdentifierSet;
 pub type DependenciesDiagnosticsArtifact = IdentifierMap<Vec<Diagnostic>>;
 pub type ModuleIdsArtifact = IdentifierMap<ModuleId>;
-pub type ChunkIdsArtifact = UkeyMap<ChunkUkey, ChunkId>;
 pub type CgcRuntimeRequirementsArtifact = UkeyMap<ChunkUkey, RuntimeGlobals>;
 pub type ChunkRenderArtifact = UkeyMap<ChunkUkey, ChunkRenderResult>;

crates/rspack_core/src/chunk.rs

@@ -13,10 +13,9 @@ use rspack_hash::{RspackHash, RspackHashDigest};
 use rustc_hash::{FxHashMap as HashMap, FxHashSet as HashSet, FxHasher};
 
 use crate::{
-  ChunkGraph, ChunkGroupByUkey, ChunkGroupOrderKey, ChunkGroupUkey, ChunkHashesArtifact,
-  ChunkIdsArtifact, ChunkUkey, Compilation, EntryOptions, Filename, ModuleGraph,
-  RenderManifestEntry, RuntimeSpec, SourceType, chunk_graph_chunk::ChunkId, compare_chunk_group,
-  sort_group_by_index,
+  ChunkGraph, ChunkGroupByUkey, ChunkGroupOrderKey, ChunkGroupUkey, ChunkHashesArtifact, ChunkUkey,
+  Compilation, EntryOptions, Filename, ModuleGraph, RenderManifestEntry, RuntimeSpec, SourceType,
+  chunk_graph_chunk::ChunkId, compare_chunk_group, sort_group_by_index,
 };
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -57,6 +56,7 @@ pub struct ChunkRenderResult {
 pub struct Chunk {
   ukey: ChunkUkey,
   kind: ChunkKind,
+  id: Option<ChunkId>,
   // - If the chunk is create by entry config, the name is the entry name
   // - The name of chunks create by dynamic import is `None` unless users use
   // magic comment like `import(/* webpackChunkName: "someChunk" * / './someModule.js')` to specify it.
@@ -110,19 +110,24 @@ impl Chunk {
     self.css_filename_template = filename_template;
   }
 
-  pub fn id<'a>(&self, chunk_ids: &'a ChunkIdsArtifact) -> Option<&'a ChunkId> {
-    ChunkGraph::get_chunk_id(chunk_ids, &self.ukey)
+  pub fn id(&self) -> Option<&ChunkId> {
+    self.id.as_ref()
   }
 
-  pub fn expect_id<'a>(&self, chunk_ids: &'a ChunkIdsArtifact) -> &'a ChunkId {
-    self
-      .id(chunk_ids)
-      .expect("Should set id before calling expect_id")
+  pub fn expect_id(&self) -> &ChunkId {
+    self.id().expect("Should set id before calling expect_id")
   }
 
-  pub fn set_id(&self, chunk_ids: &mut ChunkIdsArtifact, id: impl Into<ChunkId>) -> bool {
-    let id = id.into();
-    ChunkGraph::set_chunk_id(chunk_ids, self.ukey, id)
+  pub fn set_id(&mut self, id: impl Into<ChunkId>) -> bool {
+    let id: ChunkId = id.into();
+    if let Some(prev_id) = &self.id
+      && prev_id == &id
+    {
+      return false;
+    }
+
+    self.id = Some(id);
+    true
   }
 
   pub fn prevent_integration(&self) -> bool {
@@ -280,6 +285,7 @@ impl Chunk {
       filename_template: None,
       css_filename_template: None,
       ukey: ChunkUkey::new(),
+      id: None,
       id_name_hints: Default::default(),
       prevent_integration: false,
       files: Default::default(),
@@ -667,14 +673,11 @@ impl Chunk {
     chunks
   }
 
-  pub fn name_for_filename_template<'a>(
-    &'a self,
-    chunk_ids: &'a ChunkIdsArtifact,
-  ) -> Option<&'a str> {
+  pub fn name_for_filename_template(&self) -> Option<&str> {
     if self.name.is_some() {
       self.name.as_deref()
     } else {
-      self.id(chunk_ids).map(|id| id.as_str())
+      self.id().map(|id| id.as_str())
     }
   }
 
@@ -687,7 +690,7 @@ impl Chunk {
   }
 
   pub fn update_hash(&self, hasher: &mut RspackHash, compilation: &Compilation) {
-    self.id(&compilation.chunk_ids_artifact).hash(hasher);
+    self.id().hash(hasher);
     let runtime_modules = compilation
       .chunk_graph
       .get_chunk_runtime_modules_iterable(&self.ukey)
@@ -853,7 +856,7 @@ impl Chunk {
           && let Some(chunk_id) = compilation
             .chunk_by_ukey
             .expect_get(chunk_ukey)
-            .id(&compilation.chunk_ids_artifact)
+            .id()
             .cloned()
         {
           chunk_ids.push(chunk_id);
@@ -883,7 +886,7 @@ impl Chunk {
     ) -> Option<(ChunkId, Vec<ChunkId>)> {
       let chunk = compilation.chunk_by_ukey.expect_get(chunk_ukey);
       if let (Some(chunk_id), Some(child_chunk_ids)) = (
-        chunk.id(&compilation.chunk_ids_artifact).cloned(),
+        chunk.id().cloned(),
         chunk.get_child_ids_by_order(order, compilation, filter_fn),
       ) {
         return Some((chunk_id, child_chunk_ids));

crates/rspack_core/src/chunk_graph/chunk_graph_chunk.rs

@@ -12,8 +12,8 @@ use serde::{Serialize, Serializer};
 
 use crate::{
   BoxModule, Chunk, ChunkByUkey, ChunkGraph, ChunkGraphModule, ChunkGroupByUkey, ChunkGroupUkey,
-  ChunkIdsArtifact, ChunkUkey, Compilation, Module, ModuleGraph, ModuleGraphCacheArtifact,
-  ModuleIdentifier, RuntimeGlobals, RuntimeModule, SourceType, find_graph_roots, merge_runtime,
+  ChunkUkey, Compilation, Module, ModuleGraph, ModuleGraphCacheArtifact, ModuleIdentifier,
+  RuntimeGlobals, RuntimeModule, SourceType, find_graph_roots, merge_runtime,
 };
 
 #[derive(Debug, Clone, Default)]
@@ -719,10 +719,7 @@ impl ChunkGraph {
       .iter()
     {
       let chunk = compilation.chunk_by_ukey.expect_get(c);
-      map.insert(
-        chunk.expect_id(&compilation.chunk_ids_artifact).to_string(),
-        filter(c, compilation),
-      );
+      map.insert(chunk.expect_id().to_string(), filter(c, compilation));
     }
 
     map
@@ -1154,23 +1151,4 @@ impl ChunkGraph {
       })
       .unwrap_or(module.source_types(module_graph).iter().copied().collect())
   }
-
-  pub fn get_chunk_id<'a>(
-    chunk_ids: &'a ChunkIdsArtifact,
-    chunk_ukey: &ChunkUkey,
-  ) -> Option<&'a ChunkId> {
-    chunk_ids.get(chunk_ukey)
-  }
-
-  pub fn set_chunk_id(
-    chunk_ids: &mut ChunkIdsArtifact,
-    chunk_ukey: ChunkUkey,
-    id: ChunkId,
-  ) -> bool {
-    if let Some(old_id) = chunk_ids.insert(chunk_ukey, id.clone()) {
-      old_id != id
-    } else {
-      true
-    }
-  }
 }

crates/rspack_core/src/chunk_group.rs

@@ -285,7 +285,7 @@ impl ChunkGroup {
         compilation
           .chunk_by_ukey
           .get(chunk)
-          .and_then(|item| item.id(&compilation.chunk_ids_artifact))
+          .and_then(|item| item.id())
       })
       .join("+")
   }

crates/rspack_core/src/compilation/build_module_graph/module_executor/execute.rs

@@ -224,7 +224,8 @@ impl Task<ExecutorTaskContext> for ExecuteTask {
     let mut chunk = Chunk::new(Some("build time chunk".into()), ChunkKind::Normal);
 
     if let Some(name) = chunk.name() {
-      chunk.set_id(&mut compilation.chunk_ids_artifact, name);
+      let name = name.to_string();
+      chunk.set_id(name);
     }
     let runtime: RuntimeSpec = once("build time".into()).collect();
 

crates/rspack_core/src/compilation/mod.rs

@@ -44,17 +44,17 @@ use crate::{
   AsyncModulesArtifact, BindingCell, BoxDependency, BoxModule, CacheCount, CacheOptions,
   CgcRuntimeRequirementsArtifact, CgmHashArtifact, CgmRuntimeRequirementsArtifact, Chunk,
   ChunkByUkey, ChunkContentHash, ChunkGraph, ChunkGroupByUkey, ChunkGroupUkey, ChunkHashesArtifact,
-  ChunkIdsArtifact, ChunkKind, ChunkRenderArtifact, ChunkRenderCacheArtifact, ChunkRenderResult,
-  ChunkUkey, CodeGenerationJob, CodeGenerationResult, CodeGenerationResults, CompilationLogger,
-  CompilationLogging, CompilerOptions, ConcatenationScope, DependenciesDiagnosticsArtifact,
-  DependencyCodeGeneration, DependencyTemplate, DependencyTemplateType, DependencyType,
-  DerefOption, Entry, EntryData, EntryOptions, EntryRuntime, Entrypoint, ExecuteModuleId, Filename,
-  ImportPhase, ImportVarMap, ImportedByDeferModulesArtifact, Logger, MemoryGCStorage,
-  ModuleFactory, ModuleGraph, ModuleGraphCacheArtifact, ModuleGraphMut, ModuleGraphPartial,
-  ModuleGraphRef, ModuleIdentifier, ModuleIdsArtifact, ModuleStaticCacheArtifact, PathData,
-  ResolverFactory, RuntimeGlobals, RuntimeKeyMap, RuntimeMode, RuntimeModule, RuntimeSpec,
-  RuntimeSpecMap, RuntimeTemplate, SharedPluginDriver, SideEffectsOptimizeArtifact, SourceType,
-  Stats, ValueCacheVersions,
+  ChunkKind, ChunkNamedIdArtifact, ChunkRenderArtifact, ChunkRenderCacheArtifact,
+  ChunkRenderResult, ChunkUkey, CodeGenerationJob, CodeGenerationResult, CodeGenerationResults,
+  CompilationLogger, CompilationLogging, CompilerOptions, ConcatenationScope,
+  DependenciesDiagnosticsArtifact, DependencyCodeGeneration, DependencyTemplate,
+  DependencyTemplateType, DependencyType, DerefOption, Entry, EntryData, EntryOptions,
+  EntryRuntime, Entrypoint, ExecuteModuleId, Filename, ImportPhase, ImportVarMap,
+  ImportedByDeferModulesArtifact, Logger, MemoryGCStorage, ModuleFactory, ModuleGraph,
+  ModuleGraphCacheArtifact, ModuleGraphMut, ModuleGraphPartial, ModuleGraphRef, ModuleIdentifier,
+  ModuleIdsArtifact, ModuleStaticCacheArtifact, PathData, ResolverFactory, RuntimeGlobals,
+  RuntimeKeyMap, RuntimeMode, RuntimeModule, RuntimeSpec, RuntimeSpecMap, RuntimeTemplate,
+  SharedPluginDriver, SideEffectsOptimizeArtifact, SourceType, Stats, ValueCacheVersions,
   build_chunk_graph::artifact::BuildChunkGraphArtifact,
   compilation::build_module_graph::{
     BuildModuleGraphArtifact, ModuleExecutor, UpdateParam, build_module_graph,
@@ -254,8 +254,8 @@ pub struct Compilation {
   pub side_effects_optimize_artifact: DerefOption<SideEffectsOptimizeArtifact>,
   // artifact for module_ids
   pub module_ids_artifact: ModuleIdsArtifact,
-  // artifact for chunk_ids
-  pub chunk_ids_artifact: ChunkIdsArtifact,
+  // artifact for named_chunk_ids
+  pub named_chunk_ids_artifact: ChunkNamedIdArtifact,
   // artifact for code_generation
   pub code_generation_results: BindingCell<CodeGenerationResults>,
   // artifact for create_module_hashes
@@ -393,7 +393,7 @@ impl Compilation {
       ),
       side_effects_optimize_artifact: DerefOption::new(Default::default()),
       module_ids_artifact: Default::default(),
-      chunk_ids_artifact: Default::default(),
+      named_chunk_ids_artifact: Default::default(),
       code_generation_results: Default::default(),
       cgm_hash_artifact: Default::default(),
       cgm_runtime_requirements_artifact: Default::default(),
@@ -2010,7 +2010,6 @@ impl Compilation {
       entrypoint_ukey: &ChunkGroupUkey,
       chunk_group_by_ukey: &ChunkGroupByUkey,
       chunk_by_ukey: &ChunkByUkey,
-      chunk_ids: &ChunkIdsArtifact,
       chunk_graph: &mut ChunkGraph,
     ) {
       let entrypoint = chunk_group_by_ukey.expect_get(entrypoint_ukey);
@@ -2026,15 +2025,14 @@ impl Compilation {
         runtime,
         chunk_by_ukey.get(&entrypoint.get_runtime_chunk(chunk_group_by_ukey)),
       ) {
-        chunk_graph.set_runtime_id(runtime, chunk.id(chunk_ids).map(|id| id.to_string()));
+        chunk_graph.set_runtime_id(runtime, chunk.id().map(|id| id.to_string()));
       }
     }
     for i in self.entrypoints.iter() {
       process_entrypoint(
         i.1,
         &self.chunk_group_by_ukey,
         &self.chunk_by_ukey,
-        &self.chunk_ids_artifact,
         &mut self.chunk_graph,
       )
     }
@@ -2043,7 +2041,6 @@ impl Compilation {
         i,
         &self.chunk_group_by_ukey,
         &self.chunk_by_ukey,
-        &self.chunk_ids_artifact,
         &mut self.chunk_graph,
       )
     }
@@ -2529,17 +2526,14 @@ impl Compilation {
         .filter(|(_, (_, remaining))| *remaining != 0)
         .map(|(chunk_ukey, _)| self.chunk_by_ukey.expect_get(chunk_ukey))
         .collect();
-      circular.sort_unstable_by(|a, b| {
-        a.id(&self.chunk_ids_artifact)
-          .cmp(&b.id(&self.chunk_ids_artifact))
-      });
+      circular.sort_unstable_by(|a, b| a.id().cmp(&b.id()));
       runtime_chunks.extend(circular.iter().map(|chunk| chunk.ukey()));
       let circular_names = circular
         .iter()
         .map(|chunk| {
           chunk
             .name()
-            .or(chunk.id(&self.chunk_ids_artifact).map(|id| id.as_str()))
+            .or(chunk.id().map(|id| id.as_str()))
             .unwrap_or("no id chunk")
         })
         .join(", ");

crates/rspack_core/src/compiler/rebuild.rs

@@ -127,8 +127,8 @@ impl Compiler {
         .incremental
         .mutations_readable(IncrementalPasses::CHUNK_IDS)
       {
-        new_compilation.chunk_ids_artifact =
-          std::mem::take(&mut self.compilation.chunk_ids_artifact);
+        new_compilation.named_chunk_ids_artifact =
+          std::mem::take(&mut self.compilation.named_chunk_ids_artifact);
       }
       if new_compilation
         .incremental
@@ -234,10 +234,7 @@ impl CompilationRecords {
         let mut hashes = FxHashMap::default();
         for chunk in compilation.chunk_graph.get_module_chunks(*identifier) {
           let chunk = compilation.chunk_by_ukey.expect_get(chunk);
-          let chunk_id = chunk
-            .id(&compilation.chunk_ids_artifact)
-            .expect("should have chunk_id")
-            .clone();
+          let chunk_id = chunk.id().expect("should have chunk_id").clone();
           let hash = compilation
             .code_generation_results
             .get_hash(identifier, Some(chunk.runtime()))
@@ -282,7 +279,7 @@ impl CompilationRecords {
       .values()
       .filter(|chunk| chunk.kind() != ChunkKind::HotUpdate)
       .map(|chunk| {
-        let chunk_id = chunk.expect_id(&compilation.chunk_ids_artifact).clone();
+        let chunk_id = chunk.expect_id().clone();
         let chunk_runtime = chunk.runtime().clone();
         let chunk_modules: FxHashSet<ModuleId> = compilation
           .chunk_graph