fix: Improved enum/boolean detection for some cases.

tryAGI · Aug 28, 2024 · 8c0300f · 8c0300f
1 parent 4826f63
commit 8c0300f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/libs/OpenApiGenerator.Core/Extensions/OpenApiSchemaExtensions.cs b/src/libs/OpenApiGenerator.Core/Extensions/OpenApiSchemaExtensions.cs
@@ -1,3 +1,4 @@
+using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 
 namespace OpenApiGenerator.Core.Extensions;
@@ -47,7 +48,16 @@ public static bool IsEnum(
  {
  schema = schema ?? throw new ArgumentNullException(nameof(schema));
 
- return schema.Type == "string" && schema.Enum.Any();
+ return schema.Enum.Any() && schema.Type is "string" or null;
+ }
+
+ public static bool IsBoolean(
+ this OpenApiSchema schema)
+ {
+ schema = schema ?? throw new ArgumentNullException(nameof(schema));
+
+ return schema.Type == "boolean" ||
+ schema.Default is OpenApiBoolean;
  }
 
  public static bool IsBase64(

diff --git a/src/libs/OpenApiGenerator.Core/Models/SchemaContext.cs b/src/libs/OpenApiGenerator.Core/Models/SchemaContext.cs
@@ -120,7 +120,7 @@ private static string ComputeType(OpenApiSchema schema)
  {
  return "class";
  }
- if (schema.Type == "boolean")
+ if (schema.IsBoolean())
  {
  return "bool";
  }

diff --git a/src/libs/OpenApiGenerator.Core/Models/TypeData.cs b/src/libs/OpenApiGenerator.Core/Models/TypeData.cs
@@ -213,7 +213,7 @@ public static string GetCSharpType(SchemaContext context, SchemaContext? additio
  ("array", _) =>
  ($"{context.Children.FirstOrDefault(x => x.Hint == Hint.ArrayItem)?.TypeData?.CSharpTypeWithoutNullability}".AsArray(), true),
 
- (null, null) when context.IsClass =>
+ (null, null) when context.IsClass || context.IsEnum =>
  ($"global::{context.Settings.Namespace}.{context.Id}", true),
  (null, null) => ("object", true),
  ("null", _) => ("object", true),