Add support for endpoint-centric APIs (#48)

* Move Language to DirectoryBuild Props.

  <LangVersion>10</LangVersion>
  <RazorLangVersion>3.0</RazorLangVersion>

* Make SignAssembly stuff only in Realease mode.

* Bump version to 3.0 as this is a breaking change.

* Add a delegate that allows for transformation of the model before validation.

* Update sample to show how transform model could be used although this example doesn't actualy change the model

* Update Readme with whats new in 3.0

Also added 2.0 given it was missing.

* RepositoryUrl should have the .git

* Update FluentValidation from 11.4.0 to 11.5.2 (latest at this time)

Author: StevenTCramer

README.md

@@ -48,6 +48,13 @@ More sample projects will be added as the framework develops.
 
 ## What's new
 
+### New in 3.0.0 
+- Add OnTransformModel delegate to allow the model to be transformed before validation (This is useful when using endpoint-centric APIs)
+- Major change because it changes the signature of the public IValidationProvider interface.
+
+### New in 2.0.0
+- Add net7.0 target framework.
+
 ### New in 1.8.0
 - Use `Services.TryAddScoped` instead of `Services.AddScoped` for validators, in case 
   the consuming app has already registered validators with a different lifetime.

Source/Lib/Directory.Build.props

@@ -2,9 +2,9 @@
 
 	<PropertyGroup>
 
-		<Version>2.0.0</Version>
-		<AssemblyVersion>2.0.0.0</AssemblyVersion>
-		<FileVersion>2.0.0.0</FileVersion>
+		<Version>3.0.0</Version>
+		<AssemblyVersion>3.0.0.0</AssemblyVersion>
+		<FileVersion>3.0.0.0</FileVersion>
 
 		<Authors>Peter Morris</Authors>
 		<Company />
@@ -15,19 +15,18 @@
 
 		<PackageProjectUrl>https://github.com/mrpmorris/blazor-validation</PackageProjectUrl>
 		<PackageIconUrl />
-		<RepositoryUrl>https://github.com/mrpmorris/blazor-validation</RepositoryUrl>
+		<RepositoryUrl>https://github.com/mrpmorris/blazor-validation.git</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
+		<LangVersion>latest</LangVersion>
+		<RazorLangVersion>3.0</RazorLangVersion>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+	</PropertyGroup>
 
+	<PropertyGroup Condition="'$(Configuration)'=='Release'">
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<AssemblyOriginatorKeyFile>MrPMorris.snk</AssemblyOriginatorKeyFile>
 		<SignAssembly>true</SignAssembly>
-		<DelaySign>false</DelaySign>
-
-		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+		<DelaySign>true</DelaySign>
 	</PropertyGroup>
 
 </Project>

Source/Lib/Morris.Blazor.FluentValidation/FluentValidationValidatorProvider.cs

@@ -13,16 +13,22 @@ namespace Morris.Blazor.FluentValidation
 {
 	public class FluentValidationValidatorProvider : IValidationProvider
 	{
-		public void InitializeEditContext(
+		private Func<object, object> OnTransformModel { get; set; } = null;
+
+		public void InitializeEditContext
+		(
 			EditContext editContext,
 			IServiceProvider serviceProvider,
-			ValidationProperties properties)
+			ValidationProperties properties,
+			Func<object, object> transformModel = null
+		)
 		{
 			if (editContext == null)
 				throw new ArgumentNullException(nameof(editContext));
 			if (serviceProvider == null)
 				throw new ArgumentNullException(nameof(serviceProvider));
 			properties ??= ValidationProperties.Set;
+			OnTransformModel = transformModel;
 
 			var messages = new ValidationMessageStore(editContext);
 			editContext.OnValidationRequested +=
@@ -56,9 +62,11 @@ private async Task ValidateModel(
 			messages.Clear();
 			editContext.NotifyValidationStateChanged();
 
-			IEnumerable<IValidator> validators = GetValidatorsForObject(editContext.Model, serviceProvider);
+			object transformedModel = GetTransformedModel(editContext.Model);
+
+			IEnumerable<IValidator> validators = GetValidatorsForObject(transformedModel, serviceProvider);
 
-			var validationContext = new ValidationContext<object>(editContext.Model);
+			var validationContext = new ValidationContext<object>(transformedModel);
 
 			var validationResults = new List<ValidationResult>();
 			foreach (IValidator validator in validators)
@@ -70,13 +78,17 @@ private async Task ValidateModel(
 			IEnumerable<ValidationFailure> validationFailures = validationResults.SelectMany(x => x.Errors);
 			foreach (var validationError in validationFailures)
 			{
-				GetParentObjectAndPropertyName(editContext.Model, validationError.PropertyName, out object parentObject, out string propertyName);
+				GetParentObjectAndPropertyName(transformedModel, validationError.PropertyName, out object parentObject, out string propertyName);
 				if (parentObject != null)
 					messages.Add(new FieldIdentifier(parentObject, propertyName), validationError.ErrorMessage);
 			}
 
 			editContext.NotifyValidationStateChanged();
 		}
+		private object GetTransformedModel(object model)
+		{
+			return OnTransformModel is not null ? OnTransformModel(model) : model;
+		}
 
 		private void GetParentObjectAndPropertyName(
 			object model,
@@ -120,11 +132,13 @@ private void GetParentObjectAndPropertyName(
 			propertyName = propertyPathParts.Dequeue();
 		}
 
-		private async Task ValidateField(
+		private async Task ValidateField
+		(
 			EditContext editContext,
 			ValidationMessageStore messages,
 			FieldIdentifier fieldIdentifier,
-			IServiceProvider serviceProvider)
+			IServiceProvider serviceProvider
+		)
 		{
 			if (editContext == null)
 				throw new ArgumentNullException(nameof(editContext));
@@ -135,18 +149,19 @@ private async Task ValidateField(
 			if (editContext.Model == null)
 				throw new NullReferenceException($"{nameof(editContext)}.{nameof(editContext.Model)}");
 
+			object transformedModel = GetTransformedModel(editContext.Model);
 			var propertiesToValidate = new string[] { fieldIdentifier.FieldName };
-			var fluentValidationContext = 
+			var fluentValidationContext =
 				new ValidationContext<object>(
-					instanceToValidate: fieldIdentifier.Model,
+					instanceToValidate: transformedModel,
 					propertyChain: new PropertyChain(),
 					validatorSelector: new MemberNameValidatorSelector(propertiesToValidate)
 				);
 
 			messages.Clear(fieldIdentifier);
 			editContext.NotifyValidationStateChanged();
 
-			IEnumerable<IValidator> validators = GetValidatorsForObject(fieldIdentifier.Model, serviceProvider);
+			IEnumerable<IValidator> validators = GetValidatorsForObject(transformedModel, serviceProvider);
 			var validationResults = new List<ValidationResult>();
 
 			foreach (IValidator validator in validators)

Source/Lib/Morris.Blazor.FluentValidation/Morris.Blazor.FluentValidation.csproj

@@ -12,7 +12,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FluentValidation" Version="11.4.0" />
+		<PackageReference Include="FluentValidation" Version="11.5.2" />
 	</ItemGroup>
 
 	<ItemGroup>

Source/Lib/Morris.Blazor.Validation/DataAnnotationsValidatorProvider.cs

@@ -6,10 +6,13 @@ namespace Morris.Blazor.Validation
 {
 	public class DataAnnotationsValidatorProvider : IValidationProvider
 	{
-		public void InitializeEditContext(
+		public void InitializeEditContext
+		(
 			EditContext editContext,
 			IServiceProvider serviceProvider,
-			ValidationProperties properties)
+			ValidationProperties properties,
+			Func<object, object> transformModel = null
+		)
 		{
 #if NET7_0_OR_GREATER
 			editContext.EnableDataAnnotationsValidation(serviceProvider);

Source/Lib/Morris.Blazor.Validation/IValidationProvider.cs

@@ -5,6 +5,12 @@ namespace Morris.Blazor.Validation
 {
 	public interface IValidationProvider
 	{
-		void InitializeEditContext(EditContext editContext, IServiceProvider serviceProvider, ValidationProperties properties);
+		void InitializeEditContext
+		(
+			EditContext editContext, 
+			IServiceProvider serviceProvider, 
+			ValidationProperties properties,
+			Func<object, object> transformModel = null
+		);
 	}
 }

Source/Lib/Morris.Blazor.Validation/Morris.Blazor.Validation.csproj

@@ -2,8 +2,6 @@
 
 	<PropertyGroup>
 		<IsPackable>true</IsPackable>
-		<LangVersion>10</LangVersion>
-		<RazorLangVersion>3.0</RazorLangVersion>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<PackageId>Morris.Blazor.Validation</PackageId>
 		<Product>Morris.Blazor.Validation</Product>

Source/Lib/Morris.Blazor.Validation/Validate.cs

@@ -18,6 +18,8 @@ public class Validate : ComponentBase
 
 		[Inject]
 		IServiceProvider ServiceProvider { get; set; }
+		[Parameter]
+		public Func<object, object> OnTransformModel { get; set; } = null;
 
 		public override async Task SetParametersAsync(ParameterView parameters)
 		{
@@ -39,7 +41,7 @@ private void EditContextChanged()
 			foreach (Type providerType in Repository.All)
 			{
 				var validationProvider = (IValidationProvider)ServiceProvider.GetService(providerType);
-				validationProvider.InitializeEditContext(CurrentEditContext, ServiceProvider, ValidationProperties);
+				validationProvider.InitializeEditContext(CurrentEditContext, ServiceProvider, ValidationProperties, OnTransformModel);
 			}
 		}
 	}

Source/Samples/02-FluentValidation/FluentValidationSample/Pages/Index.razor

@@ -5,7 +5,7 @@
 @using Morris.Blazor.FluentValidation
 
 <EditForm Model=@Person OnSubmit=SubmitForm>
-	<Morris.Blazor.Validation.Validate ValidationProperties=@(ValidationProperties.Set.FluentValidator<PersonValidator>())/>
+	<Morris.Blazor.Validation.Validate ValidationProperties=@(ValidationProperties.Set.FluentValidator<PersonValidator>()) OnTransformModel=OnTransformModel />
 	<div class="mb-2 row">
 		<div class="col-3">
 			<label>Salutation</label>
@@ -74,6 +74,13 @@
 @code{
 	Models.Person Person = new Models.Person();
 
+	private object OnTransformModel(object model)
+	{
+		// Confirm that the model is of the expected type
+		// Do transformations here
+		// return the transformed model
+        return model;
+    }
 	void SubmitForm(EditContext editContext)
 	{
 		editContext.ValidateObjectTree();