- Make FluentValidation.Internal internal.

- Reduce access of some properties in Internal.
- Pass Internal directly to validator lambda functions.
- Add benchmark project using benchmarkdotnet.

Author: CodingFlow

CodingFlow.FluentValidation.slnx

@@ -4,4 +4,5 @@
   <Project Path="CodingFlow.FluentValidation.VogenExtensions/CodingFlow.FluentValidation.VogenExtensions.csproj" />
   <Project Path="CodingFlow.FluentValidation/CodingFlow.FluentValidation.csproj" />
   <Project Path="Examples/Examples.csproj" Id="31b76e57-988c-453b-b235-e2a4a4f43642" />
+  <Project Path="PerformanceBenchmarks/PerformanceBenchmarks.csproj" Id="8f1c4ea4-e0ee-4a83-8ba8-6880ea26cba2" />
 </Solution>

CodingFlow.FluentValidation/FluentValidation.cs

@@ -6,15 +6,11 @@
 /// <typeparam name="T">Input type.</typeparam>
 public class FluentValidation<T>
 {
-    public ValidationResult Result { get; set; }
+    public ValidationResult Result { get; init; }
 
     public List<ValidationError> Errors { get; init; } = [];
 
-    /// <summary>
-    /// Used internally by the library. Do not use this property
-    /// unless you are building your own validator.
-    /// </summary>
-    public Internal<T> Internal { get; private set; }
+    internal Internal<T> Internal { get; private init; }
 
     public FluentValidation(T input)
     {

CodingFlow.FluentValidation/Internal.cs

@@ -1,26 +1,14 @@
 namespace CodingFlow.FluentValidation;
 
-public class Internal<T>(FluentValidation<T> validation)
+internal class Internal<T>(FluentValidation<T> validation)
 {
     public required T Input { get; set; }
 
-    public ValidationError LastError { get; private set; }
+    private ValidationError LastError { get; set; }
 
-    public void AddValid()
+    public void Validate(Func<Internal<T>, bool> validator, ValidationError error)
     {
-        LastError = default;
-    }
-
-    public void AddError(ValidationError error)
-    {
-        validation.Result.IsValid = false;
-        LastError = error;
-        validation.Errors.Add(error);
-    }
-
-    public void Validate(Func<FluentValidation<T>, bool> validator, ValidationError error)
-    {
-        if (validator(validation))
+        if (validator(this))
         {
             AddValid();
         }
@@ -41,4 +29,16 @@ public void ChangeErrorMessage(string message)
             });
         }
     }
+
+    private void AddValid()
+    {
+        LastError = default;
+    }
+
+    private void AddError(ValidationError error)
+    {
+        validation.Result.IsValid = false;
+        LastError = error;
+        validation.Errors.Add(error);
+    }
 }

CodingFlow.FluentValidation/ValidationResult.cs

@@ -16,5 +16,5 @@ public record ValidationResult
     /// Collection of validation errors if the validation failed.
     /// This collection will be empty if the validation succeeded.
     /// </summary>
-    public IEnumerable<ValidationError> Errors { get; set; }
+    public required IEnumerable<ValidationError> Errors { get; set; }
 }

CodingFlow.FluentValidation/Validators/BetweenExclusiveValidator.cs

@@ -25,7 +25,7 @@ private static void Validate<T>(FluentValidation<T> validation, T minimum, T max
         where T : INumber<T>
     {
         validation.Internal.Validate(
-            validation => minimum < validation.Internal.Input && validation.Internal.Input < maximum,
+            @internal => minimum < @internal.Input && @internal.Input < maximum,
             new ValidationError($"Value '{validation.Internal.Input}' of type {typeof(T)} is not between {minimum} and {maximum}.")
         );
     }

CodingFlow.FluentValidation/Validators/BetweenInclusiveValidator.cs

@@ -25,7 +25,7 @@ private static void Validate<T>(FluentValidation<T> validation, T minimum, T max
         where T : INumber<T>
     {
         validation.Internal.Validate(
-            validation => minimum <= validation.Internal.Input && validation.Internal.Input <= maximum,
+            @internal => minimum <= @internal.Input && @internal.Input <= maximum,
             new ValidationError($"Value '{validation.Internal.Input}' of type {typeof(T)} is not equal to or between {minimum} and {maximum}.")
         );
     }

CodingFlow.FluentValidation/Validators/EqualValidator.cs

@@ -21,7 +21,7 @@ public static FluentValidation<T> Equal<T>(this FluentValidation<T> validation,
     private static void Validate<T>(FluentValidation<T> validation, T input)
     {
         validation.Internal.Validate(
-            validation => validation.Internal.Input.Equals(input),
+            @internal => @internal.Input.Equals(input),
             new ValidationError($"Value '{validation.Internal.Input}' of type {typeof(T)} is not equal to {input}.")
         );
     }

CodingFlow.FluentValidation/Validators/IsGuidValidator.cs

@@ -19,7 +19,7 @@ public static FluentValidation<string> IsGuid(this FluentValidation<string> vali
     private static void Validate(FluentValidation<string> validation)
     {
         validation.Internal.Validate(
-            validation => Guid.TryParse(validation.Internal.Input, out var value),
+            @internal => Guid.TryParse(@internal.Input, out var value),
             new ValidationError($"Value '{validation.Internal.Input}' is not a valid GUID.")
         );
     }

CodingFlow.FluentValidation/Validators/MatchesValidator.cs

@@ -22,7 +22,7 @@ public static FluentValidation<string> Matches(this FluentValidation<string> val
     private static void Validate(FluentValidation<string> validation, string regex)
     {
         validation.Internal.Validate(
-            validation => Regex.IsMatch(validation.Internal.Input, regex),
+            @internal => Regex.IsMatch(@internal.Input, regex),
             new ValidationError($"Value '{validation.Internal.Input}' does not match the pattern.")
         );
     }

CodingFlow.FluentValidation/Validators/MaximumLengthValidator.cs

@@ -20,7 +20,7 @@ public static FluentValidation<string> MaximumLength(this FluentValidation<strin
     private static void Validate(FluentValidation<string> validation, int maximum)
     {
         validation.Internal.Validate(
-            validation => validation.Internal.Input.Length <= maximum,
+            @internal => @internal.Input.Length <= maximum,
             new ValidationError($"Value '{validation.Internal.Input}' has a length more than {maximum}.")
         );
     }