feat: add option to declare an included Taskfile as flatten (#1704)

taskfile/ast/include.go

@@ -17,6 +17,7 @@ type Include struct {
 	Aliases        []string
 	AdvancedImport bool
 	Vars           *Vars
+	Flatten        bool
 }
 
 // Includes represents information about included tasksfiles
@@ -81,6 +82,7 @@ func (include *Include) UnmarshalYAML(node *yaml.Node) error {
 			Dir      string
 			Optional bool
 			Internal bool
+			Flatten  bool
 			Aliases  []string
 			Vars     *Vars
 		}
@@ -94,6 +96,7 @@ func (include *Include) UnmarshalYAML(node *yaml.Node) error {
 		include.Aliases = includedTaskfile.Aliases
 		include.AdvancedImport = true
 		include.Vars = includedTaskfile.Vars
+		include.Flatten = includedTaskfile.Flatten
 		return nil
 	}
 
@@ -114,5 +117,6 @@ func (include *Include) DeepCopy() *Include {
 		Internal:       include.Internal,
 		AdvancedImport: include.AdvancedImport,
 		Vars:           include.Vars.DeepCopy(),
+		Flatten:        include.Flatten,
 	}
 }

taskfile/ast/taskfile.go

@@ -55,8 +55,7 @@ func (t1 *Taskfile) Merge(t2 *Taskfile, include *Include) error {
 	}
 	t1.Vars.Merge(t2.Vars, include)
 	t1.Env.Merge(t2.Env, include)
-	t1.Tasks.Merge(t2.Tasks, include, t1.Vars)
-	return nil
+	return t1.Tasks.Merge(t2.Tasks, include, t1.Vars)
 }
 
 func (tf *Taskfile) UnmarshalYAML(node *yaml.Node) error {

taskfile/ast/tasks.go

@@ -47,43 +47,48 @@ func (t *Tasks) FindMatchingTasks(call *Call) []*MatchingTask {
 	return matchingTasks
 }
 
-func (t1 *Tasks) Merge(t2 Tasks, include *Include, includedTaskfileVars *Vars) {
-	_ = t2.Range(func(name string, v *Task) error {
+func (t1 *Tasks) Merge(t2 Tasks, include *Include, includedTaskfileVars *Vars) error {
+	err := t2.Range(func(name string, v *Task) error {
 		// We do a deep copy of the task struct here to ensure that no data can
 		// be changed elsewhere once the taskfile is merged.
 		task := v.DeepCopy()
-
 		// Set the task to internal if EITHER the included task or the included
 		// taskfile are marked as internal
 		task.Internal = task.Internal || (include != nil && include.Internal)
-
-		// Add namespaces to task dependencies
-		for _, dep := range task.Deps {
-			if dep != nil && dep.Task != "" {
-				dep.Task = taskNameWithNamespace(dep.Task, include.Namespace)
-			}
-		}
-
-		// Add namespaces to task commands
-		for _, cmd := range task.Cmds {
-			if cmd != nil && cmd.Task != "" {
-				cmd.Task = taskNameWithNamespace(cmd.Task, include.Namespace)
-			}
-		}
-
-		// Add namespaces to task aliases
-		for i, alias := range task.Aliases {
-			task.Aliases[i] = taskNameWithNamespace(alias, include.Namespace)
-		}
-
-		// Add namespace aliases
-		if include != nil {
-			for _, namespaceAlias := range include.Aliases {
-				task.Aliases = append(task.Aliases, taskNameWithNamespace(task.Task, namespaceAlias))
-				for _, alias := range v.Aliases {
-					task.Aliases = append(task.Aliases, taskNameWithNamespace(alias, namespaceAlias))
+		taskName := name
+		if !include.Flatten {
+			// Add namespaces to task dependencies
+			for _, dep := range task.Deps {
+				if dep != nil && dep.Task != "" {
+					dep.Task = taskNameWithNamespace(dep.Task, include.Namespace)
 				}
 			}
+
+			// Add namespaces to task commands
+			for _, cmd := range task.Cmds {
+				if cmd != nil && cmd.Task != "" {
+					cmd.Task = taskNameWithNamespace(cmd.Task, include.Namespace)
+				}
+			}
+
+			// Add namespaces to task aliases
+			for i, alias := range task.Aliases {
+				task.Aliases[i] = taskNameWithNamespace(alias, include.Namespace)
+			}
+
+			// Add namespace aliases
+			if include != nil {
+				for _, namespaceAlias := range include.Aliases {
+					task.Aliases = append(task.Aliases, taskNameWithNamespace(task.Task, namespaceAlias))
+					for _, alias := range v.Aliases {
+						task.Aliases = append(task.Aliases, taskNameWithNamespace(alias, namespaceAlias))
+					}
+				}
+			}
+
+			taskName = taskNameWithNamespace(name, include.Namespace)
+			task.Namespace = include.Namespace
+			task.Task = taskName
 		}
 
 		if include.AdvancedImport {
@@ -95,11 +100,14 @@ func (t1 *Tasks) Merge(t2 Tasks, include *Include, includedTaskfileVars *Vars) {
 			task.IncludedTaskfileVars = includedTaskfileVars.DeepCopy()
 		}
 
+		if t1.Get(taskName) != nil {
+			return &errors.TaskNameFlattenConflictError{
+				TaskName: taskName,
+				Include:  include.Namespace,
+			}
+		}
 		// Add the task to the merged taskfile
-		taskNameWithNamespace := taskNameWithNamespace(name, include.Namespace)
-		task.Namespace = include.Namespace
-		task.Task = taskNameWithNamespace
-		t1.Set(taskNameWithNamespace, task)
+		t1.Set(taskName, task)
 
 		return nil
 	})
@@ -114,6 +122,7 @@ func (t1 *Tasks) Merge(t2 Tasks, include *Include, includedTaskfileVars *Vars) {
 		t1.Get(defaultTaskName).Aliases = append(t1.Get(defaultTaskName).Aliases, include.Namespace)
 		t1.Get(defaultTaskName).Aliases = slices.Concat(t1.Get(defaultTaskName).Aliases, include.Aliases)
 	}
+	return err
 }
 
 func (t *Tasks) UnmarshalYAML(node *yaml.Node) error {