Fixed array deserialization to be limited at number of child tokens. Fixed item list unit test to reflect new semantics.

Author: kirk-marple

Source/Schema.NET/ValuesJsonConverter.cs

@@ -49,6 +49,7 @@ public override object ReadJson(
             var value = reader.Value;
 
             var token = JToken.Load(reader);
+            var count = token.Children().Count();
             if (mainType.GenericTypeArguments.Length == 1)
             {
                 var type = mainType.GenericTypeArguments[0];
@@ -66,18 +67,28 @@ public override object ReadJson(
             {
                 if (tokenType == JsonToken.StartArray)
                 {
+                    var total = 0;
                     var items = new List<object>();
                     for (var i = mainType.GenericTypeArguments.Length - 1; i >= 0; i--)
                     {
                         var type = mainType.GenericTypeArguments[i];
                         var unwrappedType = type.GetUnderlyingTypeFromNullable();
-                        var args = ReadJsonArray(token, unwrappedType);
+                        // only read as many items as there are tokens left
+                        var args = ReadJsonArray(token, unwrappedType, count - total);
 
                         if (args != null && args.Count > 0)
                         {
                             var genericType = typeof(OneOrMany<>).MakeGenericType(type);
                             var item = (IValues)Activator.CreateInstance(genericType, args);
                             items.Add(item);
+
+                            total += args.Count;
+
+                            if (total >= count)
+                            {
+                                // if we have deserialized enough items as there are tokens, break
+                                break;
+                            }
                         }
                     }
 
@@ -396,11 +407,18 @@ private static Type ToClass(Type type)
             return type;
         }
 
-        private static IList ReadJsonArray(JToken token, Type type)
+        private static IList ReadJsonArray(JToken token, Type type, int? count = null)
         {
             var classType = ToClass(type);
             var listType = typeof(List<>).MakeGenericType(classType);
             var list = Activator.CreateInstance(listType);
+            var i = 0;
+
+            if (count == null)
+            {
+                // if maximum item count not assigned, set to count of child tokens
+                count = token.Children().Count();
+            }
 
             foreach (var childToken in token.Children())
             {
@@ -423,6 +441,13 @@ private static IList ReadJsonArray(JToken token, Type type)
                             .Invoke(list, new object[] { child });
                     }
                 }
+
+                i++;
+
+                if (i == count)
+                {
+                    break;
+                }
             }
 
             return (IList)list;

Tests/Schema.NET.Test/core/ItemListTest.cs

@@ -58,8 +58,8 @@ public class ItemListTest
         [Fact]
         public void Deserializing_ItemListJsonLd_ReturnsMatchingItemList()
         {
-            Assert.Equal(this.itemlist.ToString(), JsonConvert.DeserializeObject<Book>(this.json, TestDefaults.DefaultJsonSerializerSettings).ToString());
-            Assert.Equal(JsonConvert.SerializeObject(this.itemlist, TestDefaults.DefaultJsonSerializerSettings), JsonConvert.SerializeObject(JsonConvert.DeserializeObject<Book>(this.json, TestDefaults.DefaultJsonSerializerSettings), TestDefaults.DefaultJsonSerializerSettings));
+            Assert.Equal(this.itemlist.ToString(), JsonConvert.DeserializeObject<ItemList>(this.json, TestDefaults.DefaultJsonSerializerSettings).ToString());
+            Assert.Equal(JsonConvert.SerializeObject(this.itemlist, TestDefaults.DefaultJsonSerializerSettings), JsonConvert.SerializeObject(JsonConvert.DeserializeObject<ItemList>(this.json, TestDefaults.DefaultJsonSerializerSettings), TestDefaults.DefaultJsonSerializerSettings));
         }
 
         // https://developers.google.com/search/docs/guides/mark-up-listings
@@ -192,29 +192,19 @@ public void Deserializing_ItemListJsonLd_ReturnsItemList()
 
             Assert.Equal("ItemList", itemList.Type);
             Assert.True(itemList.ItemListElement.HasValue);
-            Assert.Equal(4, itemList.ItemListElement.Value.Count);
+            Assert.Equal(2, itemList.ItemListElement.Value.Count);
             var listItems = (List<IListItem>)itemList.ItemListElement.Value;
             var things = (List<IThing>)itemList.ItemListElement.Value;
             Assert.Equal(2, listItems.Count);
-            Assert.Equal(2, things.Count);
+            Assert.Empty(things);
             var listItem1 = listItems.First();
             var listItem2 = listItems.Last();
-            var thing1 = things.First();
-            var thing2 = things.Last();
-            var thingListItem1 = Assert.IsType<ListItem>(thing1);
-            var thingListItem2 = Assert.IsType<ListItem>(thing2);
             Assert.Equal(1, listItem1.Position);
             Assert.Equal(2, listItem2.Position);
-            Assert.Equal(1, thingListItem1.Position);
-            Assert.Equal(2, thingListItem2.Position);
             var recipe1 = Assert.IsType<Recipe>(listItem1.Item.Single());
             var recipe2 = Assert.IsType<Recipe>(listItem2.Item.Single());
-            var recipe3 = Assert.IsType<Recipe>(thingListItem1.Item.Single());
-            var recipe4 = Assert.IsType<Recipe>(thingListItem2.Item.Single());
             Assert.Equal("Recipe 1", recipe1.Name);
             Assert.Equal("Recipe 2", recipe2.Name);
-            Assert.Equal("Recipe 1", recipe3.Name);
-            Assert.Equal("Recipe 2", recipe4.Name);
         }
     }
 }