module constructor injection for simpleinjector (#35)

dbosoft · Jan 24, 2022 · 3f24470 · 3f24470
1 parent d993293
commit 3f24470
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 5 deletions.
diff --git a/src/Hosuto.Abstractions/Modules/Hosting/IModuleHostServiceProviderFactory.cs b/src/Hosuto.Abstractions/Modules/Hosting/IModuleHostServiceProviderFactory.cs
@@ -7,5 +7,8 @@ public interface IModuleHostServiceProviderFactory
     {
         object ConfigureServices(IServiceCollection services);
         IServiceProvider ReplaceServiceProvider(object state, IServiceProvider services);
+
+        void ConfigureModule(Type moduleType, Func<IServiceProvider,object> moduleFactory);
+
     }
 }
diff --git a/src/Hosuto.Hosting/Modules/Hosting/ModulesHostBuilder.cs b/src/Hosuto.Hosting/Modules/Hosting/ModulesHostBuilder.cs
@@ -123,12 +123,13 @@ public IHost Build()
 
                 foreach (var module in _registeredModules)
                 {
-                    
-                    if(module.Value.ModuleFactory==null)
+                    moduleHostServicesFactory?.ConfigureModule(module.Key, module.Value.ModuleFactory);
+                    if (moduleHostServicesFactory != null) continue;
+
+                    if (module.Value.ModuleFactory == null)
                         services.AddSingleton(module.Key);
                     else
                         services.AddSingleton(module.Key, module.Value.ModuleFactory);
-
                 }
 
                 RegisterModulesAndHosts(services, frameworkServices);

diff --git a/src/Hosuto.SimpleInjector/Modules/Hosting/ServiceProviderFactory.cs b/src/Hosuto.SimpleInjector/Modules/Hosting/ServiceProviderFactory.cs
@@ -30,6 +30,20 @@ public IServiceProvider ReplaceServiceProvider(object state, IServiceProvider se
 
             return _container;
         }
+
+        public void ConfigureModule(Type moduleType, Func<IServiceProvider, object> moduleFactory)
+        {
+
+            switch (moduleFactory)
+            {
+                case null:
+                    _container.Register(moduleType);
+                    break;
+                default:
+                    _container.Register(moduleType, () => moduleFactory(_container) );
+                    break;
+            }
+        }
     }
 
 }
diff --git a/test/Hosuto.Hosting.Tests/Modules/Hosting/ModuleBuildingTests.cs b/test/Hosuto.Hosting.Tests/Modules/Hosting/ModuleBuildingTests.cs
@@ -88,6 +88,25 @@ public void Multiple_modules_can_be_bootstrapped_and_see_each_other()
             Assert.NotNull(module.SomeModule);
         }
 
+
+        [Fact]
+        public void Module_dependencies_can_be_injected_from_host_container()
+        {
+            var builder = ModulesHost.CreateDefaultBuilder();
+            builder.HostModule<ModuleWithConstructorInjection>();
+
+            var depMock = Mock.Of<IDep>();
+            var sc = new ServiceCollection();
+            sc.AddTransient(sp => depMock);
+
+            builder.UseServiceCollection(sc);
+
+            var host = builder.Build();
+            var module = host.Services.GetRequiredService<ModuleWithConstructorInjection>();
+
+            Assert.Equal(depMock,module.Dependency);
+        }
+
         private class SomeModule
         {
             public string Environment { get; private set; }
@@ -108,6 +127,21 @@ public void ConfigureServices(IServiceCollection services, IHostingEnvironment e
 
         }
 
+        public interface IDep
+        {
+
+        }
+
+        private class ModuleWithConstructorInjection
+        {
+            public IDep Dependency { get;  }
+            public ModuleWithConstructorInjection(IDep dep)
+            {
+                Dependency = dep;
+            }
+
+        }
+
         private class OtherModule
         {
             public SomeModule SomeModule { get; private set;  }

diff --git a/test/Hosuto.SimpleInjector.Tests/Modules/Hosting/OuterContainerTests.cs b/test/Hosuto.SimpleInjector.Tests/Modules/Hosting/OuterContainerTests.cs
@@ -22,13 +22,31 @@ public void Module_can_resolve_services_from_outer_container()
 
 
             builder.HostModule<SomeModule>();
-            var host = builder.Build();
-            var moduleHost = host.Services.GetRequiredService<IModuleHost<SomeModule>>();
+            builder.Build();
+            var moduleHost = container.GetRequiredService<IModuleHost<SomeModule>>();
 
             serviceMock.Verify(x=>x.CallMe());
 
         }
 
+        [Fact]
+        public void Module_dependencies_can_be_injected_from_outer_container()
+        {
+            var container = new Container();
+
+            var builder = ModulesHost.CreateDefaultBuilder();
+            builder.UseSimpleInjector(container);
+            var serviceMock = Mock.Of<IService>();
+            container.RegisterInstance(serviceMock);
+
+
+            builder.HostModule<ModuleWithConstructorInjection>();
+
+            var host = builder.Build();
+            var module = container.GetRequiredService<ModuleWithConstructorInjection>();
+            Assert.Equal(module.Dependency, serviceMock);
+        }
+
         // ReSharper disable once MemberCanBePrivate.Global
         public interface IService
         {
@@ -46,6 +64,18 @@ public void ConfigureServices(IServiceProvider sp, IServiceCollection services)
             }
 
         }
+
+
+        // ReSharper disable once ClassNeverInstantiated.Local
+        private class ModuleWithConstructorInjection
+        {
+            public IService Dependency { get; }
+            public ModuleWithConstructorInjection(IService dep)
+            {
+                Dependency = dep;
+            }
+
+        }
     }