fix: verbatim windows paths

Author: Bushuo

rewatch/src/build/compile.rs

@@ -7,6 +7,7 @@ use super::logs;
 use super::packages;
 use crate::config;
 use crate::helpers;
+use crate::helpers::StrippedVerbatimPath;
 use ahash::{AHashMap, AHashSet};
 use anyhow::anyhow;
 use console::style;
@@ -448,17 +449,12 @@ pub fn compiler_args(
                         "{}:{}:{}",
                         spec.module,
                         if spec.in_source {
-                            Path::new(file_path)
-                                .parent()
-                                .unwrap()
-                                .to_str()
-                                .unwrap()
-                                .to_string()
+                            file_path.parent().unwrap().to_str().unwrap().to_string()
                         } else {
                             Path::new("lib")
                                 .join(Path::join(
                                     Path::new(&spec.get_out_of_source_dir()),
-                                    Path::new(file_path).parent().unwrap(),
+                                    file_path.parent().unwrap(),
                                 ))
                                 .to_str()
                                 .unwrap()
@@ -623,7 +619,13 @@ fn compile_file(
     );
 
     let to_mjs = Command::new(bsc_path)
-        .current_dir(build_path_abs.canonicalize().ok().unwrap())
+        .current_dir(
+            build_path_abs
+                .canonicalize()
+                .map(StrippedVerbatimPath::to_stripped_verbatim_path)
+                .ok()
+                .unwrap(),
+        )
         .args(to_mjs_args)
         .output();
 

rewatch/src/build/namespaces.rs

@@ -1,4 +1,5 @@
 use crate::build::packages;
+use crate::helpers::StrippedVerbatimPath;
 use ahash::AHashSet;
 use std::fs::File;
 use std::io::Write;
@@ -56,7 +57,13 @@ pub fn compile_mlmap(package: &packages::Package, namespace: &str, bsc_path: &Pa
     let args = vec!["-w", "-49", "-color", "always", "-no-alias-deps", &mlmap_name];
 
     let _ = Command::new(bsc_path)
-        .current_dir(build_path_abs.canonicalize().ok().unwrap())
+        .current_dir(
+            build_path_abs
+                .canonicalize()
+                .map(StrippedVerbatimPath::to_stripped_verbatim_path)
+                .ok()
+                .unwrap(),
+        )
         .args(args)
         .output()
         .expect("err");

rewatch/src/build/packages.rs

@@ -4,6 +4,7 @@ use super::packages;
 use crate::config;
 use crate::helpers;
 use crate::helpers::emojis::*;
+use crate::helpers::StrippedVerbatimPath;
 use ahash::{AHashMap, AHashSet};
 use anyhow::{anyhow, Result};
 use console::style;
@@ -265,7 +266,7 @@ pub fn read_dependency(
         )),
     }?;
 
-    let canonical_path = match path.canonicalize() {
+    let canonical_path = match path.canonicalize().map(StrippedVerbatimPath::to_stripped_verbatim_path) {
         Ok(canonical_path) => Ok(canonical_path),
         Err(e) => {
             Err(format!(
@@ -429,7 +430,10 @@ fn make_package(config: config::Config, package_path: &Path, is_pinned_dep: bool
         namespace: config.get_namespace(),
         modules: None,
         // we canonicalize the path name so it's always the same
-        path: package_path.canonicalize().expect("Could not canonicalize"),
+        path: package_path
+            .canonicalize()
+            .map(StrippedVerbatimPath::to_stripped_verbatim_path)
+            .expect("Could not canonicalize"),
         dirs: None,
         is_pinned_dep,
         is_local_dep: !package_path.components().any(|c| c.as_os_str() == "node_modules"),

rewatch/src/helpers.rs

@@ -36,6 +36,53 @@ pub mod emojis {
     pub static LINE_CLEAR: &str = "\x1b[2K\r";
 }
 
+/// This trait is used to strip the verbatim prefix from a Windows path.
+/// On non-Windows systems, it simply returns the original path.
+/// This is needed until the rescript compiler can handle such paths.
+pub trait StrippedVerbatimPath {
+    fn to_stripped_verbatim_path(self) -> PathBuf;
+}
+
+impl StrippedVerbatimPath for PathBuf {
+    fn to_stripped_verbatim_path(self) -> PathBuf {
+        if cfg!(not(target_os = "windows")) {
+            return self;
+        }
+
+        let mut stripped = PathBuf::new();
+        for component in self.components() {
+            match component {
+                Component::Prefix(prefix_component) => {
+                    if prefix_component.kind().is_verbatim() {
+                        stripped.push(
+                            prefix_component
+                                .as_os_str()
+                                .to_string_lossy()
+                                .strip_prefix("\\\\?\\")
+                                .unwrap(),
+                        );
+                    } else {
+                        stripped.push(prefix_component.as_os_str());
+                    }
+                }
+                Component::RootDir => {
+                    stripped.push(Component::RootDir);
+                }
+                Component::CurDir => {
+                    stripped.push(Component::CurDir);
+                }
+                Component::ParentDir => {
+                    stripped.push(Component::ParentDir);
+                }
+                Component::Normal(os_str) => {
+                    stripped.push(os_str);
+                }
+            }
+        }
+        stripped
+    }
+}
+
 pub trait LexicalAbsolute {
     fn to_lexical_absolute(&self) -> std::io::Result<PathBuf>;
 }
@@ -152,7 +199,8 @@ pub fn get_bsc(root_path: &Path, workspace_root: &Option<PathBuf>) -> PathBuf {
             .join(subfolder)
             .join("bin")
             .join("bsc.exe")
-            .canonicalize(),
+            .canonicalize()
+            .map(StrippedVerbatimPath::to_stripped_verbatim_path),
         workspace_root.as_ref().map(|workspace_root| {
             workspace_root
                 .join("node_modules")
@@ -161,6 +209,7 @@ pub fn get_bsc(root_path: &Path, workspace_root: &Option<PathBuf>) -> PathBuf {
                 .join("bin")
                 .join("bsc.exe")
                 .canonicalize()
+                .map(StrippedVerbatimPath::to_stripped_verbatim_path)
         }),
     ) {
         (Ok(path), _) => path,
@@ -212,7 +261,10 @@ pub fn get_compiler_asset(
 }
 
 pub fn canonicalize_string_path(path: &str) -> Option<PathBuf> {
-    return Path::new(path).canonicalize().ok();
+    return Path::new(path)
+        .canonicalize()
+        .map(StrippedVerbatimPath::to_stripped_verbatim_path)
+        .ok();
 }
 
 pub fn get_bs_compiler_asset(

rewatch/src/watcher.rs

@@ -4,6 +4,7 @@ use crate::build::clean;
 use crate::cmd;
 use crate::helpers;
 use crate::helpers::emojis::*;
+use crate::helpers::StrippedVerbatimPath;
 use crate::queue::FifoQueue;
 use crate::queue::*;
 use futures_timer::Delay;
@@ -144,7 +145,10 @@ async fn async_watch(
                     ) => {
                         // if we are going to compile incrementally, we need to mark the exact files
                         // dirty
-                        if let Ok(canonicalized_path_buf) = path_buf.canonicalize() {
+                        if let Ok(canonicalized_path_buf) = path_buf
+                            .canonicalize()
+                            .map(StrippedVerbatimPath::to_stripped_verbatim_path)
+                        {
                             for module in build_state.modules.values_mut() {
                                 match module.source_type {
                                     SourceType::SourceFile(ref mut source_file) => {