feat: improve add include error msg (#9529)

Author: SyMind

crates/node_binding/src/compilation/mod.rs

@@ -15,6 +15,7 @@ use rspack_core::BoxDependency;
 use rspack_core::Compilation;
 use rspack_core::CompilationId;
 use rspack_core::EntryOptions;
+use rspack_core::FactorizeInfo;
 use rspack_core::ModuleIdentifier;
 use rspack_error::Diagnostic;
 use rspack_napi::napi::bindgen_prelude::*;
@@ -760,49 +761,53 @@ impl JsCompilation {
       let module_graph = compilation.get_module_graph();
       let results = dependency_ids
         .into_iter()
-        .map(
-          |dependency_id| match module_graph.get_module_by_dependency_id(&dependency_id) {
+        .map(|dependency_id| {
+          if let Some(dependency) = module_graph.dependency_by_id(&dependency_id) {
+            if let Some(factorize_info) = FactorizeInfo::get_from(dependency) {
+              if let Some(diagnostic) = factorize_info.diagnostics().first() {
+                return Either::A(diagnostic.to_string());
+              }
+            }
+          }
+
+          match module_graph.get_module_by_dependency_id(&dependency_id) {
             Some(module) => {
               let js_module =
                 JsModuleWrapper::new(module.identifier(), None, compilation.compiler_id());
-              (Either::B(()), Either::B(js_module))
+              Either::B(js_module)
             }
-            None => (
-              Either::A(format!(
-                "Module created by {:?} cannot be found",
-                dependency_id
-              )),
-              Either::A(()),
-            ),
-          },
-        )
-        .collect::<Vec<(Either<String, ()>, Either<(), JsModuleWrapper>)>>();
+            None => Either::A("build failed with unknown error".to_string()),
+          }
+        })
+        .collect::<Vec<Either<String, JsModuleWrapper>>>();
 
       Ok(JsAddIncludeCallbackArgs(results))
     })
   }
 }
 
-pub struct JsAddIncludeCallbackArgs(Vec<(Either<String, ()>, Either<(), JsModuleWrapper>)>);
+pub struct JsAddIncludeCallbackArgs(Vec<Either<String, JsModuleWrapper>>);
 
 impl ToNapiValue for JsAddIncludeCallbackArgs {
   unsafe fn to_napi_value(env: sys::napi_env, val: Self) -> Result<sys::napi_value> {
     let env_wrapper = Env::from_raw(env);
     let mut js_array = env_wrapper.create_array(0)?;
-    for (error, module) in val.0 {
-      let js_error = match error {
-        Either::A(val) => env_wrapper.create_string(&val)?.into_unknown(),
-        Either::B(_) => env_wrapper.get_undefined()?.into_unknown(),
-      };
-      let js_module = match module {
-        Either::A(_) => env_wrapper.get_undefined()?.into_unknown(),
-        Either::B(val) => {
-          let napi_val = ToNapiValue::to_napi_value(env, val)?;
-          Unknown::from_napi_value(env, napi_val)?
+
+    for result in val.0 {
+      let js_result = match result {
+        Either::A(msg) => vec![
+          env_wrapper.create_string(&msg)?.into_unknown(),
+          env_wrapper.get_undefined()?.into_unknown(),
+        ],
+        Either::B(module) => {
+          let napi_val = ToNapiValue::to_napi_value(env, module)?;
+          let js_module = Unknown::from_napi_value(env, napi_val)?;
+          vec![env_wrapper.get_undefined()?.into_unknown(), js_module]
         }
       };
-      js_array.insert(vec![js_error, js_module])?;
+      js_array.insert(js_result)?;
     }
+
     ToNapiValue::to_napi_value(env, js_array)
   }
 }

packages/rspack-test-tools/tests/configCases/compilation/add-include/rspack.config.js

@@ -59,6 +59,19 @@ class Plugin {
 					);
 				})
 			);
+			tasks.push(
+				new Promise(resolve => {
+					compilation.addInclude(
+						compiler.context,
+						EntryPlugin.createDependency(path.resolve(__dirname, "no-exist.js")),
+						{},
+						(err, module) => {
+							expect(err.message).toMatch(/Can't resolve/);
+							resolve(module);
+						}
+					);
+				})
+			);
 			return Promise.all(tasks);
 		});
 

packages/rspack/src/Compilation.ts

@@ -1264,7 +1264,7 @@ class AddIncludeDispatcher {
 				const cb = cbs[i];
 				cb(
 					errMsg ? new WebpackError(errMsg) : null,
-					Module.__from_binding(moduleBinding)
+					moduleBinding ? Module.__from_binding(moduleBinding) : undefined
 				);
 			}
 		});