chore(js_executor): restore code structure and comments

Author: nekomoyi

crates/vite_global_cli/src/js_executor.rs

@@ -214,23 +214,22 @@ impl JsExecutor {
         project_path: &AbsolutePath,
         args: &[String],
     ) -> Result<ExitStatus, Error> {
-        let scripts_dir = self.get_scripts_dir()?;
+        // Use project's runtime based on its devEngines.runtime configuration
         let runtime = self.ensure_project_runtime(project_path).await?;
-        let mut cmd = Self::prepare_js_command(project_path, &runtime, scripts_dir, args);
-        let status = cmd.status().await?;
-        Ok(status)
+        let node_binary = runtime.get_binary_path();
+        let bin_prefix = runtime.get_bin_prefix();
+        self.run_js_entry(project_path, &node_binary, &bin_prefix, args).await
     }
 
     pub async fn delegate_to_local_cli_output(
         &mut self,
         project_path: &AbsolutePath,
         args: &[String],
     ) -> Result<Output, Error> {
-        let scripts_dir = self.get_scripts_dir()?;
         let runtime = self.ensure_project_runtime(project_path).await?;
-        let mut cmd = Self::prepare_js_command(project_path, &runtime, scripts_dir, args);
-        let output = cmd.output().await?;
-        Ok(output)
+        let node_binary = runtime.get_binary_path();
+        let bin_prefix = runtime.get_bin_prefix();
+        self.run_js_entry_output(project_path, &node_binary, &bin_prefix, args).await
     }
 
     /// Delegate to the global vite-plus CLI entrypoint directly.
@@ -263,37 +262,67 @@ impl JsExecutor {
     /// when no version source exists in the project directory.
     ///
     /// Use this for read-only / side-effect-free commands like `--version`.
-    #[allow(dead_code)]
+    #[allow(dead_code)] // kept for future read-only delegations
     pub async fn delegate_with_cli_runtime(
         &mut self,
         project_path: &AbsolutePath,
         args: &[String],
     ) -> Result<ExitStatus, Error> {
-        let scripts_dir = self.get_scripts_dir()?;
         let runtime = self.ensure_cli_runtime().await?;
-        let mut cmd = Self::prepare_js_command(project_path, &runtime, scripts_dir, args);
-        let status = cmd.status().await?;
-        Ok(status)
+        let node_binary = runtime.get_binary_path();
+        let bin_prefix = runtime.get_bin_prefix();
+        self.run_js_entry(project_path, &node_binary, &bin_prefix, args).await
     }
 
-    fn prepare_js_command(
+    /// Prepare a JS command with the entry point resolved.
+    fn prepare_js_entry(
+        &self,
         project_path: &AbsolutePath,
-        runtime: &JsRuntime,
-        scripts_dir: AbsolutePathBuf,
+        node_binary: &AbsolutePath,
+        bin_prefix: &AbsolutePath,
         args: &[String],
-    ) -> Command {
+    ) -> Result<Command, Error> {
+        // Try to resolve vite-plus from the project directory using oxc_resolver
         let entry_point = match Self::resolve_local_vite_plus(project_path) {
             Some(path) => path,
-            None => scripts_dir.join("bin.js"),
+            None => {
+                // Fall back to the global installation's bin.js
+                let scripts_dir = self.get_scripts_dir()?;
+                scripts_dir.join("bin.js")
+            }
         };
 
         tracing::debug!("Delegating to CLI via JS entry point: {:?} {:?}", entry_point, args);
 
-        let node_binary = runtime.get_binary_path();
-        let bin_prefix = runtime.get_bin_prefix();
-        let mut cmd = Self::create_js_command(&node_binary, &bin_prefix);
+        let mut cmd = Self::create_js_command(node_binary, bin_prefix);
         cmd.arg(entry_point.as_path()).args(args).current_dir(project_path.as_path());
-        cmd
+        Ok(cmd)
+    }
+
+    /// Run a JS entry point with the given runtime, resolving local vite-plus first.
+    async fn run_js_entry(
+        &self,
+        project_path: &AbsolutePath,
+        node_binary: &AbsolutePath,
+        bin_prefix: &AbsolutePath,
+        args: &[String],
+    ) -> Result<ExitStatus, Error> {
+        let mut cmd = self.prepare_js_entry(project_path, node_binary, bin_prefix, args)?;
+        let status = cmd.status().await?;
+        Ok(status)
+    }
+
+    /// Like [`run_js_entry`], but returns `Output`.
+    async fn run_js_entry_output(
+        &self,
+        project_path: &AbsolutePath,
+        node_binary: &AbsolutePath,
+        bin_prefix: &AbsolutePath,
+        args: &[String],
+    ) -> Result<Output, Error> {
+        let mut cmd = self.prepare_js_entry(project_path, node_binary, bin_prefix, args)?;
+        let output = cmd.output().await?;
+        Ok(output)
     }
 
     /// Resolve the local vite-plus package's `dist/bin.js` from the project directory.