Merge pull request #26 from MTESSDev/feature/supportAllJsonText

MDAT 1.5.1 - Add complete support for System.Text.Json Serialization…

Author: anisite

src/MDAT/MDAT.csproj

@@ -10,7 +10,7 @@
 		<Company>MESS</Company>
 		<PackageProjectUrl>https://github.com/MTESSDev/mdAT</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/MTESSDev/mdAT</RepositoryUrl>
-		<Version>1.5.0</Version>
+		<Version>1.5.1</Version>
 		<Description>Markdown Auto-Tests for .net 6+, based on MSTestsV2 DataSource.</Description>
   </PropertyGroup>
 

src/MDAT/MarkdownTest.cs

@@ -2,13 +2,11 @@
 using Markdig;
 using Markdig.Syntax;
 using MDAT.Resolver;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.ComponentModel;
 using System.Reflection;
 using System.Text;
 using YamlDotNet.Core;
 using YamlDotNet.Serialization;
-using YamlDotNet.System.Text.Json;
 
 namespace MDAT
 {
@@ -221,16 +219,16 @@ private static IDeserializer NewDeserializer(INodeTypeResolver resolver, string
         {
             DeserializerBuilder deserializer = new DeserializerBuilder()
               .WithTypeConverter(new ByteArayConverter(), e => e.OnBottom())
-              .WithTypeConverter(new SystemTextJsonYamlTypeConverter())
-              .WithTypeInspector(x => new SystemTextJsonTypeInspector(x))
+              .WithTypeConverter(new SystemTextJsonYamlTypeConverter(false, true))
+              .WithTypeInspector(x => new YamlDotNet.System.Text.Json.SystemTextJsonTypeInspector(x))
               .WithTypeConverter(new StringValuesConverter())
               .WithNodeTypeResolver(resolver)
               .WithNodeDeserializer(new KeyValuePairNodeDeserializer())
               .IgnoreUnmatchedProperties()
               .WithAttemptingUnquotedStringTypeDeserialization()
               .WithTagMapping(MdatConstants.IncludeTag, typeof(IncludeRef));
 
-            foreach(var typeConverter in MdatConfig.ListeTypeConverter)
+            foreach (var typeConverter in MdatConfig.ListeTypeConverter)
             {
                 _ = typeConverter.Where is { } ? deserializer.WithTypeConverter(typeConverter.TypeConverter!, typeConverter.Where) : deserializer.WithTypeConverter(typeConverter.TypeConverter!);
             }

src/MDAT/Resolver/JsonDocumentConverter.cs

@@ -0,0 +1,43 @@
+using Newtonsoft.Json;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+
+namespace MDAT.Resolver
+{
+    public class SystemTextJsonFullConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return typeof(JsonNode).IsAssignableFrom(objectType)
+           || typeof(JsonDocument).IsAssignableFrom(objectType)
+           || typeof(JsonElement).IsAssignableFrom(objectType);
+        }
+
+        public override void WriteJson(JsonWriter writer, object? value, Newtonsoft.Json.JsonSerializer serializer)
+        {
+            if (value is null)
+            {
+                writer.WriteNull();
+                return;
+            }
+
+            string json = value switch
+            {
+                JsonObject obj => obj.ToJsonString(),
+                JsonArray arr => arr.ToJsonString(),
+                JsonValue val => val.ToJsonString(),
+                JsonNode node => node.ToJsonString(),
+                JsonDocument doc => doc.RootElement.GetRawText(),
+                JsonElement elem => elem.ToString(),
+                _ => throw new JsonSerializationException($"Type System.Text.Json non supporté : {value.GetType()}")
+            };
+
+            writer.WriteRawValue(json);
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, Newtonsoft.Json.JsonSerializer serializer)
+        {
+            throw new JsonSerializationException("Invalid json document.");
+        }
+    }
+}