fix: bin path ordering

src/engines/mod.rs

@@ -139,33 +139,25 @@ impl<'a> CmdPool<'a> {
         cwd: String,
         extension_env: &'a mut ExtensionEnvironment,
     ) -> CmdPool<'a> {
-        let mut path: String = env::var("PATH").unwrap_or_default();
         #[cfg(not(target_os = "windows"))]
-        if path.len() > 0 && !path.ends_with(':') {
-            path += ":";
-        }
-        #[cfg(target_os = "windows")]
-        if path.len() > 0 && !path.ends_with(';') {
-            path += ";";
-        }
-        path.push_str(&cwd);
-        #[cfg(not(target_os = "windows"))]
-        {
+        let path = {
+            let mut path = String::from(&cwd);
             path += "/.bin:";
-        }
-        #[cfg(target_os = "windows")]
-        {
-            path += "\\.bin;";
-        }
-        path.push_str(&cwd);
-        #[cfg(not(target_os = "windows"))]
-        {
+            path.push_str(&cwd);
             path += "/node_modules/.bin";
-        }
+            path += ":";
+            path.push_str(&env::var("PATH").unwrap_or_default());
+            path
+        };
         #[cfg(target_os = "windows")]
-        {
+        let path = {
+            let mut path = cwd.replace('/', "\\");
+            path += "\\.bin;";
+            path.push_str(&cwd.replace('/', "\\"));
             path += "\\node_modules\\.bin;";
-        }
+            path.push_str(&env::var("PATH").unwrap_or_default());
+            path
+        };
         CmdPool {
             cmd_num: 0,
             cwd,

src/engines/node.rs

@@ -19,11 +19,11 @@ use crate::engines::create_cmd;
 use crate::engines::CmdPool;
 use crate::engines::Exec;
 use crate::engines::{BatchCmd, ExecState};
+use base64::{engine::general_purpose, Engine as _};
 use futures::future::FutureExt;
 use percent_encoding::percent_encode;
 use percent_encoding::NON_ALPHANUMERIC;
 use std::time::Instant;
-use base64::{engine::general_purpose, Engine as _};
 
 // Custom node loader to mimic current working directory despite loading from a tmp file
 // Note: We dont have to percent encode as we're not using `,! characters

src/main.rs

@@ -69,9 +69,9 @@ fn uri_parse(uri_str: &str) -> Option<Uri> {
 #[tokio::main]
 async fn main() -> Result<()> {
     #[cfg(not(debug_assertions))]
-    let version = "0.2.13";
+    let version = "0.2.14";
     #[cfg(debug_assertions)]
-    let version = "0.2.13-debug";
+    let version = "0.2.14-debug";
     let matches = Command::new("Chomp")
         .version(version)
         .arg(