feat: Added ModelStyle setting.

tryAGI · Dec 6, 2023 · eef7188 · eef7188
1 parent 7f4f7a1
commit eef7188
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 4 deletions.
diff --git a/src/libs/OpenApiGenerator/Models/Model.cs b/src/libs/OpenApiGenerator/Models/Model.cs
@@ -3,4 +3,5 @@
 namespace OpenApiGenerator.Models;
 
 internal readonly record struct Model(
+    ModelStyle Style,
     EquatableArray<Property> Properties);
diff --git a/src/libs/OpenApiGenerator/Models/ModelStyle.cs b/src/libs/OpenApiGenerator/Models/ModelStyle.cs
@@ -0,0 +1,8 @@
+namespace OpenApiGenerator.Models;
+
+internal enum ModelStyle
+{
+    Class,
+    Record,
+    ReadonlyRecordStruct,
+}
diff --git a/src/libs/OpenApiGenerator/Models/Settings.cs b/src/libs/OpenApiGenerator/Models/Settings.cs
@@ -3,4 +3,7 @@ namespace OpenApiGenerator.Models;
 internal readonly record struct Settings(
     string TargetFramework,
     string Namespace,
-    bool UseNSwag);
+    bool UseNSwag,
+
+    bool GenerateModels,
+    ModelStyle ModelStyle);
diff --git a/src/libs/OpenApiGenerator/OpenApiGenerator.props b/src/libs/OpenApiGenerator/OpenApiGenerator.props
@@ -12,16 +12,26 @@
     <!-- Used as default TargetFramework if OpenApiGenerator_TargetFramework is not specified -->
     <CompilerVisibleProperty Include="TargetFramework"/>
 
+    <!-- Namespace. Default: $(TargetFramework) or "netstandard2.0" -->
     <CompilerVisibleProperty Include="OpenApiGenerator_TargetFramework"/>
+    <!-- Namespace. Default: $(PackageId) or $(AssemblyName) or "OpenApiGenerator" -->
     <CompilerVisibleProperty Include="OpenApiGenerator_Namespace"/>
+    <!-- true/false. Default: false -->
     <CompilerVisibleProperty Include="OpenApiGenerator_UseCache"/>
+    <!-- true/false. Default: false -->
     <CompilerVisibleProperty Include="OpenApiGenerator_UseNSwag"/>
-    <CompilerVisibleProperty Include="OpenApiGenerator_Models_Generate"/>
+
+    <!-- true/false. Default: false -->
+    <CompilerVisibleProperty Include="OpenApiGenerator_GenerateModels"/>
+    <!-- Class/Record/ReadonlyRecordStruct. Default: Class -->
+    <CompilerVisibleProperty Include="OpenApiGenerator_ModelStyle"/>
+
+    <!-- true/false. Default: false -->
     <CompilerVisibleProperty Include="OpenApiGenerator_GenerateSdk"/>
   </ItemGroup>
 
   <ItemGroup>
-    <AdditionalFiles Include="**\*.yaml" GenerateModels="true" />
+    <AdditionalFiles Include="**\*.yaml" />
   </ItemGroup>
 
 </Project>
diff --git a/src/libs/OpenApiGenerator/OptionsExtensions.cs b/src/libs/OpenApiGenerator/OptionsExtensions.cs
@@ -20,7 +20,19 @@ public static IncrementalValueProvider<Settings> DetectSettings(
                            options.GetGlobalOption("PackageId") ??
                            options.GetGlobalOption("AssemblyName") ??
                            prefix,
-                UseNSwag: bool.Parse(options.GetGlobalOption("UseNSwag", prefix) ?? bool.FalseString)
+                UseNSwag: bool.TryParse(
+                    options.GetGlobalOption("UseNSwag", prefix),
+                    out var useNSwag) && useNSwag,
+
+                GenerateModels: bool.TryParse(
+                    options.GetGlobalOption(nameof(Settings.GenerateModels), prefix),
+                    out var generateModels) && generateModels,
+                ModelStyle: Enum.TryParse<ModelStyle>(
+                    options.GetGlobalOption(nameof(Settings.ModelStyle), prefix) ??
+                        $"{default(ModelStyle):G}",
+                    ignoreCase: true,
+                    out var modelStyle) ? modelStyle : default
+
                 ));
     }
 }