fix: factorize hooks avoid update dependency request (#10999)

* fix: factorize hooks avoid update dependency request

* add test case

* fix: remove useless set_request

Author: jerrykingxyz

crates/rspack_binding_api/src/plugins/interceptor.rs

@@ -1438,13 +1438,10 @@ impl CompilationAfterSeal for CompilationAfterSealTap {
 #[async_trait]
 impl NormalModuleFactoryBeforeResolve for NormalModuleFactoryBeforeResolveTap {
   async fn run(&self, data: &mut ModuleFactoryCreateData) -> rspack_error::Result<Option<bool>> {
-    let dependency = data.dependencies[0]
-      .as_module_dependency_mut()
-      .expect("should be module dependency");
     match self
       .function
       .call_with_promise(JsBeforeResolveArgs {
-        request: dependency.request().to_string(),
+        request: data.request.clone(),
         context: data.context.to_string(),
         issuer: data
           .issuer
@@ -1456,7 +1453,7 @@ impl NormalModuleFactoryBeforeResolve for NormalModuleFactoryBeforeResolveTap {
       .await
     {
       Ok((ret, resolve_data)) => {
-        dependency.set_request(resolve_data.request);
+        data.request = resolve_data.request;
         data.context = resolve_data.context.into();
         Ok(ret)
       }
@@ -1475,13 +1472,10 @@ impl NormalModuleFactoryFactorize for NormalModuleFactoryFactorizeTap {
     &self,
     data: &mut ModuleFactoryCreateData,
   ) -> rspack_error::Result<Option<BoxModule>> {
-    let dependency = data.dependencies[0]
-      .as_module_dependency_mut()
-      .expect("should be module dependency");
     match self
       .function
       .call_with_promise(JsFactorizeArgs {
-        request: dependency.request().to_string(),
+        request: data.request.clone(),
         context: data.context.to_string(),
         issuer: data
           .issuer
@@ -1493,7 +1487,7 @@ impl NormalModuleFactoryFactorize for NormalModuleFactoryFactorizeTap {
       .await
     {
       Ok(resolve_data) => {
-        dependency.set_request(resolve_data.request);
+        data.request = resolve_data.request;
         data.context = resolve_data.context.into();
         // only supports update resolve request for now
         Ok(None)
@@ -1513,13 +1507,10 @@ impl NormalModuleFactoryResolve for NormalModuleFactoryResolveTap {
     &self,
     data: &mut ModuleFactoryCreateData,
   ) -> rspack_error::Result<Option<NormalModuleFactoryResolveResult>> {
-    let dependency = data.dependencies[0]
-      .as_module_dependency_mut()
-      .expect("should be module dependency");
     match self
       .function
       .call_with_promise(JsResolveArgs {
-        request: dependency.request().to_string(),
+        request: data.request.clone(),
         context: data.context.to_string(),
         issuer: data
           .issuer
@@ -1531,7 +1522,7 @@ impl NormalModuleFactoryResolve for NormalModuleFactoryResolveTap {
       .await
     {
       Ok(resolve_data) => {
-        dependency.set_request(resolve_data.request);
+        data.request = resolve_data.request;
         data.context = resolve_data.context.into();
         // only supports update resolve request for now
         Ok(None)

crates/rspack_core/src/compiler/make/repair/factorize.rs

@@ -58,6 +58,15 @@ impl Task<MakeTaskContext> for FactorizeTask {
       .or(self.issuer_layer.as_ref())
       .cloned();
 
+    let request = self.dependencies[0]
+      .as_module_dependency()
+      .map(|d| d.request().to_string())
+      .or_else(|| {
+        self.dependencies[0]
+          .as_context_dependency()
+          .map(|d| d.request().to_string())
+      })
+      .unwrap_or_default();
     // Error and result are not mutually exclusive in webpack module factorization.
     // Rspack puts results that need to be shared in both error and ok in [ModuleFactoryCreateData].
     let mut create_data = ModuleFactoryCreateData {
@@ -66,6 +75,7 @@ impl Task<MakeTaskContext> for FactorizeTask {
       resolve_options: self.resolve_options,
       options: self.options.clone(),
       context,
+      request,
       dependencies: self.dependencies,
       issuer: self.issuer,
       issuer_identifier: self.original_module_identifier,

crates/rspack_core/src/dependency/context_dependency.rs

@@ -8,7 +8,6 @@ pub trait ContextDependency: Dependency {
   fn options(&self) -> &ContextOptions;
   fn get_context(&self) -> Option<&str>;
   fn resource_identifier(&self) -> &str;
-  fn set_request(&mut self, request: String);
 
   fn get_optional(&self) -> bool {
     false

crates/rspack_core/src/dependency/context_element_dependency.rs

@@ -157,10 +157,6 @@ impl ModuleDependency for ContextElementDependency {
     )
   }
 
-  fn set_request(&mut self, request: String) {
-    self.request = request;
-  }
-
   fn factorize_info(&self) -> &FactorizeInfo {
     &self.factorize_info
   }

crates/rspack_core/src/dependency/entry.rs

@@ -98,10 +98,6 @@ impl ModuleDependency for EntryDependency {
     &self.request
   }
 
-  fn set_request(&mut self, request: String) {
-    self.request = request;
-  }
-
   fn factorize_info(&self) -> &FactorizeInfo {
     &self.factorize_info
   }

crates/rspack_core/src/dependency/loader_import.rs

@@ -87,10 +87,6 @@ impl ModuleDependency for LoaderImportDependency {
     &self.request
   }
 
-  fn set_request(&mut self, request: String) {
-    self.request = request;
-  }
-
   fn factorize_info(&self) -> &FactorizeInfo {
     &self.factorize_info
   }

crates/rspack_core/src/dependency/module_dependency.rs

@@ -27,8 +27,6 @@ pub trait ModuleDependency: Dependency {
     false
   }
 
-  fn set_request(&mut self, _request: String) {}
-
   fn get_optional(&self) -> bool {
     false
   }

crates/rspack_core/src/module_factory.rs

@@ -21,6 +21,7 @@ pub struct ModuleFactoryCreateData {
   pub resolve_options: Option<Arc<Resolve>>,
   #[cacheable(with=As<FromContext>)]
   pub options: Arc<CompilerOptions>,
+  pub request: String,
   pub context: Context,
   pub dependencies: Vec<BoxDependency>,
   pub issuer: Option<Box<str>>,
@@ -36,17 +37,6 @@ pub struct ModuleFactoryCreateData {
 }
 
 impl ModuleFactoryCreateData {
-  pub fn request(&self) -> Option<&str> {
-    self.dependencies[0]
-      .as_module_dependency()
-      .map(|d| d.request())
-      .or_else(|| {
-        self.dependencies[0]
-          .as_context_dependency()
-          .map(|d| d.request())
-      })
-  }
-
   pub fn add_file_dependency<F: Into<ArcPath>>(&mut self, file: F) {
     self.file_dependencies.insert(file.into());
   }

crates/rspack_core/src/normal_module_factory.rs

@@ -150,7 +150,7 @@ impl NormalModuleFactory {
     let dependency_optional = dependency.get_optional();
 
     let importer = data.issuer_identifier;
-    let raw_request = dependency.request().to_owned();
+    let raw_request = data.request.clone();
 
     let mut file_dependencies = Default::default();
     let mut missing_dependencies = Default::default();
@@ -165,11 +165,11 @@ impl NormalModuleFactory {
     let mut no_auto_loaders = false;
     let mut no_pre_post_auto_loaders = false;
 
-    let mut scheme = get_scheme(dependency.request());
+    let mut scheme = get_scheme(&data.request);
     let context_scheme = get_scheme(data.context.as_ref());
-    let mut unresolved_resource = dependency.request();
+    let mut unresolved_resource = data.request.as_str();
     if scheme.is_none() {
-      let mut request_without_match_resource = dependency.request();
+      let mut request_without_match_resource = data.request.as_str();
       request_without_match_resource = {
         if let Some(m) = MATCH_RESOURCE_REGEX.captures(request_without_match_resource) {
           let match_resource = {
@@ -864,20 +864,13 @@ impl NormalModuleFactory {
       if let NormalModuleFactoryResolveResult::Module(result) = result {
         return Ok(ModuleFactoryResult::new_with_module(result));
       } else {
-        let ident = format!(
-          "{}/{}",
-          &data.context,
-          data.request().expect("normal module should have request")
-        );
+        let ident = format!("{}/{}", &data.context, data.request);
         let module_identifier = ModuleIdentifier::from(format!("ignored|{ident}"));
 
         let mut raw_module = RawModule::new(
           "/* (ignored) */".to_owned(),
           module_identifier,
-          format!(
-            "{} (ignored)",
-            data.request().expect("normal module should have request")
-          ),
+          format!("{} (ignored)", data.request),
           Default::default(),
         )
         .boxed();

crates/rspack_plugin_css/src/dependency/compose.rs

@@ -78,10 +78,6 @@ impl ModuleDependency for CssComposeDependency {
     &self.request
   }
 
-  fn set_request(&mut self, request: String) {
-    self.request = request;
-  }
-
   fn factorize_info(&self) -> &FactorizeInfo {
     &self.factorize_info
   }