fix

Author: SyMind

crates/node_binding/src/error.rs

@@ -215,7 +215,7 @@ impl RspackError {
     compilation: &rspack_core::Compilation,
     diagnostic: &Diagnostic,
   ) -> napi::Result<Self> {
-    let error = match diagnostic.source() {
+    let mut error = match diagnostic.source() {
       Some(source) => match source.downcast_ref::<RspackError>() {
         Some(rspack_error) => Some(Box::new(rspack_error.clone())),
         None => Some(Box::new(RspackError {
@@ -235,7 +235,7 @@ impl RspackError {
     };
 
     if let Some(e) = diagnostic.downcast_ref::<ModuleNotFoundError>() {
-      return Ok(RspackError {
+      error = Some(Box::new(RspackError {
         name: "Error".to_string(),
         message: format!("{}", e).replace("Module not found: ", ""),
         severity: None,
@@ -246,7 +246,7 @@ impl RspackError {
         stack: None,
         hide_stack: None,
         error: None,
-      });
+      }));
     }
 
     if let Some(error) = diagnostic.downcast_ref::<RspackError>() {

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

@@ -5,7 +5,6 @@ use rspack_sources::BoxSource;
 
 use super::{add::AddTask, MakeTaskContext};
 use crate::{
-  diagnostics::ModuleNotFoundError,
   module_graph::ModuleGraphModule,
   utils::task_loop::{Task, TaskResult, TaskType},
   BoxDependency, CompilationId, CompilerId, CompilerOptions, Context, ExportInfoData,

crates/rspack_core/src/context_module_factory.rs

@@ -2,7 +2,11 @@ use std::{borrow::Cow, fs, sync::Arc};
 
 use cow_utils::CowUtils;
 use derive_more::Debug;
-use rspack_error::{error, miette::IntoDiagnostic, Result, ToStringResultToRspackResultExt};
+use rspack_error::{
+  error,
+  miette::{self, Diagnostic, IntoDiagnostic},
+  Result, ToStringResultToRspackResultExt,
+};
 use rspack_hook::define_hook;
 use rspack_paths::{AssertUtf8, Utf8Path, Utf8PathBuf};
 use rspack_regex::RspackRegex;
@@ -324,10 +328,15 @@ impl ContextModuleFactory {
         data.add_missing_dependencies(missing_dependencies);
         return Ok((ModuleFactoryResult::new_with_module(raw_module), None));
       }
-      Err(err) => {
+      Err(mut e) => {
         data.add_file_dependencies(file_dependencies);
         data.add_missing_dependencies(missing_dependencies);
-        return Err(err);
+        if e.source_code().is_none() {
+          if let Some(source) = &data.original_module_source {
+            e = e.with_source_code(source.source());
+          }
+        }
+        return Err(miette::Error::from(e));
       }
     };
 

crates/rspack_core/src/diagnostics.rs

@@ -1,4 +1,4 @@
-use std::{fmt::Display, path::PathBuf};
+use std::{fmt::Display, path::PathBuf, sync::Arc};
 
 use itertools::Itertools;
 use rspack_error::{
@@ -19,9 +19,10 @@ use crate::{BoxLoader, DependencyRange};
 pub struct EmptyDependency(Box<dyn Diagnostic + Send + Sync>);
 
 impl EmptyDependency {
-  pub fn new(span: DependencyRange) -> Self {
+  pub fn new(source_code: Option<String>, span: DependencyRange) -> Self {
     Self(
-      TraceableError::from_lazy_file(
+      TraceableError::from_arc_string(
+        source_code.map(Arc::new),
         span.start as usize,
         span.end as usize,
         "Empty dependency".to_string(),

crates/rspack_core/src/normal_module_factory.rs

@@ -5,7 +5,11 @@ use std::{
 
 use regex::Regex;
 use rspack_cacheable::cacheable;
-use rspack_error::{error, Result};
+use rspack_error::{
+  error,
+  miette::{self, Diagnostic},
+  Result,
+};
 use rspack_hook::define_hook;
 use rspack_loader_runner::{get_scheme, Loader, Scheme};
 use rspack_paths::Utf8PathBuf;
@@ -235,7 +239,16 @@ impl NormalModuleFactory {
 
         if first_char.is_none() {
           let span = dependency.source_span().unwrap_or_default();
-          return Err(EmptyDependency::new(DependencyRange::new(span.start, span.end)).into());
+          return Err(
+            EmptyDependency::new(
+              data
+                .original_module_source
+                .as_ref()
+                .map(|s| s.source().to_string()),
+              DependencyRange::new(span.start, span.end),
+            )
+            .into(),
+          );
         }
 
         // See: https://webpack.js.org/concepts/loaders/#inline
@@ -356,10 +369,15 @@ impl NormalModuleFactory {
 
             return Ok(Some(ModuleFactoryResult::new_with_module(raw_module)));
           }
-          Err(e) => {
+          Err(mut e) => {
             data.add_file_dependencies(file_dependencies);
             data.add_missing_dependencies(missing_dependencies);
-            return Err(e);
+            if e.source_code().is_none() {
+              if let Some(source) = &data.original_module_source {
+                e = e.with_source_code(source.source());
+              }
+            }
+            return Err(miette::Error::from(e));
           }
         }
       }

crates/rspack_core/src/resolver/mod.rs

@@ -9,7 +9,6 @@ use std::{
 };
 
 use regex::Regex;
-use rspack_error::Error;
 use rspack_loader_runner::{DescriptionData, ResourceData};
 use rspack_paths::{AssertUtf8, Utf8PathBuf};
 use rspack_util::identifier::insert_zero_width_space_for_fragment;
@@ -21,8 +20,8 @@ pub use self::{
   resolver_impl::{ResolveInnerOptions, Resolver},
 };
 use crate::{
-  Context, DependencyCategory, DependencyType, ErrorSpan, ModuleIdentifier, Resolve,
-  SharedPluginDriver,
+  diagnostics::ModuleNotFoundError, Context, DependencyCategory, DependencyType, ErrorSpan,
+  ModuleIdentifier, Resolve, SharedPluginDriver,
 };
 
 static RELATIVE_PATH_REGEX: LazyLock<Regex> =
@@ -306,7 +305,7 @@ if its extension was not listed in the `resolve.extensions`. Here're some possib
 pub async fn resolve(
   args: ResolveArgs<'_>,
   plugin_driver: &SharedPluginDriver,
-) -> Result<ResolveResult, Error> {
+) -> Result<ResolveResult, ModuleNotFoundError> {
   let dep = ResolveOptionsWithDependencyType {
     resolve_options: args
       .resolve_options
@@ -346,5 +345,5 @@ pub async fn resolve(
     result = result.map_err(|err| err.with_help(hint))
   };
 
-  result.map_err(|e| Error::from(e))
+  result
 }

packages/rspack-test-tools/tests/__snapshots__/StatsOutput.test.js.snap

@@ -405,7 +405,7 @@ runtime modules 274 bytes 1 module
 ./index.js 39 bytes [built] [code generated] [1 error]
 
 ERROR in ./index.js 1:0-22
-  × Invalid "exports" target "../../index.js" defined for '.' in the package config <TEST_TOOLS_ROOT>/tests/statsOutputCases/resolve-unexpected-exports-in-pkg-error/node_modules/pkg-a/package.json
+  × Module not found: Invalid "exports" target "../../index.js" defined for '.' in the package config <TEST_TOOLS_ROOT>/tests/statsOutputCases/resolve-unexpected-exports-in-pkg-error/node_modules/pkg-a/package.json
 
 Rspack x.x.x compiled with 1 error in X s
 `;

packages/rspack-test-tools/tests/diagnosticsCases/factorize/cannot-resolve-with-bom/stats.err

@@ -1,5 +1,5 @@
 ERROR in ./index.js 1:8-20
-  × JSON parse error: BOM character found in '<TEST_TOOLS_ROOT>/tests/diagnosticsCases/factorize/cannot-resolve-with-bom/node_modules/bommodule/package.json'
+  × Module not found: JSON parse error: BOM character found in '<TEST_TOOLS_ROOT>/tests/diagnosticsCases/factorize/cannot-resolve-with-bom/node_modules/bommodule/package.json'
    ╭─[1:0]
  1 │ {
    · ▲

packages/rspack-test-tools/tests/diagnosticsCases/factorize/cannot-resolve-with-broken-json/stats.err

@@ -1,5 +1,5 @@
 ERROR in ./index.js 1:8-14
-  × JSON parse error: control character (/u0000-/u001F) found while parsing a string at line 3 column 0 in '<TEST_TOOLS_ROOT>/tests/diagnosticsCases/factorize/cannot-resolve-with-broken-json/node_modules/foo/package.json'
+  × Module not found: JSON parse error: control character (/u0000-/u001F) found while parsing a string at line 3 column 0 in '<TEST_TOOLS_ROOT>/tests/diagnosticsCases/factorize/cannot-resolve-with-broken-json/node_modules/foo/package.json'
    ╭─[3:0]
  1 │ {
  2 │   "name": "foo

packages/rspack-test-tools/tests/errorCases/error-map.js

@@ -23,6 +23,11 @@ module.exports = {
 		expect(errors).toMatchInlineSnapshot(`
 		Array [
 		  Object {
+		    error: Object {
+		  "message": "Can't resolve './answer' in '<TEST_TOOLS_ROOT>/tests/fixtures/errors/resolve-fail-esm'",
+		  "name": "Error",
+		  "stack": "Error: Can't resolve './answer' in '<TEST_TOOLS_ROOT>/tests/fixtures/errors/resolve-fail-esm'\\n    at Proxy.map (<RSPACK_ROOT>/dist/index.js<LINE_COL>)\\n    at <TEST_TOOLS_ROOT>/tests/errorCases/error-map.js<LINE_COL>\\n    at Object.fn (<RSPACK_ROOT>/dist/index.js<LINE_COL>)\\n    at next (<ROOT>/node_modules/<PNPM_INNER>/@rspack/lite-tapable/dist/index.js<LINE_COL>)\\n    at AsyncSeriesHook.callAsyncStageRange (<ROOT>/node_modules/<PNPM_INNER>/@rspack/lite-tapable/dist/index.js<LINE_COL>)\\n    at AsyncSeriesHook.callAsync (<ROOT>/node_modules/<PNPM_INNER>/@rspack/lite-tapable/dist/index.js<LINE_COL>)\\n    at <RSPACK_ROOT>/dist/index.js<LINE_COL>",
+		},
 		    index: 0,
 		    loc: 1:0-33,
 		    module: NormalModule {