Try to fix JSON schema generation

RedpointGames · Nov 23, 2024 · 45512dd · 45512dd
1 parent 51cdc9b
commit 45512dd
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/UET/uet/Commands/Internal/GenerateJsonSchema/DefaultJsonSchemaGenerator.cs b/UET/uet/Commands/Internal/GenerateJsonSchema/DefaultJsonSchemaGenerator.cs
@@ -105,9 +105,12 @@ private static string ProcessSummary(XmlNode summary)
 
         private void GenerateSchemaForObject(Utf8JsonWriter writer, JsonTypeInfo jsonTypeInfo, JsonSerializerContext jsonTypeInfoResolver)
         {
+            var isDynamicObject = jsonTypeInfo.Type.IsConstructedGenericType &&
+                (jsonTypeInfo.Type.GetGenericTypeDefinition() == typeof(BuildConfigDynamic<,>) ||
+                 jsonTypeInfo.Type.GetGenericTypeDefinition() == typeof(BuildConfigPredefinedDynamic<,,>));
+
             var properties = jsonTypeInfo.Properties;
-            if (jsonTypeInfo.Type.IsConstructedGenericType &&
-                jsonTypeInfo.Type.GetGenericTypeDefinition() == typeof(BuildConfigDynamic<,>))
+            if (isDynamicObject)
             {
                 // Exclude dynamically driven properties for BuildConfigDynamic.
                 properties = properties.Where(x => x.Name != "DynamicSettings" && x.Name != "Type").ToList();
@@ -147,8 +150,7 @@ private void GenerateSchemaForObject(Utf8JsonWriter writer, JsonTypeInfo jsonTyp
                 properties);
 
             // Write out all the possible values of Type.
-            if (jsonTypeInfo.Type.IsConstructedGenericType &&
-                jsonTypeInfo.Type.GetGenericTypeDefinition() == typeof(BuildConfigDynamic<,>))
+            if (isDynamicObject)
             {
                 var dynamicProviderType = typeof(IDynamicProvider<,>)
                     .MakeGenericType(jsonTypeInfo.Type.GetGenericArguments());
@@ -246,8 +248,7 @@ private void GenerateSchemaForObject(Utf8JsonWriter writer, JsonTypeInfo jsonTyp
                 }
                 writer.WriteEndArray();
             }
-            else if (jsonTypeInfo.Type.IsConstructedGenericType &&
-                jsonTypeInfo.Type.GetGenericTypeDefinition() == typeof(BuildConfigDynamic<,>))
+            else if (isDynamicObject)
             {
                 writer.WritePropertyName("allOf");
                 writer.WriteStartArray();