Remove circular DI, pass renderer on initialization instead.

Author: ilonatommy

src/Components/Components/src/IEndpointHtmlRenderer.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components;
+
+/// <summary>
+/// An interface for EndpointHtmlRenderer implementations that allows NavigationManagers call renderer's methods
+/// </summary>
+public interface IEndpointHtmlRenderer
+{
+    /// <summary>
+    /// Sets the html response to 404 Not Found.
+    /// </summary>
+    void SetNotFoundResponse();
+}

src/Components/Components/src/PublicAPI.Shipped.txt

@@ -445,7 +445,6 @@ Microsoft.AspNetCore.Components.RouteView.RouteData.set -> void
 Microsoft.AspNetCore.Components.RouteView.RouteView() -> void
 Microsoft.AspNetCore.Components.RouteView.SetParametersAsync(Microsoft.AspNetCore.Components.ParameterView parameters) -> System.Threading.Tasks.Task!
 Microsoft.AspNetCore.Components.Routing.IHostEnvironmentNavigationManager
-Microsoft.AspNetCore.Components.Routing.IHostEnvironmentNavigationManager.Initialize(string! baseUri, string! uri) -> void
 Microsoft.AspNetCore.Components.Routing.INavigationInterception
 Microsoft.AspNetCore.Components.Routing.INavigationInterception.EnableNavigationInterceptionAsync() -> System.Threading.Tasks.Task!
 Microsoft.AspNetCore.Components.Routing.IRoutingStateProvider

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

@@ -18,4 +18,7 @@ Microsoft.AspNetCore.Components.NavigationManager.NotifyNotFound(bool isIntercep
 Microsoft.AspNetCore.Components.NavigationManager.NotifyNotFoundAsync(bool isNavigationIntercepted) -> System.Threading.Tasks.ValueTask<bool>
 virtual Microsoft.AspNetCore.Components.NavigationManager.HandleNotFoundHandlerException(System.Exception! ex, Microsoft.AspNetCore.Components.Routing.NotFoundContext! context) -> void
 Microsoft.AspNetCore.Components.NotFoundRenderingException
-Microsoft.AspNetCore.Components.NotFoundRenderingException.NotFoundRenderingException(string! message, System.Exception! innerException) -> void
+Microsoft.AspNetCore.Components.NotFoundRenderingException.NotFoundRenderingException(string! message, System.Exception! innerException) -> void
+Microsoft.AspNetCore.Components.IEndpointHtmlRenderer
+Microsoft.AspNetCore.Components.IEndpointHtmlRenderer.SetNotFoundResponse() -> void
+Microsoft.AspNetCore.Components.Routing.IHostEnvironmentNavigationManager.Initialize(string! baseUri, string! uri, Microsoft.AspNetCore.Components.IEndpointHtmlRenderer? renderer = null) -> void

src/Components/Components/src/Routing/IHostEnvironmentNavigationManager.cs

@@ -14,5 +14,6 @@ public interface IHostEnvironmentNavigationManager
     /// </summary>
     /// <param name="baseUri">The base URI.</param>
     /// <param name="uri">The absolute URI.</param>
-    void Initialize(string baseUri, string uri);
+    /// <param name="renderer">The optional renderer.</param>
+    void Initialize(string baseUri, string uri, IEndpointHtmlRenderer? renderer = null);
 }

src/Components/Endpoints/src/DependencyInjection/HttpNavigationManager.cs

@@ -7,15 +7,14 @@ namespace Microsoft.AspNetCore.Components.Endpoints;
 
 internal sealed class HttpNavigationManager : NavigationManager, IHostEnvironmentNavigationManager
 {
-    private readonly IRazorComponentEndpointInvoker _invoker;
+    private IEndpointHtmlRenderer? _renderer;
 
-    public HttpNavigationManager(IRazorComponentEndpointInvoker invoker)
+    void IHostEnvironmentNavigationManager.Initialize(string baseUri, string uri, IEndpointHtmlRenderer? renderer)
     {
-        _invoker = invoker;
+        Initialize(baseUri, uri);
+        _renderer = renderer;
     }
 
-    void IHostEnvironmentNavigationManager.Initialize(string baseUri, string uri) => Initialize(baseUri, uri);
-
     protected override void NavigateToCore(string uri, NavigationOptions options)
     {
         var absoluteUriString = ToAbsoluteUri(uri).AbsoluteUri;
@@ -24,6 +23,6 @@ protected override void NavigateToCore(string uri, NavigationOptions options)
 
     protected override void NotFoundCore()
     {
-        _invoker.SetNotFound();
+        _renderer?.SetNotFoundResponse();
     }
 }

src/Components/Endpoints/src/IRazorComponentEndpointInvoker.cs

@@ -25,6 +25,4 @@ public interface IRazorComponentEndpointInvoker
     /// <returns>A <see cref="Task"/> that completes when the endpoint has been invoked and the component
     /// has been rendered into the response.</returns>
     Task Render(HttpContext context);
-
-    void SetNotFound();
 }

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

@@ -1,2 +1 @@
-#nullable enable
-Microsoft.AspNetCore.Components.Endpoints.IRazorComponentEndpointInvoker.SetNotFound() -> void
+#nullable enable

src/Components/Endpoints/src/RazorComponentEndpointInvoker.cs

@@ -33,11 +33,6 @@ public Task Render(HttpContext context)
         return _renderer.Dispatcher.InvokeAsync(() => RenderComponentCore(context));
     }
 
-    public void SetNotFound()
-    {
-        _renderer.SetNotFoundResponse();
-    }
-
     // We do not want the debugger to consider NavigationExceptions caught by this method as user-unhandled.
     [DebuggerDisableUserUnhandledExceptions]
     private async Task RenderComponentCore(HttpContext context)
@@ -79,7 +74,7 @@ private async Task RenderComponentCore(HttpContext context)
             return Task.CompletedTask;
         });
 
-        await EndpointHtmlRenderer.InitializeStandardComponentServicesAsync(
+        await _renderer.InitializeStandardComponentServicesAsync(
             context,
             componentType: pageComponent,
             handler: result.HandlerName,

src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs

@@ -74,7 +74,7 @@ private Task ReturnErrorResponse(string detailedMessage)
             : Task.CompletedTask;
     }
 
-    internal void SetNotFoundResponse()
+    public void SetNotFoundResponse()
     {
         _httpContext.Response.StatusCode = StatusCodes.Status404NotFound;
     }

src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs

@@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Components.Endpoints;
 /// output with prerendering markers so the content can later switch into interactive mode when used with
 /// blazor.*.js. It also deals with initializing the standard component DI services once per request.
 /// </summary>
-internal partial class EndpointHtmlRenderer : StaticHtmlRenderer, IComponentPrerenderer
+internal partial class EndpointHtmlRenderer : StaticHtmlRenderer, IComponentPrerenderer, IEndpointHtmlRenderer
 {
     private readonly IServiceProvider _services;
     private readonly RazorComponentsServiceOptions _options;
@@ -70,14 +70,14 @@ private void SetHttpContext(HttpContext httpContext)
         }
     }
 
-    internal static async Task InitializeStandardComponentServicesAsync(
+    internal async Task InitializeStandardComponentServicesAsync(
         HttpContext httpContext,
         [DynamicallyAccessedMembers(Component)] Type? componentType = null,
         string? handler = null,
         IFormCollection? form = null)
     {
         var navigationManager = (IHostEnvironmentNavigationManager)httpContext.RequestServices.GetRequiredService<NavigationManager>();
-        navigationManager?.Initialize(GetContextBaseUri(httpContext.Request), GetFullUri(httpContext.Request));
+        navigationManager?.Initialize(GetContextBaseUri(httpContext.Request), GetFullUri(httpContext.Request), this);
 
         var authenticationStateProvider = httpContext.RequestServices.GetService<AuthenticationStateProvider>();
         if (authenticationStateProvider is IHostEnvironmentAuthenticationStateProvider hostEnvironmentAuthenticationStateProvider)