perf: do not canonicalize the entry path (#848)

This was introduced in `https://github.com/unrs/unrs-resolver/pull/125`

The PR description and test case do not explain the reasoning behind this change, and I don't see how it reflects a real-world scenario in modern package managers.

Author: Boshen

fixtures/symlink-with-nested-node_modules/.gitignore

@@ -260,20 +260,9 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
     ) -> Result<Resolution, ResolveError> {
         ctx.with_fully_specified(self.options.fully_specified);
 
-        let cached_path = if self.options.symlinks {
-            self.load_realpath(&self.cache.value(path))?
-        } else {
-            path.to_path_buf()
-        };
-
-        let cached_path = self.cache.value(&cached_path);
+        let cached_path = self.cache.value(path);
         let cached_path = self.require(&cached_path, specifier, ctx)?;
-
-        let path = if self.options.symlinks {
-            self.load_realpath(&cached_path)?
-        } else {
-            cached_path.to_path_buf()
-        };
+        let path = self.load_realpath(&cached_path)?;
 
         let package_json = self.find_package_json_for_a_package(&cached_path, ctx)?;
         if let Some(package_json) = &package_json {

fixtures/symlink-with-nested-node_modules/bar/node_modules/foo

@@ -1,6 +1,6 @@
 //! Tests for `Resolution::package_json`.
 
-use crate::{ResolveError, Resolver};
+use crate::Resolver;
 
 #[test]
 fn test() {
@@ -68,8 +68,9 @@ fn package_json_with_symlinks_true() {
 fn test_corrupted_package_json() {
     use std::path::Path;
 
+    use crate::{ResolveError, ResolveOptions, ResolverGeneric};
+
     use super::memory_fs::MemoryFS;
-    use crate::{ResolveOptions, ResolverGeneric};
 
     // Test scenarios for various corrupted package.json files
     let scenarios = [

fixtures/symlink-with-nested-node_modules/foo/node_modules/dep/index.js

@@ -165,22 +165,6 @@ fn resolve_dot() {
     }
 }
 
-#[test]
-fn symlink_with_nested_node_modules() {
-    let f = super::fixture_root().join("symlink-with-nested-node_modules");
-
-    let resolver = Resolver::default();
-    let resolved_path =
-        resolver.resolve(f.join("bar/node_modules/foo"), "dep").map(|r| r.full_path());
-    assert_eq!(resolved_path, Ok(f.join("foo/node_modules/dep/index.js")));
-
-    let resolver = Resolver::new(ResolveOptions { symlinks: false, ..ResolveOptions::default() });
-    assert_eq!(
-        resolver.resolve(f.join("bar/node_modules/foo"), "dep"),
-        Err(ResolveError::NotFound("dep".into()))
-    );
-}
-
 #[test]
 fn abnormal_relative() {
     let f = super::fixture_root().join("abnormal-relative-with-node_modules");

fixtures/symlink-with-nested-node_modules/foo/node_modules/foo/index.js

@@ -174,7 +174,7 @@ fn test() {
 fn test_unsupported_targets() {
     use crate::ResolveError;
 
-    let Some(SymlinkFixturePaths { root: _, temp_path }) =
+    let Some(SymlinkFixturePaths { root, temp_path }) =
         prepare_symlinks("temp.test_unsupported_targets").unwrap()
     else {
         return;
@@ -200,9 +200,10 @@ fn test_unsupported_targets() {
     //   from `FsCachedPath::find_package_json` when trying to canonicalize the full path of `package.json`.
     // * Otherwise, a `ResolveError::NotFound` will be returned.
     let dos_device_temp_path = get_dos_device_path(&temp_path).unwrap();
+    let dos_device_root = get_dos_device_path(&root).unwrap();
     assert_eq!(
         resolver_with_symlinks.resolve(&dos_device_temp_path, "./index.js"),
-        Err(ResolveError::PathNotSupported(dos_device_temp_path))
+        Err(ResolveError::PathNotSupported(dos_device_root))
     );
 }