Cleanups

Author: javiercn

src/Components/Endpoints/src/Binding/Converters/NullableConverter.cs

@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components.Endpoints.Binding;
+
+internal sealed class NullableConverter<T> : FormDataConverter<T?> where T : struct
+{
+    private readonly FormDataConverter<T> _nonNullableConverter;
+
+    public NullableConverter(FormDataConverter<T> nonNullableConverter)
+    {
+        _nonNullableConverter = nonNullableConverter;
+    }
+
+    internal override bool TryRead(ref FormDataReader context, Type type, FormDataMapperOptions options, out T? result, out bool found)
+    {
+        if (!(_nonNullableConverter.TryRead(ref context, type, options, out var innerResult, out found) && found))
+        {
+            result = null;
+            return false;
+        }
+        else
+        {
+            result = innerResult;
+            return true;
+        }
+    }
+}

src/Components/Endpoints/src/Binding/Converters/ParsableConverter.cs

@@ -0,0 +1,21 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components.Endpoints.Binding;
+
+internal sealed class ParsableConverter<T> : FormDataConverter<T>, ISingleValueConverter where T : IParsable<T>
+{
+    internal override bool TryRead(ref FormDataReader reader, Type type, FormDataMapperOptions options, out T? result, out bool found)
+    {
+        found = reader.TryGetValue(out var value);
+        if (found && T.TryParse(value, reader.Culture, out result))
+        {
+            return true;
+        }
+        else
+        {
+            result = default;
+            return false;
+        }
+    }
+}

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

@@ -34,7 +34,7 @@ public bool CanBind(string formName, Type valueType)
     {
         return _formData.IsFormDataAvailable &&
             string.Equals(formName, _formData.Name, StringComparison.Ordinal) &&
-            _options.HasConverter(valueType);
+            _options.ResolveConverter(valueType) != null;
     }
 
     public bool TryBind(string formName, Type valueType, [NotNullWhen(true)] out object? boundValue)

src/Components/Endpoints/src/Binding/NullableConverter.cs renamed to src/Components/Endpoints/src/Binding/Factories/NullableConverterFactory.cs

@@ -7,45 +7,26 @@ namespace Microsoft.AspNetCore.Components.Endpoints.Binding;
 
 internal sealed class NullableConverterFactory : IFormDataConverterFactory
 {
-    public static bool CanConvert(Type type, FormDataMapperOptions options)
+    public static readonly NullableConverterFactory Instance = new();
+
+    public bool CanConvert(Type type, FormDataMapperOptions options)
     {
         var underlyingType = Nullable.GetUnderlyingType(type);
-        return underlyingType != null && options.HasConverter(underlyingType);
+        return underlyingType != null && options.ResolveConverter(underlyingType) != null;
     }
 
-    public static FormDataConverter CreateConverter(Type type, FormDataMapperOptions options)
+    public FormDataConverter CreateConverter(Type type, FormDataMapperOptions options)
     {
         var underlyingType = Nullable.GetUnderlyingType(type);
         Debug.Assert(underlyingType != null);
+
         var underlyingConverter = options.ResolveConverter(underlyingType);
         Debug.Assert(underlyingConverter != null);
+
         var expectedConverterType = typeof(NullableConverter<>).MakeGenericType(underlyingType);
         Debug.Assert(expectedConverterType != null);
+
         return Activator.CreateInstance(expectedConverterType, underlyingConverter) as FormDataConverter ??
             throw new InvalidOperationException($"Unable to create converter for type '{type}'.");
     }
 }
-
-internal class NullableConverter<T> : FormDataConverter<T?> where T : struct
-{
-    private readonly FormDataConverter<T> _nonNullableConverter;
-
-    public NullableConverter(FormDataConverter<T> nonNullableConverter)
-    {
-        _nonNullableConverter = nonNullableConverter;
-    }
-
-    internal override bool TryRead(ref FormDataReader context, Type type, FormDataMapperOptions options, out T? result, out bool found)
-    {
-        if (!(_nonNullableConverter.TryRead(ref context, type, options, out var innerResult, out found) && found))
-        {
-            result = null;
-            return false;
-        }
-        else
-        {
-            result = innerResult;
-            return true;
-        }
-    }
-}

src/Components/Endpoints/src/Binding/Factories/ParsableConverterFactory.cs

@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.Extensions.Internal;
+
+namespace Microsoft.AspNetCore.Components.Endpoints.Binding;
+
+internal sealed class ParsableConverterFactory : IFormDataConverterFactory
+{
+    public static readonly ParsableConverterFactory Instance = new();
+
+    public bool CanConvert(Type type, FormDataMapperOptions options)
+    {
+        return ClosedGenericMatcher.ExtractGenericInterface(type, typeof(IParsable<>)) is not null;
+    }
+
+    public FormDataConverter CreateConverter(Type type, FormDataMapperOptions options)
+    {
+        return Activator.CreateInstance(typeof(ParsableConverter<>).MakeGenericType(type)) as FormDataConverter ??
+            throw new InvalidOperationException($"Unable to create converter for '{type.FullName}'.");
+    }
+}

src/Components/Endpoints/src/Binding/FormDataConverter.cs

@@ -1,8 +1,9 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace Microsoft.AspNetCore.Components.Endpoints.Binding;
 
+// Base type for all types that can map from form data to a .NET type.
 internal class FormDataConverter
 {
 }

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

@@ -14,8 +14,8 @@ public FormDataMapperOptions()
     {
         _converters = new(WellKnownConverters.Converters);
 
-        _factories.Add((type, options) => ParsableConverterFactory.CanConvert(type, options) ? ParsableConverterFactory.CreateConverter(type, options) : null);
-        _factories.Add((type, options) => NullableConverterFactory.CanConvert(type, options) ? NullableConverterFactory.CreateConverter(type, options) : null);
+        _factories.Add((type, options) => ParsableConverterFactory.Instance.CanConvert(type, options) ? ParsableConverterFactory.Instance.CreateConverter(type, options) : null);
+        _factories.Add((type, options) => NullableConverterFactory.Instance.CanConvert(type, options) ? NullableConverterFactory.Instance.CreateConverter(type, options) : null);
     }
 
     internal bool HasConverter(Type valueType) => _converters.ContainsKey(valueType);

src/Components/Endpoints/src/Binding/IFormDataConverterFactory.cs

@@ -1,11 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace Microsoft.AspNetCore.Components.Endpoints.Binding;
 
 internal interface IFormDataConverterFactory
 {
-    public static abstract bool CanConvert(Type type, FormDataMapperOptions options);
+    public bool CanConvert(Type type, FormDataMapperOptions options);
 
-    public static abstract FormDataConverter CreateConverter(Type type, FormDataMapperOptions options);
+    public FormDataConverter CreateConverter(Type type, FormDataMapperOptions options);
 }

src/Components/Endpoints/src/Binding/ParsableConverter.cs

@@ -32,18 +32,14 @@
     <Compile Include="$(RepoRoot)src\Shared\Components\ComponentParameter.cs" LinkBase="DependencyInjection" />
     <Compile Include="$(RepoRoot)src\Shared\Components\PrerenderComponentApplicationStore.cs" LinkBase="DependencyInjection" />
     <Compile Include="$(RepoRoot)src\Shared\Components\ProtectedPrerenderComponentApplicationStore.cs" LinkBase="DependencyInjection" />
+    <Compile Include="$(RepoRoot)src\Shared\ClosedGenericMatcher\ClosedGenericMatcher.cs" LinkBase="Binding" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\CacheHeaderSettings.cs" Link="Shared\CacheHeaderSettings.cs" />
 
     <Compile Include="$(SharedSourceRoot)PropertyHelper\**\*.cs" />
 
     <!-- Add a project dependency without reference output assemblies to enforce build order -->
     <!-- Applying workaround for https://github.com/microsoft/msbuild/issues/2661 and https://github.com/dotnet/sdk/issues/952 -->
-    <ProjectReference Include="..\..\Web.JS\Microsoft.AspNetCore.Components.Web.JS.npmproj"
-      Condition="'$(BuildNodeJS)' != 'false' and '$(BuildingInsideVisualStudio)' != 'true'"
-      Private="false"
-      ReferenceOutputAssembly="false"
-      SkipGetTargetFrameworkProperties="true"
-      UndefineProperties="TargetFramework" />
+    <ProjectReference Include="..\..\Web.JS\Microsoft.AspNetCore.Components.Web.JS.npmproj" Condition="'$(BuildNodeJS)' != 'false' and '$(BuildingInsideVisualStudio)' != 'true'" Private="false" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" UndefineProperties="TargetFramework" />
   </ItemGroup>
 
   <ItemGroup>

src/Components/Endpoints/src/Microsoft.AspNetCore.Components.Endpoints.csproj

@@ -76,7 +76,7 @@ public void CanDeserialize_CustomParsableTypes()
         // Assert
         Assert.Equal(expected, result);
     }
-    
+
 #nullable enable
     [Fact]
     public void CanDeserialize_NullableCustomParsableTypes()
@@ -299,6 +299,7 @@ public static bool TryParse([NotNullWhen(true)] string s, IFormatProvider provid
 internal struct ValuePoint : IParsable<ValuePoint>, IEquatable<ValuePoint>
 {
     public int X { get; set; }
+
     public int Y { get; set; }
 
     public static ValuePoint Parse(string s, IFormatProvider provider)

src/Components/Endpoints/test/Binding/FormDataMapperTests.cs

@@ -32,8 +32,13 @@ internal static class ClosedGenericMatcher
     /// </remarks>
     public static Type? ExtractGenericInterface(Type queryType, Type interfaceType)
     {
+#if !NET8_0_OR_GREATER
         ArgumentNullThrowHelper.ThrowIfNull(queryType);
         ArgumentNullThrowHelper.ThrowIfNull(interfaceType);
+#else
+        ArgumentNullException.ThrowIfNull(queryType);
+        ArgumentNullException.ThrowIfNull(interfaceType);
+#endif
 
         if (IsGenericInstantiation(queryType, interfaceType))
         {