🐛 - Fix crash due to canonalization

Author: jfrolich

src/build.rs

@@ -99,14 +99,14 @@ fn generate_ast(
             "-bs-ast".to_string(),
             "-o".to_string(),
             ast_path.to_string(),
-            helpers::canonicalize_string_path(file),
+            helpers::canonicalize_string_path(file).unwrap(),
         ],
     ]
     .concat();
 
     /* Create .ast */
     let res_to_ast = Command::new(helpers::get_bsc(&root_path))
-        .current_dir(helpers::canonicalize_string_path(&build_path_abs))
+        .current_dir(helpers::canonicalize_string_path(&build_path_abs).unwrap())
         .args(res_to_ast_args)
         .output()
         .expect("Error converting .res to .ast");
@@ -606,7 +606,7 @@ pub fn compile_mlmap(package: &package_tree::Package, namespace: &str, root_path
     .concat();
 
     let _ = Command::new(helpers::get_bsc(&root_path))
-        .current_dir(helpers::canonicalize_string_path(&build_path_abs))
+        .current_dir(helpers::canonicalize_string_path(&build_path_abs).unwrap())
         .args(args)
         .output()
         .expect("err");
@@ -646,7 +646,7 @@ pub fn compile_file(
         .map(|x| {
             vec![
                 "-I".to_string(),
-                helpers::canonicalize_string_path(&helpers::get_build_path(root_path, &x)),
+                helpers::canonicalize_string_path(&helpers::get_build_path(root_path, &x)).unwrap(),
             ]
         })
         .collect::<Vec<Vec<String>>>();
@@ -713,14 +713,12 @@ pub fn compile_file(
         //     "-I".to_string(),
         //     abs_node_modules_path.to_string() + "/rescript/ocaml",
         // ],
-        vec![helpers::canonicalize_string_path(&ast_path.to_owned())],
+        vec![helpers::canonicalize_string_path(&ast_path.to_owned()).unwrap()],
     ]
     .concat();
 
     let to_mjs = Command::new(helpers::get_bsc(&root_path))
-        .current_dir(helpers::canonicalize_string_path(
-            &build_path_abs.to_owned(),
-        ))
+        .current_dir(helpers::canonicalize_string_path(&build_path_abs.to_owned()).unwrap())
         .args(to_mjs_args)
         .output();
 

src/clean.rs

@@ -166,7 +166,9 @@ pub fn cleanup_previous_build(
 
     let canonicalized_rescript_file_locations = rescript_file_locations
         .iter()
-        .map(|rescript_file_location| helpers::canonicalize_string_path(rescript_file_location))
+        .map(|rescript_file_location| {
+            helpers::canonicalize_string_path(rescript_file_location).unwrap()
+        })
         .collect::<AHashSet<String>>();
     // delete the .mjs file which appear in our previous compile assets
     // but does not exists anymore
@@ -385,7 +387,8 @@ pub fn cleanup_after_build(
             match &module.source_type {
                 SourceType::SourceFile(source_file) => {
                     remove_compile_assets(
-                        &source_file.implementation.path,
+                        &helpers::canonicalize_string_path(&source_file.implementation.path)
+                            .unwrap(),
                         &module.package.name,
                         &module.package.namespace,
                         &project_root,

src/helpers.rs

@@ -171,13 +171,11 @@ pub fn get_compiler_asset(
         + extension
 }
 
-pub fn canonicalize_string_path(path: &str) -> String {
+pub fn canonicalize_string_path(path: &str) -> Option<String> {
     return Path::new(path)
         .canonicalize()
-        .expect("Could not canonicalize")
-        .to_str()
-        .expect("Could not canonicalize")
-        .to_string();
+        .ok()
+        .map(|path| path.to_str().expect("Could not canonicalize").to_string());
 }
 
 pub fn get_bs_compiler_asset(
@@ -191,12 +189,12 @@ pub fn get_bs_compiler_asset(
         "ast" | "iast" => &None,
         _ => namespace,
     };
-    let canoncialized_source_file = canonicalize_string_path(source_file);
+    let canoncialized_source_file = source_file;
+    let canonicalized_path =
+        canonicalize_string_path(&get_package_path(root_path, &package_name)).unwrap();
+
     let dir = std::path::Path::new(&canoncialized_source_file)
-        .strip_prefix(canonicalize_string_path(&get_package_path(
-            root_path,
-            &package_name,
-        )))
+        .strip_prefix(canonicalized_path)
         .unwrap()
         .parent()
         .unwrap();