fix generation of tuple stream from input arrays

Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>

Author: andrew-coleman

src/jsonata.js

@@ -163,9 +163,7 @@ var jsonata = (function() {
         // expr is an array of steps
         // if the first step is a variable reference ($...), including root reference ($$),
         //   then the path is absolute rather than relative
-        if (expr.steps[0].type === 'variable') {
-            inputSequence = createSequence(input);  // dummy singleton sequence for first (absolute) step
-        } else if (Array.isArray(input)) {
+        if (Array.isArray(input) && expr.steps[0].type !== 'variable') {
             inputSequence = input;
         } else {
             // if input is not an array, make it so
@@ -334,7 +332,7 @@ var jsonata = (function() {
         result.tupleStream = true;
         var stepEnv = environment;
         if(tupleBindings === undefined) {
-            tupleBindings = [{'@': input}];
+            tupleBindings = input.map(item => { return {'@': item} });
         }
 
         for(var ee = 0; ee < tupleBindings.length; ee++) {

src/parser.js

@@ -1012,7 +1012,7 @@ const parser = (() => {
                             }
                             // throw error if there are any predicates defined at this point
                             // at this point the only type of stages can be predicates
-                            if(typeof step.stages !== 'undefined') {
+                            if(typeof step.stages !== 'undefined' || typeof step.predicate !== 'undefined') {
                                 throw {
                                     code: "S0215",
                                     stack: (new Error()).stack,
@@ -1038,6 +1038,12 @@ const parser = (() => {
                             step = result;
                             if (result.type === 'path') {
                                 step = result.steps[result.steps.length - 1];
+                            } else {
+                                result = {type: 'path', steps: [result]};
+                                if (typeof step.predicate !== 'undefined') {
+                                    step.stages = step.predicate;
+                                    delete step.predicate;
+                                }
                             }
                             if (typeof step.stages === 'undefined') {
                                 step.index = expr.rhs.value;

test/test-suite/groups/joins/index.json

@@ -1,6 +1,6 @@
 [
     {
-        "expr": "$.$#$pos[$pos<3]",
+        "expr": "$#$pos[$pos<3]",
         "data": [3,1,4,1,5,9],
         "bindings": {},
         "result": [
@@ -10,7 +10,25 @@
         ]
     },
     {
-        "expr": "$.$#$pos[$pos<3]^($)",
+        "expr": "$#$pos[$pos<3] = $[[0..2]]",
+        "data": [3,1,4,1,5,9],
+        "bindings": {},
+        "result": true
+    },
+    {
+        "expr": "$.$#$pos[$pos<3]",
+        "data": [3,1,4,1,5,9],
+        "bindings": {},
+        "result": [3,1,4,1,5,9]
+    },
+    {
+        "expr": "$.$#$pos[$pos<3] = $.$[[0..2]]",
+        "data": [3,1,4,1,5,9],
+        "bindings": {},
+        "result": true
+    },
+    {
+        "expr": "$#$pos[$pos<3]^($)",
         "data": [3,1,4,1,5,9],
         "bindings": {},
         "result": [
@@ -20,7 +38,7 @@
         ]
     },
     {
-        "expr": "$.$#$pos[$pos<3]^(>$)",
+        "expr": "$#$pos[$pos<3]^(>$)",
         "data": [3,1,4,1,5,9],
         "bindings": {},
         "result": [
@@ -30,7 +48,7 @@
         ]
     },
     {
-        "expr": "$.$^($)#$pos[$pos<3] ",
+        "expr": "$^($)#$pos[$pos<3] ",
         "data": [3,1,4,1,5,9],
         "bindings": {},
         "result": [
@@ -40,35 +58,41 @@
         ]
     },
     {
-        "expr": "$.$#$pos[$pos<3][1]",
+        "expr": "$#$pos[$pos<3][1]",
         "data": [3,1,4,1,5,9],
         "bindings": {},
         "result": 1
     },
     {
-        "expr": "$.$#$pos[$pos<3][1][]",
+        "expr": "$#$pos[$pos<3][1][]",
         "data": [3,1,4,1,5,9],
         "bindings": {},
         "result": [1]
     },
     {
-        "expr": "$.$#$pos[$pos<3]^($)[-1]",
+        "expr": "$#$pos[$pos<3]^($)[-1]",
         "data": [3,1,4,1,5,9],
         "bindings": {},
         "result": 4
     },
     {
-        "expr": "$.$#$pos[][$pos<3]^($)[-1]",
+        "expr": "$#$pos[][$pos<3]^($)[-1]",
         "data": [3,1,4,1,5,9],
         "bindings": {},
         "result": [4]
     },
     {
-        "expr": "$.$#$pos[$pos<3]^($)[-1][]",
+        "expr": "$#$pos[$pos<3]^($)[-1][]",
         "data": [3,1,4,1,5,9],
         "bindings": {},
         "result": [4]
     },
+    {
+        "expr": "$[[1..4]]#$pos[$pos>=2]",
+        "data": [3,1,4,1,5,9],
+        "bindings": {},
+        "result": [1,5]
+    },
     {
         "expr": "Account.Order#$o.Product[ProductID=858383].{ 'Product': `Product Name`, 'Order Index': $o }",
         "dataset": "dataset5",