Dev (#36)

modabas · web-flow · commit 2dfda46d4e18 · 2025-06-13T11:18:38.000+03:00
* - cleanup code
- clear component registry after mapping components

* - update deps to latest

* - bump version
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -18,6 +18,6 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
 
-    <Version>1.3.3</Version>
+    <Version>1.3.4</Version>
   </PropertyGroup>
 </Project>
diff --git a/samples/ServiceEndpointClient/ServiceEndpointClient.csproj b/samples/ServiceEndpointClient/ServiceEndpointClient.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.6" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/ShowcaseWebApi/ShowcaseWebApi.csproj b/samples/ShowcaseWebApi/ShowcaseWebApi.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.5" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.6" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.4" />
     <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
     <PackageReference Include="Asp.Versioning.Http" Version="8.1.0" />
     <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
diff --git a/samples/WeatherForecastWebApi/GetStreamingWeatherForecast.cs b/samples/WeatherForecastWebApi/GetStreamingWeatherForecast.cs
@@ -45,7 +45,7 @@ protected override async IAsyncEnumerable<WeatherForecast> HandleAsync(
     foreach (var item in forecast)
     {
       yield return item;
-      await Task.Delay(1000, ct);
+      await Task.Delay(500, ct);
     }
   }
 
diff --git a/samples/WeatherForecastWebApi/WeatherForecastWebApi.csproj b/samples/WeatherForecastWebApi/WeatherForecastWebApi.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.5" />
-    <PackageReference Include="Scalar.AspNetCore" Version="2.4.7" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6" />
+    <PackageReference Include="Scalar.AspNetCore" Version="2.4.13" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ModEndpoints.Core/DependencyInjectionExtensions.cs b/src/ModEndpoints.Core/DependencyInjectionExtensions.cs
@@ -267,6 +267,8 @@ public static WebApplication MapModEndpointsCore(
         globalEndpointConfiguration,
         throwOnMissingConfiguration);
 
+      ComponentRegistryAccessor.Instance.Clear();
+
       return app;
     }
   }
diff --git a/src/ModEndpoints.Core/[Configuration]/ComponentRegistryAccessor.cs b/src/ModEndpoints.Core/[Configuration]/ComponentRegistryAccessor.cs
@@ -4,7 +4,6 @@ internal class ComponentRegistryAccessor
 {
   private static readonly AsyncLocal<ComponentRegistryHolder> _registry = new();
 
-  /// <inheritdoc/>
   public ComponentRegistry? Registry
   {
     get
@@ -51,4 +50,9 @@ public void Initialize()
       Registry = new ComponentRegistry();
     }
   }
+
+  public void Clear()
+  {
+    Registry = null;
+  }
 }
diff --git a/src/ModEndpoints.Core/[Configuration]/EndpointConfigurator.cs b/src/ModEndpoints.Core/[Configuration]/EndpointConfigurator.cs
@@ -6,8 +6,6 @@ public abstract class EndpointConfigurator : IEndpointConfigurator
 {
   protected abstract Delegate ExecuteDelegate { get; }
 
-  private EndpointConfigurationBuilder? _builder;
-
   /// <summary>
   /// Entry point for endpoint configuration. Called by DI.
   /// </summary>
@@ -18,9 +16,9 @@ public RouteHandlerBuilder[] Configure(
     IEndpointRouteBuilder builder,
     ConfigurationContext<EndpointConfigurationParameters> configurationContext)
   {
-    _builder = new(builder, ExecuteDelegate);
-    Configure(_builder, configurationContext);
-    return _builder.HandlerBuilders.ToArray();
+    EndpointConfigurationBuilder configurationBuilder = new(builder, ExecuteDelegate);
+    Configure(configurationBuilder, configurationContext);
+    return configurationBuilder.HandlerBuilders.ToArray();
   }
 
   /// <summary>
diff --git a/src/ModEndpoints.Core/[Configuration]/RouteGroupConfigurator.cs b/src/ModEndpoints.Core/[Configuration]/RouteGroupConfigurator.cs
@@ -5,8 +5,6 @@ namespace ModEndpoints.Core;
 
 public abstract class RouteGroupConfigurator : IRouteGroupConfigurator
 {
-  private RouteGroupConfigurationBuilder? _configurationBuilder;
-
   /// <summary>
   /// Entry point for route group configuration. Called by DI.
   /// </summary>
@@ -17,9 +15,9 @@ public RouteGroupBuilder[] Configure(
     IEndpointRouteBuilder builder,
     ConfigurationContext<RouteGroupConfigurationParameters> configurationContext)
   {
-    _configurationBuilder = new(builder);
-    Configure(_configurationBuilder, configurationContext);
-    return _configurationBuilder.GroupBuilders.ToArray();
+    RouteGroupConfigurationBuilder configurationBuilder = new(builder);
+    Configure(configurationBuilder, configurationContext);
+    return configurationBuilder.GroupBuilders.ToArray();
   }
 
   /// <summary>
diff --git a/src/ModEndpoints.RemoteServices/ModEndpoints.RemoteServices.csproj b/src/ModEndpoints.RemoteServices/ModEndpoints.RemoteServices.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.6" />
     <PackageReference Include="ModResults" Version="1.0.1" />
   </ItemGroup>
 
diff --git a/tests/ModEndpoints.Tests/ModEndpoints.Tests.csproj b/tests/ModEndpoints.Tests/ModEndpoints.Tests.csproj
@@ -14,12 +14,12 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.16" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.17" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected override async IAsyncEnumerable<WeatherForecast> HandleAsync(`
`45`	`45`	`foreach (var item in forecast)`
`46`	`46`	`{`
`47`	`47`	`yield return item;`
`48`		`- await Task.Delay(1000, ct);`
	`48`	`+ await Task.Delay(500, ct);`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -267,6 +267,8 @@ public static WebApplication MapModEndpointsCore(`
`267`	`267`	`globalEndpointConfiguration,`
`268`	`268`	`throwOnMissingConfiguration);`
`269`	`269`
	`270`	`+ ComponentRegistryAccessor.Instance.Clear();`
	`271`	`+`
`270`	`272`	`return app;`
`271`	`273`	`}`
`272`	`274`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ internal class ComponentRegistryAccessor`
`4`	`4`	`{`
`5`	`5`	`private static readonly AsyncLocal<ComponentRegistryHolder> _registry = new();`
`6`	`6`
`7`		`- /// <inheritdoc/>`
`8`	`7`	`public ComponentRegistry? Registry`
`9`	`8`	`{`
`10`	`9`	`get`
`@@ -51,4 +50,9 @@ public void Initialize()`
`51`	`50`	`Registry = new ComponentRegistry();`
`52`	`51`	`}`
`53`	`52`	`}`
	`53`	`+`
	`54`	`+ public void Clear()`
	`55`	`+ {`
	`56`	`+ Registry = null;`
	`57`	`+ }`
`54`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ public abstract class EndpointConfigurator : IEndpointConfigurator`
`6`	`6`	`{`
`7`	`7`	`protected abstract Delegate ExecuteDelegate { get; }`
`8`	`8`
`9`		`- private EndpointConfigurationBuilder? _builder;`
`10`		`-`
`11`	`9`	`/// <summary>`
`12`	`10`	`/// Entry point for endpoint configuration. Called by DI.`
`13`	`11`	`/// </summary>`
`@@ -18,9 +16,9 @@ public RouteHandlerBuilder[] Configure(`
`18`	`16`	`IEndpointRouteBuilder builder,`
`19`	`17`	`ConfigurationContext<EndpointConfigurationParameters> configurationContext)`
`20`	`18`	`{`
`21`		`- _builder = new(builder, ExecuteDelegate);`
`22`		`- Configure(_builder, configurationContext);`
`23`		`- return _builder.HandlerBuilders.ToArray();`
	`19`	`+ EndpointConfigurationBuilder configurationBuilder = new(builder, ExecuteDelegate);`
	`20`	`+ Configure(configurationBuilder, configurationContext);`
	`21`	`+ return configurationBuilder.HandlerBuilders.ToArray();`
`24`	`22`	`}`
`25`	`23`
`26`	`24`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@ namespace ModEndpoints.Core;`
`5`	`5`
`6`	`6`	`public abstract class RouteGroupConfigurator : IRouteGroupConfigurator`
`7`	`7`	`{`
`8`		`- private RouteGroupConfigurationBuilder? _configurationBuilder;`
`9`		`-`
`10`	`8`	`/// <summary>`
`11`	`9`	`/// Entry point for route group configuration. Called by DI.`
`12`	`10`	`/// </summary>`
`@@ -17,9 +15,9 @@ public RouteGroupBuilder[] Configure(`
`17`	`15`	`IEndpointRouteBuilder builder,`
`18`	`16`	`ConfigurationContext<RouteGroupConfigurationParameters> configurationContext)`
`19`	`17`	`{`
`20`		`- _configurationBuilder = new(builder);`
`21`		`- Configure(_configurationBuilder, configurationContext);`
`22`		`- return _configurationBuilder.GroupBuilders.ToArray();`
	`18`	`+ RouteGroupConfigurationBuilder configurationBuilder = new(builder);`
	`19`	`+ Configure(configurationBuilder, configurationContext);`
	`20`	`+ return configurationBuilder.GroupBuilders.ToArray();`
`23`	`21`	`}`
`24`	`22`
`25`	`23`	`/// <summary>`