fix: resolve the inconsistent type issue in JsModule

web-infra-dev · Jan 6, 2025 · d55ceb4 · d55ceb4
1 parent f81f1c7
commit d55ceb4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/crates/node_binding/binding.d.ts b/crates/node_binding/binding.d.ts
@@ -222,7 +222,7 @@ export declare class JsModule {
   get nameForCondition(): string | undefined
   get request(): string | undefined
   get userRequest(): string | undefined
-  set userRequest(val: string)
+  set userRequest(val: string | undefined)
   get rawRequest(): string | undefined
   get factoryMeta(): JsFactoryMeta | undefined
   get type(): string

diff --git a/crates/rspack_binding_values/src/module.rs b/crates/rspack_binding_values/src/module.rs
@@ -135,13 +135,16 @@ impl JsModule {
   }
 
   #[napi(setter)]
-  pub fn set_user_request(&mut self, val: String) -> napi::Result<()> {
-    let module: &mut dyn Module = self.as_mut()?;
-
-    if let Ok(normal_module) = module.try_as_normal_module_mut() {
-      *normal_module.user_request_mut() = val;
-    }
-    Ok(())
+  pub fn set_user_request(&mut self, val: Either<String, ()>) -> napi::Result<()> {
+    Ok(match val {
+      Either::A(val) => {
+        let module: &mut dyn Module = self.as_mut()?;
+        if let Ok(normal_module) = module.try_as_normal_module_mut() {
+          *normal_module.user_request_mut() = val;
+        }
+      }
+      Either::B(_) => {}
+    })
   }
 
   #[napi(getter)]

diff --git a/packages/rspack/src/Module.ts b/packages/rspack/src/Module.ts
@@ -271,8 +271,10 @@ export class Module {
 				get(): string | undefined {
 					return module.userRequest;
 				},
-				set(val: string) {
-					module.userRequest = val;
+				set(val: string | undefined) {
+					if (val) {
+						module.userRequest = val;
+					}
 				}
 			},
 			rawRequest: {