Refactor RootTypeCache hot reload to use instance Clear method

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

Author: Copilot

src/Components/Components/src/PersistentState/PersistentServicesRegistry.cs

@@ -30,6 +30,7 @@ static PersistentServicesRegistry()
         if (HotReloadManager.Default.MetadataUpdateSupported)
         {
             HotReloadManager.Default.OnDeltaApplied += _cachedAccessorsByType.Clear;
+            HotReloadManager.Default.OnDeltaApplied += _persistentServiceTypeCache.Clear;
         }
     }
 

src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs

@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Endpoints;
 using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components.HotReload;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.Components.Server;
 using Microsoft.AspNetCore.Components.Server.BlazorPack;
@@ -67,7 +68,12 @@ public static IServerSideBlazorBuilder AddServerSideBlazor(this IServiceCollecti
         services.TryAddSingleton<CircuitMetrics>();
         services.TryAddSingleton<ICircuitFactory, CircuitFactory>();
         services.TryAddSingleton<ICircuitHandleRegistry, CircuitHandleRegistry>();
-        services.TryAddSingleton<RootTypeCache>();
+        services.TryAddSingleton<RootTypeCache>(serviceProvider =>
+        {
+            var cache = new RootTypeCache();
+            RegisterForHotReload(cache);
+            return cache;
+        });
         services.TryAddSingleton<ComponentParameterDeserializer>();
         services.TryAddSingleton<ComponentParametersTypeCache>();
         services.TryAddSingleton<CircuitIdFactory>();
@@ -124,6 +130,14 @@ public static IServerSideBlazorBuilder AddServerSideBlazor(this IServiceCollecti
         return builder;
     }
 
+    private static void RegisterForHotReload(RootTypeCache cache)
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += cache.Clear;
+        }
+    }
+
     private sealed class DefaultServerSideBlazorBuilder : IServerSideBlazorBuilder
     {
         public DefaultServerSideBlazorBuilder(IServiceCollection services)

src/Components/Shared/src/RootTypeCache.cs

@@ -4,64 +4,22 @@
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
-#if COMPONENTS
-using Microsoft.AspNetCore.Components.HotReload;
-#endif
 
-#if COMPONENTS
-namespace Microsoft.AspNetCore.Components.Infrastructure;
-#else
 namespace Microsoft.AspNetCore.Components;
-#endif
 
 // A cache for root component types
 internal sealed class RootTypeCache
 {
-#if COMPONENTS
-    private static readonly List<WeakReference> _instances = new();
-
-    static RootTypeCache()
-    {
-        if (HotReloadManager.Default.MetadataUpdateSupported)
-        {
-            HotReloadManager.Default.OnDeltaApplied += ClearCache;
-        }
-    }
-#endif
-
     private readonly ConcurrentDictionary<Key, Type?> _typeToKeyLookUp = new();
 
     public RootTypeCache()
     {
-#if COMPONENTS
-        lock (_instances)
-        {
-            _instances.Add(new WeakReference(this));
-        }
-#endif
     }
 
-#if COMPONENTS
-    private static void ClearCache()
+    internal void Clear()
     {
-        lock (_instances)
-        {
-            for (int i = _instances.Count - 1; i >= 0; i--)
-            {
-                var weakRef = _instances[i];
-                if (weakRef.Target is RootTypeCache instance)
-                {
-                    instance._typeToKeyLookUp.Clear();
-                }
-                else
-                {
-                    // Remove dead reference
-                    _instances.RemoveAt(i);
-                }
-            }
-        }
+        _typeToKeyLookUp.Clear();
     }
-#endif
 
     public Type? GetRootType(string assembly, string type)
     {

src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHostBuilder.cs

@@ -323,7 +323,11 @@ internal void InitializeDefaultServices()
         Services.AddSingleton<IScrollToLocationHash>(WebAssemblyScrollToLocationHash.Instance);
         Services.AddSingleton(_jsMethods);
         Services.AddSingleton(new LazyAssemblyLoader(DefaultWebAssemblyJSRuntime.Instance));
-        Services.AddSingleton(_ => _rootComponentCache ?? new());
+        Services.AddSingleton(serviceProvider =>
+        {
+            var cache = _rootComponentCache ?? new RootTypeCache();
+            return cache;
+        });
         Services.AddSingleton<ComponentStatePersistenceManager>();
         Services.AddSingleton(sp => sp.GetRequiredService<ComponentStatePersistenceManager>().State);
         Services.AddSupplyValueFromPersistentComponentStateProvider();