Use JSON PolymorphismOptions

usercode · Dec 22, 2022 · d749436 · d749436
1 parent 1049c04
commit d749436
Show file tree

Hide file tree

Showing 36 changed files with 172 additions and 171 deletions.
diff --git a/src/DragonFly.API.Client/DragonFly.API.Client.csproj b/src/DragonFly.API.Client/DragonFly.API.Client.csproj
@@ -15,6 +15,10 @@
     <MinVerTagPrefix>v</MinVerTagPrefix>
   </PropertyGroup>
 
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>

diff --git a/src/DragonFly.API.Client/DragonFlyBuilderExtensions.cs b/src/DragonFly.API.Client/DragonFlyBuilderExtensions.cs
@@ -0,0 +1,28 @@
+// Copyright (c) usercode
+// https://github.com/usercode/DragonFly
+// MIT License
+
+using DragonFly.Builders;
+using DragonFly.API.Exports.Json;
+using DragonFly.Core.ContentStructures;
+using DragonFly.Storage;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace DragonFly.Client;
+
+public static class StartupExtensions
+{
+    public static IDragonFlyBuilder AddRestApi(this IDragonFlyBuilder builder)
+    {
+        builder.Services.AddTransient<ClientContentService>();
+        builder.Services.AddTransient<IContentStorage, ClientContentService>();
+        builder.Services.AddTransient<IStructureStorage, ClientContentService>();
+        builder.Services.AddTransient<IWebHookStorage, ClientContentService>();
+        builder.Services.AddTransient<IAssetStorage, ClientContentService>();
+        builder.Services.AddTransient<IAssetFolderStorage, ClientContentService>();
+
+        builder.PostInit<JsonDerivedTypesAction>();
+
+        return builder;
+    }
+}
diff --git a/src/DragonFly.API.Exports/ContentItems/RestContentFields.cs b/src/DragonFly.API.Exports/ContentItems/RestContentFields.cs
@@ -8,7 +8,7 @@ namespace DragonFly.Content;
 /// <summary>
 /// ContentField
 /// </summary>
-public class RestContentFields : Dictionary<string, JsonNode>
+public class RestContentFields : Dictionary<string, JsonNode?>
 {
     public RestContentFields()
     {

diff --git a/src/DragonFly.API.Exports/ContentItems/RestContentItemConverter.cs b/src/DragonFly.API.Exports/ContentItems/RestContentItemConverter.cs
@@ -28,10 +28,12 @@ public static ContentItem ToModel(this RestContentItem restContentItem, ContentS
             {
                 RestContentSchema? restSchema = restContentItem.Schema.Deserialize<RestContentSchema>();
 
-                if (restSchema != null)
+                if (restSchema == null)
                 {
-                    schema = restSchema.ToModel();
+                    throw new Exception("Unknown schema");
                 }
+
+                schema = restSchema.ToModel();
             }
         }
 

diff --git a/src/DragonFly.API.Exports/DragonFly.API.Exports.csproj b/src/DragonFly.API.Exports/DragonFly.API.Exports.csproj
@@ -15,6 +15,10 @@
     <MinVerTagPrefix>v</MinVerTagPrefix>
   </PropertyGroup>
 
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>  

diff --git a/src/DragonFly.API.Exports/Json/Converters/ArrayOptionJsonConverter.cs b/src/DragonFly.API.Exports/Json/Converters/ArrayOptionJsonConverter.cs
diff --git a/src/DragonFly.API.Exports/Json/Converters/QueryFieldJsonConverter.cs b/src/DragonFly.API.Exports/Json/Converters/QueryFieldJsonConverter.cs
diff --git a/src/DragonFly.API.Exports/Json/JsonDerivedTypesAction.cs b/src/DragonFly.API.Exports/Json/JsonDerivedTypesAction.cs
@@ -0,0 +1,47 @@
+// Copyright (c) usercode
+// https://github.com/usercode/DragonFly
+// MIT License
+
+using System.Text.Json.Serialization.Metadata;
+using DragonFly.AspNetCore.API.Exports.Json;
+using DragonFly.Query;
+
+namespace DragonFly.API.Exports.Json;
+
+public class JsonDerivedTypesAction : IPostInitialize
+{
+    public async Task ExecuteAsync(IDragonFlyApi api)
+    {
+        JsonPolymorphismOptions optionsDerivedTypes = new JsonPolymorphismOptions();
+
+        foreach (Type type in api.ContentField().GetAllOptionsTypes())
+        {
+            optionsDerivedTypes.DerivedTypes.Add(new JsonDerivedType(type, type.Name));
+        }
+
+        JsonPolymorphismOptions queryDerivedTypes = new JsonPolymorphismOptions();
+
+        foreach (Type type in api.ContentField().GetAllQueryTypes())
+        {
+            queryDerivedTypes.DerivedTypes.Add(new JsonDerivedType(type, type.Name));
+        }
+
+        JsonSerializerDefault.Options.TypeInfoResolver = new DefaultJsonTypeInfoResolver()
+        {
+            Modifiers =
+            {
+                (JsonTypeInfo typeInfo) =>
+                {
+                    if (typeInfo.Type == typeof(ContentFieldOptions))
+                    {
+                        typeInfo.PolymorphismOptions = optionsDerivedTypes;
+                    }
+                    else if (typeInfo.Type == typeof(FieldQuery))
+                    {
+                        typeInfo.PolymorphismOptions = queryDerivedTypes;
+                    }
+                }
+            }
+        };
+    }
+}
diff --git a/src/DragonFly.API.Exports/Json/JsonSerializerDefault.cs b/src/DragonFly.API.Exports/Json/JsonSerializerDefault.cs
@@ -2,18 +2,13 @@
 // https://github.com/usercode/DragonFly
 // MIT License
 
-using DragonFly.Core.Json;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace DragonFly.AspNetCore.API.Exports.Json;
 
 public class JsonSerializerDefault
 {
-    public JsonSerializerDefault()
-    {
-    }
-
     private static JsonSerializerOptions? _options;
 
     public static JsonSerializerOptions Options
@@ -24,8 +19,6 @@ public static JsonSerializerOptions Options
             {
                 _options = new JsonSerializerOptions();
                 _options.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
-                _options.Converters.Add(new ArrayOptionJsonConverter());
-                _options.Converters.Add(new QueryFieldJsonConverter());
             }
 
             return _options;

diff --git a/src/DragonFly.API/StartupExtensions.cs → ...agonFly.API/DragonFlyBuilderExtensions.cs b/src/DragonFly.API/StartupExtensions.cs → ...agonFly.API/DragonFlyBuilderExtensions.cs
@@ -7,29 +7,29 @@
 using DragonFly.AspNetCore.API.Middlewares.Assets;
 using DragonFly.AspNetCore.API.Middlewares.ContentSchemas;
 using DragonFly.Builders;
-using Microsoft.Extensions.DependencyInjection;
 using DragonFly.AspNetCore.API.Middlewares.ContentStructures;
 using DragonFly.AspNetCore.Middleware;
-using Microsoft.AspNetCore.Http.Json;
-using DragonFly.AspNetCore.API.Exports.Json;
-using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
+using DragonFly.API.Exports.Json;
+using Microsoft.AspNetCore.Http.Json;
+using Microsoft.Extensions.DependencyInjection;
+using System.Text.Json.Serialization;
+using DragonFly.AspNetCore.API.Exports.Json;
 
 namespace DragonFly.AspNetCore;
 
-public static class StartupExtensions
+public static class DragonFlyBuilderExtensions
 {
     public static IDragonFlyBuilder AddRestApi(this IDragonFlyBuilder builder)
     {
         builder.Services.Configure<JsonOptions>(opt =>
         {
-            foreach (JsonConverter converter in JsonSerializerDefault.Options.Converters)
-            {
-                opt.SerializerOptions.Converters.Add(converter);
-            }
+            opt.SerializerOptions.TypeInfoResolver = JsonSerializerDefault.Options.TypeInfoResolver;
         });
 
+        builder.PostInit<JsonDerivedTypesAction>();
+
         return builder;
     }
 

diff --git a/src/DragonFly.ApiKeys.Razor/DragonFly.ApiKeys.Razor.csproj b/src/DragonFly.ApiKeys.Razor/DragonFly.ApiKeys.Razor.csproj
@@ -14,6 +14,10 @@
     <MinVerTagPrefix>v</MinVerTagPrefix>
   </PropertyGroup>
 
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>

diff --git a/src/DragonFly.ApiKeys.Razor/DragonFlyBuilderExtensions.cs b/src/DragonFly.ApiKeys.Razor/DragonFlyBuilderExtensions.cs
@@ -7,8 +7,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using DragonFLy.ApiKeys;
 using DragonFly.ApiKeys.Razor.Services;
+using DragonFly.ApiKeys.Razor;
 
-namespace DragonFly.ApiKeys.Razor;
+namespace DragonFly.Client;
 
 public static class DragonFlyBuilderExtensions
 {

diff --git a/src/DragonFly.ApiKeys/DragonFly.ApiKeys.csproj b/src/DragonFly.ApiKeys/DragonFly.ApiKeys.csproj
@@ -13,7 +13,11 @@
 	  <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <MinVerTagPrefix>v</MinVerTagPrefix>
   </PropertyGroup>
-
+
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>

diff --git a/src/DragonFly.App.Client/DragonFly.App.Client.csproj b/src/DragonFly.App.Client/DragonFly.App.Client.csproj
@@ -3,7 +3,7 @@
 	<TargetFramework>net7.0</TargetFramework>
 	<RunAOTCompilation>false</RunAOTCompilation>
   </PropertyGroup>
-
+  
   <ItemGroup>
 	  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.1" />
 	  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.1" />

diff --git a/src/DragonFly.App.Client/Program.cs b/src/DragonFly.App.Client/Program.cs
@@ -2,25 +2,22 @@
 // https://github.com/usercode/DragonFly
 // MIT License
 
-using DragonFly.ApiKeys.Razor;
-using DragonFly.AspNetCore.Identity.Razor;
-using DragonFly.Client.Core;
-using DragonFly.BlockField.Razor;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using DragonFly.Client;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<DragonFly.App.Client.App>("app");
 builder.RootComponents.Add<HeadOutlet>("head::after");
 
 builder.AddDragonFlyClient()
+            .AddRestApi()
             .AddBlockField()
             .AddIdentity()
-            .AddApiKeys()
+            .AddApiKeys()            
             ;
 
 WebAssemblyHost build = builder.Build();
 
-build.UseDragonFlyClient();
-
+await build.UseDragonFlyClient();
 await build.RunAsync();
diff --git a/src/DragonFly.App.Server/DragonFly.App.Server.csproj b/src/DragonFly.App.Server/DragonFly.App.Server.csproj
@@ -17,9 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DragonFly.ApiKeys.AspNetCore\DragonFly.ApiKeys.AspNetCore.csproj" />
-    <ProjectReference Include="..\DragonFly.API\DragonFly.API.csproj" />
     <ProjectReference Include="..\DragonFly.App.Client\DragonFly.App.Client.csproj" />
+    <ProjectReference Include="..\DragonFly.ApiKeys.AspNetCore\DragonFly.ApiKeys.AspNetCore.csproj" />
+    <ProjectReference Include="..\DragonFly.API\DragonFly.API.csproj" />    
     <ProjectReference Include="..\DragonFly.AspNetCore\DragonFly.AspNetCore.csproj" />
     <ProjectReference Include="..\DragonFly.BlockField.AspNetCore\DragonFly.BlockField.AspNetCore.csproj" />
     <ProjectReference Include="..\DragonFly.Core\DragonFly.Core.csproj" />

diff --git a/src/DragonFly.App.Server/Program.cs b/src/DragonFly.App.Server/Program.cs
@@ -71,4 +71,5 @@
 app.UseDragonFlyManager();
 app.UseSwagger();
 app.UseSwaggerUI();
+app.UseRouting();
 app.Run();
diff --git a/src/DragonFly.AspNetCore/DragonFly.AspNetCore.csproj b/src/DragonFly.AspNetCore/DragonFly.AspNetCore.csproj
@@ -31,7 +31,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DragonFly.API.Client\DragonFly.API.Client.csproj" />
     <ProjectReference Include="..\DragonFly.Core\DragonFly.Core.csproj" />
   </ItemGroup>
 

diff --git a/src/DragonFly.BlockField.Razor/DragonFly.BlockField.Razor.csproj b/src/DragonFly.BlockField.Razor/DragonFly.BlockField.Razor.csproj
@@ -14,6 +14,10 @@
     <MinVerTagPrefix>v</MinVerTagPrefix>
   </PropertyGroup>
 
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>