fix

Author: SyMind

crates/node_binding/src/error.rs

@@ -1,5 +1,6 @@
+use cow_utils::CowUtils;
 use derive_more::Debug;
-use napi::{bindgen_prelude::ToNapiValue, JsValue};
+use napi::{bindgen_prelude::ToNapiValue, JsValue, ValueType};
 use napi_derive::napi;
 use rspack_core::ModuleIdentifier;
 use rspack_error::{
@@ -124,7 +125,8 @@ impl napi::bindgen_prelude::FromNapiValue for RspackError {
     napi_val: napi::bindgen_prelude::sys::napi_value,
   ) -> napi::bindgen_prelude::Result<RspackError> {
     let unknown = napi::bindgen_prelude::Unknown::from_napi_value(env, napi_val)?;
-    if !unknown.is_error()? {
+    let ty = unknown.get_type()?;
+    if ty != ValueType::Object {
       let error = unknown.coerce_to_string()?.into_utf8()?.into_owned()?;
       return Ok(RspackError {
         name: "NonErrorEmittedError".to_string(),
@@ -141,30 +143,8 @@ impl napi::bindgen_prelude::FromNapiValue for RspackError {
     }
 
     let obj = napi::bindgen_prelude::Object::from_napi_value(env, napi_val)?;
-    let name: String = obj
-      .get("name")
-      .map_err(|mut err| {
-        err.reason = format!("{} on {}.{}", err.reason, "RspackError", "name");
-        err
-      })?
-      .ok_or_else(|| {
-        napi::bindgen_prelude::Error::new(
-          napi::bindgen_prelude::Status::InvalidArg,
-          "Missing field `name`",
-        )
-      })?;
-    let message: String = obj
-      .get("message")
-      .map_err(|mut err| {
-        err.reason = format!("{} on {}.{}", err.reason, "RspackError", "message");
-        err
-      })?
-      .ok_or_else(|| {
-        napi::bindgen_prelude::Error::new(
-          napi::bindgen_prelude::Status::InvalidArg,
-          "Missing field `message`",
-        )
-      })?;
+    let name: String = obj.get("name")?.unwrap_or("Error".to_string());
+    let message: String = obj.get("message")?.unwrap_or("Error".to_string());
     let module = obj.get::<ModuleObject>("module").unwrap_or(None);
     let module_identifier = if let Some(module) = &module {
       Some(module.identifier())
@@ -230,7 +210,10 @@ impl RspackError {
         // the original error message is extracted from the `message`
         error = Some(Box::new(RspackError {
           name: "Error".to_string(),
-          message: diagnostic.to_string().replace("Module not found: ", ""),
+          message: diagnostic
+            .to_string()
+            .cow_replace("Module not found: ", "")
+            .to_string(),
           severity: None,
           module_identifier: None,
           module: None,

packages/rspack-test-tools/tests/configCases/errors/module-not-found-error/errors.js

@@ -0,0 +1,3 @@
+module.exports = [
+    [/Module not found/],
+]

packages/rspack-test-tools/tests/configCases/errors/module-not-found-error/rspack.config.js

@@ -0,0 +1,18 @@
+/** @type {import("@rspack/core").Configuration} */
+module.exports = {
+    entry: "./index",
+    plugins: [
+        {
+            apply(compiler) {
+                compiler.hooks.done.tap("TestPlugin", stats => {
+                    const erros = stats.compilation.errors;
+                    expect(erros.length).toBe(1);
+                    expect(erros[0].name).toBe("ModuleNotFoundError");
+                    expect(erros[0].message).toContain("Module not found: Can't resolve './index'");
+
+                    expect(erros[0].error).toBeDefined();
+                });
+            }
+        }
+    ]
+};

packages/rspack-test-tools/tests/configCases/errors/push-custom-error/rspack.config.js

@@ -19,7 +19,7 @@ module.exports = {
 								column: 0
 							}
 						};
-						compilation.errors.push([error]);
+						compilation.errors.push(error);
 					});
 				});
 			}

tests/webpack-test/__snapshots__/StatsTestCases.basictest.js.snap

@@ -511,10 +511,10 @@ exports[`StatsTestCases should print correct stats for errors-space-error 1`] =
 
 ERROR in ./index.js (./loader!./index.js)
   × stack1stack2
-  │ stack3
+  │ stack3loader error1 (from: Xdir/errors-xxx.js)
 
 ERROR in ./index.js (./loader!./index.js)
-  × stack1stack2
+  × stack1stack2loader error2 (from: Xdir/errors-xxx.js)
 
 Rspack x.x.x compiled with 2 errors in X.23
 
@@ -523,10 +523,10 @@ assets by status xx bytes [cached] 1 asset
 
 ERROR in ./index.js (./loader!./index.js)
   × stack1stack2
-  │ stack3
+  │ stack3loader error1 (from: Xdir/errors-xxx.js)
 
 ERROR in ./index.js (./loader!./index.js)
-  × stack1stack2
+  × stack1stack2loader error2 (from: Xdir/errors-xxx.js)
 
 Rspack x.x.x compiled with 2 errors in X.23
 
@@ -535,10 +535,10 @@ assets by status xx bytes [cached] 1 asset
 
 ERROR in ./index.js (./loader!./index.js)
   × stack1stack2
-  │ stack3
+  │ stack3loader error1 (from: Xdir/errors-xxx.js)
 
 ERROR in ./index.js (./loader!./index.js)
-  × stack1stack2
+  × stack1stack2loader error2 (from: Xdir/errors-xxx.js)
 
 Rspack x.x.x compiled with 2 errors in X.23
 
@@ -547,10 +547,10 @@ assets by status xx bytes [cached] 1 asset
 
 ERROR in ./index.js (./loader!./index.js)
   × stack1stack2
-  │ stack3
+  │ stack3loader error1 (from: Xdir/errors-xxx.js)
 
 ERROR in ./index.js (./loader!./index.js)
-  × stack1stack2
+  × stack1stack2loader error2 (from: Xdir/errors-xxx.js)
 
 Rspack x.x.x compiled with 2 errors in X.23
 
@@ -559,10 +559,10 @@ assets by status xx bytes [cached] 1 asset
 
 ERROR in ./index.js (./loader!./index.js)
   × stack1stack2
-  │ stack3
+  │ stack3loader error1 (from: Xdir/errors-xxx.js)
 
 ERROR in ./index.js (./loader!./index.js)
-  × stack1stack2
+  × stack1stack2loader error2 (from: Xdir/errors-xxx.js)
 
 Rspack x.x.x compiled with 2 errors in X.23
 
@@ -571,10 +571,10 @@ assets by status xx bytes [cached] 1 asset
 
 ERROR in ./index.js (./loader!./index.js)
   × stack1stack2
-  │ stack3
+  │ stack3loader error1 (from: Xdir/errors-xxx.js)
 
 ERROR in ./index.js (./loader!./index.js)
-  × stack1stack2
+  × stack1stack2loader error2 (from: Xdir/errors-xxx.js)
 
 Rspack x.x.x compiled with 2 errors in X.23"
 `;