chore: testing on CI

Author: JounQin

src/lib.rs

@@ -157,12 +157,18 @@ pub fn init_pnp_manifest<P: AsRef<Path>>(manifest: &mut Manifest, p: P) {
 
     for (name, ranges) in manifest.package_registry_data.iter_mut() {
         for (reference, info) in ranges.iter_mut() {
+            println!("manifest.manifest_dir, {}", manifest.manifest_dir.to_string_lossy());
+
             let package_location = manifest.manifest_dir.join(info.package_location.clone());
 
             let normalized_location = util::normalize_path(package_location.to_string_lossy());
 
+            println!("normalized_location: {normalized_location}");
+
             info.package_location = PathBuf::from(normalized_location);
 
+            println!("info.package_location: {}", info.package_location.to_string_lossy());
+
             if !info.discard_from_lookup {
                 manifest.location_trie.insert(
                     &info.package_location,
@@ -207,6 +213,12 @@ pub fn find_locator<'a, P: AsRef<Path>>(
         }
     }
 
+    println!("path {}", path.as_ref().to_string_lossy());
+
+    let path = util::normalize_path(path.as_ref().to_string_lossy());
+
+    println!("path {path}");
+
     manifest.location_trie.get_ancestor_value(&path)
 }
 
@@ -341,10 +353,7 @@ pub fn resolve_to_unqualified_via_manifest<P: AsRef<Path>>(
                 }
             }?;
 
-            Ok(Resolution::Resolved(
-                dependency_pkg.package_location.clone(),
-                module_path,
-            ))
+            Ok(Resolution::Resolved(dependency_pkg.package_location.clone(), module_path))
         } else {
             let broken_ancestors = find_broken_peer_dependencies(specifier, parent_locator);
 

src/lib_tests.rs

@@ -23,7 +23,7 @@ mod tests {
     use super::*;
     use crate::{
         ResolutionConfig, ResolutionHost, init_pnp_manifest, load_pnp_manifest,
-        parse_bare_identifier, resolve_to_unqualified, resolve_to_unqualified_via_manifest,
+        parse_bare_identifier, resolve_to_unqualified, resolve_to_unqualified_via_manifest, util,
     };
 
     #[test]
@@ -167,19 +167,16 @@ mod tests {
     #[test]
     fn test_global_cache() {
         let manifest = load_pnp_manifest(
-            env::current_dir()
-                .unwrap()
-                .join("fixtures")
-                .join("global-cache")
-                .join(".pnp.cjs"),
+            env::current_dir().unwrap().join("fixtures").join("global-cache").join(".pnp.cjs"),
         )
         .unwrap();
 
-        let global_cache = dirs::home_dir()
-            .unwrap()
-            .join(".yarn")
-            .join("berry")
-            .join("cache");
+        let home_dir = dirs::home_dir().unwrap();
+
+        #[cfg(windows)]
+        let global_cache = home_dir.join("AppData\\Local\\Yarn\\Berry");
+        #[cfg(not(windows))]
+        let global_cache = home_dir.join(".yarn/berry/cache");
 
         let result = resolve_to_unqualified_via_manifest(
             &manifest,
@@ -194,12 +191,15 @@ mod tests {
         match result {
             Ok(Resolution::Resolved(path, subpath)) => {
                 assert_eq!(
-                    path,
-                    global_cache
-                        .join("source-map-npm-0.6.1-1a3621db16-10c0.zip")
-                        .join("node_modules")
-                        .join("source-map")
-                        .join("")
+                    path.to_string_lossy(),
+                    util::normalize_path(
+                        global_cache
+                            .join("source-map-npm-0.6.1-1a3621db16-10c0.zip")
+                            .join("node_modules")
+                            .join("source-map")
+                            .join("")
+                            .to_string_lossy()
+                    )
                 );
                 assert_eq!(subpath, None);
             }

src/util.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Deserializer, de::Error};
 use std::borrow::Cow;
 
 use path_slash::PathBufExt;
-use std::path::{Path, PathBuf};
+use std::path::{MAIN_SEPARATOR_STR, Path, PathBuf};
 
 #[derive(Debug, Default, Clone)]
 pub struct Trie<T> {
@@ -39,7 +39,9 @@ pub fn normalize_path<P: AsRef<str>>(original: P) -> String {
     let p = PathBuf::from(original_str);
     let mut str = clean_path::clean(p).to_slash_lossy().to_string();
 
-    if original_str.ends_with('/') && !str.ends_with('/') {
+    if (original_str.ends_with('/') || original_str.ends_with(MAIN_SEPARATOR_STR))
+        && !str.ends_with('/')
+    {
         str.push('/');
     }