Merge branch 'theo/fix-root-detection'

scribd · Sep 24, 2018 · de9beeb · de9beeb
2 parents 5aaf130 + e5eadb8
commit de9beeb
Show file tree

Hide file tree

Showing 10 changed files with 145 additions and 78 deletions.
diff --git a/Resources/dependency_resolver.stencil b/Resources/dependency_resolver.stencil
@@ -11,8 +11,6 @@
         {% endfor %}
 {% endmacro %}
 
-{% macro DependencyContainerBuilder dependency %}{{dependency.type.name}}DependencyContainer(injecting: self{% call ParametersPassInWithSeparator dependency.parameters %}){% endmacro %}
-
 {% macro AttributesDecl dependencies %}
 {% for dependency in dependencies %}
     let {{dependency.name}}: {{dependency.abstractType}}
@@ -89,10 +87,10 @@ final class {{dependencyContainer.targetType.name}}DependencyContainer{{dependen
         {% if not registration.customRef %}
 
         {% if registration.hasBuilder %}
-        let dependencies = {% call DependencyContainerBuilder registration %}
+        let dependencies = {{registration.type.name}}DependencyContainer({% if registration.hasReferences %}injecting: self{% if registration.parameters %}, {% endif %}{% endif %}{% call ParametersPassIn registration.parameters %})
         let value = {{registration.type}}(injecting: dependencies)
         {% else %}{# registration.hasBuilder #}
-        let value = {{registration.type}}()
+        let value = {{registration.type}}({% if registration.hasDependencyContainer %}injecting: {{registration.type.name}}DependencyContainer{{registration.type.generics}}(){% endif %})
         {% endif %}{# registration.hasBuilder #}
 
         {% else %}{# not registration.customRef #}
@@ -138,21 +136,13 @@ final class {{dependencyContainer.targetType.name}}DependencyContainer{{dependen
 }
 
 {% for injectableDependency in dependencyContainer.injectableDependencies %}
+{% if injectableDependency.references %}
 extension {{dependencyContainer.targetType.name}}DependencyContainer: {{injectableDependency.targetType.name}}InputDependencyResolver {}
+{% endif %}
 {% endfor %}
 
-{% if not dependencyContainer.isRoot %}
-protocol {{dependencyContainer.targetType.name}}{% if dependencyContainer.doesSupportObjc %}ObjC{% endif %}DependencyInjectable {
-    {% for genericName in dependencyContainer.targetType.genericNames %}
-    associatedtype {{genericName}}
-    {% endfor %}
-
-    {% if dependencyContainer.targetType.genericNames %}
-    init(injecting dependencies: {{dependencyContainer.targetType.name}}DependencyContainer{{dependencyContainer.targetType.generics}})
-    {% else %}
-    init(injecting dependencies: {{dependencyContainer.targetType.name}}DependencyResolver)
-    {% endif %}
-}
+{% if dependencyContainer.doesSupportObjc %}
+protocol {{dependencyContainer.targetType.name}}ObjCDependencyInjectable {}
 {% endif %}
 
 {% if dependencyContainer.isPublic %}

diff --git a/Sample/API/Generated/Weaver.API.swift b/Sample/API/Generated/Weaver.API.swift
@@ -23,9 +23,6 @@ final class MovieAPIDependencyContainer: MovieAPIDependencyResolver {
         _ = logger
     }
 }
-protocol MovieAPIDependencyInjectable {
-    init(injecting dependencies: MovieAPIDependencyResolver)
-}
 final class MovieAPIShimDependencyContainer: MovieAPIInputDependencyResolver {
     let urlSession: URLSession
     init(urlSession: URLSession) {

diff --git a/Sample/API/Generated/Weaver.MovieManager.swift b/Sample/API/Generated/Weaver.MovieManager.swift
@@ -38,9 +38,6 @@ final class MovieManagerDependencyContainer: MovieManagerDependencyResolver {
     }
 }
 extension MovieManagerDependencyContainer: MovieAPIInputDependencyResolver {}
-protocol MovieManagerDependencyInjectable {
-    init(injecting dependencies: MovieManagerDependencyResolver)
-}
 final class MovieManagerShimDependencyContainer: MovieManagerInputDependencyResolver {
     let logger: Logger
     init(logger: Logger) {

diff --git a/Sample/Sample/Generated/Weaver.HomeViewController.swift b/Sample/Sample/Generated/Weaver.HomeViewController.swift
@@ -42,7 +42,4 @@ final class HomeViewControllerDependencyContainer: HomeViewControllerDependencyR
         _ = logger
     }
 }
-extension HomeViewControllerDependencyContainer: MovieViewControllerInputDependencyResolver {}
-protocol HomeViewControllerDependencyInjectable {
-    init(injecting dependencies: HomeViewControllerDependencyResolver)
-}
+extension HomeViewControllerDependencyContainer: MovieViewControllerInputDependencyResolver {}
diff --git a/Sample/Sample/Generated/Weaver.MovieViewController.swift b/Sample/Sample/Generated/Weaver.MovieViewController.swift
@@ -49,7 +49,4 @@ final class MovieViewControllerDependencyContainer: MovieViewControllerDependenc
         _ = reviewController(movieID: movieID)
     }
 }
-extension MovieViewControllerDependencyContainer: WSReviewViewControllerInputDependencyResolver {}
-protocol MovieViewControllerDependencyInjectable {
-    init(injecting dependencies: MovieViewControllerDependencyResolver)
-}
+extension MovieViewControllerDependencyContainer: WSReviewViewControllerInputDependencyResolver {}
diff --git a/Sample/Sample/Generated/Weaver.PersonManager.swift b/Sample/Sample/Generated/Weaver.PersonManager.swift
@@ -23,7 +23,4 @@ final class PersonManagerDependencyContainer: PersonManagerDependencyResolver {
         movieAPI = dependencies.movieAPI
         _ = logger
     }
-}
-protocol PersonManagerDependencyInjectable {
-    init(injecting dependencies: PersonManagerDependencyResolver)
 }
diff --git a/Sample/Sample/Generated/Weaver.ReviewManager.swift b/Sample/Sample/Generated/Weaver.ReviewManager.swift
@@ -23,7 +23,4 @@ final class ReviewManagerDependencyContainer: ReviewManagerDependencyResolver {
         movieAPI = dependencies.movieAPI
         _ = logger
     }
-}
-protocol ReviewManagerDependencyInjectable {
-    init(injecting dependencies: ReviewManagerDependencyResolver)
 }
diff --git a/Sample/Sample/Generated/Weaver.WSReviewViewController+Injectable.swift b/Sample/Sample/Generated/Weaver.WSReviewViewController+Injectable.swift
@@ -18,6 +18,4 @@ final class WSReviewViewControllerDependencyContainer: NSObject, WSReviewViewCon
         super.init()
     }
 }
-protocol WSReviewViewControllerObjCDependencyInjectable {
-    init(injecting dependencies: WSReviewViewControllerDependencyResolver)
-}
+protocol WSReviewViewControllerObjCDependencyInjectable {}
diff --git a/Sources/WeaverCodeGen/Generator.swift b/Sources/WeaverCodeGen/Generator.swift
@@ -59,7 +59,9 @@ private struct RegistrationViewModel {
     let scope: String
     let customRef: Bool
     let parameters: [DependencyViewModel]
+    let hasReferences: Bool
     let hasBuilder: Bool
+    let hasDependencyContainer: Bool
     let isTransient: Bool
     let isWeak: Bool
 
@@ -72,12 +74,16 @@ private struct RegistrationViewModel {
 
         if let dependencyContainer = dependencyGraph.dependencyContainersByType[dependency.type.index] {
             parameters = dependencyContainer.parameters.map { DependencyViewModel($0, dependencyGraph: dependencyGraph) }
-            hasBuilder = !dependencyContainer.parameters.isEmpty || !dependencyContainer.references.orderedKeys.isEmpty
+            hasReferences = !dependencyContainer.allReferences.isEmpty
+            hasBuilder = dependencyContainer.hasBuilder
+            hasDependencyContainer = dependencyContainer.hasDependencies
         } else {
             parameters = []
+            hasReferences = false
             hasBuilder = false
+            hasDependencyContainer = false
         }
-        
+
         isTransient = dependency.scope == .transient
         isWeak = dependency.scope == .weak
     }
@@ -183,11 +189,11 @@ private extension DependencyContainer {
     }
 
     var isRoot: Bool {
-        let hasNonCustomReferences = references.orderedValues.contains {
-            !$0.configuration.customRef
-        }
-        let hasParameters = !parameters.isEmpty
-        return !hasNonCustomReferences && !hasParameters
+        return sources.isEmpty
+    }
+
+    var hasBuilder: Bool {
+        return !parameters.isEmpty || !allReferences.isEmpty
     }
 
     var isPublic: Bool {