Implement explicit interface implementation in IPersistentComponentStateSerializer<T> and make base interface public

Co-authored-by: javiercn <[email protected]>

Author: Copilot

src/Components/Components/src/IPersistentComponentStateSerializer.cs

@@ -5,7 +5,7 @@
 
 namespace Microsoft.AspNetCore.Components;
 
-internal interface IPersistentComponentStateSerializer
+public interface IPersistentComponentStateSerializer
 {
     Task PersistAsync(Type type, object value, IBufferWriter<byte> writer);
     object Restore(Type type, ReadOnlySequence<byte> data);

src/Components/Components/src/IPersistentComponentStateSerializerOfT.cs

@@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Components;
 /// Provides custom serialization logic for persistent component state values of type <typeparamref name="T"/>.
 /// </summary>
 /// <typeparam name="T">The type of the value to serialize.</typeparam>
-public interface IPersistentComponentStateSerializer<T>
+public interface IPersistentComponentStateSerializer<T> : IPersistentComponentStateSerializer
 {
     /// <summary>
     /// Serializes the provided <paramref name="value"/> and writes it to the <paramref name="writer"/>.
@@ -26,4 +26,16 @@ public interface IPersistentComponentStateSerializer<T>
     /// <param name="data">The serialized data to deserialize.</param>
     /// <returns>The deserialized value.</returns>
     T Restore(ReadOnlySequence<byte> data);
+
+    /// <summary>
+    /// Explicit interface implementation for non-generic serialization.
+    /// </summary>
+    Task IPersistentComponentStateSerializer.PersistAsync(Type type, object value, IBufferWriter<byte> writer)
+        => PersistAsync((T)value, writer);
+
+    /// <summary>
+    /// Explicit interface implementation for non-generic deserialization.
+    /// </summary>
+    object IPersistentComponentStateSerializer.Restore(Type type, ReadOnlySequence<byte> data)
+        => Restore(data)!;
 }

src/Components/Components/src/PersistentStateValueProvider.cs

@@ -109,14 +109,8 @@ private static PropertyGetter ResolvePropertyGetter(Type type, string propertyNa
         var serializerType = typeof(IPersistentComponentStateSerializer<>).MakeGenericType(type);
         var serializer = serviceProvider.GetService(serializerType);
 
-        if (serializer != null)
-        {
-            // Create an adapter that implements the internal interface
-            var adapterType = typeof(SerializerAdapter<>).MakeGenericType(type);
-            return (IPersistentComponentStateSerializer?)Activator.CreateInstance(adapterType, serializer);
-        }
-        
-        return null;
+        // The generic interface now inherits from the internal interface, so we can cast directly
+        return serializer as IPersistentComponentStateSerializer;
     }
 
     [UnconditionalSuppressMessage(
@@ -374,13 +368,4 @@ internal bool TryTake<TValue>(string key, IPersistentComponentStateSerializer<TV
             return false;
         }
     }
-
-    private sealed class SerializerAdapter<T>(IPersistentComponentStateSerializer<T> serializer) : IPersistentComponentStateSerializer
-    {
-        Task IPersistentComponentStateSerializer.PersistAsync(Type type, object value, IBufferWriter<byte> writer)
-            => serializer.PersistAsync((T)value, writer);
-
-        object IPersistentComponentStateSerializer.Restore(Type type, ReadOnlySequence<byte> data)
-            => serializer.Restore(data)!;
-    }
 }

src/Components/Components/src/PublicAPI.Unshipped.txt

@@ -16,6 +16,9 @@ Microsoft.AspNetCore.Components.Infrastructure.RegisterPersistentComponentStateS
 Microsoft.AspNetCore.Components.PersistentStateAttribute
 Microsoft.AspNetCore.Components.PersistentStateAttribute.PersistentStateAttribute() -> void
 Microsoft.AspNetCore.Components.Infrastructure.PersistentStateProviderServiceCollectionExtensions
+Microsoft.AspNetCore.Components.IPersistentComponentStateSerializer
+Microsoft.AspNetCore.Components.IPersistentComponentStateSerializer.PersistAsync(System.Type! type, object! value, System.Buffers.IBufferWriter<byte>! writer) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Components.IPersistentComponentStateSerializer.Restore(System.Type! type, System.Buffers.ReadOnlySequence<byte> data) -> object!
 Microsoft.AspNetCore.Components.IPersistentComponentStateSerializer<T>
 Microsoft.AspNetCore.Components.IPersistentComponentStateSerializer<T>.PersistAsync(T value, System.Buffers.IBufferWriter<byte>! writer) -> System.Threading.Tasks.Task!
 Microsoft.AspNetCore.Components.IPersistentComponentStateSerializer<T>.Restore(System.Buffers.ReadOnlySequence<byte> data) -> T