suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2025-01-23 14:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed with semicolon space issue

Browse Source
This commit is contained in:
Mike Farah 2021-09-15 22:24:03 +10:00
parent 3339562aa2
commit 2292f0ffb4
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/yqlib/doc/With.md
View File

@ -9,7 +9,7 @@ a:
``` ```
then then
```bash ```bash
yq eval 'with(.a.deeply.nested ; . = "newValue" | . style="single")' sample.yml yq eval 'with(.a.deeply.nested; . = "newValue" | . style="single")' sample.yml
``` ```
will output will output
```yaml ```yaml
@ -28,7 +28,7 @@ a:
``` ```
then then
```bash ```bash
yq eval 'with(.a.deeply ; .nested = "newValue" | .other= "newThing")' sample.yml yq eval 'with(.a.deeply; .nested = "newValue" | .other= "newThing")' sample.yml
``` ```
will output will output
```yaml ```yaml
@ -47,7 +47,7 @@ myArray:
``` ```
then then
```bash ```bash
yq eval 'with(.myArray[] ; .b = .a + " yum")' sample.yml yq eval 'with(.myArray[]; .b = .a + " yum")' sample.yml
``` ```
will output will output
```yaml ```yaml

5
pkg/yqlib/expression_processing_test.go
View File

@ -15,6 +15,11 @@ var pathTests = []struct {
expectedTokens []interface{} expectedTokens []interface{}
expectedPostFix []interface{} expectedPostFix []interface{}
}{ }{
{
"with(.a;.=3)",
append(make([]interface{}, 0), "WITH", "(", "a", "BLOCK", "SELF", "ASSIGN", "3 (int64)", ")"),
append(make([]interface{}, 0), "a", "SELF", "3 (int64)", "ASSIGN", "BLOCK", "WITH"),
},
{ {
"0x12", "0x12",
append(make([]interface{}, 0), "18 (int64)"), append(make([]interface{}, 0), "18 (int64)"),

2
pkg/yqlib/expression_tokeniser.go
View File

@ -340,7 +340,7 @@ func initLexer() (*lex.Lexer, error) {
lexer.Add([]byte("( |\t|\n|\r)+"), skip) lexer.Add([]byte("( |\t|\n|\r)+"), skip)
lexer.Add([]byte(`\."[^ "]+"\??`), pathToken(true)) lexer.Add([]byte(`\."[^ "]+"\??`), pathToken(true))
lexer.Add([]byte(`\.[^ \}\{\:\[\],\|\.\[\(\)=\n]+\??`), pathToken(false)) lexer.Add([]byte(`\.[^ ;\}\{\:\[\],\|\.\[\(\)=\n]+\??`), pathToken(false))
lexer.Add([]byte(`\.`), selfToken()) lexer.Add([]byte(`\.`), selfToken())
lexer.Add([]byte(`\|`), opToken(pipeOpType)) lexer.Add([]byte(`\|`), opToken(pipeOpType))

6
pkg/yqlib/operator_with_test.go
View File

@ -6,7 +6,7 @@ var withOperatorScenarios = []expressionScenario{
{ {
description: "Update and style", description: "Update and style",
document: `a: {deeply: {nested: value}}`, document: `a: {deeply: {nested: value}}`,
expression: `with(.a.deeply.nested ; . = "newValue" | . style="single")`, expression: `with(.a.deeply.nested; . = "newValue" | . style="single")`,
expected: []string{ expected: []string{
"D0, P[], (doc)::a: {deeply: {nested: 'newValue'}}\n", "D0, P[], (doc)::a: {deeply: {nested: 'newValue'}}\n",
}, },
@ -14,7 +14,7 @@ var withOperatorScenarios = []expressionScenario{
{ {
description: "Update multiple deeply nested properties", description: "Update multiple deeply nested properties",
document: `a: {deeply: {nested: value, other: thing}}`, document: `a: {deeply: {nested: value, other: thing}}`,
expression: `with(.a.deeply ; .nested = "newValue" | .other= "newThing")`, expression: `with(.a.deeply; .nested = "newValue" | .other= "newThing")`,
expected: []string{ expected: []string{
"D0, P[], (doc)::a: {deeply: {nested: newValue, other: newThing}}\n", "D0, P[], (doc)::a: {deeply: {nested: newValue, other: newThing}}\n",
}, },
@ -22,7 +22,7 @@ var withOperatorScenarios = []expressionScenario{
{ {
description: "Update array elements relatively", description: "Update array elements relatively",
document: `myArray: [{a: apple},{a: banana}]`, document: `myArray: [{a: apple},{a: banana}]`,
expression: `with(.myArray[] ; .b = .a + " yum")`, expression: `with(.myArray[]; .b = .a + " yum")`,
expected: []string{ expected: []string{
"D0, P[], (doc)::myArray: [{a: apple, b: apple yum}, {a: banana, b: banana yum}]\n", "D0, P[], (doc)::myArray: [{a: apple, b: apple yum}, {a: banana, b: banana yum}]\n",
}, },