feat: Added GroupByTags setting.

tryAGI · May 23, 2024 · 49cde92 · 49cde92
1 parent 1724a36
commit 49cde92
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 1 deletion.
diff --git a/src/libs/Directory.Build.props b/src/libs/Directory.Build.props
@@ -39,7 +39,7 @@
   </ItemGroup>
 
   <PropertyGroup Label="Versioning">
-    <Version>0.7.1</Version>
+    <Version>0.7.2</Version>
     <MinVerMinimumMajorMinor>0.1</MinVerMinimumMajorMinor>
     <MinVerTagPrefix>v</MinVerTagPrefix>
     <MinVerDefaultPreReleaseIdentifiers>dev</MinVerDefaultPreReleaseIdentifiers>

diff --git a/src/libs/OpenApiGenerator.Cli/Commands/GenerateCommand.cs b/src/libs/OpenApiGenerator.Cli/Commands/GenerateCommand.cs
@@ -73,6 +73,7 @@ private static async Task HandleAsync(
             JsonSerializerType: default,
             UseRequiredKeyword: default,
             GenerateConstructors: false,
+            GroupByTags: false,
             GenerateMethods: false,
             MethodNamingConvention: default,
             MethodNamingConventionFallback: MethodNamingConvention.MethodAndPath,

diff --git a/src/libs/OpenApiGenerator.Core/Generation/Data.Methods.cs b/src/libs/OpenApiGenerator.Core/Generation/Data.Methods.cs
@@ -69,6 +69,25 @@ public static ImmutableArray<EndPoint> PrepareData(
                 Summary: string.Empty,
                 RequestType: string.Empty,
                 ResponseType: string.Empty)] : [];
+        if (settings.GroupByTags && (settings.GenerateSdk || settings.GenerateConstructors))
+        {
+            constructors = constructors.Concat(openApiDocument.Tags.Select(x => new EndPoint(
+                Id: "Constructors",
+                Namespace: settings.Namespace,
+                ClassName: x.Name.ToPropertyName(),
+                BaseUrl: openApiDocument.Servers.FirstOrDefault()?.Url ?? string.Empty,
+                Stream: false,
+                Path: string.Empty,
+                AuthorizationScheme: string.Empty,
+                Properties: ImmutableArray<PropertyData>.Empty,
+                TargetFramework: settings.TargetFramework,
+                JsonSerializerType: settings.JsonSerializerType,
+                JsonSerializerContext: settings.JsonSerializerContext,
+                HttpMethod: OperationType.Get,
+                Summary: string.Empty,
+                RequestType: string.Empty,
+                ResponseType: string.Empty))).ToArray();
+        }
 
         return [
             ..operations,

diff --git a/src/libs/OpenApiGenerator.Core/Models/Settings.cs b/src/libs/OpenApiGenerator.Core/Models/Settings.cs
@@ -13,6 +13,7 @@ public readonly record struct Settings(
     SdkFeatureUsage UseRequiredKeyword,
 
     bool GenerateConstructors,
+    bool GroupByTags,
     bool GenerateMethods,
     MethodNamingConvention MethodNamingConvention,
     MethodNamingConvention MethodNamingConventionFallback,

diff --git a/src/libs/OpenApiGenerator/OpenApiGenerator.props b/src/libs/OpenApiGenerator/OpenApiGenerator.props
@@ -29,6 +29,8 @@
     <!-- true/false. Default: false -->
     <CompilerVisibleProperty Include="OpenApiGenerator_GenerateConstructors"/>
     <!-- true/false. Default: false -->
+    <CompilerVisibleProperty Include="OpenApiGenerator_GroupByTags"/>
+    <!-- true/false. Default: false -->
     <CompilerVisibleProperty Include="OpenApiGenerator_GenerateMethods"/>
     <!-- SimpleOperationId/MethodAndPath/OperationIdWithDots. Default: SimpleOperationId -->
     <CompilerVisibleProperty Include="OpenApiGenerator_MethodNamingConvention"/>

diff --git a/src/libs/OpenApiGenerator/OptionsExtensions.cs b/src/libs/OpenApiGenerator/OptionsExtensions.cs
@@ -32,6 +32,7 @@ public static Settings GetSettings(
             UseRequiredKeyword: options.GetEnumGlobalOption<SdkFeatureUsage>(nameof(Settings.UseRequiredKeyword), prefix),
 
             GenerateConstructors: options.GetBoolGlobalOption(nameof(Settings.GenerateConstructors), prefix),
+            GroupByTags: options.GetBoolGlobalOption(nameof(Settings.GroupByTags), prefix),
             GenerateMethods: options.GetBoolGlobalOption(nameof(Settings.GenerateMethods), prefix),
             MethodNamingConvention: options.GetEnumGlobalOption<MethodNamingConvention>(nameof(Settings.MethodNamingConvention), prefix),
             MethodNamingConventionFallback: options.GetEnumGlobalOption(nameof(Settings.MethodNamingConventionFallback), prefix, defaultValue: MethodNamingConvention.MethodAndPath),

diff --git a/src/tests/OpenApiGenerator.UnitTests/CacheTests.cs b/src/tests/OpenApiGenerator.UnitTests/CacheTests.cs
@@ -15,6 +15,7 @@ public class CacheTests
         JsonSerializerType: default,
         UseRequiredKeyword: default,
         GenerateConstructors: false,
+        GroupByTags: false,
         GenerateMethods: false,
         MethodNamingConvention: default,
         MethodNamingConventionFallback: MethodNamingConvention.MethodAndPath,

diff --git a/src/tests/OpenApiGenerator.UnitTests/ClientTests.cs b/src/tests/OpenApiGenerator.UnitTests/ClientTests.cs
@@ -18,6 +18,7 @@ public class ClientTests :
         JsonSerializerType: default,
         UseRequiredKeyword: default,
         GenerateConstructors: false,
+        GroupByTags: false,
         GenerateMethods: false,
         MethodNamingConvention: default,
         MethodNamingConventionFallback: MethodNamingConvention.MethodAndPath,

diff --git a/src/tests/OpenApiGenerator.UnitTests/ModelTests.cs b/src/tests/OpenApiGenerator.UnitTests/ModelTests.cs
@@ -18,6 +18,7 @@ public class ModelTests :
         JsonSerializerType: default,
         UseRequiredKeyword: default,
         GenerateConstructors: false,
+        GroupByTags: false,
         GenerateMethods: false,
         MethodNamingConvention: default,
         MethodNamingConventionFallback: MethodNamingConvention.MethodAndPath,