fix missing attribute on nullable number

json-everything · Mar 25, 2024 · 4cf5eaf · 4cf5eaf
1 parent e39211b
commit 4cf5eaf
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 8 deletions.
diff --git a/JsonSchema.Generation/Attributes/ExclusiveMaximumAttribute.cs b/JsonSchema.Generation/Attributes/ExclusiveMaximumAttribute.cs
@@ -38,7 +38,7 @@ public ExclusiveMaximumAttribute(double value)
 
 	void IAttributeHandler.AddConstraints(SchemaGenerationContextBase context, Attribute attribute)
 	{
-		if (!context.Type.IsNumber()) return;
+		if (!context.Type.IsNumber() && !context.Type.IsNullableNumber()) return;
 
 		context.Intents.Add(new ExclusiveMaximumIntent(Value));
 	}

diff --git a/JsonSchema.Generation/Attributes/ExclusiveMinimumAttribute.cs b/JsonSchema.Generation/Attributes/ExclusiveMinimumAttribute.cs
@@ -38,7 +38,7 @@ public ExclusiveMinimumAttribute(double value)
 
 	void IAttributeHandler.AddConstraints(SchemaGenerationContextBase context, Attribute attribute)
 	{
-		if (!context.Type.IsNumber()) return;
+		if (!context.Type.IsNumber() && !context.Type.IsNullableNumber()) return;
 
 		context.Intents.Add(new ExclusiveMinimumIntent(Value));
 	}

diff --git a/JsonSchema.Generation/Attributes/IfMaxAttribute.cs b/JsonSchema.Generation/Attributes/IfMaxAttribute.cs
@@ -52,7 +52,7 @@ public IfMaxAttribute(string propertyName, double value, object? group)
 	{
 		if (PropertyType == null) return null;
 
-		if (PropertyType.IsNumber())
+		if (!PropertyType.IsNumber() && !PropertyType.IsNullableNumber())
 		{
 			if (IsExclusive) return new ExclusiveMaximumIntent(Value.ClampToDecimal());
 			return new MaximumIntent(Value.ClampToDecimal());

diff --git a/JsonSchema.Generation/Attributes/IfMinAttribute.cs b/JsonSchema.Generation/Attributes/IfMinAttribute.cs
@@ -52,7 +52,7 @@ public IfMinAttribute(string propertyName, double value, object? group)
 	{
 		if (PropertyType == null) return null;
 
-		if (PropertyType.IsNumber())
+		if (!PropertyType.IsNumber() && !PropertyType.IsNullableNumber())
 		{
 			if (IsExclusive) return new ExclusiveMinimumIntent(Value.ClampToDecimal());
 			return new MinimumIntent(Value.ClampToDecimal());

diff --git a/JsonSchema.Generation/Attributes/JsonNumberHandlingAttributeHandler.cs b/JsonSchema.Generation/Attributes/JsonNumberHandlingAttributeHandler.cs
@@ -22,7 +22,7 @@ public void AddConstraints(SchemaGenerationContextBase context, Attribute attrib
 		var handlingAttribute = attribute as JsonNumberHandlingAttribute;
 		if (handlingAttribute == null) return;
 
-		if (!context.Type.IsNumber()) return;
+		if (!context.Type.IsNumber() && !context.Type.IsNullableNumber()) return;
 
 		var typeIntent = context.Intents.OfType<TypeIntent>().FirstOrDefault();
 

diff --git a/JsonSchema.Generation/Attributes/MaximumAttribute.cs b/JsonSchema.Generation/Attributes/MaximumAttribute.cs
@@ -38,7 +38,7 @@ public MaximumAttribute(double value)
 
 	void IAttributeHandler.AddConstraints(SchemaGenerationContextBase context, Attribute attribute)
 	{
-		if (!context.Type.IsNumber()) return;
+		if (!context.Type.IsNumber() && !context.Type.IsNullableNumber()) return;
 
 		context.Intents.Add(new MaximumIntent(Value));
 	}

diff --git a/JsonSchema.Generation/Attributes/MinimumAttribute.cs b/JsonSchema.Generation/Attributes/MinimumAttribute.cs
@@ -38,7 +38,7 @@ public MinimumAttribute(double value)
 
 	void IAttributeHandler.AddConstraints(SchemaGenerationContextBase context, Attribute attribute)
 	{
-		if (!context.Type.IsNumber()) return;
+		if (!context.Type.IsNumber() && !context.Type.IsNullableNumber()) return;
 
 		context.Intents.Add(new MinimumIntent(Value));
 	}

diff --git a/JsonSchema.Generation/Attributes/MultipleOfAttribute.cs b/JsonSchema.Generation/Attributes/MultipleOfAttribute.cs
@@ -28,7 +28,7 @@ public MultipleOfAttribute(double value)
 
 	void IAttributeHandler.AddConstraints(SchemaGenerationContextBase context, Attribute attribute)
 	{
-		if (!context.Type.IsNumber()) return;
+		if (!context.Type.IsNumber() && !context.Type.IsNullableNumber()) return;
 
 		context.Intents.Add(new MultipleOfIntent(Value));
 	}

diff --git a/JsonSchema.Generation/TypeExtensions.cs b/JsonSchema.Generation/TypeExtensions.cs
@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Text;
 using System.Text.Json.Serialization;
+using Json.More;
 
 namespace Json.Schema.Generation;
 
@@ -125,4 +126,15 @@ public static bool IsNullableValueType(this Type type)
 	{
 		return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>);
 	}
+
+	/// <summary>
+	/// Determines if the type is a nullable value type, i.e. <see cref="Nullable{T}"/>.
+	/// </summary>
+	/// <param name="type">The type</param>
+	/// <returns>True if the type is <see cref="Nullable{T}"/>; false otherwise.</returns>
+	public static bool IsNullableNumber(this Type type)
+	{
+		return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>) &&
+			   type.GetGenericArguments()[0].IsNumber();
+	}
 }