Preserve comments on map keys

Allows more sophisticated functionality

cmd/evaluate_all_command.go

@@ -42,21 +42,14 @@ func evaluateAll(cmd *cobra.Command, args []string) error {
 		colorsEnabled = true
 	}
 
-	firstFileIndex := -1
+	if writeInplace && len(args) < 2 {
-	if !nullInput && len(args) == 1 {
-		firstFileIndex = 0
-	} else if len(args) > 1 {
-		firstFileIndex = 1
-	}
-
-	if writeInplace && (firstFileIndex == -1) {
 		return fmt.Errorf("Write inplace flag only applicable when giving an expression and at least one file")
 	}
 
 	if writeInplace {
 		// only use colors if its forced
 		colorsEnabled = forceColor
-		writeInPlaceHandler := yqlib.NewWriteInPlaceHandler(args[firstFileIndex])
+		writeInPlaceHandler := yqlib.NewWriteInPlaceHandler(args[1])
 		out, err = writeInPlaceHandler.CreateTempFile()
 		if err != nil {
 			return err

cmd/evalute_sequence_command.go

@@ -62,21 +62,14 @@ func evaluateSequence(cmd *cobra.Command, args []string) error {
 		colorsEnabled = true
 	}
 
-	firstFileIndex := -1
+	if writeInplace && len(args) < 2 {
-	if !nullInput && len(args) == 1 {
-		firstFileIndex = 0
-	} else if len(args) > 1 {
-		firstFileIndex = 1
-	}
-
-	if writeInplace && (firstFileIndex == -1) {
 		return fmt.Errorf("Write inplace flag only applicable when giving an expression and at least one file")
 	}
 
 	if writeInplace {
 		// only use colors if its forced
 		colorsEnabled = forceColor
-		writeInPlaceHandler := yqlib.NewWriteInPlaceHandler(args[firstFileIndex])
+		writeInPlaceHandler := yqlib.NewWriteInPlaceHandler(args[1])
 		out, err = writeInPlaceHandler.CreateTempFile()
 		if err != nil {
 			return err
@@ -109,7 +102,7 @@ func evaluateSequence(cmd *cobra.Command, args []string) error {
 			err = streamEvaluator.EvaluateFiles(processExpression(""), []string{args[0]}, printer)
 		}
 	default:
-		err = streamEvaluator.EvaluateFiles(processExpression(args[0]), args[1:], printer)
+		err = streamEvaluator.EvaluateFiles(args[0], args[1:], printer)
 	}
 	completedSuccessfully = err == nil
 

cmd/version.go

@@ -11,7 +11,7 @@ var (
 	GitDescribe string
 
 	// Version is main version number that is being run at the moment.
-	Version = "4.5.1"
+	Version = "4.5.0"
 
 	// VersionPrerelease is a pre-release marker for the version. If this is "" (empty string)
 	// then it means that it is a final release. Otherwise, this is a pre-release

github-action/Dockerfile

@@ -1,4 +1,4 @@
-FROM mikefarah/yq:4.5.1
+FROM mikefarah/yq:4.5.0
 
 COPY entrypoint.sh /entrypoint.sh
 

pkg/yqlib/expression_processing_test.go

@@ -12,11 +12,6 @@ var pathTests = []struct {
 	expectedTokens  []interface{}
 	expectedPostFix []interface{}
 }{
-	{
-		`.a as $item ireduce (0; . + $item)`, // note - add code to shuffle reduce to this position for postfix
-		append(make([]interface{}, 0), "a", "ASSIGN_VARIABLE", "GET_VARIABLE", "REDUCE", "(", "0 (int64)", "BLOCK", "SELF", "ADD", "GET_VARIABLE", ")"),
-		append(make([]interface{}, 0), "a", "GET_VARIABLE", "ASSIGN_VARIABLE", "0 (int64)", "SELF", "GET_VARIABLE", "ADD", "BLOCK", "REDUCE"),
-	},
 	{
 		`.a | .b | .c`,
 		append(make([]interface{}, 0), "a", "PIPE", "b", "PIPE", "c"),

pkg/yqlib/expression_tokeniser.go

@@ -252,8 +252,6 @@ func initLexer() (*lex.Lexer, error) {
 	lexer.Add([]byte(`or`), opToken(orOpType))
 	lexer.Add([]byte(`and`), opToken(andOpType))
 	lexer.Add([]byte(`not`), opToken(notOpType))
-	lexer.Add([]byte(`ireduce`), opToken(reduceOpType))
-	lexer.Add([]byte(`;`), opToken(blockOpType))
 	lexer.Add([]byte(`\/\/`), opToken(alternativeOpType))
 
 	lexer.Add([]byte(`documentIndex`), opToken(getDocumentIndexOpType))

pkg/yqlib/lib.go

@@ -25,9 +25,6 @@ type operationType struct {
 
 var orOpType = &operationType{Type: "OR", NumArgs: 2, Precedence: 20, Handler: orOperator}
 var andOpType = &operationType{Type: "AND", NumArgs: 2, Precedence: 20, Handler: andOperator}
-var reduceOpType = &operationType{Type: "REDUCE", NumArgs: 2, Precedence: 5, Handler: reduceOperator}
-
-var blockOpType = &operationType{Type: "BLOCK", Precedence: 10, NumArgs: 2, Handler: emptyOperator}
 
 var unionOpType = &operationType{Type: "UNION", NumArgs: 2, Precedence: 10, Handler: unionOperator}
 
@@ -83,7 +80,7 @@ var selfReferenceOpType = &operationType{Type: "SELF", NumArgs: 0, Precedence: 5
 var valueOpType = &operationType{Type: "VALUE", NumArgs: 0, Precedence: 50, Handler: valueOperator}
 var envOpType = &operationType{Type: "ENV", NumArgs: 0, Precedence: 50, Handler: envOperator}
 var notOpType = &operationType{Type: "NOT", NumArgs: 0, Precedence: 50, Handler: notOperator}
-var emptyOpType = &operationType{Type: "EMPTY", Precedence: 50, Handler: emptyOperator}
+var emptyOpType = &operationType{Type: "EMPTY", NumArgs: 50, Handler: emptyOperator}
 
 var recursiveDescentOpType = &operationType{Type: "RECURSIVE_DESCENT", NumArgs: 0, Precedence: 50, Handler: recursiveDescentOperator}
 

pkg/yqlib/operator_reduce.go

@@ -1,59 +0,0 @@
-package yqlib
-
-import (
-	"container/list"
-	"fmt"
-)
-
-func reduceOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
-	log.Debugf("-- reduceOp")
-	//.a as $var reduce (0; . + $var)
-	//lhs is the assignment operator
-	//rhs is the reduce block
-	// '.' refers to the current accumulator, initialised to 0
-	// $var references a single element from the .a
-
-	//ensure lhs is actually an assignment
-	//and rhs is a block (empty)
-	if expressionNode.Lhs.Operation.OperationType != assignVariableOpType {
-		return Context{}, fmt.Errorf("reduce must be given a variables assignment, got %v instead", expressionNode.Lhs.Operation.OperationType.Type)
-	} else if expressionNode.Rhs.Operation.OperationType != blockOpType {
-		return Context{}, fmt.Errorf("reduce must be given a block, got %v instead", expressionNode.Rhs.Operation.OperationType.Type)
-	}
-
-	arrayExpNode := expressionNode.Lhs.Lhs
-	array, err := d.GetMatchingNodes(context, arrayExpNode)
-
-	log.Debugf("array of %v things", array.MatchingNodes.Len())
-
-	if err != nil {
-		return Context{}, err
-	}
-
-	variableName := expressionNode.Lhs.Rhs.Operation.StringValue
-
-	initExp := expressionNode.Rhs.Lhs
-
-	accum, err := d.GetMatchingNodes(context, initExp)
-	if err != nil {
-		return Context{}, err
-	}
-
-	log.Debugf("with variable %v", variableName)
-
-	blockExp := expressionNode.Rhs.Rhs
-	for el := array.MatchingNodes.Front(); el != nil; el = el.Next() {
-		candidate := el.Value.(*CandidateNode)
-		log.Debugf("REDUCING WITH %v", NodeToString(candidate))
-		l := list.New()
-		l.PushBack(candidate)
-		accum.SetVariable(variableName, l)
-
-		accum, err = d.GetMatchingNodes(accum, blockExp)
-		if err != nil {
-			return Context{}, err
-		}
-	}
-
-	return accum, nil
-}

pkg/yqlib/operator_reduce_test.go

@@ -1,22 +0,0 @@
-package yqlib
-
-import (
-	"testing"
-)
-
-var reduceOperatorScenarios = []expressionScenario{
-	{
-		document:   `[10,2, 5, 3]`,
-		expression: `.[] as $item ireduce (0; . + $item)`,
-		expected: []string{
-			"D0, P[], (!!int)::20\n",
-		},
-	},
-}
-
-func TestReduceOperatorScenarios(t *testing.T) {
-	for _, tt := range reduceOperatorScenarios {
-		testScenario(t, &tt)
-	}
-	// documentScenarios(t, "Reduce", reduceOperatorScenarios)
-}

release_instructions.txt

@@ -8,7 +8,6 @@
 - use github actions to publish docker and make github release
 - check github updated yq action in marketplace
 
-
 - snapcraft
   - will auto create a candidate, test it works then promote
   

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: yq
-version: '4.5.1'
+version: '4.5.0'
 summary: A lightweight and portable command-line YAML processor
 description: |
   The aim of the project is to be the jq or sed of yaml files.