From fb09f071b2153816102236fac0590ca8898a5bcf Mon Sep 17 00:00:00 2001
From: Jonathan Cammisuli <jon@cammisuli.ca>
Date: Mon, 23 Oct 2023 16:12:00 -0400
Subject: [PATCH] fix(core): provide better error message if we cannot read a
 file when finding imports

---
 .../native/plugins/js/ts_import_locators.rs   | 47 ++++++++++++-------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/packages/nx/src/native/plugins/js/ts_import_locators.rs b/packages/nx/src/native/plugins/js/ts_import_locators.rs
index 80262cd412db2f..c7ebdcd96d3ff7 100644
--- a/packages/nx/src/native/plugins/js/ts_import_locators.rs
+++ b/packages/nx/src/native/plugins/js/ts_import_locators.rs
@@ -1,3 +1,4 @@
+use anyhow::anyhow;
 use std::collections::{HashMap, HashSet};
 use std::fmt::Debug;
 use std::path::Path;
@@ -443,11 +444,13 @@ fn find_specifier_in_require(state: &mut State) -> Option<(String, ImportType)>
     None
 }
 
-fn process_file((source_project, file_path): (&String, &String)) -> Option<ImportResult> {
+fn process_file(
+    (source_project, file_path): (&String, &String),
+) -> anyhow::Result<Option<ImportResult>> {
     let now = Instant::now();
     let cm = Arc::<SourceMap>::default()
         .load_file(Path::new(file_path))
-        .unwrap();
+        .map_err(|e| anyhow!("Unable to load {}: {}", file_path, e))?;
 
     let comments = SingleThreadedComments::default();
 
@@ -573,16 +576,18 @@ fn process_file((source_project, file_path): (&String, &String)) -> Option<Impor
         .filter_map(code_is_not_ignored)
         .collect();
 
-    Some(ImportResult {
+    Ok(Some(ImportResult {
         file: file_path.clone(),
         source_project: source_project.clone(),
         static_import_expressions,
         dynamic_import_expressions,
-    })
+    }))
 }
 
 #[napi]
-fn find_imports(project_file_map: HashMap<String, Vec<String>>) -> Vec<ImportResult> {
+fn find_imports(
+    project_file_map: HashMap<String, Vec<String>>,
+) -> anyhow::Result<Vec<ImportResult>> {
     enable_logger();
 
     let files_to_process: Vec<(&String, &String)> = project_file_map
@@ -592,7 +597,7 @@ fn find_imports(project_file_map: HashMap<String, Vec<String>>) -> Vec<ImportRes
 
     files_to_process
         .into_par_iter()
-        .filter_map(process_file)
+        .filter_map(|file| process_file(file).transpose())
         .collect()
 }
 #[cfg(test)]
@@ -643,7 +648,8 @@ import 'a4'; import 'a5';
         let results = find_imports(HashMap::from([(
             String::from("a"),
             vec![test_file_path.clone()],
-        )]));
+        )]))
+        .unwrap();
 
         let result = results.get(0).unwrap();
 
@@ -795,7 +801,8 @@ import 'a4'; import 'a5';
         let results = find_imports(HashMap::from([(
             String::from("a"),
             vec![test_file_path.clone(), broken_file_path],
-        )]));
+        )]))
+        .unwrap();
 
         let result = results.get(0).unwrap();
         let ast_results: ImportResult = find_imports_with_ast(test_file_path);
@@ -917,7 +924,8 @@ import('./dynamic-import.vue')
         let results = find_imports(HashMap::from([(
             String::from("a"),
             vec![test_file_path.clone()],
-        )]));
+        )]))
+        .unwrap();
 
         let result = results.get(0).unwrap();
 
@@ -963,7 +971,8 @@ import('./dynamic-import.vue')
         let results = find_imports(HashMap::from([(
             String::from("a"),
             vec![test_file_path.clone()],
-        )]));
+        )]))
+        .unwrap();
 
         let result = results.get(0).unwrap();
         let ast_results: ImportResult = find_imports_with_ast(test_file_path);
@@ -1020,7 +1029,8 @@ import('./dynamic-import.vue')
         let results = find_imports(HashMap::from([(
             String::from("a"),
             vec![test_file_path.clone()],
-        )]));
+        )]))
+        .unwrap();
 
         let result = results.get(0).unwrap();
         let ast_results: ImportResult = find_imports_with_ast(test_file_path);
@@ -1058,7 +1068,8 @@ import('./dynamic-import.vue')
         let results = find_imports(HashMap::from([(
             String::from("a"),
             vec![test_file_path.clone()],
-        )]));
+        )]))
+        .unwrap();
 
         let result = results.get(0).unwrap();
         let ast_results: ImportResult = find_imports_with_ast(test_file_path);
@@ -1105,7 +1116,8 @@ import('./dynamic-import.vue')
         let results = find_imports(HashMap::from([(
             String::from("a"),
             vec![test_file_path.clone()],
-        )]));
+        )]))
+        .unwrap();
 
         let result = results.get(0).unwrap();
         let ast_results: ImportResult = find_imports_with_ast(test_file_path);
@@ -1149,7 +1161,8 @@ import('./dynamic-import.vue')
 
         let test_file_path = temp_dir.display().to_string() + "/test.ts";
 
-        let results = find_imports(HashMap::from([(String::from("a"), vec![test_file_path])]));
+        let results =
+            find_imports(HashMap::from([(String::from("a"), vec![test_file_path])])).unwrap();
 
         let result = results.get(0).unwrap();
 
@@ -1188,7 +1201,8 @@ import('./dynamic-import.vue')
         let results = find_imports(HashMap::from([(
             String::from("a"),
             vec![test_file_path.clone()],
-        )]));
+        )]))
+        .unwrap();
 
         let result = results.get(0).unwrap();
         let ast_results: ImportResult = find_imports_with_ast(test_file_path);
@@ -1239,7 +1253,8 @@ import('./dynamic-import.vue')
         let results = find_imports(HashMap::from([(
             String::from("a"),
             vec![test_file_path.clone()],
-        )]));
+        )]))
+        .unwrap();
 
         let result = results.get(0).unwrap();
         let ast_results: ImportResult = find_imports_with_ast(test_file_path);