refactor: move ByonmNpmResolver to deno_resolver (#25937)

Some more slow progress on moving all the resolution code into
deno_resolver.

6 files changed, 52 insertions, 146 deletions

diff --git a/resolvers/node/Cargo.toml b/resolvers/node/Cargo.toml
index 104204569..c2f2f1cc1 100644
--- a/resolvers/node/Cargo.toml
+++ b/resolvers/node/Cargo.toml
@@ -21,6 +21,7 @@ anyhow.workspace = true
 async-trait.workspace = true
 deno_media_type.workspace = true
 deno_package_json.workspace = true
+deno_path_util.workspace = true
 futures.workspace = true
 lazy-regex.workspace = true
 once_cell.workspace = true
diff --git a/resolvers/node/analyze.rs b/resolvers/node/analyze.rs
index deb56d064..009296006 100644
--- a/resolvers/node/analyze.rs
+++ b/resolvers/node/analyze.rs
@@ -6,6 +6,8 @@ use std::collections::HashSet;
 use std::path::Path;
 use std::path::PathBuf;
 
+use deno_path_util::url_from_file_path;
+use deno_path_util::url_to_file_path;
 use futures::future::LocalBoxFuture;
 use futures::stream::FuturesUnordered;
 use futures::FutureExt;
@@ -18,7 +20,6 @@ use url::Url;
 
 use crate::env::NodeResolverEnv;
 use crate::package_json::load_pkg_json;
-use crate::path::to_file_specifier;
 use crate::resolution::NodeResolverRc;
 use crate::NodeModuleKind;
 use crate::NodeResolutionMode;
@@ -135,8 +136,7 @@ impl<TCjsCodeAnalyzer: CjsCodeAnalyzer, TNodeResolverEnv: NodeResolverEnv>
 
     source.push(format!(
       "const mod = require(\"{}\");",
-      entry_specifier
-        .to_file_path()
+      url_to_file_path(entry_specifier)
         .unwrap()
         .to_str()
         .unwrap()
@@ -297,15 +297,13 @@ impl<TCjsCodeAnalyzer: CjsCodeAnalyzer, TNodeResolverEnv: NodeResolverEnv>
       todo!();
     }
 
-    let referrer_path = referrer.to_file_path().unwrap();
+    let referrer_path = url_to_file_path(referrer).unwrap();
     if specifier.starts_with("./") || specifier.starts_with("../") {
       if let Some(parent) = referrer_path.parent() {
-        return Some(
-          self
-            .file_extension_probe(parent.join(specifier), &referrer_path)
-            .map(|p| to_file_specifier(&p)),
-        )
-        .transpose();
+        return self
+          .file_extension_probe(parent.join(specifier), &referrer_path)
+          .and_then(|p| url_from_file_path(&p).map_err(AnyError::from))
+          .map(Some);
       } else {
         todo!();
       }
@@ -362,24 +360,22 @@ impl<TCjsCodeAnalyzer: CjsCodeAnalyzer, TNodeResolverEnv: NodeResolverEnv>
             load_pkg_json(self.env.pkg_json_fs(), &package_json_path)?;
           if let Some(package_json) = maybe_package_json {
             if let Some(main) = package_json.main(NodeModuleKind::Cjs) {
-              return Ok(Some(to_file_specifier(&d.join(main).clean())));
+              return Ok(Some(url_from_file_path(&d.join(main).clean())?));
             }
           }
 
-          return Ok(Some(to_file_specifier(&d.join("index.js").clean())));
+          return Ok(Some(url_from_file_path(&d.join("index.js").clean())?));
         }
-        return Some(
-          self
-            .file_extension_probe(d, &referrer_path)
-            .map(|p| to_file_specifier(&p)),
-        )
-        .transpose();
+        return self
+          .file_extension_probe(d, &referrer_path)
+          .and_then(|p| url_from_file_path(&p).map_err(AnyError::from))
+          .map(Some);
       } else if let Some(main) = package_json.main(NodeModuleKind::Cjs) {
-        return Ok(Some(to_file_specifier(&module_dir.join(main).clean())));
+        return Ok(Some(url_from_file_path(&module_dir.join(main).clean())?));
       } else {
-        return Ok(Some(to_file_specifier(
+        return Ok(Some(url_from_file_path(
           &module_dir.join("index.js").clean(),
-        )));
+        )?));
       }
     }
 
@@ -395,7 +391,7 @@ impl<TCjsCodeAnalyzer: CjsCodeAnalyzer, TNodeResolverEnv: NodeResolverEnv>
         parent.join("node_modules").join(specifier)
       };
       if let Ok(path) = self.file_extension_probe(path, &referrer_path) {
-        return Ok(Some(to_file_specifier(&path)));
+        return Ok(Some(url_from_file_path(&path)?));
       }
       last = parent;
     }
diff --git a/resolvers/node/clippy.toml b/resolvers/node/clippy.toml
index 86150781b..90eaba3fa 100644
--- a/resolvers/node/clippy.toml
+++ b/resolvers/node/clippy.toml
@@ -42,6 +42,9 @@ disallowed-methods = [
   { path = "std::fs::write", reason = "File system operations should be done using NodeResolverFs trait" },
   { path = "std::path::Path::canonicalize", reason = "File system operations should be done using NodeResolverFs trait" },
   { path = "std::path::Path::exists", reason = "File system operations should be done using NodeResolverFs trait" },
+  { path = "url::Url::to_file_path", reason = "Use deno_path_util instead so it works in Wasm" },
+  { path = "url::Url::from_file_path", reason = "Use deno_path_util instead so it works in Wasm" },
+  { path = "url::Url::from_directory_path", reason = "Use deno_path_util instead so it works in Wasm" },
 ]
 disallowed-types = [
   { path = "std::sync::Arc", reason = "use crate::sync::MaybeArc instead" },
diff --git a/resolvers/node/npm.rs b/resolvers/node/npm.rs
index 77df57c48..6b5f21db6 100644
--- a/resolvers/node/npm.rs
+++ b/resolvers/node/npm.rs
@@ -3,6 +3,8 @@
 use std::path::Path;
 use std::path::PathBuf;
 
+use deno_path_util::url_from_directory_path;
+use deno_path_util::url_from_file_path;
 use url::Url;
 
 use crate::errors;
@@ -24,7 +26,7 @@ pub trait NpmResolver: std::fmt::Debug + MaybeSend + MaybeSync {
   fn in_npm_package(&self, specifier: &Url) -> bool;
 
   fn in_npm_package_at_dir_path(&self, path: &Path) -> bool {
-    let specifier = match Url::from_directory_path(path.to_path_buf().clean()) {
+    let specifier = match url_from_directory_path(&path.to_path_buf().clean()) {
       Ok(p) => p,
       Err(_) => return false,
     };
@@ -32,7 +34,7 @@ pub trait NpmResolver: std::fmt::Debug + MaybeSend + MaybeSync {
   }
 
   fn in_npm_package_at_file_path(&self, path: &Path) -> bool {
-    let specifier = match Url::from_file_path(path.to_path_buf().clean()) {
+    let specifier = match url_from_file_path(&path.to_path_buf().clean()) {
       Ok(p) => p,
       Err(_) => return false,
     };
diff --git a/resolvers/node/path.rs b/resolvers/node/path.rs
index ece270cd9..8c2d35fad 100644
--- a/resolvers/node/path.rs
+++ b/resolvers/node/path.rs
@@ -4,8 +4,6 @@ use std::path::Component;
 use std::path::Path;
 use std::path::PathBuf;
 
-use url::Url;
-
 /// Extension to path_clean::PathClean
 pub trait PathClean<T> {
   fn clean(&self) -> T;
@@ -65,65 +63,6 @@ impl PathClean<PathBuf> for PathBuf {
   }
 }
 
-pub(crate) fn to_file_specifier(path: &Path) -> Url {
-  match Url::from_file_path(path) {
-    Ok(url) => url,
-    Err(_) => panic!("Invalid path: {}", path.display()),
-  }
-}
-
-// todo(dsherret): we have the below code also in deno_core and it
-// would be good to somehow re-use it in both places (we don't want
-// to create a dependency on deno_core here)
-
-#[cfg(not(windows))]
-#[inline]
-pub fn strip_unc_prefix(path: PathBuf) -> PathBuf {
-  path
-}
-
-/// Strips the unc prefix (ex. \\?\) from Windows paths.
-#[cfg(windows)]
-pub fn strip_unc_prefix(path: PathBuf) -> PathBuf {
-  use std::path::Component;
-  use std::path::Prefix;
-
-  let mut components = path.components();
-  match components.next() {
-    Some(Component::Prefix(prefix)) => {
-      match prefix.kind() {
-        // \\?\device
-        Prefix::Verbatim(device) => {
-          let mut path = PathBuf::new();
-          path.push(format!(r"\\{}\", device.to_string_lossy()));
-          path.extend(components.filter(|c| !matches!(c, Component::RootDir)));
-          path
-        }
-        // \\?\c:\path
-        Prefix::VerbatimDisk(_) => {
-          let mut path = PathBuf::new();
-          path.push(prefix.as_os_str().to_string_lossy().replace(r"\\?\", ""));
-          path.extend(components);
-          path
-        }
-        // \\?\UNC\hostname\share_name\path
-        Prefix::VerbatimUNC(hostname, share_name) => {
-          let mut path = PathBuf::new();
-          path.push(format!(
-            r"\\{}\{}\",
-            hostname.to_string_lossy(),
-            share_name.to_string_lossy()
-          ));
-          path.extend(components.filter(|c| !matches!(c, Component::RootDir)));
-          path
-        }
-        _ => path,
-      }
-    }
-    _ => path,
-  }
-}
-
 #[cfg(test)]
 mod test {
   #[cfg(windows)]
@@ -139,41 +78,4 @@ mod test {
       assert_eq!(PathBuf::from(input).clean(), PathBuf::from(expected));
     }
   }
-
-  #[cfg(windows)]
-  #[test]
-  fn test_strip_unc_prefix() {
-    use std::path::PathBuf;
-
-    run_test(r"C:\", r"C:\");
-    run_test(r"C:\test\file.txt", r"C:\test\file.txt");
-
-    run_test(r"\\?\C:\", r"C:\");
-    run_test(r"\\?\C:\test\file.txt", r"C:\test\file.txt");
-
-    run_test(r"\\.\C:\", r"\\.\C:\");
-    run_test(r"\\.\C:\Test\file.txt", r"\\.\C:\Test\file.txt");
-
-    run_test(r"\\?\UNC\localhost\", r"\\localhost");
-    run_test(r"\\?\UNC\localhost\c$\", r"\\localhost\c$");
-    run_test(
-      r"\\?\UNC\localhost\c$\Windows\file.txt",
-      r"\\localhost\c$\Windows\file.txt",
-    );
-    run_test(r"\\?\UNC\wsl$\deno.json", r"\\wsl$\deno.json");
-
-    run_test(r"\\?\server1", r"\\server1");
-    run_test(r"\\?\server1\e$\", r"\\server1\e$\");
-    run_test(
-      r"\\?\server1\e$\test\file.txt",
-      r"\\server1\e$\test\file.txt",
-    );
-
-    fn run_test(input: &str, expected: &str) {
-      assert_eq!(
-        super::strip_unc_prefix(PathBuf::from(input)),
-        PathBuf::from(expected)
-      );
-    }
-  }
 }
diff --git a/resolvers/node/resolution.rs b/resolvers/node/resolution.rs
index ad9dbb710..811583a5e 100644
--- a/resolvers/node/resolution.rs
+++ b/resolvers/node/resolution.rs
@@ -8,6 +8,8 @@ use anyhow::bail;
 use anyhow::Error as AnyError;
 use deno_media_type::MediaType;
 use deno_package_json::PackageJsonRc;
+use deno_path_util::strip_unc_prefix;
+use deno_path_util::url_from_file_path;
 use serde_json::Map;
 use serde_json::Value;
 use url::Url;
@@ -47,8 +49,6 @@ use crate::errors::TypesNotFoundErrorData;
 use crate::errors::UnsupportedDirImportError;
 use crate::errors::UnsupportedEsmUrlSchemeError;
 use crate::errors::UrlToNodeResolutionError;
-use crate::path::strip_unc_prefix;
-use crate::path::to_file_specifier;
 use crate::NpmResolverRc;
 use crate::PathClean;
 use deno_package_json::PackageJson;
@@ -394,7 +394,7 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
           message: err.to_string(),
         }
       })?;
-    let url = to_file_specifier(&package_folder.join(bin_entry));
+    let url = url_from_file_path(&package_folder.join(bin_entry)).unwrap();
 
     let resolve_response = self.url_to_node_resolution(url)?;
     // TODO(bartlomieju): skipped checking errors for commonJS resolution and
@@ -485,12 +485,12 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
       || lowercase_path.ends_with(".d.cts")
       || lowercase_path.ends_with(".d.mts")
     {
-      return Ok(to_file_specifier(path));
+      return Ok(url_from_file_path(path).unwrap());
     }
     if let Some(path) =
       probe_extensions(&self.env, path, &lowercase_path, referrer_kind)
     {
-      return Ok(to_file_specifier(&path));
+      return Ok(url_from_file_path(&path).unwrap());
     }
     if self.env.is_dir_sync(path) {
       let resolution_result = self.resolve_package_dir_subpath(
@@ -514,15 +514,15 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
         &index_path.to_string_lossy().to_lowercase(),
         referrer_kind,
       ) {
-        return Ok(to_file_specifier(&path));
+        return Ok(url_from_file_path(&path).unwrap());
       }
     }
     // allow resolving .css files for types resolution
     if lowercase_path.ends_with(".css") {
-      return Ok(to_file_specifier(path));
+      return Ok(url_from_file_path(path).unwrap());
     }
     Err(TypesNotFoundError(Box::new(TypesNotFoundErrorData {
-      code_specifier: to_file_specifier(path),
+      code_specifier: url_from_file_path(path).unwrap(),
       maybe_referrer: maybe_referrer.cloned(),
     })))
   }
@@ -673,7 +673,8 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
             } else {
               format!("{target}{subpath}")
             };
-            let package_json_url = to_file_specifier(package_json_path);
+            let package_json_url =
+              url_from_file_path(package_json_path).unwrap();
             let result = match self.package_resolve(
               &export_target,
               &package_json_url,
@@ -760,7 +761,7 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
       );
     }
     if subpath.is_empty() {
-      return Ok(to_file_specifier(&resolved_path));
+      return Ok(url_from_file_path(&resolved_path).unwrap());
     }
     if invalid_segment_re.is_match(subpath) {
       let request = if pattern {
@@ -782,9 +783,11 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
       let resolved_path_str = resolved_path.to_string_lossy();
       let replaced = pattern_re
         .replace(&resolved_path_str, |_caps: &regex::Captures| subpath);
-      return Ok(to_file_specifier(&PathBuf::from(replaced.to_string())));
+      return Ok(
+        url_from_file_path(&PathBuf::from(replaced.to_string())).unwrap(),
+      );
     }
-    Ok(to_file_specifier(&resolved_path.join(subpath).clean()))
+    Ok(url_from_file_path(&resolved_path.join(subpath).clean()).unwrap())
   }
 
   #[allow(clippy::too_many_arguments)]
@@ -871,7 +874,7 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
         mode,
       )?;
       if mode.is_types() && url.scheme() == "file" {
-        let path = url.to_file_path().unwrap();
+        let path = deno_path_util::url_to_file_path(&url).unwrap();
         return Ok(Some(self.path_to_declaration_url(
           &path,
           maybe_referrer,
@@ -1307,7 +1310,7 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
     if mode.is_types() {
       Ok(self.path_to_declaration_url(&file_path, referrer, referrer_kind)?)
     } else {
-      Ok(to_file_specifier(&file_path))
+      Ok(url_from_file_path(&file_path).unwrap())
     }
   }
 
@@ -1338,7 +1341,7 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
     &self,
     url: &Url,
   ) -> Result<Option<PackageJsonRc>, ClosestPkgJsonError> {
-    let Ok(file_path) = url.to_file_path() else {
+    let Ok(file_path) = deno_path_util::url_to_file_path(url) else {
       return Ok(None);
     };
     self.get_closest_package_json_from_path(&file_path)
@@ -1433,7 +1436,7 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
     if let Some(main) = maybe_main {
       let guess = package_json.path.parent().unwrap().join(main).clean();
       if self.env.is_file_sync(&guess) {
-        return Ok(to_file_specifier(&guess));
+        return Ok(url_from_file_path(&guess).unwrap());
       }
 
       // todo(dsherret): investigate exactly how node and typescript handles this
@@ -1463,7 +1466,7 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
           .clean();
         if self.env.is_file_sync(&guess) {
           // TODO(bartlomieju): emitLegacyIndexDeprecation()
-          return Ok(to_file_specifier(&guess));
+          return Ok(url_from_file_path(&guess).unwrap());
         }
       }
     }
@@ -1496,14 +1499,15 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
       let guess = directory.join(index_file_name).clean();
       if self.env.is_file_sync(&guess) {
         // TODO(bartlomieju): emitLegacyIndexDeprecation()
-        return Ok(to_file_specifier(&guess));
+        return Ok(url_from_file_path(&guess).unwrap());
       }
     }
 
     if mode.is_types() {
       Err(
         TypesNotFoundError(Box::new(TypesNotFoundErrorData {
-          code_specifier: to_file_specifier(&directory.join("index.js")),
+          code_specifier: url_from_file_path(&directory.join("index.js"))
+            .unwrap(),
           maybe_referrer: maybe_referrer.cloned(),
         }))
         .into(),
@@ -1511,7 +1515,7 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
     } else {
       Err(
         ModuleNotFoundError {
-          specifier: to_file_specifier(&directory.join("index.js")),
+          specifier: url_from_file_path(&directory.join("index.js")).unwrap(),
           typ: "module",
           maybe_referrer: maybe_referrer.cloned(),
         }
@@ -1611,9 +1615,7 @@ fn resolve_bin_entry_value<'a>(
 }
 
 fn to_file_path(url: &Url) -> PathBuf {
-  url
-    .to_file_path()
-    .unwrap_or_else(|_| panic!("Provided URL was not file:// URL: {url}"))
+  deno_path_util::url_to_file_path(url).unwrap()
 }
 
 fn to_file_path_string(url: &Url) -> String {
@@ -1692,7 +1694,7 @@ fn with_known_extension(path: &Path, ext: &str) -> PathBuf {
 }
 
 fn to_specifier_display_string(url: &Url) -> String {
-  if let Ok(path) = url.to_file_path() {
+  if let Ok(path) = deno_path_util::url_to_file_path(url) {
     path.display().to_string()
   } else {
     url.to_string()