Fixed SingletonCouldDependedOnTransientThoughtFuncDependency

Author: Bobris

BTDB/IOC/ContainerImpl.cs

@@ -106,6 +106,7 @@ public object ResolveKeyed(object? key, Type type)
 
         if (type.IsDelegate())
         {
+            if (ctxImpl.VerifySingletons) return (_, _) => null;
             if (IContainer.FactoryRegistry.TryGetValue(type.TypeHandle.Value, out var factory))
             {
                 return factory(this, ctx);
@@ -117,6 +118,7 @@ public object ResolveKeyed(object? key, Type type)
             var genericTypeDefinition = type.GetGenericTypeDefinition();
             if (genericTypeDefinition == typeof(Func<>))
             {
+                if (ctxImpl.VerifySingletons) return (_, _) => null;
                 var nestedType = type.GetGenericArguments()[0];
                 var nestedFactory = CreateFactory(ctx, nestedType, key);
                 if (nestedFactory == null) return null;
@@ -131,6 +133,7 @@ public object ResolveKeyed(object? key, Type type)
 
             if (genericTypeDefinition == typeof(Func<,>))
             {
+                if (ctxImpl.VerifySingletons) return (_, _) => null;
                 var genericArguments = type.GetGenericArguments();
                 var nestedType = genericArguments[1];
                 if (genericArguments[0] == typeof(IContainer))
@@ -313,6 +316,7 @@ public object ResolveKeyed(object? key, Type type)
         {
             if (cReg.Lifetime == Lifetime.Singleton && cReg.SingletonId != uint.MaxValue)
             {
+                if (ctxImpl.VerifySingletons) return (_, _) => null;
                 var singletonInstance = Volatile.Read(ref Singletons[cReg.SingletonId]);
                 // If Singleton is just being created return waiting factory
                 if (singletonInstance is SingletonLocker)

BTDBTest/IOCTests.cs

@@ -1637,6 +1637,18 @@ public void ComplexFuncDependency()
         Assert.NotNull(obj);
     }
 
+    [Fact]
+    public void SingletonCouldDependedOnTransientThoughtFuncDependency()
+    {
+        var builder = new ContainerBuilder();
+        builder.RegisterType<KlassWithFuncDependency>().SingleInstance();
+        builder.RegisterType<Logger>().As<ILogger>().SingleInstance();
+        builder.RegisterType<ErrorHandler>().As<IErrorHandler>();
+        var container = builder.BuildAndVerify();
+        var obj = container.Resolve<KlassWithFuncDependency>();
+        Assert.NotNull(obj);
+    }
+
     [Fact]
     public void ComplexFuncDependency2()
     {