Fix two small bugs.

Qowaiv · Jul 12, 2024 · 5547655 · 5547655
1 parent aeb751b
commit 5547655
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/src/Qowaiv.CodeGeneration.OpenApi/OpenApiTypeResolver.ResolveType.cs b/src/Qowaiv.CodeGeneration.OpenApi/OpenApiTypeResolver.ResolveType.cs
@@ -116,7 +116,6 @@ static bool IsNone(EnumerationField field)
     [Pure]
     private Type? ResolveNumber(ResolveOpenApiSchema schema) => NormalizeFormat(schema.Format) switch
     {
-        "DOUBLE" => typeof(double),
         "INT16" => typeof(short),
         "INT32" => typeof(int),
         "INT64" => typeof(long),

diff --git a/src/Qowaiv.CodeGeneration.OpenApi/OpenApiTypeResolver.cs b/src/Qowaiv.CodeGeneration.OpenApi/OpenApiTypeResolver.cs
@@ -15,7 +15,7 @@ public partial class OpenApiTypeResolver(
     private readonly OpenApiTypeResolverSettings Settings = settings ?? new OpenApiTypeResolverSettings();
 
     /// <remarks>
-    /// Types that are null-able by design will not be transformed to 
+    /// Types that are null-able by design will not be transformed to
     /// <see cref="Nullable{T}"/>'s when optional.
     /// </remarks>
     [Pure]
@@ -27,7 +27,10 @@ protected virtual bool IsNullableByDesign(Type type)
     private static bool HasNoneOrEmptyField(Type type)
         => Array.Exists(
             array: type.GetFields(BindingFlags.Static | BindingFlags.Public),
-            match: f => f.FieldType == type && (f.Name == "Empty" || f.Name == "None"));
+            match: f => f.FieldType == type && (f.Name == "Empty" || f.Name == "None"))
+        || Array.Exists(
+            array: type.GetProperties(BindingFlags.Static | BindingFlags.Public),
+            match: p => p.PropertyType == type && (p.Name == "Empty" || p.Name == "None"));
 
     [Pure]
     protected virtual EnumerationField ResolveEnumField(OpenApiString @enum, Enumeration type)

diff --git a/src/Qowaiv.CodeGeneration.OpenApi/OpenApiTypeResolverSettings.cs b/src/Qowaiv.CodeGeneration.OpenApi/OpenApiTypeResolverSettings.cs
@@ -21,7 +21,7 @@ public class OpenApiTypeResolverSettings
     /// <summary>Property required type (default is <see cref="RequiredTypes.IsRequired"/>).</summary>
     public RequiredTypes RequiredType { get; init; } = RequiredTypes.IsRequired;
 
-    /// <summary>Indicates that all properties that hare value types should be nullable (default is false).</summary>
+    /// <summary>Indicates that all properties that are value types should be nullable (default is false).</summary>
     /// <remarks>
     /// Value types like <see cref="Guid"/> and <see cref="EmailAddress"/> that
     /// nullable by design are excluded from this setting.

diff --git a/src/Qowaiv.CodeGeneration.OpenApi/Qowaiv.CodeGeneration.OpenApi.csproj b/src/Qowaiv.CodeGeneration.OpenApi/Qowaiv.CodeGeneration.OpenApi.csproj
@@ -8,7 +8,7 @@
 
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <Version>0.0.1-alpha-015</Version>
+    <Version>0.0.1-alpha-016</Version>
     <PackageId>Qowaiv.CodeGeneration.OpenApi</PackageId>
     <PackageReleaseNotes>
 ToBeReleased

diff --git a/src/Qowaiv.CodeGeneration/CSharpWriter.cs b/src/Qowaiv.CodeGeneration/CSharpWriter.cs
@@ -1,4 +1,5 @@
 using Qowaiv.CodeGeneration.Syntax;
+using Qowaiv.Reflection;
 using System.IO;
 
 namespace Qowaiv.CodeGeneration;
@@ -83,7 +84,8 @@ public CSharpWriter Write(IEnumerable<Action<CSharpWriter>> writes, Action<CShar
     public CSharpWriter Write(Type type, bool attribute)
     {
         Guard.NotNull(type);
-        var name = type.ToCSharpString(withNamespace: !Settings.GlobalUsings.Contains(type.Namespace!));
+        var withoutNamespace = Settings.GlobalUsings.Contains(QowaivType.GetNotNullableType(type).Namespace!);
+        var name = type.ToCSharpString(!withoutNamespace);
         return attribute && name.EndsWith("Attribute")
             ? Write(name[..^9])
             : Write(name);

diff --git a/src/Qowaiv.CodeGeneration/Qowaiv.CodeGeneration.csproj b/src/Qowaiv.CodeGeneration/Qowaiv.CodeGeneration.csproj
@@ -8,7 +8,7 @@
 
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <Version>0.0.1-alpha-015</Version>
+    <Version>0.0.1-alpha-016</Version>
     <PackageId>Qowaiv.CodeGeneration</PackageId>
     <PackageReleaseNotes>
 ToBeReleased