unencode object dictionary values

Author: mythz

src/ServiceStack.Text/Common/DeserializeDictionary.cs

@@ -276,7 +276,7 @@ public static IDictionary<TKey, TValue> ParseDictionary<TKey, TValue>(
                     {
                         to[mapKey] = (TValue)(tryToParseItemsAsPrimitiveTypes && elementStartIndex < valueLength
                             ? DeserializeType<TSerializer>.ParsePrimitive(elementValue.Value(), value[elementStartIndex])
-                            : parseValueFn(elementValue));
+                            : parseValueFn(elementValue).Value());
                     }
                 }
                 else
@@ -288,7 +288,7 @@ public static IDictionary<TKey, TValue> ParseDictionary<TKey, TValue>(
                     }
                     else
                     {
-                        to[mapKey] = (TValue)parseValueFn(elementValue);
+                        to[mapKey] = (TValue)parseValueFn(elementValue).Value();
                     }
                 }
 

src/ServiceStack.Text/StringSpanExtensions.cs

@@ -24,6 +24,12 @@ public static string Value(this ReadOnlySpan<char> value) => value.IsEmpty
                 ? ""
                 : value.ToString();
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static object Value(this object obj) =>
+            obj is string value && value.Length == 1 && value[0] == TypeConstants.NonWidthWhiteSpace
+                ? ""
+                : obj;
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool IsNullOrEmpty(this ReadOnlySpan<char> value) => value.IsEmpty || (value.Length == 1 && value[0] == TypeConstants.NonWidthWhiteSpace);
 

tests/ServiceStack.Text.Tests/Issues/WhitespaceIssues.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
 using Northwind.Common.DataModel;
 using NUnit.Framework;
 using ServiceStack.Text.Json;
@@ -45,5 +46,22 @@ public void Does_serialize_property_Empty_String()
             Assert.That(fromMs.Name, Is.EqualTo(dto.Name));
             JS.UnConfigure();
         }
+
+        [Test]
+        public void Does_serialize_object_dictionary()
+        {
+            JsConfig.ConvertObjectTypesIntoStringDictionary = true;
+            
+            var value = "{Number:10330,CountryKey:DE,FederalStateKey:\"\",Salutation:,City:''}";
+            var map = (Dictionary<string,object>) value.FromJsv<object>();
+            
+            Assert.That(map["Number"], Is.EqualTo("10330"));
+            Assert.That(map["CountryKey"], Is.EqualTo("DE"));
+            Assert.That(map["FederalStateKey"], Is.EqualTo(""));
+            Assert.That(map["Salutation"], Is.EqualTo(""));
+            Assert.That(map["City"], Is.EqualTo("''"));
+
+            JsConfig.ConvertObjectTypesIntoStringDictionary = false;
+        }
     }
 }