address PR feedback, maintain hot path perf

Author: mikrostew

crates/volta-core/src/project/mod.rs

@@ -171,9 +171,10 @@ impl Project {
         })
     }
 
-    /// Does this project use Plug-n-Play?
-    // (Do either of the files '.pnp.js' or '.pnp.cjs' exist?)
-    pub fn is_plug_n_play(&self) -> bool {
+    /// Does this project use Yarn Plug'n'Play?
+    // (project uses Yarn, and either of the files '.pnp.js' or '.pnp.cjs' exist)
+    pub fn is_yarn_pnp(&self) -> bool {
+        self.platform().map_or(false, |platform| platform.yarn.is_some()) &&
         self.manifest_file.parent().map_or(false, |base_dir| {
             base_dir.join(".pnp.js").exists() || base_dir.join(".pnp.cjs").exists()
         })

crates/volta-core/src/project/tests.rs

@@ -225,20 +225,20 @@ mod plug_n_play {
     fn project_is_not_pnp() {
         let project_path = fixture_path(&["basic"]);
         let test_project = Project::for_dir(project_path).unwrap().unwrap();
-        assert_eq!(test_project.is_plug_n_play(), false);
+        assert_eq!(test_project.is_yarn_pnp(), false);
     }
 
     #[test]
     fn project_has_pnp_js() {
         let project_path = fixture_path(&["plug-n-play", "pnp-js"]);
         let test_project = Project::for_dir(project_path).unwrap().unwrap();
-        assert_eq!(test_project.is_plug_n_play(), true);
+        assert_eq!(test_project.is_yarn_pnp(), true);
     }
 
     #[test]
     fn project_has_pnp_cjs() {
         let project_path = fixture_path(&["plug-n-play", "pnp-cjs"]);
         let test_project = Project::for_dir(project_path).unwrap().unwrap();
-        assert_eq!(test_project.is_plug_n_play(), true);
+        assert_eq!(test_project.is_yarn_pnp(), true);
     }
 }

crates/volta-core/src/run/binary.rs

@@ -20,34 +20,34 @@ pub(super) fn command(exe: &OsStr, args: &[OsString], session: &mut Session) ->
     if let Some(project) = session.project()? {
         // Check if the executable is a direct dependency
         if project.has_direct_bin(exe)? {
-            if project
-                .platform()
-                .map_or(false, |platform| platform.yarn.is_some())
-                && project.is_plug_n_play()
-            {
-                debug!("Project uses Yarn PnP, calling {} with 'yarn'", bin);
-                let platform = Platform::current(session)?;
-                let mut exe_and_args = vec![exe.to_os_string()];
-                exe_and_args.extend_from_slice(args);
-                return Ok(ToolCommand::new("yarn", exe_and_args, platform, ToolKind::Yarn).into());
+            match project.find_bin(exe) {
+                Some(path_to_bin) => {
+                    debug!("Found {} in project at '{}'", bin, path_to_bin.display());
+
+                    let platform = Platform::current(session)?;
+                    return Ok(ToolCommand::new(
+                        path_to_bin,
+                        args,
+                        platform,
+                        ToolKind::ProjectLocalBinary(bin),
+                    )
+                    .into());
+                },
+                None => {
+                    if project.is_yarn_pnp()
+                    {
+                        debug!("Project uses Yarn PnP, calling {} with 'yarn'", bin);
+                        let platform = Platform::current(session)?;
+                        let mut exe_and_args = vec![exe.to_os_string()];
+                        exe_and_args.extend_from_slice(args);
+                        return Ok(ToolCommand::new("yarn", exe_and_args, platform, ToolKind::Yarn).into());
+                    } else {
+                        return Err(ErrorKind::ProjectLocalBinaryNotFound {
+                            command: exe.to_string_lossy().to_string(),
+                        }.into());
+                    }
+                }
             }
-            let path_to_bin =
-                project
-                    .find_bin(exe)
-                    .ok_or_else(|| ErrorKind::ProjectLocalBinaryNotFound {
-                        command: exe.to_string_lossy().to_string(),
-                    })?;
-
-            debug!("Found {} in project at '{}'", bin, path_to_bin.display());
-
-            let platform = Platform::current(session)?;
-            return Ok(ToolCommand::new(
-                path_to_bin,
-                args,
-                platform,
-                ToolKind::ProjectLocalBinary(bin),
-            )
-            .into());
         }
     }
 

tests/acceptance/execute_binary.rs

@@ -296,7 +296,6 @@ fn project_local_binary_pnp() {
         .setup_npm_binary("6.7.0", &npm_bin("6.7.0"))
         .setup_yarn_binary("1.23.483", &yarn_bin("1.23.483"))
         .setup_yarn_binary("3.12.1092", &yarn_bin("3.12.1092"))
-        .project_bins(cowsay_bin_info("1.5.0"))
         .project_pnp()
         .add_dir_to_path(PathBuf::from("/bin"))
         .build();