fixed leading content logic

examples/array.yaml

@@ -1,2 +1,11 @@
-- [cat, dog, frog, cow]
-- [apple, banana, grape, mango]
+---
+- become: true
+  gather_facts: false
+  hosts: lalaland
+  name: "Apply smth"
+  roles:
+    - lala
+    - land
+  serial: 1
+- become: false
+  gather_facts: true

go.mod

@@ -8,11 +8,11 @@ require (
 	github.com/elliotchance/orderedmap v1.5.0
 	github.com/fatih/color v1.13.0
 	github.com/goccy/go-json v0.9.11
-	github.com/goccy/go-yaml v1.9.6
+	github.com/goccy/go-yaml v1.9.5
 	github.com/jinzhu/copier v0.3.5
 	github.com/magiconair/properties v1.8.6
 	github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e
-	github.com/spf13/cobra v1.6.1
+	github.com/spf13/cobra v1.6.0
 	golang.org/x/net v0.0.0-20220708220712-1185a9018129
 	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
 	gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -21,8 +21,8 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=
 github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/goccy/go-yaml v1.9.6 h1:KhAu1zf9JXnm3vbG49aDE0E5uEBUsM4uwD31/58ZWyI=
-github.com/goccy/go-yaml v1.9.6/go.mod h1:JubOolP3gh0HpiBc4BLRD4YmjEjHAmIIB2aaXKkTfoE=
+github.com/goccy/go-yaml v1.9.5 h1:Eh/+3uk9kLxG4koCX6lRMAPS1OaMSAi+FJcya0INdB0=
+github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
@@ -43,8 +43,8 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
-github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
+github.com/spf13/cobra v1.6.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI=
+github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -62,7 +62,6 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e h1:NHvCuwuS43lGnYhten69ZWqi2QOj/CiDNcKbVqwVoew=
 golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

pkg/yqlib/doc/operators/slice-array.md

@@ -1,77 +0,0 @@
-
-## Slicing arrays
-Given a sample.yml file of:
-```yaml
-- cat
-- dog
-- frog
-- cow
-```
-then
-```bash
-yq '.[1:3]' sample.yml
-```
-will output
-```yaml
-- dog
-- frog
-```
-
-## Slicing arrays - without the first number
-Starts from the start of the array
-
-Given a sample.yml file of:
-```yaml
-- cat
-- dog
-- frog
-- cow
-```
-then
-```bash
-yq '.[:2]' sample.yml
-```
-will output
-```yaml
-- cat
-- dog
-```
-
-## Slicing arrays - without the second number
-Finishes at the end of the array
-
-Given a sample.yml file of:
-```yaml
-- cat
-- dog
-- frog
-- cow
-```
-then
-```bash
-yq '.[2:]' sample.yml
-```
-will output
-```yaml
-- frog
-- cow
-```
-
-## Slicing arrays - use negative numbers to count backwards from the end
-Given a sample.yml file of:
-```yaml
-- cat
-- dog
-- frog
-- cow
-```
-then
-```bash
-yq '.[1:-1]' sample.yml
-```
-will output
-```yaml
-- dog
-- frog
-```
-

pkg/yqlib/lexer.go

@@ -3,6 +3,7 @@ package yqlib
 import (
 	"fmt"
 	"regexp"
+	"strconv"
 )
 
 type expressionTokeniser interface {
@@ -63,11 +64,11 @@ func unwrap(value string) string {
 func extractNumberParameter(value string) (int, error) {
 	parameterParser := regexp.MustCompile(`.*\(([0-9]+)\)`)
 	matches := parameterParser.FindStringSubmatch(value)
-	var indent, errParsingInt = parseInt(matches[1])
+	var indent, errParsingInt = strconv.ParseInt(matches[1], 10, 32)
 	if errParsingInt != nil {
 		return 0, errParsingInt
 	}
-	return indent, nil
+	return int(indent), nil
 }
 
 func hasOptionParameter(value string, option string) bool {

pkg/yqlib/lexer_participle.go

@@ -1,7 +1,6 @@
 package yqlib
 
 import (
-	"regexp"
 	"strconv"
 	"strings"
 
@@ -13,10 +12,6 @@ var participleYqRules = []*participleYqRule{
 	{"HEAD_COMMENT", `head_?comment|headComment`, opTokenWithPrefs(getCommentOpType, assignCommentOpType, commentOpPreferences{HeadComment: true}), 0},
 	{"FOOT_COMMENT", `foot_?comment|footComment`, opTokenWithPrefs(getCommentOpType, assignCommentOpType, commentOpPreferences{FootComment: true}), 0},
 
-	{"SliceArray", `\.\[-?[0-9]+:-?[0-9]+\]`, sliceArrayTwoNumbers(), 0},
-	{"SliceArraySecond", `\.\[\:-?[0-9]+\]`, sliceArraySecondNumberOnly(), 0},
-	{"SliceArrayFirst", `\.\[-?[0-9]+\:\]`, sliceArrayFirstNumberOnly(), 0},
-
 	{"OpenBracket", `\(`, literalToken(openBracket, false), 0},
 	{"CloseBracket", `\)`, literalToken(closeBracket, true), 0},
 	{"OpenTraverseArrayCollect", `\.\[`, literalToken(traverseArrayCollect, false), 0},
@@ -305,84 +300,6 @@ func flattenWithDepth() yqAction {
 	}
 }
 
-func sliceArrayTwoNumbers() yqAction {
-	return func(rawToken lexer.Token) (*token, error) {
-		value := rawToken.Value
-		sliceArrayNumbers := regexp.MustCompile(`\.\[(-?[0-9]+)\:(-?[0-9]+)\]`)
-		matches := sliceArrayNumbers.FindStringSubmatch(value)
-		log.Debug("sliceArrayTwoNumbers value: %v", value)
-		log.Debug("Matches: %v", matches)
-
-		firstNumber, err := parseInt(matches[1])
-		if err != nil {
-			return nil, err
-		}
-		secondNumber, err := parseInt(matches[2])
-		if err != nil {
-			return nil, err
-		}
-
-		prefs := sliceArrayPreferences{
-			firstNumber:         firstNumber,
-			secondNumber:        secondNumber,
-			secondNumberDefined: true,
-		}
-		log.Debug("%v", prefs)
-
-		op := &Operation{OperationType: sliceArrayOpType, Value: sliceArrayOpType.Type, StringValue: value, Preferences: prefs}
-		return &token{TokenType: operationToken, Operation: op}, nil
-	}
-}
-
-func sliceArraySecondNumberOnly() yqAction {
-	return func(rawToken lexer.Token) (*token, error) {
-		value := rawToken.Value
-		sliceArrayNumbers := regexp.MustCompile(`\.\[\:(-?[0-9]+)\]`)
-		matches := sliceArrayNumbers.FindStringSubmatch(value)
-		log.Debug("sliceArraySecondNumberOnly value: %v", value)
-		log.Debug("Matches: %v", matches)
-
-		secondNumber, err := parseInt(matches[1])
-		if err != nil {
-			return nil, err
-		}
-
-		prefs := sliceArrayPreferences{
-			firstNumber:         0,
-			secondNumber:        secondNumber,
-			secondNumberDefined: true,
-		}
-		log.Debug("%v", prefs)
-
-		op := &Operation{OperationType: sliceArrayOpType, Value: sliceArrayOpType.Type, StringValue: value, Preferences: prefs}
-		return &token{TokenType: operationToken, Operation: op}, nil
-	}
-}
-
-func sliceArrayFirstNumberOnly() yqAction {
-	return func(rawToken lexer.Token) (*token, error) {
-		value := rawToken.Value
-		sliceArrayNumbers := regexp.MustCompile(`\.\[(-?[0-9]+)\:\]`)
-		matches := sliceArrayNumbers.FindStringSubmatch(value)
-		log.Debug("sliceArrayFirstNumberOnly value: %v", value)
-		log.Debug("Matches: %v", matches)
-
-		firstNumber, err := parseInt(matches[1])
-		if err != nil {
-			return nil, err
-		}
-
-		prefs := sliceArrayPreferences{
-			firstNumber:         firstNumber,
-			secondNumberDefined: false,
-		}
-		log.Debug("%v", prefs)
-
-		op := &Operation{OperationType: sliceArrayOpType, Value: sliceArrayOpType.Type, StringValue: value, Preferences: prefs}
-		return &token{TokenType: operationToken, Operation: op}, nil
-	}
-}
-
 func assignAllCommentsOp(updateAssign bool) yqAction {
 	return func(rawToken lexer.Token) (*token, error) {
 		log.Debug("assignAllCommentsOp %v", rawToken.Value)

pkg/yqlib/lexer_participle_test.go

@@ -14,62 +14,6 @@ type participleLexerScenario struct {
 }
 
 var participleLexerScenarios = []participleLexerScenario{
-	{
-		expression: ".[1:3]",
-		tokens: []*token{
-			{
-				TokenType: operationToken,
-				Operation: &Operation{
-					OperationType: sliceArrayOpType,
-					Value:         "SLICE",
-					StringValue:   ".[1:3]",
-					Preferences:   sliceArrayPreferences{firstNumber: 1, secondNumber: 3, secondNumberDefined: true},
-				},
-			},
-		},
-	},
-	{
-		expression: ".[:3]",
-		tokens: []*token{
-			{
-				TokenType: operationToken,
-				Operation: &Operation{
-					OperationType: sliceArrayOpType,
-					Value:         "SLICE",
-					StringValue:   ".[:3]",
-					Preferences:   sliceArrayPreferences{firstNumber: 0, secondNumber: 3, secondNumberDefined: true},
-				},
-			},
-		},
-	},
-	{
-		expression: ".[1:]",
-		tokens: []*token{
-			{
-				TokenType: operationToken,
-				Operation: &Operation{
-					OperationType: sliceArrayOpType,
-					Value:         "SLICE",
-					StringValue:   ".[1:]",
-					Preferences:   sliceArrayPreferences{firstNumber: 1, secondNumber: 0, secondNumberDefined: false},
-				},
-			},
-		},
-	},
-	{
-		expression: ".[-100:-54]",
-		tokens: []*token{
-			{
-				TokenType: operationToken,
-				Operation: &Operation{
-					OperationType: sliceArrayOpType,
-					Value:         "SLICE",
-					StringValue:   ".[-100:-54]",
-					Preferences:   sliceArrayPreferences{firstNumber: -100, secondNumber: -54, secondNumberDefined: true},
-				},
-			},
-		},
-	},
 	{
 		expression: ".a",
 		tokens: []*token{

pkg/yqlib/lib.go

@@ -81,7 +81,6 @@ var lineOpType = &operationType{Type: "LINE", NumArgs: 0, Precedence: 50, Handle
 var columnOpType = &operationType{Type: "LINE", NumArgs: 0, Precedence: 50, Handler: columnOperator}
 
 var collectOpType = &operationType{Type: "COLLECT", NumArgs: 1, Precedence: 50, Handler: collectOperator}
-var sliceArrayOpType = &operationType{Type: "SLICE", NumArgs: 0, Precedence: 50, Handler: sliceArrayOperator}
 var mapOpType = &operationType{Type: "MAP", NumArgs: 1, Precedence: 50, Handler: mapOperator}
 var errorOpType = &operationType{Type: "ERROR", NumArgs: 1, Precedence: 50, Handler: errorOperator}
 var pickOpType = &operationType{Type: "PICK", NumArgs: 1, Precedence: 50, Handler: pickOperator}
@@ -353,8 +352,8 @@ func parseInt(numberString string) (int, error) {
 
 	if err != nil {
 		return 0, err
-	} else if parsed > math.MaxInt || parsed < math.MinInt {
-		return 0, fmt.Errorf("%v is not within [%v, %v]", parsed, math.MinInt, math.MaxInt)
+	} else if parsed > math.MaxInt {
+		return 0, fmt.Errorf("%v is too big (larger than %v)", parsed, math.MaxInt)
 	}
 
 	return int(parsed), err

pkg/yqlib/operator_slice.go

@@ -1,63 +0,0 @@
-package yqlib
-
-import (
-	"container/list"
-
-	yaml "gopkg.in/yaml.v3"
-)
-
-type sliceArrayPreferences struct {
-	firstNumber         int
-	secondNumber        int
-	secondNumberDefined bool
-}
-
-func sliceArrayOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
-
-	lhs, err := d.GetMatchingNodes(context, expressionNode.LHS)
-	if err != nil {
-		return Context{}, err
-	}
-	prefs := expressionNode.Operation.Preferences.(sliceArrayPreferences)
-	firstNumber := prefs.firstNumber
-	secondNumber := prefs.secondNumber
-
-	results := list.New()
-
-	for el := lhs.MatchingNodes.Front(); el != nil; el = el.Next() {
-		lhsNode := el.Value.(*CandidateNode)
-		original := unwrapDoc(lhsNode.Node)
-
-		relativeFirstNumber := firstNumber
-		if relativeFirstNumber < 0 {
-			relativeFirstNumber = len(original.Content) + firstNumber
-		}
-
-		relativeSecondNumber := len(original.Content)
-		if prefs.secondNumberDefined {
-			relativeSecondNumber = secondNumber
-			if relativeSecondNumber < 0 {
-				relativeSecondNumber = len(original.Content) + secondNumber
-			}
-		}
-
-		log.Debug("calculateIndicesToTraverse: slice from %v to %v", relativeFirstNumber, relativeSecondNumber)
-
-		var newResults []*yaml.Node
-		for i := relativeFirstNumber; i < relativeSecondNumber; i++ {
-			newResults = append(newResults, original.Content[i])
-		}
-
-		slicedArrayNode := &yaml.Node{
-			Kind:    yaml.SequenceNode,
-			Tag:     original.Tag,
-			Content: newResults,
-		}
-		results.PushBack(lhsNode.CreateReplacement(slicedArrayNode))
-
-	}
-
-	// result is now the context that has the nodes we need to put back into a sequence.
-	//what about multiple arrays in the context? I think we need to create an array for each one
-	return context.ChildContext(results), nil
-}

pkg/yqlib/operator_slice_test.go

@@ -1,81 +0,0 @@
-package yqlib
-
-import "testing"
-
-var sliceArrayScenarios = []expressionScenario{
-	{
-		description: "Slicing arrays",
-		document:    `[cat, dog, frog, cow]`,
-		expression:  `.[1:3]`,
-		expected: []string{
-			"D0, P[], (!!seq)::- dog\n- frog\n",
-		},
-	},
-	{
-		description:    "Slicing arrays - without the first number",
-		subdescription: "Starts from the start of the array",
-		document:       `[cat, dog, frog, cow]`,
-		expression:     `.[:2]`,
-		expected: []string{
-			"D0, P[], (!!seq)::- cat\n- dog\n",
-		},
-	},
-	{
-		description:    "Slicing arrays - without the second number",
-		subdescription: "Finishes at the end of the array",
-		document:       `[cat, dog, frog, cow]`,
-		expression:     `.[2:]`,
-		expected: []string{
-			"D0, P[], (!!seq)::- frog\n- cow\n",
-		},
-	},
-	{
-		description: "Slicing arrays - use negative numbers to count backwards from the end",
-		document:    `[cat, dog, frog, cow]`,
-		expression:  `.[1:-1]`,
-		expected: []string{
-			"D0, P[], (!!seq)::- dog\n- frog\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `[[cat, dog, frog, cow], [apple, banana, grape, mango]]`,
-		expression: `.[] | .[1:3]`,
-		expected: []string{
-			"D0, P[0], (!!seq)::- dog\n- frog\n",
-			"D0, P[1], (!!seq)::- banana\n- grape\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `[[cat, dog, frog, cow], [apple, banana, grape, mango]]`,
-		expression: `.[] | .[-2:-1]`,
-		expected: []string{
-			"D0, P[0], (!!seq)::- frog\n",
-			"D0, P[1], (!!seq)::- grape\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `[cat1, cat2, cat3, cat4, cat5, cat6, cat7, cat8, cat9, cat10, cat11]`,
-		expression: `.[10:11]`,
-		expected: []string{
-			"D0, P[], (!!seq)::- cat11\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `[cat1, cat2, cat3, cat4, cat5, cat6, cat7, cat8, cat9, cat10, cat11]`,
-		expression: `.[-11:-10]`,
-		expected: []string{
-			"D0, P[], (!!seq)::- cat1\n",
-		},
-	},
-}
-
-func TestSliceOperatorScenarios(t *testing.T) {
-	for _, tt := range sliceArrayScenarios {
-		testScenario(t, &tt)
-	}
-	documentOperatorScenarios(t, "slice-array", sliceArrayScenarios)
-}

pkg/yqlib/operator_traverse_path.go

@@ -76,6 +76,7 @@ func traverse(context Context, matchingNode *CandidateNode, operation *Operation
 }
 
 func traverseArrayOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
+
 	//lhs may update the variable context, we should pass that into the RHS
 	// BUT we still return the original context back (see jq)
 	// https://stedolan.github.io/jq/manual/#Variable/SymbolicBindingOperator:...as$identifier|...

pkg/yqlib/operators_test.go

@@ -31,7 +31,7 @@ type expressionScenario struct {
 }
 
 func TestMain(m *testing.M) {
-	logging.SetLevel(logging.DEBUG, "")
+	logging.SetLevel(logging.ERROR, "")
 	Now = func() time.Time {
 		return time.Date(2021, time.May, 19, 1, 2, 3, 4, time.UTC)
 	}