Address feedback from peer review

Author: captainsafia

src/Components/Components/src/Routing/Router.cs

@@ -59,7 +59,8 @@ static readonly ReadOnlyDictionary<string, object> _emptyParametersDictionary
         [Parameter] public RenderFragment<RouteData> Found { get; set; }
 
         /// <summary>
-        /// Gets or sets a handler that should be called before navigating to a new page.
+        /// Gets or sets a handler that should be called before navigating to a new page. Return <c>true</c>
+        /// if the route's component should be rendered following invocation. Return <c>false</c> otherwise.
         /// </summary>
         [Parameter] public Func<string, bool> OnNavigate { get; set; }
 
@@ -107,14 +108,14 @@ public Task SetParametersAsync(ParameterView parameters)
             // we need to call the `OnNavigate` handler to ensure that pre-processing
             // steps are completed before rendering the route. This way, it will work
             // if you navigate to /PageWithLazyLoadedAssemblies or visit it for the first time.
-            if (OnNavigate != null && !initialOnNavigateCalled) {
+            if (OnNavigate != null && !initialOnNavigateCalled)
+            {
                 OnNavigate(NavigationManager.ToBaseRelativePath(_locationAbsolute));
                 initialOnNavigateCalled = true;
             }
 
             Refresh(isNavigationIntercepted: false);
 
-
             return Task.CompletedTask;
         }
 
@@ -178,9 +179,11 @@ private void OnLocationChanged(object sender, LocationChangedEventArgs args)
             _locationAbsolute = args.Location;
             if (_renderHandle.IsInitialized && Routes != null)
             {
-                if (OnNavigate != null) {
+                if (OnNavigate != null)
+                {
                     var continueRender = OnNavigate(NavigationManager.ToBaseRelativePath(_locationAbsolute));
-                    if (!continueRender) {
+                    if (!continueRender)
+                    {
                         return;
                     }
                 }

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

@@ -191,7 +191,7 @@ internal void InitializeDefaultServices()
             Services.AddSingleton<IJSRuntime>(DefaultWebAssemblyJSRuntime.Instance);
             Services.AddSingleton<NavigationManager>(WebAssemblyNavigationManager.Instance);
             Services.AddSingleton<INavigationInterception>(WebAssemblyNavigationInterception.Instance);
-            Services.AddSingleton<WebAssemblyDynamicResourceLoader>(new WebAssemblyDynamicResourceLoader(DefaultWebAssemblyJSRuntime.Instance));
+            Services.AddSingleton<WebAssemblyDynamicAssemblyLoader>(new WebAssemblyDynamicAssemblyLoader(DefaultWebAssemblyJSRuntime.Instance));
             Services.AddLogging(builder => {
                 builder.AddProvider(new WebAssemblyConsoleLoggerProvider(DefaultWebAssemblyJSRuntime.Instance));
             });

src/Components/WebAssembly/WebAssembly/src/Services/WebAssemblyDynamicResourceLoader.cs renamed to src/Components/WebAssembly/WebAssembly/src/Services/WebAssemblyDynamicAssemblyLoader.cs

@@ -10,23 +10,23 @@
 using System.Runtime.Loader;
 using Microsoft.JSInterop.WebAssembly;
 
-namespace Microsoft.AspNetCore.Components.WebAssembly.Services
+namespace Microsoft.AspNetCore.Components.WebAssembly
 {
-    public class WebAssemblyDynamicResourceLoader
+    public class WebAssemblyDynamicAssemblyLoader
     {
         internal const string GetDynamicAssemblies = "window.Blazor._internal.getDynamicAssemblies";
         internal const string ReadDynamicAssemblies = "window.Blazor._internal.readDynamicAssemblies";
 
-        private static List<string> _loadedAssemblyCache = new List<string>();
+        private List<string> _loadedAssemblyCache = new List<string>();
 
         private readonly WebAssemblyJSRuntime _jsRuntime;
 
-        internal WebAssemblyDynamicResourceLoader(WebAssemblyJSRuntime jsRuntime)
+        internal WebAssemblyDynamicAssemblyLoader(WebAssemblyJSRuntime jsRuntime)
         {
             _jsRuntime = jsRuntime;
         }
 
-        public async Task<IEnumerable<Assembly>> LoadDynamicAssemblies(IEnumerable<string> assembliesToLoad)
+        public async Task<IEnumerable<Assembly>> LoadAssembliesAsync(IEnumerable<string> assembliesToLoad)
         {
             // Only load assemblies that haven't already been lazily-loaded
             var newAssembliesToLoad = assembliesToLoad.Where(assembly => !_loadedAssemblyCache.Contains(assembly));

src/Components/test/testassets/BasicTestApp/RouterTest/TestRouterWithDynamicAssembly.razor

@@ -1,9 +1,9 @@
 @using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.WebAssembly.Services
+@using Microsoft.AspNetCore.Components.WebAssembly
 @using System.Linq
 @using System.Reflection
 
-@inject WebAssemblyDynamicResourceLoader lazyLoader
+@inject WebAssemblyDynamicAssemblyLoader lazyLoader
 
 <Router AppAssembly="@typeof(BasicTestApp.Program).Assembly" AdditionalAssemblies="@lazyLoadedAssemblies" OnNavigate="@OnNavigate">
     <Found Context="routeData">
@@ -19,25 +19,33 @@
 @code {
     private List<Assembly> lazyLoadedAssemblies = new List<Assembly>();
 
-    public bool OnNavigate (string uri) {
+    public bool OnNavigate (string uri)
+    {
         Console.WriteLine($"Running OnNavigate for {uri}...");
         _ = LoadAssemblies(uri);
         return false;
     }
 
-    private async Task LoadAssemblies(string uri) {
+    private async Task LoadAssemblies(string uri)
+    {
         bool loadedAssemblies = false;
-        try {
-            if (uri.EndsWith("WithDynamicAssembly")) {
+        try
+        {
+            if (uri.EndsWith("WithDynamicAssembly"))
+            {
                 loadedAssemblies = true;
                 Console.WriteLine($"Loading assemblies for WithDynamicAssembly...");
-                var assemblies = await lazyLoader.LoadDynamicAssemblies(new List<string>(){ "Newtonsoft.Json.dll" });
+                var assemblies = await lazyLoader.LoadAssembliesAsync(new List<string>(){ "Newtonsoft.Json.dll" });
                 lazyLoadedAssemblies.AddRange(assemblies);
             }
-        } catch (Exception e) {
+        }
+        catch (Exception e)
+        {
             Console.WriteLine($"Error when loading assemblies: {e}");
-        } finally {
-            if (loadedAssemblies) {
+        }
+        finally {
+            if (loadedAssemblies)
+            {
                 Console.WriteLine("Calling StateHasChanged...");
                 StateHasChanged();
             }