Optimize DateTimes serialization

Author: mythz

src/ServiceStack.Text.Net40/ServiceStack.Text.Net40.csproj

@@ -12,6 +12,7 @@
     <AssemblyName>ServiceStack.Text</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,7 @@
     <DefineConstants>TRACE;DEBUG;NET40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +31,7 @@
     <DefineConstants>TRACE;NET40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

src/ServiceStack.Text.Net40/ServiceStack.Text.Net40.sln.DotSettings

@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
+	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String></wpf:ResourceDictionary>

src/ServiceStack.Text/Common/DateTimeSerializer.cs

@@ -12,6 +12,8 @@
 
 using System;
 using System.Globalization;
+using System.IO;
+using System.Text;
 using System.Xml;
 using ServiceStack.Text.Json;
 
@@ -32,6 +34,7 @@ public static class DateTimeSerializer
         public const string EscapedWcfJsonSuffix = ")\\/";
         public const string WcfJsonPrefix = "/Date(";
         public const char WcfJsonSuffix = ')';
+        public const string UnspecifiedOffset = "-0000";
 
         /// <summary>
         /// If AlwaysUseUtc is set to true then convert all DateTime to UTC.
@@ -83,9 +86,9 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
                 return XmlConvert.ToDateTimeOffset(dateTimeStr, dateTimeType).DateTime.Prepare();
 #else
                 var dateTime = Env.IsMono ? ParseManual(dateTimeStr) : null;
-                if (dateTime != null) 
+                if (dateTime != null)
                     return dateTime.Value;
-                
+
                 return XmlConvert.ToDateTime(dateTimeStr, XmlDateTimeSerializationMode.Utc).Prepare();
 #endif
             }
@@ -94,10 +97,10 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
             {
                 return DateTime.Parse(dateTimeStr, null, DateTimeStyles.AssumeLocal).Prepare();
             }
-            catch(FormatException) 
+            catch (FormatException)
             {
                 var manualDate = ParseManual(dateTimeStr);
-                if (manualDate != null) 
+                if (manualDate != null)
                     return manualDate.Value;
 
                 throw;
@@ -149,7 +152,7 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
                     int.TryParse(timeParts[1], out min);
 
                     var secParts = timeParts[2].Split('.');
-                    int.TryParse(secParts[0], out ss);     
+                    int.TryParse(secParts[0], out ss);
                     if (secParts.Length == 2)
                     {
                         var msStr = secParts[1].PadRight(3, '0');
@@ -179,7 +182,7 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
                     }
                     else
                     {
-                        hh = int.Parse(timeOffset.Substring(0,2));
+                        hh = int.Parse(timeOffset.Substring(0, 2));
                         min = int.Parse(timeOffset.Substring(2));
                     }
 
@@ -299,7 +302,7 @@ public static string ToShortestXsdDateTimeString(DateTime dateTime)
                 return dateTime.Kind != DateTimeKind.Utc
                     ? dateTime.ToString(DateTimeFormatSecondsUtcOffset)
                     : dateTime.ToStableUniversalTime().ToString(XsdDateTimeFormatSeconds);
-            
+
             return dateTime.Kind != DateTimeKind.Utc
                 ? dateTime.ToString(DateTimeFormatTicksUtcOffset)
                 : ToXsdDateTimeString(dateTime);
@@ -340,10 +343,10 @@ public static DateTimeOffset ParseWcfJsonDateOffset(string wcfJsonDate)
                 return unixTime.FromUnixTimeMs();
             }
 
-            if (JsConfig.DateHandler == JsonDateHandler.DCJSCompatible)
+            // DCJS ignores the offset and considers it local time if any offset exists
+            // REVIEW: DCJS shoves offset in a separate field 'offsetMinutes', we have the offset in the format, so shouldn't we use it?
+            if (JsConfig.DateHandler == JsonDateHandler.DCJSCompatible || timeZone == UnspecifiedOffset)
             {
-                // DCJS ignores the offset and considers it local time if any offset exists
-                // REVIEW: DCJS shoves offset in a separate field 'offsetMinutes', we have the offset in the format, so shouldn't we use it?
                 return unixTime.FromUnixTimeMs().ToLocalTime();
             }
 
@@ -385,9 +388,9 @@ public static DateTime ParseWcfJsonDate(string wcfJsonDate)
                 return unixTime.FromUnixTimeMs();
             }
 
-            if (JsConfig.DateHandler == JsonDateHandler.DCJSCompatible)
+            // DCJS ignores the offset and considers it local time if any offset exists
+            if (JsConfig.DateHandler == JsonDateHandler.DCJSCompatible || timeZone == UnspecifiedOffset)
             {
-                // DCJS ignores the offset and considers it local time if any offset exists
                 return unixTime.FromUnixTimeMs().ToLocalTime();
             }
 
@@ -396,34 +399,74 @@ public static DateTime ParseWcfJsonDate(string wcfJsonDate)
             return new DateTimeOffset(date, offset).DateTime;
         }
 
-        public static string ToWcfJsonDate(DateTime dateTime)
+        private static TimeZoneInfo LocalTimeZone = TimeZoneInfo.Local;
+        public static void WriteWcfJsonDate(TextWriter writer, DateTime dateTime)
         {
             if (JsConfig.DateHandler == JsonDateHandler.ISO8601)
             {
-                return dateTime.ToString("o", CultureInfo.InvariantCulture);
+                writer.Write(dateTime.ToString("o", CultureInfo.InvariantCulture));
+                return;
             }
 
             var timestamp = dateTime.ToUnixTimeMs();
-            var offset = dateTime.Kind == DateTimeKind.Utc
-                ? string.Empty
-                : TimeZoneInfo.Local.GetUtcOffset(dateTime).ToTimeOffsetString();
+            string offset = null;
+            if (dateTime.Kind != DateTimeKind.Utc)
+            {
+                if (JsConfig.DateHandler == JsonDateHandler.TimestampOffset && dateTime.Kind == DateTimeKind.Unspecified)
+                    offset = UnspecifiedOffset;
+                else
+                    offset = LocalTimeZone.GetUtcOffset(dateTime).ToTimeOffsetString();
+            }
 
-            return EscapedWcfJsonPrefix + timestamp + offset + EscapedWcfJsonSuffix;
+            writer.Write(EscapedWcfJsonPrefix);
+            writer.Write(timestamp);
+            if (offset != null)
+            {
+                writer.Write(offset);
+            }
+            writer.Write(EscapedWcfJsonSuffix);
         }
 
-        public static string ToWcfJsonDateTimeOffset(DateTimeOffset dateTimeOffset)
+        public static string ToWcfJsonDate(DateTime dateTime)
+        {
+            var sb = new StringBuilder();
+            using (var writer = new StringWriter(sb))
+            {
+                WriteWcfJsonDate(writer, dateTime);
+                return sb.ToString();
+            }
+        }
+
+        public static void WriteWcfJsonDateTimeOffset(TextWriter writer, DateTimeOffset dateTimeOffset)
         {
             if (JsConfig.DateHandler == JsonDateHandler.ISO8601)
             {
-                return dateTimeOffset.ToString("o", CultureInfo.InvariantCulture);
+                writer.Write(dateTimeOffset.ToString("o", CultureInfo.InvariantCulture));
+                return;
             }
 
             var timestamp = dateTimeOffset.Ticks.ToUnixTimeMs();
             var offset = dateTimeOffset.Offset == TimeSpan.Zero
-                ? string.Empty
+                ? null
                 : dateTimeOffset.Offset.ToTimeOffsetString();
 
-            return EscapedWcfJsonPrefix + timestamp + offset + EscapedWcfJsonSuffix;
+            writer.Write(EscapedWcfJsonPrefix);
+            writer.Write(timestamp);
+            if (offset != null)
+            {
+                writer.Write(offset);
+            }
+            writer.Write(EscapedWcfJsonSuffix);
+        }
+
+        public static string ToWcfJsonDateTimeOffset(DateTimeOffset dateTimeOffset)
+        {
+            var sb = new StringBuilder();
+            using (var writer = new StringWriter(sb))
+            {
+                WriteWcfJsonDateTimeOffset(writer, dateTimeOffset);
+                return sb.ToString();
+            }
         }
     }
 }