wip

pkg/yqlib/candidate_node.go

@@ -15,6 +15,9 @@ type CandidateNode struct {
 	Document  uint          // the document index of this node
 	Filename  string
 	FileIndex int
+	// when performing op against all nodes given, this will treat all the nodes as one
+	// (e.g. top level cross document merge). This property does not propegate to child nodes.
+	EvaluateTogether bool
 }
 
 func (n *CandidateNode) GetKey() string {

pkg/yqlib/operator_multiply.go

@@ -10,12 +10,8 @@ import (
 
 type crossFunctionCalculation func(d *dataTreeNavigator, lhs *CandidateNode, rhs *CandidateNode) (*CandidateNode, error)
 
-func crossFunction(d *dataTreeNavigator, matchingNodes *list.List, expressionNode *ExpressionNode, calculation crossFunctionCalculation) (*list.List, error) {
+func doCrossFunc(d *dataTreeNavigator, contextList *list.List, expressionNode *ExpressionNode, calculation crossFunctionCalculation) (*list.List, error) {
-
 	var results = list.New()
-	for matchEl := matchingNodes.Front(); matchEl != nil; matchEl = matchEl.Next() {
-		contextList := nodeToMap(matchEl.Value.(*CandidateNode))
-
 	lhs, err := d.GetMatchingNodes(contextList, expressionNode.Lhs)
 	if err != nil {
 		return nil, err
@@ -42,6 +38,21 @@ func crossFunction(d *dataTreeNavigator, matchingNodes *list.List, expressionNod
 		}
 
 	}
+	return results, nil
+}
+
+func crossFunction(d *dataTreeNavigator, matchingNodes *list.List, expressionNode *ExpressionNode, calculation crossFunctionCalculation) (*list.List, error) {
+	var results = list.New()
+	for matchEl := matchingNodes.Front(); matchEl != nil; matchEl = matchEl.Next() {
+		contextList := nodeToMap(matchEl.Value.(*CandidateNode))
+
+		innerResults, err := doCrossFunc(d, contextList, expressionNode, calculation)
+
+		if err != nil {
+			return nil, err
+		}
+
+		results.PushBackList(innerResults)
 
 	}
 

pkg/yqlib/operator_multiply_test.go

@@ -12,6 +12,8 @@ import (
 // d0a d1a d0b d1b
 // run it for (d0a d1a) x (d0b d1b) - noting that we dont do (d0a x d1a) nor (d0b d1b)
 // I think this will work for eval-all correctly then..
+
+//alternative, like jq, eval-all puts all docs in an single array.
 var multiplyOperatorScenarios = []expressionScenario{
 	{
 		skipDoc:    true,
@@ -25,7 +27,7 @@ var multiplyOperatorScenarios = []expressionScenario{
 		skipDoc:    true,
 		document:   `a: {also: [1]}`,
 		document2:  `b: {also: me}`,
-		expression: `. * {"a" : .b}`,
+		expression: `.a * .b`,
 		expected: []string{
 			"D0, P[], (!!map)::{a: {also: me}, b: {also: me}}\n",
 		},

pkg/yqlib/utils.go

@@ -40,6 +40,7 @@ func readDocuments(reader io.Reader, filename string, fileIndex int) (*list.List
 			Filename:         filename,
 			Node:             &dataBucket,
 			FileIndex:        fileIndex,
+			EvaluateTogether: true,
 		}
 
 		inputList.PushBack(candidateNode)