.

mattiasnordqvist · Nov 10, 2024 · d00de3f · d00de3f
1 parent 1b9daf3
commit d00de3f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 234 deletions.
diff --git a/.../Mapper.FartingUnicorn.Tests.SingleField.BoolType.NullableNonOptional_Tests.BlogPost.g.cs b/.../Mapper.FartingUnicorn.Tests.SingleField.BoolType.NullableNonOptional_Tests.BlogPost.g.cs
@@ -24,11 +24,19 @@ public static partial class Mappers
         var isIsDraftPropertyDefined = jsonElement.TryGetProperty("IsDraft", out var jsonIsDraftProperty);
         if (isIsDraftPropertyDefined)
         {
-            // type = Nullable, isOption = False, isNullable = True
+            // type = Boolean, isOption = False, isNullable = True
             if (jsonIsDraftProperty.ValueKind == JsonValueKind.Null)
             {
                 errors.Add(new RequiredValueMissingError([.. path, "IsDraft"]));
             }
+            else if (jsonIsDraftProperty.ValueKind == JsonValueKind.True || jsonIsDraftProperty.ValueKind == JsonValueKind.False)
+            {
+                obj.IsDraft = jsonIsDraftProperty.GetBoolean();
+            }
+            else
+            {
+                errors.Add(new ValueHasWrongTypeError([.. path, "IsDraft"], "Boolean", jsonIsDraftProperty.ValueKind.ToString()));
+            }
         }
         else
         {

diff --git a/...FartingUnicorn.Tests.SingleField.ReferenceType.NonNullableNonOptional_Tests.BlogPost.g.cs b/...FartingUnicorn.Tests.SingleField.ReferenceType.NonNullableNonOptional_Tests.BlogPost.g.cs
diff --git a/...er.FartingUnicorn.Tests.SingleField.ReferenceType.NonNullableOptional_Tests.BlogPost.g.cs b/...er.FartingUnicorn.Tests.SingleField.ReferenceType.NonNullableOptional_Tests.BlogPost.g.cs
diff --git a/...er.FartingUnicorn.Tests.SingleField.ReferenceType.NullableNonOptional_Tests.BlogPost.g.cs b/...er.FartingUnicorn.Tests.SingleField.ReferenceType.NullableNonOptional_Tests.BlogPost.g.cs
diff --git a/...apper.FartingUnicorn.Tests.SingleField.ReferenceType.NullableOptional_Tests.BlogPost.g.cs b/...apper.FartingUnicorn.Tests.SingleField.ReferenceType.NullableOptional_Tests.BlogPost.g.cs
diff --git a/MapperGenerator/MapperGenerator.cs b/MapperGenerator/MapperGenerator.cs
@@ -242,7 +242,10 @@ static bool IsSyntaxTargetForGeneration(SyntaxNode node)
                         : ((INamedTypeSymbol)p.Type).TypeArguments.First().Name;
 
                     var isNullable = t.IsNullable();
-
+                    if (t.IsNullableValueType())
+                    {
+                        tName = ((INamedTypeSymbol)p.Type).TypeArguments.First().Name;
+                    }
                     properties.Add(new PropertyToGenerateMapperFor(p.Name, tName, isOptions, isNullable));
                 }
             }