suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-03-10 15:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix excessive exploding for merge anchor

Browse Source
This commit is contained in:
Steven WdV 2025-06-16 13:53:28 +02:00
parent 4d88d51b1b
commit 4734be9a4d
No known key found for this signature in database
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/yqlib/operator_anchors_aliases.go
View File

@ -148,12 +148,12 @@ func reconstructAliasedMap(node *CandidateNode, context Context) error {
valueNode := node.Content[index+1]
log.Debugf("traversing %v", keyNode.Value)
if keyNode.Tag != "!!merge" {
err := overrideEntry(node, keyNode, valueNode, index, context.ChildContext(newContent))
err := overrideEntry(node, keyNode, valueNode, index, true, context.ChildContext(newContent))
if err != nil {
return err
}
} else {
err := applyMergeAnchor(node, valueNode, index, context, newContent)
err := applyMergeAnchor(node, valueNode, index, context.ChildContext(newContent))
if err != nil {
return err
}
@ -225,14 +225,14 @@ func explodeNode(node *CandidateNode, context Context) error {
}
}
func applyMergeAnchor(node *CandidateNode, merge *CandidateNode, mergeIndex int, context Context, newContent *list.List) error {
func applyMergeAnchor(node *CandidateNode, merge *CandidateNode, mergeIndex int, newContent Context) error {
if merge.Kind == AliasNode {
merge = merge.Alias
}
switch merge.Kind {
case MappingNode:
log.Debugf("a merge map!")
return applyMergeAnchorMap(node, merge, mergeIndex, context.ChildContext(newContent))
return applyMergeAnchorMap(node, merge, mergeIndex, newContent)
case SequenceNode:
log.Debugf("a merge list!")
// Earlier keys take precedence
@ -245,9 +245,8 @@ func applyMergeAnchor(node *CandidateNode, merge *CandidateNode, mergeIndex int,
return fmt.Errorf(
"can only use merge anchors with maps (!!map) or sequences (!!seq) of maps, but got sequence containing %v",
childValue.Tag)
return nil
}
err := applyMergeAnchorMap(node, childValue, mergeIndex, context.ChildContext(newContent))
err := applyMergeAnchorMap(node, childValue, mergeIndex, newContent)
if err != nil {
return err
}
@ -258,20 +257,21 @@ func applyMergeAnchor(node *CandidateNode, merge *CandidateNode, mergeIndex int,
}
}
func applyMergeAnchorMap(node *CandidateNode, mergeMap *CandidateNode, aliasIndex int, newContent Context) error {
log.Debug("merge map is nil ?")
func applyMergeAnchorMap(node *CandidateNode, mergeMap *CandidateNode, mergeIndex int, newContent Context) error {
if mergeMap == nil {
log.Debug("merge map is nil")
return nil
}
log.Debug("merge map: %v", NodeToString(mergeMap))
if mergeMap.Kind != MappingNode {
return fmt.Errorf("applyMergeAnchorMap expects !!map, got %v instead", mergeMap.Tag)
}
for index := 0; index < len(mergeMap.Content); index = index + 2 {
keyNode := mergeMap.Content[index]
log.Debugf("applying merge map key %v", keyNode.Value)
valueNode := mergeMap.Content[index+1]
err := overrideEntry(node, keyNode, valueNode, aliasIndex, newContent)
err := overrideEntry(node, keyNode, valueNode, mergeIndex, false, newContent)
if err != nil {
return err
}
@ -279,12 +279,12 @@ func applyMergeAnchorMap(node *CandidateNode, mergeMap *CandidateNode, aliasInde
return nil
}
func overrideEntry(node *CandidateNode, key *CandidateNode, value *CandidateNode, startIndex int, newContent Context) error {
err := explodeNode(value, newContent)
if err != nil {
return err
func overrideEntry(node *CandidateNode, key *CandidateNode, value *CandidateNode, startIndex int, explode bool, newContent Context) error {
if explode {
err := explodeNode(value, newContent)
if err != nil {
return err
}
}
for newEl := newContent.MatchingNodes.Front(); newEl != nil; newEl = newEl.Next() {
@ -308,9 +308,11 @@ func overrideEntry(node *CandidateNode, key *CandidateNode, value *CandidateNode
}
}
err = explodeNode(key, newContent)
if err != nil {
return err
if explode {
err := explodeNode(key, newContent)
if err != nil {
return err
}
}
log.Debugf("adding %v:%v", key.Value, value.Value)
newContent.MatchingNodes.PushBack(key)

9
pkg/yqlib/operator_anchors_aliases_test.go
View File

@ -307,6 +307,15 @@ var anchorOperatorScenarios = []expressionScenario{
"D0, P[m], (!!map)::{a: 42}\n",
},
},
{ // Exploding merge anchor should not explode neighbors
skipDoc: true,
// b must not be exploded, as `r: *a` will become invalid
document: `{b: &b {a: &a 42}, r: *a, c: {<<: *b}}`,
expression: `explode(.c)`,
expected: []string{
"D0, P[], (!!map)::{b: &b {a: &a 42}, r: *a, c: {a: &a 42}}\n",
},
},
}
func TestAnchorAliasOperatorScenarios(t *testing.T) {