fix(cli): support chained argument normalization

- Refactor `normalize_args` to run in a loop, allowing multiple normalizations to be applied sequentially.
- This fixes issues where commands like `vp help rebuild` or `vp help node` were not fully normalized to their target commands.
- Update global CLI snapshot tests to reflect the new `rebuild` top-level command in help output.

Author: Han5991

crates/vite_global_cli/src/main.rs

@@ -40,49 +40,56 @@ use crate::cli::{
 /// - `vp help [command]` → `vp [command] --help`
 /// - `vp node [args...]` → `vp env exec node [args...]`
 fn normalize_args(args: Vec<String>) -> Vec<String> {
-    match args.get(1).map(String::as_str) {
-        // `vp list ...` → `vp pm list ...`
-        // `vp ls ...` → `vp pm list ...`
-        Some("list" | "ls") => {
-            let mut normalized = Vec::with_capacity(args.len() + 1);
-            normalized.push(args[0].clone());
-            normalized.push("pm".to_string());
-            normalized.push("list".to_string());
-            normalized.extend(args[2..].iter().cloned());
-            normalized
-        }
-        // `vp rebuild ...` → `vp pm rebuild ...`
-        Some("rebuild") => {
-            let mut normalized = Vec::with_capacity(args.len() + 1);
-            normalized.push(args[0].clone());
-            normalized.push("pm".to_string());
-            normalized.push("rebuild".to_string());
-            normalized.extend(args[2..].iter().cloned());
-            normalized
-        }
-        // `vp help` alone -> show main help
-        Some("help") if args.len() == 2 => vec![args[0].clone(), "--help".to_string()],
-        // `vp help [command] [args...]` -> `vp [command] --help [args...]`
-        Some("help") if args.len() > 2 => {
-            let mut normalized = Vec::with_capacity(args.len());
-            normalized.push(args[0].clone());
-            normalized.push(args[2].clone());
-            normalized.push("--help".to_string());
-            normalized.extend(args[3..].iter().cloned());
-            normalized
-        }
-        // `vp node [args...]` → `vp env exec node [args...]`
-        Some("node") => {
-            let mut normalized = Vec::with_capacity(args.len() + 2);
-            normalized.push(args[0].clone());
-            normalized.push("env".to_string());
-            normalized.push("exec".to_string());
-            normalized.push("node".to_string());
-            normalized.extend(args[2..].iter().cloned());
-            normalized
-        }
-        // No transformation needed
-        _ => args,
+    let mut normalized = args;
+    loop {
+        let next = match normalized.get(1).map(String::as_str) {
+            // `vp list ...` → `vp pm list ...`
+            // `vp ls ...` → `vp pm list ...`
+            Some("list" | "ls") => {
+                let mut next = Vec::with_capacity(normalized.len() + 1);
+                next.push(normalized[0].clone());
+                next.push("pm".to_string());
+                next.push("list".to_string());
+                next.extend(normalized[2..].iter().cloned());
+                next
+            }
+            // `vp rebuild ...` → `vp pm rebuild ...`
+            Some("rebuild") => {
+                let mut next = Vec::with_capacity(normalized.len() + 1);
+                next.push(normalized[0].clone());
+                next.push("pm".to_string());
+                next.push("rebuild".to_string());
+                next.extend(normalized[2..].iter().cloned());
+                next
+            }
+            // `vp help` alone -> show main help
+            Some("help") if normalized.len() == 2 => {
+                vec![normalized[0].clone(), "--help".to_string()]
+            }
+            // `vp help [command] [args...]` -> `vp [command] --help [args...]`
+            Some("help") if normalized.len() > 2 => {
+                let mut next = Vec::with_capacity(normalized.len());
+                next.push(normalized[0].clone());
+                next.push(normalized[2].clone());
+                next.push("--help".to_string());
+                next.extend(normalized[3..].iter().cloned());
+                next
+            }
+            // `vp node [args...]` → `vp env exec node [args...]`
+            Some("node") => {
+                let mut next = Vec::with_capacity(normalized.len() + 2);
+                next.push(normalized[0].clone());
+                next.push("env".to_string());
+                next.push("exec".to_string());
+                next.push("node".to_string());
+                next.extend(normalized[2..].iter().cloned());
+                next
+            }
+            // No transformation needed
+            _ => return normalized,
+        };
+
+        normalized = next;
     }
 }
 
@@ -458,6 +465,20 @@ mod tests {
         assert_eq!(normalized, s(&["vp", "pm", "rebuild", "--", "--update-binary"]));
     }
 
+    #[test]
+    fn normalize_args_rewrites_vp_help_rebuild() {
+        let input = s(&["vp", "help", "rebuild"]);
+        let normalized = normalize_args(input);
+        assert_eq!(normalized, s(&["vp", "pm", "rebuild", "--help"]));
+    }
+
+    #[test]
+    fn normalize_args_rewrites_vp_help_node() {
+        let input = s(&["vp", "help", "node"]);
+        let normalized = normalize_args(input);
+        assert_eq!(normalized, s(&["vp", "env", "exec", "node", "--help"]));
+    }
+
     #[test]
     fn unknown_argument_detected_without_pass_as_value_hint() {
         let error = try_parse_args_from(["vp".to_string(), "--cache".to_string()])

packages/cli/snap-tests-global/cli-helper-message/snap.txt

@@ -41,6 +41,7 @@ Manage Dependencies:
   info, view, show           View package information from the registry
   link, ln                   Link packages for local development
   unlink                     Unlink packages
+  rebuild                    Rebuild native modules
   pm                         Forward a command to the package manager
 
 Maintain:
@@ -441,4 +442,3 @@ Options:
   -h, --help             Print help
 
 Documentation: https://viteplus.dev/guide/upgrade
-