suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-09-01 14:14:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

now assumes yaml idiomatic formatting when adding to empty maps/arrays

Browse Source
This commit is contained in:
Mike Farah
2022-04-15 08:27:22 +10:00
parent ea66a73f43
commit b11075ec98
7 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/yqlib/operator_traverse_path.go
+11 -1
View File
@@ -198,6 +198,11 @@ func traverseArrayWithIndices(candidate *CandidateNode, indices []*yaml.Node, pr
indexToUse := index
contentLength := int64(len(node.Content))
for contentLength <= index {
if contentLength == 0 {
// default to nice yaml formating
node.Style = 0
}
node.Content = append(node.Content, &yaml.Node{Tag: "!!null", Kind: yaml.ScalarNode, Value: "null"})
contentLength = int64(len(node.Content))
}
@@ -207,7 +212,7 @@ func traverseArrayWithIndices(candidate *CandidateNode, indices []*yaml.Node, pr
}
if indexToUse < 0 {
return nil, fmt.Errorf("Index [%v] out of range, array size is %v", index, contentLength)
return nil, fmt.Errorf("index [%v] out of range, array size is %v", index, contentLength)
}
newMatches.PushBack(candidate.CreateChildInArray(int(index), node.Content[indexToUse]))
@@ -232,6 +237,11 @@ func traverseMap(context Context, matchingNode *CandidateNode, key string, prefs
valueNode := &yaml.Node{Tag: "!!null", Kind: yaml.ScalarNode, Value: "null"}
keyNode := &yaml.Node{Kind: yaml.ScalarNode, Value: key}
node := matchingNode.Node
if len(node.Content) == 0 {
node.Style = 0
}
node.Content = append(node.Content, keyNode, valueNode)
if prefs.IncludeMapKeys {