Improved empty collections and fields handling in extras structures. F…

…ixes #105
vpenades · Sep 28, 2021 · 714c4bf · 714c4bf
1 parent 326bdb5
commit 714c4bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/SharpGLTF.Core/IO/JsonContent.Impl.cs b/src/SharpGLTF.Core/IO/JsonContent.Impl.cs
@@ -380,6 +380,8 @@ private static Array TryClone(IEnumerable collection)
                 }
             }
 
+            if (count == 0) { return Array.Empty<Object>(); }
+
             if (elementType.IsGenericType && elementType.GetGenericTypeDefinition() == typeof(IReadOnlyDictionary<,>))
             {
                 elementType = typeof(IDictionary);
@@ -491,6 +493,7 @@ private static IEnumerable<JSONPROPERTY> _Enumerate(IDictionary dict)
         {
             foreach (DictionaryEntry entry in dict)
             {
+                if (entry.Value == null) continue;
                 yield return new JSONPROPERTY(_GetKey(entry.Key), _GetValue(entry.Value));
             }
         }
@@ -499,6 +502,7 @@ private static IEnumerable<JSONPROPERTY> _Enumerate<TKey, TValue>(IEnumerable<Ke
         {
             foreach (var entry in dict)
             {
+                if (entry.Value == null) continue;
                 yield return new JSONPROPERTY(_GetKey(entry.Key), _GetValue(entry.Value));
             }
         }

diff --git a/tests/SharpGLTF.Core.Tests/Schema2/Authoring/BasicSceneCreationTests.cs b/tests/SharpGLTF.Core.Tests/Schema2/Authoring/BasicSceneCreationTests.cs
@@ -34,9 +34,11 @@ public void CreateSceneWithExtras()
             var dict = new Dictionary<string, object>();
 
             dict["author"] = "me";
+            dict["string_null"] = (string)null;
 
             dict["value1"] = 17;
             dict["array1"] = new List<int> { 1, 2, 3 };
+            dict["array_empty"] = new List<int>();
             dict["dict1"] = new Dictionary<string, object>
             {
                 ["A"] = 16,