diff --git a/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSource.cs b/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSource.cs index a81610542792..7ce2a54419b0 100644 --- a/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSource.cs +++ b/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSource.cs @@ -20,8 +20,8 @@ internal class RazorComponentEndpointDataSource<[DynamicallyAccessedMembers(Comp private readonly object _lock = new(); private readonly List> _conventions = []; private readonly List> _finallyConventions = []; + private readonly List> _componentApplicationBuilderActions = []; private readonly RazorComponentDataSourceOptions _options = new(); - private readonly ComponentApplicationBuilder _builder; private readonly IEndpointRouteBuilder _endpointRouteBuilder; private readonly ResourceCollectionResolver _resourceCollectionResolver; private readonly RenderModeEndpointProvider[] _renderModeEndpointProviders; @@ -32,33 +32,29 @@ internal class RazorComponentEndpointDataSource<[DynamicallyAccessedMembers(Comp private IChangeToken _changeToken; private IDisposable? _disposableChangeToken; // THREADING: protected by _lock - public Func SetDisposableChangeTokenAction = disposableChangeToken => disposableChangeToken; - // Internal for testing. - internal ComponentApplicationBuilder Builder => _builder; internal List> Conventions => _conventions; + internal List> ComponentApplicationBuilderActions => _componentApplicationBuilderActions; + internal CancellationTokenSource ChangeTokenSource => _cancellationTokenSource; public RazorComponentEndpointDataSource( - ComponentApplicationBuilder builder, IEnumerable renderModeEndpointProviders, IEndpointRouteBuilder endpointRouteBuilder, RazorComponentEndpointFactory factory, HotReloadService? hotReloadService = null) { - _builder = builder; _endpointRouteBuilder = endpointRouteBuilder; _resourceCollectionResolver = new ResourceCollectionResolver(endpointRouteBuilder); _renderModeEndpointProviders = renderModeEndpointProviders.ToArray(); _factory = factory; _hotReloadService = hotReloadService; - HotReloadService.ClearCacheEvent += OnHotReloadClearCache; DefaultBuilder = new RazorComponentsEndpointConventionBuilder( _lock, - builder, endpointRouteBuilder, _options, _conventions, - _finallyConventions); + _finallyConventions, + _componentApplicationBuilderActions); _cancellationTokenSource = new CancellationTokenSource(); _changeToken = new CancellationChangeToken(_cancellationTokenSource.Token); @@ -106,8 +102,20 @@ private void UpdateEndpoints() lock (_lock) { + _disposableChangeToken?.Dispose(); + _disposableChangeToken = null; + var endpoints = new List(); - var context = _builder.Build(); + + var componentApplicationBuilder = new ComponentApplicationBuilder(); + + foreach (var action in ComponentApplicationBuilderActions) + { + action?.Invoke(componentApplicationBuilder); + } + + var context = componentApplicationBuilder.Build(); + var configuredRenderModesMetadata = new ConfiguredRenderModesMetadata( [.. Options.ConfiguredRenderModes]); @@ -168,8 +176,7 @@ private void UpdateEndpoints() oldCancellationTokenSource?.Dispose(); if (_hotReloadService is { MetadataUpdateSupported: true }) { - _disposableChangeToken?.Dispose(); - _disposableChangeToken = SetDisposableChangeTokenAction(ChangeToken.OnChange(_hotReloadService.GetChangeToken, UpdateEndpoints)); + _disposableChangeToken = ChangeToken.OnChange(_hotReloadService.GetChangeToken, UpdateEndpoints); } } } @@ -195,15 +202,6 @@ private void AddBlazorWebEndpoints(List endpoints) } } - public void OnHotReloadClearCache(Type[]? types) - { - lock (_lock) - { - _disposableChangeToken?.Dispose(); - _disposableChangeToken = null; - } - } - public override IChangeToken GetChangeToken() { Initialize(); diff --git a/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSourceFactory.cs b/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSourceFactory.cs index 84327f3f6d54..a8f178a4fc25 100644 --- a/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSourceFactory.cs +++ b/src/Components/Endpoints/src/Builder/RazorComponentEndpointDataSourceFactory.cs @@ -17,9 +17,14 @@ internal class RazorComponentEndpointDataSourceFactory( { public RazorComponentEndpointDataSource CreateDataSource<[DynamicallyAccessedMembers(Component)] TRootComponent>(IEndpointRouteBuilder endpoints) { - var builder = ComponentApplicationBuilder.GetBuilder() ?? - DefaultRazorComponentApplication.Instance.GetBuilder(); + var dataSource = new RazorComponentEndpointDataSource(providers, endpoints, factory, hotReloadService); - return new RazorComponentEndpointDataSource(builder, providers, endpoints, factory, hotReloadService); + dataSource.ComponentApplicationBuilderActions.Add(builder => + { + var assembly = typeof(TRootComponent).Assembly; + IRazorComponentApplication.GetBuilderForAssembly(builder, assembly); + }); + + return dataSource; } } diff --git a/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilder.cs b/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilder.cs index 04b1daa9e952..46808fbfdfb0 100644 --- a/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilder.cs +++ b/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilder.cs @@ -18,27 +18,25 @@ public sealed class RazorComponentsEndpointConventionBuilder : IEndpointConventi private readonly RazorComponentDataSourceOptions _options; private readonly List> _conventions; private readonly List> _finallyConventions; + private readonly List> _componentApplicationBuilderActions; internal RazorComponentsEndpointConventionBuilder( object @lock, - ComponentApplicationBuilder builder, IEndpointRouteBuilder endpointRouteBuilder, RazorComponentDataSourceOptions options, List> conventions, - List> finallyConventions) + List> finallyConventions, + List> componentApplicationBuilderActions) { _lock = @lock; - ApplicationBuilder = builder; EndpointRouteBuilder = endpointRouteBuilder; _options = options; _conventions = conventions; _finallyConventions = finallyConventions; + _componentApplicationBuilderActions = componentApplicationBuilderActions; } - /// - /// Gets the that is used to build the endpoints. - /// - internal ComponentApplicationBuilder ApplicationBuilder { get; } + internal List> ComponentApplicationBuilderActions => _componentApplicationBuilderActions; internal string? ManifestPath { get => _options.ManifestPath; set => _options.ManifestPath = value; } diff --git a/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilderExtensions.cs b/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilderExtensions.cs index fd0a6aec0c4d..7cc4fa4dc764 100644 --- a/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilderExtensions.cs +++ b/src/Components/Endpoints/src/Builder/RazorComponentsEndpointConventionBuilderExtensions.cs @@ -30,7 +30,7 @@ public static RazorComponentsEndpointConventionBuilder AddAdditionalAssemblies( foreach (var assembly in assemblies) { - builder.ApplicationBuilder.AddAssembly(assembly); + builder.ComponentApplicationBuilderActions.Add(b => b.AddAssembly(assembly)); } return builder; } diff --git a/src/Components/Endpoints/test/Builder/RazorComponentsEndpointConventionBuilderExtensionsTest.cs b/src/Components/Endpoints/test/Builder/RazorComponentsEndpointConventionBuilderExtensionsTest.cs index 70fa780fcbaf..e1a5116ee0be 100644 --- a/src/Components/Endpoints/test/Builder/RazorComponentsEndpointConventionBuilderExtensionsTest.cs +++ b/src/Components/Endpoints/test/Builder/RazorComponentsEndpointConventionBuilderExtensionsTest.cs @@ -245,7 +245,7 @@ public void MapRazorComponents_CanAddConventions_ToBlazorWebEndpoints(string fra private RazorComponentsEndpointConventionBuilder CreateRazorComponentsAppBuilder(IEndpointRouteBuilder endpointBuilder) { var builder = endpointBuilder.MapRazorComponents(); - builder.ApplicationBuilder.AddLibrary(new AssemblyComponentLibraryDescriptor( + builder.ComponentApplicationBuilderActions.Add(b => b.AddLibrary(new AssemblyComponentLibraryDescriptor( "App", [new PageComponentBuilder { PageType = typeof(App), @@ -253,7 +253,7 @@ [new PageComponentBuilder { AssemblyName = "App", }], [] - )); + ))); return builder; } diff --git a/src/Components/Endpoints/test/HotReloadServiceTests.cs b/src/Components/Endpoints/test/HotReloadServiceTests.cs index 011056c2e7c6..a8e2280d77e9 100644 --- a/src/Components/Endpoints/test/HotReloadServiceTests.cs +++ b/src/Components/Endpoints/test/HotReloadServiceTests.cs @@ -23,9 +23,8 @@ public class HotReloadServiceTests public void UpdatesEndpointsWhenHotReloadChangeTokenTriggered() { // Arrange - var builder = CreateBuilder(typeof(ServerComponent)); var services = CreateServices(typeof(MockEndpointProvider)); - var endpointDataSource = CreateDataSource(builder, services); + var endpointDataSource = CreateDataSource(services, ConfigureServerComponentBuilder); var invoked = false; // Act @@ -41,9 +40,8 @@ public void UpdatesEndpointsWhenHotReloadChangeTokenTriggered() public void AddNewEndpointWhenDataSourceChanges() { // Arrange - var builder = CreateBuilder(typeof(ServerComponent)); var services = CreateServices(typeof(MockEndpointProvider)); - var endpointDataSource = CreateDataSource(builder, services); + var endpointDataSource = CreateDataSource(services, ConfigureServerComponentBuilder); // Assert - 1 var endpoint = Assert.IsType( @@ -52,15 +50,17 @@ public void AddNewEndpointWhenDataSourceChanges() Assert.Equal("/server", endpoint.RoutePattern.RawText); // Act - 2 - endpointDataSource.Builder.Pages.AddFromLibraryInfo("TestAssembly2", new[] - { - new PageComponentBuilder + endpointDataSource.ComponentApplicationBuilderActions.Add( + b => b.Pages.AddFromLibraryInfo("TestAssembly2", new[] { - AssemblyName = "TestAssembly2", - PageType = typeof(StaticComponent), - RouteTemplates = new List { "/app/test" } - } - }); + new PageComponentBuilder + { + AssemblyName = "TestAssembly2", + PageType = typeof(StaticComponent), + RouteTemplates = new List { "/app/test" } + } + })); + HotReloadService.UpdateApplication(null); // Assert - 2 @@ -76,9 +76,8 @@ public void AddNewEndpointWhenDataSourceChanges() public void RemovesEndpointWhenDataSourceChanges() { // Arrange - var builder = CreateBuilder(typeof(ServerComponent)); var services = CreateServices(typeof(MockEndpointProvider)); - var endpointDataSource = CreateDataSource(builder, services); + var endpointDataSource = CreateDataSource(services, ConfigureServerComponentBuilder); // Assert - 1 var endpoint = Assert.IsType(Assert.Single(endpointDataSource.Endpoints, @@ -87,7 +86,7 @@ public void RemovesEndpointWhenDataSourceChanges() Assert.Equal("/server", endpoint.RoutePattern.RawText); // Act - 2 - endpointDataSource.Builder.RemoveLibrary("TestAssembly"); + endpointDataSource.ComponentApplicationBuilderActions.Add(b => b.RemoveLibrary("TestAssembly")); endpointDataSource.Options.ConfiguredRenderModes.Clear(); HotReloadService.UpdateApplication(null); @@ -100,9 +99,8 @@ public void RemovesEndpointWhenDataSourceChanges() public void ModifiesEndpointWhenDataSourceChanges() { // Arrange - var builder = CreateBuilder(typeof(ServerComponent)); var services = CreateServices(typeof(MockEndpointProvider)); - var endpointDataSource = CreateDataSource(builder, services); + var endpointDataSource = CreateDataSource(services, ConfigureServerComponentBuilder); // Assert - 1 var endpoint = Assert.IsType(Assert.Single(endpointDataSource.Endpoints, e => e.Metadata.GetMetadata() != null)); @@ -124,9 +122,8 @@ public void ModifiesEndpointWhenDataSourceChanges() public void NotifiesCompositeEndpointDataSource() { // Arrange - var builder = CreateBuilder(typeof(ServerComponent)); var services = CreateServices(typeof(MockEndpointProvider)); - var endpointDataSource = CreateDataSource(builder, services); + var endpointDataSource = CreateDataSource(services, ConfigureServerComponentBuilder); var compositeEndpointDataSource = new CompositeEndpointDataSource( new[] { endpointDataSource }); @@ -137,7 +134,7 @@ public void NotifiesCompositeEndpointDataSource() Assert.Equal("/server", compositeEndpoint.RoutePattern.RawText); // Act - 2 - endpointDataSource.Builder.Pages.RemoveFromAssembly("TestAssembly"); + endpointDataSource.ComponentApplicationBuilderActions.Add(b => b.Pages.RemoveFromAssembly("TestAssembly")); endpointDataSource.Options.ConfiguredRenderModes.Clear(); HotReloadService.UpdateApplication(null); @@ -148,37 +145,14 @@ public void NotifiesCompositeEndpointDataSource() Assert.Empty(compositePageEndpoints); } - private sealed class WrappedChangeTokenDisposable : IDisposable - { - public bool IsDisposed { get; private set; } - private readonly IDisposable _innerDisposable; - - public WrappedChangeTokenDisposable(IDisposable innerDisposable) - { - _innerDisposable = innerDisposable; - } - - public void Dispose() - { - IsDisposed = true; - _innerDisposable.Dispose(); - } - } - [Fact] public void ConfirmChangeTokenDisposedHotReload() { // Arrange - var builder = CreateBuilder(typeof(ServerComponent)); var services = CreateServices(typeof(MockEndpointProvider)); - var endpointDataSource = CreateDataSource(builder, services); - - WrappedChangeTokenDisposable wrappedChangeTokenDisposable = null; - - endpointDataSource.SetDisposableChangeTokenAction = (IDisposable disposableChangeToken) => { - wrappedChangeTokenDisposable = new WrappedChangeTokenDisposable(disposableChangeToken); - return wrappedChangeTokenDisposable; - }; + var endpointDataSource = CreateDataSource(services, ConfigureServerComponentBuilder, null); + var changeTokenSource = endpointDataSource.ChangeTokenSource; + var changeToken = endpointDataSource.GetChangeToken(); var endpoint = Assert.IsType(Assert.Single(endpointDataSource.Endpoints, e => e.Metadata.GetMetadata() != null)); Assert.Equal("/server", endpoint.RoutePattern.RawText); @@ -187,18 +161,21 @@ public void ConfirmChangeTokenDisposedHotReload() // Make a modification and then perform a hot reload. endpointDataSource.Conventions.Add(builder => builder.Metadata.Add(new TestMetadata())); + HotReloadService.UpdateApplication(null); HotReloadService.ClearCache(null); // Confirm the change token is disposed after ClearCache - Assert.True(wrappedChangeTokenDisposable.IsDisposed); + Assert.True(changeToken.HasChanged); + Assert.Throws(() => changeTokenSource.Token); } private class TestMetadata { } - private ComponentApplicationBuilder CreateBuilder(params Type[] types) + private class TestAssembly : Assembly; + + private static void ConfigureBuilder(ComponentApplicationBuilder builder, params Type[] types) { - var builder = new ComponentApplicationBuilder(); builder.AddLibrary(new AssemblyComponentLibraryDescriptor( "TestAssembly", Array.Empty(), @@ -208,8 +185,11 @@ private ComponentApplicationBuilder CreateBuilder(params Type[] types) ComponentType = t, RenderMode = t.GetCustomAttribute() }).ToArray())); + } - return builder; + private static void ConfigureServerComponentBuilder(ComponentApplicationBuilder builder) + { + ConfigureBuilder(builder, typeof(ServerComponent)); } private IServiceProvider CreateServices(params Type[] types) @@ -227,16 +207,21 @@ private IServiceProvider CreateServices(params Type[] types) } private static RazorComponentEndpointDataSource CreateDataSource( - ComponentApplicationBuilder builder, IServiceProvider services, - IComponentRenderMode[] renderModes = null) + Action configureBuilder = null, + IComponentRenderMode[] renderModes = null, + HotReloadService hotReloadService = null) { var result = new RazorComponentEndpointDataSource( - builder, new[] { new MockEndpointProvider() }, new TestEndpointRouteBuilder(services), new RazorComponentEndpointFactory(), - new HotReloadService() { MetadataUpdateSupported = true }); + hotReloadService ?? new HotReloadService() { MetadataUpdateSupported = true }); + + if (configureBuilder is not null) + { + result.ComponentApplicationBuilderActions.Add(configureBuilder); + } if (renderModes != null) { diff --git a/src/Components/Endpoints/test/RazorComponentEndpointDataSourceTest.cs b/src/Components/Endpoints/test/RazorComponentEndpointDataSourceTest.cs index 52cd757d62ab..26a154b2cb11 100644 --- a/src/Components/Endpoints/test/RazorComponentEndpointDataSourceTest.cs +++ b/src/Components/Endpoints/test/RazorComponentEndpointDataSourceTest.cs @@ -24,6 +24,11 @@ public class RazorComponentEndpointDataSourceTest public void RegistersEndpoints() { var endpointDataSource = CreateDataSource(); + endpointDataSource.ComponentApplicationBuilderActions.Add(builder => + { + var assembly = typeof(App).Assembly; + IRazorComponentApplication.GetBuilderForAssembly(builder, assembly); + }); var endpoints = endpointDataSource.Endpoints; @@ -33,10 +38,15 @@ public void RegistersEndpoints() [Fact] public void NoDiscoveredModesDefaultsToStatic() { - - var builder = CreateBuilder(); var services = CreateServices(typeof(ServerEndpointProvider)); - var endpointDataSource = CreateDataSource(builder, services); + var endpointDataSource = CreateDataSource(services); + + endpointDataSource.ComponentApplicationBuilderActions.Add(builder => + { + builder.AddLibrary(new AssemblyComponentLibraryDescriptor( + "TestAssembly", + Array.Empty(), Array.Empty())); + }); var endpoints = endpointDataSource.Endpoints; @@ -199,22 +209,6 @@ public void NoDiscoveredModesDefaultsToStatic() }, }; - private ComponentApplicationBuilder CreateBuilder(params Type[] types) - { - var builder = new ComponentApplicationBuilder(); - builder.AddLibrary(new AssemblyComponentLibraryDescriptor( - "TestAssembly", - Array.Empty(), - types.Select(t => new ComponentBuilder - { - AssemblyName = "TestAssembly", - ComponentType = t, - RenderMode = t.GetCustomAttribute() - }).ToArray())); - - return builder; - } - private IServiceProvider CreateServices(params Type[] types) { var services = new ServiceCollection(); @@ -230,12 +224,10 @@ private IServiceProvider CreateServices(params Type[] types) } private RazorComponentEndpointDataSource CreateDataSource( - ComponentApplicationBuilder builder = null, IServiceProvider services = null, IComponentRenderMode[] renderModes = null) { var result = new RazorComponentEndpointDataSource( - builder ?? DefaultRazorComponentApplication.Instance.GetBuilder(), services?.GetService>() ?? Enumerable.Empty(), new TestEndpointRouteBuilder(services ?? CreateServices()), new RazorComponentEndpointFactory(),