implement multiple expotd

SmallInjector/Container.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 
 namespace SmallInjector
@@ -15,7 +17,7 @@ namespace SmallInjector
         public void RegisterType<TService, TInterface>(bool isSingleton, TService instance = default)
             where TService : TInterface
         {
-            if (!IsRegistered<TService>())
+            if (!IsRegistered<TInterface>())
             {
                 _container[typeof(TInterface)] = new List<RegisteredType>
                     {new RegisteredType(typeof(TService), isSingleton, null)};
@@ -43,7 +45,7 @@ namespace SmallInjector
         public IEnumerable<object> ResolveAny(Type serviceType)
         {
             if (!_container.TryGetValue(serviceType, out var registeredTypes))
-                throw new Exception(@"Dependency {serviceType} is not registered");
+                throw new Exception($"Dependency {serviceType.FullName} is not registered");
             foreach (var registeredType in registeredTypes)
             {
                 if (registeredType.IsSingleton && registeredType.Instance != null)
@@ -56,9 +58,17 @@ namespace SmallInjector
                 var parameters = constructor.GetParameters();
                 var constructorParameters = new object[parameters.Length];
                 for (var i = 0; i < parameters.Length; i++)
+                {
+                    var parameterType = parameters[i].ParameterType;
+                    if (typeof(Array).IsAssignableFrom(parameterType))
+                    {
+                            constructorParameters[i] = ResolveAny(parameterType.GetElementType()).ToArray();
+                    }
+                    else
                     {
                         constructorParameters[i] = Resolve(parameters[i].ParameterType);
                     }
+                }
 
                 var instance = constructor.Invoke(constructorParameters);
                 yield return registeredType.IsSingleton ? (registeredType.Instance = instance) : instance;
@@ -83,6 +93,8 @@ namespace SmallInjector
                 IsSingleton = isSingleton;
                 Instance = instance;
             }
+
+            public override string ToString() => ServiceType.ToString();
         }
     }
 }

SmallInjectorDemo/Helper.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
+using SmallInjectorDemo.Interfaces;
 
 namespace SmallInjectorDemo
 {

SmallInjectorDemo/Interfaces/IClock.cs

@@ -1,4 +1,4 @@
-namespace SmallInjectorDemo
+namespace SmallInjectorDemo.Interfaces
 {
     /// <summary>
     /// Interface of the clock.

SmallInjectorDemo/Interfaces/IModule.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SmallInjectorDemo.Interfaces
+{
+    public interface IModule
+    {
+    }
+}

SmallInjectorDemo/Interfaces/IServiceOne.cs

@@ -0,0 +1,10 @@
+namespace SmallInjectorDemo.Interfaces
+{
+    /// <summary>
+    /// Interface for service one.
+    /// </summary>
+    public interface IServiceOne
+    {
+
+    }
+}

SmallInjectorDemo/Interfaces/IServiceTwo.cs

@@ -0,0 +1,10 @@
+namespace SmallInjectorDemo.Interfaces
+{
+    /// <summary>
+    /// Interface for service two.
+    /// </summary>
+    public interface IServiceTwo
+    {
+
+    }
+}

SmallInjectorDemo/Items/ModuleA.cs

@@ -0,0 +1,9 @@
+using SmallInjectorDemo.Interfaces;
+
+namespace SmallInjectorDemo.Items
+{
+    public class ModuleA : IModule
+    {
+        
+    }
+}

SmallInjectorDemo/Items/ModuleB.cs

@@ -0,0 +1,9 @@
+using SmallInjectorDemo.Interfaces;
+
+namespace SmallInjectorDemo.Items
+{
+    public class ModuleB : IModule
+    {
+        
+    }
+}

SmallInjectorDemo/Items/ModuleC.cs

@@ -0,0 +1,9 @@
+using SmallInjectorDemo.Interfaces;
+
+namespace SmallInjectorDemo.Items
+{
+    public class ModuleC : IModule
+    {
+        
+    }
+}

SmallInjectorDemo/Program.cs

@@ -1,6 +1,8 @@
 using System;
 using CommonServiceLocator;
 using SmallInjector;
+using SmallInjectorDemo.Interfaces;
+using SmallInjectorDemo.Items;
 
 namespace SmallInjectorDemo
 {
@@ -22,6 +24,10 @@ namespace SmallInjectorDemo
             container.RegisterType<ServiceTwo, IServiceTwo>(true);
             Console.WriteLine("Register " + nameof(ServiceConsumer));
             container.RegisterType<ServiceConsumer>(false);
+            container.RegisterType<ModuleA, IModule>(true);
+            container.RegisterType<ModuleB, IModule>(true);
+            container.RegisterType<ModuleC, IModule>(true);
+
 
             Console.WriteLine();
             Console.WriteLine("Check registrations:");
@@ -32,9 +38,6 @@ namespace SmallInjectorDemo
 
             Console.WriteLine();
             Console.WriteLine("Resolve class instances:");
-            //var useful1 = container.Resolve<ServiceConsumer>();
-            //var useful2 = container.Resolve<ServiceConsumer>();
-            //var useful3 = container.Resolve<ServiceConsumer>();
             var useful1 = ServiceLocator.Current.GetInstance<ServiceConsumer>();
             var useful2 = ServiceLocator.Current.GetInstance<ServiceConsumer>();
             var useful3 = ServiceLocator.Current.GetInstance<ServiceConsumer>();

SmallInjectorDemo/ServiceConsumer.cs

@@ -1,4 +1,5 @@
 using System;
+using SmallInjectorDemo.Interfaces;
 
 namespace SmallInjectorDemo
 {

SmallInjectorDemo/ServiceOne.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using SmallInjectorDemo.Interfaces;
 
 namespace SmallInjectorDemo
 {
@@ -14,7 +16,7 @@ namespace SmallInjectorDemo
         /// <summary>
         /// Creates a new instance of <see cref="ServiceOne"/>.
         /// </summary>
-        public ServiceOne(IClock clock)
+        public ServiceOne(IClock clock, IModule[] modules)
         {
             _clock = clock;
             _id = Guid.NewGuid().EncodeBase64String();
@@ -24,12 +26,4 @@ namespace SmallInjectorDemo
         /// <inheritdoc />
         public override string ToString() => Helper.WriteMethodString(_clock, _id);
     }
-
-    /// <summary>
-    /// Interface for service one.
-    /// </summary>
-    public interface IServiceOne
-    {
-
-    }
 }

SmallInjectorDemo/ServiceTwo.cs

@@ -1,4 +1,5 @@
 using System;
+using SmallInjectorDemo.Interfaces;
 
 namespace SmallInjectorDemo
 {
@@ -24,12 +25,4 @@ namespace SmallInjectorDemo
         /// <inheritdoc />
         public override string ToString() => Helper.WriteMethodString(_clock, _id);
     }
-
-    /// <summary>
-    /// Interface for service two.
-    /// </summary>
-    public interface IServiceTwo
-    {
-
-    }
 }

SmallInjectorDemo/SystemClock.cs

@@ -1,4 +1,5 @@
 using System;
+using SmallInjectorDemo.Interfaces;
 
 namespace SmallInjectorDemo
 {