Simplify serialization and inlining heuristic (Fixes #98)

Author: xoofx

src/Tomlyn.Tests/ModelTests/ReflectionModelTests.cs

@@ -755,7 +755,8 @@ public void TestCommentRoundtripWithModel()
         [Test]
         public void TestModelWithSpecialDictionary()
         {
-            var input = @"[values.test]
+            var input = @"[values]
+[values.test]
 a = 1
 b = true
 ".ReplaceLineEndings().Trim();

src/Tomlyn.Tests/SerializationTests.cs

@@ -24,7 +24,8 @@ public void TestCrlfInMultilineString()
 
         model["property"] = "string\r\nwith\r\nnewlines";
 
-        Assert.AreEqual("property = '''string\r\nwith\r\nnewlines'''" + Environment.NewLine, Toml.FromModel(model));
+        var result = Toml.FromModel(model).Trim();
+        AssertHelper.AreEqualNormalizeNewLine("property = '''string\r\nwith\r\nnewlines'''", result);
     }
 
     [Test]
@@ -41,7 +42,55 @@ public void TestArrayWithPrimitives()
         };
 
         var result = Toml.FromModel(model).ReplaceLineEndings("\n").Trim();
-        Console.WriteLine(result);
-        Assert.AreEqual("mixed-array = [{a = 1}, 2, 3]", result);
+        AssertHelper.AreEqualNormalizeNewLine("mixed-array = [{a = 1}, 2, 3]", result);
+    }
+
+    [Test]
+    public void TestNestedEmptyArrays()
+    {
+        var outer = new TomlTable
+        {
+            ["inner1"] = new TomlTable { },
+            ["inner2"] = new TomlTable {
+                { "array1", new TomlArray {} },
+                { "array2", new TomlArray {} }
+            },
+            ["inner3"] = new TomlTable {
+                { "array1", new TomlArray {} },
+                { "array2", new TomlArray {} },
+                { "array3", new TomlArray { "hello" } },
+                { "array4", new TomlArray { } },
+                { "array5", new TomlArray { } },
+                { "array6", new TomlArray { } }
+            },
+            ["inner4"] = new TomlTable {
+                { "array1", new TomlArray {} },
+                { "string", "value" },
+                { "array2", new TomlArray {} },
+                { "array3", new TomlArray {} },
+            },
+        };
+
+        var expecting = """
+                        [inner1]
+                        [inner2]
+                        array1 = []
+                        array2 = []
+                        [inner3]
+                        array1 = []
+                        array2 = []
+                        array3 = ["hello"]
+                        array4 = []
+                        array5 = []
+                        array6 = []
+                        [inner4]
+                        array1 = []
+                        string = "value"
+                        array2 = []
+                        array3 = []
+                        """.ReplaceLineEndings("\n");
+        
+        var result = Toml.FromModel(outer).ReplaceLineEndings("\n").Trim();
+        AssertHelper.AreEqualNormalizeNewLine(expecting, result);
     }
 }

src/Tomlyn.Tests/Tomlyn.Tests.csproj

@@ -13,11 +13,11 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="nunit" Version="4.3.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="System.Text.Json" Version="9.0.0" />
-    <PackageReference Include="Portable.System.DateTimeOnly" Version="8.0.2" Condition="'$(TargetFramework)' == 'net48'" />
+    <PackageReference Include="nunit" Version="4.3.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="System.Text.Json" Version="9.0.2" />
+    <PackageReference Include="Portable.System.DateTimeOnly" Version="9.0.0" Condition="'$(TargetFramework)' == 'net48'" />
     <PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" Condition="'$(TargetFramework)' == 'net48'" />
     <PackageReference Include="PolySharp" Version="1.*">
       <PrivateAssets>all</PrivateAssets>