Add new IValueWriter for being able to write raw JsonValue

Author: mythz

lib/ServiceStack.Interfaces.dll

@@ -237,9 +237,12 @@ public WriteObjectDelegate GetValueTypeToStringMethod(Type type)
                     ? (WriteObjectDelegate)Serializer.WriteEnumFlags
                     : Serializer.WriteEnum;
 
-            if (type.HasInterface(typeof (IFormattable)))
+            if (type.HasInterface(typeof(IFormattable)))
                 return Serializer.WriteFormattableObjectString;
 
+            if (type.HasInterface(typeof(IValueWriter)))
+                return WriteValue;
+
             return Serializer.WriteObjectString;
         }
 
@@ -264,6 +267,12 @@ public WriteObjectDelegate GetWriteFn<T>()
             return GetCoreWriteFn<T>();
         }
 
+        public void WriteValue(TextWriter writer, object value)
+        {
+            var valueWriter = (IValueWriter)value;
+            valueWriter.WriteTo(Serializer, writer);
+        }
+
         private WriteObjectDelegate GetCoreWriteFn<T>()
         {
             if ((typeof(T).IsValueType() && !JsConfig.TreatAsRefType(typeof(T))) || JsConfig<T>.HasSerializeFn)
@@ -341,6 +350,9 @@ private WriteObjectDelegate GetCoreWriteFn<T>()
                 return WriteListsOfElements<TSerializer>.WriteIEnumerable;
             }
 
+            if (typeof(T).HasInterface(typeof (IValueWriter)))
+                return WriteValue;
+
             if (typeof(T).IsClass() || typeof(T).IsInterface() || JsConfig.TreatAsRefType(typeof(T)))
             {
                 var typeToStringMethod = WriteType<T, TSerializer>.Write;
@@ -374,6 +386,5 @@ public void WriteType(TextWriter writer, object value)
         {
             Serializer.WriteRawString(writer, JsConfig.TypeWriter((Type)value));
         }
-
     }
 }

src/ServiceStack.Text/Common/JsWriter.cs

@@ -151,7 +151,12 @@ public static JsonArrayObjects Parse(string json)
 		}
 	}
 
-    public struct JsonValue
+    public interface IValueWriter
+    {
+        void WriteTo(ITypeSerializer serializer, TextWriter writer);
+    }
+
+    public struct JsonValue : IValueWriter
     {
         private readonly string json;
 
@@ -169,6 +174,11 @@ public override string ToString()
         {
             return json;
         }
+
+        public void WriteTo(ITypeSerializer serializer, TextWriter writer)
+        {
+            writer.Write(json ?? JsonUtils.Null);
+        }
     }
 
 }

src/ServiceStack.Text/JsonObject.cs

@@ -1,4 +1,5 @@
-using NUnit.Framework;
+using System.Collections.Generic;
+using NUnit.Framework;
 
 namespace ServiceStack.Text.Tests.JsonTests
 {
@@ -147,13 +148,119 @@ public void Can_Serialize_StringContainerDto()
             Assert.That(src.Action.ElementId, Is.EqualTo(fromSrc.Action.ElementId));
             Assert.That(dst.Action, Is.EqualTo(fromDst.Action));
         }
-        
+
+
+        readonly SimpleObj simple = new SimpleObj
+        {
+            value1 = "Foo",
+            value2 = "Bar"
+        };
+
+        [Test]
+        public void Can_Deserialize_JsonValue()
+        {
+            var json = simple.ToJson();
+            var jsonValue = new JsonValue(json);
+
+            var fromJson = jsonValue.As<SimpleObj>();
+
+            Assert.That(fromJson.value1, Is.EqualTo(simple.value1));
+            Assert.That(fromJson.value2, Is.EqualTo(simple.value2));
+        }
+
+        [Test]
+        public void Can_Serialize_JsonValue_Multiple_Times()
+        {
+            var json = simple.ToJson();
+            var jsonValue = new JsonValue(json);
+
+            var jsonAfter = jsonValue.ToJson();
+
+            Assert.That(jsonAfter, Is.EqualTo(json));
+        }
+
+        [Test]
+        public void Can_Deserialize_JsonValue_After_Multiple_Serialize()
+        {
+            var json = simple.ToJson();
+            var jsonValue = new JsonValue(json);
+
+            jsonValue = new JsonValue(jsonValue.ToJson());
+
+            var fromJson = jsonValue.As<SimpleObj>();
+
+            Assert.That(fromJson.value1, Is.EqualTo(simple.value1));
+            Assert.That(fromJson.value2, Is.EqualTo(simple.value2));
+        }
+
+        [Test]
+        public void Can_Deserialize_JsonValue_After_Multiple_Serialize_2()
+        {
+            var json = simple.ToJson();
+            var jsonValue = new JsonValue(json);
+
+            json = jsonValue.ToJson();
+
+            var fromJson = json.FromJson<SimpleObj>();
+
+            Assert.That(fromJson.value1, Is.EqualTo(simple.value1));
+            Assert.That(fromJson.value2, Is.EqualTo(simple.value2));
+        }
+        [Test]
+        public void Can_Serialize_NestedJsonValueDto()
+        {
+            var scaffold = new List<JsonValue> { new JsonValue(text.ToJson()), new JsonValue(text.ToJson()) };
+
+            var container = new NestedJsonValueDto
+            {
+                ElementId = "container_1",
+                ElementType = "container",
+                // Raw nesting - won't be escaped
+                Content = new ElementContentDto { ElementId = "container_1", Content = "container goes here" },
+                Action = new ElementActionDto { ElementId = "container_1", Action = "action goes here" },
+                Scaffolding = scaffold
+            };
+
+            var json = container.ToJson();
+
+            var fromJson = json.FromJson<NestedJsonValueDto>();
+
+            foreach (var jsonValue in fromJson.Scaffolding)
+            {
+                var fromJsonValue = jsonValue.As<TextElementDto>();
+                Assert.That(fromJsonValue.ElementId, Is.EqualTo(text.ElementId));
+                Assert.That(fromJsonValue.Action.ElementId, Is.EqualTo(text.Action.ElementId));
+                Assert.That(fromJsonValue.Content.ElementId, Is.EqualTo(text.Content.ElementId));
+            }
+        }
+
+        public class SimpleObj
+        {
+            public string value1 { get; set; }
+            public string value2 { get; set; }
+        }
+
+        public class NestedSimpleJsonValue
+        {
+            public JsonValue Simple { get; set; }
+        }
+
+        public class NestedJsonValueDto
+        {
+            public string ElementType { get; set; }
+            public string ElementId { get; set; }
+
+            public ElementContentDto Content { get; set; }
+            public ElementActionDto Action { get; set; }
+
+            public List<JsonValue> Scaffolding { get; set; }
+        }
+
         public class TypedContainerDto
         {
             public TextElementDto Source { get; set; }
             public ImageElementDto Destination { get; set; }
         }
-
         // DTOs
         public class StringContainerDto // This is the request dto
         {
@@ -199,5 +306,6 @@ public class ElementActionDto
             public string Action { get; set; }
             // There can be more nested objects in here
         }
+
     }
 }