Fix merging arrays with different lengths

Author: sleeuwen

dotnet-json.Tests/Commands/MergeCommandTests.cs

@@ -181,6 +181,68 @@ await File.WriteAllTextAsync(Path.Join(_tmpDir, "b.json"), @"{
 }");
         }
 
+        [Fact]
+        public async Task MergeWithArraysWorkCorrectly()
+        {
+            await File.WriteAllTextAsync(Path.Join(_tmpDir, "a.json"), @"{
+  ""Array"": [
+    ""item 1"",
+    ""item 2""
+  ]
+}");
+
+            await File.WriteAllTextAsync(Path.Join(_tmpDir, "b.json"), @"{
+  ""Array"": [
+    ""1 item"",
+    null,
+    ""3 item""
+  ]
+}");
+
+            var (exitCode, console) = await RunCommand(
+                Path.Join(_tmpDir, "a.json"),
+                Path.Join(_tmpDir, "b.json"));
+
+            exitCode.Should().Be(0);
+
+            var content = await File.ReadAllTextAsync(Path.Join(_tmpDir, "a.json"));
+            content.Should().Be(@"{
+  ""Array"": [
+    ""1 item"",
+    null,
+    ""3 item""
+  ]
+}");
+        }
+
+        [Fact]
+        public async Task MergeWithNewArrayWorkCorrectly()
+        {
+            await File.WriteAllTextAsync(Path.Join(_tmpDir, "a.json"), @"{
+}");
+
+            await File.WriteAllTextAsync(Path.Join(_tmpDir, "b.json"), @"{
+  ""Array"": [
+    ""item 1"",
+    ""item 2""
+  ]
+}");
+
+            var (exitCode, console) = await RunCommand(
+                Path.Join(_tmpDir, "a.json"),
+                Path.Join(_tmpDir, "b.json"));
+
+            exitCode.Should().Be(0);
+
+            var content = await File.ReadAllTextAsync(Path.Join(_tmpDir, "a.json"));
+            content.Should().Be(@"{
+  ""Array"": [
+    ""item 1"",
+    ""item 2""
+  ]
+}");
+        }
+
         private async Task<(int exitCode, IConsole console)> RunCommand(params string[] args)
         {
             var command = new MergeCommand();

dotnet-json/Core/JsonDocument.cs

@@ -121,10 +121,10 @@ internal static IEnumerable<KeyValuePair<string, JToken>> AllTokens(JToken token
                 if (kv.Key == key)
                     return kv.Value;
 
-                if (key.StartsWith(kv.Key) && kv.Value is JObject jObject && kv.Key.Length > parentKey.Length)
+                if (key.StartsWith(kv.Key) && kv.Key.Length > parentKey.Length && (kv.Value is JObject or JArray))
                 {
                     parentKey = kv.Key;
-                    bestParent = jObject;
+                    bestParent = kv.Value;
                 }
             }
 

dotnet-json/dotnet-json.csproj

@@ -14,7 +14,7 @@
     <ToolCommandName>dotnet-json</ToolCommandName>
     <PackageOutputPath>./nupkg</PackageOutputPath>
 
-    <Version>1.1.0</Version>
+    <Version>1.1.1</Version>
     <PackageId>dotnet-json</PackageId>
     <Authors>sleeuwen</Authors>
     <RepositoryUrl>https://github.com/sleeuwen/dotnet-json</RepositoryUrl>