Fix: Correct typos and improve service registration logic

Renamed `SpecifcInjectableServiceRegistration` to `SpecificInjectableServiceRegistration` to fix spelling errors. Adjusted string checks and formatting in service registration methods to enhance clarity and accuracy, including updating argument handling for key-based registration.

Author: AnnaSasDev

src/CodeOfChaos.Extensions.DependencyInjection.Generators/Registrations/InjectableServiceRegistration.cs

@@ -24,7 +24,7 @@ public record struct InjectableServiceRegistration(
     // Methods
     // -----------------------------------------------------------------------------------------------------------------
     public void FormatText(GeneratorStringBuilder builder, string _) {
-        if (Key is not null) builder.AppendLine($"services.AddKeyed{LifeTime}<{ServiceTypeName.ToDisplayString()}, {ImplementationTypeName.ToDisplayString()}>({Key.ToQuotedString()});");
+        if (Key is not null) builder.AppendLine($"services.AddKeyed{LifeTime}<{ServiceTypeName.ToDisplayString()}, {ImplementationTypeName.ToDisplayString()}>(serviceKey:{Key.ToQuotedString()});");
         builder.AppendLine($"services.Add{LifeTime}<{ServiceTypeName.ToDisplayString()}, {ImplementationTypeName.ToDisplayString()}>();");
     }
 
@@ -50,7 +50,7 @@ out InjectableServiceRegistration registration
         if (genericNameSyntax?.TypeArgumentList.Arguments.FirstOrDefault() is not {} serviceTypeSyntax) return false;
         if (resolver.ResolveSymbol(serviceTypeSyntax) is not INamedTypeSymbol serviceNamedTypeSymbol) return false;
 
-        AttributeData? keyedServiceAttribute =    attributes.FirstOrDefault(attr => attr.AttributeClass?.ToDisplayString().Contains("KeyedInjectableServiceAttribute") ?? false);
+        AttributeData? keyedServiceAttribute =    attributes.FirstOrDefault(attr => attr.AttributeClass?.ToDisplayString().Contains("InjectableServiceAttribute") ?? false);
         string? key = (string?)keyedServiceAttribute?.ConstructorArguments.ElementAtOrDefault(1).Value;
         int lifeTime = (int)(keyedServiceAttribute?.ConstructorArguments.ElementAtOrDefault(0).Value ?? -1);
 

src/CodeOfChaos.Extensions.DependencyInjection.Generators/Registrations/SpecifcInjectableServiceRegistration.cs renamed to src/CodeOfChaos.Extensions.DependencyInjection.Generators/Registrations/SpecificInjectableServiceRegistration.cs

@@ -13,7 +13,7 @@ namespace CodeOfChaos.Extensions.DependencyInjection.Generators.Registrations;
 // Code
 // ---------------------------------------------------------------------------------------------------------------------
 // ReSharper disable once StructCanBeMadeReadOnly
-public record struct SpecifcInjectableServiceRegistration(
+public record struct SpecificInjectableServiceRegistration(
     INamedTypeSymbol ServiceTypeName,
     INamedTypeSymbol ImplementationTypeName,
     string LifeTime,
@@ -24,7 +24,10 @@ public record struct SpecifcInjectableServiceRegistration(
     // Methods
     // -----------------------------------------------------------------------------------------------------------------
     public void FormatText(GeneratorStringBuilder builder, string _) {
-        if (!string.IsNullOrWhiteSpace(Key)) builder.AppendLine($"services.AddKeyed{LifeTime}<{ServiceTypeName.ToDisplayString()}, {ImplementationTypeName.ToDisplayString()}>({Key!.ToQuotedString()});");
+        if (!string.IsNullOrWhiteSpace(Key)) {
+            builder.AppendLine($"services.AddKeyed{LifeTime}<{ServiceTypeName.ToDisplayString()}, {ImplementationTypeName.ToDisplayString()}>({Key!.ToQuotedString()});");
+            return;
+        }
         builder.AppendLine($"services.Add{LifeTime}<{ServiceTypeName.ToDisplayString()}, {ImplementationTypeName.ToDisplayString()}>();");
     }
 
@@ -35,7 +38,7 @@ public static bool TryCreateFromModel(
         INamedTypeSymbol implementationTypeSymbol,
         AttributeSyntax attribute,
         ISymbolResolver resolver,
-        out SpecifcInjectableServiceRegistration registration
+        out SpecificInjectableServiceRegistration registration
     ) {
         registration = default;
 
@@ -50,7 +53,7 @@ out SpecifcInjectableServiceRegistration registration
         if (genericNameSyntax?.TypeArgumentList.Arguments.FirstOrDefault() is not {} serviceTypeSyntax) return false;
         if (resolver.ResolveSymbol(serviceTypeSyntax) is not INamedTypeSymbol serviceNamedTypeSymbol) return false;
 
-        AttributeData? keyedServiceAttribute = attributes.FirstOrDefault(attr => attr.AttributeClass?.ToDisplayString().Contains("KeyedInjectableServiceAttribute") ?? false);
+        AttributeData? keyedServiceAttribute = attributes.FirstOrDefault(attr => attr.AttributeClass?.ToDisplayString().Contains("Injectable") ?? false);
         string? key = (string?)keyedServiceAttribute?.ConstructorArguments.ElementAtOrDefault(0).Value;
         string lifeTimeName = attribute.Name.ToFullString();
 
@@ -59,7 +62,7 @@ out SpecifcInjectableServiceRegistration registration
         if (lifeTimeName.Contains("Scoped")) lifeTime = "Scoped";
         if (lifeTimeName.Contains("Transient")) lifeTime = "Transient";
 
-        registration = new SpecifcInjectableServiceRegistration(
+        registration = new SpecificInjectableServiceRegistration(
             serviceNamedTypeSymbol,
             implementationTypeSymbol,
             lifeTime,

src/CodeOfChaos.Extensions.DependencyInjection.Generators/ServiceRegistrationGenerator.cs

@@ -128,7 +128,7 @@ private static List<IServiceRegistration> GetRegistrations(SourceProductionConte
                 if ((SymbolEqualityComparer.Default.Equals(constructedFrom, injectableSingletonAttributeType)
                         || SymbolEqualityComparer.Default.Equals(constructedFrom, injectableScopedAttributeType)
                         || SymbolEqualityComparer.Default.Equals(constructedFrom, injectableTransientAttributeType))
-                    && SpecifcInjectableServiceRegistration.TryCreateFromModel(implementationTypeSymbol, attribute, new SymbolResolver(model), out SpecifcInjectableServiceRegistration specificInjectable)) {
+                    && SpecificInjectableServiceRegistration.TryCreateFromModel(implementationTypeSymbol, attribute, new SymbolResolver(model), out SpecificInjectableServiceRegistration specificInjectable)) {
                     registrations.Add(specificInjectable);
                     continue;
                 }

src/CodeOfChaos.Extensions.DependencyInjection/InjectableService/InjectableServiceAttribute.cs

@@ -1,16 +1,16 @@
-// ---------------------------------------------------------------------------------------------------------------------
-// Imports
-// ---------------------------------------------------------------------------------------------------------------------
-
-using Microsoft.Extensions.DependencyInjection;
-
-namespace CodeOfChaos.Extensions.DependencyInjection;
-// ---------------------------------------------------------------------------------------------------------------------
-// Code
-// ---------------------------------------------------------------------------------------------------------------------
-[AttributeUsage(AttributeTargets.Class, Inherited = false)]
-public class InjectableServiceAttribute<TService>(ServiceLifetime lifetime, string? key = null) : Attribute {
-    public ServiceLifetime Lifetime { get; } = lifetime;
-    public Type ServiceType { get; } = typeof(TService);
-    public string? Key { get; } = key;
-}
+// ---------------------------------------------------------------------------------------------------------------------
+// Imports
+// ---------------------------------------------------------------------------------------------------------------------
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace CodeOfChaos.Extensions.DependencyInjection;
+// ---------------------------------------------------------------------------------------------------------------------
+// Code
+// ---------------------------------------------------------------------------------------------------------------------
+[AttributeUsage(AttributeTargets.Class, Inherited = false)]
+public class InjectableServiceAttribute<TService>(ServiceLifetime lifetime, string? key = null) : Attribute {
+    public ServiceLifetime Lifetime { get; } = lifetime;
+    public Type ServiceType { get; } = typeof(TService);
+    public string? Key { get; } = key;
+}