Merge pull request #179 from scribd/stephane/projects_param

Add projects attribute to Weaver to filter out dependencies by project names

Sample/API/Generated/Weaver.swift

@@ -2,7 +2,7 @@ import Foundation
 import UIKit
 
 // swiftlint:disable all
-/// This file is generated by Weaver 1.1.4
+/// This file is generated by Weaver 1.1.5
 /// DO NOT EDIT!
 
 final class MainDependencyContainer {

Sample/Sample/AppDelegate.swift

@@ -16,7 +16,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     private let dependencies = MainDependencyContainer.appDelegateDependencyResolver()
 
-    @Weaver(.registration)
+    @Weaver(.registration, projects: ["Sample"])
     private var logger: Logger
 
     @Weaver(.registration, builder: AppDelegate.makeURLSession)

Sample/Sample/Generated/Weaver.swift

@@ -3,7 +3,7 @@ import Foundation
 import UIKit
 
 // swiftlint:disable all
-/// This file is generated by Weaver 1.1.4
+/// This file is generated by Weaver 1.1.5
 /// DO NOT EDIT!
 
 @objc(SampleIOSMainDependencyContainer)
@@ -213,10 +213,9 @@ final class MainDependencyContainer: NSObject {
     private func personManagerDependencyResolver() -> PersonManagerDependencyResolver {
         let _self = MainDependencyContainer()
         var _builders = Dictionary<String, Any>()
-        _builders["logger"] = Provider.lazyBuilder( { (_: Optional<Provider.ParametersCopier>) -> Logger in return Logger() })
+        _builders["logger"] = _self.loggerBuilder
         _builders["movieAPI"] = _self.movieAPIBuilder
         _self.provider.addBuilders(_builders)
-        _ = _self.logger
         MainDependencyContainer._pushDynamicResolver({ _self.logger })
         MainDependencyContainer._pushDynamicResolver({ _self.movieAPI })
         return _self
@@ -225,10 +224,9 @@ final class MainDependencyContainer: NSObject {
     private func reviewManagerDependencyResolver() -> ReviewManagerDependencyResolver {
         let _self = MainDependencyContainer()
         var _builders = Dictionary<String, Any>()
-        _builders["logger"] = Provider.lazyBuilder( { (_: Optional<Provider.ParametersCopier>) -> Logger in return Logger() })
+        _builders["logger"] = loggerBuilder
         _builders["movieAPI"] = movieAPIBuilder
         _self.provider.addBuilders(_builders)
-        _ = _self.logger
         MainDependencyContainer._pushDynamicResolver({ _self.logger })
         MainDependencyContainer._pushDynamicResolver({ _self.movieAPI })
         return _self
@@ -238,7 +236,6 @@ final class MainDependencyContainer: NSObject {
         let _self = MainDependencyContainer(provider: provider.copy())
         let _inputProvider = _self.provider.copy()
         var _builders = Dictionary<String, Any>()
-        _builders["logger"] = Provider.lazyBuilder( { (_: Optional<Provider.ParametersCopier>) -> Logger in return Logger() })
         _builders["movieController"] = Provider.weakLazyBuilder(
              { (copyParameters: Optional<Provider.ParametersCopier>) -> UIViewController in
                 defer { MainDependencyContainer._dynamicResolversLock.unlock() }
@@ -250,11 +247,11 @@ final class MainDependencyContainer: NSObject {
             }
         )
         _builders["imageManager"] = imageManagerBuilder
+        _builders["logger"] = loggerBuilder
         _builders["movieManager"] = movieManagerBuilder
         _builders["reviewManager"] = reviewManagerBuilder
         _self.provider.addBuilders(_builders)
         _inputProvider.addBuilders(_builders)
-        _ = _self.logger
         MainDependencyContainer._pushDynamicResolver({ _self.logger })
         MainDependencyContainer._pushDynamicResolver({ _self.movieManager })
         MainDependencyContainer._pushDynamicResolver(_self.movieController)
@@ -265,18 +262,17 @@ final class MainDependencyContainer: NSObject {
         let _self = MainDependencyContainer(provider: provider.copy())
         let _inputProvider = _self.provider
         var _builders = Dictionary<String, Any>()
-        _builders["logger"] = Provider.lazyBuilder( { (_: Optional<Provider.ParametersCopier>) -> Logger in return Logger() })
         _builders["reviewController"] = Provider.weakLazyBuilder(
              { (_: Optional<Provider.ParametersCopier>) -> WSReviewViewController in
                 let _inputContainer = MainDependencyContainer(provider: _inputProvider.copy())
                 return WSReviewViewController.make(_inputContainer as WSReviewViewControllerInputDependencyResolver)
             }
         )
         _builders["imageManager"] = imageManagerBuilder
+        _builders["logger"] = loggerBuilder
         _builders["movieManager"] = movieManagerBuilder
         _builders["reviewManager"] = reviewManagerBuilder
         _self.provider.addBuilders(_builders)
-        _ = _self.logger
         MainDependencyContainer._pushDynamicResolver({ _self.logger })
         MainDependencyContainer._pushDynamicResolver({ _self.movieID })
         MainDependencyContainer._pushDynamicResolver({ _self.movieTitle })
@@ -369,7 +365,8 @@ struct Weaver<ConcreteType, AbstractType> {
          escaping: Bool = false,
          builder: Optional<Any> = nil,
          objc: Bool = false,
-         platforms: Array<MainDependencyContainer.Platform> = []) {
+         platforms: Array<MainDependencyContainer.Platform> = [],
+         projects: Array<String> = []) {
         // no-op
     }
 
@@ -385,7 +382,8 @@ extension Weaver where ConcreteType == Void {
          escaping: Bool = false,
          builder: Optional<Any> = nil,
          objc: Bool = false,
-         platforms: Array<MainDependencyContainer.Platform> = []) {
+         platforms: Array<MainDependencyContainer.Platform> = [],
+         projects: Array<String> = []) {
         // no-op
     }
 }
@@ -403,7 +401,8 @@ struct WeaverP2<ConcreteType, AbstractType, P1, P2> {
          escaping: Bool = false,
          builder: Optional<Any> = nil,
          objc: Bool = false,
-         platforms: Array<MainDependencyContainer.Platform> = []) {
+         platforms: Array<MainDependencyContainer.Platform> = [],
+         projects: Array<String> = []) {
         // no-op
     }
 
@@ -419,7 +418,8 @@ extension WeaverP2 where ConcreteType == Void {
          escaping: Bool = false,
          builder: Optional<Any> = nil,
          objc: Bool = false,
-         platforms: Array<MainDependencyContainer.Platform> = []) {
+         platforms: Array<MainDependencyContainer.Platform> = [],
+         projects: Array<String> = []) {
         // no-op
     }
 }

Sample/Sample/Manager/PersonManager.swift

@@ -28,7 +28,7 @@ final class PersonManager: PersonManaging {
 
     // weaver: self.isIsolated = true
 
-    @Weaver(.registration)
+    @Weaver(.reference)
     private var logger: Logger
 
     @Weaver(.reference)

Sample/Sample/Manager/ReviewManager.swift

@@ -37,7 +37,7 @@ import API
 
 final class ReviewManager: ReviewManaging {
 
-    @Weaver(.registration)
+    @Weaver(.reference)
     private var logger: Logger
 
     @Weaver(.reference)

Sample/Sample/View/HomeViewController.swift

@@ -16,7 +16,7 @@ final class HomeViewController: UIViewController {
 
     private var movies = [Movie]()
 
-    @Weaver(.registration)
+    @Weaver(.reference, platforms: [.iOS])
     private var logger: Logger
 
     @Weaver(.reference)

Sample/Sample/View/MovieViewController.swift

@@ -17,7 +17,7 @@ final class MovieViewController: UIViewController {
         let overview: String?
     }
 
-    @Weaver(.registration)
+    @Weaver(.reference)
     private var logger: Logger
 
     @Weaver(.parameter)

Sources/WeaverCodeGen/Codable.swift

@@ -31,6 +31,8 @@ extension ConfigurationAttribute: Codable {
             self = .escaping(value: try container.decode(Bool.self, forKey: .value))
         case .platforms:
             self = .platforms(values: try container.decode([Platform].self, forKey: .value))
+        case .projects:
+            self = .projects(values: try container.decode([String].self, forKey: .value))
         }
     }
 
@@ -58,6 +60,9 @@ extension ConfigurationAttribute: Codable {
         case .platforms(let value):
             try container.encode(ConfigurationAttributeName.platforms, forKey: .name)
             try container.encode(value, forKey: .value)
+        case .projects(let value):
+            try container.encode(ConfigurationAttributeName.projects, forKey: .name)
+            try container.encode(value, forKey: .value)
         }
     }
 }
@@ -95,6 +100,7 @@ extension ConfigurationAttributeName: Codable {
         case setter = "set"
         case escaping = "e"
         case platforms = "p"
+        case projects = "j"
 
         init(_ value: ConfigurationAttributeName) {
             switch value {
@@ -112,6 +118,8 @@ extension ConfigurationAttributeName: Codable {
                 self = .escaping
             case .platforms:
                 self = .platforms
+            case .projects:
+                self = .projects
             }
         }
 
@@ -131,6 +139,8 @@ extension ConfigurationAttributeName: Codable {
                 return .escaping
             case .platforms:
                 return .platforms
+            case .projects:
+                return .projects
             }
         }
     }

Sources/WeaverCodeGen/Configuration.swift

@@ -48,14 +48,17 @@ struct DependencyConfiguration: Configuration {
     let escaping: Bool
 
     let platforms: Set<Platform>
-
+
+    let projects: Set<String>
+
     init(with attributes: [ConfigurationAttributeName: ConfigurationAttribute]?) {
         customBuilder = attributes?[.customBuilder]?.stringValue
         scope = attributes?[.scope]?.scopeValue ?? .default
         doesSupportObjc = attributes?[.doesSupportObjc]?.boolValue ?? false
         setter = attributes?[.setter]?.boolValue ?? false
         escaping = attributes?[.escaping]?.boolValue ?? false
         platforms = Set(attributes?[.platforms]?.platformValues ?? [])
+        projects = Set(attributes?[.projects]?.projectValues ?? [])
     }
 }