Merge branch 'latest-tests'

* latest-tests:
  Update to pass the latest compliance tests

Author: jamesls

jmespath.js

@@ -403,9 +403,9 @@
           "Or": 5,
           "Flatten": 6,
           "Star": 20,
+          "Filter": 20,
           "Dot": 40,
           "Lbrace": 50,
-          "Filter": 50,
           "Lbracket": 55,
           "Lparen": 60
       };
@@ -1122,6 +1122,10 @@
         max: {
             func: this.functionMax,
             signature: [{types: ["array-number", "array-string"]}]},
+        "merge": {
+            func: this.functionMerge,
+            signature: [{types: ["object"], variadic: true}]
+        },
         "max_by": {
           func: this.functionMaxBy,
           signature: [{types: ["array"]}, {types: ["expref"]}]
@@ -1155,6 +1159,7 @@
         reverse: {
             func: this.functionReverse,
             signature: [{types: ["string", "array"]}]},
+        "to_array": {func: this.functionToArray, signature: [{types: ["any"]}]},
         "to_string": {func: this.functionToString, signature: [{types: ["any"]}]},
         "to_number": {func: this.functionToNumber, signature: [{types: ["any"]}]},
         "not_null": {
@@ -1329,6 +1334,17 @@
        }
     },
 
+    functionMerge: function(resolvedArgs) {
+      var merged = {};
+      for (var i = 0; i < resolvedArgs.length; i++) {
+        var current = resolvedArgs[i];
+        for (var key in current) {
+          merged[key] = current[key];
+        }
+      }
+      return merged;
+    },
+
     functionMax: function(resolvedArgs) {
       if (resolvedArgs[0].length > 0) {
         var typeName = this.getTypeName(resolvedArgs[0][0]);
@@ -1402,6 +1418,14 @@
         return listJoin.join(joinChar);
     },
 
+    functionToArray: function(resolvedArgs) {
+        if (this.getTypeName(resolvedArgs[0]) === "array") {
+            return resolvedArgs[0];
+        } else {
+            return [resolvedArgs[0]];
+        }
+    },
+
     functionToString: function(resolvedArgs) {
         if (this.getTypeName(resolvedArgs[0]) === "string") {
             return resolvedArgs[0];
@@ -1441,7 +1465,7 @@
 
     functionSortBy: function(resolvedArgs) {
         var sortedArray = resolvedArgs[0].slice(0);
-        if (!sortedArray) {
+        if (sortedArray.length === 0) {
             return sortedArray;
         }
         var interpreter = this.interpreter;

test/compliance/filters.json

@@ -294,5 +294,22 @@
         "result": []
       }
     ]
+  },
+  {
+    "given": {
+      "foo": [
+        {"a": 1, "b": {"c": "x"}},
+	{"a": 1, "b": {"c": "y"}},
+	{"a": 1, "b": {"c": "z"}},
+	{"a": 2, "b": {"c": "z"}},
+	{"a": 1, "baz": 2}
+      ]
+    },
+    "cases": [
+      {
+        "expression": "foo[?a==`1`].b.c",
+        "result": ["x", "y", "z"]
+      }
+    ]
   }
 ]

test/compliance/functions.json

@@ -239,6 +239,26 @@
       "expression": "max(empty_list)",
       "result": null
     },
+    {
+      "expression": "merge(`{}`)",
+      "result": {}
+    },
+    {
+      "expression": "merge(`{}`, `{}`)",
+      "result": {}
+    },
+    {
+      "expression": "merge(`{\"a\": 1}`, `{\"b\": 2}`)",
+      "result": {"a": 1, "b": 2}
+    },
+    {
+      "expression": "merge(`{\"a\": 1}`, `{\"a\": 2}`)",
+      "result": {"a": 2}
+    },
+    {
+      "expression": "merge(`{\"a\": 1, \"b\": 2}`, `{\"a\": 2, \"c\": 3}`, `{\"d\": 4}`)",
+      "result": {"a": 2, "b": 2, "c": 3, "d": 4}
+    },
     {
       "expression": "min(numbers)",
       "result": -1
@@ -431,6 +451,26 @@
       "expression": "sum(`[]`)",
       "result": 0
     },
+    {
+      "expression": "to_array(`foo`)",
+      "result": ["foo"]
+    },
+    {
+      "expression": "to_array(`0`)",
+      "result": [0]
+    },
+    {
+      "expression": "to_array(objects)",
+      "result": [{"foo": "bar", "bar": "baz"}]
+    },
+    {
+      "expression": "to_array(`[1, 2, 3]`)",
+      "result": [1, 2, 3]
+    },
+    {
+      "expression": "to_array(false)",
+      "result": [false]
+    },
     {
       "expression": "to_string(`foo`)",
       "result": "foo"
@@ -569,7 +609,7 @@
   },
   "cases": [
     {
-      "description": "function projection on variadic function",
+      "description": "sort by field expression",
       "expression": "sort_by(people, &age)",
       "result": [
          {"age": 10, "age_str": "10", "bool": true, "name": 3},
@@ -580,7 +620,7 @@
       ]
     },
     {
-      "description": "function projection on variadic function",
+      "description": "sort by function expression",
       "expression": "sort_by(people, &to_number(age_str))",
       "result": [
          {"age": 10, "age_str": "10", "bool": true, "name": 3},
@@ -591,7 +631,7 @@
       ]
     },
     {
-      "description": "function projection on variadic function",
+      "description": "function projection on sort_by function",
       "expression": "sort_by(people, &age)[].name",
       "result": [3, "a", "c", "b", "d"]
     },
@@ -615,6 +655,10 @@
       "expression": "sort_by(people, &age)[].extra",
       "result": ["foo", "bar"]
     },
+    {
+      "expression": "sort_by(`[]`, &age)",
+      "result": []
+    },
     {
       "expression": "max_by(people, &age)",
       "result": {"age": 50, "age_str": "50", "bool": false, "name": "d"}