Add new JsConfig.ParsePrimitiveFn to allow short-circuiting of parse primitive values

Author: mythz

src/ServiceStack.Text/Common/DeserializeType.cs

@@ -120,7 +120,16 @@ public static object ParseAbstractType<T>(string value)
 
         public static object ParseQuotedPrimitive(string value)
         {
-            if (string.IsNullOrEmpty(value)) return null;
+            var fn = JsConfig.ParsePrimitiveFn;
+            if (fn != null)
+            {
+                var result = fn(value);
+                if (result != null)
+                    return result;
+            }
+
+            if (string.IsNullOrEmpty(value)) 
+                return null;
 
             Guid guidValue;
             if (Guid.TryParse(value, out guidValue)) return guidValue;
@@ -160,10 +169,20 @@ public static object ParseQuotedPrimitive(string value)
 
         public static object ParsePrimitive(string value)
         {
-            if (string.IsNullOrEmpty(value)) return null;
+            var fn = JsConfig.ParsePrimitiveFn;
+            if (fn != null)
+            {
+                var result = fn(value);
+                if (result != null)
+                    return result;
+            }
+
+            if (string.IsNullOrEmpty(value)) 
+                return null;
 
             bool boolValue;
-            if (bool.TryParse(value, out boolValue)) return boolValue;
+            if (bool.TryParse(value, out boolValue)) 
+                return boolValue;
 
             // Parse as decimal
             decimal decimalValue;
@@ -219,8 +238,8 @@ internal static object ParsePrimitive(string value, char firstChar)
             if (typeof(TSerializer) == typeof(JsonTypeSerializer))
             {
                 return firstChar == JsWriter.QuoteChar
-                           ? ParseQuotedPrimitive(value)
-                           : ParsePrimitive(value);
+                    ? ParseQuotedPrimitive(value)
+                    : ParsePrimitive(value);
             }
             return (ParsePrimitive(value) ?? ParseQuotedPrimitive(value));
         }

src/ServiceStack.Text/JsConfig.cs

@@ -357,6 +357,21 @@ public static Func<string, Type> TypeFinder
             }
         }
 
+        private static Func<string, object> sParsePrimitiveFn;
+        public static Func<string, object> ParsePrimitiveFn
+        {
+            get
+            {
+                return (JsConfigScope.Current != null ? JsConfigScope.Current.ParsePrimitiveFn : null)
+                    ?? sParsePrimitiveFn
+                    ?? null;
+            }
+            set
+            {
+                if (sParsePrimitiveFn == null) sParsePrimitiveFn = value;
+            }
+        }
+
         private static DateHandler? sDateHandler;
         public static DateHandler DateHandler
         {
@@ -738,6 +753,7 @@ public static void Reset()
             sJsvTypeAttrInObject = null;
             sTypeWriter = null;
             sTypeFinder = null;
+            sParsePrimitiveFn = null;
             sTreatEnumAsInteger = null;
             sAlwaysUseUtc = null;
             sAssumeUtc = null;

src/ServiceStack.Text/JsConfigScope.cs

@@ -70,6 +70,7 @@ public void Dispose()
         internal string JsvTypeAttrInObject { get; set; }
         public Func<Type, string> TypeWriter { get; set; }
         public Func<string, Type> TypeFinder { get; set; }
+        public Func<string, object> ParsePrimitiveFn { get; set; }
         public DateHandler? DateHandler { get; set; }
         public TimeSpanHandler? TimeSpanHandler { get; set; }
         public PropertyConvention? PropertyConvention { get; set; }

tests/ServiceStack.Text.Tests/DictionaryTests.cs

@@ -3,6 +3,7 @@
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Globalization;
+using System.Text.RegularExpressions;
 using NUnit.Framework;
 using ServiceStack.Text.Tests.DynamicModels.DataModel;
 
@@ -627,6 +628,36 @@ private class ModelWithDictionary
         {
             public Dictionary<string, string> Value { get; set; }
         }
+
+        [Test]
+        public void Do_not_convert_Guids()
+        {
+            JsConfig.DateHandler = DateHandler.ISO8601;
+            JsConfig.AlwaysUseUtc = true;
+            JsConfig.TryToParsePrimitiveTypeValues = true;  // needed for datetime
+
+            var isGuidRegex = 
+              new Regex(@"^(\{){0,1}[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}(\}){0,1}$", RegexOptions.Compiled);
+
+            JsConfig.ParsePrimitiveFn = s => isGuidRegex.IsMatch(s) ? s : null;
+
+            var original = new Dictionary<string, object>
+               {
+                   {"GuidString", "6A3F0923-A4B8-4026-9982-5C79128EA128"},
+                   {"DateTime", DateTime.UtcNow}
+               };
+
+            var json = JsonSerializer.SerializeToString(original);
+
+            json.Print();
+
+            var deserialized = JsonSerializer.DeserializeFromString<Dictionary<string, object>>(json);
+
+            Assert.That(deserialized["GuidString"], Is.EqualTo("6A3F0923-A4B8-4026-9982-5C79128EA128"));
+            Assert.That(deserialized["DateTime"], Is.AssignableTo(typeof(DateTime)));
+
+            JsConfig.Reset();
+        }
     }
 
     public class OrderedDictionarySub : OrderedDictionary { }