fix

Author: Boshen

src/error.rs

@@ -41,10 +41,6 @@ pub enum ResolveError {
     #[error("{0}")]
     IOError(IOError),
 
-    /// For example, Windows UNC path with Volume GUID is not supported.
-    #[error("Path {0:?} contains unsupported construct.")]
-    PathNotSupported(PathBuf),
-
     /// Node.js builtin module when `Options::builtin_modules` is enabled.
     ///
     /// `is_runtime_module` can be used to determine whether the request

src/file_system.rs

@@ -3,6 +3,8 @@ use std::{
     path::{Path, PathBuf},
 };
 
+use crate::path::dunce;
+
 use cfg_if::cfg_if;
 #[cfg(feature = "yarn_pnp")]
 use pnp::fs::{LruZipCache, VPath, VPathInfo, ZipCache};
@@ -155,28 +157,11 @@ impl FileSystemOs {
     /// See [std::fs::read_link]
     #[inline]
     pub fn read_link(path: &Path) -> io::Result<PathBuf> {
-        fs::read_link(path).map(adjust_canonicalization)
+        let path = fs::read_link(path)?;
+        Ok(dunce(path))
     }
 }
 
-#[cfg(not(target_os = "windows"))]
-#[inline]
-fn adjust_canonicalization(p: PathBuf) -> PathBuf {
-    p
-}
-
-/// When applicable, converts a [DOS device path](https://learn.microsoft.com/en-us/dotnet/standard/io/file-path-formats#dos-device-paths)
-/// to a normal path (usually, "Traditional DOS paths" or "UNC path") that can be consumed by the `import`/`require` syntax of Node.js.
-/// i.e. Remove `\\?\`, `\\.\` prefix then `\\?\UNC` prefix.
-/// Code adapted from <https://stackoverflow.com/questions/50322817/how-do-i-remove-the-prefix-from-a-canonical-windows-path>
-#[cfg(target_os = "windows")]
-#[inline]
-fn adjust_canonicalization(p: PathBuf) -> PathBuf {
-    let p = p.strip_prefix(r#"\\?\"#).map(|p| p.to_path_buf()).unwrap_or(p);
-    let p = p.strip_prefix(r#"\\.\"#).map(|p| p.to_path_buf()).unwrap_or(p);
-    dunce::simplified(&p).to_path_buf()
-}
-
 impl FileSystem for FileSystemOs {
     fn read_to_string(&self, path: &Path) -> io::Result<String> {
         cfg_if! {
@@ -240,21 +225,3 @@ fn metadata() {
     );
     let _ = meta;
 }
-
-#[cfg(target_os = "windows")]
-#[test]
-fn test_strip_windows_prefix() {
-    let cases = [
-        (r"\\?\C:\Users\user\Documents\file1.txt", r"C:\Users\user\Documents\file1.txt"),
-        (r"\\.\C:\Users\user\Documents\file2.txt", r"C:\Users\user\Documents\file2.txt"),
-        (r"\\?\UNC\server\share\file3.txt", r"\\server\share\file3.txt"),
-        (
-            r"\\?\Volume{c8ec34d8-3ba6-45c3-9b9d-3e4148e12d00}\file4.txt",
-            r"\\?\BootPartition\file4.txt",
-        ),
-    ];
-
-    for (path, expected) in cases {
-        assert_eq!(adjust_canonicalization(PathBuf::from(path)), PathBuf::from(expected));
-    }
-}

src/fs_cache.rs

@@ -22,7 +22,7 @@ use crate::{
     TsConfigSerde,
     cache::{Cache, CachedPath},
     context::ResolveContext as Ctx,
-    path::PathUtil,
+    path::{PathUtil, dunce},
 };
 
 static THREAD_COUNT: AtomicU64 = AtomicU64::new(1);
@@ -77,17 +77,7 @@ impl<Fs: FileSystem> Cache for FsCache<Fs> {
 
     fn canonicalize(&self, path: &Self::Cp) -> Result<PathBuf, ResolveError> {
         let cached_path = self.canonicalize_impl(path)?;
-        let path = cached_path.to_path_buf();
-        cfg_if! {
-            if #[cfg(windows)] {
-                match crate::FileSystemOs::try_strip_windows_prefix(&path) {
-                    Some(path) => Ok(path),
-                    None => Err(ResolveError::PathNotSupported(path)),
-                }
-            } else {
-                Ok(path)
-            }
-        }
+        Ok(dunce(cached_path.to_path_buf()))
     }
 
     fn is_file(&self, path: &Self::Cp, ctx: &mut Ctx) -> bool {

src/path.rs

@@ -100,6 +100,24 @@ impl PathUtil for Path {
     }
 }
 
+#[cfg(not(target_os = "windows"))]
+#[inline]
+pub fn dunce(p: PathBuf) -> PathBuf {
+    p
+}
+
+/// When applicable, converts a [DOS device path](https://learn.microsoft.com/en-us/dotnet/standard/io/file-path-formats#dos-device-paths)
+/// to a normal path (usually, "Traditional DOS paths" or "UNC path") that can be consumed by the `import`/`require` syntax of Node.js.
+/// i.e. Remove `\\?\`, `\\.\` prefix then `\\?\UNC` prefix.
+/// Code adapted from <https://stackoverflow.com/questions/50322817/how-do-i-remove-the-prefix-from-a-canonical-windows-path>
+#[cfg(target_os = "windows")]
+#[inline]
+pub fn dunce(p: PathBuf) -> PathBuf {
+    let p = p.strip_prefix(r#"\\?\"#).map(|p| p.to_path_buf()).unwrap_or(p);
+    let p = p.strip_prefix(r#"\\.\"#).map(|p| p.to_path_buf()).unwrap_or(p);
+    dunce::simplified(&p).to_path_buf()
+}
+
 // https://github.com/webpack/enhanced-resolve/blob/main/test/path.test.js
 #[test]
 fn is_invalid_exports_target() {
@@ -130,3 +148,21 @@ fn normalize() {
     assert_eq!(Path::new("C:").normalize(), Path::new("C:"));
     assert_eq!(Path::new(r"\\server\share").normalize(), Path::new(r"\\server\share"));
 }
+
+#[cfg(target_os = "windows")]
+#[test]
+fn dunce() {
+    let cases = [
+        (r"\\?\C:\Users\user\Documents\file1.txt", r"C:\Users\user\Documents\file1.txt"),
+        (r"\\.\C:\Users\user\Documents\file2.txt", r"C:\Users\user\Documents\file2.txt"),
+        (r"\\?\UNC\server\share\file3.txt", r"\\server\share\file3.txt"),
+        (
+            r"\\?\Volume{c8ec34d8-3ba6-45c3-9b9d-3e4148e12d00}\file4.txt",
+            r"\\?\BootPartition\file4.txt",
+        ),
+    ];
+
+    for (path, expected) in cases {
+        assert_eq!(dunce(PathBuf::from(path)), PathBuf::from(expected));
+    }
+}