fix: should handle loader error with empty stack trace (#12213)

Author: SyMind

crates/rspack_binding_api/src/error.rs

@@ -254,7 +254,9 @@ impl std::fmt::Display for RspackError {
   fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
     if self.parent_error_name.as_deref() == Some("ModuleBuildError") {
       // https://github.com/webpack/webpack/blob/93743d233ab4fa36738065ebf8df5f175323b906/lib/ModuleBuildError.js
-      if let Some(stack) = &self.stack {
+      if let Some(stack) = &self.stack
+        && !stack.is_empty()
+      {
         if self.hide_stack != Some(true) {
           write!(f, "{stack}")
         } else {

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

@@ -103,13 +103,6 @@ pub(crate) fn merge_loader_context(
     .collect();
 
   if let Some(error) = from.error {
-    let details = if let Some(stack) = &error.stack
-      && error.hide_stack.unwrap_or(false)
-    {
-      Some(stack.to_string())
-    } else {
-      None
-    };
     return Err(error.with_parent_error_name("ModuleBuildError").into());
   }
 

crates/rspack_core/src/diagnostics.rs

@@ -31,20 +31,28 @@ impl From<EmptyDependency> for Error {
 
 ///////////////////// Module /////////////////////
 
-#[derive(Debug)]
-pub struct ModuleBuildError(pub Error);
+#[derive(Debug, Clone)]
+pub struct ModuleBuildError {
+  error: Error,
+  from: Option<String>,
+}
 
 impl ModuleBuildError {
-  pub fn new(error: Error) -> Self {
-    Self(error)
+  pub fn new(error: Error, from: Option<String>) -> Self {
+    Self { error, from }
   }
 }
 
 impl From<ModuleBuildError> for Error {
   fn from(value: ModuleBuildError) -> Error {
-    let source = value.0;
+    let source = value.error;
 
-    let mut err = Error::error("Module build failed:".into());
+    let message = if let Some(from) = value.from {
+      format!("Module build failed (from {from}):")
+    } else {
+      "Module build failed:".to_string()
+    };
+    let mut err = Error::error(message);
     let details = source
       .hide_stack
       .unwrap_or(false)

crates/rspack_core/src/normal_module.rs

@@ -510,7 +510,17 @@ impl Module for NormalModule {
         .collect();
 
       inner.source = None;
-      let diagnostic = Diagnostic::from(rspack_error::Error::from(ModuleBuildError::new(err)));
+
+      let current_loader = loader_result.current_loader.map(|current_loader| {
+        contextify(
+          build_context.compiler_options.context.as_path(),
+          current_loader.as_str(),
+        )
+      });
+      let diagnostic = Diagnostic::from(rspack_error::Error::from(ModuleBuildError::new(
+        err,
+        current_loader,
+      )));
       inner.diagnostics.push(diagnostic);
 
       self.inner_mut().build_info.hash = Some(self.init_build_hash(

crates/rspack_loader_runner/src/runner.rs

@@ -2,6 +2,7 @@ use std::{fmt::Debug, path::PathBuf, sync::Arc};
 
 use rspack_error::{Diagnostic, Error, Result, error};
 use rspack_fs::ReadableFileSystem;
+use rspack_paths::Utf8PathBuf;
 use rspack_sources::SourceMap;
 use rustc_hash::FxHashSet as HashSet;
 use tracing::{Instrument, info_span};
@@ -223,6 +224,7 @@ pub struct LoaderResult<Context> {
   pub source_map: Option<SourceMap>,
   pub additional_data: Option<AdditionalData>,
   pub parse_meta: ParseMeta,
+  pub current_loader: Option<Utf8PathBuf>,
 }
 
 impl<Context: Send> LoaderResult<Context> {
@@ -241,6 +243,14 @@ impl<Context: Send> LoaderResult<Context> {
       source_map: loader_context.source_map,
       additional_data: loader_context.additional_data,
       parse_meta: loader_context.parse_meta,
+      current_loader: (loader_context.loader_index >= 0)
+        .then(|| {
+          loader_context
+            .loader_items
+            .get(loader_context.loader_index as usize)
+        })
+        .flatten()
+        .map(|loader| loader.path().to_path_buf()),
     }
   }
 }

tests/rspack-test/diagnosticsCases/builtins/recoverable_syntax_error/stats.err

@@ -1,5 +1,5 @@
 ERROR in ./index.tsx
-  × Module build failed:
+  × Module build failed (from builtin:swc-loader):
   ├─▶   ×   x Unexpected token. Did you mean `{'>'}` or `>`?
   │     │    ,-[<TEST_ROOT>/diagnosticsCases/builtins/recoverable_syntax_error/index.tsx<LINE_COL>]
   │     │  1 | let c = <test>() => {}</test>;

tests/rspack-test/diagnosticsCases/module-build-failed/asset-module-build-failed/stats.err

@@ -1,5 +1,5 @@
 ERROR in ./logo.svg
-  × Module build failed:
+  × Module build failed (from ./my-loader.js):
   ╰─▶   × Error: Failed to load
         │     at xxx
         │     at xxx

tests/rspack-test/diagnosticsCases/module-build-failed/loader-emit-diagnostic/stats.err

@@ -49,7 +49,7 @@ ERROR in (./with-multi-byte-char.js!) 1:0-13
    ╰────
 
 ERROR in (./with-multi-byte-char.js!)
-  × Module build failed:
+  × Module build failed (from ./with-multi-byte-char.js):
   ╰─▶   × Error: Format diagnostic failed: Invalid char boundary. Did you pass the correct line, column and length?
         │     at xxx
         │     at xxx
@@ -76,7 +76,7 @@ ERROR in (./with-multiple-line.js!) 1:0-2:4
    ╰────
 
 ERROR in (./with-multiple-line.js!)
-  × Module build failed:
+  × Module build failed (from ./with-multiple-line.js):
   ╰─▶   × Error: Format diagnostic failed: Invalid `length` in location.
         │     at xxx
         │     at xxx

tests/rspack-test/diagnosticsCases/module-build-failed/loader-throw-empty-stack-error/index.js

@@ -0,0 +1,5 @@
+it("should handle loader error with empty stack trace", () => {
+    expect(() => {
+        require("./lib");
+    }).toThrow("Failed to load");
+});

tests/rspack-test/diagnosticsCases/module-build-failed/loader-throw-empty-stack-error/lib.js

@@ -0,0 +1 @@
+export const lib = "lib";