Configure lazy-loaded assemblies in WebAssemblyLazyLoadDefinition

Author: captainsafia

src/Components/Components/src/NavigationManager.cs

@@ -2,9 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.Routing;
 
 namespace Microsoft.AspNetCore.Components
@@ -30,7 +27,6 @@ public event EventHandler<LocationChangedEventArgs> LocationChanged
                 _locationChanged -= value;
             }
         }
-        public Func<string, List<string>>? OnNavigate { get; set; }
 
         private EventHandler<LocationChangedEventArgs>? _locationChanged;
 
@@ -203,11 +199,10 @@ internal static string NormalizeBaseUri(string baseUri)
         /// <summary>
         /// Triggers the <see cref="LocationChanged"/> event with the current URI value.
         /// </summary>
-        protected async Task NotifyLocationChanged(bool isInterceptedLink)
+        protected void NotifyLocationChanged(bool isInterceptedLink)
         {
             try
             {
-                await BeforeLocationChangeAsync();
                 _locationChanged?.Invoke(this, new LocationChangedEventArgs(_uri!, isInterceptedLink));
             }
             catch (Exception ex)
@@ -216,8 +211,6 @@ protected async Task NotifyLocationChanged(bool isInterceptedLink)
             }
         }
 
-        public virtual Task BeforeLocationChangeAsync() => Task.CompletedTask;
-
         private void AssertInitialized()
         {
             if (!_isInitialized)

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

@@ -56,8 +56,6 @@ static readonly ReadOnlyDictionary<string, object> _emptyParametersDictionary
         /// </summary>
         [Parameter] public RenderFragment<RouteData> Found { get; set; }
 
-        [Parameter] public Func<string, List<string>> OnNavigate { get; set; }
-
         private RouteTable Routes { get; set; }
 
         /// <inheritdoc />
@@ -71,7 +69,7 @@ public void Attach(RenderHandle renderHandle)
         }
 
         /// <inheritdoc />
-        public async Task SetParametersAsync(ParameterView parameters)
+        public Task SetParametersAsync(ParameterView parameters)
         {
             parameters.SetParameterProperties(this);
 
@@ -95,16 +93,11 @@ public async Task SetParametersAsync(ParameterView parameters)
                 throw new InvalidOperationException($"The {nameof(Router)} component requires a value for the parameter {nameof(NotFound)}.");
             }
 
-            if (OnNavigate != null) {
-                NavigationManager.OnNavigate = OnNavigate;
-            }
-
-           await NavigationManager.BeforeLocationChangeAsync();
-
 
             var assemblies = AdditionalAssemblies == null ? new[] { AppAssembly } : new[] { AppAssembly }.Concat(AdditionalAssemblies);
             Routes = RouteTableFactory.Create(assemblies);
             Refresh(isNavigationIntercepted: false);
+            return Task.CompletedTask;
         }
 
         /// <inheritdoc />

src/Components/Web.JS/dist/Release/blazor.webassembly.js

@@ -296,12 +296,11 @@ function createEmscriptenModuleInstance(resourceLoader: WebAssemblyResourceLoade
       if (dynamicAssemblies) {
         const resourcePromises = Promise.all(assembliesToLoad
             .filter(assembly => dynamicAssemblies.hasOwnProperty(assembly))
-            .map(assembly => resourceLoader.loadResource(assembly, `_framework/_bin/${assembly}`, dynamicAssemblies[assembly], 'assembly'))
+            .map(assembly => resourceLoader.loadResource(assembly, `_framework/${assembly}`, dynamicAssemblies[assembly], 'assembly'))
             .map(async resource => (await resource.response).arrayBuffer()));
 
         return BINDING.js_to_mono_obj(
           resourcePromises.then(resourcesToLoad => {
-            console.log(`resourcesToLoad: ${resourcesToLoad}`)
             if (resourcesToLoad.length) {
               window['Blazor']._internal.readDynamicAssemblies = () => {
                 const array = BINDING.mono_obj_array_new(resourcesToLoad.length);

src/Components/Web.JS/src/Platform/Mono/MonoPlatform.ts

@@ -168,6 +168,11 @@ public void ConfigureContainer<TBuilder>(IServiceProviderFactory<TBuilder> facto
             };
         }
 
+        public void SetLazyLoadDefinition(WebAssemblyLazyLoadDefinition lazyLoadDefinition)
+        {
+            WebAssemblyNavigationManager.Instance.LazyLoadDefinition = lazyLoadDefinition;
+        }
+
         /// <summary>
         /// Builds a <see cref="WebAssemblyHost"/> instance based on the configuration of this builder.
         /// </summary>

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

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting
+{
+    public class WebAssemblyLazyLoadDefinition
+    {
+        public WebAssemblyLazyLoadDefinition()
+        {
+            LazyLoadMappings = new Dictionary<string, IEnumerable<string>>();
+        }
+
+        public WebAssemblyLazyLoadDefinition(Dictionary<string, IEnumerable<string>> _lazyLoadMappings)
+        {
+            LazyLoadMappings = _lazyLoadMappings;
+        }
+
+        public void AddRouteDefinition(string route, IEnumerable<string> assemblies)
+        {
+            LazyLoadMappings[route] = assemblies;
+        }
+
+        public IEnumerable<string> GetLazyAssembliesForRoute(string uri)
+        {
+            IEnumerable<string> assembliesToLoad;
+
+            if (!LazyLoadMappings.TryGetValue(uri, out assembliesToLoad))
+            {
+                return null;
+            }
+            return assembliesToLoad;
+        }
+
+        public Dictionary<string, IEnumerable<string>> LazyLoadMappings { get; }
+    }
+}

src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyLazyLoadDefinition.cs

@@ -3,9 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.Routing;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Interop = Microsoft.AspNetCore.Components.Web.BrowserNavigationManagerInterop;
 
 namespace Microsoft.AspNetCore.Components.WebAssembly.Services
@@ -20,15 +22,18 @@ internal class WebAssemblyNavigationManager : NavigationManager
         /// </summary>
         public static WebAssemblyNavigationManager Instance { get; set; }
 
+        public WebAssemblyLazyLoadDefinition LazyLoadDefinition { get; set;  }
+
         public WebAssemblyNavigationManager(string baseUri, string uri)
         {
             Initialize(baseUri, uri);
         }
 
-        public Task SetLocation(string uri, bool isInterceptedLink)
+        public async Task SetLocation(string uri, bool isInterceptedLink)
         {
             Uri = uri;
-            return NotifyLocationChanged(isInterceptedLink);
+            await BeforeLocationChangeAsync();
+            NotifyLocationChanged(isInterceptedLink);
         }
 
         /// <inheritdoc />
@@ -42,15 +47,16 @@ protected override void NavigateToCore(string uri, bool forceLoad)
             DefaultWebAssemblyJSRuntime.Instance.Invoke<object>(Interop.NavigateTo, uri, forceLoad);
         }
 
-        public override async Task BeforeLocationChangeAsync()
+        public async Task BeforeLocationChangeAsync()
         {
-            if (OnNavigate == null) {
+            if (LazyLoadDefinition == null) {
                 return;
             }
 
-            var assembliesToLoad = OnNavigate(Uri);
+            var path = Uri.Replace(BaseUri, "");
+            var assembliesToLoad = LazyLoadDefinition.GetLazyAssembliesForRoute(path);
 
-            if (assembliesToLoad.Count == 0)
+            if (assembliesToLoad == null)
             {
                 return;
             }
@@ -72,9 +78,9 @@ public override async Task BeforeLocationChangeAsync()
                 null,
                 null);
 
-            for (var i = 0; i < assemblies.Length; i++)
+            foreach (byte[] assembly in assemblies)
             {
-                Assembly.Load((byte[])assemblies[i]);
+                Assembly.Load(assembly);
             }
         }
     }

src/Components/WebAssembly/WebAssembly/src/Services/WebAssemblyNavigationManager.cs

@@ -527,7 +527,7 @@ public void CanLazyLoadOnRouteChange()
         {
             // Navigate to a page without any lazy-loaded dependencies
             SetUrlViaPushState("/");
-            var app = Browser.MountTestComponent<TestRouterWithDynamicAssembly>();
+            var app = Browser.MountTestComponent<TestRouter>();
 
             // Ensure that we haven't requested the lazy loaded assembly
             Assert.False(HasLoadedAssembly("Newtonsoft.Json.dll"));
@@ -551,7 +551,7 @@ public void CanLazyLoadOnFirstVisit()
         {
             // Navigate to a page with lazy loaded assemblies for the first time
             SetUrlViaPushState("/WithDynamicAssembly");
-            var app = Browser.MountTestComponent<TestRouterWithDynamicAssembly>();
+            var app = Browser.MountTestComponent<TestRouter>();
             var button = app.FindElement(By.Id("use-package-button"));
 
             // We should have requested the DLL

src/Components/test/E2ETest/Tests/RoutingTest.cs

@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <BlazorWebAssemblyLazyLoad Include="Newtonsoft.Json.dll" />
+    <BlazorWebAssemblyLazyLoad Include="Newtonsoft.Json" />
   </ItemGroup>
 
 </Project>

src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj

@@ -70,7 +70,6 @@
         <option value="BasicTestApp.RouterTest.NavigationManagerComponent">NavigationManager Test</option>
         <option value="BasicTestApp.RouterTest.TestRouter">Router</option>
         <option value="BasicTestApp.RouterTest.TestRouterWithAdditionalAssembly">Router with additional assembly</option>
-        <option value="BasicTestApp.RouterTest.TestRouterWithDynamicAssembly">Router with dynamic assembly</option>
         <option value="BasicTestApp.StringComparisonComponent">StringComparison</option>
         <option value="BasicTestApp.SvgComponent">SVG</option>
         <option value="BasicTestApp.SvgWithChildComponent">SVG with child component</option>

src/Components/test/testassets/BasicTestApp/Index.razor

@@ -18,6 +18,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Configuration;
 using Microsoft.JSInterop;
+using System.Collections.Generic;
 
 namespace BasicTestApp
 {
@@ -30,6 +31,11 @@ public static async Task Main(string[] args)
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
             builder.RootComponents.Add<Index>("root");
 
+            // Set lazy-load definition for a single path
+            WebAssemblyLazyLoadDefinition lazyLoadDefinition = new WebAssemblyLazyLoadDefinition();
+            lazyLoadDefinition.AddRouteDefinition("WithDynamicAssembly", new List<string>() { "Newtonsoft.Json.dll" });
+            builder.SetLazyLoadDefinition(lazyLoadDefinition);
+
             builder.Services.AddSingleton(new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
             builder.Services.AddSingleton<AuthenticationStateProvider, ServerAuthenticationStateProvider>();
             builder.Services.AddAuthorizationCore(options =>