Improved ResolveAll for Array Parameters (#12)

tariksavas · Jul 24, 2024 · edde86a · edde86a
1 parent 6b3b0d1
commit edde86a
Show file tree

Hide file tree

Showing 36 changed files with 945 additions and 13 deletions.
diff --git a/Runtime/Core/Context/DIContainer.cs b/Runtime/Core/Context/DIContainer.cs
@@ -94,6 +94,32 @@ public T Resolve<T>(Type type = null, string id = "") where T : class
             return bindedObject.CreatedObject as T;
         }
 
+        public T[] ResolveAll<T>(Type type = null, string id = "") where T : class
+        {
+            type ??= typeof(T);
+
+            Predicate<BindedObject> predicate = string.IsNullOrEmpty(id)
+                ? x => x.Type == type || x.InterfaceType == type
+                : x => x.Id == id && (x.Type == type || x.InterfaceType == type);
+
+            OptimizedList<BindedObject> bindedObjects = _bindedObjects.FindAll(predicate);
+            if (bindedObjects == null || bindedObjects.Count == 0)
+            {
+                return _parentDIContainer?.ResolveAll<T>(type, id);
+            }
+
+            T[] createdObjects = new T[bindedObjects.Count];
+
+            for (int index = 0; index < bindedObjects.Count; index++)
+            {
+                TryCreateBindedObject(bindedObjects[index]);
+
+                createdObjects[index] = bindedObjects[index].CreatedObject as T;
+            }
+
+            return createdObjects;
+        }
+
         private void TryCreateBindedObject(BindedObject bindedObject)
         {
             if (bindedObject.CreatedObject != null || !bindedObject.Type.TryGetDependencies(out object[] objects, this))

diff --git a/Runtime/Utility/InjectionHelper.cs b/Runtime/Utility/InjectionHelper.cs
@@ -26,16 +26,40 @@ public static bool TryGetDependencies(this Type type, out object[] objects, DICo
                 Type parameterType = parameter.ParameterType;
 
                 InjectAttribute injectAttribute = parameter.GetCustomAttribute<InjectAttribute>();
-
-                object parameterObject = container.Resolve<object>(parameterType, injectAttribute?.Id);
-                if (parameterObject == null)
+
+                if (!parameterType.IsArray)
                 {
-                    Debug.LogError($"Can not resolve depenceny! Type: {type} --- DependencyType: {parameterType}");
-                    return false;
+                    object parameterObject = container.Resolve<object>(parameterType, injectAttribute?.Id);
+                    if (parameterObject == null)
+                    {
+                        Debug.LogError($"Can not resolve depenceny! Type: {type} --- DependencyType: {parameterType}");
+                        return false;
+                    }
+
+                    Array.Resize(ref objects, objects.Length + 1);
+                    objects[^1] = parameterObject;
                 }
+                else
+                {
+                    Type elementType = parameterType.GetElementType();
+
+                    object[] parameterObjects = container.ResolveAll<object>(elementType, injectAttribute?.Id);
+                    if (parameterObjects == null)
+                    {
+                        Debug.LogError($"Can not resolve depenceny! Type: {type} --- DependencyType: {elementType}");
+                        return false;
+                    }
 
-                Array.Resize(ref objects, objects.Length + 1);
-                objects[^1] = parameterObject;
+                    Array parameterArray = Array.CreateInstance(elementType, parameterObjects.Length);
+
+                    for (int index = 0; index < parameterObjects.Length; index++)
+                    {
+                        parameterArray.SetValue(parameterObjects[index], index);
+                    }
+
+                    Array.Resize(ref objects, objects.Length + 1);
+                    objects[^1] = parameterArray;
+                }
             }
 
             return true;