Update prefix usage.

CHANGELOG.md

@@ -1,11 +1,16 @@
 # Changelog
 
-## Unreleased
+## 0.5.3
 
 #### 🐞 Fixes
 
 - Fixed an incorrect globals directory on Windows.
 
+#### ⚙️ Internal
+
+- Updated dependencies.
+- Updated globals install to use a `--prefix` arg instead of `PREFIX` env var.
+
 ## 0.5.2
 
 #### 🚀 Updates

crates/common/src/commands.rs

@@ -1,46 +1,59 @@
-use proto_pdk_api::ExecCommandInput;
+use proto_pdk_api::{ExecCommandInput, HostEnvironment};
 use std::path::Path;
 
-pub fn install_global(dependency: &str, globals_dir: &Path) -> ExecCommandInput {
+pub fn get_global_prefix<T: AsRef<Path>>(env: &HostEnvironment, globals_dir: T) -> String {
+    let prefix = globals_dir.as_ref().to_string_lossy().to_string();
+
+    // On Windows, globals will be installed into the prefix as-is,
+    // so binaries will exist in the root of the prefix.
+    if env.os.is_windows() {
+        return prefix;
+    }
+
+    // On Unix, globals are nested within a /bin directory, and since our
+    // fixed globals dir ends in /bin, we must remove it and set the prefix
+    // to the parent directory. This way everything resolves correctly.
+    prefix.replace("/bin", "")
+}
+
+pub fn install_global(dependency: &str, globals_prefix: String) -> ExecCommandInput {
     let mut cmd = ExecCommandInput::inherit(
         "npm",
         [
             "install",
+            dependency,
             "--global",
             "--loglevel",
             "warn",
             "--no-audit",
             "--no-update-notifier",
-            dependency,
+            "--prefix",
+            &globals_prefix,
         ],
     );
 
     cmd.env_vars
         .insert("PROTO_INSTALL_GLOBAL".into(), "true".into());
 
-    // Remove the /bin component
-    cmd.env_vars.insert(
-        "PREFIX".into(),
-        globals_dir.parent().unwrap().to_string_lossy().to_string(),
-    );
-
     cmd
 }
 
-pub fn uninstall_global(dependency: &str, globals_dir: &Path) -> ExecCommandInput {
+pub fn uninstall_global(dependency: &str, globals_prefix: String) -> ExecCommandInput {
     let mut cmd = ExecCommandInput::inherit(
         "npm",
-        ["uninstall", "--global", "--loglevel", "warn", dependency],
+        [
+            "uninstall",
+            dependency,
+            "--global",
+            "--loglevel",
+            "warn",
+            "--prefix",
+            &globals_prefix,
+        ],
     );
 
     cmd.env_vars
         .insert("PROTO_INSTALL_GLOBAL".into(), "true".into());
 
-    // Remove the /bin component
-    cmd.env_vars.insert(
-        "PREFIX".into(),
-        globals_dir.parent().unwrap().to_string_lossy().to_string(),
-    );
-
     cmd
 }

crates/common/src/lib.rs

@@ -4,19 +4,3 @@ mod package_json;
 
 pub use node_dist::*;
 pub use package_json::*;
-
-use proto_pdk_api::HostEnvironment;
-
-pub fn get_globals_dirs(env: &HostEnvironment) -> Vec<String> {
-    let mut dirs = vec![];
-
-    // Windows for some reason removes the /bin suffix when installing into it,
-    // so we also need to account for the path without /bin. But keep the /bin path
-    // as the final path and for the install to trigger correctly.
-    if env.os.is_windows() {
-        dirs.push("$PROTO_HOME/tools/node/globals".into());
-    }
-
-    dirs.push("$PROTO_HOME/tools/node/globals/bin".into());
-    dirs
-}

crates/node-depman/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "node_depman_plugin"
-version = "0.5.2"
+version = "0.5.3"
 edition = "2021"
 license = "MIT"
 publish = false

crates/node-depman/src/proto.rs

@@ -1,7 +1,10 @@
 use crate::npm_registry::parse_registry_response;
 use crate::package_manager::PackageManager;
 use extism_pdk::*;
-use node_common::{commands, get_globals_dirs, BinField, NodeDistVersion, PackageJson};
+use node_common::{
+    commands::{self, get_global_prefix},
+    BinField, NodeDistVersion, PackageJson,
+};
 use proto_pdk::*;
 use std::collections::HashMap;
 use std::fs;
@@ -310,7 +313,7 @@ pub fn locate_executables(
     };
 
     Ok(Json(LocateExecutablesOutput {
-        globals_lookup_dirs: get_globals_dirs(&env),
+        globals_lookup_dirs: vec!["$PROTO_HOME/tools/node/globals/bin".into()],
         primary: Some(primary),
         secondary,
         ..LocateExecutablesOutput::default()
@@ -321,9 +324,11 @@ pub fn locate_executables(
 pub fn install_global(
     Json(input): Json<InstallGlobalInput>,
 ) -> FnResult<Json<InstallGlobalOutput>> {
+    let env = get_proto_environment()?;
+
     let result = exec_command!(commands::install_global(
         &input.dependency,
-        &input.globals_dir.real_path(),
+        get_global_prefix(&env, input.globals_dir.real_path()),
     ));
 
     Ok(Json(InstallGlobalOutput::from_exec_command(result)))
@@ -333,9 +338,11 @@ pub fn install_global(
 pub fn uninstall_global(
     Json(input): Json<UninstallGlobalInput>,
 ) -> FnResult<Json<UninstallGlobalOutput>> {
+    let env = get_proto_environment()?;
+
     let result = exec_command!(commands::uninstall_global(
         &input.dependency,
-        &input.globals_dir.real_path(),
+        get_global_prefix(&env, input.globals_dir.real_path()),
     ));
 
     Ok(Json(UninstallGlobalOutput::from_exec_command(result)))
@@ -393,7 +400,6 @@ pub fn pre_run(Json(input): Json<RunHook>) -> FnResult<()> {
 
 #[plugin_fn]
 pub fn locate_bins(Json(input): Json<LocateBinsInput>) -> FnResult<Json<LocateBinsOutput>> {
-    let env = get_proto_environment()?;
     let mut bin_path = None;
     let package_path = input.context.tool_dir.join("package.json");
     let manager = PackageManager::detect();
@@ -437,7 +443,7 @@ pub fn locate_bins(Json(input): Json<LocateBinsInput>) -> FnResult<Json<LocateBi
     Ok(Json(LocateBinsOutput {
         bin_path: bin_path.map(PathBuf::from),
         fallback_last_globals_dir: true,
-        globals_lookup_dirs: get_globals_dirs(&env),
+        globals_lookup_dirs: vec!["$PROTO_HOME/tools/node/globals/bin".into()],
         ..LocateBinsOutput::default()
     }))
 }

crates/node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "node_plugin"
-version = "0.5.2"
+version = "0.5.3"
 edition = "2021"
 license = "MIT"
 publish = false

crates/node/src/proto.rs

@@ -1,5 +1,8 @@
 use extism_pdk::*;
-use node_common::{commands, get_globals_dirs, NodeDistLTS, NodeDistVersion, PackageJson};
+use node_common::{
+    commands::{self, get_global_prefix},
+    NodeDistLTS, NodeDistVersion, PackageJson,
+};
 use proto_pdk::*;
 
 #[host_fn]
@@ -206,7 +209,7 @@ pub fn locate_executables(
     let env = get_proto_environment()?;
 
     Ok(Json(LocateExecutablesOutput {
-        globals_lookup_dirs: get_globals_dirs(&env),
+        globals_lookup_dirs: vec!["$PROTO_HOME/tools/node/globals/bin".into()],
         primary: Some(ExecutableConfig::new(if env.os == HostOS::Windows {
             format!("{}.exe", BIN)
         } else {
@@ -220,9 +223,11 @@ pub fn locate_executables(
 pub fn install_global(
     Json(input): Json<InstallGlobalInput>,
 ) -> FnResult<Json<InstallGlobalOutput>> {
+    let env = get_proto_environment()?;
+
     let result = exec_command!(commands::install_global(
         &input.dependency,
-        &input.globals_dir.real_path(),
+        get_global_prefix(&env, input.globals_dir.real_path()),
     ));
 
     Ok(Json(InstallGlobalOutput::from_exec_command(result)))
@@ -232,9 +237,11 @@ pub fn install_global(
 pub fn uninstall_global(
     Json(input): Json<UninstallGlobalInput>,
 ) -> FnResult<Json<UninstallGlobalOutput>> {
+    let env = get_proto_environment()?;
+
     let result = exec_command!(commands::uninstall_global(
         &input.dependency,
-        &input.globals_dir.real_path(),
+        get_global_prefix(&env, input.globals_dir.real_path()),
     ));
 
     Ok(Json(UninstallGlobalOutput::from_exec_command(result)))
@@ -288,7 +295,7 @@ pub fn locate_bins(Json(_): Json<LocateBinsInput>) -> FnResult<Json<LocateBinsOu
             format!("bin/{}", BIN).into()
         }),
         fallback_last_globals_dir: true,
-        globals_lookup_dirs: get_globals_dirs(&env),
+        globals_lookup_dirs: vec!["$PROTO_HOME/tools/node/globals/bin".into()],
         ..LocateBinsOutput::default()
     }))
 }