add md images

Author: Hadevs

SwiftInjector/SwiftInjector.xcodeproj/project.pbxproj

@@ -20,6 +20,7 @@
 		E676F73122C954BB00DC1282 /* TestContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = E676F73022C954BB00DC1282 /* TestContainer.swift */; };
 		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 */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -50,6 +51,7 @@
 		E676F73022C954BB00DC1282 /* TestContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestContainer.swift; sourceTree = "<group>"; };
 		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>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -117,6 +119,7 @@
 			isa = PBXGroup;
 			children = (
 				E676F72622C94F4700DC1282 /* RootContainer.swift */,
+				E6BF5C6222CD2A32009A9331 /* SILogger.swift */,
 				E676F73022C954BB00DC1282 /* TestContainer.swift */,
 				E676F73222C955B200DC1282 /* DIContainer.swift */,
 				E676F72E22C9548B00DC1282 /* Container.swift */,
@@ -229,6 +232,7 @@
 				E676F73522C9688F00DC1282 /* TestClass.swift in Sources */,
 				E676F73322C955B200DC1282 /* DIContainer.swift in Sources */,
 				E676F70822C94F2B00DC1282 /* ViewController.swift in Sources */,
+				E6BF5C6322CD2A32009A9331 /* SILogger.swift in Sources */,
 				E676F72F22C9548B00DC1282 /* Container.swift in Sources */,
 				E676F72922C94F6000DC1282 /* Containerable.swift in Sources */,
 				E676F73122C954BB00DC1282 /* TestContainer.swift in Sources */,

SwiftInjector/SwiftInjector/AppDelegate.swift

@@ -16,10 +16,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 
   func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-    let newVc: ViewController? = container.resolve()
+    let newVc: ViewController? = container.resolve(name: "123")
     let testClass = newVc?.testClass
-    print(testClass)
 
+
+    print(testClass)
     return true
   }
 

SwiftInjector/SwiftInjector/Source/Containerable.swift

@@ -19,17 +19,30 @@ protocol Containerable: class {
 }
 
 struct ContainerObject {
+  var name: String? = nil
   var registration: Containerable.Service
   var object: Containerable.Object? = nil
-  init(_ registration: @escaping Containerable.Service) {
+  init(_ registration: @escaping Containerable.Service, name: String? = nil) {
     self.registration = registration
+    self.name = name
   }
 }
 
 extension Containerable {
-  private func resolveAny(typeString: String) -> Object? {
+  private func resolveAny(typeString: String, name: String? = nil) -> Object? {
     // TODO: replace .first with more smart condition
-    let array = services[typeString]
+    let array: [ContainerObject]? = {
+      if let filterName = name {
+        return services[typeString]?.filter { $0.name == filterName }
+      } else {
+        return services[typeString]
+      }
+    }()
+
+    if (array?.count ?? 0) > 1 {
+      SILogger("Warning in \(typeString) resolving. You registered two different object for this type. Try to provide \"name\" argument while registering your object. But you will receive first object of all services you registered.").log()
+    }
+
     if let object = array?.first?.object {
       autoresolve(on: object)
       return object
@@ -46,9 +59,9 @@ extension Containerable {
     }
   }
 
-  func resolve<T: Object>() -> T? {
+  func resolve<T: Object>(name: String? = nil) -> T? {
     let key = String(describing: T.self)
-    let object = resolveAny(typeString: key) as? T
+    let object = resolveAny(typeString: key, name: name) as? T
 
     return object
   }
@@ -69,16 +82,17 @@ extension Containerable {
     }
   }
 
-  func register<T: Object>(_ registration: @escaping (() -> T)) {
+  func register<T: Object>(_ registration: @escaping (() -> T), name: String? = nil) {
+
     dispatchRegistrationGroup.enter()
     let object = registration()
     let key = String(describing: type(of: object))
     if let array = services[key] {
       var newArray = array
-      newArray.append(ContainerObject(registration))
+      newArray.append(ContainerObject(registration, name: name))
       services[key] = newArray
     } else {
-      services[key] = [ContainerObject(registration)]
+      services[key] = [ContainerObject(registration, name: name)]
     }
     dispatchRegistrationGroup.leave()
   }

SwiftInjector/SwiftInjector/Source/DIContainer.swift

@@ -16,12 +16,12 @@ class DIContainer: Container {
     self.register()
   }
 
-  final func register<T: AnyObject>(_ registration: @escaping (() -> T)) {
-    parentContainer.register(registration)
+  final func register<T: Containerable.Object>(name: String? = nil, _ registration: @escaping (() -> T)) {
+    parentContainer.register(registration, name: name)
   }
 
-  final func resolve<T: Containerable.Object>() -> T? {
-    return parentContainer.resolve()
+  final func resolve<T: Containerable.Object>(name: String? = nil) -> T? {
+    return parentContainer.resolve(name: name)
   }
 
   func register() {

SwiftInjector/SwiftInjector/Source/SILogger.swift

@@ -0,0 +1,36 @@
+//
+//  SILogger.swift
+//  SwiftInjector
+//
+//  Created by Ghost on 03.07.2019.
+//  Copyright © 2019 Ghost. All rights reserved.
+//
+
+import Foundation
+
+struct SILogger {
+  private let prefix: String = "SwiftInjector: "
+  enum Priority {
+    case low
+    case medium
+    case high
+
+    var prefix: String {
+      switch self {
+      case .low, .medium: return ""
+      case .high: return "[!IMPORTANT!]:"
+      }
+    }
+  }
+
+  private let text: String
+
+  init(_ text: String) {
+    self.text = text
+  }
+
+  func log(priority: Priority = .medium) {
+    let result = prefix + priority.prefix + " " + text
+    print(result)
+  }
+}

SwiftInjector/SwiftInjector/Source/TestContainer.swift

@@ -10,8 +10,11 @@ import Foundation
 
 class TestContainer: DIContainer {
   let vc = ViewController()
+  let vc2 = ViewController()
+  
   override func register() {
     register { TestClass() }
-    register { self.vc }
+    register(name: "123") { self.vc }
+    register { self.vc2 }
   }
 }

SwiftInjector/SwiftInjector/ViewController.swift

@@ -10,11 +10,10 @@ import UIKit
 
 class ViewController: UIViewController {
   var testClass: TestClass?
+
   override func viewDidLoad() {
     super.viewDidLoad()
     // Do any additional setup after loading the view.
   }
-
-
 }