Fixes relative drive paths

Author: arcanis

.gitignore

@@ -1 +1 @@
-target
+target

Cargo.lock

@@ -13,7 +13,6 @@ concurrent_lru = "^0.2"
 fancy-regex = { version = "^0.16.0", default-features = false, features = ["std"] }
 miniz_oxide = "^0.8"
 mmap-rs = { version = "^0.6", optional = true }
-path-slash = "0.2.1"
 pathdiff = "^0.2"
 radix_trie = "0.2.1"
 serde = { version = "1", features = ["derive"] }

Cargo.toml

@@ -1,3 +1,5 @@
 enableGlobalCache: true
 
+globalFolder: "D:\\yarn-global"
+
 nodeLinker: pnp

fixtures/global-cache/.yarnrc.yml

@@ -212,5 +212,7 @@ mod tests {
                 panic!("Unexpected resolve failed");
             }
         }
+
+        panic!("test");
     }
 }

src/lib_tests.rs

@@ -1,8 +1,7 @@
 use fancy_regex::Regex;
 use serde::{Deserialize, Deserializer, de::Error};
-use std::{borrow::Cow, path::Component};
+use std::borrow::Cow;
 
-use path_slash::PathBufExt;
 use std::path::{MAIN_SEPARATOR_STR, Path, PathBuf};
 
 #[derive(Debug, Default, Clone)]
@@ -33,35 +32,61 @@ impl<T> Trie<T> {
     }
 }
 
-fn clean_path(path: PathBuf) -> PathBuf {
-    let mut out = Vec::new();
+pub fn normalize_path<P: AsRef<str>>(original: P) -> String {
+    let original_str
+        = original.as_ref();
+
+    let check_str_root
+        = original_str.strip_prefix("/");
+    let str_minus_root
+        = check_str_root.unwrap_or(original_str);
+
+    let components
+        = str_minus_root.split(&['/', '\\'][..]);
+
+    let mut out: Vec<&str>
+        = Vec::new();
 
-    for comp in path.components() {
-        println!("Component: {:?}", comp);
+    for comp in components {
         match comp {
-            Component::CurDir => (),
-            Component::ParentDir => match out.last() {
-                Some(Component::RootDir) => (),
-                Some(Component::Normal(_)) => {
+            "" | "." => {
+                // Those components don't progress the path
+            },
+
+            ".." => match out.last() {
+                None if check_str_root.is_some() => {
+                    // No need to add a ".." since we're already at the root
+                },
+
+                Some(&"..") | None => {
+                    out.push(comp);
+                },
+
+                Some(_) => {
                     out.pop();
-                }
-                None
-                | Some(Component::CurDir)
-                | Some(Component::ParentDir)
-                | Some(Component::Prefix(_)) => out.push(comp),
+                },
+            },
+
+            comp => {
+                out.push(comp)
             },
-            comp => out.push(comp),
         }
     }
 
-    if !out.is_empty() { out.iter().collect() } else { PathBuf::from(".") }
-}
+    if check_str_root.is_some() {
+        if out.is_empty() {
+            return "/".to_string();
+        } else {
+            out.insert(0, "");
+        }
+    }
 
-pub fn normalize_path<P: AsRef<str>>(original: P) -> String {
-    let original_str = original.as_ref();
+    let mut str
+        = out.join("/");
 
-    let p = PathBuf::from(original_str);
-    let mut str = clean_path(p).to_slash_lossy().to_string();
+    if out.is_empty() {
+        return ".".to_string();
+    }
 
     if (original_str.ends_with('/') || original_str.ends_with(MAIN_SEPARATOR_STR))
         && !str.ends_with('/')
@@ -85,12 +110,17 @@ mod tests {
         assert_eq!(normalize_path("foo//bar"), "foo/bar");
         assert_eq!(normalize_path("foo/./bar"), "foo/bar");
         assert_eq!(normalize_path("foo/../bar"), "bar");
+        assert_eq!(normalize_path("foo/..//bar"), "bar");
         assert_eq!(normalize_path("foo/bar/.."), "foo");
         assert_eq!(normalize_path("foo/../../bar"), "../bar");
         assert_eq!(normalize_path("../foo/../../bar"), "../../bar");
         assert_eq!(normalize_path("./foo"), "foo");
         assert_eq!(normalize_path("../foo"), "../foo");
+        assert_eq!(normalize_path("../D:/foo"), "../D:/foo");
         assert_eq!(normalize_path("/foo/bar"), "/foo/bar");
+        assert_eq!(normalize_path("/../foo/bar"), "/foo/bar");
+        assert_eq!(normalize_path("/foo/../../bar/baz"), "/bar/baz");
+        assert_eq!(normalize_path("/../foo/bar"), "/foo/bar");
         assert_eq!(normalize_path("/foo/bar/"), "/foo/bar/");
     }
 }