From 51e3318b33b53e0d06fcac81a0d84ebceea19a2e Mon Sep 17 00:00:00 2001
From: Jason Barden <jason.barden1@outlook.com>
Date: Sat, 17 Jan 2026 09:20:27 +0000
Subject: [PATCH] Refactor service registration and attribute usage

- Rename ServiceAttribute to AutoRegisterServiceAttribute for clarity
- Add ServiceModel class and use shared ServiceLifetime enum
- Generate service registration code with correct namespace
- Improve attribute XML docs and endpoint registration options
- Update NuGet metadata and project references
- Enhance options binding logic and code style
- Replace and update unit tests for service registration
- Minor formatting and strong ID code improvements
---
 .../AutoRegisterEndpointAttribute.cs          |  38 ++++++++
 .../AutoRegisterOptions.cs                    |   8 ++
 ...ute.cs => AutoRegisterServiceAttribute.cs} |   2 +-
 .../ServiceLifetime.cs                        |   3 +
 .../AStar.Dev.Source.Generators.csproj        |  34 +++++--
 .../OptionBindingGenerator.cs                 |  28 +++---
 .../OptionsBindingCodeGenerator.cs            |   7 +-
 .../ServiceCollectionCodeGenerator.cs         |  33 ++++---
 .../ServiceModel.cs                           |  81 ++++++++++++++++
 .../ServiceRegistrationGenerator.cs           |  89 ++----------------
 src/AStar.Dev.Source.Generators/astar.png     | Bin 0 -> 15984 bytes
 .../RegisterServiceAttributeShould.cs         |  35 +++++++
 .../ServiceAttributeShould.cs                 |  35 -------
 ...xpectedCode#OrderId.StrongId.g.received.cs |   6 +-
 .../StrongIdCodeGeneration/TestStrongIds.cs   |   2 +-
 15 files changed, 239 insertions(+), 162 deletions(-)
 create mode 100644 src/AStar.Dev.Source.Generators.Attributes/AutoRegisterEndpointAttribute.cs
 rename src/AStar.Dev.Source.Generators.Attributes/{ServiceAttribute.cs => AutoRegisterServiceAttribute.cs} (86%)
 create mode 100644 src/AStar.Dev.Source.Generators/ServiceRegistrationGeneration/ServiceModel.cs
 create mode 100644 src/AStar.Dev.Source.Generators/astar.png
 create mode 100644 test/AStar.Dev.Source.Generators.Attributes.Tests.Unit/RegisterServiceAttributeShould.cs
 delete mode 100644 test/AStar.Dev.Source.Generators.Attributes.Tests.Unit/ServiceAttributeShould.cs

diff --git a/src/AStar.Dev.Source.Generators.Attributes/AutoRegisterEndpointAttribute.cs b/src/AStar.Dev.Source.Generators.Attributes/AutoRegisterEndpointAttribute.cs
new file mode 100644
index 0000000..7ee97ff
--- /dev/null
+++ b/src/AStar.Dev.Source.Generators.Attributes/AutoRegisterEndpointAttribute.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Net.Http;
+
+namespace AStar.Dev.Source.Generators.Attributes;
+
+/// <summary>
+/// An attribute to automatically register a minimal APU endpoint.
+/// </summary>
+/// <remarks>
+/// This attribute is used to mark classes for automatic endpoint registration in the system.
+/// It supports specifying an HTTP method type and an optional method group name for categorization or grouping.
+/// </remarks>
+[AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
+public class AutoRegisterEndpointAttribute(HttpMethod? methodType, string? methodGroupName = null) : Attribute
+{
+    /// <summary>
+    /// Gets the HTTP method type associated with the endpoint.
+    /// </summary>
+    /// <remarks>
+    /// If no specific HTTP method is provided during initialization, the default value is <see cref="HttpMethod.Get"/>.
+    /// </remarks>
+    /// <value>
+    /// Represents the HTTP method used for the endpoint, as an instance of the <see cref="System.Net.Http.HttpMethod"/> class.
+    /// </value>
+    public HttpMethod MethodType { get; } = methodType ?? HttpMethod.Get;
+
+    /// <summary>
+    /// Gets the group name associated with the method for organizational purposes.
+    /// </summary>
+    /// <remarks>
+    /// This property provides a way to categorize or group methods logically within a larger structure.
+    /// If no group name is specified during initialization, the value will be <see langword="null"/>.
+    /// </remarks>
+    /// <value>
+    /// Represents the name of the method group as a <see cref="string"/>. Can be <see langword="null"/> if not explicitly set.
+    /// </value>
+    public string? MethodGroupName { get; } = methodGroupName;
+}
diff --git a/src/AStar.Dev.Source.Generators.Attributes/AutoRegisterOptions.cs b/src/AStar.Dev.Source.Generators.Attributes/AutoRegisterOptions.cs
index 71a0847..1bbf91b 100644
--- a/src/AStar.Dev.Source.Generators.Attributes/AutoRegisterOptions.cs
+++ b/src/AStar.Dev.Source.Generators.Attributes/AutoRegisterOptions.cs
@@ -2,6 +2,14 @@
 
 namespace AStar.Dev.Source.Generators.Attributes;
 
+/// <summary>
+/// Attribute used to indicate that a class or struct should be automatically registered as an <see cref="IOptions{T}"/>,
+/// with an optional section name provided for configuration purposes.
+/// </summary>
+/// <remarks>
+/// This attribute can only be applied to classes or structs. It is not inherited by derived types
+/// and does not allow multiple usage on the same target.
+/// </remarks>
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct, Inherited = false, AllowMultiple = false)]
 public class AutoRegisterOptionsAttribute(string? sectionName = null) : Attribute
 {
diff --git a/src/AStar.Dev.Source.Generators.Attributes/ServiceAttribute.cs b/src/AStar.Dev.Source.Generators.Attributes/AutoRegisterServiceAttribute.cs
similarity index 86%
rename from src/AStar.Dev.Source.Generators.Attributes/ServiceAttribute.cs
rename to src/AStar.Dev.Source.Generators.Attributes/AutoRegisterServiceAttribute.cs
index 45f1ef9..46d74e1 100644
--- a/src/AStar.Dev.Source.Generators.Attributes/ServiceAttribute.cs
+++ b/src/AStar.Dev.Source.Generators.Attributes/AutoRegisterServiceAttribute.cs
@@ -3,7 +3,7 @@
 namespace AStar.Dev.Source.Generators.Attributes;
 
 [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
-public sealed class ServiceAttribute(ServiceLifetime lifetime = ServiceLifetime.Scoped) : Attribute
+public sealed class AutoRegisterServiceAttribute(ServiceLifetime lifetime = ServiceLifetime.Scoped) : Attribute
 {
     /// <summary>
     /// Specifies the lifetime of the service. Defaults to Scoped.
diff --git a/src/AStar.Dev.Source.Generators.Attributes/ServiceLifetime.cs b/src/AStar.Dev.Source.Generators.Attributes/ServiceLifetime.cs
index 0aaf428..bbf8ca2 100644
--- a/src/AStar.Dev.Source.Generators.Attributes/ServiceLifetime.cs
+++ b/src/AStar.Dev.Source.Generators.Attributes/ServiceLifetime.cs
@@ -1,3 +1,6 @@
 namespace AStar.Dev.Source.Generators.Attributes;
 
+/// <summary>
+/// Specifies the lifetime of a service within a dependency injection container.
+/// </summary>
 public enum ServiceLifetime { Singleton, Scoped, Transient }
diff --git a/src/AStar.Dev.Source.Generators/AStar.Dev.Source.Generators.csproj b/src/AStar.Dev.Source.Generators/AStar.Dev.Source.Generators.csproj
index b8edbd0..d0c53f2 100644
--- a/src/AStar.Dev.Source.Generators/AStar.Dev.Source.Generators.csproj
+++ b/src/AStar.Dev.Source.Generators/AStar.Dev.Source.Generators.csproj
@@ -9,26 +9,29 @@
         <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
         <IsRoslynComponent>true</IsRoslynComponent>
         <PackageId>AStar.Dev.Source.Generators</PackageId>
-        <!-- Do NOT include referenced projects in this generator package -->
         <IncludeReferencedProjects>false</IncludeReferencedProjects>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <!-- Include generator DLL in analyzers folder for proper loading -->
         <IncludeBuildOutput>false</IncludeBuildOutput>
         <NoWarn>$(NoWarn);NU5128</NoWarn>
 
         <!-- Package metadata -->
-        <Version>0.1.3</Version>
-        <Authors>AStar Dev</Authors>
-        <Company>AStar</Company>
+        <Version>0.1.4</Version>
+        <Authors>AStar Development, Jason Barden</Authors>
+        <Company>AStar Development</Company>
         <Description>Source generators and supporting attribute types for AStar.Dev projects.</Description>
         <PackageTags>source-generator;strongid;attributes;astartools</PackageTags>
-        <PackageProjectUrl>https://example.com/AStar.Dev.Source.Generators</PackageProjectUrl>
-        <RepositoryUrl>https://github.com/your-org/SourceGenerators1111</RepositoryUrl>
+        <PackageProjectUrl>https://astardevelopment.co.uk</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/astar-development/astar-dev-source-generators.git</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-        <PackageReleaseNotes>Initial 0.1.2 release.</PackageReleaseNotes>
+        <PackageReleaseNotes>v0.1.4 - Add missing namespace in generated ServiceRegistrations class.
+- Rename ServiceAttribute to AutoRegisterServiceAttribute for clarity</PackageReleaseNotes>
         <RepositoryBranch>main</RepositoryBranch>
+        <Title>AStar Dev Source Generators</Title>
+        <PackageReadmeFile>Readme.md</PackageReadmeFile>
+        <PackageIcon>astar.png</PackageIcon>
+        <IncludeSymbols>True</IncludeSymbols>
     </PropertyGroup>
 
     <ItemGroup>
@@ -59,7 +62,18 @@
         <!-- Include build props to auto-reference the Attributes assembly -->
         <None Include="build\AStar.Dev.Source.Generators.props" Pack="true" PackagePath="build" />
     </ItemGroup>
-        <!-- (BuildAndCopyAttributes target above handles building and copying the Attributes DLL) -->
-
+    <ItemGroup>
+      <ProjectReference Include="..\AStar.Dev.Source.Generators.Attributes\AStar.Dev.Source.Generators.Attributes.csproj" />
+    </ItemGroup>
+    <ItemGroup>
+      <None Update="astar.png">
+        <Pack>True</Pack>
+        <PackagePath>\</PackagePath>
+      </None>
+      <None Update="Readme.md">
+        <Pack>True</Pack>
+        <PackagePath>\</PackagePath>
+      </None>
+    </ItemGroup>
 
 </Project>
diff --git a/src/AStar.Dev.Source.Generators/OptionsBindingGeneration/OptionBindingGenerator.cs b/src/AStar.Dev.Source.Generators/OptionsBindingGeneration/OptionBindingGenerator.cs
index d77f728..d37dc96 100644
--- a/src/AStar.Dev.Source.Generators/OptionsBindingGeneration/OptionBindingGenerator.cs
+++ b/src/AStar.Dev.Source.Generators/OptionsBindingGeneration/OptionBindingGenerator.cs
@@ -61,7 +61,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
         var fullTypeName = ns != null ? string.Concat(ns, ".", typeName) : typeName;
         string? sectionName = null;
         AttributeData? attr = typeSymbol.GetAttributes().FirstOrDefault(a => a.AttributeClass?.ToDisplayString() == AttrFqn);
-        if(attr != null && attr.ConstructorArguments.Length > 0 && attr.ConstructorArguments[0].Value is string s && !string.IsNullOrWhiteSpace(s))
+        if(attr is { ConstructorArguments.Length: > 0 } && attr.ConstructorArguments[0].Value is string s && !string.IsNullOrWhiteSpace(s))
         {
             sectionName = s;
         }
@@ -72,23 +72,27 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             if(attrSyntax?.ArgumentList?.Arguments.Count > 0)
             {
                 ExpressionSyntax expr = attrSyntax.ArgumentList.Arguments[0].Expression;
-                if(expr is LiteralExpressionSyntax literal && literal.Token.Value is string literalValue)
-                {
-                    sectionName = literalValue;
-                }
+                if(expr is LiteralExpressionSyntax { Token.Value: string literalValue }) sectionName = literalValue;
             }
         }
 
-        if(string.IsNullOrWhiteSpace(sectionName))
+        return !string.IsNullOrWhiteSpace(sectionName) 
+            ? new OptionsTypeInfo(typeName, fullTypeName, sectionName!, ctx.TargetNode.GetLocation()) 
+            : ExtractSectionNameFromMembers(ctx, typeSymbol, sectionName, typeName, fullTypeName);
+    }
+
+    private static OptionsTypeInfo? ExtractSectionNameFromMembers(GeneratorAttributeSyntaxContext ctx, INamedTypeSymbol typeSymbol, string? sectionName, string typeName, string fullTypeName)
+    {
+        foreach(ISymbol member in typeSymbol.GetMembers())
         {
-            foreach(ISymbol member in typeSymbol.GetMembers())
+            if(member is not IFieldSymbol { IsStatic: true, IsConst: true, Name: "SectionName" } field || field.Type.SpecialType != SpecialType.System_String ||
+               field.ConstantValue is not string val || string.IsNullOrWhiteSpace(val))
             {
-                if(member is IFieldSymbol field && field.IsStatic && field.IsConst && field.Name == "SectionName" && field.Type.SpecialType == SpecialType.System_String && field.ConstantValue is string val && !string.IsNullOrWhiteSpace(val))
-                {
-                    sectionName = val;
-                    break;
-                }
+                continue;
             }
+
+            sectionName = val;
+            break;
         }
 
         return new OptionsTypeInfo(typeName, fullTypeName, sectionName ?? string.Empty, ctx.TargetNode.GetLocation());
diff --git a/src/AStar.Dev.Source.Generators/OptionsBindingGeneration/OptionsBindingCodeGenerator.cs b/src/AStar.Dev.Source.Generators/OptionsBindingGeneration/OptionsBindingCodeGenerator.cs
index 1c0655b..20b4029 100644
--- a/src/AStar.Dev.Source.Generators/OptionsBindingGeneration/OptionsBindingCodeGenerator.cs
+++ b/src/AStar.Dev.Source.Generators/OptionsBindingGeneration/OptionsBindingCodeGenerator.cs
@@ -18,10 +18,7 @@ public static string Generate(IReadOnlyList<OptionsTypeInfo> types)
         _ = sb.AppendLine("    {");
         _ = sb.AppendLine("        public static IServiceCollection AddAutoRegisteredOptions(this IServiceCollection services, IConfiguration configuration)");
         _ = sb.AppendLine("        {");
-        foreach(OptionsTypeInfo info in types)
-        {
-            _ = sb.AppendLine($"            services.AddOptions<{info.FullTypeName}>()\n                .Bind(configuration.GetSection(\"{EscapeString(info.SectionName)}\"))\n                .ValidateDataAnnotations()\n                .ValidateOnStart();");
-        }
+        foreach(OptionsTypeInfo info in types) _ = sb.AppendLine($"            services.AddOptions<{info.FullTypeName}>()\n                .Bind(configuration.GetSection(\"{EscapeString(info.SectionName)}\"))\n                .ValidateDataAnnotations()\n                .ValidateOnStart();");
 
         _ = sb.AppendLine("            return services;");
         _ = sb.AppendLine("        }");
@@ -30,5 +27,5 @@ public static string Generate(IReadOnlyList<OptionsTypeInfo> types)
         return sb.ToString();
     }
 
-    private static string EscapeString(string s) => s?.Replace("\\", "\\\\").Replace("\"", "\\\"") ?? string.Empty;
+    private static string EscapeString(string s) => s?.Replace("\\", @"\\").Replace("\"", "\\\"") ?? string.Empty;
 }
diff --git a/src/AStar.Dev.Source.Generators/ServiceRegistrationGeneration/ServiceCollectionCodeGenerator.cs b/src/AStar.Dev.Source.Generators/ServiceRegistrationGeneration/ServiceCollectionCodeGenerator.cs
index 8ae22ab..e84e74e 100644
--- a/src/AStar.Dev.Source.Generators/ServiceRegistrationGeneration/ServiceCollectionCodeGenerator.cs
+++ b/src/AStar.Dev.Source.Generators/ServiceRegistrationGeneration/ServiceCollectionCodeGenerator.cs
@@ -2,31 +2,31 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using AStar.Dev.Source.Generators.Attributes;
 
 namespace AStar.Dev.Source.Generators.ServiceRegistrationGeneration;
 
 internal static class ServiceCollectionCodeGenerator
 {
-    public static string Generate(IReadOnlyList<ServiceRegistrationGenerator.ServiceModel> items)
+    public static string Generate(IReadOnlyList<ServiceModel> items)
     {
         IEnumerable<string> registrations = BuildServiceRegistrations(items);
-        return BuildSourceFile(registrations);
+        ServiceModel? item = items.FirstOrDefault();
+        return BuildSourceFile(registrations, item?.Namespace ?? "AStar.Dev");
     }
 
-    private static IEnumerable<string> BuildServiceRegistrations(IReadOnlyList<ServiceRegistrationGenerator.ServiceModel> items)
+    private static IEnumerable<string> BuildServiceRegistrations(IReadOnlyList<ServiceModel> items)
     {
         var seen = new HashSet<string>(StringComparer.Ordinal);
 
-        foreach(ServiceRegistrationGenerator.ServiceModel model in items)
+        foreach(ServiceModel model in items)
         {
             foreach(var registration in CreateRegistrationsForModel(model).Where(seen.Add))
-            {
                 yield return registration;
-            }
         }
     }
 
-    private static IEnumerable<string> CreateRegistrationsForModel(ServiceRegistrationGenerator.ServiceModel model)
+    private static IEnumerable<string> CreateRegistrationsForModel(ServiceModel model)
     {
         var method = GetRegistrationMethod(model.Lifetime);
 
@@ -43,20 +43,23 @@ private static IEnumerable<string> CreateRegistrationsForModel(ServiceRegistrati
         }
     }
 
-    private static string GetRegistrationMethod(ServiceRegistrationGenerator.Lifetime lifetime) => lifetime switch
-    {
-        ServiceRegistrationGenerator.Lifetime.Singleton => "AddSingleton",
-        ServiceRegistrationGenerator.Lifetime.Scoped => "AddScoped",
-        ServiceRegistrationGenerator.Lifetime.Transient => "AddTransient",
-        _ => "AddScoped"
-    };
+    private static string GetRegistrationMethod(ServiceLifetime lifetime)
+        => lifetime switch
+        {
+            ServiceLifetime.Singleton => "AddSingleton",
+            ServiceLifetime.Scoped => "AddScoped",
+            ServiceLifetime.Transient => "AddTransient",
+            _ => "AddScoped"
+        };
 
-    private static string BuildSourceFile(IEnumerable<string> registrations)
+    private static string BuildSourceFile(IEnumerable<string> registrations, string @namespace)
     {
         var sb = new StringBuilder();
         _ = sb.AppendLine("// <auto-generated/>");
         _ = sb.AppendLine("using Microsoft.Extensions.DependencyInjection;");
         _ = sb.AppendLine();
+        _ = sb.AppendLine($"namespace {@namespace};");
+        _ = sb.AppendLine();
         _ = sb.AppendLine("public static class GeneratedServiceCollectionExtensions");
         _ = sb.AppendLine("{");
         _ = sb.AppendLine("    public static IServiceCollection AddAnnotatedServices(this IServiceCollection s)");
diff --git a/src/AStar.Dev.Source.Generators/ServiceRegistrationGeneration/ServiceModel.cs b/src/AStar.Dev.Source.Generators/ServiceRegistrationGeneration/ServiceModel.cs
new file mode 100644
index 0000000..52030f7
--- /dev/null
+++ b/src/AStar.Dev.Source.Generators/ServiceRegistrationGeneration/ServiceModel.cs
@@ -0,0 +1,81 @@
+using System.Collections.Generic;
+using System.Linq;
+using AStar.Dev.Source.Generators.Attributes;
+using Microsoft.CodeAnalysis;
+
+namespace AStar.Dev.Source.Generators.ServiceRegistrationGeneration;
+
+internal sealed class ServiceModel(ServiceLifetime lifetime, string implFqn, string? serviceFqn, bool alsoAsSelf, string @namespace)
+{
+    public ServiceLifetime Lifetime { get; } = lifetime;
+    public string ImplFqn { get; } = implFqn;
+    public string? ServiceFqn { get; } = serviceFqn;
+    public string? Namespace { get; } = @namespace;
+    public bool AlsoAsSelf { get; } = alsoAsSelf;
+
+    public static ServiceModel? TryCreate(INamedTypeSymbol impl, AttributeData attr)
+    {
+        if(!IsValidImplementationType(impl))
+            return null;
+
+        ServiceLifetime lifetime = ExtractLifetime(attr);
+        INamedTypeSymbol? asType = ExtractAsType(attr);
+        var asSelf = ExtractAsSelf(attr);
+        INamedTypeSymbol? service = asType ?? InferServiceType(impl);
+        var ns = impl.ContainingNamespace.IsGlobalNamespace ? null : impl.ContainingNamespace.ToDisplayString();
+
+        // Only skip if no service and not alsoAsSelf
+        return service is null && !asSelf
+            ? null
+            : new ServiceModel(
+            lifetime: lifetime,
+            implFqn: impl.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat),
+            serviceFqn: service?.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat),
+            alsoAsSelf: asSelf,
+            @namespace: ns
+        );
+    }
+
+    private static bool IsValidImplementationType(INamedTypeSymbol impl) => !impl.IsAbstract &&
+               impl.Arity == 0 &&
+               impl.DeclaredAccessibility == Accessibility.Public;
+
+    private static ServiceLifetime ExtractLifetime(AttributeData attr) => attr.ConstructorArguments.Length == 1 &&
+               attr.ConstructorArguments[0].Value is int li
+            ? (ServiceLifetime)li
+            : ServiceLifetime.Scoped;
+
+    private static INamedTypeSymbol? ExtractAsType(AttributeData attr)
+    {
+        foreach(KeyValuePair<string, TypedConstant> na in attr.NamedArguments)
+        {
+            if(na.Key == "As" && na.Value.Value is INamedTypeSymbol ts)
+                return ts;
+        }
+
+        return null;
+    }
+
+    private static bool ExtractAsSelf(AttributeData attr)
+    {
+        foreach(KeyValuePair<string, TypedConstant> na in attr.NamedArguments)
+        {
+            if(na.Key == "AsSelf" && na.Value.Value is bool b)
+                return b;
+        }
+
+        return false;
+    }
+
+    private static INamedTypeSymbol? InferServiceType(INamedTypeSymbol impl)
+    {
+        INamedTypeSymbol[] candidates = [.. impl.AllInterfaces.Where(IsEligibleServiceInterface)];
+
+        return candidates.Length == 1 ? candidates[0] : null;
+    }
+
+    private static bool IsEligibleServiceInterface(INamedTypeSymbol i) => i.DeclaredAccessibility == Accessibility.Public &&
+               i.TypeKind == TypeKind.Interface &&
+               i.Arity == 0 &&
+               i.ToDisplayString() != "System.IDisposable";
+}
diff --git a/src/AStar.Dev.Source.Generators/ServiceRegistrationGeneration/ServiceRegistrationGenerator.cs b/src/AStar.Dev.Source.Generators/ServiceRegistrationGeneration/ServiceRegistrationGenerator.cs
index 13ad9a5..3aeecaa 100644
--- a/src/AStar.Dev.Source.Generators/ServiceRegistrationGeneration/ServiceRegistrationGenerator.cs
+++ b/src/AStar.Dev.Source.Generators/ServiceRegistrationGeneration/ServiceRegistrationGenerator.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Collections.Immutable;
+using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
@@ -9,7 +8,7 @@ namespace AStar.Dev.Source.Generators.ServiceRegistrationGeneration;
 
 [Generator]
 [System.Diagnostics.CodeAnalysis.SuppressMessage("MicrosoftCodeAnalysisCorrectness", "RS1038:Compiler extensions should be implemented in assemblies with compiler-provided references", Justification = "<Pending>")]
-public sealed class ServiceRegistrationGenerator : IIncrementalGenerator
+public sealed partial class ServiceRegistrationGenerator : IIncrementalGenerator
 {
     public void Initialize(IncrementalGeneratorInitializationContext context)
     {
@@ -27,7 +26,8 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
                 transform: static (syntaxCtx, _) => GetDeclaredSymbol(syntaxCtx))
             .Where(static s => s is not null)!;
 
-    private static bool IsClassCandidateForServiceRegistration(SyntaxNode node) => node is ClassDeclarationSyntax c &&
+    private static bool IsClassCandidateForServiceRegistration(SyntaxNode node)
+        => node is ClassDeclarationSyntax c &&
                c.AttributeLists.Count > 0 &&
                c.TypeParameterList is null;
 
@@ -42,7 +42,8 @@ private static bool IsClassCandidateForServiceRegistration(SyntaxNode node) => n
             .Select(static (sym, _) => (sym, attr: FindServiceAttribute(sym!)))
             .Where(static t => t.attr is not null)!;
 
-    private static AttributeData? FindServiceAttribute(INamedTypeSymbol symbol) => symbol.GetAttributes()
+    private static AttributeData? FindServiceAttribute(INamedTypeSymbol symbol)
+        => symbol.GetAttributes()
         .FirstOrDefault(a =>
             a.AttributeClass?.Name == "ServiceAttribute" ||
             a.AttributeClass?.ToDisplayString().EndsWith(".ServiceAttribute") == true);
@@ -52,85 +53,9 @@ private static bool IsClassCandidateForServiceRegistration(SyntaxNode node) => n
             .Select(static (t, _) => ServiceModel.TryCreate(t.sym, t.attr!))
             .Where(static m => m is not null)!;
 
-    private static void GenerateSource(
-        SourceProductionContext spc,
-        (Compilation Left, ImmutableArray<ServiceModel?> Right) pair)
+    private static void GenerateSource(SourceProductionContext spc, (Compilation Left, ImmutableArray<ServiceModel?> Right) pair)
     {
         var code = ServiceCollectionCodeGenerator.Generate(pair.Right);
         spc.AddSource("GeneratedServiceCollectionExtensions.g.cs", code);
     }
-
-    internal enum Lifetime { Singleton = 0, Scoped = 1, Transient = 2 }
-
-    internal sealed class ServiceModel(ServiceRegistrationGenerator.Lifetime lifetime, string implFqn, string? serviceFqn, bool alsoAsSelf)
-    {
-        public Lifetime Lifetime { get; } = lifetime;
-        public string ImplFqn { get; } = implFqn;
-        public string? ServiceFqn { get; } = serviceFqn;
-        public bool AlsoAsSelf { get; } = alsoAsSelf;
-
-        public static ServiceModel? TryCreate(INamedTypeSymbol impl, AttributeData attr)
-        {
-            if(!IsValidImplementationType(impl))
-                return null;
-
-            Lifetime lifetime = ExtractLifetime(attr);
-            INamedTypeSymbol? asType = ExtractAsType(attr);
-            var asSelf = ExtractAsSelf(attr);
-            INamedTypeSymbol? service = asType ?? InferServiceType(impl);
-
-            // Only skip if no service and not alsoAsSelf
-            return service is null && !asSelf
-                ? null
-                : new ServiceModel(
-                lifetime: lifetime,
-                implFqn: impl.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat),
-                serviceFqn: service?.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat),
-                alsoAsSelf: asSelf
-            );
-        }
-
-        private static bool IsValidImplementationType(INamedTypeSymbol impl) => !impl.IsAbstract &&
-                   impl.Arity == 0 &&
-                   impl.DeclaredAccessibility == Accessibility.Public;
-
-        private static Lifetime ExtractLifetime(AttributeData attr) => attr.ConstructorArguments.Length == 1 &&
-                   attr.ConstructorArguments[0].Value is int li
-                ? (Lifetime)li
-                : Lifetime.Scoped;
-
-        private static INamedTypeSymbol? ExtractAsType(AttributeData attr)
-        {
-            foreach(KeyValuePair<string, TypedConstant> na in attr.NamedArguments)
-            {
-                if(na.Key == "As" && na.Value.Value is INamedTypeSymbol ts)
-                    return ts;
-            }
-
-            return null;
-        }
-
-        private static bool ExtractAsSelf(AttributeData attr)
-        {
-            foreach(KeyValuePair<string, TypedConstant> na in attr.NamedArguments)
-            {
-                if(na.Key == "AsSelf" && na.Value.Value is bool b)
-                    return b;
-            }
-
-            return false;
-        }
-
-        private static INamedTypeSymbol? InferServiceType(INamedTypeSymbol impl)
-        {
-            INamedTypeSymbol[] candidates = [.. impl.AllInterfaces.Where(IsEligibleServiceInterface)];
-
-            return candidates.Length == 1 ? candidates[0] : null;
-        }
-
-        private static bool IsEligibleServiceInterface(INamedTypeSymbol i) => i.DeclaredAccessibility == Accessibility.Public &&
-                   i.TypeKind == TypeKind.Interface &&
-                   i.Arity == 0 &&
-                   i.ToDisplayString() != "System.IDisposable";
-    }
 }
diff --git a/src/AStar.Dev.Source.Generators/astar.png b/src/AStar.Dev.Source.Generators/astar.png
new file mode 100644
index 0000000000000000000000000000000000000000..74b197eaae17c8a9d66b29d6259ce99af25741e6
GIT binary patch
literal 15984
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

literal 0
HcmV?d00001

diff --git a/test/AStar.Dev.Source.Generators.Attributes.Tests.Unit/RegisterServiceAttributeShould.cs b/test/AStar.Dev.Source.Generators.Attributes.Tests.Unit/RegisterServiceAttributeShould.cs
new file mode 100644
index 0000000..284d635
--- /dev/null
+++ b/test/AStar.Dev.Source.Generators.Attributes.Tests.Unit/RegisterServiceAttributeShould.cs
@@ -0,0 +1,35 @@
+namespace AStar.Dev.Source.Generators.Attributes.Tests.Unit;
+
+public class RegisterServiceAttributeShould
+{
+    [Fact]
+    public void HaveDefaultLifetimeAsScoped()
+        => new AutoRegisterServiceAttribute().Lifetime.ShouldBe(ServiceLifetime.Scoped);
+
+    [Fact]
+    public void AllowSettingLifetimeViaConstructor()
+        => new AutoRegisterServiceAttribute(ServiceLifetime.Singleton).Lifetime.ShouldBe(ServiceLifetime.Singleton);
+
+    [Fact]
+    public void AllowSettingAsProperty()
+        => new AutoRegisterServiceAttribute { As = typeof(string) }.As.ShouldBe(typeof(string));
+
+    [Fact]
+    public void AllowSettingAsSelfProperty()
+        => new AutoRegisterServiceAttribute { AsSelf = true }.AsSelf.ShouldBeTrue();
+
+    [Fact]
+    public void BeApplicableToClassesOnly()
+        => typeof(AutoRegisterServiceAttribute).GetCustomAttributes(typeof(AttributeUsageAttribute), false)
+            .OfType<AttributeUsageAttribute>().Single().ValidOn.ShouldBe(AttributeTargets.Class);
+
+    [Fact]
+    public void NotBeInherited()
+        => typeof(AutoRegisterServiceAttribute).GetCustomAttributes(typeof(AttributeUsageAttribute), false)
+            .OfType<AttributeUsageAttribute>().Single().Inherited.ShouldBeFalse();
+
+    [Fact]
+    public void NotAllowMultipleUsageOnSameClass()
+        => typeof(AutoRegisterServiceAttribute).GetCustomAttributes(typeof(AttributeUsageAttribute), false)
+            .OfType<AttributeUsageAttribute>().Single().AllowMultiple.ShouldBeFalse();
+}
diff --git a/test/AStar.Dev.Source.Generators.Attributes.Tests.Unit/ServiceAttributeShould.cs b/test/AStar.Dev.Source.Generators.Attributes.Tests.Unit/ServiceAttributeShould.cs
deleted file mode 100644
index e03c4ff..0000000
--- a/test/AStar.Dev.Source.Generators.Attributes.Tests.Unit/ServiceAttributeShould.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-namespace AStar.Dev.Source.Generators.Attributes.Tests.Unit;
-
-public class ServiceAttributeShould
-{
-    [Fact]
-    public void HaveDefaultLifetimeAsScoped()
-        => new ServiceAttribute().Lifetime.ShouldBe(ServiceLifetime.Scoped);
-
-    [Fact]
-    public void AllowSettingLifetimeViaConstructor()
-        => new ServiceAttribute(ServiceLifetime.Singleton).Lifetime.ShouldBe(ServiceLifetime.Singleton);
-
-    [Fact]
-    public void AllowSettingAsProperty()
-        => new ServiceAttribute { As = typeof(string) }.As.ShouldBe(typeof(string));
-
-    [Fact]
-    public void AllowSettingAsSelfProperty()
-        => new ServiceAttribute { AsSelf = true }.AsSelf.ShouldBeTrue();
-
-    [Fact]
-    public void BeApplicableToClassesOnly()
-        => typeof(ServiceAttribute).GetCustomAttributes(typeof(AttributeUsageAttribute), false)
-            .OfType<AttributeUsageAttribute>().Single().ValidOn.ShouldBe(AttributeTargets.Class);
-
-    [Fact]
-    public void NotBeInherited()
-        => typeof(ServiceAttribute).GetCustomAttributes(typeof(AttributeUsageAttribute), false)
-            .OfType<AttributeUsageAttribute>().Single().Inherited.ShouldBeFalse();
-
-    [Fact]
-    public void NotAllowMultipleUsageOnSameClass()
-        => typeof(ServiceAttribute).GetCustomAttributes(typeof(AttributeUsageAttribute), false)
-            .OfType<AttributeUsageAttribute>().Single().AllowMultiple.ShouldBeFalse();
-}
diff --git a/test/AStar.Dev.Source.Generators.Tests.Unit/StrongIdCodeGeneration/StrongIdGeneratorTests.StrongId_GeneratesExpectedCode#OrderId.StrongId.g.received.cs b/test/AStar.Dev.Source.Generators.Tests.Unit/StrongIdCodeGeneration/StrongIdGeneratorTests.StrongId_GeneratesExpectedCode#OrderId.StrongId.g.received.cs
index e3d3fea..db6aef9 100644
--- a/test/AStar.Dev.Source.Generators.Tests.Unit/StrongIdCodeGeneration/StrongIdGeneratorTests.StrongId_GeneratesExpectedCode#OrderId.StrongId.g.received.cs
+++ b/test/AStar.Dev.Source.Generators.Tests.Unit/StrongIdCodeGeneration/StrongIdGeneratorTests.StrongId_GeneratesExpectedCode#OrderId.StrongId.g.received.cs
@@ -1,6 +1,10 @@
 //HintName: OrderId.StrongId.g.cs
 // <auto-generated/>
 #nullable enable
+using System;
+
+namespace AStar.Dev.Source.Generators.Tests.Unit.StrongIdCodeGeneration;
+
 public readonly partial struct OrderId : System.IEquatable<OrderId>
 {
     private readonly System.Guid _value;
@@ -18,7 +22,7 @@
 
     public static bool TryParse(string? s, out OrderId value)
     {
-        var ok = System.Guid.TryParse(s, out var g);
+        var ok = System.Guid.TryParse(s, out Guid g);
         value = ok ? new(g) : default;
         return ok;
     }
diff --git a/test/AStar.Dev.Source.Generators.Tests.Unit/StrongIdCodeGeneration/TestStrongIds.cs b/test/AStar.Dev.Source.Generators.Tests.Unit/StrongIdCodeGeneration/TestStrongIds.cs
index 1bf06cf..f6ef0bf 100644
--- a/test/AStar.Dev.Source.Generators.Tests.Unit/StrongIdCodeGeneration/TestStrongIds.cs
+++ b/test/AStar.Dev.Source.Generators.Tests.Unit/StrongIdCodeGeneration/TestStrongIds.cs
@@ -7,7 +7,7 @@ namespace AStar.Dev.Source.Generators.Tests.Unit.StrongIdCodeGeneration;
 public readonly partial record struct UserId;
 
 [StrongId(typeof(int))]
-public readonly partial record struct OrderId;
+public readonly partial record struct OrderId2;
 
 [StrongId(typeof(System.Guid))]
 public readonly partial record struct EntityId;