From 5c73132c8e118c2bae5e83296a6d89f3b43dec63 Mon Sep 17 00:00:00 2001 From: Mike Farah Date: Wed, 3 Feb 2021 11:54:10 +1100 Subject: [PATCH] Dont create entries when selecting --- pkg/yqlib/context.go | 26 ++++++++++++++++++------- pkg/yqlib/operator_select.go | 5 +++-- pkg/yqlib/operator_select_test.go | 8 ++++++++ pkg/yqlib/operator_traverse_path.go | 30 ++++++++++++++--------------- 4 files changed, 45 insertions(+), 24 deletions(-) diff --git a/pkg/yqlib/context.go b/pkg/yqlib/context.go index a6693c5f..36056dab 100644 --- a/pkg/yqlib/context.go +++ b/pkg/yqlib/context.go @@ -1,18 +1,30 @@ package yqlib -import "container/list" +import ( + "container/list" + + "github.com/jinzhu/copier" +) type Context struct { - MatchingNodes *list.List - Variables map[string]*list.List + MatchingNodes *list.List + Variables map[string]*list.List + DontAutoCreate bool } func (n *Context) SingleChildContext(candidate *CandidateNode) Context { - elMap := list.New() - elMap.PushBack(candidate) - return Context{MatchingNodes: elMap, Variables: n.Variables} + list := list.New() + list.PushBack(candidate) + return n.ChildContext(list) } func (n *Context) ChildContext(results *list.List) Context { - return Context{MatchingNodes: results, Variables: n.Variables} + clone := Context{} + err := copier.Copy(&clone, n) + if err != nil { + log.Error("Error cloning context :(") + panic(err) + } + clone.MatchingNodes = results + return clone } diff --git a/pkg/yqlib/operator_select.go b/pkg/yqlib/operator_select.go index ce5036ba..5c659e8f 100644 --- a/pkg/yqlib/operator_select.go +++ b/pkg/yqlib/operator_select.go @@ -11,8 +11,9 @@ func selectOperator(d *dataTreeNavigator, context Context, expressionNode *Expre for el := context.MatchingNodes.Front(); el != nil; el = el.Next() { candidate := el.Value.(*CandidateNode) - - rhs, err := d.GetMatchingNodes(context.SingleChildContext(candidate), expressionNode.Rhs) + childContext := context.SingleChildContext(candidate) + childContext.DontAutoCreate = true + rhs, err := d.GetMatchingNodes(childContext, expressionNode.Rhs) if err != nil { return Context{}, err diff --git a/pkg/yqlib/operator_select_test.go b/pkg/yqlib/operator_select_test.go index d98805ae..6a084749 100644 --- a/pkg/yqlib/operator_select_test.go +++ b/pkg/yqlib/operator_select_test.go @@ -14,6 +14,14 @@ var selectOperatorScenarios = []expressionScenario{ "D0, P[1], (!!str)::goat\n", }, }, + { + skipDoc: true, + document: `[{animal: cat, legs: {cool: true}}, {animal: fish}]`, + expression: `(.[] | select(.legs.cool == true).canWalk) = true | (.[] | .alive.things) = "yes"`, + expected: []string{ + "D0, P[], (doc)::[{animal: cat, legs: {cool: true}, canWalk: true, alive: {things: yes}}, {animal: fish, alive: {things: yes}}]\n", + }, + }, { skipDoc: true, document: `[hot, fot, dog]`, diff --git a/pkg/yqlib/operator_traverse_path.go b/pkg/yqlib/operator_traverse_path.go index 20754b60..517a6923 100644 --- a/pkg/yqlib/operator_traverse_path.go +++ b/pkg/yqlib/operator_traverse_path.go @@ -24,7 +24,7 @@ func traversePathOperator(d *dataTreeNavigator, context Context, expressionNode var matches = list.New() for el := context.MatchingNodes.Front(); el != nil; el = el.Next() { - newNodes, err := traverse(d, el.Value.(*CandidateNode), expressionNode.Operation) + newNodes, err := traverse(d, context, el.Value.(*CandidateNode), expressionNode.Operation) if err != nil { return Context{}, err } @@ -34,7 +34,7 @@ func traversePathOperator(d *dataTreeNavigator, context Context, expressionNode return context.ChildContext(matches), nil } -func traverse(d *dataTreeNavigator, matchingNode *CandidateNode, operation *Operation) (*list.List, error) { +func traverse(d *dataTreeNavigator, context Context, matchingNode *CandidateNode, operation *Operation) (*list.List, error) { log.Debug("Traversing %v", NodeToString(matchingNode)) value := matchingNode.Node @@ -55,7 +55,7 @@ func traverse(d *dataTreeNavigator, matchingNode *CandidateNode, operation *Oper switch value.Kind { case yaml.MappingNode: log.Debug("its a map with %v entries", len(value.Content)/2) - return traverseMap(matchingNode, operation.StringValue, operation.Preferences.(traversePreferences), false) + return traverseMap(context, matchingNode, operation.StringValue, operation.Preferences.(traversePreferences), false) case yaml.SequenceNode: log.Debug("its a sequence of %v things!", len(value.Content)) @@ -64,11 +64,11 @@ func traverse(d *dataTreeNavigator, matchingNode *CandidateNode, operation *Oper case yaml.AliasNode: log.Debug("its an alias!") matchingNode.Node = matchingNode.Node.Alias - return traverse(d, matchingNode, operation) + return traverse(d, context, matchingNode, operation) case yaml.DocumentNode: log.Debug("digging into doc node") - return traverse(d, matchingNode.CreateChild(nil, matchingNode.Node.Content[0]), operation) + return traverse(d, context, matchingNode.CreateChild(nil, matchingNode.Node.Content[0]), operation) default: return list.New(), nil } @@ -90,7 +90,7 @@ func traverseNodesWithArrayIndices(context Context, indicesToTraverse []*yaml.No var matchingNodeMap = list.New() for el := context.MatchingNodes.Front(); el != nil; el = el.Next() { candidate := el.Value.(*CandidateNode) - newNodes, err := traverseArrayIndices(candidate, indicesToTraverse, prefs) + newNodes, err := traverseArrayIndices(context, candidate, indicesToTraverse, prefs) if err != nil { return Context{}, err } @@ -100,7 +100,7 @@ func traverseNodesWithArrayIndices(context Context, indicesToTraverse []*yaml.No return context.ChildContext(matchingNodeMap), nil } -func traverseArrayIndices(matchingNode *CandidateNode, indicesToTraverse []*yaml.Node, prefs traversePreferences) (*list.List, error) { // call this if doc / alias like the other traverse +func traverseArrayIndices(context Context, matchingNode *CandidateNode, indicesToTraverse []*yaml.Node, prefs traversePreferences) (*list.List, error) { // call this if doc / alias like the other traverse node := matchingNode.Node if node.Tag == "!!null" { log.Debugf("OperatorArrayTraverse got a null - turning it into an empty array") @@ -111,28 +111,28 @@ func traverseArrayIndices(matchingNode *CandidateNode, indicesToTraverse []*yaml if node.Kind == yaml.AliasNode { matchingNode.Node = node.Alias - return traverseArrayIndices(matchingNode, indicesToTraverse, prefs) + return traverseArrayIndices(context, matchingNode, indicesToTraverse, prefs) } else if node.Kind == yaml.SequenceNode { return traverseArrayWithIndices(matchingNode, indicesToTraverse) } else if node.Kind == yaml.MappingNode { - return traverseMapWithIndices(matchingNode, indicesToTraverse, prefs) + return traverseMapWithIndices(context, matchingNode, indicesToTraverse, prefs) } else if node.Kind == yaml.DocumentNode { - return traverseArrayIndices(matchingNode.CreateChild(nil, matchingNode.Node.Content[0]), indicesToTraverse, prefs) + return traverseArrayIndices(context, matchingNode.CreateChild(nil, matchingNode.Node.Content[0]), indicesToTraverse, prefs) } log.Debugf("OperatorArrayTraverse skipping %v as its a %v", matchingNode, node.Tag) return list.New(), nil } -func traverseMapWithIndices(candidate *CandidateNode, indices []*yaml.Node, prefs traversePreferences) (*list.List, error) { +func traverseMapWithIndices(context Context, candidate *CandidateNode, indices []*yaml.Node, prefs traversePreferences) (*list.List, error) { if len(indices) == 0 { - return traverseMap(candidate, "", prefs, true) + return traverseMap(context, candidate, "", prefs, true) } var matchingNodeMap = list.New() for _, indexNode := range indices { log.Debug("traverseMapWithIndices: %v", indexNode.Value) - newNodes, err := traverseMap(candidate, indexNode.Value, prefs, false) + newNodes, err := traverseMap(context, candidate, indexNode.Value, prefs, false) if err != nil { return nil, err } @@ -187,7 +187,7 @@ func keyMatches(key *yaml.Node, wantedKey string) bool { return matchKey(key.Value, wantedKey) } -func traverseMap(matchingNode *CandidateNode, key string, prefs traversePreferences, splat bool) (*list.List, error) { +func traverseMap(context Context, matchingNode *CandidateNode, key string, prefs traversePreferences, splat bool) (*list.List, error) { var newMatches = orderedmap.NewOrderedMap() err := doTraverseMap(newMatches, matchingNode, key, prefs, splat) @@ -195,7 +195,7 @@ func traverseMap(matchingNode *CandidateNode, key string, prefs traversePreferen return nil, err } - if !prefs.DontAutoCreate && newMatches.Len() == 0 { + if !prefs.DontAutoCreate && !context.DontAutoCreate && newMatches.Len() == 0 { //no matches, create one automagically valueNode := &yaml.Node{Tag: "!!null", Kind: yaml.ScalarNode, Value: "null"} node := matchingNode.Node