Merge pull request #23 from appany/0.1.10

Tests, minor refactorings, rename extensions

src/AppAny.HotChocolate.FluentValidation.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<Nullable>enable</Nullable>
-		<Version>0.1.9</Version>
+		<Version>0.1.10</Version>
 		<LangVersion>9</LangVersion>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
 		<IncludeSymbols>true</IncludeSymbols>
@@ -24,7 +24,7 @@
 	</PropertyGroup>
 
 	<ItemGroup Label="Packages">
-		<PackageReference Include="FluentValidation" Version="9.4.0" />
+		<PackageReference Include="FluentValidation" Version="9.5.0" />
 		<PackageReference Include="HotChocolate.Execution" Version="11.0.9" />
 	</ItemGroup>
 

src/Extensions/ArgumentValidationBuilderExtensions.cs → src/Builders/Extensions/ArgumentValidationBuilderExtensions.cs

@@ -12,8 +12,7 @@ public static class ArgumentValidationBuilderExtensions
 		/// Overrides global <see cref="InputValidatorProvider"/>.
 		/// Uses <see cref="TValidator"/> to resolve <see cref="InputValidator"/>
 		/// </summary>
-		public static ArgumentValidationBuilder UseValidator<TValidator>(
-			this ArgumentValidationBuilder builder)
+		public static ArgumentValidationBuilder UseValidator<TValidator>(this ArgumentValidationBuilder builder)
 			where TValidator : class, IValidator
 		{
 			return builder.UseInputValidatorProviders(context =>
@@ -25,8 +24,7 @@ public static ArgumentValidationBuilder UseValidator<TValidator>(
 		/// Overrides global <see cref="InputValidatorProvider"/>.
 		/// Uses all <see cref="TValidator"/> to resolve <see cref="InputValidator"/>
 		/// </summary>
-		public static ArgumentValidationBuilder UseValidators<TValidator>(
-			this ArgumentValidationBuilder builder)
+		public static ArgumentValidationBuilder UseValidators<TValidator>(this ArgumentValidationBuilder builder)
 			where TValidator : class, IValidator
 		{
 			return builder.UseInputValidatorProviders(context =>
@@ -64,8 +62,7 @@ public static ArgumentValidationBuilder UseValidators(
 		/// Overrides global <see cref="InputValidatorProvider"/>.
 		/// Uses <see cref="TValidator"/> to resolve <see cref="InputValidator"/> with <see cref="ValidationDefaults.ValidationStrategies.Default{TInput}"/> strategy
 		/// </summary>
-		public static ArgumentValidationBuilder UseValidator<TInput, TValidator>(
-			this ArgumentValidationBuilder builder)
+		public static ArgumentValidationBuilder UseValidator<TInput, TValidator>(this ArgumentValidationBuilder builder)
 			where TValidator : class, IValidator<TInput>
 		{
 			return builder.UseValidator<TInput, TValidator>(ValidationDefaults.ValidationStrategies.Default);
@@ -75,8 +72,7 @@ public static ArgumentValidationBuilder UseValidator<TInput, TValidator>(
 		/// Overrides global <see cref="InputValidatorProvider"/>.
 		/// Uses all <see cref="TValidator"/> to resolve <see cref="InputValidator"/> with <see cref="ValidationDefaults.ValidationStrategies.Default{TInput}"/> strategy
 		/// </summary>
-		public static ArgumentValidationBuilder UseValidators<TInput, TValidator>(
-			this ArgumentValidationBuilder builder)
+		public static ArgumentValidationBuilder UseValidators<TInput, TValidator>(this ArgumentValidationBuilder builder)
 			where TValidator : class, IValidator<TInput>
 		{
 			return builder.UseValidators<TInput, TValidator>(ValidationDefaults.ValidationStrategies.Default);

src/Extensions/CanUseErrorMappersExtensions.cs → src/Builders/Extensions/ValidationBuilderExtensions.cs

@@ -1,7 +1,17 @@
+using System.Linq;
+
 namespace AppAny.HotChocolate.FluentValidation
 {
-	public static class CanUseErrorMappersExtensions
+	public static class ValidationBuilderExtensions
 	{
+		/// <summary>
+		/// Always skips validation <see cref="ValidationDefaults.SkipValidation.Skip"/>
+		/// </summary>
+		public static TBuilder SkipValidation<TBuilder>(this CanSkipValidation<TBuilder> builder)
+		{
+			return builder.SkipValidation(ValidationDefaults.SkipValidation.Skip);
+		}
+
 		/// <summary>
 		/// Uses default <see cref="ErrorMapper"/>. See <see cref="ValidationDefaults.ErrorMappers.Default"/>
 		/// </summary>
@@ -43,5 +53,18 @@ public static TBuilder UseDefaultErrorMapperWithExtendedDetails<TBuilder>(
 				errorMapper?.Invoke(errorBuilder, context);
 			});
 		}
+
+		/// <summary>
+		/// Adds default <see cref="InputValidatorProvider"/>. See <see cref="ValidationDefaults.InputValidatorProviders.Default"/>
+		/// </summary>
+		public static TBuilder UseDefaultInputValidatorProvider<TBuilder>(
+			this CanUseInputValidatorProviders<TBuilder> builder,
+			params InputValidatorProvider[] inputValidatorProviders)
+		{
+			return builder.UseInputValidatorProviders(
+				new InputValidatorProvider[] { ValidationDefaults.InputValidatorProviders.Default }
+					.Concat(inputValidatorProviders)
+					.ToArray());
+		}
 	}
 }

src/Extensions/DictionaryExtensions.cs → src/Extensions/ExtensionDataExtensions.cs

@@ -4,7 +4,7 @@
 
 namespace AppAny.HotChocolate.FluentValidation
 {
-	internal static class DictionaryExtensions
+	internal static class ExtensionDataExtensions
 	{
 		public static IInputField? TryGetArgument(this IDictionary<string, IInputField> arguments, string name)
 		{
@@ -61,8 +61,7 @@ public static ArgumentValidationOptions GetOrCreateArgumentOptions(this Extensio
 				: null;
 		}
 
-		public static ArgumentValidationOptions GetArgumentOptions(
-			this IReadOnlyDictionary<string, object?> contextData)
+		public static ArgumentValidationOptions GetArgumentOptions(this IReadOnlyDictionary<string, object?> contextData)
 		{
 			return (ArgumentValidationOptions)contextData[ValidationDefaults.ArgumentOptionsKey]!;
 		}

src/Extensions/InputValidatorProviderContextExtensions.cs → src/Extensions/InputFieldExtensions.cs

@@ -5,7 +5,7 @@
 
 namespace AppAny.HotChocolate.FluentValidation
 {
-	internal static class InputValidatorProviderContextExtensions
+	internal static class InputFieldExtensions
 	{
 		private static readonly ConcurrentDictionary<Type, Type> ArgumentTypeToValidatorType = new();
 

src/InputValidator/InputValidator.cs

@@ -1,4 +1,3 @@
-using System.Threading;
 using System.Threading.Tasks;
 using FluentValidation;
 using FluentValidation.Results;
@@ -8,5 +7,5 @@ namespace AppAny.HotChocolate.FluentValidation
 	/// <summary>
 	/// Abstracts <see cref="IValidator"/> execution
 	/// </summary>
-	public delegate ValueTask<ValidationResult?> InputValidator(object argument, CancellationToken cancellationToken);
+	public delegate ValueTask<ValidationResult?> InputValidator(InputValidatorContext inputValidatorContext);
 }

src/InputValidator/InputValidatorContext.cs

@@ -0,0 +1,16 @@
+using System.Threading;
+
+namespace AppAny.HotChocolate.FluentValidation
+{
+	public readonly struct InputValidatorContext
+	{
+		public InputValidatorContext(object argument, CancellationToken cancellationToken)
+		{
+			Argument = argument;
+			CancellationToken = cancellationToken;
+		}
+
+		public object Argument { get; }
+		public CancellationToken CancellationToken { get; }
+	}
+}

src/Skipping/SkipValidationContext.cs

@@ -5,7 +5,9 @@ namespace AppAny.HotChocolate.FluentValidation
 {
 	public readonly struct SkipValidationContext
 	{
-		public SkipValidationContext(IMiddlewareContext middlewareContext, IInputField argument)
+		public SkipValidationContext(
+			IMiddlewareContext middlewareContext,
+			IInputField argument)
 		{
 			MiddlewareContext = middlewareContext;
 			Argument = argument;

src/ValidationDefaults.cs

@@ -130,11 +130,11 @@ public static class InputValidators
 			/// </summary>
 			public static InputValidator FromValidator(IValidator validator)
 			{
-				return async (argument, cancellationToken) =>
+				return async context =>
 				{
-					var validationContext = new ValidationContext<object>(argument);
+					var validationContext = new ValidationContext<object>(context.Argument);
 
-					return await validator.ValidateAsync(validationContext, cancellationToken).ConfigureAwait(false);
+					return await validator.ValidateAsync(validationContext, context.CancellationToken).ConfigureAwait(false);
 				};
 			}
 
@@ -143,16 +143,16 @@ public static InputValidator FromValidator(IValidator validator)
 			/// </summary>
 			public static InputValidator FromValidators(IEnumerable<IValidator> validators)
 			{
-				return async (argument, cancellationToken) =>
+				return async context =>
 				{
-					var validationContext = new ValidationContext<object>(argument);
+					var validationContext = new ValidationContext<object>(context.Argument);
 
 					ValidationResult? validationResult = null;
 
 					foreach (var validator in validators)
 					{
 						var validatorResult = await validator.ValidateAsync(
-							validationContext, cancellationToken).ConfigureAwait(false);
+							validationContext, context.CancellationToken).ConfigureAwait(false);
 
 						if (validationResult is null)
 						{
@@ -178,13 +178,13 @@ public static InputValidator FromValidatorWithStrategy<TInput>(
 				IValidator<TInput> validator,
 				Action<ValidationStrategy<TInput>> validationStrategy)
 			{
-				return async (argument, cancellationToken) =>
+				return async context =>
 				{
 					var validationContext = ValidationContext<TInput>.CreateWithOptions(
-						(TInput)argument,
+						(TInput)context.Argument,
 						validationStrategy);
 
-					return await validator.ValidateAsync(validationContext, cancellationToken).ConfigureAwait(false);
+					return await validator.ValidateAsync(validationContext, context.CancellationToken).ConfigureAwait(false);
 				};
 			}
 
@@ -195,18 +195,18 @@ public static InputValidator FromValidatorsWithStrategy<TInput>(
 				IEnumerable<IValidator<TInput>> validators,
 				Action<ValidationStrategy<TInput>> validationStrategy)
 			{
-				return async (argument, cancellationToken) =>
+				return async context =>
 				{
 					var validationContext = ValidationContext<TInput>.CreateWithOptions(
-						(TInput)argument,
+						(TInput)context.Argument,
 						validationStrategy);
 
 					ValidationResult? validationResult = null;
 
 					foreach (var validator in validators)
 					{
 						var validatorResult = await validator.ValidateAsync(
-							validationContext, cancellationToken).ConfigureAwait(false);
+							validationContext, context.CancellationToken).ConfigureAwait(false);
 
 						if (validationResult is null)
 						{

src/ValidationFieldMiddleware.cs

@@ -17,9 +17,9 @@ public static FieldDelegate Use(FieldDelegate next)
 
 					for (var nodeIndex = 0; nodeIndex < argumentNodes.Count; nodeIndex++)
 					{
-						var passedArgument = argumentNodes[nodeIndex];
+						var argumentNode = argumentNodes[nodeIndex];
 
-						var argument = objectFieldOptions.Arguments.TryGetArgument(passedArgument.Name.Value);
+						var argument = objectFieldOptions.Arguments.TryGetArgument(argumentNode.Name.Value);
 
 						if (argument is null)
 						{
@@ -28,8 +28,11 @@ public static FieldDelegate Use(FieldDelegate next)
 
 						var argumentOptions = argument.ContextData.GetArgumentOptions();
 
-						if (await argumentOptions.SkipValidation!.Invoke(
-							new SkipValidationContext(middlewareContext, argument)).ConfigureAwait(false))
+						var shouldSkipValidation = await argumentOptions.SkipValidation!
+							.Invoke(new SkipValidationContext(middlewareContext, argument))
+							.ConfigureAwait(false);
+
+						if (shouldSkipValidation)
 						{
 							continue;
 						}
@@ -45,11 +48,12 @@ public static FieldDelegate Use(FieldDelegate next)
 						{
 							var inputValidatorProvider = argumentOptions.InputValidatorProviders[providerIndex];
 
-							var inputValidator = inputValidatorProvider.Invoke(
-								new InputValidatorProviderContext(middlewareContext, argument));
+							var inputValidator = inputValidatorProvider
+								.Invoke(new InputValidatorProviderContext(middlewareContext, argument));
 
-							var validationResult = await inputValidator.Invoke(
-								argumentValue, middlewareContext.RequestAborted).ConfigureAwait(false);
+							var validationResult = await inputValidator
+								.Invoke(new InputValidatorContext(argumentValue, middlewareContext.RequestAborted))
+								.ConfigureAwait(false);
 
 							if (validationResult?.IsValid is null or true)
 							{
@@ -62,11 +66,9 @@ public static FieldDelegate Use(FieldDelegate next)
 
 								var errorBuilder = ErrorBuilder.New();
 
-								argumentOptions.ErrorMapper!.Invoke(errorBuilder, new ErrorMappingContext(
-									middlewareContext,
-									argument,
-									validationResult,
-									validationFailure));
+								argumentOptions.ErrorMapper!.Invoke(
+									errorBuilder,
+									new ErrorMappingContext(middlewareContext, argument, validationResult, validationFailure));
 
 								middlewareContext.ReportError(errorBuilder.Build());
 							}

tests/AppAny.HotChocolate.FluentValidation.Benchmarks/AppAny.HotChocolate.FluentValidation.Benchmarks.csproj

@@ -10,7 +10,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-		<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.12.1" />
 		<PackageReference Include="FairyBread" Version="4.0.0" />
 		<PackageReference Include="FluentChoco" Version="2.0.0" />
 	</ItemGroup>

tests/AppAny.HotChocolate.FluentValidation.Benchmarks/Core/TestInputValidator.cs

@@ -1,8 +1,9 @@
+using FairyBread;
 using FluentValidation;
 
 namespace AppAny.HotChocolate.FluentValidation.Benchmarks
 {
-	public class TestInputValidator : AbstractValidator<TestInput>
+	public class TestInputValidator : AbstractValidator<TestInput>, IRequiresOwnScopeValidator
 	{
 		public TestInputValidator()
 		{