chore: add ManagedReference YAML roundtrip tests

dotnet · Sep 27, 2024 · 750bb7d · 750bb7d
1 parent 19e7a97
commit 750bb7d
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 7 deletions.
diff --git a/src/Docfx.Common/Json/JsonUtility.cs b/src/Docfx.Common/Json/JsonUtility.cs
@@ -91,9 +91,11 @@ private static bool IsSupported()
             switch (fullName)
             {
                 case "Docfx.Build.Engine.XRefMap":
-                case "Docfx.DataContracts.ManagedReference.PageViewModel":
                     return true;
 
+                case "Docfx.DataContracts.ManagedReference.PageViewModel":
+                    return true; // TODO: Need to support ExtensionData
+
                 // Intermediate types for tests. it's expected to be removed later (And return true by default).
                 case "Docfx.Plugins.MarkdownServiceProperties":
                     return true;

diff --git a/src/Docfx.DataContracts.Common/JTokenConverter.cs b/src/Docfx.DataContracts.Common/JTokenConverter.cs
@@ -1,6 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Reflection;
+using System.Text.Json;
+using Docfx.Common;
 using Newtonsoft.Json.Linq;
 
 namespace Docfx.DataContracts.Common;
@@ -18,6 +21,23 @@ public static T Convert<T>(object obj)
         {
             return jToken.ToObject<T>();
         }
+
+
+        var type = typeof(T);
+
+        // Try to convert `List<object>` to T (`ObjectToInferredTypesConverter`)
+        // Currently `ObjectToInferredTypesConverter` convert item to List<object>. So it need to convert type.
+        if (obj is List<object> list
+         && type.GetTypeInfo().IsGenericType
+         && type.GetGenericTypeDefinition() == typeof(List<>))
+        {
+            // TODO: performance optimization.
+            var json = JsonUtility.Serialize(list);
+            var result = JsonUtility.Deserialize<T>(new StringReader(json));
+            return result;
+        }
+
+
         throw new InvalidCastException();
     }
 }
diff --git a/src/Docfx.DataContracts.Common/ReferenceViewModel.cs b/src/Docfx.DataContracts.Common/ReferenceViewModel.cs
@@ -86,17 +86,27 @@ public class ReferenceViewModel
     [YamlIgnore]
     [Newtonsoft.Json.JsonExtensionData]
     [System.Text.Json.Serialization.JsonExtensionData]
+    [System.Text.Json.Serialization.JsonInclude]
     [UniqueIdentityReferenceIgnore]
     [MarkdownContentIgnore]
-    public CompositeDictionary AdditionalJson =>
-        CompositeDictionary
+    public CompositeDictionary AdditionalJson
+    {
+        get
+        {
+            return CompositeDictionary
             .CreateBuilder()
             .Add(Constants.ExtensionMemberPrefix.Name, NameInDevLangs, JTokenConverter.Convert<string>)
             .Add(Constants.ExtensionMemberPrefix.NameWithType, NameWithTypeInDevLangs, JTokenConverter.Convert<string>)
             .Add(Constants.ExtensionMemberPrefix.FullName, FullNameInDevLangs, JTokenConverter.Convert<string>)
             .Add(Constants.ExtensionMemberPrefix.Spec, Specs, JTokenConverter.Convert<List<SpecViewModel>>)
             .Add(string.Empty, Additional)
             .Create();
+        }
+        private init
+        {
+            // init or getter is required for deserialize data with System.Text.Json.
+        }
+    }
 
     public ReferenceViewModel Clone()
     {

diff --git a/src/Docfx.Dotnet/ManagedReference/Models/ItemViewModel.cs b/src/Docfx.Dotnet/ManagedReference/Models/ItemViewModel.cs
@@ -378,14 +378,24 @@ public string FullNameForVB
     [YamlIgnore]
     [Newtonsoft.Json.JsonExtensionData]
     [System.Text.Json.Serialization.JsonExtensionData]
+    [System.Text.Json.Serialization.JsonInclude]
     [UniqueIdentityReferenceIgnore]
     [MarkdownContentIgnore]
-    public IDictionary<string, object> ExtensionData =>
-        CompositeDictionary
+    public IDictionary<string, object> ExtensionData
+    {
+        get
+        {
+            return CompositeDictionary
             .CreateBuilder()
             .Add(Constants.ExtensionMemberPrefix.Name, Names, JTokenConverter.Convert<string>)
             .Add(Constants.ExtensionMemberPrefix.NameWithType, NamesWithType, JTokenConverter.Convert<string>)
             .Add(Constants.ExtensionMemberPrefix.FullName, FullNames, JTokenConverter.Convert<string>)
             .Add(string.Empty, Metadata)
             .Create();
+        }
+        private init
+        {
+            // init or getter is required for deserialize data with System.Text.Json.
+        }
+    }
 }
diff --git a/src/Docfx.Dotnet/ManagedReference/Models/SyntaxDetailViewModel.cs b/src/Docfx.Dotnet/ManagedReference/Models/SyntaxDetailViewModel.cs
@@ -89,11 +89,21 @@ public string ContentForVB
     [YamlIgnore]
     [Newtonsoft.Json.JsonExtensionData]
     [System.Text.Json.Serialization.JsonExtensionData]
+    [System.Text.Json.Serialization.JsonInclude]
     [UniqueIdentityReferenceIgnore]
     [MarkdownContentIgnore]
-    public IDictionary<string, object> ExtensionData =>
-        CompositeDictionary
+    public IDictionary<string, object> ExtensionData
+    {
+        get
+        {
+            return CompositeDictionary
             .CreateBuilder()
             .Add(Constants.ExtensionMemberPrefix.Content, Contents, JTokenConverter.Convert<string>)
             .Create();
+        }
+        private init
+        {
+            // init or getter is required for deserialize data with System.Text.Json.
+        }
+    }
 }
diff --git a/test/docfx.Tests/Api.verified.cs b/test/docfx.Tests/Api.verified.cs
@@ -2503,6 +2503,7 @@ public ReferenceViewModel() { }
         [Docfx.DataContracts.Common.UniqueIdentityReferenceIgnore]
         [Newtonsoft.Json.JsonExtensionData]
         [System.Text.Json.Serialization.JsonExtensionData]
+        [System.Text.Json.Serialization.JsonInclude]
         [YamlDotNet.Serialization.YamlIgnore]
         public Docfx.Common.CompositeDictionary AdditionalJson { get; }
         [Newtonsoft.Json.JsonProperty("commentId")]
@@ -2877,6 +2878,7 @@ public ItemViewModel() { }
         [Docfx.DataContracts.Common.UniqueIdentityReferenceIgnore]
         [Newtonsoft.Json.JsonExtensionData]
         [System.Text.Json.Serialization.JsonExtensionData]
+        [System.Text.Json.Serialization.JsonInclude]
         [YamlDotNet.Serialization.YamlIgnore]
         public System.Collections.Generic.IDictionary<string, object> ExtensionData { get; }
         [Docfx.Common.EntityMergers.MergeOption(Docfx.Common.EntityMergers.MergeOption.Ignore)]
@@ -3152,6 +3154,7 @@ public SyntaxDetailViewModel() { }
         [Docfx.DataContracts.Common.UniqueIdentityReferenceIgnore]
         [Newtonsoft.Json.JsonExtensionData]
         [System.Text.Json.Serialization.JsonExtensionData]
+        [System.Text.Json.Serialization.JsonInclude]
         [YamlDotNet.Serialization.YamlIgnore]
         public System.Collections.Generic.IDictionary<string, object> ExtensionData { get; }
         [Newtonsoft.Json.JsonProperty("parameters")]