Maintain singleton sequence of array

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

Author: andrew-coleman

src/jsonata.js

@@ -219,6 +219,9 @@ var jsonata = (function() {
         }
 
         if(expr.keepSingletonArray) {
+            if(!isSequence(resultSequence)) {
+                resultSequence = createSequence(resultSequence);
+            }
             resultSequence.keepSingleton = true;
         }
 

test/test-suite/groups/flattening/sequence-of-arrays.json

@@ -0,0 +1,40 @@
+[
+    {
+        "expr": "$.[value,epochSeconds]",
+        "data": [
+            {"epochSeconds":1578381600,"value": 3},
+            {"epochSeconds":1578381700,"value": 5}
+        ],
+        "result": [
+            [3, 1578381600],
+            [5, 1578381700]
+        ]
+    },
+    {
+        "expr": "$.[value,epochSeconds]",
+        "data": [
+            {"epochSeconds":1578381600,"value": 3}
+        ],
+        "result": [3, 1578381600]
+    },
+    {
+        "expr": "$.[value,epochSeconds][]",
+        "data": [
+            {"epochSeconds":1578381600,"value": 3},
+            {"epochSeconds":1578381700,"value": 5}
+        ],
+        "result": [
+            [3, 1578381600],
+            [5, 1578381700]
+        ]
+    },
+    {
+        "expr": "$.[value,epochSeconds][]",
+        "data": [
+            {"epochSeconds":1578381600,"value": 3}
+        ],
+        "result": [
+            [3, 1578381600]
+        ]
+    }
+]

test/test-suite/groups/hof-zip-map/case002.json

@@ -1,6 +1,6 @@
 {
-    "expr": "(  $data := {    \"one\": [1],    \"two\": [5]  };  $data[].$zip(one, two) ~> $map($sum)) ",
+    "expr": "(  $data := {    \"one\": [1],    \"two\": [5]  };  $data.$zip(one, two) ~> $map($sum)) ",
     "data": null,
     "bindings": {},
     "result": 6
-}
+}

test/test-suite/groups/hof-zip-map/case003.json

@@ -1,6 +1,6 @@
 {
-    "expr": "(  $data := {    \"one\": 1,    \"two\": 5  };  $data[].$zip(one, two) ~> $map($sum)) ",
+    "expr": "(  $data := {    \"one\": 1,    \"two\": 5  };  $data.$zip(one, two) ~> $map($sum)) ",
     "data": null,
     "bindings": {},
     "result": 6
-}
+}