Merge branch 'more-functions-r2' into develop

* more-functions-r2:
  Add a merge() function
  Add to_array function

Author: jamesls

jmespath/functions.py

@@ -185,6 +185,13 @@ def _func_not_null(self, *arguments):
             if argument is not None:
                 return argument
 
+    @builtin_function({'types': []})
+    def _func_to_array(self, arg):
+        if isinstance(arg, list):
+            return arg
+        else:
+            return [arg]
+
     @builtin_function({'types': []})
     def _func_to_string(self, arg):
         if isinstance(arg, STRING_TYPE):
@@ -252,6 +259,13 @@ def _func_max(self, arg):
         else:
             return None
 
+    @builtin_function({"types": ["object"], "variadic": True})
+    def _func_merge(self, *arguments):
+        merged = {}
+        for arg in arguments:
+            merged.update(arg)
+        return merged
+
     @builtin_function({"types": ['array-number', 'array-string']})
     def _func_min(self, arg):
         if arg:

tests/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"