local scope injection bugs fixed

Assets/Scenes/SampleScene.unity

@@ -130,12 +130,12 @@ GameObject:
   - component: {fileID: 357009554}
   - component: {fileID: 357009553}
   m_Layer: 0
-  m_Name: ReleaseDependency
+  m_Name: ReleaseDependencyTest
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &357009553
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -318,6 +318,50 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b5d2362725654c94894df5bd0cc8a6d4, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &1794166374
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1794166376}
+  - component: {fileID: 1794166375}
+  m_Layer: 0
+  m_Name: LocalScopeTest
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1794166375
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1794166374}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a99b13ce29beec4b870bb953e8df2ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &1794166376
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1794166374}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1890540586
 GameObject:
   m_ObjectHideFlags: 0
@@ -372,3 +416,4 @@ SceneRoots:
   - {fileID: 1249362804}
   - {fileID: 1890540587}
   - {fileID: 357009554}
+  - {fileID: 1794166376}

Assets/UniDI/Scripts/Resolvers/MethodResolver.cs

@@ -14,6 +14,7 @@ internal class MethodResolver
         private readonly ParameterTypesProvider _parameterTypesProvider;
         private readonly MethodInfo _baseGetParameterMethod;
         private readonly Dictionary<MethodInfo, object[]> _methodParametersMap = new();
+        private readonly Dictionary<int, Dictionary<MethodInfo, object[]>> _methodIdParametersMap = new();
         private readonly object[] _tempResolveParams = new object[1];
 
         internal MethodResolver(ProvidersDto providersDto, BindingFlags flags)
@@ -39,9 +40,31 @@ internal void Resolve(object consumer, Type consumerType, int? id = null)
             }
         }
 
+        internal void ClearGlobalCache()
+        {
+            _methodParametersMap.Clear();
+        }
+
+        internal void ClearLocalCache()
+        {
+            _methodIdParametersMap.Clear();
+        }
+
+        internal void ClearLocalCache(int id)
+        {
+            _methodIdParametersMap.Remove(id);
+        }
+
         private void ResolveMethod(object consumer, MethodInfo methodInfo, int? id = null)
         {
-            if (!_methodParametersMap.TryGetValue(methodInfo, out object[] methodParameters))
+            if (id != null && !_methodIdParametersMap.ContainsKey(id.Value))
+            {
+                _methodIdParametersMap.Add(id.Value, new Dictionary<MethodInfo, object[]>());
+            }
+
+            var map = id == null ? _methodParametersMap : _methodIdParametersMap[id.Value];
+
+            if (!map.TryGetValue(methodInfo, out object[] methodParameters))
             {
                 var injectedParameterTypes = _parameterTypesProvider.GetParameterTypes(methodInfo);
                 methodParameters = new object[injectedParameterTypes.Length];
@@ -52,7 +75,7 @@ private void ResolveMethod(object consumer, MethodInfo methodInfo, int? id = nul
                     var getInstance = _genericMethodsProvider.GetParameterInstanceMethod(_baseGetParameterMethod, injectedParameterTypes[i]);
                     methodParameters[i] = getInstance.Invoke(this, _tempResolveParams);
                 }
-                _methodParametersMap.Add(methodInfo, methodParameters);
+                map.Add(methodInfo, methodParameters);
             }
             methodInfo.Invoke(consumer, methodParameters);
         }

Assets/UniDI/Scripts/Strategies/ResolvingStrategy.cs

@@ -39,5 +39,20 @@ internal void Resolve(object consumer, int? id = null)
             _propertyResolver.Resolve(consumer, consumerType, id);
             _methodResolver.Resolve(consumer, consumerType, id);
         }
+
+        internal void ClearGlobalCache()
+        {
+            _methodResolver.ClearGlobalCache();
+        }
+
+        internal void ClearLocalCache()
+        {
+            _methodResolver.ClearLocalCache();
+        }
+
+        internal void ClearLocalCache(int id)
+        {
+            _methodResolver.ClearLocalCache(id);
+        }
     }
 }

Assets/UniDI/Scripts/UniDIContext.cs

@@ -54,16 +54,20 @@ internal void Inject<T>(T injected, int id, Lifetime lifetime)
         internal void ReleaseDependency(Type type)
         {
             _instancesProvider.ClearInstances(type);
+            _resolvingStrategy.ClearGlobalCache();
         }
 
         internal void ReleaseDependency(Type type, int id, bool clearFullScope)
         {
             _instancesProvider.ClearInstancesById(type, id, clearFullScope);
+            _resolvingStrategy.ClearLocalCache(id);
         }
 
         private void OnActiveSceneChanged(Scene current, Scene next)
         {
             _instancesProvider.ClearSceneInstances();
+            _resolvingStrategy.ClearGlobalCache();
+            _resolvingStrategy.ClearLocalCache();
         }
     }
 }

Assets/UniDI/package.json

@@ -2,7 +2,7 @@
   "name": "com.arty-f.unidi",
   "displayName": "UniDI",
   "author": { "name": "arty-F" },
-  "version": "1.1.0",
+  "version": "1.1.1",
   "unity": "2021.3",
   "description": "Fast and easy Unity DI library.",
   "keywords": [ "DI", "Dependency Injection", "DI Container" ],

Assets/UniDITestScripts/LocalScopeTests/LocalConsumerClass.cs

@@ -0,0 +1,13 @@
+namespace UniDI.Test
+{
+    public class LocalConsumerClass
+    {
+        public LocalInjectedClass LocalInjectedClass;
+
+        [Inject]
+        private void Init(LocalInjectedClass localInjectedClass)
+        {
+            LocalInjectedClass = localInjectedClass;
+        }
+    }
+}

Assets/UniDITestScripts/LocalScopeTests/LocalInjectedClass.cs

@@ -0,0 +1,12 @@
+namespace UniDI.Test
+{
+    public class LocalInjectedClass
+    {
+        public int Value;
+
+        public LocalInjectedClass(int value)
+        {
+            Value = value;  
+        }
+    }
+}

Assets/UniDITestScripts/LocalScopeTests/LocalScopeTester.cs

@@ -0,0 +1,23 @@
+using UnityEngine;
+
+namespace UniDI.Test
+{
+    public class LocalScopeTester : MonoBehaviour
+    {
+        private void Start()
+        {
+            var injected1 = new LocalInjectedClass(1);
+            var injected2 = new LocalInjectedClass(2);
+            injected1.Inject(1);
+            injected2.Inject(2);
+
+            var consumer1 = new LocalConsumerClass();
+            var consumer2 = new LocalConsumerClass();
+            consumer1.Resolve(1);
+            consumer2.Resolve(2);
+
+            Debug.Log($"consumer1: {consumer1.LocalInjectedClass.Value}");
+            Debug.Log($"consumer2: {consumer2.LocalInjectedClass.Value}");
+        }
+    }
+}

Assets/UniDITestScripts/PerformanceTests/PerformanceTestStarter.cs

@@ -1,5 +1,4 @@
-using Assets.UniDITestScripts;
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;

Assets/UniDITestScripts/PerformanceTests/PerformanceTester.cs

@@ -1,10 +1,8 @@
-using UniDI;
-using UniDI.Test;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
 using UnityEngine;
 
-namespace Assets.UniDITestScripts
+namespace UniDI.Test
 {
     public class PerformanceTester : MonoBehaviour
     {