diff --git a/args/args_test.go b/args/args_test.go index 75dacb4d..9839ebff 100644 --- a/args/args_test.go +++ b/args/args_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/go-task/task/v3/args" - "github.com/go-task/task/v3/internal/orderedmap" + "github.com/go-task/task/v3/internal/omap" "github.com/go-task/task/v3/taskfile/ast" ) @@ -33,7 +33,7 @@ func TestArgs(t *testing.T) { {Task: "task-c"}, }, ExpectedGlobals: &ast.Vars{ - OrderedMap: orderedmap.FromMapWithOrder( + OrderedMap: omap.FromMapWithOrder( map[string]ast.Var{ "FOO": {Value: "bar"}, "BAR": {Value: "baz"}, @@ -49,7 +49,7 @@ func TestArgs(t *testing.T) { {Task: "task-a"}, }, ExpectedGlobals: &ast.Vars{ - OrderedMap: orderedmap.FromMapWithOrder( + OrderedMap: omap.FromMapWithOrder( map[string]ast.Var{ "CONTENT": {Value: "with some spaces"}, }, @@ -64,7 +64,7 @@ func TestArgs(t *testing.T) { {Task: "task-b"}, }, ExpectedGlobals: &ast.Vars{ - OrderedMap: orderedmap.FromMapWithOrder( + OrderedMap: omap.FromMapWithOrder( map[string]ast.Var{ "FOO": {Value: "bar"}, }, @@ -84,7 +84,7 @@ func TestArgs(t *testing.T) { Args: []string{"FOO=bar", "BAR=baz"}, ExpectedCalls: []ast.Call{}, ExpectedGlobals: &ast.Vars{ - OrderedMap: orderedmap.FromMapWithOrder( + OrderedMap: omap.FromMapWithOrder( map[string]ast.Var{ "FOO": {Value: "bar"}, "BAR": {Value: "baz"}, diff --git a/internal/orderedmap/orderedmap.go b/internal/omap/orderedmap.go similarity index 99% rename from internal/orderedmap/orderedmap.go rename to internal/omap/orderedmap.go index 8a497f6b..c57b9023 100644 --- a/internal/orderedmap/orderedmap.go +++ b/internal/omap/orderedmap.go @@ -1,4 +1,4 @@ -package orderedmap +package omap import ( "fmt" diff --git a/internal/orderedmap/orderedmap_test.go b/internal/omap/orderedmap_test.go similarity index 99% rename from internal/orderedmap/orderedmap_test.go rename to internal/omap/orderedmap_test.go index f8b912c8..14220831 100644 --- a/internal/orderedmap/orderedmap_test.go +++ b/internal/omap/orderedmap_test.go @@ -1,4 +1,4 @@ -package orderedmap +package omap import ( "testing" diff --git a/internal/output/output_test.go b/internal/output/output_test.go index ef150373..9236736e 100644 --- a/internal/output/output_test.go +++ b/internal/output/output_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/go-task/task/v3/internal/orderedmap" + "github.com/go-task/task/v3/internal/omap" "github.com/go-task/task/v3/internal/output" "github.com/go-task/task/v3/internal/templater" "github.com/go-task/task/v3/taskfile/ast" @@ -48,7 +48,7 @@ func TestGroup(t *testing.T) { func TestGroupWithBeginEnd(t *testing.T) { tmpl := templater.Templater{ Vars: &ast.Vars{ - OrderedMap: orderedmap.FromMap(map[string]ast.Var{ + OrderedMap: omap.FromMap(map[string]ast.Var{ "VAR1": {Value: "example-value"}, }), }, diff --git a/taskfile/ast/include.go b/taskfile/ast/include.go index 097fb6e2..b55762cc 100644 --- a/taskfile/ast/include.go +++ b/taskfile/ast/include.go @@ -7,7 +7,7 @@ import ( "github.com/go-task/task/v3/internal/execext" "github.com/go-task/task/v3/internal/filepathext" - "github.com/go-task/task/v3/internal/orderedmap" + omap "github.com/go-task/task/v3/internal/omap" "gopkg.in/yaml.v3" ) @@ -27,7 +27,7 @@ type Include struct { // Includes represents information about included tasksfiles type Includes struct { - orderedmap.OrderedMap[string, Include] + omap.OrderedMap[string, Include] } // UnmarshalYAML implements the yaml.Unmarshaler interface. diff --git a/taskfile/ast/taskfile_test.go b/taskfile/ast/taskfile_test.go index a8e00a8b..0d0cd43c 100644 --- a/taskfile/ast/taskfile_test.go +++ b/taskfile/ast/taskfile_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" - "github.com/go-task/task/v3/internal/orderedmap" + "github.com/go-task/task/v3/internal/omap" "github.com/go-task/task/v3/taskfile/ast" ) @@ -39,7 +39,7 @@ vars: &ast.Cmd{}, &ast.Cmd{ Task: "another-task", Vars: &ast.Vars{ - OrderedMap: orderedmap.FromMapWithOrder( + OrderedMap: omap.FromMapWithOrder( map[string]ast.Var{ "PARAM1": {Value: "VALUE1"}, "PARAM2": {Value: "VALUE2"}, @@ -59,7 +59,7 @@ vars: &ast.Cmd{}, &ast.Cmd{ Task: "some_task", Vars: &ast.Vars{ - OrderedMap: orderedmap.FromMapWithOrder( + OrderedMap: omap.FromMapWithOrder( map[string]ast.Var{ "PARAM1": {Value: "var"}, }, @@ -79,7 +79,7 @@ vars: &ast.Dep{}, &ast.Dep{ Task: "another-task", Vars: &ast.Vars{ - OrderedMap: orderedmap.FromMapWithOrder( + OrderedMap: omap.FromMapWithOrder( map[string]ast.Var{ "PARAM1": {Value: "VALUE1"}, "PARAM2": {Value: "VALUE2"}, diff --git a/taskfile/ast/tasks.go b/taskfile/ast/tasks.go index 2f5906e7..4f632428 100644 --- a/taskfile/ast/tasks.go +++ b/taskfile/ast/tasks.go @@ -5,18 +5,18 @@ import ( "gopkg.in/yaml.v3" - "github.com/go-task/task/v3/internal/orderedmap" + "github.com/go-task/task/v3/internal/omap" ) // Tasks represents a group of tasks type Tasks struct { - orderedmap.OrderedMap[string, *Task] + omap.OrderedMap[string, *Task] } func (t *Tasks) UnmarshalYAML(node *yaml.Node) error { switch node.Kind { case yaml.MappingNode: - tasks := orderedmap.New[string, *Task]() + tasks := omap.New[string, *Task]() if err := node.Decode(&tasks); err != nil { return err } diff --git a/taskfile/ast/var.go b/taskfile/ast/var.go index 6b827af5..93f883da 100644 --- a/taskfile/ast/var.go +++ b/taskfile/ast/var.go @@ -7,12 +7,12 @@ import ( "gopkg.in/yaml.v3" "github.com/go-task/task/v3/internal/experiments" - "github.com/go-task/task/v3/internal/orderedmap" + "github.com/go-task/task/v3/internal/omap" ) // Vars is a string[string] variables map. type Vars struct { - orderedmap.OrderedMap[string, Var] + omap.OrderedMap[string, Var] } // ToCacheMap converts Vars to a map containing only the static