Use PerAssembly AddHandlers/AddBehaviors methods (#152)

viceroypenguin · web-flow · commit d6f20fa92888 · 2024-11-13T13:03:12.000-06:00
diff --git a/benchmarks/Benchmark.Behaviors/Benchmark.cs b/benchmarks/Benchmark.Behaviors/Benchmark.cs
@@ -149,8 +149,8 @@ public void Setup()
 
 		_ = services.AddScoped<SomeService>();
 
-		_ = services.AddHandlers();
-		_ = services.AddBehaviors();
+		_ = services.AddBenchmarkBehaviorsHandlers();
+		_ = services.AddBenchmarkBehaviorsBehaviors();
 
 		_ = services.AddMediator(opts => opts.ServiceLifetime = ServiceLifetime.Scoped);
 		_ = services.AddScoped(
diff --git a/benchmarks/Benchmark.Large/Benchmark.cs b/benchmarks/Benchmark.Large/Benchmark.cs
@@ -71,7 +71,7 @@ public void Setup()
 	{
 		var services = new ServiceCollection();
 
-		_ = services.AddHandlers();
+		_ = services.AddBenchmarkLargeHandlers();
 
 		_ = services.AddMediator(opts => opts.ServiceLifetime = ServiceLifetime.Scoped);
 		_ = services.AddMediatR(
diff --git a/benchmarks/Benchmark.Simple/Benchmark.cs b/benchmarks/Benchmark.Simple/Benchmark.cs
@@ -71,7 +71,7 @@ public void Setup()
 	{
 		var services = new ServiceCollection();
 
-		_ = services.AddHandlers();
+		_ = services.AddBenchmarkSimpleHandlers();
 
 		_ = services.AddMediator(opts => opts.ServiceLifetime = ServiceLifetime.Scoped);
 		_ = services.AddMediatR(
diff --git a/readme.md b/readme.md
@@ -158,17 +158,17 @@ Immediate.Handlers supports `Microsoft.Extensions.DependencyInjection.Abstractio
 
 #### Registering Handlers
 
-```cs
-services.AddHandlers();
-```
+In your `Program.cs`, add a call to `app.MapXxxHandlers()`, where `Xxx` is the shortened form of the project name.
+* For a project named `Web`, it will be `app.MapWebHandlers()`
+* For a project named `Application.Web`, it will be `app.MapApplicationWebHandlers()`
 
 This registers all classes in the assembly marked with `[Handler]`.
 
 #### Registering Behaviors
 
-```cs
-services.AddBehaviors();
-```
+In your `Program.cs`, add a call to `app.MapXxxBehaviors()`, where `Xxx` is the shortened form of the project name.
+* For a project named `Web`, it will be `app.MapWebBehaviors()`
+* For a project named `Application.Web`, it will be `app.MapApplicationWebBehaviors()`
 
 This registers all behaviors referenced in any `[Behaviors]` attribute.
 
diff --git a/samples/Normal/Program.cs b/samples/Normal/Program.cs
@@ -4,8 +4,8 @@
 
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
-builder.Services.AddBehaviors();
-builder.Services.AddHandlers();
+builder.Services.AddNormalBehaviors();
+builder.Services.AddNormalHandlers();
 
 var app = builder.Build();
 
diff --git a/src/Immediate.Handlers.Generators/ImmediateHandlersGenerator.cs b/src/Immediate.Handlers.Generators/ImmediateHandlersGenerator.cs
@@ -18,6 +18,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 				.Any(r => (r.Display ?? "")
 					.Contains("Microsoft.Extensions.DependencyInjection.Abstractions")));
 
+		var assemblyName = context.CompilationProvider
+			.Select((cp, _) => cp.AssemblyName!
+				.Replace(".", string.Empty)
+				.Replace(" ", string.Empty)
+				.Trim()
+			);
+
 		var @namespace = context
 			.AnalyzerConfigOptionsProvider
 			.Select((c, _) => c.GlobalOptions
@@ -59,16 +66,19 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 			.Collect()
 			.Combine(behaviors)
 			.Combine(@namespace
-				.Combine(hasMsDi));
+				.Combine(hasMsDi)
+				.Combine(assemblyName));
 
 		context.RegisterSourceOutput(
 			registrationNodes,
 			(spc, node) => RenderServiceCollectionExtension(
 				spc,
 				handlers: node.Left.Left,
 				behaviors: node.Left.Right,
-				hasDi: node.Right.Right,
-				@namespace: node.Right.Left)
+				hasDi: node.Right.Left.Right,
+				@namespace: node.Right.Left.Left,
+				assemblyName: node.Right.Right
+			)
 		);
 	}
 
@@ -77,7 +87,9 @@ private static void RenderServiceCollectionExtension(
 		ImmutableArray<(string? displayName, EquatableReadOnlyList<Behavior?>? behaviors)> handlers,
 		ImmutableArray<Behavior?> behaviors,
 		bool hasDi,
-		string? @namespace)
+		string? @namespace,
+		string assemblyName
+	)
 	{
 		var cancellationToken = context.CancellationToken;
 		cancellationToken.ThrowIfCancellationRequested();
@@ -101,6 +113,7 @@ private static void RenderServiceCollectionExtension(
 		var source = template.Render(new
 		{
 			Namespace = @namespace,
+			AssemblyName = assemblyName,
 			Handlers = handlers.Select(x => x.displayName),
 			Behaviors = behaviors
 				.Concat(handlers.SelectMany(h => h.behaviors ?? Enumerable.Empty<Behavior?>()))
diff --git a/src/Immediate.Handlers.Generators/Templates/ServiceCollectionExtensions.sbntxt b/src/Immediate.Handlers.Generators/Templates/ServiceCollectionExtensions.sbntxt
@@ -9,7 +9,7 @@ namespace {{ namespace }};
 {{~ end ~}}
 public static class HandlerServiceCollectionExtensions
 {
-	public static IServiceCollection AddBehaviors(
+	public static IServiceCollection Add{{ assembly_name }}Behaviors(
 		this IServiceCollection services)
 	{
 		{{~ for b in behaviors ~}}
@@ -19,7 +19,7 @@ public static class HandlerServiceCollectionExtensions
 		return services;
 	}
 
-	public static IServiceCollection AddHandlers(
+	public static IServiceCollection Add{{ assembly_name }}Handlers(
 		this IServiceCollection services,
 		ServiceLifetime lifetime = ServiceLifetime.Scoped
 	)
diff --git a/tests/Immediate.Handlers.FunctionalTests/HandlerResolver.cs b/tests/Immediate.Handlers.FunctionalTests/HandlerResolver.cs
@@ -1,4 +1,4 @@
-﻿using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Immediate.Handlers.FunctionalTests;
 
@@ -8,8 +8,8 @@ public static T Resolve<T>(Action<IServiceCollection>? serviceCollectionConfigur
 		where T : notnull
 	{
 		var serviceCollection = new ServiceCollection()
-			.AddHandlers()
-			.AddBehaviors();
+			.AddImmediateHandlersFunctionalTestsHandlers()
+			.AddImmediateHandlersFunctionalTestsBehaviors();
 
 		serviceCollectionConfigurator?.Invoke(serviceCollection);
 
diff --git a/tests/Immediate.Handlers.Tests/GeneratorTests/BehaviorTests.CrtpBehavior_assemblies=Msdi#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Handlers.Tests/GeneratorTests/BehaviorTests.CrtpBehavior_assemblies=Msdi#IH.ServiceCollectionExtensions.g.verified.cs
@@ -6,15 +6,15 @@
 
 public static class HandlerServiceCollectionExtensions
 {
-	public static IServiceCollection AddBehaviors(
+	public static IServiceCollection AddTestsBehaviors(
 		this IServiceCollection services)
 	{
 		services.TryAddTransient(typeof(global::ConstraintBehavior<,>));
 		
 		return services;
 	}
 
-	public static IServiceCollection AddHandlers(
+	public static IServiceCollection AddTestsHandlers(
 		this IServiceCollection services,
 		ServiceLifetime lifetime = ServiceLifetime.Scoped
 	)
diff --git a/tests/Immediate.Handlers.Tests/GeneratorTests/BehaviorTests.MultipleBehaviors_assemblies=Msdi#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Handlers.Tests/GeneratorTests/BehaviorTests.MultipleBehaviors_assemblies=Msdi#IH.ServiceCollectionExtensions.g.verified.cs
@@ -6,7 +6,7 @@
 
 public static class HandlerServiceCollectionExtensions
 {
-	public static IServiceCollection AddBehaviors(
+	public static IServiceCollection AddTestsBehaviors(
 		this IServiceCollection services)
 	{
 		services.TryAddTransient(typeof(global::Dummy.LoggingBehavior<,>));
@@ -18,7 +18,7 @@ public static IServiceCollection AddBehaviors(
 		return services;
 	}
 
-	public static IServiceCollection AddHandlers(
+	public static IServiceCollection AddTestsHandlers(
 		this IServiceCollection services,
 		ServiceLifetime lifetime = ServiceLifetime.Scoped
 	)
diff --git a/tests/Immediate.Handlers.Tests/GeneratorTests/BehaviorTests.SingleBehavior_assemblies=Msdi#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Handlers.Tests/GeneratorTests/BehaviorTests.SingleBehavior_assemblies=Msdi#IH.ServiceCollectionExtensions.g.verified.cs
@@ -6,15 +6,15 @@
 
 public static class HandlerServiceCollectionExtensions
 {
-	public static IServiceCollection AddBehaviors(
+	public static IServiceCollection AddTestsBehaviors(
 		this IServiceCollection services)
 	{
 		services.TryAddTransient(typeof(global::Dummy.LoggingBehavior<,>));
 		
 		return services;
 	}
 
-	public static IServiceCollection AddHandlers(
+	public static IServiceCollection AddTestsHandlers(
 		this IServiceCollection services,
 		ServiceLifetime lifetime = ServiceLifetime.Scoped
 	)
diff --git a/tests/Immediate.Handlers.Tests/GeneratorTests/HandlerTests.ComplexParameterAttribute_assemblies=Msdi#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Handlers.Tests/GeneratorTests/HandlerTests.ComplexParameterAttribute_assemblies=Msdi#IH.ServiceCollectionExtensions.g.verified.cs
@@ -6,14 +6,14 @@
 
 public static class HandlerServiceCollectionExtensions
 {
-	public static IServiceCollection AddBehaviors(
+	public static IServiceCollection AddTestsBehaviors(
 		this IServiceCollection services)
 	{
 		
 		return services;
 	}
 
-	public static IServiceCollection AddHandlers(
+	public static IServiceCollection AddTestsHandlers(
 		this IServiceCollection services,
 		ServiceLifetime lifetime = ServiceLifetime.Scoped
 	)
diff --git a/tests/Immediate.Handlers.Tests/GeneratorTests/HandlerTests.MultipleParameterAttributes_assemblies=Msdi#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Handlers.Tests/GeneratorTests/HandlerTests.MultipleParameterAttributes_assemblies=Msdi#IH.ServiceCollectionExtensions.g.verified.cs
@@ -6,14 +6,14 @@
 
 public static class HandlerServiceCollectionExtensions
 {
-	public static IServiceCollection AddBehaviors(
+	public static IServiceCollection AddTestsBehaviors(
 		this IServiceCollection services)
 	{
 		
 		return services;
 	}
 
-	public static IServiceCollection AddHandlers(
+	public static IServiceCollection AddTestsHandlers(
 		this IServiceCollection services,
 		ServiceLifetime lifetime = ServiceLifetime.Scoped
 	)
diff --git a/tests/Immediate.Handlers.Tests/GeneratorTests/HandlerTests.SimpleParameterAttribute_assemblies=Msdi#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Handlers.Tests/GeneratorTests/HandlerTests.SimpleParameterAttribute_assemblies=Msdi#IH.ServiceCollectionExtensions.g.verified.cs
@@ -6,14 +6,14 @@
 
 public static class HandlerServiceCollectionExtensions
 {
-	public static IServiceCollection AddBehaviors(
+	public static IServiceCollection AddTestsBehaviors(
 		this IServiceCollection services)
 	{
 		
 		return services;
 	}
 
-	public static IServiceCollection AddHandlers(
+	public static IServiceCollection AddTestsHandlers(
 		this IServiceCollection services,
 		ServiceLifetime lifetime = ServiceLifetime.Scoped
 	)

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public void Setup()`
`71`	`71`	`{`
`72`	`72`	`var services = new ServiceCollection();`
`73`	`73`
`74`		`- _ = services.AddHandlers();`
	`74`	`+ _ = services.AddBenchmarkLargeHandlers();`
`75`	`75`
`76`	`76`	`_ = services.AddMediator(opts => opts.ServiceLifetime = ServiceLifetime.Scoped);`
`77`	`77`	`_ = services.AddMediatR(`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace {{ namespace }};`
`9`	`9`	`{{~ end ~}}`
`10`	`10`	`public static class HandlerServiceCollectionExtensions`
`11`	`11`	`{`
`12`		`- public static IServiceCollection AddBehaviors(`
	`12`	`+ public static IServiceCollection Add{{ assembly_name }}Behaviors(`
`13`	`13`	`this IServiceCollection services)`
`14`	`14`	`{`
`15`	`15`	`{{~ for b in behaviors ~}}`
`@@ -19,7 +19,7 @@ public static class HandlerServiceCollectionExtensions`
`19`	`19`	`return services;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public static IServiceCollection AddHandlers(`
	`22`	`+ public static IServiceCollection Add{{ assembly_name }}Handlers(`
`23`	`23`	`this IServiceCollection services,`
`24`	`24`	`ServiceLifetime lifetime = ServiceLifetime.Scoped`
`25`	`25`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,15 @@`
`6`	`6`
`7`	`7`	`public static class HandlerServiceCollectionExtensions`
`8`	`8`	`{`
`9`		`- public static IServiceCollection AddBehaviors(`
	`9`	`+ public static IServiceCollection AddTestsBehaviors(`
`10`	`10`	`this IServiceCollection services)`
`11`	`11`	`{`
`12`	`12`	`services.TryAddTransient(typeof(global::ConstraintBehavior<,>));`
`13`	`13`
`14`	`14`	`return services;`
`15`	`15`	`}`
`16`	`16`
`17`		`- public static IServiceCollection AddHandlers(`
	`17`	`+ public static IServiceCollection AddTestsHandlers(`
`18`	`18`	`this IServiceCollection services,`
`19`	`19`	`ServiceLifetime lifetime = ServiceLifetime.Scoped`
`20`	`20`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`public static class HandlerServiceCollectionExtensions`
`8`	`8`	`{`
`9`		`- public static IServiceCollection AddBehaviors(`
	`9`	`+ public static IServiceCollection AddTestsBehaviors(`
`10`	`10`	`this IServiceCollection services)`
`11`	`11`	`{`
`12`	`12`	`services.TryAddTransient(typeof(global::Dummy.LoggingBehavior<,>));`
`@@ -18,7 +18,7 @@ public static IServiceCollection AddBehaviors(`
`18`	`18`	`return services;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public static IServiceCollection AddHandlers(`
	`21`	`+ public static IServiceCollection AddTestsHandlers(`
`22`	`22`	`this IServiceCollection services,`
`23`	`23`	`ServiceLifetime lifetime = ServiceLifetime.Scoped`
`24`	`24`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,14 @@`
`6`	`6`
`7`	`7`	`public static class HandlerServiceCollectionExtensions`
`8`	`8`	`{`
`9`		`- public static IServiceCollection AddBehaviors(`
	`9`	`+ public static IServiceCollection AddTestsBehaviors(`
`10`	`10`	`this IServiceCollection services)`
`11`	`11`	`{`
`12`	`12`
`13`	`13`	`return services;`
`14`	`14`	`}`
`15`	`15`
`16`		`- public static IServiceCollection AddHandlers(`
	`16`	`+ public static IServiceCollection AddTestsHandlers(`
`17`	`17`	`this IServiceCollection services,`
`18`	`18`	`ServiceLifetime lifetime = ServiceLifetime.Scoped`
`19`	`19`	`)`