Support white-space when parsing __type info

Author: mythz

src/ServiceStack.Text/Common/DeserializeType.cs

@@ -73,8 +73,17 @@ public static object ObjectStringToType(string strType)
         public static Type ExtractType(string strType)
         {
             var typeAttrInObject = Serializer.TypeAttrInObject;
-            if (strType != null
-                && strType.Length > typeAttrInObject.Length
+            if (strType == null || strType.Length <= 1) return null;
+
+            var hasWhitespace = JsonUtils.WhiteSpaceChars.Contains(strType[1]);
+            if (hasWhitespace)
+            {
+                var pos = strType.IndexOf('"');
+                if (pos >= 0)
+                    strType = "{" + strType.Substring(pos);
+            }
+
+            if (strType.Length > typeAttrInObject.Length
                 && strType.Substring(0, typeAttrInObject.Length) == typeAttrInObject)
             {
                 var propIndex = typeAttrInObject.Length;

src/ServiceStack.Text/Json/JsonTypeSerializer.cs

@@ -33,10 +33,10 @@ internal static string GetTypeAttrInObject(string typeAttr)
 
         static JsonTypeSerializer()
         {
-            WhiteSpaceFlags[' '] = true;
-            WhiteSpaceFlags['\t'] = true;
-            WhiteSpaceFlags['\r'] = true;
-            WhiteSpaceFlags['\n'] = true;
+            foreach (var c in JsonUtils.WhiteSpaceChars)
+            {
+                WhiteSpaceFlags[c] = true;
+            }
         }
 
         public WriteObjectDelegate GetWriteFn<T>()

src/ServiceStack.Text/Json/JsonUtils.cs

@@ -14,6 +14,8 @@ public static class JsonUtils
 		public const string True = "true";
 		public const string False = "false";
 
+        public static char[] WhiteSpaceChars = new[] { ' ', '\t', '\r', '\n' };
+
 		static readonly char[] EscapeChars = new[]
 			{
 				QuoteChar, '\n', '\r', '\t', '"', '\\', '\f', '\b',

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

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace ServiceStack.Text.Tests.JsonTests
+{
+    public class TypeInfoTests
+    {
+        class MyClass : IComparable
+        {
+            public int CompareTo(object obj)
+            {
+                return 0;
+            }
+        }
+
+        [Test]
+        [TestCase("[{'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'}]")]
+        [TestCase("[{ '__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'}]")]
+        [TestCase("[{\n'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'}]")]
+        [TestCase("[{\t'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'}]")]
+        [TestCase("[ {'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'}]")]
+        [TestCase("[\n{'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'}]")]
+        [TestCase("[\t{'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'}]")]
+        [TestCase("[ { '__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'}]")]
+        [TestCase("[\n{\n'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'}]")]
+        [TestCase("[\t{\t'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'}]")]
+        [TestCase("[{'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'} ]")]
+        [TestCase("[{ '__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'}\t]")]
+        [TestCase("[{\n'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'}\n]")]
+        [TestCase("[{\t'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass' }]")]
+        [TestCase("[ {'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'\t}]")]
+        [TestCase("[\n{'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'\n}]")]
+        [TestCase("[\t{'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'\t}\n]")]
+        [TestCase("[ { '__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass', }]")]
+        [TestCase("[\n{\n'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'}]")]
+        [TestCase("[\t{\t'__type':'ServiceStack.Text.Tests.JsonTests.TypeInfoTests+MyClass'}]")]
+        public void TypeAttrInObject(string json)
+        {
+            json = json.Replace('\'', '"');
+            var deserDto = JsonSerializer.DeserializeFromString<List<IComparable>>(json);
+            Console.WriteLine(json);
+            Assert.IsNotNull(deserDto);
+            Assert.AreEqual(1, deserDto.Count);
+            Assert.IsNotNull(deserDto[0]);
+        }
+ 
+    }
+}

tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj

@@ -178,6 +178,7 @@
   <ItemGroup>
     <Compile Include="AttributeTests.cs" />
     <Compile Include="JsonTests\InvalidJsonTests.cs" />
+    <Compile Include="JsonTests\TypeInfoTests.cs" />
     <Compile Include="SerializationDelegatePerformanceTests.cs" />
     <Compile Include="SerializationHookTests.cs" />
     <Compile Include="StaticAccessorTests.cs" />