feat(task): dependencies

cli/schemas/config-file.v1.json

@@ -448,6 +448,13 @@
                   "type": "string",
                   "required": true,
                   "description": "The task to execute"
+                },
+                "dependencies": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  },
+                  "description": "Tasks that should be executed before this task"
                 }
               }
             }

cli/tools/task.rs

@@ -76,7 +76,31 @@ pub async fn execute_script(
     env_vars,
     cli_options,
   };
-  task_runner.run_task(task_name).await
+
+  match task_runner.sort_tasks_topo(task_name) {
+    Ok(sorted) => task_runner.run_tasks(sorted).await,
+    Err(err) => match err {
+      TaskError::NotFound(name) => {
+        if task_flags.is_run {
+          return Err(anyhow!("Task not found: {}", name));
+        }
+
+        log::error!("Task not found: {}", name);
+        if log::log_enabled!(log::Level::Error) {
+          print_available_tasks(
+            &mut std::io::stderr(),
+            &task_runner.cli_options.start_dir,
+            &task_runner.tasks_config,
+          )?;
+        }
+        Ok(1)
+      }
+      TaskError::TaskDepCycle(name) => {
+        log::error!("Task cycle detected: {}", name);
+        Ok(1)
+      }
+    },
+  }
 }
 
 struct RunSingleOptions<'a> {
@@ -86,6 +110,12 @@ struct RunSingleOptions<'a> {
   custom_commands: HashMap<String, Rc<dyn ShellCommand>>,
 }
 
+#[derive(Debug)]
+enum TaskError {
+  NotFound(String),
+  TaskDepCycle(String),
+}
+
 struct TaskRunner<'a> {
   tasks_config: WorkspaceTasksConfig,
   task_flags: &'a TaskFlags,
@@ -96,26 +126,30 @@ struct TaskRunner<'a> {
 }
 
 impl<'a> TaskRunner<'a> {
-  async fn run_task(
+  async fn run_tasks(
     &self,
-    task_name: &String,
+    task_names: Vec<String>,
   ) -> Result<i32, deno_core::anyhow::Error> {
-    let Some((dir_url, task_or_script)) = self.tasks_config.task(task_name)
-    else {
-      if self.task_flags.is_run {
-        return Err(anyhow!("Task not found: {}", task_name));
+    // TODO(bartlomieju): we might want to limit concurrency here - eg. `wireit` runs 2 tasks in parallel
+    // unless and env var is specified.
+    // TODO(marvinhagemeister): Run in sequence for now as it's not safe
+    // to run all tasks in parallel. We can only run tasks in parallel where
+    // all dependencies have been executed prior to that.
+    for task_name in &task_names {
+      let exit_code = self.run_task(task_name).await?;
+      if exit_code > 0 {
+        return Ok(exit_code);
       }
+    }
 
-      log::error!("Task not found: {}", task_name);
-      if log::log_enabled!(log::Level::Error) {
-        print_available_tasks(
-          &mut std::io::stderr(),
-          &self.cli_options.start_dir,
-          &self.tasks_config,
-        )?;
-      }
-      return Ok(1);
-    };
+    Ok(0)
+  }
+
+  async fn run_task(
+    &self,
+    task_name: &String,
+  ) -> Result<i32, deno_core::anyhow::Error> {
+    let (dir_url, task_or_script) = self.get_task(task_name.as_str()).unwrap();
 
     match task_or_script {
       TaskOrScript::Task(_tasks, definition) => {
@@ -232,6 +266,62 @@ impl<'a> TaskRunner<'a> {
       .exit_code,
     )
   }
+
+  fn get_task(
+    &self,
+    task_name: &str,
+  ) -> Result<(&Url, TaskOrScript), TaskError> {
+    let Some(result) = self.tasks_config.task(task_name) else {
+      return Err(TaskError::NotFound(task_name.to_string()));
+    };
+
+    Ok(result)
+  }
+
+  fn sort_tasks_topo(&self, name: &str) -> Result<Vec<String>, TaskError> {
+    let mut marked: Vec<String> = vec![];
+    let mut sorted: Vec<String> = vec![];
+
+    self.sort_visit(name, &mut marked, &mut sorted)?;
+
+    Ok(sorted)
+  }
+
+  fn sort_visit(
+    &self,
+    name: &str,
+    marked: &mut Vec<String>,
+    sorted: &mut Vec<String>,
+  ) -> Result<(), TaskError> {
+    // Already sorted
+    if sorted.contains(&name.to_string()) {
+      return Ok(());
+    }
+
+    // Graph has a cycle
+    if marked.contains(&name.to_string()) {
+      return Err(TaskError::TaskDepCycle(name.to_string()));
+    }
+
+    marked.push(name.to_string());
+
+    let Some(def) = self.tasks_config.task(name) else {
+      return Err(TaskError::NotFound(name.to_string()));
+    };
+
+    match def.1 {
+      TaskOrScript::Task(_, actual_def) => {
+        for dep in &actual_def.dependencies {
+          self.sort_visit(dep, marked, sorted)?
+        }
+      }
+      TaskOrScript::Script(_, name) => self.sort_visit(name, marked, sorted)?,
+    }
+
+    sorted.push(name.to_string());
+
+    Ok(())
+  }
 }
 
 fn output_task(task_name: &str, script: &str) {

tests/specs/npm/prefix_import_and_alias/__test__.jsonc

@@ -0,0 +1,7 @@
+{
+  "tempDir": true,
+  "steps": [{
+    "args": "run -A main.js",
+    "output": "main.out"
+  }]
+}

tests/specs/npm/prefix_import_and_alias/deno.json

@@ -0,0 +1,5 @@
+{
+  "imports": {
+    "@denotest/basic": "npm:@denotest/[email protected]"
+  }
+}

tests/specs/task/dependencies/__test__.jsonc

@@ -0,0 +1,49 @@
+{
+  "tests": {
+    "basic1": {
+      "cwd": "basic1",
+      "tempDir": true,
+      "args": "task run",
+      "output": "./basic1.out"
+    },
+    "basic2": {
+      "cwd": "basic2",
+      "tempDir": true,
+      "args": "task run",
+      "output": "./basic2.out"
+    },
+    "cross_package": {
+      "cwd": "cross_package/package1",
+      "tempDir": true,
+      "args": "task run",
+      "output": "./cross_package.out",
+      "exitCode": 1
+    },
+    "diamond": {
+      "cwd": "diamond",
+      "tempDir": true,
+      "args": "task a",
+      "output": "./diamond.out"
+    },
+    "diamond_big": {
+      "cwd": "diamond_big",
+      "tempDir": true,
+      "args": "task a",
+      "output": "./diamond_big.out"
+    },
+    "cycle": {
+      "cwd": "cycle",
+      "tempDir": true,
+      "output": "./cycle.out",
+      "args": "task a",
+      "exitCode": 1
+    },
+    "cycle_2": {
+      "cwd": "cycle_2",
+      "tempDir": true,
+      "args": "task a",
+      "output": "./cycle_2.out",
+      "exitCode": 1
+    }
+  }
+}

tests/specs/task/dependencies/basic1.out

@@ -0,0 +1,10 @@
+Task build1 deno run ../build1.js
+Starting build1
+build1 performing more work...
+build1 finished
+Task build2 deno run ../build2.js
+Starting build2
+build2 performing more work...
+build2 finished
+Task run deno run ../run.js
+run finished

tests/specs/task/dependencies/basic1/deno.json

@@ -0,0 +1,10 @@
+{
+  "tasks": {
+    "build1": "deno run ../build1.js",
+    "build2": "deno run ../build2.js",
+    "run": {
+      "command": "deno run ../run.js",
+      "dependencies": ["build1", "build2"]
+    }
+  }
+}

tests/specs/task/dependencies/basic2.out

@@ -0,0 +1,10 @@
+Task build1 deno run ../build1.js
+Starting build1
+build1 performing more work...
+build1 finished
+Task build2 deno run ../build2.js
+Starting build2
+build2 performing more work...
+build2 finished
+Task run deno run ../run.js
+run finished

tests/specs/task/dependencies/basic2/deno.json

@@ -0,0 +1,13 @@
+{
+  "tasks": {
+    "build1": "deno run ../build1.js",
+    "build2": {
+      "command": "deno run ../build2.js",
+      "dependencies": ["build1"]
+    },
+    "run": {
+      "command": "deno run ../run.js",
+      "dependencies": ["build2"]
+    }
+  }
+}

tests/specs/task/dependencies/build1.js

@@ -0,0 +1,9 @@
+import { randomTimeout } from "./util.js";
+
+console.log("Starting build1");
+
+await randomTimeout(500, 750);
+console.log("build1 performing more work...");
+await randomTimeout(500, 750);
+
+console.log("build1 finished");

tests/specs/task/dependencies/build2.js

@@ -0,0 +1,9 @@
+import { randomTimeout } from "./util.js";
+
+console.log("Starting build2");
+
+await randomTimeout(250, 750);
+console.log("build2 performing more work...");
+await randomTimeout(250, 750);
+
+console.log("build2 finished");

tests/specs/task/dependencies/cross_package.out

@@ -0,0 +1,4 @@
+Task not found: ../package2:run
+Available tasks:
+- run
+    deno run.js

tests/specs/task/dependencies/cross_package/package1/deno.json

@@ -0,0 +1,8 @@
+{
+  "tasks": {
+    "run": {
+      "command": "deno run.js",
+      "dependencies": ["../package2:run"]
+    }
+  }
+}

tests/specs/task/dependencies/cross_package/package2/deno.json

@@ -0,0 +1,5 @@
+{
+  "tasks": {
+    "run": "deno run.js"
+  }
+}

tests/specs/task/dependencies/cycle.out

@@ -0,0 +1 @@
+Task cycle detected: a

tests/specs/task/dependencies/cycle/a.js

@@ -0,0 +1 @@
+console.log("Running a");

tests/specs/task/dependencies/cycle/deno.jsonc

@@ -0,0 +1,8 @@
+{
+  "tasks": {
+    "a": {
+      "command": "deno run a.js",
+      "dependencies": ["a"]
+    }
+  }
+}

tests/specs/task/dependencies/cycle_2.out

@@ -0,0 +1 @@
+Task cycle detected: a

tests/specs/task/dependencies/cycle_2/a.js

@@ -0,0 +1 @@
+console.log("Running a");

tests/specs/task/dependencies/cycle_2/b.js

@@ -0,0 +1 @@
+console.log("Running b");

tests/specs/task/dependencies/cycle_2/deno.jsonc

@@ -0,0 +1,12 @@
+{
+  "tasks": {
+    "a": {
+      "command": "deno run a.js",
+      "dependencies": ["b"]
+    },
+    "b": {
+      "command": "deno run b.js",
+      "dependencies": ["a"]
+    }
+  }
+}

tests/specs/task/dependencies/diamond.out

@@ -0,0 +1,8 @@
+Task d deno run d.js
+Running d
+Task b deno run b.js
+Running b
+Task c deno run c.js
+Running c
+Task a deno run a.js
+Running a

tests/specs/task/dependencies/diamond/a.js

@@ -0,0 +1 @@
+console.log("Running a");

tests/specs/task/dependencies/diamond/b.js

@@ -0,0 +1 @@
+console.log("Running b");

tests/specs/task/dependencies/diamond/c.js

@@ -0,0 +1 @@
+console.log("Running c");

tests/specs/task/dependencies/diamond/d.js

@@ -0,0 +1 @@
+console.log("Running d");

tests/specs/task/dependencies/diamond/deno.jsonc

@@ -0,0 +1,22 @@
+{
+  //   a
+  //  / \
+  // b   c
+  //  \ /
+  //   d
+  "tasks": {
+    "a": {
+      "command": "deno run a.js",
+      "dependencies": ["b", "c"]
+    },
+    "b": {
+      "command": "deno run b.js",
+      "dependencies": ["d"]
+    },
+    "c": {
+      "command": "deno run c.js",
+      "dependencies": ["d"]
+    },
+    "d": "deno run d.js"
+  }
+}