Merge pull request #77 from KuraiAndras/feature/fix-disposals

Fix disposals in unity

Author: KuraiAndras

CHANGELOG.md

@@ -1,4 +1,8 @@
 # 7.0.0
+- Add `MonoBehaviourInjected` and `MonoBehaviourScoped`
+- Renamed classes: \*MonoBehavior\* -> \*MonoBehavio**u**r\*
+- InjectedMonoBehavior now removes Scope from the store during `OnDestroy`
+- ScopeStore is now generic
 - Update dependencies
 - Update minimum Unity version to `2020.3`
 - Update to .NET 6 where not breaking

MainProject/Directory.Build.props

@@ -3,7 +3,7 @@
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
 
-    <CurrentVersion>6.1.2</CurrentVersion>
+    <CurrentVersion>7.0.0</CurrentVersion>
 
     <Version>$(CurrentVersion)</Version>
     <PakcageVersion>$(CurrentVersion)</PakcageVersion>

MainProject/Injecter/IScopeStore.cs

@@ -4,8 +4,8 @@ namespace Injecter
 {
     public interface IScopeStore
     {
-        IServiceScope CreateScope(object owner);
-        void DisposeScope(object owner);
-        IServiceScope GetScope(object owner);
+        IServiceScope CreateScope<T>(T owner) where T : notnull;
+        void DisposeScope<T>(T owner) where T : notnull;
+        IServiceScope? GetScope<T>(T owner) where T : notnull;
     }
 }

MainProject/Injecter/ScopeStore.cs

@@ -11,19 +11,30 @@ public sealed class ScopeStore : IScopeStore
 
         public ScopeStore(IServiceProvider serviceProvider) => _serviceProvider = serviceProvider;
 
-        public IServiceScope CreateScope(object owner)
+        public IServiceScope CreateScope<T>(T owner) where T : notnull
         {
+            if (owner == null) throw new ArgumentNullException(nameof(owner));
+
             var scope = _serviceProvider.CreateScope();
             _scopes.Add(owner, scope);
 
             return scope;
         }
 
-        public IServiceScope GetScope(object owner) => _scopes[owner];
+        public IServiceScope? GetScope<T>(T owner) where T : notnull
+        {
+            if (owner == null) throw new ArgumentNullException(nameof(owner));
+
+            _scopes.TryGetValue(owner, out var scope);
 
-        public void DisposeScope(object owner)
+            return scope;
+        }
+
+        public void DisposeScope<T>(T owner) where T : notnull
         {
-            var scope = _scopes[owner];
+            if (owner == null) throw new ArgumentNullException(nameof(owner));
+
+            if (!_scopes.TryGetValue(owner, out var scope)) return;
 
             scope.Dispose();
 

UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.injecter.hosting.unity",
-    "version": "6.1.2",
+    "version": "7.0.0",
     "displayName": "Injecter.Hosting.Unity",
     "license": "MIT",
     "licensesUrl": "https://github.com/KuraiAndras/Injecter/blob/master/LICENSE.md",
@@ -13,6 +13,6 @@
         "url": "https://github.com/KuraiAndras/Injecter"
     },
     "dependencies": {
-        "com.injecter.unity": "6.1.2"
+        "com.injecter.unity": "7.0.0"
     }
 }

UnityProject/Injecter.Unity/Assets/Injecter.Unity.Tests/Arrange/DisposeIsCalledOnDestroy/DisposingScript.cs

@@ -4,6 +4,8 @@ namespace Injecter.Unity.Tests.Arrange.DisposeIsCalledOnDestroy
 {
     public sealed class DisposingScript : MonoBehaviour
     {
-        [Inject] private readonly ITestDisposable _testDisposable;
+        [Inject]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "Used for test")]
+        private readonly ITestDisposable _testDisposable;
     }
 }

UnityProject/Injecter.Unity/Assets/Injecter.Unity/ComponentMissingException.cs

@@ -25,7 +25,6 @@ public interface ISceneInjector
         /// Sets up usages of the InjectAttribute
         /// </summary>
         /// <exception cref="System.ArgumentNullException"/>
-        /// <exception cref="ComponentMissingException"/>
         /// <param name="gameObjectInstance">GameObject instance to inject into</param>
         /// <param name="createScopes">Create new scopes</param>
         /// <returns>Original instance</returns>

UnityProject/Injecter.Unity/Assets/Injecter.Unity/ComponentMissingException.cs.meta

@@ -3,9 +3,9 @@
 
 namespace Injecter.Unity
 {
-    public abstract class InjectedMonoBehavior<TViewModel> : InjectedMonoBehavior
+    public abstract class InjectedMonoBehaviour<TViewModel> : InjectedMonoBehaviour
     {
-        protected InjectedMonoBehavior(bool createScopes) : base(createScopes)
+        protected InjectedMonoBehaviour(bool createScopes) : base(createScopes)
         {
         }