ObjectMerge allow arrays of objects

nikoraes · Sep 26, 2024 · 25ea688 · 25ea688
1 parent a77114e
commit 25ea688
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/JexlNet.ExtendedGrammar/ExtendedGrammar.cs b/JexlNet.ExtendedGrammar/ExtendedGrammar.cs
@@ -1532,7 +1532,7 @@ public static JsonNode ObjectEntries(JsonNode input)
         /// <returns>A new object with the properties of the input objects merged together</returns>
         public static JsonNode ObjectMerge(JsonNode[] args)
         {
-            JsonObject result = new JsonObject();
+            JsonObject result = [];
             foreach (JsonNode arg in args)
             {
                 if (arg is JsonObject obj)
@@ -1542,6 +1542,19 @@ public static JsonNode ObjectMerge(JsonNode[] args)
                         result[item.Key] = item.Value?.DeepClone();
                     }
                 }
+                else if (arg is JsonArray array)
+                {
+                    foreach (JsonNode item in array)
+                    {
+                        if (item is JsonObject objItem)
+                        {
+                            foreach (var subItem in objItem)
+                            {
+                                result[subItem.Key] = subItem.Value?.DeepClone();
+                            }
+                        }
+                    }
+                }
             }
             return result;
         }

diff --git a/JexlNet.Test/ExtendedGrammar.cs b/JexlNet.Test/ExtendedGrammar.cs
@@ -348,6 +348,9 @@ public void Reduce(string expression, string expected)
     [Theory]
     [InlineData("$merge({'foo':'bar'},{baz:'tek'})")]
     [InlineData("{'foo':'bar'}|merge({baz:'tek'})")]
+    [InlineData("{'foo':'bar'}|merge([{baz:'tek'}])")]
+    [InlineData("[{'foo':'bar'}]|merge([{baz:'tek'}])")]
+    [InlineData("[{foo:'bar'},{baz:'tek'}]|merge")]
     [InlineData("[['foo','bar'],['baz','tek']]|toObject")]
     public void Objects(string expression)
     {