go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-08-10 22:42:19 +02:00
Code Issues Releases Activity

feat: includes should use OrderedMap

Browse Source
This commit is contained in:
Pete Davison
2024-01-04 00:27:46 +00:00
parent d684e59b6a
commit 1a03c3fbaf
1 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
taskfile/ast/include.go
View File

@@ -7,8 +7,8 @@ import (
"github.com/go-task/task/v3/internal/execext" "github.com/go-task/task/v3/internal/execext"
"github.com/go-task/task/v3/internal/filepathext" "github.com/go-task/task/v3/internal/filepathext"
"github.com/go-task/task/v3/internal/orderedmap"
"golang.org/x/exp/slices"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )
@@ -27,8 +27,7 @@ type Include struct {
// Includes represents information about included tasksfiles // Includes represents information about included tasksfiles
type Includes struct { type Includes struct {
Keys []string orderedmap.OrderedMap[string, Include]
Mapping map[string]Include
} }
// UnmarshalYAML implements the yaml.Unmarshaler interface. // UnmarshalYAML implements the yaml.Unmarshaler interface.
@@ -60,31 +59,15 @@ func (includes *Includes) Len() int {
if includes == nil { if includes == nil {
return 0 return 0
} }
return len(includes.Keys) return includes.OrderedMap.Len()
} }
// Set sets a value to a given key // Wrapper around OrderedMap.Set to ensure we don't get nil pointer errors
func (includes *Includes) Set(namespace string, include Include) { func (includes *Includes) Range(f func(k string, v Include) error) error {
if includes.Mapping == nil {
includes.Mapping = make(map[string]Include, 1)
}
if !slices.Contains(includes.Keys, namespace) {
includes.Keys = append(includes.Keys, namespace)
}
includes.Mapping[namespace] = include
}
// Range allows you to loop into the included taskfiles in its right order
func (includes *Includes) Range(yield func(namespace string, include Include) error) error {
if includes == nil { if includes == nil {
return nil return nil
} }
for _, k := range includes.Keys { return includes.OrderedMap.Range(f)
if err := yield(k, includes.Mapping[k]); err != nil {
return err
}
}
return nil
} }
func (include *Include) UnmarshalYAML(node *yaml.Node) error { func (include *Include) UnmarshalYAML(node *yaml.Node) error {