some fixes

Author: Hadevs

SwiftInjector/SwiftInjector.xcodeproj/project.pbxproj

@@ -21,6 +21,7 @@
 		E676F73322C955B200DC1282 /* DIContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = E676F73222C955B200DC1282 /* DIContainer.swift */; };
 		E676F73522C9688F00DC1282 /* TestClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = E676F73422C9688F00DC1282 /* TestClass.swift */; };
 		E6BF5C6322CD2A32009A9331 /* SILogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6BF5C6222CD2A32009A9331 /* SILogger.swift */; };
+		E6BF5C6522CD45C0009A9331 /* RecursiveResolvingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6BF5C6422CD45C0009A9331 /* RecursiveResolvingTests.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -52,6 +53,7 @@
 		E676F73222C955B200DC1282 /* DIContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DIContainer.swift; sourceTree = "<group>"; };
 		E676F73422C9688F00DC1282 /* TestClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestClass.swift; sourceTree = "<group>"; };
 		E6BF5C6222CD2A32009A9331 /* SILogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SILogger.swift; sourceTree = "<group>"; };
+		E6BF5C6422CD45C0009A9331 /* RecursiveResolvingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecursiveResolvingTests.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -110,6 +112,7 @@
 			children = (
 				E676F71A22C94F2E00DC1282 /* SwiftInjectorTests.swift */,
 				E676F72A22C9511200DC1282 /* ContainerableMainTests.swift */,
+				E6BF5C6422CD45C0009A9331 /* RecursiveResolvingTests.swift */,
 				E676F71C22C94F2E00DC1282 /* Info.plist */,
 			);
 			path = SwiftInjectorTests;
@@ -245,6 +248,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E6BF5C6522CD45C0009A9331 /* RecursiveResolvingTests.swift in Sources */,
 				E676F72B22C9511200DC1282 /* ContainerableMainTests.swift in Sources */,
 				E676F71B22C94F2E00DC1282 /* SwiftInjectorTests.swift in Sources */,
 			);

SwiftInjector/SwiftInjector/AppDelegate.swift

@@ -18,7 +18,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
   func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
     let newVc: ViewController? = self.container.resolve(name: "123")
     let testClass = newVc?.testClass
-
+    #error("NOT FINISHED RECURSIVE RESOLVING. BECAUSE AFTER RESOLVING I DONT PASS NAME VARIABLE TO RESOLVE.")
     print(testClass)
     return true
   }

SwiftInjector/SwiftInjector/Source/Containerable.swift

@@ -15,7 +15,6 @@ protocol Containerable: class {
   typealias RelationIn = String
   typealias RelationOut = String
 
-  var container: Containerable? { get set }
   var dispatchRegistrationGroup: DispatchGroup { get }
 
   var services: [ServiceName: [ContainerObject]] { get set }
@@ -48,6 +47,7 @@ extension Containerable {
     }
 
     if let object = array?.first?.object {
+      print(1)
       return object
     } else if let object = array?.first?.registration() {
 
@@ -78,7 +78,6 @@ extension Containerable {
     for object in recursiveNotResolvedObjects {
       autoresolve(on: object)
     }
-    recursiveNotResolvedObjects.removeAll()
   }
 
   private func autoresolve<T: Object>(on object: T) {
@@ -101,6 +100,7 @@ extension Containerable {
             return
           }
           if let value = resolveAny(typeString: typeString) {
+            print("I SETTED VALUE FOR \(typeString)")
             object_setIvar(object, ivar, value)
           }
         }

SwiftInjector/SwiftInjector/Source/RootContainer.swift

@@ -16,7 +16,6 @@ class RootContainer: Containerable {
 
   var dispatchRegistrationGroup: DispatchGroup = DispatchGroup()
 
-  var container: Containerable?
 
   init() {
     let date = Date()

SwiftInjector/SwiftInjectorTests/RecursiveResolvingTests.swift

@@ -0,0 +1,66 @@
+//
+//  SwiftInjectorTests.swift
+//  SwiftInjectorTests
+//
+//  Created by Ghost on 30.06.2019.
+//  Copyright © 2019 Ghost. All rights reserved.
+//
+
+import XCTest
+@testable import SwiftInjector
+
+class RecursiveResolvingTests: XCTestCase {
+
+
+  class FirstClass: Equatable {
+    var name: String = "123"
+    var secondClass: SecondClass!
+
+    static func == (lhs: FirstClass, rhs: FirstClass) -> Bool {
+      return "\(Unmanaged.passUnretained(lhs).toOpaque())" == "\(Unmanaged.passUnretained(rhs).toOpaque())"
+    }
+  }
+
+  class SecondClass: Equatable {
+    var name: String = "234"
+    weak var firstClass: FirstClass!
+
+    static func == (lhs: SecondClass, rhs: SecondClass) -> Bool {
+      return "\(Unmanaged.passUnretained(lhs).toOpaque())" == "\(Unmanaged.passUnretained(rhs).toOpaque())"
+    }
+
+  }
+
+  override func setUp() {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+  }
+
+  override func tearDown() {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+  }
+
+
+  class TestingContainer_1: DIContainer {
+    let firstClass = FirstClass()
+    let secondClass = SecondClass()
+    override func register() {
+      register { self.firstClass }
+      register { self.secondClass }
+    }
+  }
+  let container = TestingContainer_1()
+  func testClassToClassRegister() {
+
+    var firstClass: FirstClass? = container.resolve()
+    let secondClass: SecondClass? = container.resolve()
+    print("---------")
+    print(firstClass, secondClass?.firstClass)
+    print("---------")
+    XCTAssertNotNil(firstClass)
+    XCTAssertNotNil(secondClass)
+    XCTAssertNotNil(secondClass?.firstClass)
+    XCTAssertEqual(firstClass?.secondClass, secondClass)
+    XCTAssertEqual(secondClass?.firstClass, firstClass)
+  }
+
+}