perf: reuse dependency between compilation

Author: SyMind

crates/node_binding/src/compilation/entries.rs

@@ -228,7 +228,12 @@ impl JsEntryData {
         .map(|dependency_id| {
           #[allow(clippy::unwrap_used)]
           let dep = module_graph.dependency_by_id(dependency_id).unwrap();
-          JsDependencyWrapper::new(dep.as_ref(), compilation.id(), Some(compilation))
+          JsDependencyWrapper::new(
+            dep.as_ref(),
+            compilation.compiler_id(),
+            compilation.id(),
+            Some(compilation),
+          )
         })
         .collect::<Vec<_>>(),
     )
@@ -258,7 +263,12 @@ impl JsEntryData {
         .map(|dependency_id| {
           #[allow(clippy::unwrap_used)]
           let dep = module_graph.dependency_by_id(dependency_id).unwrap();
-          JsDependencyWrapper::new(dep.as_ref(), compilation.id(), Some(compilation))
+          JsDependencyWrapper::new(
+            dep.as_ref(),
+            compilation.compiler_id(),
+            compilation.id(),
+            Some(compilation),
+          )
         })
         .collect::<Vec<_>>(),
     )

crates/node_binding/src/compilation/mod.rs

@@ -807,6 +807,7 @@ impl JsCompilation {
                 let dependency = module_graph.dependency_by_id(&dependency_id).unwrap();
                 let js_dependency = JsDependencyWrapper::new(
                   dependency.as_ref(),
+                  compilation.compiler_id(),
                   compilation.id(),
                   Some(&compilation),
                 );

crates/node_binding/src/context_module_factory.rs

@@ -175,7 +175,14 @@ impl JsContextModuleFactoryAfterResolveData {
       .0
       .dependencies
       .iter()
-      .map(|dep| JsDependencyWrapper::new(dep.as_ref(), self.0.compilation_id, None))
+      .map(|dep| {
+        JsDependencyWrapper::new(
+          dep.as_ref(),
+          self.0.compiler_id,
+          self.0.compilation_id,
+          None,
+        )
+      })
       .collect::<Vec<_>>()
   }
 }

crates/node_binding/src/dependency.rs

@@ -2,7 +2,7 @@ use std::{cell::RefCell, ptr::NonNull};
 
 use napi::{bindgen_prelude::ToNapiValue, Either, Env, JsString};
 use napi_derive::napi;
-use rspack_core::{Compilation, CompilationId, Dependency, DependencyId};
+use rspack_core::{Compilation, CompilationId, CompilerId, Dependency, DependencyId};
 use rspack_napi::OneShotInstanceRef;
 use rspack_plugin_javascript::dependency::{
   CommonJsExportRequireDependency, ESMExportImportedSpecifierDependency,
@@ -142,14 +142,14 @@ impl JsDependency {
 
 type DependencyInstanceRefs = HashMap<DependencyId, OneShotInstanceRef<JsDependency>>;
 
-type DependencyInstanceRefsByCompilationId =
-  RefCell<HashMap<CompilationId, DependencyInstanceRefs>>;
+type DependencyInstanceRefsByCompilerId = RefCell<HashMap<CompilerId, DependencyInstanceRefs>>;
 
 thread_local! {
-  static DEPENDENCY_INSTANCE_REFS: DependencyInstanceRefsByCompilationId = Default::default();
+  static DEPENDENCY_INSTANCE_REFS: DependencyInstanceRefsByCompilerId = Default::default();
 }
 
 pub struct JsDependencyWrapper {
+  compiler_id: CompilerId,
   dependency_id: DependencyId,
   dependency: NonNull<dyn Dependency>,
   compilation_id: CompilationId,
@@ -159,6 +159,7 @@ pub struct JsDependencyWrapper {
 impl JsDependencyWrapper {
   pub fn new(
     dependency: &dyn Dependency,
+    compiler_id: CompilerId,
     compilation_id: CompilationId,
     compilation: Option<&Compilation>,
   ) -> Self {
@@ -168,17 +169,18 @@ impl JsDependencyWrapper {
     Self {
       dependency_id,
       dependency: NonNull::new(dependency as *const dyn Dependency as *mut dyn Dependency).unwrap(),
+      compiler_id,
       compilation_id,
       compilation: compilation
         .map(|c| NonNull::new(c as *const Compilation as *mut Compilation).unwrap()),
     }
   }
 
   pub fn cleanup_last_compilation(compilation_id: CompilationId) {
-    DEPENDENCY_INSTANCE_REFS.with(|refs| {
-      let mut refs_by_compilation_id = refs.borrow_mut();
-      refs_by_compilation_id.remove(&compilation_id)
-    });
+    // DEPENDENCY_INSTANCE_REFS.with(|refs| {
+    //   let mut refs_by_compilation_id = refs.borrow_mut();
+    //   refs_by_compilation_id.remove(&compilation_id)
+    // });
   }
 }
 
@@ -189,7 +191,7 @@ impl ToNapiValue for JsDependencyWrapper {
   ) -> napi::Result<napi::sys::napi_value> {
     DEPENDENCY_INSTANCE_REFS.with(|refs| {
       let mut refs_by_compilation_id = refs.borrow_mut();
-      let entry = refs_by_compilation_id.entry(val.compilation_id);
+      let entry = refs_by_compilation_id.entry(val.compiler_id);
       let refs = match entry {
         std::collections::hash_map::Entry::Occupied(entry) => entry.into_mut(),
         std::collections::hash_map::Entry::Vacant(entry) => {

crates/node_binding/src/dependency_block.rs

@@ -27,9 +27,14 @@ impl JsDependenciesBlock {
         .get_dependencies()
         .iter()
         .filter_map(|dependency_id| {
-          module_graph
-            .dependency_by_id(dependency_id)
-            .map(|dep| JsDependencyWrapper::new(dep.as_ref(), compilation.id(), Some(compilation)))
+          module_graph.dependency_by_id(dependency_id).map(|dep| {
+            JsDependencyWrapper::new(
+              dep.as_ref(),
+              compilation.compiler_id(),
+              compilation.id(),
+              Some(compilation),
+            )
+          })
         })
         .collect::<Vec<_>>()
     } else {

crates/node_binding/src/module.rs

@@ -239,7 +239,12 @@ impl JsModule {
           .filter_map(|dependency_id| {
             module_graph.dependency_by_id(dependency_id).map(|dep| {
               let compilation = unsafe { self.compilation.map(|c| c.as_ref()) };
-              JsDependencyWrapper::new(dep.as_ref(), self.compilation_id, compilation)
+              JsDependencyWrapper::new(
+                dep.as_ref(),
+                self.compiler_id,
+                self.compilation_id,
+                compilation,
+              )
             })
           })
           .collect::<Vec<_>>()

crates/node_binding/src/module_graph_connection.rs

@@ -40,6 +40,7 @@ impl JsModuleGraphConnection {
     if let Some(dependency) = module_graph.dependency_by_id(&self.dependency_id) {
       Ok(JsDependencyWrapper::new(
         dependency.as_ref(),
+        compilation.compiler_id(),
         compilation.id(),
         Some(compilation),
       ))

crates/rspack_core/src/context_module_factory.rs

@@ -10,7 +10,7 @@ use swc_core::common::util::take::Take;
 use tracing::instrument;
 
 use crate::{
-  resolve, BoxDependency, CompilationId, ContextElementDependency, ContextModule,
+  resolve, BoxDependency, CompilationId, CompilerId, ContextElementDependency, ContextModule,
   ContextModuleOptions, DependencyCategory, DependencyId, DependencyType, ErrorSpan, ModuleExt,
   ModuleFactory, ModuleFactoryCreateData, ModuleFactoryResult, ModuleIdentifier, RawModule,
   ResolveArgs, ResolveContextModuleDependencies, ResolveInnerOptions,
@@ -49,6 +49,7 @@ pub enum AfterResolveResult {
 
 #[derive(Debug, Clone)]
 pub struct AfterResolveData {
+  pub compiler_id: CompilerId,
   pub compilation_id: CompilationId,
   pub resource: Utf8PathBuf,
   pub context: String,
@@ -341,6 +342,7 @@ impl ContextModuleFactory {
   ) -> Result<Option<ModuleFactoryResult>> {
     let context_options = &context_module_options.context_options;
     let after_resolve_data = AfterResolveData {
+      compiler_id: data.compiler_id,
       compilation_id: data.compilation_id,
       resource: context_module_options.resource.clone(),
       context: context_options.context.clone(),