feat(task): workspace support with --filter and --recursive (#26949)

This commit adds workspace support to "deno taks". Two new flags were added: - "--recursive" - allows to run a specified task in workspace members, eg. "deno task --recursive dev" - "--filter" - allows to run a specified task only in specific workspace members, eg. "deno task --recursive --filter 'client/*' dev" "--filter" flag implies "--recursive" flag. Closes #24991 --------- Signed-off-by: Bartek Iwańczuk <[email protected]> Signed-off-by: David Sherret <[email protected]> Co-authored-by: Bartek Iwańczuk <[email protected]> Co-authored-by: Nathan Whitaker <[email protected]> Co-authored-by: David Sherret <[email protected]> Co-authored-by: David Sherret <[email protected]>
denoland · Nov 20, 2024 · f0b245c · f0b245c
1 parent b729bf0
commit f0b245c
Show file tree

Hide file tree

Showing 43 changed files with 541 additions and 78 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -49,7 +49,7 @@ deno_ast = { version = "=0.43.3", features = ["transpiling"] }
 deno_core = { version = "0.321.0" }
 
 deno_bench_util = { version = "0.171.0", path = "./bench_util" }
-deno_config = { version = "=0.39.1", features = ["workspace", "sync"] }
+deno_config = { version = "=0.39.2", features = ["workspace", "sync"] }
 deno_lockfile = "=0.23.1"
 deno_media_type = { version = "0.2.0", features = ["module_specifier"] }
 deno_npm = "=0.25.4"

diff --git a/cli/args/flags.rs b/cli/args/flags.rs
@@ -380,6 +380,8 @@ pub struct TaskFlags {
   pub cwd: Option<String>,
   pub task: Option<String>,
   pub is_run: bool,
+  pub recursive: bool,
+  pub filter: Option<String>,
   pub eval: bool,
 }
 
@@ -3046,13 +3048,27 @@ Evaluate a task from string
           .help("Specify the directory to run the task in")
           .value_hint(ValueHint::DirPath),
       )
+      .arg(
+        Arg::new("recursive")
+          .long("recursive")
+          .short('r')
+          .help("Run the task in all projects in the workspace")
+          .action(ArgAction::SetTrue),
+      )
+      .arg(
+        Arg::new("filter")
+        .long("filter")
+        .short('f')
+        .help("Filter members of the workspace by name - should be used with --recursive")
+        .value_parser(value_parser!(String)),
+      )
       .arg(
         Arg::new("eval")
           .long("eval")
           .help(
             "Evaluate the passed value as if, it was a task in a configuration file",
           ).action(ArgAction::SetTrue)
-        )
+      )
       .arg(node_modules_dir_arg())
   })
 }
@@ -5212,10 +5228,15 @@ fn task_parse(
   unstable_args_parse(flags, matches, UnstableArgsConfig::ResolutionAndRuntime);
   node_modules_arg_parse(flags, matches);
 
+  let filter = matches.remove_one::<String>("filter");
+  let recursive = matches.get_flag("recursive") || filter.is_some();
+
   let mut task_flags = TaskFlags {
     cwd: matches.remove_one::<String>("cwd"),
     task: None,
     is_run: false,
+    recursive,
+    filter,
     eval: matches.get_flag("eval"),
   };
 
@@ -10418,6 +10439,8 @@ mod tests {
           cwd: None,
           task: Some("build".to_string()),
           is_run: false,
+          recursive: false,
+          filter: None,
           eval: false,
         }),
         argv: svec!["hello", "world"],
@@ -10433,6 +10456,8 @@ mod tests {
           cwd: None,
           task: Some("build".to_string()),
           is_run: false,
+          recursive: false,
+          filter: None,
           eval: false,
         }),
         ..Flags::default()
@@ -10447,6 +10472,56 @@ mod tests {
           cwd: Some("foo".to_string()),
           task: Some("build".to_string()),
           is_run: false,
+          recursive: false,
+          filter: None,
+          eval: false,
+        }),
+        ..Flags::default()
+      }
+    );
+
+    let r = flags_from_vec(svec!["deno", "task", "--filter", "*", "build"]);
+    assert_eq!(
+      r.unwrap(),
+      Flags {
+        subcommand: DenoSubcommand::Task(TaskFlags {
+          cwd: None,
+          task: Some("build".to_string()),
+          is_run: false,
+          recursive: true,
+          filter: Some("*".to_string()),
+          eval: false,
+        }),
+        ..Flags::default()
+      }
+    );
+
+    let r = flags_from_vec(svec!["deno", "task", "--recursive", "build"]);
+    assert_eq!(
+      r.unwrap(),
+      Flags {
+        subcommand: DenoSubcommand::Task(TaskFlags {
+          cwd: None,
+          task: Some("build".to_string()),
+          is_run: false,
+          recursive: true,
+          filter: None,
+          eval: false,
+        }),
+        ..Flags::default()
+      }
+    );
+
+    let r = flags_from_vec(svec!["deno", "task", "-r", "build"]);
+    assert_eq!(
+      r.unwrap(),
+      Flags {
+        subcommand: DenoSubcommand::Task(TaskFlags {
+          cwd: None,
+          task: Some("build".to_string()),
+          is_run: false,
+          recursive: true,
+          filter: None,
           eval: false,
         }),
         ..Flags::default()
@@ -10461,6 +10536,8 @@ mod tests {
           cwd: None,
           task: Some("echo 1".to_string()),
           is_run: false,
+          recursive: false,
+          filter: None,
           eval: true,
         }),
         ..Flags::default()
@@ -10490,6 +10567,8 @@ mod tests {
           cwd: None,
           task: Some("build".to_string()),
           is_run: false,
+          recursive: false,
+          filter: None,
           eval: false,
         }),
         argv: svec!["--", "hello", "world"],
@@ -10508,6 +10587,8 @@ mod tests {
           cwd: Some("foo".to_string()),
           task: Some("build".to_string()),
           is_run: false,
+          recursive: false,
+          filter: None,
           eval: false,
         }),
         argv: svec!["--", "hello", "world"],
@@ -10527,6 +10608,8 @@ mod tests {
           cwd: None,
           task: Some("build".to_string()),
           is_run: false,
+          recursive: false,
+          filter: None,
           eval: false,
         }),
         argv: svec!["--"],
@@ -10545,6 +10628,8 @@ mod tests {
           cwd: None,
           task: Some("build".to_string()),
           is_run: false,
+          recursive: false,
+          filter: None,
           eval: false,
         }),
         argv: svec!["-1", "--test"],
@@ -10563,6 +10648,8 @@ mod tests {
           cwd: None,
           task: Some("build".to_string()),
           is_run: false,
+          recursive: false,
+          filter: None,
           eval: false,
         }),
         argv: svec!["--test"],
@@ -10582,6 +10669,8 @@ mod tests {
           cwd: None,
           task: Some("build".to_string()),
           is_run: false,
+          recursive: false,
+          filter: None,
           eval: false,
         }),
         log_level: Some(log::Level::Error),
@@ -10600,6 +10689,8 @@ mod tests {
           cwd: None,
           task: None,
           is_run: false,
+          recursive: false,
+          filter: None,
           eval: false,
         }),
         ..Flags::default()
@@ -10617,6 +10708,8 @@ mod tests {
           cwd: None,
           task: None,
           is_run: false,
+          recursive: false,
+          filter: None,
           eval: false,
         }),
         config_flag: ConfigFlag::Path("deno.jsonc".to_string()),
@@ -10635,6 +10728,8 @@ mod tests {
           cwd: None,
           task: None,
           is_run: false,
+          recursive: false,
+          filter: None,
           eval: false,
         }),
         config_flag: ConfigFlag::Path("deno.jsonc".to_string()),

diff --git a/cli/main.rs b/cli/main.rs
@@ -243,6 +243,8 @@ async fn run_subcommand(flags: Arc<Flags>) -> Result<i32, AnyError> {
                   cwd: None,
                   task: Some(run_flags.script.clone()),
                   is_run: true,
+                  recursive: false,
+                  filter: None,
                   eval: false,
                 };
                 new_flags.subcommand = DenoSubcommand::Task(task_flags.clone());