Merge branch 'master' of https://github.com/sylwow/CSharpLibraries

7bitcoder · 7bitcoder · commit 058f9327e5af · 2022-07-16T12:06:21.000+02:00
diff --git a/Library/DependencyInjector.cs b/Library/DependencyInjector.cs
@@ -54,29 +54,26 @@ private void Add<I, T>(ServiceScope scope, string? token = null) where T : I whe
     public T[] GetUniques<T>() where T : class => GetServices<T>(ServiceScope.Unique);
     public T? GetShared<T>(string? token = null) where T : class => GetServices<T>(ServiceScope.Shared, token).FirstOrDefault();
     public T[] GetShares<T>(string? token = null) where T : class => GetServices<T>(ServiceScope.Shared, token);
-
     private T[] GetServices<T>(ServiceScope? scope = null, string? token = null) where T : class
     {
-        return GetServices(typeof(T), ServiceScope.Shared, token) as T[] ?? new T[0];
+        var services = GetServices(typeof(T), scope, token);
+        return Array.ConvertAll(services.ToArray(), item => item as T) ?? new T[0];
     }
-    private object[] GetServices(Type interfaceType, ServiceScope? scope = null, string? token = null)
+    private IEnumerable<object> GetServices(Type interfaceType, ServiceScope? scope = null, string? token = null)
     {
-        var result = new List<object>();
         var serviceKey = new ServiceKey(interfaceType, null, token);
         if (!_typesMap.TryGetValue(serviceKey, out var infos))
         {
-            return new object[0];
+            yield break;
         }
         foreach (var info in infos)
         {
             var service = GetService(serviceKey with { Type = info.Type }, info, scope);
             if (service is not null)
             {
-                result.Add(service);
+                yield return service;
             }
         }
-
-        return result.ToArray();
     }
 
     private object? GetService(ServiceKey serviceKey, ServiceInfo serviceInfo, ServiceScope? scope = null)
@@ -156,7 +153,11 @@ private ConstructorInfo GetServiceConstructor(ServiceKey serviceKey, ServiceInfo
         if (paramType.IsArray)
         {
             paramType = paramType.GetElementType();
-            return GetServices(paramType ?? typeof(object), serviceScope, token);
+            var listType = typeof(List<>).MakeGenericType(paramType);
+            dynamic result = Activator.CreateInstance(listType);
+            var cast = result as List<object>;
+            cast.AddRange(GetServices(paramType ?? typeof(object), serviceScope, token));
+            return result.ToArray();
         }
         return GetServices(paramType, serviceScope, token)?.FirstOrDefault();
     }
diff --git a/Tests/DependencyInjectorTest/ExampleClasses.cs b/Tests/DependencyInjectorTest/ExampleClasses.cs
@@ -173,8 +173,8 @@ internal class MutipleInheranceRef
 {
     public IMutipleInherance[] Parameters { get; }
 
-    public MutipleInheranceRef(IMutipleInherance[] parameters)
+    public MutipleInheranceRef(IEnumerable<IMutipleInherance> parameters)
     {
-        Parameters = parameters;
+        Parameters = parameters.ToArray();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -54,29 +54,26 @@ private void Add<I, T>(ServiceScope scope, string? token = null) where T : I whe`
`54`	`54`	`public T[] GetUniques<T>() where T : class => GetServices<T>(ServiceScope.Unique);`
`55`	`55`	`public T? GetShared<T>(string? token = null) where T : class => GetServices<T>(ServiceScope.Shared, token).FirstOrDefault();`
`56`	`56`	`public T[] GetShares<T>(string? token = null) where T : class => GetServices<T>(ServiceScope.Shared, token);`
`57`		`-`
`58`	`57`	`private T[] GetServices<T>(ServiceScope? scope = null, string? token = null) where T : class`
`59`	`58`	`{`
`60`		`- return GetServices(typeof(T), ServiceScope.Shared, token) as T[] ?? new T[0];`
	`59`	`+ var services = GetServices(typeof(T), scope, token);`
	`60`	`+ return Array.ConvertAll(services.ToArray(), item => item as T) ?? new T[0];`
`61`	`61`	`}`
`62`		`- private object[] GetServices(Type interfaceType, ServiceScope? scope = null, string? token = null)`
	`62`	`+ private IEnumerable<object> GetServices(Type interfaceType, ServiceScope? scope = null, string? token = null)`
`63`	`63`	`{`
`64`		`- var result = new List<object>();`
`65`	`64`	`var serviceKey = new ServiceKey(interfaceType, null, token);`
`66`	`65`	`if (!_typesMap.TryGetValue(serviceKey, out var infos))`
`67`	`66`	`{`
`68`		`- return new object[0];`
	`67`	`+ yield break;`
`69`	`68`	`}`
`70`	`69`	`foreach (var info in infos)`
`71`	`70`	`{`
`72`	`71`	`var service = GetService(serviceKey with { Type = info.Type }, info, scope);`
`73`	`72`	`if (service is not null)`
`74`	`73`	`{`
`75`		`- result.Add(service);`
	`74`	`+ yield return service;`
`76`	`75`	`}`
`77`	`76`	`}`
`78`		`-`
`79`		`- return result.ToArray();`
`80`	`77`	`}`
`81`	`78`
`82`	`79`	`private object? GetService(ServiceKey serviceKey, ServiceInfo serviceInfo, ServiceScope? scope = null)`
`@@ -156,7 +153,11 @@ private ConstructorInfo GetServiceConstructor(ServiceKey serviceKey, ServiceInfo`
`156`	`153`	`if (paramType.IsArray)`
`157`	`154`	`{`
`158`	`155`	`paramType = paramType.GetElementType();`
`159`		`- return GetServices(paramType ?? typeof(object), serviceScope, token);`
	`156`	`+ var listType = typeof(List<>).MakeGenericType(paramType);`
	`157`	`+ dynamic result = Activator.CreateInstance(listType);`
	`158`	`+ var cast = result as List<object>;`
	`159`	`+ cast.AddRange(GetServices(paramType ?? typeof(object), serviceScope, token));`
	`160`	`+ return result.ToArray();`
`160`	`161`	`}`
`161`	`162`	`return GetServices(paramType, serviceScope, token)?.FirstOrDefault();`
`162`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,8 +173,8 @@ internal class MutipleInheranceRef`
`173`	`173`	`{`
`174`	`174`	`public IMutipleInherance[] Parameters { get; }`
`175`	`175`
`176`		`- public MutipleInheranceRef(IMutipleInherance[] parameters)`
	`176`	`+ public MutipleInheranceRef(IEnumerable<IMutipleInherance> parameters)`
`177`	`177`	`{`
`178`		`- Parameters = parameters;`
	`178`	`+ Parameters = parameters.ToArray();`
`179`	`179`	`}`
`180`	`180`	`}`