Add support for IServiceProviderIsKeyedService in Lamar DI framework

src/Lamar.Microsoft.DependencyInjection/HostBuilderExtensions.cs

@@ -39,7 +39,8 @@ public static HostApplicationBuilder UseLamar(this HostApplicationBuilder builde
 
             // This enables the usage of implicit services in Minimal APIs
             builder.Services.AddSingleton(s => (IServiceProviderIsService) s.GetRequiredService<IContainer>());
-
+            builder.Services.AddSingleton(s => (IServiceProviderIsKeyedService) s.GetRequiredService<IContainer>());
+
             builder.ConfigureContainer<ServiceRegistry>(new LamarServiceProviderFactory(), x =>
             {
                 configure?.Invoke(x);
@@ -76,8 +77,9 @@ public static IHostBuilder UseLamar(this IHostBuilder builder, Action<HostBuilde
 #if NET6_0_OR_GREATER
                     // This enables the usage of implicit services in Minimal APIs
                     services.AddSingleton(s => (IServiceProviderIsService) s.GetRequiredService<IContainer>());
+                    services.AddSingleton(s => (IServiceProviderIsKeyedService) s.GetRequiredService<IContainer>());
 #endif
-                    
+
                 });
         }
 
@@ -119,6 +121,7 @@ public static IServiceCollection AddLamar(this IServiceCollection services, Serv
 
 #if NET6_0_OR_GREATER
             services.AddSingleton<IServiceProviderIsService>(s => (IServiceProviderIsService) s.GetRequiredService<IContainer>());
+            services.AddSingleton<IServiceProviderIsKeyedService>(s => (IServiceProviderIsKeyedService)s.GetRequiredService<IContainer>());
 #endif
 
             registry ??= new ServiceRegistry();

src/Lamar.Testing/IoC/Acceptance/IServiceProviderIsKeyedService_implementation.cs

@@ -0,0 +1,94 @@
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using StructureMap.Testing.Widget;
+using Xunit;
+
+namespace Lamar.Testing.IoC.Acceptance;
+#if NET6_0_OR_GREATER
+public class IServiceProviderIsKeyedService_implementation
+{
+    [Fact]
+    public void explicit_checks_of_non_concrete_types()
+    {
+        var container = Container.For(services => { 
+            services.For<IClock>().Use<Clock>();
+            services.AddKeyedSingleton<IClock, Clock>("IClock");
+        });
+
+        container.IsKeyedService(typeof(IClock), "IClock").ShouldBeTrue();
+        container.IsKeyedService(typeof(IWidget), "IWidget").ShouldBeFalse();
+    }
+
+    [Fact]
+    public void fix_for_368_auto_resolve_enumerable_concretes_and_generics()
+    {
+        var container = Container.For(services =>
+        {
+            services.Scan(s =>
+            {
+                s.AssemblyContainingType(GetType());
+                s.WithDefaultConventions();
+                s.AddAllTypesOf<IService>();
+            });
+
+            services.For(typeof(IGenericService1<>)).Use(typeof(GenericService1<>));
+            services.AddKeyedSingleton<IEnumerable<IService>, List<ServiceA>>("IEnumerable<ServiceA>");
+            services.AddKeyedSingleton<IEnumerable<IService>, List<ServiceB>>("IEnumerable<ServiceB>");
+            services.AddKeyedSingleton(typeof(IGenericService1<>), "GenericService1<>", typeof(GenericService1<>));
+
+        });
+
+        container.IsKeyedService(typeof(ConcreteClass), "ConcreteClass").ShouldBeFalse();
+        container.IsKeyedService(typeof(IEnumerable<IService>), "IEnumerable<ServiceA>").ShouldBeTrue();
+        container.IsKeyedService(typeof(IGenericService1<IService>), "IGenericService1<IService>").ShouldBeTrue();
+        container.IsKeyedService(typeof(IGenericService1<ConcreteClass>), "IGenericService1<ConcreteClass>").ShouldBeTrue();
+    }
+
+    [Fact]
+    public void fix_for_391_dont_resolve_collections_with_not_registered_type()
+    {
+        var containerWithNoRegistrations = Container.Empty();
+
+        containerWithNoRegistrations.IsKeyedService(typeof(IEnumerable<ConcreteClass>),"IEnumerable<ConcreteClass>").ShouldBeFalse();
+        containerWithNoRegistrations.IsKeyedService(typeof(IReadOnlyCollection<ConcreteClass>) ,"IReadOnlyCollection<ConcreteClass>").ShouldBeFalse();
+        containerWithNoRegistrations.IsKeyedService(typeof(IList<ConcreteClass>), "IList<ConcreteClass>").ShouldBeFalse();
+        containerWithNoRegistrations.IsKeyedService(typeof(List<ConcreteClass>), "List<ConcreteClass>").ShouldBeFalse();
+
+        var containerWithRegistrations = Container.For(services =>
+                                                      {
+                                                          services.ForConcreteType<ConcreteClass>();
+                                                          services.AddKeyedSingleton<IEnumerable<IService>, List<ServiceA>>("IEnumerable<ServiceA>");
+                                                      });
+
+        containerWithRegistrations.IsKeyedService(typeof(IEnumerable<ConcreteClass>), "IEnumerable<ConcreteClass>").ShouldBeTrue();
+        containerWithRegistrations.IsKeyedService(typeof(IReadOnlyCollection<ConcreteClass>), "IReadOnlyCollection<ConcreteClass>").ShouldBeTrue();
+        containerWithRegistrations.IsKeyedService(typeof(IList<ConcreteClass>), "IList<ConcreteClass>").ShouldBeTrue();
+        containerWithRegistrations.IsKeyedService(typeof(List<ConcreteClass>), "List<ConcreteClass>").ShouldBeTrue();
+    }
+
+    public interface IService
+    {
+    }
+
+    public class ServiceA : IService
+    {
+    }
+
+    public class ServiceB : IService
+    {
+    }
+
+    public class ConcreteClass
+    {
+    }
+
+    public interface IGenericService1<T>
+    {
+    }
+
+    public class GenericService1<T> : IGenericService1<T>
+    {
+    }
+}
+#endif

src/Lamar/IoC/Scope.cs

@@ -21,7 +21,7 @@
 
 #region sample_Scope-Declarations
 
-public class Scope : IServiceContext, IServiceProviderIsService
+public class Scope : IServiceContext, IServiceProviderIsService, IServiceProviderIsKeyedService
 
     #endregion
 
@@ -248,7 +248,7 @@
             if (instance == null)
             {
                 throw new InvalidOperationException(
                     $"Cannot QuickBuild type {objectType.GetFullName()} because Lamar cannot determine how to build required dependency {x.ParameterType.FullNameInCode()}");
             }
 
             try
@@ -369,6 +369,11 @@
     public bool IsService(Type serviceType)
     {
         return ServiceGraph.CanBeServiceByNetCoreRules(serviceType);
+    }
+
+    public bool IsKeyedService(Type serviceType, object serviceKey)
+    {
+        return ServiceGraph.CanBeServiceByNetCoreRules(serviceType, serviceKey.ToString());
     }
 
     public static Scope Empty()
@@ -482,5 +487,5 @@
     public object GetRequiredKeyedService(Type serviceType, object serviceKey)
     {
         return GetInstance(serviceType, serviceKey.ToString());
-    }
+    }
 }

src/Lamar/ServiceGraph.cs

@@ -593,4 +593,35 @@ public bool CanBeServiceByNetCoreRules(Type serviceType)
 
         return family.Default != null;
     }
+
+    public bool CanBeServiceByNetCoreRules(Type serviceType, string name)
+    { 
+        if (_families.TryFind(serviceType, out var family))
+        {
+            return family.InstanceFor(name) != null;
+        }
+
+        lock (_familyLock)
+        {
+            if (_families.TryFind(serviceType, out family))
+            {
+                return family.InstanceFor(name) != null;
+            }
+
+            family = TryToCreateMissingFamilyWithNetCoreRules(serviceType);
+            _families = _families.AddOrUpdate(serviceType, family);
+
+            if (!_inPlanning)
+            {
+                buildOutMissingResolvers();
+
+                if (family != null)
+                {
+                    rebuildReferencedAssemblyArray();
+                }
+            }
+        }
+
+        return  family.InstanceFor(name) != null;
+    }
 }