Remove validator, change code behaviour (#51)

* Remove validator, change code behaviour

* Update AppAny.HotChocolate.FluentValidation.csproj

* Refactor extensions, generalize UseValidator

* Update README.md

* Update README.md

* Add null input with validation strategy test

* Add AssertDefaultErrorMapper

* Add AssertSuceessResult

* Remove assert single

* Update ci to semver release-first

Author: sergeyshaykhullin

.github/workflows/package.yaml

@@ -0,0 +1,34 @@
+name: Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  release:
+    name: Package
+    runs-on: ubuntu-20.04
+
+    steps:
+    - name: Package | Checkout
+      uses: actions/checkout@v2.3.4
+
+    - name: Package | Release
+      id: release
+      uses: tenhaus/get-release-or-tag@v2
+
+    - name: Package | Setup
+      uses: actions/setup-dotnet@v1.7.2
+      with:
+        dotnet-version: 5.0.x
+
+    - name: Package | Publish
+      id: publish
+      uses: brandedoutcast/publish-nuget@v2.5.5
+      with:
+        NUGET_KEY: ${{ secrets.NUGET_API_KEY }}
+        PROJECT_FILE_PATH: src/AppAny.HotChocolate.FluentValidation.csproj
+        VERSION_STATIC: ${{ steps.release.outputs.tag }}
+        TAG_FORMAT: '*'
+        INCLUDE_SYMBOLS: true
+

.github/workflows/release.yaml

@@ -6,6 +6,7 @@ on:
       release:
         description: Release
         required: true
+        default: patch
 
 jobs:
   release:
@@ -16,46 +17,24 @@ jobs:
     - name: Release | Checkout
       uses: actions/checkout@v2.3.4
 
-    - name: Release | Setup
-      uses: actions/setup-dotnet@v1.7.2
+    - name: Release | Previous | Cancel
+      uses: styfle/cancel-workflow-action@0.8.0
       with:
-        dotnet-version: 5.0.x
+        access_token: ${{ secrets.UPDATE_WORKFLOWS_TOKEN }}
 
-    - name: Release
-      id: release
-      uses: actions/create-release@v1.1.4
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Release | Tag
+      id: tag
+      uses: zwaldowski/semver-release-action@v1
       with:
-        tag_name: ${{ github.event.inputs.release }}
-        release_name: ${{ github.event.inputs.release }}
-
-    - name: Release | Publish
-      id: publish
-      uses: brandedoutcast/publish-nuget@v2.5.5
-      with:
-        NUGET_KEY: ${{ secrets.NUGET_API_KEY }}
-        PROJECT_FILE_PATH: src/AppAny.HotChocolate.FluentValidation.csproj
-        VERSION_STATIC: ${{ github.event.inputs.release }}
-        TAG_FORMAT: '*'
-        INCLUDE_SYMBOLS: true
-
-    - name: Release | Assets
-      uses: actions/upload-release-asset@v1.0.2
+        bump: ${{ github.event.inputs.release }}
+        github_token: ${{ secrets.UPDATE_WORKFLOWS_TOKEN }}
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.release.outputs.upload_url }}
-        asset_name: ${{ steps.publish.outputs.PACKAGE_NAME }}
-        asset_path: ${{ steps.publish.outputs.PACKAGE_PATH }}
-        asset_content_type: application/zip
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
-    - name: Release | Assets | Symbols
-      uses: actions/upload-release-asset@v1.0.2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Release
+      uses: actions/create-release@v1.1.4
       with:
-        upload_url: ${{ steps.release.outputs.upload_url }}
-        asset_name: ${{ steps.publish.outputs.SYMBOLS_PACKAGE_NAME }}
-        asset_path: ${{ steps.publish.outputs.SYMBOLS_PACKAGE_PATH }}
-        asset_content_type: application/zip
+        tag_name: ${{ steps.tag.outputs.version }}
+        release_name: ${{ steps.tag.outputs.version }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.UPDATE_WORKFLOWS_TOKEN }}

README.md

@@ -43,9 +43,9 @@ public class ExampleInputValidator : AbstractValidator<ExampleInput>
 {
   public ExampleInputValidator()
   {
-    RuleFor(input => input.Example)
+    RuleFor(input => input.ExampleProperty)
       .NotEmpty()
-      .WithMessage("Example is empty");
+      .WithMessage("Property is empty");
   }
 }
 ```
@@ -93,7 +93,6 @@ descriptor.Field(x => x.Example(default!))
 ... Example([UseFluentValidation, UseValidator((typeof(ExampleInputValidator))] ExampleInput input) { ... }
 ```
 
-
 ## 📝 Docs 📝
 
 - 📄 [Abstractions](docs/core-abstractions.md)

docs/examples/error-mappers.md

@@ -5,23 +5,36 @@
 - All extension methods has overrides to pass more error mappers
 - All error mappers can be composed with other
 
+```cs
+public class NotEmptyNameValidator : AbstractValidator<ExampleInput>
+{
+  public NotEmptyNameValidator()
+  {
+    RuleFor(input => input.ExampleProperty)
+      .NotEmpty()
+      .WithMessage("Property is empty")
+      .WithErrorCode("ERR0123");
+  }
+}
+```
+
 ## .UseDefaultErrorMapper()
 
 ```json
 {
   "errors": [
     {
-      "message": "Name is empty",
+      "message": "Property is empty",
       "path": [
-        "createUser"
+        "example"
       ],
       "extensions": {
-        "code": "ValidationFailed"
+        "code": "ERR0123"
       }
     }
   ],
   "data": {
-    "createUser": null
+    "example": null
   }
 }
 ```
@@ -32,22 +45,21 @@
 {
   "errors": [
     {
-      "message": "Name is empty",
+      "message": "Property is empty",
       "path": [
-        "createUser"
+        "example"
       ],
       "extensions": {
-        "code": "ValidationFailed",
-        "validator": "NotEmptyValidator",
-        "field": "createUser",
+        "code": "ERR0123",
+        "field": "example",
         "argument": "input",
-        "property": "Name",
+        "property": "ExampleProperty",
         "severity": "Error"
       }
     }
   ],
   "data": {
-    "createUser": null
+    "example": null
   }
 }
 ```
@@ -58,28 +70,27 @@
 {
   "errors": [
     {
-      "message": "Name is empty",
+      "message": "Property is empty",
       "path": [
-        "createUser"
+        "example"
       ],
       "extensions": {
-        "code": "ValidationFailed",
-        "validator": "NotEmptyValidator",
-        "field": "createUser",
+        "code": "ERR0123",
+        "field": "example",
         "argument": "input",
-        "property": "Name",
+        "property": "ExampleProperty",
         "severity": "Error",
         "attemptedValue": "",
         "customState": null,
         "formattedMessagePlaceholderValues": {
-          "PropertyName": "Name",
+          "PropertyName": "ExampleProperty",
           "PropertyValue": ""
         }
       }
     }
   ],
   "data": {
-    "createUser": null
+    "example": null
   }
 }
 ```

src/AppAny.HotChocolate.FluentValidation.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<Nullable>enable</Nullable>
-		<Version>0.1.18</Version>
+		<Version>0.1.19</Version>
 		<LangVersion>9</LangVersion>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
 		<IncludeSymbols>true</IncludeSymbols>

src/Builders/Extensions/UseValidationStrategyExtensions.cs

@@ -1,5 +1,8 @@
 using System;
+using FluentValidation;
 using FluentValidation.Internal;
+using FluentValidation.Results;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace AppAny.HotChocolate.FluentValidation
 {
@@ -42,9 +45,47 @@ public static ArgumentValidationBuilder UseValidationStrategy<TInput>(
 			this ArgumentValidationBuilder builder,
 			Action<InputValidatorContext, ValidationStrategy<TInput>> validationStrategy)
 		{
-			return builder.UseInputValidators(context => ValidationDefaults.InputValidators.WithStrategy<TInput>(
-				context,
-				strategy => validationStrategy(context, strategy)));
+			return builder.UseInputValidators(async inputValidatorContext =>
+			{
+				var argumentValue = inputValidatorContext
+					.MiddlewareContext
+					.ArgumentValue<TInput>(inputValidatorContext.Argument.Name);
+
+				if (argumentValue is null)
+				{
+					return null;
+				}
+
+				var validatorType = inputValidatorContext.Argument.GetGenericValidatorType();
+
+				var validators = (IValidator[])inputValidatorContext.MiddlewareContext.Services.GetServices(validatorType);
+
+				var validationContext = ValidationContext<TInput>.CreateWithOptions(
+					argumentValue,
+					strategy => validationStrategy(inputValidatorContext, strategy));
+
+				ValidationResult? validationResult = null;
+
+				for (var validatorIndex = 0; validatorIndex < validators.Length; validatorIndex++)
+				{
+					var validator = validators[validatorIndex];
+
+					var validatorResult = await validator
+						.ValidateAsync(validationContext, inputValidatorContext.MiddlewareContext.RequestAborted)
+						.ConfigureAwait(false);
+
+					if (validationResult is null)
+					{
+						validationResult = validatorResult;
+					}
+					else
+					{
+						validationResult.MergeFailures(validatorResult);
+					}
+				}
+
+				return validationResult;
+			});
 		}
 	}
 }