Merge branch '19-linker'

scribd · Jul 24, 2018 · 7712ca6 · 7712ca6
2 parents d4f0d85 + 6ed4abf
commit 7712ca6
Show file tree

Hide file tree

Showing 23 changed files with 990 additions and 873 deletions.
diff --git a/Resources/dependency_resolver.stencil b/Resources/dependency_resolver.stencil
@@ -63,9 +63,9 @@ final class {{resolver.targetType.name}}DependencyContainer{{resolver.targetType
     {% for reference in resolver.references %}
 
     {% if reference.parameters %}
-    func {{reference.name}}({% for parameter in reference.parameters %}{{parameter.name}}: {{parameter.type}}{% if not forloop.last %}, {% endif %}{% endfor %}) -> {{reference.resolvedType}}
+    func {{reference.name}}({% for parameter in reference.parameters %}{{parameter.name}}: {{parameter.type}}{% if not forloop.last %}, {% endif %}{% endfor %}) -> {{reference.abstractType}}
     {% else %}{# reference.parameters #}
-    var {{reference.name}}: {{reference.resolvedType}} { get }
+    var {{reference.name}}: {{reference.abstractType}} { get }
     {% endif %}{# reference.parameters #}
 
     {% endfor %}{# resolver.references #}
@@ -86,14 +86,14 @@ extension {{resolver.targetType.name}}DependencyContainer: {{resolver.targetType
 
     {% if reference.parameters %}
 
-    func {{reference.name}}({% for parameter in reference.parameters %}{{parameter.name}}: {{parameter.type}}{% if not forloop.last %}, {% endif %}{% endfor %}) -> {{reference.resolvedType}} {
-        return resolve({{reference.resolvedType}}.self, name: "{{reference.name}}", parameter{% if reference.parameters.count > 1 %}s{% endif %}: {% for parameter in reference.parameters %}{{parameter.name}}{% if not forloop.last %}, {% endif %}{% endfor %})
+    func {{reference.name}}({% for parameter in reference.parameters %}{{parameter.name}}: {{parameter.type}}{% if not forloop.last %}, {% endif %}{% endfor %}) -> {{reference.abstractType}} {
+        return resolve({{reference.abstractType}}.self, name: "{{reference.name}}", parameter{% if reference.parameters.count > 1 %}s{% endif %}: {% for parameter in reference.parameters %}{{parameter.name}}{% if not forloop.last %}, {% endif %}{% endfor %})
     }
 
     {% else %}{# reference.paramters #}
 
-    var {{reference.name}}: {{reference.resolvedType}} {
-        return resolve({{reference.resolvedType}}.self, name: "{{reference.name}}")
+    var {{reference.name}}: {{reference.abstractType}} {
+        return resolve({{reference.abstractType}}.self, name: "{{reference.name}}")
     }
 
     {% endif %}{# reference.parameters #}
@@ -190,14 +190,14 @@ extension {{resolver.targetType.name}}ShimDependencyContainer: {{resolver.target
 
     {% if reference.parameters %}
 
-    func {{reference.name}}({% for parameter in reference.parameters %}{{parameter.name}}: {{parameter.type}}{% if not forloop.last %}, {% endif %}{% endfor %}) -> {{reference.resolvedType}} {
-        return internalDependencies.resolve({{reference.resolvedType.name}}.self, name: "{{reference.name}}", parameter{% if reference.parameters.count > 1 %}s{% endif %}: {% for parameter in reference.parameters %}{{parameter.name}}{% if not forloop.last %}, {% endif %}{% endfor %})
+    func {{reference.name}}({% for parameter in reference.parameters %}{{parameter.name}}: {{parameter.type}}{% if not forloop.last %}, {% endif %}{% endfor %}) -> {{reference.abstractType}} {
+        return internalDependencies.resolve({{reference.abstractType.name}}.self, name: "{{reference.name}}", parameter{% if reference.parameters.count > 1 %}s{% endif %}: {% for parameter in reference.parameters %}{{parameter.name}}{% if not forloop.last %}, {% endif %}{% endfor %})
     }
 
     {% else %}{# reference.parameters #}
 
-    var {{reference.name}}: {{reference.resolvedType}} {
-        return internalDependencies.resolve({{reference.resolvedType}}.self, name: "{{reference.name}}")
+    var {{reference.name}}: {{reference.abstractType}} {
+        return internalDependencies.resolve({{reference.abstractType}}.self, name: "{{reference.name}}")
     }
 
     {% endif %}{# reference.parameters #}

diff --git a/Sample/API/Generated/Weaver.API.swift b/Sample/API/Generated/Weaver.API.swift
@@ -1,4 +1,4 @@
-/// This file is generated by Weaver 0.9.12
+/// This file is generated by Weaver 0.9.13
 /// DO NOT EDIT!
 import Foundation
 import WeaverDI

diff --git a/Sample/API/Generated/Weaver.ImageManager.swift b/Sample/API/Generated/Weaver.ImageManager.swift
@@ -1,4 +1,4 @@
-/// This file is generated by Weaver 0.9.12
+/// This file is generated by Weaver 0.9.13
 /// DO NOT EDIT!
 import Foundation
 import UIKit
@@ -9,33 +9,33 @@ final class ImageManagerDependencyContainer: DependencyContainer {
         super.init()
     }
     override func registerDependencies(in store: DependencyStore) {
-        store.register(APIProtocol.self, scope: .graph, name: "movieAPI", builder: { (dependencies) in
-            return MovieAPI.makeMovieAPI(injecting: dependencies)
-        })
         store.register(Logger.self, scope: .graph, name: "logger", builder: { (dependencies) in
             return Logger()
         })
         store.register(URLSession.self, scope: .container, name: "urlSession", builder: { (dependencies) in
             return self.urlSessionCustomRef()
         })
+        store.register(APIProtocol.self, scope: .graph, name: "movieAPI", builder: { (dependencies) in
+            return MovieAPI.makeMovieAPI(injecting: dependencies)
+        })
     }
 }
 protocol ImageManagerDependencyResolver {
-    var movieAPI: APIProtocol { get }
     var logger: Logger { get }
     var urlSession: URLSession { get }
+    var movieAPI: APIProtocol { get }
     func urlSessionCustomRef() -> URLSession
 }
 extension ImageManagerDependencyContainer: ImageManagerDependencyResolver {
-    var movieAPI: APIProtocol {
-        return resolve(APIProtocol.self, name: "movieAPI")
-    }
     var logger: Logger {
         return resolve(Logger.self, name: "logger")
     }
     var urlSession: URLSession {
         return resolve(URLSession.self, name: "urlSession")
     }
+    var movieAPI: APIProtocol {
+        return resolve(APIProtocol.self, name: "movieAPI")
+    }
 }
 // MARK: - ImageManagerShim
 final class ImageManagerShimDependencyContainer: DependencyContainer {
@@ -49,15 +49,15 @@ final class ImageManagerShimDependencyContainer: DependencyContainer {
     }
 }
 extension ImageManagerShimDependencyContainer: ImageManagerDependencyResolver {
-    var movieAPI: APIProtocol {
-        return internalDependencies.resolve(APIProtocol.self, name: "movieAPI")
-    }
     var logger: Logger {
         return internalDependencies.resolve(Logger.self, name: "logger")
     }
     var urlSession: URLSession {
         return internalDependencies.resolve(URLSession.self, name: "urlSession")
     }
+    var movieAPI: APIProtocol {
+        return internalDependencies.resolve(APIProtocol.self, name: "movieAPI")
+    }
 }
 extension ImageManager {
     public convenience init() {

diff --git a/Sample/API/Generated/Weaver.MovieManager.swift b/Sample/API/Generated/Weaver.MovieManager.swift
@@ -1,4 +1,4 @@
-/// This file is generated by Weaver 0.9.12
+/// This file is generated by Weaver 0.9.13
 /// DO NOT EDIT!
 import Foundation
 import WeaverDI
@@ -10,28 +10,28 @@ final class MovieManagerDependencyContainer: DependencyContainer {
         super.init(parent)
     }
     override func registerDependencies(in store: DependencyStore) {
-        store.register(APIProtocol.self, scope: .graph, name: "movieAPI", builder: { (dependencies) in
-            return MovieAPI.makeMovieAPI(injecting: dependencies)
-        })
         store.register(URLSession.self, scope: .container, name: "urlSession", builder: { (dependencies) in
             return self.urlSessionCustomRef()
         })
+        store.register(APIProtocol.self, scope: .graph, name: "movieAPI", builder: { (dependencies) in
+            return MovieAPI.makeMovieAPI(injecting: dependencies)
+        })
     }
 }
 protocol MovieManagerDependencyResolver {
     var host: String? { get }
-    var movieAPI: APIProtocol { get }
     var urlSession: URLSession { get }
+    var movieAPI: APIProtocol { get }
     var logger: Logger { get }
     func urlSessionCustomRef() -> URLSession
 }
 extension MovieManagerDependencyContainer: MovieManagerDependencyResolver {
-    var movieAPI: APIProtocol {
-        return resolve(APIProtocol.self, name: "movieAPI")
-    }
     var urlSession: URLSession {
         return resolve(URLSession.self, name: "urlSession")
     }
+    var movieAPI: APIProtocol {
+        return resolve(APIProtocol.self, name: "movieAPI")
+    }
     var logger: Logger {
         return resolve(Logger.self, name: "logger")
     }
@@ -68,12 +68,12 @@ final class MovieManagerShimDependencyContainer: DependencyContainer {
     }
 }
 extension MovieManagerShimDependencyContainer: MovieManagerDependencyResolver {
-    var movieAPI: APIProtocol {
-        return internalDependencies.resolve(APIProtocol.self, name: "movieAPI")
-    }
     var urlSession: URLSession {
         return internalDependencies.resolve(URLSession.self, name: "urlSession")
     }
+    var movieAPI: APIProtocol {
+        return internalDependencies.resolve(APIProtocol.self, name: "movieAPI")
+    }
 }
 extension MovieManager {
     public convenience init(logger: Logger, host: String?) {

diff --git a/Sample/Sample/Generated/Weaver.AppDelegate.swift b/Sample/Sample/Generated/Weaver.AppDelegate.swift
@@ -1,4 +1,4 @@
-/// This file is generated by Weaver 0.9.12
+/// This file is generated by Weaver 0.9.13
 /// DO NOT EDIT!
 import API
 import UIKit
@@ -9,62 +9,62 @@ final class AppDelegateDependencyContainer: DependencyContainer {
         super.init()
     }
     override func registerDependencies(in store: DependencyStore) {
+        store.register(Logger.self, scope: .container, name: "logger", builder: { (dependencies) in
+            return Logger()
+        })
+        store.register(URLSession.self, scope: .container, name: "urlSession", builder: { (dependencies) in
+            return self.urlSessionCustomRef()
+        })
         store.register(APIProtocol.self, scope: .container, name: "movieAPI", builder: { (dependencies) in
             return self.movieAPICustomRef()
         })
-        store.register(UIViewController.self, scope: .container, name: "homeViewController", builder: { (dependencies) in
-            return HomeViewController.makeHomeViewController(injecting: dependencies)
+        store.register(ImageManaging.self, scope: .container, name: "imageManager", builder: { (dependencies) in
+            return self.imageManagerCustomRef()
         })
         store.register(MovieManaging.self, scope: .container, name: "movieManager", builder: { (dependencies) in
             return self.movieManagerCustomRef()
         })
-        store.register(Logger.self, scope: .container, name: "logger", builder: { (dependencies) in
-            return Logger()
-        })
-        store.register(URLSession.self, scope: .container, name: "urlSession", builder: { (dependencies) in
-            return self.urlSessionCustomRef()
+        store.register(UIViewController.self, scope: .container, name: "homeViewController", builder: { (dependencies) in
+            return HomeViewController.makeHomeViewController(injecting: dependencies)
         })
         store.register(ReviewManaging.self, scope: .container, name: "reviewManager", builder: { (dependencies) in
             return ReviewManager.makeReviewManager(injecting: dependencies)
         })
-        store.register(ImageManaging.self, scope: .container, name: "imageManager", builder: { (dependencies) in
-            return self.imageManagerCustomRef()
-        })
     }
 }
 protocol AppDelegateDependencyResolver {
-    var movieAPI: APIProtocol { get }
-    var homeViewController: UIViewController { get }
-    var movieManager: MovieManaging { get }
     var logger: Logger { get }
     var urlSession: URLSession { get }
-    var reviewManager: ReviewManaging { get }
+    var movieAPI: APIProtocol { get }
     var imageManager: ImageManaging { get }
-    func movieAPICustomRef() -> APIProtocol
-    func movieManagerCustomRef() -> MovieManaging
+    var movieManager: MovieManaging { get }
+    var homeViewController: UIViewController { get }
+    var reviewManager: ReviewManaging { get }
     func urlSessionCustomRef() -> URLSession
+    func movieAPICustomRef() -> APIProtocol
     func imageManagerCustomRef() -> ImageManaging
+    func movieManagerCustomRef() -> MovieManaging
 }
 extension AppDelegateDependencyContainer: AppDelegateDependencyResolver {
+    var logger: Logger {
+        return resolve(Logger.self, name: "logger")
+    }
+    var urlSession: URLSession {
+        return resolve(URLSession.self, name: "urlSession")
+    }
     var movieAPI: APIProtocol {
         return resolve(APIProtocol.self, name: "movieAPI")
     }
-    var homeViewController: UIViewController {
-        return resolve(UIViewController.self, name: "homeViewController")
+    var imageManager: ImageManaging {
+        return resolve(ImageManaging.self, name: "imageManager")
     }
     var movieManager: MovieManaging {
         return resolve(MovieManaging.self, name: "movieManager")
     }
-    var logger: Logger {
-        return resolve(Logger.self, name: "logger")
-    }
-    var urlSession: URLSession {
-        return resolve(URLSession.self, name: "urlSession")
+    var homeViewController: UIViewController {
+        return resolve(UIViewController.self, name: "homeViewController")
     }
     var reviewManager: ReviewManaging {
         return resolve(ReviewManaging.self, name: "reviewManager")
     }
-    var imageManager: ImageManaging {
-        return resolve(ImageManaging.self, name: "imageManager")
-    }
 }
diff --git a/Sample/Sample/Generated/Weaver.HomeViewController.swift b/Sample/Sample/Generated/Weaver.HomeViewController.swift
@@ -1,4 +1,4 @@
-/// This file is generated by Weaver 0.9.12
+/// This file is generated by Weaver 0.9.13
 /// DO NOT EDIT!
 import API
 import Foundation
@@ -10,26 +10,26 @@ final class HomeViewControllerDependencyContainer: DependencyContainer {
         super.init(parent)
     }
     override func registerDependencies(in store: DependencyStore) {
-        store.register(UIViewController.self, scope: .transient, name: "movieController", builder: { (dependencies, movieID: UInt, title: String) in
-            return MovieViewController.makeMovieViewController(injecting: dependencies, movieID: movieID, title: title)
-        })
         store.register(Logger.self, scope: .graph, name: "logger", builder: { (dependencies) in
             return Logger()
         })
+        store.register(UIViewController.self, scope: .transient, name: "movieController", builder: { (dependencies, movieID: UInt, title: String) in
+            return MovieViewController.makeMovieViewController(injecting: dependencies, movieID: movieID, title: title)
+        })
     }
 }
 protocol HomeViewControllerDependencyResolver {
-    func movieController(movieID: UInt, title: String) -> UIViewController
     var logger: Logger { get }
+    func movieController(movieID: UInt, title: String) -> UIViewController
     var movieManager: MovieManaging { get }
 }
 extension HomeViewControllerDependencyContainer: HomeViewControllerDependencyResolver {
-    func movieController(movieID: UInt, title: String) -> UIViewController {
-        return resolve(UIViewController.self, name: "movieController", parameters: movieID, title)
-    }
     var logger: Logger {
         return resolve(Logger.self, name: "logger")
     }
+    func movieController(movieID: UInt, title: String) -> UIViewController {
+        return resolve(UIViewController.self, name: "movieController", parameters: movieID, title)
+    }
     var movieManager: MovieManaging {
         return resolve(MovieManaging.self, name: "movieManager")
     }

diff --git a/Sample/Sample/Generated/Weaver.MovieViewController.swift b/Sample/Sample/Generated/Weaver.MovieViewController.swift
@@ -1,4 +1,4 @@
-/// This file is generated by Weaver 0.9.12
+/// This file is generated by Weaver 0.9.13
 /// DO NOT EDIT!
 import API
 import Foundation

diff --git a/Sample/Sample/Generated/Weaver.PersonManager.swift b/Sample/Sample/Generated/Weaver.PersonManager.swift
@@ -1,4 +1,4 @@
-/// This file is generated by Weaver 0.9.12
+/// This file is generated by Weaver 0.9.13
 /// DO NOT EDIT!
 import API
 import Foundation

diff --git a/Sample/Sample/Generated/Weaver.ReviewManager.swift b/Sample/Sample/Generated/Weaver.ReviewManager.swift
@@ -1,4 +1,4 @@
-/// This file is generated by Weaver 0.9.12
+/// This file is generated by Weaver 0.9.13
 /// DO NOT EDIT!
 import API
 import Foundation

diff --git a/Sample/Sample/Generated/Weaver.WSReviewViewController+Injectable.swift b/Sample/Sample/Generated/Weaver.WSReviewViewController+Injectable.swift
@@ -1,4 +1,4 @@
-/// This file is generated by Weaver 0.9.12
+/// This file is generated by Weaver 0.9.13
 /// DO NOT EDIT!
 import Foundation
 import WeaverDI

diff --git a/Sources/WeaverCodeGen/AutoEquatable.generated.swift b/Sources/WeaverCodeGen/AutoEquatable.generated.swift
@@ -37,6 +37,13 @@ public func == (lhs: ConfigurationAnnotation, rhs: ConfigurationAnnotation) -> B
     guard lhs.target == rhs.target else { return false }
     return true
 }
+// MARK: - DependencyIndex AutoEquatable
+extension DependencyIndex: Equatable {}
+internal func == (lhs: DependencyIndex, rhs: DependencyIndex) -> Bool {
+    guard lhs.name == rhs.name else { return false }
+    guard compareOptionals(lhs: lhs.type, rhs: rhs.type, compare: ==) else { return false }
+    return true
+}
 // MARK: - EndOfAnyDeclaration AutoEquatable
 extension EndOfAnyDeclaration: Equatable {}
 public func == (lhs: EndOfAnyDeclaration, rhs: EndOfAnyDeclaration) -> Bool {
@@ -123,6 +130,12 @@ public func == (lhs: Type, rhs: Type) -> Bool {
     guard lhs.generics == rhs.generics else { return false }
     return true
 }
+// MARK: - TypeIndex AutoEquatable
+extension TypeIndex: Equatable {}
+internal func == (lhs: TypeIndex, rhs: TypeIndex) -> Bool {
+    guard lhs.value == rhs.value else { return false }
+    return true
+}
 
 // MARK: - AutoEquatable for Enums
 // MARK: - ConfigurationAttribute AutoEquatable