wip

Author: arcanis

Cargo.lock

@@ -1,7 +1,11 @@
 [package]
-name = "pnp-rs"
+name = "pnp"
 version = "0.1.0"
 edition = "2021"
+license = "BSD-2-Clause"
+description = "Resolution primitives for Yarn PnP"
+homepage = "https://yarnpkg.com"
+repository = "https://github.com/yarnpkg/berry/"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

Cargo.toml

@@ -29,7 +29,7 @@ pub enum Error {
 
 pub enum Resolution {
     Specifier(String),
-    Path(PathBuf),
+    Package(PathBuf, Option<String>),
 }
 
 pub struct ResolutionHost {
@@ -118,18 +118,6 @@ pub struct Manifest {
     package_registry_data: HashMap<String, HashMap<String, PackageInformation>>,
 }
 
-pub fn is_builtin(specifier: &str, config: &ResolutionConfig) -> bool {
-    config.builtins.contains(specifier)
-}
-
-pub fn is_path_specifier(specifier: &str) -> bool {
-    lazy_static! {
-        static ref RE: Regex = Regex::new("^\\.{0,2}/").unwrap();
-    }
-
-    RE.is_match(specifier).unwrap()
-}
-
 pub fn parse_bare_identifier(specifier: &str) -> Result<(String, Option<String>), Error> {
     let mut segments = specifier.splitn(3, '/');
     let mut ident_option: Option<String> = None;
@@ -275,18 +263,6 @@ pub fn is_excluded_from_fallback(manifest: &Manifest, locator: &PackageLocator)
     }
 }
 
-pub fn pnp_resolve(specifier: &str, parent: &Path, config: &ResolutionConfig) -> Result<Resolution, Error> {
-    if is_builtin(specifier, config) {
-        return Ok(Resolution::Specifier(specifier.to_string()))
-    }
-
-    if is_path_specifier(specifier) {
-        return Ok(Resolution::Specifier(specifier.to_string()))
-    }
-
-    resolve_to_unqualified(specifier, parent, config)
-}
-
 pub fn resolve_to_unqualified(specifier: &str, parent: &Path, config: &ResolutionConfig) -> Result<Resolution, Error> {
     let (ident, module_path) = parse_bare_identifier(specifier)?;
 
@@ -321,10 +297,7 @@ pub fn resolve_to_unqualified(specifier: &str, parent: &Path, config: &Resolutio
                     PackageDependency::Alias(name, reference) => get_package(&manifest, &PackageLocator { name, reference }),
                 }?;
 
-                let joined_path = dependency_pkg.package_location.clone() + &module_path.unwrap_or_default();
-                let normalized_path = util::normalize_path(joined_path);
-
-                Ok(Resolution::Path(PathBuf::from(normalized_path)))
+                Ok(Resolution::Package(PathBuf::from(dependency_pkg.package_location.clone()), module_path.clone()))
             } else {
                 return Err(Error::FailedResolution);
             }

src/lib.rs

@@ -58,7 +58,7 @@ mod tests {
                 let resolution = resolve_to_unqualified(specifier, parent, &config);
 
                 match resolution {
-                    Ok(Resolution::Path(path)) => {
+                    Ok(Resolution::Package(path, _subpath)) => {
                         assert_eq!(path.to_string_lossy(), test.expected, "{}", test.it);
                     },
                     Ok(Resolution::Specifier(specifier)) => {

src/lib_tests.rs

@@ -1,4 +1,4 @@
-use pnp_rs::{pnp_resolve, ResolutionConfig, Resolution};
+use pnp::{ResolutionConfig, Resolution};
 use std::path::PathBuf;
 
 fn main() {
@@ -17,15 +17,15 @@ fn main() {
     println!("specifier = {}", specifier);
     println!("parent    = {:?}", parent);
 
-    let resolution = pnp_resolve(&specifier, &parent, &ResolutionConfig {
+    let resolution = pnp::resolve_to_unqualified(&specifier, &parent, &ResolutionConfig {
         ..Default::default()
     });
 
     match resolution {
         Ok(res) => {
             match res {
-                Resolution::Path(p) => {
-                    println!("result    = Path ({:?})", p);
+                Resolution::Package(p, subpath) => {
+                    println!("result    = Package ({:?}, {:?})", p, subpath);
                 }
                 Resolution::Specifier(specifier) => {
                     println!("result    = Specifier ({})", specifier);