Fix merging keys with different types of values

Author: sleeuwen

dotnet-json.Tests/JsonDocumentTests.cs

@@ -85,6 +85,24 @@ public void FindValue_ReturnsCorrectValue(JToken root, string key, JValue expect
                 .Which.Should<JValue>().Be(expected);
         }
 
+        [Fact]
+        public void FindValue_ReturnsNullIfKeyDoesNotExist()
+        {
+            var document = new JsonDocument(JObject.Parse(@"{ ""key"": ""value"" }"));
+            var actual = document.FindToken("notkey");
+
+            actual.Should().BeNull();
+        }
+
+        [Fact]
+        public void FindValue_ReturnsNullIfKeyDoesNotExist_ButSubkeyExists()
+        {
+            var document = new JsonDocument(JObject.Parse(@"{ ""key"": ""value"" }"));
+            var actual = document.FindToken("key:nested");
+
+            actual.Should().BeNull();
+        }
+
         [Fact]
         public void SetValue_ModifiesOriginalDocument_Object()
         {
@@ -147,6 +165,63 @@ public void SetValue_CreatesNestedStructure_Array()
                 .Which.Value.Should().Be("value");;
         }
 
+        [Fact]
+        public void SetValue_ReplacesValue_WithArray()
+        {
+            var document = new JsonDocument(JObject.Parse(@"{ ""key"": ""value"" }"));
+
+            document.SetValue("key:0", "array");
+
+            document._json.Should().BeOfType<JObject>()
+                .Which.Should().ContainKey("key");
+
+            document._json["key"].Should().BeOfType<JArray>()
+                .Which.Should().HaveCount(1);
+
+            document._json["key"][0].Should().BeOfType<JValue>()
+                .Which.Value.Should().Be("array");
+        }
+
+        [Fact]
+        public void SetValue_ReplacesValue_WithObject()
+        {
+            var document = new JsonDocument(JObject.Parse(@"{ ""key"": ""value"" }"));
+
+            document.SetValue("key:nested", "object");
+
+            document._json.Should().BeOfType<JObject>()
+                .Which.Should().ContainKey("key");
+
+            document._json["key"].Should().BeOfType<JObject>()
+                .Which.Should().ContainKey("nested");
+
+            document._json["key"]["nested"].Should().BeOfType<JValue>()
+                .Which.Value.Should().Be("object");
+        }
+
+        [Fact]
+        public void Merge_MergesTwoDocuments()
+        {
+            var document1 = new JsonDocument(JObject.Parse(@"{ ""key1"": ""value1"" }"));
+            var document2 = new JsonDocument(JObject.Parse(@"{ ""key2"": ""value2"" }"));
+
+            document1.Merge(document2);
+
+            document1._json.Should().BeOfType<JObject>()
+                .Which.Should().ContainKeys("key1", "key1");
+
+            document1._json["key1"].Should().BeOfType<JValue>()
+                .Which.Value.Should().Be("value1");
+            document1._json["key2"].Should().BeOfType<JValue>()
+                .Which.Value.Should().Be("value2");
+        }
+
+        [Fact(Skip = "not yet implemented")]
+        public void Merge_ReplacesWholeArray()
+        {
+            // TODO: Make sure Merge replaces an array instead of only update array indices.
+        }
+
         [Fact]
         public void SetValue_CreatesNestedStructure_Multi()
         {

dotnet-json/Core/JsonDocument.cs

@@ -109,8 +109,8 @@ internal static IEnumerable<KeyValuePair<string, JValue>> AllValues(JToken token
                 var subkey = subKeys[i];
                 var isLastKey = i == subKeys.Length - 1;
 
-                if (current is JValue jValue && (!createNew || jValue.Value == null))
-                    throw new ArgumentException("");
+                if (current is JValue && !createNew)
+                    return null;
 
                 if (int.TryParse(subkey, out _) && current is JObject && ((JObject)current).Count == 0 && current.Parent != null)
                 {
@@ -126,10 +126,13 @@ internal static IEnumerable<KeyValuePair<string, JValue>> AllValues(JToken token
                     continue;
                 }
 
+                if (current is JValue)
+                    return null;
+
                 var jObject = (JObject)current!; // At this point current can only be a JObject.
                 current = jObject[subkey];
 
-                if (current == null && createNew)
+                if (createNew && (current is null || (current is JValue && !isLastKey)))
                 {
                     current = jObject[subkey] = isLastKey ? (JToken)new JValue((object?)null) : new JObject();
                 }

dotnet-json/dotnet-json.csproj

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