Add support for static fields (#46)

src/Immediate.Validations.Analyzers/ValidateClassAnalyzer.cs

@@ -150,7 +150,7 @@ private static void AnalyzeSymbol(SyntaxNodeAnalysisContext context)
 		var members = symbol
 			.GetAllMembers()
 			.Where(m =>
-				m is IPropertySymbol
+				m is IPropertySymbol or IFieldSymbol
 					or IMethodSymbol
 				{
 					Parameters: [],
@@ -410,13 +410,6 @@ List<ISymbol> members
 			return;
 
 		var validateParameter = validateParameterSymbols.First(p => p.Name == parameter.Name);
-		var targetType = validateParameter.Type;
-
-		if (validateParameter.IsParams && targetType is IArrayTypeSymbol { ElementType: { } et })
-			targetType = et;
-
-		if (targetType is ITypeParameterSymbol)
-			targetType = typeArgumentType;
 
 		if (syntax.Expression.IsNameOfExpression(out var propertyName))
 		{
@@ -439,12 +432,13 @@ List<ISymbol> members
 
 			var memberType = member switch
 			{
-				IPropertySymbol { Type: { } t } => t,
 				IMethodSymbol { ReturnType: { } t } => t,
+				IPropertySymbol { Type: { } t } => t,
+				IFieldSymbol { Type: { } t } => t,
 				_ => throw new InvalidOperationException(),
 			};
 
-			if (!context.Compilation.ClassifyConversion(memberType, targetType).IsValidConversion())
+			if (!ValidateArgumentType(context.Compilation, validateParameter, memberType, typeArgumentType, out var targetType))
 			{
 				context.ReportDiagnostic(
 					Diagnostic.Create(
@@ -462,7 +456,7 @@ List<ISymbol> members
 			if (context.SemanticModel.GetOperation(syntax.Expression)?.Type is not ITypeSymbol argumentType)
 				return;
 
-			if (!context.Compilation.ClassifyConversion(argumentType, targetType).IsValidConversion())
+			if (!ValidateArgumentType(context.Compilation, validateParameter, argumentType, typeArgumentType, out var targetType))
 			{
 				context.ReportDiagnostic(
 					Diagnostic.Create(
@@ -475,6 +469,41 @@ List<ISymbol> members
 			}
 		}
 	}
+
+	private static bool ValidateArgumentType(
+		Compilation compilation,
+		IParameterSymbol parameter,
+		ITypeSymbol argumentType,
+		ITypeSymbol typeArgumentType,
+		out ITypeSymbol targetType
+	)
+	{
+		targetType = parameter.Type;
+		var buildArrayTypeSymbol = false;
+
+		if (parameter.IsParams
+			&& targetType is IArrayTypeSymbol { ElementType: { } paramElementType })
+		{
+			targetType = paramElementType;
+
+			if (argumentType is IArrayTypeSymbol { ElementType: { } argumentElementType })
+			{
+				argumentType = argumentElementType;
+				buildArrayTypeSymbol = true;
+			}
+		}
+
+		if (targetType is ITypeParameterSymbol)
+			targetType = typeArgumentType;
+
+		if (compilation.ClassifyConversion(argumentType, targetType).IsValidConversion())
+			return true;
+
+		if (buildArrayTypeSymbol)
+			targetType = compilation.CreateArrayTypeSymbol(targetType);
+
+		return false;
+	}
 }
 
 file static class Extensions

src/Immediate.Validations.Generators/ImmediateValidationsGenerator.Transform.cs

@@ -102,7 +102,7 @@ CancellationToken token
 		var members = symbol
 			.GetAllMembers()
 			.Where(m =>
-				m is IPropertySymbol
+				m is IPropertySymbol or IFieldSymbol
 					or IMethodSymbol
 				{
 					Parameters: [],
@@ -537,9 +537,8 @@ AttributeArgumentSyntax attributeArgumentSyntax
 			{
 				IMethodSymbol { IsStatic: true } => $"{name}()",
 				IMethodSymbol => $"instance.{name}()",
-				IPropertySymbol { IsStatic: true } => $"{name}",
-				IPropertySymbol => $"instance.{name}",
-				_ => "",
+				{ IsStatic: true } => $"{name}",
+				_ => $"instance.{name}",
 			};
 		}
 

tests/Immediate.Validations.Tests/AnalyzerTests/ValidateClassAnalyzerTests.cs

@@ -535,7 +535,7 @@ params string[] first
 						? default
 						: (true, $"Value '{target}' is not equal to '{first[0]}'");
 			}
-						
+
 			[Validate]
 			public sealed partial record Target : IValidationTarget<Target>
 			{
@@ -567,7 +567,7 @@ params string[] first
 						? default
 						: (true, $"Value '{target}' is not equal to '{first[0]}'");
 			}
-						
+
 			[Validate]
 			public sealed partial record Target : IValidationTarget<Target>
 			{
@@ -599,7 +599,7 @@ params T[] first
 						? default
 						: (true, $"Value '{target}' is not equal to '{first[0]}'");
 			}
-						
+
 			[Validate]
 			public sealed partial record Target : IValidationTarget<Target>
 			{
@@ -631,7 +631,7 @@ params T[] first
 						? default
 						: (true, $"Value '{target}' is not equal to '{first[0]}'");
 			}
-						
+
 			[Validate]
 			public sealed partial record Target : IValidationTarget<Target>
 			{
@@ -663,7 +663,7 @@ params string[] first
 						? default
 						: (true, $"Value '{target}' is not equal to '{first[0]}'");
 			}
-						
+
 			[Validate]
 			public sealed partial record Target : IValidationTarget<Target>
 			{
@@ -695,7 +695,7 @@ params string[] first
 						? default
 						: (true, $"Value '{target}' is not equal to '{first[0]}'");
 			}
-						
+
 			[Validate]
 			public sealed partial record Target : IValidationTarget<Target>
 			{
@@ -727,7 +727,7 @@ params T[] first
 						? default
 						: (true, $"Value '{target}' is not equal to '{first[0]}'");
 			}
-						
+
 			[Validate]
 			public sealed partial record Target : IValidationTarget<Target>
 			{
@@ -759,7 +759,7 @@ params T[] first
 						? default
 						: (true, $"Value '{target}' is not equal to '{first[0]}'");
 			}
-						
+
 			[Validate]
 			public sealed partial record Target : IValidationTarget<Target>
 			{
@@ -772,6 +772,46 @@ public sealed partial record Target : IValidationTarget<Target>
 			"""
 		).RunAsync();
 
+	[Fact]
+	public async Task ValidValidatorTypeShouldNotWarn16() =>
+		await AnalyzerTestHelpers.CreateAnalyzerTest<ValidateClassAnalyzer>(
+			"""
+			using System.Collections.Generic;
+			using Immediate.Validations.Shared;
+
+			[Validate]
+			public sealed partial record Target : IValidationTarget<Target>
+			{
+				[OneOf(nameof(Values))]
+				public required string Id { get; init; }
+
+				private static readonly string[] Values = ["123", "456", "789"];
+
+				public static List<ValidationError> Validate(Target target) => [];
+			}
+			"""
+		).RunAsync();
+
+	[Fact]
+	public async Task InvalidValidatorTypeShouldWarn16() =>
+		await AnalyzerTestHelpers.CreateAnalyzerTest<ValidateClassAnalyzer>(
+			"""
+			using System.Collections.Generic;
+			using Immediate.Validations.Shared;
+
+			[Validate]
+			public sealed partial record Target : IValidationTarget<Target>
+			{
+				[OneOf({|IV0016:nameof(Values)|})]
+				public required int Id { get; init; }
+
+				private static readonly string[] Values = ["123", "456", "789"];
+
+				public static List<ValidationError> Validate(Target target) => [];
+			}
+			"""
+		).RunAsync();
+
 	[Fact]
 	public async Task InvalidNameofShouldWarn() =>
 		await AnalyzerTestHelpers.CreateAnalyzerTest<ValidateClassAnalyzer>(

tests/Immediate.Validations.Tests/GeneratorTests/ValidatorArgumentTests.FieldAttributeArgument#IV...ValidateClass.g.verified.cs

@@ -0,0 +1,68 @@
+//HintName: IV...ValidateClass.g.cs
+using System.Collections.Generic;
+using Immediate.Validations.Shared;
+
+#nullable enable
+#pragma warning disable CS1591
+
+
+partial class ValidateClass
+{
+	static List<ValidationError> IValidationTarget<ValidateClass>.Validate(ValidateClass? target) =>
+		Validate(target);
+
+	public static  List<ValidationError> Validate(ValidateClass? target)
+	{
+		if (target is not { } t)
+		{
+			return 
+			[
+				new()
+				{
+					PropertyName = ".self",
+					ErrorMessage = "`target` must not be `null`.",
+				},
+			];
+		}
+
+		var errors = new List<ValidationError>();
+
+
+		__ValidateStringProperty(errors, t, t.StringProperty);
+
+
+		return errors;
+	}
+
+
+
+	private static void __ValidateStringProperty(
+		List<ValidationError> errors, ValidateClass instance, string target
+	)
+	{
+
+		if (target is not { } t)
+		{
+			errors.Add(new()
+			{
+				PropertyName = $"StringProperty",
+				ErrorMessage = "Property must not be `null`.",
+			});
+
+			return;
+		}
+
+
+
+		errors.Add(
+			global::Immediate.Validations.Shared.NotEqualAttribute.ValidateProperty(
+				t
+				, operand: instance._argumentValue
+			),
+			$"StringProperty",
+			null
+		);
+	}
+
+}
+

tests/Immediate.Validations.Tests/GeneratorTests/ValidatorArgumentTests.StaticFieldAttributeArgument#IV...ValidateClass.g.verified.cs

@@ -0,0 +1,68 @@
+//HintName: IV...ValidateClass.g.cs
+using System.Collections.Generic;
+using Immediate.Validations.Shared;
+
+#nullable enable
+#pragma warning disable CS1591
+
+
+partial class ValidateClass
+{
+	static List<ValidationError> IValidationTarget<ValidateClass>.Validate(ValidateClass? target) =>
+		Validate(target);
+
+	public static  List<ValidationError> Validate(ValidateClass? target)
+	{
+		if (target is not { } t)
+		{
+			return 
+			[
+				new()
+				{
+					PropertyName = ".self",
+					ErrorMessage = "`target` must not be `null`.",
+				},
+			];
+		}
+
+		var errors = new List<ValidationError>();
+
+
+		__ValidateStringProperty(errors, t, t.StringProperty);
+
+
+		return errors;
+	}
+
+
+
+	private static void __ValidateStringProperty(
+		List<ValidationError> errors, ValidateClass instance, string target
+	)
+	{
+
+		if (target is not { } t)
+		{
+			errors.Add(new()
+			{
+				PropertyName = $"StringProperty",
+				ErrorMessage = "Property must not be `null`.",
+			});
+
+			return;
+		}
+
+
+
+		errors.Add(
+			global::Immediate.Validations.Shared.NotEqualAttribute.ValidateProperty(
+				t
+				, operand: _argumentValue
+			),
+			$"StringProperty",
+			null
+		);
+	}
+
+}
+