go/task
go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-02-03 13:22:11 +02:00
Code Issues Releases Activity

feat: change Var.Value from string to an any type

Browse Source
This commit is contained in:
Pete Davison 2023-11-29 16:21:21 +00:00
parent de09e675c1
commit 5516ac1a00
5 changed files with 54 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
internal/compiler/v2/compiler_v2.go
View File

@ -72,11 +72,22 @@ func (vr *varResolver) merge(vars *taskfile.Vars) {
}
tr := templater.Templater{Vars: vr.vars}
_ = vars.Range(func(k string, v taskfile.Var) error {
v = taskfile.Var{
Value: tr.Replace(v.Value),
Sh: tr.Replace(v.Sh),
// Replace values
newVar := taskfile.Var{}
switch value := v.Value.(type) {
case string:
newVar.Value = tr.Replace(value)
default:
newVar.Value = value
}
static, err := vr.c.HandleDynamicVar(v, "")
newVar.Sh = tr.Replace(v.Sh)
// If the variable is not dynamic, we can set it and return
if newVar.Value != nil || newVar.Sh == "" {
vr.vars.Set(k, taskfile.Var{Value: newVar.Value})
return nil
}
// If the variable is dynamic, we need to resolve it first
static, err := vr.c.HandleDynamicVar(newVar, "")
if err != nil {
vr.err = err
return err
@ -88,10 +99,6 @@ func (vr *varResolver) merge(vars *taskfile.Vars) {
}
func (c *CompilerV2) HandleDynamicVar(v taskfile.Var, _ string) (string, error) {
if v.Value != "" || v.Sh == "" {
return v.Value, nil
}
c.muDynamicCache.Lock()
defer c.muDynamicCache.Unlock()

31
internal/compiler/v3/compiler_v3.go
View File

@ -58,21 +58,26 @@ func (c *CompilerV3) getVariables(t *taskfile.Task, call *taskfile.Call, evaluat
getRangeFunc := func(dir string) func(k string, v taskfile.Var) error {
return func(k string, v taskfile.Var) error {
tr := templater.Templater{Vars: result, RemoveNoValue: true}
if !evaluateShVars {
result.Set(k, taskfile.Var{Value: tr.Replace(v.Value)})
return nil
}
v = taskfile.Var{
Value: tr.Replace(v.Value),
Sh: tr.Replace(v.Sh),
Dir: v.Dir,
// Replace values
newVar := taskfile.Var{}
switch value := v.Value.(type) {
case string:
newVar.Value = tr.Replace(value)
default:
newVar.Value = value
}
newVar.Sh = tr.Replace(v.Sh)
newVar.Dir = v.Dir
if err := tr.Err(); err != nil {
return err
}
static, err := c.HandleDynamicVar(v, dir)
// If the variable is not dynamic, we can set it and return
if !evaluateShVars || newVar.Value != nil || newVar.Sh == "" {
result.Set(k, taskfile.Var{Value: newVar.Value})
return nil
}
// If the variable is dynamic, we need to resolve it first
static, err := c.HandleDynamicVar(newVar, dir)
if err != nil {
return err
}
@ -125,10 +130,6 @@ func (c *CompilerV3) getVariables(t *taskfile.Task, call *taskfile.Call, evaluat
}
func (c *CompilerV3) HandleDynamicVar(v taskfile.Var, dir string) (string, error) {
if v.Value != "" || v.Sh == "" {
return v.Value, nil
}
c.muDynamicCache.Lock()
defer c.muDynamicCache.Unlock()

17
internal/templater/templater.go
View File

@ -108,17 +108,20 @@ func (r *Templater) replaceVars(vars *taskfile.Vars, extra map[string]any) *task
return nil
}
var new taskfile.Vars
var newVars taskfile.Vars
_ = vars.Range(func(k string, v taskfile.Var) error {
new.Set(k, taskfile.Var{
Value: r.ReplaceWithExtra(v.Value, extra),
Live: v.Live,
Sh: r.ReplaceWithExtra(v.Sh, extra),
})
var newVar taskfile.Var
switch value := v.Value.(type) {
case string:
newVar.Value = r.ReplaceWithExtra(value, extra)
}
newVar.Live = v.Live
newVar.Sh = r.ReplaceWithExtra(v.Sh, extra)
newVars.Set(k, newVar)
return nil
})
return &new
return &newVars
}
func (r *Templater) Err() error {

2
taskfile/var.go
View File

@ -71,7 +71,7 @@ func (vs *Vars) DeepCopy() *Vars {
// Var represents either a static or dynamic variable.
type Var struct {
Value string
Value any
Live any
Sh string
Dir string

16
variables.go
View File

@ -108,6 +108,11 @@ func (e *Executor) compiledTask(call taskfile.Call, evaluateShVars bool) (*taskf
new.Env.Merge(r.ReplaceVars(origTask.Env))
if evaluateShVars {
err = new.Env.Range(func(k string, v taskfile.Var) error {
// If the variable is not dynamic, we can set it and return
if v.Value != nil || v.Sh == "" {
new.Env.Set(k, taskfile.Var{Value: v.Value})
return nil
}
static, err := e.Compiler.HandleDynamicVar(v, new.Dir)
if err != nil {
return err
@ -149,10 +154,13 @@ func (e *Executor) compiledTask(call taskfile.Call, evaluateShVars bool) (*taskf
if cmd.For.Var != "" {
if vars != nil {
v := vars.Get(cmd.For.Var)
if cmd.For.Split != "" {
list = strings.Split(v.Value, cmd.For.Split)
} else {
list = strings.Fields(v.Value)
switch value := v.Value.(type) {
case string:
if cmd.For.Split != "" {
list = strings.Split(value, cmd.For.Split)
} else {
list = strings.Fields(value)
}
}
}
}