From db5b3deddc37d671318be8822d95580a5a68bd32 Mon Sep 17 00:00:00 2001
From: Jeff Dickey <216188+jdx@users.noreply.github.com>
Date: Wed, 18 Sep 2024 16:07:11 -0500
Subject: [PATCH] feat(tasks): allow mise-tasks or .mise-tasks directories

Fixes #2604
---
 docs/cli/index.md          |  6 ++++--
 docs/cli/run.md            |  3 ++-
 docs/cli/tasks/run.md      |  3 ++-
 docs/tasks/script-tasks.md | 11 +++++++++--
 mise.usage.kdl             |  6 ++++--
 src/cli/run.rs             |  3 ++-
 src/config/mod.rs          |  2 ++
 src/task.rs                | 10 ++++++++++
 8 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/docs/cli/index.md b/docs/cli/index.md
index 510de19ea..7b56b1490 100644
--- a/docs/cli/index.md
+++ b/docs/cli/index.md
@@ -1047,7 +1047,8 @@ In .mise.toml, tasks take this form:
     outputs = ["dist/**/*.js"]
 
 Alternatively, tasks can be defined as standalone scripts.
-These must be located in the `.mise/tasks`, `mise/tasks` or `.config/mise/tasks` directory.
+These must be located in `mise-tasks`, `.mise-tasks`, `.mise/tasks`, `mise/tasks` or
+`.config/mise/tasks`.
 The name of the script will be the name of the tasks.
 
     $ cat .mise/tasks/build<<EOF
@@ -1478,7 +1479,8 @@ In .mise.toml, tasks take this form:
     outputs = ["dist/**/*.js"]
 
 Alternatively, tasks can be defined as standalone scripts.
-These must be located in the `.mise/tasks`, `mise/tasks` or `.config/mise/tasks` directory.
+These must be located in `mise-tasks`, `.mise-tasks`, `.mise/tasks`, `mise/tasks` or
+`.config/mise/tasks`.
 The name of the script will be the name of the tasks.
 
     $ cat .mise/tasks/build<<EOF
diff --git a/docs/cli/run.md b/docs/cli/run.md
index 0afe3e3cb..abf7eee28 100644
--- a/docs/cli/run.md
+++ b/docs/cli/run.md
@@ -19,7 +19,8 @@ In .mise.toml, tasks take this form:
     outputs = ["dist/**/*.js"]
 
 Alternatively, tasks can be defined as standalone scripts.
-These must be located in the `.mise/tasks`, `mise/tasks` or `.config/mise/tasks` directory.
+These must be located in `mise-tasks`, `.mise-tasks`, `.mise/tasks`, `mise/tasks` or
+`.config/mise/tasks`.
 The name of the script will be the name of the tasks.
 
     $ cat .mise/tasks/build<<EOF
diff --git a/docs/cli/tasks/run.md b/docs/cli/tasks/run.md
index 20ed3c216..e77262b5b 100644
--- a/docs/cli/tasks/run.md
+++ b/docs/cli/tasks/run.md
@@ -19,7 +19,8 @@ In .mise.toml, tasks take this form:
     outputs = ["dist/**/*.js"]
 
 Alternatively, tasks can be defined as standalone scripts.
-These must be located in the `.mise/tasks`, `mise/tasks` or `.config/mise/tasks` directory.
+These must be located in `mise-tasks`, `.mise-tasks`, `.mise/tasks`, `mise/tasks` or
+`.config/mise/tasks`.
 The name of the script will be the name of the tasks.
 
     $ cat .mise/tasks/build<<EOF
diff --git a/docs/tasks/script-tasks.md b/docs/tasks/script-tasks.md
index 0b8992dbe..2a7f1d10b 100644
--- a/docs/tasks/script-tasks.md
+++ b/docs/tasks/script-tasks.md
@@ -1,7 +1,14 @@
 # Script Tasks
 
-In addition to defining tasks through the configuration, they can also be defined as standalone script files in
-`.mise/tasks/:task_name` such as the following build script for cargo:
+In addition to defining tasks through the configuration, they can also be defined as standalone script files in one of the following directories:
+
+* `mise-tasks/:task_name`
+* `.mise-tasks/:task_name`
+* `mise/tasks/:task_name`
+* `.mise/tasks/:task_name`
+* `.config/mise/tasks/:task_name`
+
+Here is an example of a script task that builds a Rust CLI:
 
 ```bash
 #!/usr/bin/env bash
diff --git a/mise.usage.kdl b/mise.usage.kdl
index 885e09040..4266bd051 100644
--- a/mise.usage.kdl
+++ b/mise.usage.kdl
@@ -790,7 +790,8 @@ In .mise.toml, tasks take this form:
     outputs = ["dist/**/*.js"]
 
 Alternatively, tasks can be defined as standalone scripts.
-These must be located in the `.mise/tasks`, `mise/tasks` or `.config/mise/tasks` directory.
+These must be located in `mise-tasks`, `.mise-tasks`, `.mise/tasks`, `mise/tasks` or
+`.config/mise/tasks`.
 The name of the script will be the name of the tasks.
 
     $ cat .mise/tasks/build<<EOF
@@ -1064,7 +1065,8 @@ In .mise.toml, tasks take this form:
     outputs = ["dist/**/*.js"]
 
 Alternatively, tasks can be defined as standalone scripts.
-These must be located in the `.mise/tasks`, `mise/tasks` or `.config/mise/tasks` directory.
+These must be located in `mise-tasks`, `.mise-tasks`, `.mise/tasks`, `mise/tasks` or
+`.config/mise/tasks`.
 The name of the script will be the name of the tasks.
 
     $ cat .mise/tasks/build<<EOF
diff --git a/src/cli/run.rs b/src/cli/run.rs
index 8cccf9613..4c325dde9 100644
--- a/src/cli/run.rs
+++ b/src/cli/run.rs
@@ -45,7 +45,8 @@ use super::args::ToolArg;
 ///     outputs = ["dist/**/*.js"]
 ///
 /// Alternatively, tasks can be defined as standalone scripts.
-/// These must be located in the `.mise/tasks`, `mise/tasks` or `.config/mise/tasks` directory.
+/// These must be located in `mise-tasks`, `.mise-tasks`, `.mise/tasks`, `mise/tasks` or
+/// `.config/mise/tasks`.
 /// The name of the script will be the name of the tasks.
 ///
 ///     $ cat .mise/tasks/build<<EOF
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 472aa39e0..7aebd6266 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -678,6 +678,8 @@ impl Debug for Config {
 
 fn default_task_includes() -> Vec<PathBuf> {
     vec![
+        "mise-tasks".into(),
+        ".mise-tasks".into(),
         ".mise/tasks".into(),
         ".config/mise/tasks".into(),
         "mise/tasks".into(),
diff --git a/src/task.rs b/src/task.rs
index fb118e0ad..68c5f14fe 100644
--- a/src/task.rs
+++ b/src/task.rs
@@ -164,6 +164,8 @@ fn name_from_path(root: impl AsRef<Path>, path: impl AsRef<Path>) -> Result<Stri
         .as_ref()
         .strip_prefix(root)
         .map(|p| match p {
+            p if p.starts_with("mise-tasks") => p.strip_prefix("mise-tasks"),
+            p if p.starts_with(".mise-tasks") => p.strip_prefix(".mise-tasks"),
             p if p.starts_with(".mise/tasks") => p.strip_prefix(".mise/tasks"),
             p if p.starts_with("mise/tasks") => p.strip_prefix("mise/tasks"),
             p if p.starts_with(".config/mise/tasks") => p.strip_prefix(".config/mise/tasks"),
@@ -332,6 +334,14 @@ impl TreeItem for (&Graph<Task, ()>, NodeIndex) {
 
 fn config_root(config_source: &impl AsRef<Path>) -> Option<&Path> {
     for ancestor in config_source.as_ref().ancestors() {
+        if ancestor.ends_with("mise-tasks") {
+            return ancestor.parent();
+        }
+
+        if ancestor.ends_with(".mise-tasks") {
+            return ancestor.parent();
+        }
+
         if ancestor.ends_with(".mise/tasks") {
             return ancestor.parent()?.parent();
         }