feat: should retain source error name (#11762)

Author: SyMind

crates/rspack_binding_api/src/error.rs

@@ -272,6 +272,17 @@ impl std::fmt::Display for RspackError {
 
 impl std::error::Error for RspackError {}
 
+impl From<RspackError> for rspack_error::Error {
+  fn from(value: RspackError) -> Error {
+    let mut error = rspack_error::error!(format!("{}", value));
+    error.code = Some(value.name);
+    error.details = value.details;
+    error.stack = value.stack;
+    error.hide_stack = value.hide_stack;
+    error
+  }
+}
+
 impl From<&Error> for RspackError {
   fn from(value: &Error) -> Self {
     let mut name = "Error".to_string();

crates/rspack_binding_api/src/plugins/js_loader/scheduler.rs

@@ -1,7 +1,7 @@
 use napi::Either;
 use rspack_core::{
   AdditionalData, BUILTIN_LOADER_PREFIX, LoaderContext, NormalModuleLoaderShouldYield,
-  NormalModuleLoaderStartYielding, RunnerContext, diagnostics::CapturedLoaderError,
+  NormalModuleLoaderStartYielding, RunnerContext,
 };
 use rspack_error::{Result, ToStringResultToRspackResultExt};
 use rspack_hook::plugin_hook;
@@ -110,14 +110,7 @@ pub(crate) fn merge_loader_context(
     } else {
       None
     };
-
-    return Err(
-      CapturedLoaderError::new(
-        Box::new(error.with_parent_error_name("ModuleBuildError")),
-        details,
-      )
-      .into(),
-    );
+    return Err(error.with_parent_error_name("ModuleBuildError").into());
   }
 
   let content = match from.content {

crates/rspack_core/src/diagnostics.rs

@@ -41,11 +41,18 @@ impl ModuleBuildError {
 }
 
 impl From<ModuleBuildError> for Error {
-  fn from(mut value: ModuleBuildError) -> Error {
+  fn from(value: ModuleBuildError) -> Error {
+    let source = value.0;
+
     let mut err = Error::error("Module build failed:".into());
-    err.details = std::mem::take(&mut value.0.details);
-    err.severity = value.0.severity;
-    err.source_error = Some(Box::new(value.0));
+    let details = source
+      .hide_stack
+      .unwrap_or(false)
+      .then_some(source.stack.as_ref().map(|stack| stack.to_string()))
+      .flatten();
+    err.details = details;
+    err.severity = source.severity;
+    err.source_error = Some(Box::new(source));
     err.code = Some("ModuleBuildError".into());
     err
   }
@@ -110,28 +117,6 @@ impl ModuleParseError {
   }
 }
 
-#[derive(Debug)]
-pub struct CapturedLoaderError {
-  pub source: Box<dyn std::error::Error>,
-  pub details: Option<String>,
-}
-
-impl CapturedLoaderError {
-  #[allow(clippy::too_many_arguments)]
-  pub fn new(source: Box<dyn std::error::Error>, details: Option<String>) -> Self {
-    Self { source, details }
-  }
-}
-
-impl From<CapturedLoaderError> for Error {
-  fn from(value: CapturedLoaderError) -> Error {
-    let mut error = rspack_error::error!(value.source.to_string());
-    error.code = Some("CapturedLoaderError".into());
-    error.details = value.details;
-    error
-  }
-}
-
 /// Mark boxed errors as [crate::diagnostics::ModuleParseError],
 /// then, map it to diagnostics
 pub fn map_box_diagnostics_to_module_parse_diagnostics(

tests/rspack-test/configCases/loader/module-build-error-structure/errors.js

@@ -0,0 +1 @@
+module.exports = [/Module build failed/];

tests/rspack-test/configCases/loader/module-build-error-structure/index.js

@@ -0,0 +1,5 @@
+module.exports = function () {
+    const error = new Error("Cannot be used within pages/_document.js");
+    error.name = "NextFontError";
+    throw error;
+}

tests/rspack-test/configCases/loader/module-build-error-structure/loader.js

@@ -0,0 +1,31 @@
+/** @type {import("@rspack/core").Configuration} */
+module.exports = {
+    entry: "./index.js",
+    module: {
+        rules: [
+            {
+                test: /\.js$/i,
+                use: [{ loader: "./loader" }],
+            }
+        ]
+    },
+    plugins: [
+        {
+            apply(compiler) {
+                compiler.hooks.done.tap("PLUGIN", stats => {
+                    const { errors } = stats.compilation;
+                    expect(errors).toHaveLength(1);
+
+                    const error = errors[0];
+                    expect(error).toMatchObject({
+                        name: "ModuleBuildError",
+                        error: {
+                            name: "NextFontError"
+                        }
+                    });
+                    expect(error.error.message).toContain("Cannot be used within pages/_document.js");
+                });
+            }
+        }
+    ]
+};