Fix bug in attributes registration with custom strategy (#53)

Registerly/src/DeviantCoding.Registerly.csproj

@@ -11,9 +11,9 @@
     <IsDeviantCodingNugetPackage>true</IsDeviantCodingNugetPackage>
     <Description>Dependency injection made easy</Description>
     <PackageTags>DI;Dependency;Injection;</PackageTags> 
-    <Version>1.2.1</Version>
+    <Version>1.2.2</Version>
     <PackageReleaseNotes>
-      Add net standard support
+      Fix bug in attributes registration with custom strategy
     </PackageReleaseNotes>
     <PackageProjectUrl>https://manuel-fernandez-rodriguez.github.io/DeviantCoding/docs/registerly/introduction.html</PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>

Registerly/src/Strategies/Mapping/AttributeMappingStrategy.cs

@@ -24,18 +24,19 @@ public IEnumerable<ServiceDescriptor> Map(IEnumerable<Type> implementationTypes,
                     yield return serviceDescriptor;
                 }
             }
-
-            if (implementationType.GetInterfaces().Length != 0)
+            else if (implementationType.GetInterfaces().Length != 0)
             {
                 foreach (var serviceDescriptor in _asImplementedInterfaces.Map([implementationType], lifetimeStrategy))
                 {
                     yield return serviceDescriptor;
                 }
             }
-
-            foreach (var serviceDescriptor in _asSelf.Map([implementationType], lifetimeStrategy))
+            else
             {
-                yield return serviceDescriptor;
+                foreach (var serviceDescriptor in _asSelf.Map([implementationType], lifetimeStrategy))
+                {
+                    yield return serviceDescriptor;
+                }
             }
         }
     }

Registerly/src/Strategies/Registration/AttributeRegistrationStrategy.cs

@@ -48,7 +48,7 @@ public IServiceCollection RegisterServices(IServiceCollection serviceCollection,
         foreach (var descriptor in descriptors)
         {
             GetRegistrationStrategy(descriptor)
-                .RegisterServices(serviceCollection, new[] { descriptor });
+                .RegisterServices(serviceCollection, [descriptor]);
         }
 
         return serviceCollection;

Registerly/test/UnitTests/RegisterByAttributesTest.cs

@@ -66,6 +66,24 @@ public void ResolveServicesFromCustomAssemblySource()
             .Should().BeOfType<TestSingletonService>();
     }
 
+    [Fact]
+    public void CanRegisterWithCustomMappingStrategy()
+    {
+        var host = Host.CreateEmptyApplicationBuilder(new());
+
+        host.RegisterServicesByAttributes(classes => classes
+            .FromAssemblyOf<TestScopedService>()
+            .Where(c => c.Exactly<ClassImplementingTwoInterfaces>()));
+
+        var services = host.Services.BuildServiceProvider();
+
+        services.GetRequiredService<IInterface1>()
+            .Should().BeOfType<ClassImplementingTwoInterfaces>();
+
+        services.GetService<IInterface2>()
+            .Should().BeNull();
+    }
+
 
     private static void Assert(IServiceCollection services)
     {

Registerly/test/UnitTests/SampleServices/SampleServices.cs

@@ -34,4 +34,12 @@ public class TestSingletonService(TestServiceDependency serviceDependency) : ISi
 #pragma warning disable IDE0052 // Remove unread private members
     private readonly TestServiceDependency _serviceDependency = serviceDependency;
 #pragma warning restore IDE0052 // Remove unread private members
+}
+
+public interface IInterface1 { }
+public interface IInterface2 { }
+
+[Scoped<As<IInterface1>>]
+public class ClassImplementingTwoInterfaces : IInterface1, IInterface2
+{
 }