Rewrite JsConfig to only read/write config instance snapshots

Author: mythz

src/ServiceStack.Text/Common/DateTimeSerializer.cs

@@ -56,10 +56,11 @@ public static class DateTimeSerializer
         /// <returns></returns>
         public static DateTime Prepare(this DateTime dateTime, bool parsedAsUtc = false)
         {
-            if (JsConfig.SkipDateTimeConversion)
+            var config = JsConfig.GetConfig();
+            if (config.SkipDateTimeConversion)
                 return dateTime;
 
-            if (JsConfig.AlwaysUseUtc)
+            if (config.AlwaysUseUtc)
                 return dateTime.Kind != DateTimeKind.Utc ? dateTime.ToStableUniversalTime() : dateTime;
 
             return parsedAsUtc ? dateTime.ToLocalTime() : dateTime;
@@ -88,27 +89,28 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
                 if (dateTimeStr.StartsWith(EscapedWcfJsonPrefix, StringComparison.Ordinal) || dateTimeStr.StartsWith(WcfJsonPrefix, StringComparison.Ordinal))
                     return ParseWcfJsonDate(dateTimeStr).Prepare();
 
+                var config = JsConfig.GetConfig();
                 if (dateTimeStr.Length == DefaultDateTimeFormat.Length)
                 {
                     var unspecifiedDate = DateTime.Parse(dateTimeStr, CultureInfo.InvariantCulture);
 
-                    if (JsConfig.AssumeUtc)
+                    if (config.AssumeUtc)
                         unspecifiedDate = DateTime.SpecifyKind(unspecifiedDate, DateTimeKind.Utc);
 
                     return unspecifiedDate.Prepare();
                 }
 
                 if (dateTimeStr.Length == DefaultDateTimeFormatWithFraction.Length)
                 {
-                    var unspecifiedDate = JsConfig.AssumeUtc
+                    var unspecifiedDate = config.AssumeUtc
                         ? DateTime.Parse(dateTimeStr, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal)
                         : DateTime.Parse(dateTimeStr, CultureInfo.InvariantCulture);
 
                     return unspecifiedDate.Prepare();
                 }
 
                 var kind = DateTimeKind.Unspecified;
-                switch (JsConfig.DateHandler)
+                switch (config.DateHandler)
                 {
                     case DateHandler.UnixTime:
                         if (int.TryParse(dateTimeStr, out var unixTime))
@@ -121,7 +123,7 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
                     case DateHandler.ISO8601:
                     case DateHandler.ISO8601DateOnly:
                     case DateHandler.ISO8601DateTime:
-                        if (JsConfig.SkipDateTimeConversion)
+                        if (config.SkipDateTimeConversion)
                             dateTimeStr = RemoveUtcOffsets(dateTimeStr, out kind);
                         break;
                 }
@@ -160,7 +162,7 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
 
                 try
                 {
-                    if (JsConfig.SkipDateTimeConversion)
+                    if (config.SkipDateTimeConversion)
                     {
                         return DateTime.Parse(dateTimeStr, null,
                             kind == DateTimeKind.Unspecified
@@ -170,7 +172,7 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
                                     : DateTimeStyles.AssumeUniversal);
                     }
 
-                    var assumeKind = JsConfig.AssumeUtc ? DateTimeStyles.AssumeUniversal : DateTimeStyles.AssumeLocal;
+                    var assumeKind = config.AssumeUtc ? DateTimeStyles.AssumeUniversal : DateTimeStyles.AssumeLocal;
                     var dateTime = DateTime.Parse(dateTimeStr, CultureInfo.InvariantCulture, assumeKind);
                     return dateTime.Prepare();
                 }
@@ -596,8 +598,10 @@ private static DateTime UseConfigSpecifiedSetting(this DateTime dateTime)
 
         public static void WriteWcfJsonDate(TextWriter writer, DateTime dateTime)
         {
+            var config = JsConfig.GetConfig();
+            
             dateTime = dateTime.UseConfigSpecifiedSetting();
-            switch (JsConfig.DateHandler)
+            switch (config.DateHandler)
             {
                 case DateHandler.ISO8601:
                     writer.Write(dateTime.ToString("o", CultureInfo.InvariantCulture));
@@ -617,16 +621,16 @@ public static void WriteWcfJsonDate(TextWriter writer, DateTime dateTime)
             string offset = null;
             if (dateTime.Kind != DateTimeKind.Utc)
             {
-                if (JsConfig.DateHandler == DateHandler.TimestampOffset && dateTime.Kind == DateTimeKind.Unspecified)
+                if (config.DateHandler == DateHandler.TimestampOffset && dateTime.Kind == DateTimeKind.Unspecified)
                     offset = UnspecifiedOffset;
                 else
                     offset = LocalTimeZone.GetUtcOffset(dateTime).ToTimeOffsetString();
             }
             else
             {
                 // Normally the JsonDateHandler.TimestampOffset doesn't append an offset for Utc dates, but if
-                // the JsConfig.AppendUtcOffset is set then we will
-                if (JsConfig.DateHandler == DateHandler.TimestampOffset && JsConfig.AppendUtcOffset.HasValue && JsConfig.AppendUtcOffset.Value)
+                // the config.AppendUtcOffset is set then we will
+                if (config.DateHandler == DateHandler.TimestampOffset && config.AppendUtcOffset)
                     offset = UtcOffset;
             }
 

src/ServiceStack.Text/Common/WriteType.cs

@@ -257,7 +257,7 @@ private static bool Init()
 
         internal struct TypePropertyWriter
         {
-            internal string GetPropertyName(PropertyConfigs config)
+            internal string GetPropertyName(Config config)
             {
                 return config.EmitCamelCaseNames
                     ? propertyNameCLSFriendly
@@ -304,7 +304,7 @@ public TypePropertyWriter(Type propertyType, string propertyName, string propert
                 this.isEnum = isEnum;
             }
 
-            public bool ShouldWriteProperty(object propertyValue, PropertyConfigs config)
+            public bool ShouldWriteProperty(object propertyValue, Config config)
             {
                 var isDefaultValue = propertyValue == null || Equals(DefaultValue, propertyValue);
                 if (isDefaultValue)
@@ -393,7 +393,7 @@ public static void WriteProperties(TextWriter writer, object instance)
 
             if (PropertyWriters != null)
             {
-                var config = JsConfig<T>.GetPropertyConfigs();
+                var config = JsConfig<T>.GetConfig();
 
                 var typedInstance = (T)instance;
                 var len = PropertyWriters.Length;
@@ -466,7 +466,7 @@ private static void WriteLateboundProperties(TextWriter writer, object value, Ty
             if (!JsConfig<T>.ExcludeTypeInfo.GetValueOrDefault()) JsState.IsWritingDynamic = false;
         }
 
-        internal static string GetPropertyName(string propertyName, PropertyConfigs config)
+        internal static string GetPropertyName(string propertyName, Config config)
         {
             return config.EmitCamelCaseNames
                 ? propertyName.ToCamelCase()
@@ -482,7 +482,7 @@ public static void WriteComplexQueryStringProperties(string typeName, TextWriter
             var i = 0;
             if (PropertyWriters != null)
             {
-                var config = JsConfig<T>.GetPropertyConfigs();
+                var config = JsConfig<T>.GetConfig();
 
                 var typedInstance = (T)instance;
                 var len = PropertyWriters.Length;
@@ -564,7 +564,7 @@ public static void WriteQueryString(TextWriter writer, object instance)
             try
             {
                 JsState.QueryStringMode = true;
-                var config = JsConfig<T>.GetPropertyConfigs();
+                var config = JsConfig<T>.GetConfig();
 
                 var i = 0;
                 var typedInstance = (T)instance;

src/ServiceStack.Text/Env.cs

@@ -136,7 +136,12 @@ static Env()
 
         public static bool SupportsDynamic { get; private set; }
 
-        public static bool StrictMode { get; set; }
+        private static bool strictMode;
+        public static bool StrictMode
+        {
+            get => strictMode;
+            set => JsConfig.ThrowOnError = strictMode = value;
+        }
 
         public static string ServerUserAgent { get; set; }
 
@@ -152,6 +157,7 @@ public static DateTime GetReleaseDate()
         public static string ReferenceAssembyPath => ReferenceAssemblyPath; 
 
         private static string referenceAssemblyPath;
+
         public static string ReferenceAssemblyPath
         {
             get