Fix scoped IncludeTypeInfo

mythz · mythz · commit 7d7805287815 · 2024-10-17T00:14:07.000+08:00
diff --git a/ServiceStack.Text/src/ServiceStack.Text/Common/WriteType.cs b/ServiceStack.Text/src/ServiceStack.Text/Common/WriteType.cs
@@ -390,7 +390,9 @@ public static void WriteProperties(TextWriter writer, object instance)
         writer.Write(JsWriter.MapStartChar);
 
         var i = 0;
-        if (WriteTypeInfo != null || JsState.IsWritingDynamic)
+        var writeTypeInfo = WriteTypeInfo != null || JsState.IsWritingDynamic
+            || (JsConfigScope.Current != null && JsConfigScope.Current.IncludeTypeInfo && !JsConfigScope.Current.ExcludeTypeInfo); 
+        if (writeTypeInfo)
         {
             if (JsConfig.PreferInterfaces && TryWriteSelfType(writer)) i++;
             else if (TryWriteTypeInfo(writer, instance)) i++;
diff --git a/ServiceStack.Text/tests/ServiceStack.Text.Tests/DynamicJsonTests.cs b/ServiceStack.Text/tests/ServiceStack.Text.Tests/DynamicJsonTests.cs
@@ -1,35 +1,60 @@
-﻿using NUnit.Framework;
+﻿using System;
+using NUnit.Framework;
 
-namespace ServiceStack.Text.Tests
+namespace ServiceStack.Text.Tests;
+
+[TestFixture]
+public class DynamicJsonTests
 {
-    [TestFixture]
-    public class DynamicJsonTests
+    [Test]
+    public void Can_Serialize_dynamic_collection()
     {
-        [Test]
-        public void Can_Serialize_dynamic_collection()
-        {
-            dynamic rows = new[] { new { Name = "Foo" }, new { Name = "Bar" } };
+        dynamic rows = new[] { new { Name = "Foo" }, new { Name = "Bar" } };
 
-            string json = JsonSerializer.SerializeToString(rows);
+        string json = JsonSerializer.SerializeToString(rows);
 
-            Assert.That(json, Is.EqualTo("[{\"Name\":\"Foo\"},{\"Name\":\"Bar\"}]"));
+        Assert.That(json, Is.EqualTo("[{\"Name\":\"Foo\"},{\"Name\":\"Bar\"}]"));
 
-            string csv = CsvSerializer.SerializeToString(rows);
-            Assert.That(csv.NormalizeNewLines(), Is.EqualTo("Name\nFoo\nBar"));
-        }
+        string csv = CsvSerializer.SerializeToString(rows);
+        Assert.That(csv.NormalizeNewLines(), Is.EqualTo("Name\nFoo\nBar"));
+    }
 
-        [Test]
-        public void Can_deserialize_dynamic_instance()
-        {
-            var dog = new { Name = "Spot" };
-            var json = DynamicJson.Serialize(dog);
+    [Test]
+    public void Can_deserialize_dynamic_instance()
+    {
+        var dog = new { Name = "Spot" };
+        var json = DynamicJson.Serialize(dog);
 
-            Assert.That(json, Is.EqualTo("{\"Name\":\"Spot\"}"));
+        Assert.That(json, Is.EqualTo("{\"Name\":\"Spot\"}"));
 
-            var deserialized = DynamicJson.Deserialize(json);
+        var deserialized = DynamicJson.Deserialize(json);
 
-            Assert.IsNotNull(deserialized);
-            Assert.That(deserialized.Name, Is.EqualTo(dog.Name));
+        Assert.IsNotNull(deserialized);
+        Assert.That(deserialized.Name, Is.EqualTo(dog.Name));
+    }
+    
+    public class Customer
+    {
+        public string Name { get; set; }
+    }
+
+    [Test]
+    public void Can_IncludeTypeInfo_within_JsConfigScope()
+    {
+        JsConfig.IncludeTypeInfo = false;
+
+        var cus = new Customer { Name = "Foo" };
+
+        Assert.That(JsonSerializer.SerializeToString(cus), Does.Not.Contain("__type"));
+
+        using (JsConfig.With(new Config { IncludeTypeInfo = true }))
+        {
+            Assert.That(JsonSerializer.SerializeToString(cus), Does.Contain("__type"));
         }
+
+        Assert.That(JsonSerializer.SerializeToString(cus), Does.Not.Contain("__type"));
+        
+        JsConfig.Reset();
     }
-}
+
+}
