Simplify map expr

TomWright · Oct 10, 2024 · 797f001 · 797f001
1 parent 9010bd5
commit 797f001
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/execution/execute.go b/execution/execute.go
@@ -8,6 +8,7 @@ import (
 	"github.com/tomwright/dasel/v3/selector/ast"
 )
 
+// ExecuteSelector parses the selector and executes the resulting AST with the given input.
 func ExecuteSelector(selectorStr string, value *model.Value) (*model.Value, error) {
 	if selectorStr == "" {
 		return value, nil
@@ -28,6 +29,7 @@ func ExecuteSelector(selectorStr string, value *model.Value) (*model.Value, erro
 
 type expressionExecutor func(data *model.Value) (*model.Value, error)
 
+// ExecuteAST executes the given AST with the given input.
 func ExecuteAST(expr ast.Expr, value *model.Value) (*model.Value, error) {
 	if expr == nil {
 		return value, nil

diff --git a/execution/execute_map.go b/execution/execute_map.go
@@ -15,12 +15,9 @@ func mapExprExecutor(e ast.MapExpr) (expressionExecutor, error) {
 		res := model.NewSliceValue()
 
 		if err := data.RangeSlice(func(i int, item *model.Value) error {
-			var err error
-			for _, expr := range e.Exprs {
-				item, err = ExecuteAST(expr, item)
-				if err != nil {
-					return err
-				}
+			item, err := ExecuteAST(e.Expr, item)
+			if err != nil {
+				return err
 			}
 			if err := res.Append(item); err != nil {
 				return fmt.Errorf("error appending item to result: %w", err)

diff --git a/selector/ast/expression_complex.go b/selector/ast/expression_complex.go
@@ -88,7 +88,7 @@ type ObjectExpr struct {
 func (ObjectExpr) expr() {}
 
 type MapExpr struct {
-	Exprs Expressions
+	Expr Expr
 }
 
 func (MapExpr) expr() {}

diff --git a/selector/parser/parse_map.go b/selector/parser/parse_map.go
@@ -27,7 +27,7 @@ func parseMap(p *Parser) (ast.Expr, error) {
 	}
 
 	return ast.MapExpr{
-		Exprs: expressions,
+		Expr: ast.ChainExprs(expressions...),
 	}, nil
 }
 

diff --git a/selector/parser/parser_test.go b/selector/parser/parser_test.go
@@ -267,9 +267,7 @@ func TestParser_Parse_HappyPath(t *testing.T) {
 			expected: ast.ChainExprs(
 				ast.PropertyExpr{Property: ast.StringExpr{Value: "foo"}},
 				ast.MapExpr{
-					Exprs: ast.Expressions{
-						ast.PropertyExpr{Property: ast.StringExpr{Value: "x"}},
-					},
+					Expr: ast.PropertyExpr{Property: ast.StringExpr{Value: "x"}},
 				},
 			),
 		}))
@@ -278,12 +276,10 @@ func TestParser_Parse_HappyPath(t *testing.T) {
 			expected: ast.ChainExprs(
 				ast.PropertyExpr{Property: ast.StringExpr{Value: "foo"}},
 				ast.MapExpr{
-					Exprs: ast.Expressions{
-						ast.ChainExprs(
-							ast.PropertyExpr{Property: ast.StringExpr{Value: "x"}},
-							ast.PropertyExpr{Property: ast.StringExpr{Value: "y"}},
-						),
-					},
+					Expr: ast.ChainExprs(
+						ast.PropertyExpr{Property: ast.StringExpr{Value: "x"}},
+						ast.PropertyExpr{Property: ast.StringExpr{Value: "y"}},
+					),
 				},
 			),
 		}))