Address feedback

Author: javiercn

src/Components/Endpoints/src/Binding/DefaultFormValuesSupplier.cs

@@ -50,7 +50,7 @@ public void Bind(FormValueSupplierContext context)
 
         var deserializer = _cache.GetOrAdd(context.ValueType, CreateDeserializer);
         Debug.Assert(deserializer != null);
-        deserializer.Deserialize(context, _options, _formData.Entries, _formData.FormOptions);
+        deserializer.Deserialize(context, _options, _formData.Entries);
     }
 
     private FormValueSupplier CreateDeserializer(Type type) =>
@@ -62,17 +62,15 @@ internal abstract class FormValueSupplier
         public abstract void Deserialize(
             FormValueSupplierContext context,
             FormDataMapperOptions options,
-            IReadOnlyDictionary<string, StringValues> form,
-            FormOptions formOptions);
+            IReadOnlyDictionary<string, StringValues> form);
     }
 
     internal class FormValueSupplier<T> : FormValueSupplier
     {
         public override void Deserialize(
             FormValueSupplierContext context,
             FormDataMapperOptions options,
-            IReadOnlyDictionary<string, StringValues> form,
-            FormOptions formOptions)
+            IReadOnlyDictionary<string, StringValues> form)
         {
             if (form.Count == 0)
             {
@@ -87,12 +85,12 @@ public override void Deserialize(
                 {
                     dictionary.Add(new FormKey(key.AsMemory()), value);
                 }
-                buffer = ArrayPool<char>.Shared.Rent(formOptions.KeyLengthLimit);
+                buffer = ArrayPool<char>.Shared.Rent(options.MaxKeyBufferSize);
 
                 // Form values are parsed according to the culture of the request, which is set to the current culture by the localization middleware.
                 // Some form input types use the invariant culture when sending the data to the server. For those cases, we'll
                 // provide a way to override the culture to use to parse that value.
-                var reader = new FormDataReader(dictionary, CultureInfo.CurrentCulture, buffer.AsMemory(0, formOptions.KeyLengthLimit))
+                var reader = new FormDataReader(dictionary, CultureInfo.CurrentCulture, buffer.AsMemory(options.MaxKeyBufferSize))
                 {
                     ErrorHandler = context.OnError,
                     AttachInstanceToErrorsHandler = context.MapErrorToContainer

src/Components/Endpoints/src/Binding/FormDataMapperOptions.cs

@@ -3,6 +3,8 @@
 
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.WebUtilities;
 
 namespace Microsoft.AspNetCore.Components.Endpoints.Binding;
 
@@ -31,6 +33,8 @@ public FormDataMapperOptions()
     // which is O(n).
     internal int MaxCollectionSize = 100;
 
+    internal int MaxKeyBufferSize = FormReader.DefaultKeyLengthLimit;
+
     internal bool HasConverter(Type valueType) => _converters.ContainsKey(valueType);
 
     internal bool IsSingleValueConverter(Type type)

src/Components/Endpoints/src/Binding/HttpContextFormDataProvider.cs

@@ -17,13 +17,6 @@ internal sealed class HttpContextFormDataProvider : FormDataProvider, IHostEnvir
 
     public override IReadOnlyDictionary<string, StringValues> Entries => _entries ?? ReadOnlyDictionary<string, StringValues>.Empty;
 
-    public FormOptions FormOptions { get; private set; } = null!;
-
-    internal void SetFormOptions(FormOptions formOptions)
-    {
-        FormOptions = formOptions;
-    }
-
     void IHostEnvironmentFormDataProvider.SetFormData(string name, IReadOnlyDictionary<string, StringValues> form)
     {
         _name = name;

src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs

@@ -88,10 +88,6 @@ internal static async Task InitializeStandardComponentServicesAsync(
         if (handler != null && form != null && formData != null)
         {
             formData.SetFormData(handler, new FormCollectionReadOnlyDictionary(form));
-            if (formOptions != null && formData is HttpContextFormDataProvider contextFormData)
-            {
-                contextFormData.SetFormOptions(formOptions);
-            }
         }
 
         // It's important that this is initialized since a component might try to restore state during prerendering

src/Components/Web/src/Forms/EditForm.cs

@@ -12,6 +12,7 @@ namespace Microsoft.AspNetCore.Components.Forms;
 public class EditForm : ComponentBase
 {
     private readonly Func<Task> _handleSubmitDelegate; // Cache to avoid per-render allocations
+    private readonly RenderFragment _renderWithBindingValidator;
 
     private EditContext? _editContext;
     private bool _hasSetEditContextExplicitly;
@@ -22,6 +23,7 @@ public class EditForm : ComponentBase
     public EditForm()
     {
         _handleSubmitDelegate = HandleSubmitAsync;
+        _renderWithBindingValidator = RenderWithBindingValidator;
     }
 
     /// <summary>
@@ -176,7 +178,7 @@ void RenderFormContents(RenderTreeBuilder builder, ModelBindingContext? bindingC
             builder.AddComponentParameter(7, "Value", _editContext);
             if (bindingContext != null && !OperatingSystem.IsBrowser())
             {
-                builder.AddComponentParameter(8, "ChildContent", RenderWithBindingValidator());
+                builder.AddComponentParameter(8, "ChildContent", _renderWithBindingValidator);
             }
             else
             {
@@ -187,14 +189,11 @@ void RenderFormContents(RenderTreeBuilder builder, ModelBindingContext? bindingC
         }
     }
 
-    private RenderFragment? RenderWithBindingValidator()
+    private void RenderWithBindingValidator(RenderTreeBuilder builder)
     {
-        return builder =>
-        {
-            builder.OpenComponent<ModelBindingContextValidator>(1);
-            builder.CloseComponent();
-            builder.AddContent(2, ChildContent!, EditContext);
-        };
+        builder.OpenComponent<ModelBindingContextValidator>(1);
+        builder.CloseComponent();
+        builder.AddContent(2, ChildContent!, EditContext);
     }
 
     private async Task HandleSubmitAsync()

src/Components/Web/src/Forms/ValidationMessage.cs

@@ -52,8 +52,7 @@ protected override void OnParametersSet()
                 $"{nameof(For)} parameter.");
         }
         else if (For != _previousFieldAccessor)
-        {
-            
+        {            
             _fieldIdentifier = FieldIdentifier.Create(For);
             _previousFieldAccessor = For;
         }

src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj

@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(ComponentsSharedSourceRoot)src\ExpressionFormatting\**\*" LinkBase="Forms\ExpressionFommatting" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\ExpressionFormatting\**\*.cs" LinkBase="Forms\ExpressionFommatting" />
   </ItemGroup>
 
   <ItemGroup>

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Forms/CustomNumberInput.razor

@@ -6,15 +6,6 @@
 @code {
     protected override bool TryParseValueFromString(string value, [MaybeNullWhen(false)] out int result, [NotNullWhen(false)] out string validationErrorMessage)
     {
-        if(int.TryParse(value, out result))
-        {
-            validationErrorMessage = null;
-            return true;
-        }else
-        {
-            // This is not used, since the error comes from the binding process.
-            validationErrorMessage = "Not used.";
-            return false;
-        }
+        throw new NotImplementedException();
     }
 }