Rename GenerateServiceHandlerAttribute to ScanForTypesAttribute, CustomHandler to Handler

Co-authored-by: Dreamescaper <17177729+Dreamescaper@users.noreply.github.com>

Author: Copilot

README.md

@@ -93,14 +93,14 @@ public class HelloWorldEndpoint : IEndpoint
 
 public static partial class ServiceCollectionExtensions
 {
-    [GenerateServiceHandler(AssignableTo = typeof(IEndpoint), CustomHandler = nameof(IEndpoint.MapEndpoint))]
+    [ScanForTypes(AssignableTo = typeof(IEndpoint), Handler = nameof(IEndpoint.MapEndpoint))]
     public static partial IEndpointRouteBuilder MapEndpoints(this IEndpointRouteBuilder endpoints);
 }
 ```
 
 ### Register Options types
-Another example of `CustomHandler` is to register Options types. We can define custom `OptionAttribute`, which allows to specify configuration section key.
-And then read that value in our `CustomHandler`:
+Another example of `Handler` is to register Options types. We can define custom `OptionAttribute`, which allows to specify configuration section key.
+And then read that value in our `Handler`:
 ```csharp
 [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
 public class OptionAttribute(string? section = null) : Attribute
@@ -116,7 +116,7 @@ public record SectionOption { }
 
 public static partial class ServiceCollectionExtensions
 {
-    [GenerateServiceHandler(AttributeFilter = typeof(OptionAttribute), CustomHandler = nameof(AddOption))]
+    [ScanForTypes(AttributeFilter = typeof(OptionAttribute), Handler = nameof(AddOption))]
     public static partial IServiceCollection AddOptions(this IServiceCollection services, IConfiguration configuration);
 
     private static void AddOption<T>(IServiceCollection services, IConfiguration configuration) where T : class
@@ -133,7 +133,7 @@ public static partial class ServiceCollectionExtensions
 ```csharp
 public static partial class ModelBuilderExtensions
 {
-    [GenerateServiceHandler(AssignableTo = typeof(IEntityTypeConfiguration<>), CustomHandler = nameof(ApplyConfiguration))]
+    [ScanForTypes(AssignableTo = typeof(IEntityTypeConfiguration<>), Handler = nameof(ApplyConfiguration))]
     public static partial ModelBuilder ApplyEntityConfigurations(this ModelBuilder modelBuilder);
 
     private static void ApplyConfiguration<T, TEntity>(ModelBuilder modelBuilder)
@@ -164,12 +164,12 @@ public static partial class ModelBuilderExtensions
 | **ExcludeByTypeName** | Sets this value to exclude types from being registered by their full name. You can use '*' wildcards. You can also use ',' to separate multiple filters. |
 | **ExcludeByAttribute** | Excludes matching types by the specified attribute type being present. |
 | **KeySelector** | Sets this property to add types as keyed services. This property should point to one of the following: <br>- The name of a static method in the current type with a string return type. The method should be either generic or have a single parameter of type `Type`. <br>- A constant field or static property in the implementation type. |
-| **CustomHandler** | *(Obsolete — use `GenerateServiceHandler` instead.)* Sets this property to invoke a custom method for each type found instead of regular registration logic. |
+| **CustomHandler** | *(Obsolete — use `ScanForTypes` instead.)* Sets this property to invoke a custom method for each type found instead of regular registration logic. |
 
-`GenerateServiceHandler` attribute is used to invoke a custom method for each matched type. It has the same filtering properties as `GenerateServiceRegistrations`, but without the registration-specific ones (`Lifetime`, `AsImplementedInterfaces`, `AsSelf`, `KeySelector`):
+`ScanForTypes` attribute is used to invoke a custom method for each matched type. It has the same filtering properties as `GenerateServiceRegistrations`, but without the registration-specific ones (`Lifetime`, `AsImplementedInterfaces`, `AsSelf`, `KeySelector`):
 | Property | Description |
 | --- | --- |
-| **CustomHandler** | Sets this property to invoke a custom method for each type found. This property should point to one of the following: <br>- Name of a generic method in the current type. <br>- Static method name in found types. <br>**Note:** Types are automatically filtered by the generic constraints defined on the method's type parameters (e.g., `class`, `struct`, `new()`, interface constraints). |
+| **Handler** | Sets this property to invoke a custom method for each type found. This property should point to one of the following: <br>- Name of a generic method in the current type. <br>- Static method name in found types. <br>**Note:** Types are automatically filtered by the generic constraints defined on the method's type parameters (e.g., `class`, `struct`, `new()`, interface constraints). |
 | **FromAssemblyOf** | Sets the assembly containing the given type as the source of types to scan. If not specified, the assembly containing the method with this attribute will be used. |
 | **AssemblyNameFilter** | Sets this value to filter scanned assemblies by assembly name. This option is incompatible with `FromAssemblyOf`. You can use '*' wildcards. You can also use ',' to separate multiple filters. |
 | **AssignableTo** | Sets the type that the scanned types must be assignable to. |

ServiceScan.SourceGenerator.Tests/CustomHandlerTests.cs

@@ -1101,7 +1101,7 @@ private static Compilation CreateCompilation(params string[] source)
     }
 
     [Fact]
-    public void GenerateServiceHandlerAttribute_WithNoParameters()
+    public void ScanForTypesAttribute_WithNoParameters()
     {
         var source = $$"""
             using ServiceScan.SourceGenerator;
@@ -1110,7 +1110,7 @@ namespace GeneratorTests;
                     
             public static partial class ServicesExtensions
             {
-                [GenerateServiceHandler(AssignableTo = typeof(IService), CustomHandler = nameof(HandleType))]
+                [ScanForTypes(AssignableTo = typeof(IService), Handler = nameof(HandleType))]
                 public static partial void ProcessServices();
 
                 private static void HandleType<T>() => System.Console.WriteLine(typeof(T).Name);
@@ -1149,7 +1149,7 @@ public static partial void ProcessServices()
     }
 
     [Fact]
-    public void GenerateServiceHandlerAttribute_WithParameters()
+    public void ScanForTypesAttribute_WithParameters()
     {
         var source = $$"""
             using ServiceScan.SourceGenerator;
@@ -1158,7 +1158,7 @@ namespace GeneratorTests;
                     
             public static partial class ServicesExtensions
             {
-                [GenerateServiceHandler(TypeNameFilter = "*Service", CustomHandler = nameof(HandleType))]
+                [ScanForTypes(TypeNameFilter = "*Service", Handler = nameof(HandleType))]
                 public static partial void ProcessServices(string value);
 
                 private static void HandleType<T>(string value) => System.Console.WriteLine(value + typeof(T).Name);
@@ -1197,7 +1197,7 @@ public static partial void ProcessServices( string value)
     }
 
     [Fact]
-    public void GenerateServiceHandlerAttribute_MultipleAttributes()
+    public void ScanForTypesAttribute_MultipleAttributes()
     {
         var source = $$"""
             using ServiceScan.SourceGenerator;
@@ -1206,8 +1206,8 @@ namespace GeneratorTests;
                     
             public static partial class ServicesExtensions
             {
-                [GenerateServiceHandler(AssignableTo = typeof(IFirstService), CustomHandler = nameof(HandleFirstType))]
-                [GenerateServiceHandler(AssignableTo = typeof(ISecondService), CustomHandler = nameof(HandleSecondType))]
+                [ScanForTypes(AssignableTo = typeof(IFirstService), Handler = nameof(HandleFirstType))]
+                [ScanForTypes(AssignableTo = typeof(ISecondService), Handler = nameof(HandleSecondType))]
                 public static partial void ProcessServices();
 
                 private static void HandleFirstType<T>() => System.Console.WriteLine("First:" + typeof(T).Name);
@@ -1248,7 +1248,7 @@ public static partial void ProcessServices()
     }
 
     [Fact]
-    public void GenerateServiceHandlerAttribute_MissingCustomHandler_ReportsDiagnostic()
+    public void ScanForTypesAttribute_MissingHandler_ReportsDiagnostic()
     {
         var source = $$"""
             using ServiceScan.SourceGenerator;
@@ -1257,7 +1257,7 @@ namespace GeneratorTests;
                     
             public static partial class ServicesExtensions
             {
-                [GenerateServiceHandler(AssignableTo = typeof(IService))]
+                [ScanForTypes(AssignableTo = typeof(IService))]
                 public static partial void ProcessServices();
             }
             """;
@@ -1281,7 +1281,7 @@ public class MyService : IService { }
     }
 
     [Fact]
-    public void GenerateServiceHandlerAttribute_MissingSearchCriteria_ReportsDiagnostic()
+    public void ScanForTypesAttribute_MissingSearchCriteria_ReportsDiagnostic()
     {
         var source = $$"""
             using ServiceScan.SourceGenerator;
@@ -1290,7 +1290,7 @@ namespace GeneratorTests;
                     
             public static partial class ServicesExtensions
             {
-                [GenerateServiceHandler(CustomHandler = nameof(HandleType))]
+                [ScanForTypes(Handler = nameof(HandleType))]
                 public static partial void ProcessServices();
 
                 private static void HandleType<T>() { }
@@ -1308,7 +1308,7 @@ private static void HandleType<T>() { }
     }
 
     [Fact]
-    public void MixingGenerateServiceRegistrationsAndGenerateServiceHandler_ReportsDiagnostic()
+    public void MixingGenerateServiceRegistrationsAndScanForTypes_ReportsDiagnostic()
     {
         var source = $$"""
             using ServiceScan.SourceGenerator;
@@ -1319,7 +1319,7 @@ namespace GeneratorTests;
             public static partial class ServicesExtensions
             {
                 [GenerateServiceRegistrations(AssignableTo = typeof(IService))]
-                [GenerateServiceHandler(AssignableTo = typeof(IService), CustomHandler = nameof(HandleType))]
+                [ScanForTypes(AssignableTo = typeof(IService), Handler = nameof(HandleType))]
                 public static partial IServiceCollection ProcessServices(this IServiceCollection services);
 
                 private static void HandleType<T>() { }

ServiceScan.SourceGenerator/DependencyInjectionGenerator.ParseMethodModel.cs

@@ -17,7 +17,7 @@ public partial class DependencyInjectionGenerator
         if (!method.IsPartialDefinition)
             return Diagnostic.Create(NotPartialDefinition, method.Locations[0]);
 
-        // Check if GenerateServiceHandlerAttribute is also on this method - that's not allowed
+        // Check if ScanForTypesAttribute is also on this method - that's not allowed
         var hasServiceHandlerAttribute = method.GetAttributes()
             .Any(a => a.AttributeClass?.ToDisplayString() == GenerateAttributeInfo.HandlerMetadataName);
 

ServiceScan.SourceGenerator/DiagnosticDescriptors.cs

@@ -75,15 +75,15 @@ public static class DiagnosticDescriptors
         true);
 
     public static readonly DiagnosticDescriptor MissingCustomHandlerOnGenerateServiceHandler = new("DI0013",
-        "Missing CustomHandler",
-        "GenerateServiceHandlerAttribute must have CustomHandler specified",
+        "Missing Handler",
+        "ScanForTypesAttribute must have Handler specified",
         "Usage",
         DiagnosticSeverity.Error,
         true);
 
     public static readonly DiagnosticDescriptor CantMixServiceRegistrationsAndServiceHandler = new("DI0014",
-        "Cannot mix GenerateServiceRegistrationsAttribute and GenerateServiceHandlerAttribute",
-        "It is not allowed to use both GenerateServiceRegistrationsAttribute and GenerateServiceHandlerAttribute on the same method",
+        "Cannot mix GenerateServiceRegistrationsAttribute and ScanForTypesAttribute",
+        "It is not allowed to use both GenerateServiceRegistrationsAttribute and ScanForTypesAttribute on the same method",
         "Usage",
         DiagnosticSeverity.Error,
         true);

ServiceScan.SourceGenerator/GenerateAttributeInfo.cs

@@ -3,7 +3,7 @@
 internal static class GenerateAttributeInfo
 {
     public const string MetadataName = "ServiceScan.SourceGenerator.GenerateServiceRegistrationsAttribute";
-    public const string HandlerMetadataName = "ServiceScan.SourceGenerator.GenerateServiceHandlerAttribute";
+    public const string HandlerMetadataName = "ServiceScan.SourceGenerator.ScanForTypesAttribute";
 
     public const string Source = """
         #nullable enable
@@ -111,22 +111,22 @@ internal class GenerateServiceRegistrationsAttribute : Attribute
             /// This property is incompatible with <see cref="Lifetime"/>, <see cref="AsImplementedInterfaces"/>, <see cref="AsSelf"/>,
             /// and <see cref="KeySelector"/> properties.
             /// </summary>
-            /// <remarks>This property is obsolete. Use <see cref="GenerateServiceHandlerAttribute"/> instead.</remarks>
-            [Obsolete("Use GenerateServiceHandlerAttribute instead.", error: false)]
+            /// <remarks>This property is obsolete. Use <see cref="ScanForTypesAttribute"/> instead.</remarks>
+            [Obsolete("Use ScanForTypesAttribute instead.", error: false)]
             public string? CustomHandler { get; set; }
         }
 
         [Conditional("CODE_ANALYSIS")]
         [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
-        internal class GenerateServiceHandlerAttribute : Attribute
+        internal class ScanForTypesAttribute : Attribute
         {
             /// <summary>
             /// Sets this property to invoke a custom method for each type found.
             /// This property should point to one of the following:
             /// - Name of a generic method in the current type.
             /// - Static method name in found types.
             /// </summary>
-            public string? CustomHandler { get; set; }
+            public string? Handler { get; set; }
 
             /// <summary>
             /// Sets the assembly containing the given type as the source of types to scan.

ServiceScan.SourceGenerator/Model/AttributeModel.cs

@@ -47,7 +47,8 @@ public static AttributeModel Create(AttributeData attribute, IMethodSymbol metho
         var excludeByTypeName = attribute.NamedArguments.FirstOrDefault(a => a.Key == "ExcludeByTypeName").Value.Value as string;
         var excludeAssignableTo = attribute.NamedArguments.FirstOrDefault(a => a.Key == "ExcludeAssignableTo").Value.Value as INamedTypeSymbol;
         var keySelector = attribute.NamedArguments.FirstOrDefault(a => a.Key == "KeySelector").Value.Value as string;
-        var customHandler = attribute.NamedArguments.FirstOrDefault(a => a.Key == "CustomHandler").Value.Value as string;
+        var customHandler = (attribute.NamedArguments.FirstOrDefault(a => a.Key == "Handler").Value.Value
+                             ?? attribute.NamedArguments.FirstOrDefault(a => a.Key == "CustomHandler").Value.Value) as string;
 
         var assignableToTypeParametersCount = assignableTo?.TypeParameters.Length ?? 0;