Fix autorelease bug in WeakLazyInjected property wrapper

Author: Michael Long

Sources/Resolver/Resolver.swift

@@ -720,6 +720,7 @@ public struct Injected<Service> {
 ///
 @propertyWrapper
 public struct LazyInjected<Service> {
+    private var initialize: Bool = true
     private var service: Service!
     public var container: Resolver?
     public var name: String?
@@ -734,7 +735,8 @@ public struct LazyInjected<Service> {
     }
     public var wrappedValue: Service {
         mutating get {
-            if self.service == nil {
+            if initialize {
+                self.initialize = false
                 self.service = container?.resolve(Service.self, name: name, args: args) ?? Resolver.resolve(Service.self, name: name, args: args)
             }
             return service
@@ -756,6 +758,7 @@ public struct LazyInjected<Service> {
 ///
 @propertyWrapper
 public struct WeakLazyInjected<Service:AnyObject> {
+    private var initialize: Bool = true
     private weak var service: Service?
     public var container: Resolver?
     public var name: String?
@@ -770,8 +773,11 @@ public struct WeakLazyInjected<Service:AnyObject> {
     }
     public var wrappedValue: Service? {
         mutating get {
-            if self.service == nil {
-                self.service = container?.resolve(Service.self, name: name, args: args) ?? Resolver.resolve(Service.self, name: name, args: args)
+            if initialize {
+                self.initialize = false
+                let service = container?.resolve(Service.self, name: name, args: args) ?? Resolver.resolve(Service.self, name: name, args: args)
+                self.service = service
+                return service
             }
             return service
         }
@@ -781,9 +787,6 @@ public struct WeakLazyInjected<Service:AnyObject> {
         get { return self }
         mutating set { self = newValue }
     }
-    public mutating func release() {
-        self.service = nil
-    }
 }
 
 @propertyWrapper

Tests/ResolverTests/ResolverInjectedTests.swift

@@ -42,11 +42,25 @@ class LazyInjectedArgumentsViewController {
     }
 }
 
+class WeakLazyInjectedParentViewController {
+    @Injected var strongService: WeakXYZService
+}
+
+class WeakLazyInjectedChildViewController {
+    @WeakLazyInjected var weakService: WeakXYZService?
+}
+
 class OptionalInjectedViewController {
     @OptionalInjected var service: XYZService?
     @OptionalInjected var notRegistered: NotRegistered?
 }
 
+class WeakXYZService: XYZService {
+    func returnSomething() -> Bool {
+        return true
+    }
+}
+
 class NotRegistered {
 }
 
@@ -55,6 +69,8 @@ class ResolverInjectedTests: XCTestCase {
     override func setUp() {
         super.setUp()
 
+        Resolver.main.register { WeakXYZService(nil) }.scope(Resolver.shared)
+
         Resolver.main.register { XYZSessionService() }
         Resolver.main.register { XYZService(Resolver.main.optional()) }
 
@@ -112,10 +128,28 @@ class ResolverInjectedTests: XCTestCase {
         XCTAssert(vc.service.string == "betty")
     }
 
+    func testWParentChildWeakLazyInjectedViewController() {
+        var parent: WeakLazyInjectedParentViewController? = WeakLazyInjectedParentViewController()
+        XCTAssertNotNil(parent?.strongService)
+
+        let child = WeakLazyInjectedChildViewController()
+        XCTAssert(child.$weakService.isEmpty == true)
+        XCTAssert(child.weakService?.returnSomething() == true)
+        XCTAssertNotNil(child.weakService)
+        XCTAssert(child.$weakService.isEmpty == false)
+
+        parent = nil
+        XCTAssert(child.$weakService.isEmpty == true)
+        XCTAssertNil(parent?.strongService)
+        XCTAssertNil(child.weakService)
+    }
+
     func testOptionalInjection() {
         let vc = OptionalInjectedViewController()
         XCTAssertNotNil(vc.service)
         XCTAssertNil(vc.notRegistered)
+        vc.service = nil
+        XCTAssertNil(vc.service)
     }
 }
 

Tests/ResolverTests/XCTestManifests.swift

@@ -95,6 +95,7 @@ extension ResolverInjectedTests {
         ("testNamedInjection1", testNamedInjection1),
         ("testNamedInjection2", testNamedInjection2),
         ("testOptionalInjection", testOptionalInjection),
+        ("testWParentChildWeakLazyInjectedViewController", testWParentChildWeakLazyInjectedViewController),
     ]
 }