Ability to pass arguments #62
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -87,7 +87,7 @@ public class SwinjectStoryboard: _SwinjectStoryboardBase, SwinjectStoryboardProt | |
| return viewController | ||
| } | ||
|
|
||
| fileprivate func injectDependency(to viewController: UIViewController) { | ||
| guard !viewController.wasInjected else { return } | ||
| defer { viewController.wasInjected = true } | ||
|
|
||
|
|
@@ -158,3 +158,100 @@ public class SwinjectStoryboard: _SwinjectStoryboardBase, SwinjectStoryboardProt | |
| } | ||
|
|
||
| #endif | ||
|
|
||
|
|
||
| extension SwinjectStoryboard { | ||
|
|
||
| #if os(iOS) || os(tvOS) | ||
|
There was a problem hiding this comment. We probably want to extend this for |
||
|
|
||
| private func injectDependency<Arg>(to viewController: UIViewController, arg: Arg) { | ||
| guard !viewController.wasInjected else { return } | ||
| defer { viewController.wasInjected = true } | ||
|
|
||
| let registrationName = viewController.swinjectRegistrationName | ||
|
|
||
| if let container = container.value as? _Resolver { | ||
| let option = SwinjectStoryboardOption(controllerType: type(of: viewController)) | ||
| typealias FactoryType = (Resolver, Container.Controller, Arg) -> Container.Controller | ||
| let _ = container._resolve(name: registrationName, option: option) { (factory: FactoryType) in factory(self.container.value, viewController, arg) } | ||
| } else { | ||
| fatalError("A type conforming Resolver protocol must conform _Resolver protocol too.") | ||
| } | ||
|
|
||
| for child in viewController.childViewControllers { | ||
| injectDependency(to: child) | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. This is a lot of repeated code between methods with different arguments. Can we reuse this code somehow? Alternatively we can generate this similarly to how it is done in Swinject (see. Container.Arguments.erb) |
||
|
|
||
| private func injectDependency<Arg1, Arg2>(to viewController: UIViewController, arg1: Arg1, arg2: Arg2) { | ||
| guard !viewController.wasInjected else { return } | ||
| defer { viewController.wasInjected = true } | ||
|
|
||
| let registrationName = viewController.swinjectRegistrationName | ||
|
|
||
| if let container = container.value as? _Resolver { | ||
| let option = SwinjectStoryboardOption(controllerType: type(of: viewController)) | ||
| typealias FactoryType = (Resolver, Container.Controller, Arg1, Arg2) -> Container.Controller | ||
| let _ = container._resolve(name: registrationName, option: option) { (factory: FactoryType) in factory(self.container.value, viewController, arg1, arg2) } | ||
| } else { | ||
| fatalError("A type conforming Resolver protocol must conform _Resolver protocol too.") | ||
| } | ||
|
|
||
| for child in viewController.childViewControllers { | ||
| injectDependency(to: child) | ||
| } | ||
| } | ||
|
|
||
| private func injectDependency<Arg1, Arg2, Arg3>(to viewController: UIViewController, | ||
| arg1: Arg1, arg2: Arg2, arg3: Arg3) { | ||
| guard !viewController.wasInjected else { return } | ||
| defer { viewController.wasInjected = true } | ||
|
|
||
| let registrationName = viewController.swinjectRegistrationName | ||
|
|
||
| if let container = container.value as? _Resolver { | ||
| let option = SwinjectStoryboardOption(controllerType: type(of: viewController)) | ||
| typealias FactoryType = (Resolver, Container.Controller, Arg1, Arg2, Arg3) -> Container.Controller | ||
| let _ = container._resolve(name: registrationName, option: option) { (factory: FactoryType) in factory(self.container.value, viewController, arg1, arg2, arg3) } | ||
| } else { | ||
| fatalError("A type conforming Resolver protocol must conform _Resolver protocol too.") | ||
| } | ||
|
|
||
| for child in viewController.childViewControllers { | ||
| injectDependency(to: child) | ||
| } | ||
| } | ||
|
|
||
| //MARK: - instantiateViewController with Args | ||
|
|
||
| public func instantiateViewController<Arg>(withIdentifier identifier: String, | ||
| arg: Arg) -> UIViewController { | ||
| let viewController = loadViewController(with: identifier) | ||
| injectDependency(to: viewController, arg: arg) | ||
| return viewController | ||
| } | ||
|
|
||
| public func instantiateViewController<Arg1, Arg2>(withIdentifier identifier: String, | ||
| arg1: Arg1, arg2: Arg2) -> UIViewController { | ||
| let viewController = loadViewController(with: identifier) | ||
| injectDependency(to: viewController, arg1: arg1, arg2: arg2) | ||
| return viewController | ||
| } | ||
|
|
||
| public func instantiateViewController<Arg1, Arg2, Arg3>(withIdentifier identifier: String, | ||
| arg1: Arg1, arg2: Arg2, arg3: Arg3) -> UIViewController { | ||
| let viewController = loadViewController(with: identifier) | ||
| injectDependency(to: viewController, arg1: arg1, arg2: arg2, arg3: arg3) | ||
| return viewController | ||
| } | ||
|
|
||
| private func loadViewController(with identifier: String) -> UIViewController { | ||
| SwinjectStoryboard.pushInstantiatingStoryboard(self) | ||
| let viewController = super.instantiateViewController(withIdentifier: identifier) | ||
| SwinjectStoryboard.popInstantiatingStoryboard() | ||
| return viewController | ||
| } | ||
|
|
||
| #endif | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| // | ||
| // SwinjectStoryboardExtensions.swift | ||
| // SwinjectStoryboard | ||
| // | ||
| // Created by Malkevych Bohdan on 10.08.17. | ||
| // Copyright © 2017 Swinject Contributors. All rights reserved. | ||
| // | ||
|
|
||
| import Swinject | ||
|
|
||
| #if os(iOS) || os(OSX) || os(tvOS) | ||
| extension Container { | ||
| /// Adds a registration of the specified view or window controller that is configured in a storyboard. | ||
| /// | ||
| /// - Note: Do NOT explicitly resolve the controller registered by this method. | ||
| /// The controller is intended to be resolved by `SwinjectStoryboard` implicitly. | ||
| /// | ||
| /// - Parameters: | ||
| /// - controllerType: The controller type to register as a service type. | ||
| /// The type is `UIViewController` in iOS, `NSViewController` or `NSWindowController` in OS X. | ||
| /// - name: A registration name, which is used to differenciate from other registrations | ||
| /// that have the same view or window controller type. | ||
| /// - initCompleted: A closure to specifiy how the dependencies of the view or window controller are injected. | ||
| /// It is invoked by the `Container` when the view or window controller is instantiated by `SwinjectStoryboard`. | ||
|
|
||
| public func storyboardInitCompletedArg<C: Controller, Arg>(_ controllerType: C.Type, | ||
| name: String? = nil, initCompleted: @escaping (Resolver, C, Arg) -> ()) { | ||
| var arg: Arg! | ||
| let factory = { (_: Resolver, controller: Controller, | ||
| argLocal: Arg) -> Container.Controller in | ||
| arg = argLocal | ||
| return controller | ||
| } | ||
|
|
||
| let wrappingClosure: (Resolver, Controller) -> () = { r, c in | ||
| initCompleted(r, c as! C, arg) | ||
| } | ||
| let option = SwinjectStoryboardOption(controllerType: controllerType) | ||
| _register(Controller.self, factory: factory, name: name, option: option) | ||
| .initCompleted(wrappingClosure) | ||
| } | ||
|
|
||
| public func storyboardInitCompletedArgs<C: Controller, Arg1, Arg2>(_ controllerType: C.Type, | ||
| name: String? = nil, | ||
| initCompleted: @escaping (Resolver, C, Arg1, Arg2) -> ()) { | ||
| var arg1: Arg1! | ||
| var arg2: Arg2! | ||
| let factory = { (_: Resolver, controller: Controller, | ||
| argLocal1: Arg1, argLocal2: Arg2) -> Container.Controller in | ||
| arg1 = argLocal1 | ||
| arg2 = argLocal2 | ||
| return controller | ||
| } | ||
|
|
||
| let wrappingClosure: (Resolver, Controller) -> () = { r, c in | ||
| initCompleted(r, c as! C, arg1, arg2) | ||
| } | ||
| let option = SwinjectStoryboardOption(controllerType: controllerType) | ||
| _register(Controller.self, factory: factory, name: name, option: option) | ||
| .initCompleted(wrappingClosure) | ||
| } | ||
|
|
||
| public func storyboardInitCompletedArgs<C: Controller, Arg1, Arg2, Arg3>(_ controllerType: C.Type, | ||
| name: String? = nil, | ||
| initCompleted: @escaping (Resolver, C, Arg1, Arg2, Arg3) -> ()) { | ||
| var arg1: Arg1! | ||
| var arg2: Arg2! | ||
| var arg3: Arg3! | ||
| let factory = { (_: Resolver, controller: Controller, | ||
| argLocal1: Arg1, argLocal2: Arg2, argLocal3: Arg3) -> Container.Controller in | ||
| arg1 = argLocal1 | ||
| arg2 = argLocal2 | ||
| arg3 = argLocal3 | ||
| return controller | ||
| } | ||
|
|
||
| let wrappingClosure: (Resolver, Controller) -> () = { r, c in | ||
| initCompleted(r, c as! C, arg1, arg2, arg3) | ||
| } | ||
| let option = SwinjectStoryboardOption(controllerType: controllerType) | ||
| _register(Controller.self, factory: factory, name: name, option: option) | ||
| .initCompleted(wrappingClosure) | ||
| } | ||
|
|
||
| } | ||
| #endif | ||
|
There was a problem hiding this comment. Again, this file should probably be generated (see. Resolver.erb) |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be more consistent to have API similar to Swinject, i.e.
instantiateViewController(withIdentifier: "SomeIdentifier", arguments: firstArg, secondArg)