Add support for deserializing List<object> and Dictionary<string,object> with #Script

Author: mythz

src/ServiceStack.Text/Common/DeserializeDictionary.cs

@@ -14,7 +14,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Threading;
-using ServiceStack.Text.Json;
 
 namespace ServiceStack.Text.Common
 {
@@ -51,13 +50,11 @@ public static ParseStringSpanDelegate GetParseStringSpanMethod(Type type)
 
             //optimized access for regularly used types
             if (type == typeof(Dictionary<string, string>))
-            {
                 return ParseStringDictionary;
-            }
+            if (type == typeof(Dictionary<string, object>) && Json.JsonTypeSerializer.Instance.ObjectDeserializer != null)
+                return s => Json.JsonTypeSerializer.Instance.ObjectDeserializer(s);
             if (type == typeof(JsonObject))
-            {
                 return ParseJsonObject;
-            }
             if (typeof(JsonObject).IsAssignableFrom(type))
             {
                 var method = typeof(DeserializeDictionary<TSerializer>).GetMethod("ParseInheritedJsonObject");
@@ -89,7 +86,7 @@ public static ParseStringSpanDelegate GetParseStringSpanMethod(Type type)
 
             var result = new T();
 
-            if (JsonTypeSerializer.IsEmptyMap(value, index)) return result;
+            if (Json.JsonTypeSerializer.IsEmptyMap(value, index)) return result;
 
             var valueLength = value.Length;
             while (index < valueLength)
@@ -119,7 +116,7 @@ public static JsonObject ParseJsonObject(ReadOnlySpan<char> value)
 
             var result = new JsonObject();
 
-            if (JsonTypeSerializer.IsEmptyMap(value, index)) return result;
+            if (Json.JsonTypeSerializer.IsEmptyMap(value, index)) return result;
 
             var valueLength = value.Length;
             while (index < valueLength)
@@ -151,7 +148,7 @@ public static Dictionary<string, string> ParseStringDictionary(ReadOnlySpan<char
 
             var result = new Dictionary<string, string>();
 
-            if (JsonTypeSerializer.IsEmptyMap(value, index)) return result;
+            if (Json.JsonTypeSerializer.IsEmptyMap(value, index)) return result;
 
             var valueLength = value.Length;
             while (index < valueLength)
@@ -185,7 +182,7 @@ public static IDictionary ParseIDictionary(ReadOnlySpan<char> value, Type dictTy
 
             var to = (IDictionary)dictType.CreateInstance();
 
-            if (JsonTypeSerializer.IsEmptyMap(value, index)) return to;
+            if (Json.JsonTypeSerializer.IsEmptyMap(value, index)) return to;
 
             var valueLength = value.Length;
             while (index < valueLength)
@@ -245,7 +242,7 @@ public static IDictionary<TKey, TValue> ParseDictionary<TKey, TValue>(
                 ? new Dictionary<TKey, TValue>()
                 : (IDictionary<TKey, TValue>)createMapType.CreateInstance();
 
-            if (JsonTypeSerializer.IsEmptyMap(value, index)) return to;
+            if (Json.JsonTypeSerializer.IsEmptyMap(value, index)) return to;
 
             var valueLength = value.Length;
             while (index < valueLength)
@@ -339,8 +336,9 @@ public static object ParseDictionaryType(ReadOnlySpan<char> value, Type createMa
             do
             {
                 snapshot = ParseDelegateCache;
-                newCache = new Dictionary<TypesKey, ParseDictionaryDelegate>(ParseDelegateCache);
-                newCache[key] = parseDelegate;
+                newCache = new Dictionary<TypesKey, ParseDictionaryDelegate>(ParseDelegateCache) {
+                    [key] = parseDelegate
+                };
 
             } while (!ReferenceEquals(
                 Interlocked.CompareExchange(ref ParseDelegateCache, newCache, snapshot), snapshot));

src/ServiceStack.Text/Common/DeserializeListWithElements.cs

@@ -269,6 +269,9 @@ public static ParseStringSpanDelegate GetParseStringSpanFn()
 
             if (typeof(T) == typeof(List<int>))
                 return DeserializeListWithElements<TSerializer>.ParseIntList;
+            
+            if (typeof(T) == typeof(List<object>) && Json.JsonTypeSerializer.Instance.ObjectDeserializer != null)
+                return s => Json.JsonTypeSerializer.Instance.ObjectDeserializer(s);
 
             var elementType = listInterface.GetGenericArguments()[0];
 

tests/ServiceStack.Text.Tests/JsonTests/JsonObjectTests.cs

@@ -505,7 +505,45 @@ public void Can_deserialize_custom_JsonObject_with_incorrect_payload()
             }
             catch (FormatException) {}
         }
-        
+
+        class HasObjectDictionary
+        {
+            public Dictionary<string, object> Properties { get; set; }
+        }
+
+        [Test]
+        public void Can_deserialize_unknown_ObjectDictionary()
+        {
+            JS.Configure();
+
+            Assert.That("{\"Properties\":{\"a\":1}}".FromJson<HasObjectDictionary>().Properties["a"], Is.EqualTo(1));
+            Assert.That("{\"Properties\":{\"a\":\"1\"}}".FromJson<HasObjectDictionary>().Properties["a"], Is.EqualTo("1"));
+            Assert.That("{\"Properties\":{\"a\":[\"1\",\"2\"]}}".FromJson<HasObjectDictionary>().Properties["a"], Is.EquivalentTo(new[]{"1","2"}));
+            Assert.That("{\"Properties\":{\"a\":[1,2]}}".FromJson<HasObjectDictionary>().Properties["a"], Is.EquivalentTo(new[]{1,2}));
+
+            JS.UnConfigure();
+        }
+
+        class HasObjectList
+        {
+            public List<object> Properties { get; set; }
+        }
+
+        [Test]
+        public void Can_deserialize_unknown_ObjectList()
+        {
+            JS.Configure();
+
+            Assert.That("{\"Properties\":[\"1\"]}".FromJson<HasObjectList>().Properties[0], Is.EqualTo("1"));
+            Assert.That("{\"Properties\":[1]}".FromJson<HasObjectList>().Properties[0], Is.EqualTo(1));
+            Assert.That("{\"Properties\":[[\"1\",\"2\"]]}".FromJson<HasObjectList>().Properties[0], Is.EquivalentTo(new[]{"1","2"}));
+            Assert.That("{\"Properties\":[[1,2]]}".FromJson<HasObjectList>().Properties[0], Is.EquivalentTo(new[]{1,2}));
+            Assert.That("{\"Properties\":[{\"a\":1}]".FromJson<HasObjectList>().Properties[0], Is.EquivalentTo(new Dictionary<string,object> {
+                ["a"] = 1
+            }));
+
+            JS.UnConfigure();
+        }
 
     }
 }