suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2025-01-24 06:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed newline handling in encoder/decoder

Browse Source
This commit is contained in:
Mike Farah 2021-10-22 15:21:01 +11:00
parent a1af1b95d0
commit 587af7f722
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/yqlib/doc/Encoder and Decoder.md
View File

@ -1,5 +1,6 @@
Encode operators will take the piped in object structure and encode it as a string in the desired format. The decode operators do the opposite, they take a formatted string and decode it into the relevant object structure. Encode operators will take the piped in object structure and encode it as a string in the desired format. The decode operators do the opposite, they take a formatted string and decode it into the relevant object structure.
These operators are useful to process yaml documents that have stringified embeded yaml/json/props in them.
## Encode value as yaml string ## Encode value as yaml string
Given a sample.yml file of: Given a sample.yml file of:
```yaml ```yaml
@ -98,6 +99,7 @@ Given a sample.yml file of:
a: | a: |
foo: bar foo: bar
baz: dog baz: dog
``` ```
then then
```bash ```bash

6
pkg/yqlib/operator_encoder_decoder.go
View File

@ -28,6 +28,7 @@ func encodeOperator(d *dataTreeNavigator, context Context, expressionNode *Expre
var results = list.New() var results = list.New()
hasOnlyOneNewLine := regexp.MustCompile("[^\n].*\n$") hasOnlyOneNewLine := regexp.MustCompile("[^\n].*\n$")
endWithNewLine := regexp.MustCompile(".*\n$")
chomper := regexp.MustCompile("\n+$") chomper := regexp.MustCompile("\n+$")
for el := context.MatchingNodes.Front(); el != nil; el = el.Next() { for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {
@ -44,8 +45,9 @@ func encodeOperator(d *dataTreeNavigator, context Context, expressionNode *Expre
if originalList != nil && originalList.Len() > 0 && hasOnlyOneNewLine.MatchString(stringValue) { if originalList != nil && originalList.Len() > 0 && hasOnlyOneNewLine.MatchString(stringValue) {
original := originalList.Front().Value.(*CandidateNode) original := originalList.Front().Value.(*CandidateNode)
if unwrapDoc(original.Node).Style == yaml.SingleQuotedStyle || originalNode := unwrapDoc(original.Node)
unwrapDoc(original.Node).Style == yaml.DoubleQuotedStyle { // original block did not have a new line at the end, get rid of this one too
if !endWithNewLine.MatchString(originalNode.Value) {
stringValue = chomper.ReplaceAllString(stringValue, "") stringValue = chomper.ReplaceAllString(stringValue, "")
} }
} }

11
pkg/yqlib/operator_encoder_decoder_test.go
View File

@ -53,12 +53,21 @@ var encoderDecoderOperatorScenarios = []expressionScenario{
{ {
description: "Update a multiline encoded yaml string", description: "Update a multiline encoded yaml string",
dontFormatInputForDoc: true, dontFormatInputForDoc: true,
document: "a: |\n foo: bar\n baz: dog", document: "a: |\n foo: bar\n baz: dog\n",
expression: `.a |= (from_yaml | .foo = "cat" | to_yaml)`, expression: `.a |= (from_yaml | .foo = "cat" | to_yaml)`,
expected: []string{ expected: []string{
"D0, P[], (doc)::a: |\n foo: cat\n baz: dog\n", "D0, P[], (doc)::a: |\n foo: cat\n baz: dog\n",
}, },
}, },
{
skipDoc: true,
dontFormatInputForDoc: true,
document: "a: |-\n foo: bar\n baz: dog\n",
expression: `.a |= (from_yaml | .foo = "cat" | to_yaml)`,
expected: []string{
"D0, P[], (doc)::a: |-\n foo: cat\n baz: dog\n",
},
},
{ {
description: "Update a single line encoded yaml string", description: "Update a single line encoded yaml string",
dontFormatInputForDoc: true, dontFormatInputForDoc: true,