Merge 621081b into f8fd844

Cleanse.xcodeproj/project.xcworkspace/xcshareddata/Cleanse.xcscmblueprint

@@ -4,18 +4,32 @@
 
   },
   "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
-    "FA78EFA588CAAA527A39EFF7FEB4200B880E2491" : 0,
-    "C29DD0E89C17000393FD71820E9E7C86451DD28A" : 0
+    "C29DD0E89C17000393FD71820E9E7C86451DD28A" : 0,
+    "7F4664FA65AADBC384859AD71F1C93E5320699FF" : 9223372036854775807,
+    "68EDA75FC77F318B0BF9BAED4D569D9555E8E0D3" : 9223372036854775807,
+    "FA78EFA588CAAA527A39EFF7FEB4200B880E2491" : 0
   },
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "85D0171F-7EAD-4682-B2C2-5BBDC5C235DD",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
-    "FA78EFA588CAAA527A39EFF7FEB4200B880E2491" : "Cleanse\/",
-    "C29DD0E89C17000393FD71820E9E7C86451DD28A" : ".."
+    "C29DD0E89C17000393FD71820E9E7C86451DD28A" : "..\/..\/..\/..",
+    "7F4664FA65AADBC384859AD71F1C93E5320699FF" : "..\/..",
+    "68EDA75FC77F318B0BF9BAED4D569D9555E8E0D3" : "..",
+    "FA78EFA588CAAA527A39EFF7FEB4200B880E2491" : "Cleanse\/"
   },
   "DVTSourceControlWorkspaceBlueprintNameKey" : "Cleanse",
   "DVTSourceControlWorkspaceBlueprintVersion" : 204,
   "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Cleanse.xcodeproj",
   "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "ssh:\/\/git.corp.squareup.com\/ml\/UITestRunner.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "68EDA75FC77F318B0BF9BAED4D569D9555E8E0D3"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "ssh:\/\/git.corp.squareup.com\/ml\/snapshottestbinaries.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "7F4664FA65AADBC384859AD71F1C93E5320699FF"
+    },
     {
       "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "ssh:\/\/git.corp.squareup.com\/ios\/appointments.git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",

Cleanse/BaseComponent.swift

@@ -11,12 +11,13 @@ import Foundation
 public protocol _AnyBaseComponent : Configurable {
 }
 
-
 /// Base protocol for both Components and Subcomponenents
-
 public protocol _BaseComponent : _AnyBaseComponent {
+    /// This is the binding required to construct a new Component. Think of it as somewhat of an initialization value.
+    associatedtype Seed = Void
+
     /// This should be set to the root type of object that is created.
     associatedtype Root
 
     associatedtype Scope: Cleanse.Scope
-}
+}

Cleanse/BindingBuilder.swift

@@ -72,7 +72,10 @@ extension Binder {
 public protocol _StandardProvider : ProviderProtocol {
 }
 
-extension Provider : _StandardProvider {
+protocol _AnyStandardProvider : AnyProvider {
+}
+
+extension Provider : _StandardProvider, _AnyStandardProvider {
 }
 
 /// MARK: Building steps
@@ -126,14 +129,6 @@ extension BindingBuilder {
             anyCollectionMergeFunc = nil
         }
 
-        let componentOrSubcomponentProvider: AnyProvider?
-
-        if MaybeComponentOrSubcomponent.self is _AnyBaseComponent.Type && Input.self == MaybeComponentOrSubcomponent.self {
-            componentOrSubcomponentProvider = provider.asProvider()
-        } else {
-            componentOrSubcomponentProvider = nil
-        }
-
         let scope: Scope.Type?
 
         // If we explicitely declared our scope (e.g. `scopedIn(
@@ -149,7 +144,7 @@ extension BindingBuilder {
             scope: scope,
             provider: mappedProvider as! AnyProvider,
             collectionMergeFunc: anyCollectionMergeFunc,
-            componentOrSubcomponentProvider: componentOrSubcomponentProvider
+            sourceLocation: SourceLocation(file: file, line: line, function: function)
         )
 
         binder._internalBind(binding: rpb)

Cleanse/BindingBuilderDecorator.swift

@@ -24,8 +24,6 @@ public protocol BindingBuilderDecorator : BindingBuilder {
 
     associatedtype CollectionOrUnique: _CollectionOrUniqueBindingBase = Wrapped.CollectionOrUnique
 
-    associatedtype MaybeComponentOrSubcomponent: Any = Wrapped.MaybeComponentOrSubcomponent
-
     static var collectionMergeFunc: Optional<[FinalProvider.Element] -> FinalProvider.Element> { get }
 }
 

Cleanse/Component.swift

@@ -1,48 +1,15 @@
 //
-//  RootComponent.swift
+//  Component.swift
 //  Cleanse
 //
-//  Created by Mike Lewis on 5/2/16.
+//  Created by Mike Lewis on 7/6/16.
 //  Copyright © 2016 Square, Inc. All rights reserved.
 //
 
 import Foundation
 
-/// Used to detect if things being bound are a component.
-/// Un-typed base protocol of component. Probably shouldn't be used directly
-public protocol _AnyRootComponent : _AnyBaseComponent {
-}
-
-
-/// RootComponent has been renamed to RootComponent
-#if swift(>=3.0)
-    @available(*, deprecated, renamed:"RootComponent")
-    public typealias Component = RootComponent
-#else
-    @available(*, deprecated, renamed="RootComponent")
-    public typealias Component = RootComponent
-#endif
 
-public protocol RootComponent : Module, _BaseComponent, _AnyRootComponent {
-    /// This should be set to the root type of object that is created.
-    associatedtype Root
-
-    associatedtype Scope = Singleton
+public protocol Component : _BaseComponent {
+    ///  can have custom scopes associated with them.
+    associatedtype Scope = _Unscoped
 }
-
-public extension RootComponent {
-    /// Builds the component and returns the root object.
-    /// - throws: `CleanseError` if the component fails validation.
-    public func build() throws -> Root {
-        let graph = Graph(scope: Self.Scope.scopeOrNil)
-
-        let p = graph.provider(Root.self)
-
-        graph.install(module: self)
-
-        try graph.finalize()
-
-        return p.get()
-    }
-}
-

Cleanse/ComponentFactory.swift

@@ -7,3 +7,29 @@
 //
 
 import Foundation
+
+public protocol ComponentFactoryProtocol {
+    associatedtype ComponentElement: Cleanse.Component
+
+    func build(seed: ComponentElement.Seed) -> ComponentElement.Root
+}
+
+public struct ComponentFactory<C: Component> : ComponentFactoryProtocol {
+    public typealias ComponentElement = C
+    private let factoryFunction: (seed: ComponentElement.Seed) -> C.Root
+
+    init(factoryFunction: (seed: ComponentElement.Seed) -> C.Root) {
+        self.factoryFunction = factoryFunction
+    }
+
+    /// Builds the Component and returns its root object.
+    public func build(seed: ComponentElement.Seed) -> ComponentElement.Root {
+        return factoryFunction(seed: seed)
+    }
+}
+
+extension ComponentFactoryProtocol where ComponentElement.Seed: ProviderProtocol {
+    public func build(seed: ComponentElement.Seed.Element) -> ComponentElement.Root {
+        return build(ComponentElement.Seed.init(value: seed))
+    }
+}

Cleanse/ComponentVisitor.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 class VisitorState<V: ComponentVisitor> {
-    private var enqueuedRequirementFutures = [Any.Type]()
+    private var enqueuedRequirementFutures = [AnyProvider.Type]()
     /// These are for errors that make it impossible to traverse the module hierarchy
     private var accumulatedErrors  = [CleanseError]()
 
@@ -39,23 +39,24 @@ protocol ComponentVisitor : Binder {
 
     /// Have to implement this to have a return value for a provider. Default implementation explodes
     func resolveProvider<Element>(_ type: Element.Type, requiredBy: Any.Type?) -> Provider<Element>
-    func enterModule<M: Module>(module module: M)
-    func leaveModule<M: Module>(module module: M)
+
+    func enterModule<M: Module>(module module: M.Type)
+    func leaveModule<M: Module>(module module: M.Type)
 
-    func enterSubcomponent<S: Subcomponent>(dependency dependency: S)
-    func leaveSubcomponent<S: Subcomponent>(dependency dependency: S)
+    func enterComponent<C: Component>(dependency dependency: C.Type)
+    func leaveComponent<C: Component>(dependency dependency: C.Type)
 
     func enterProvider(binding binding: RawProviderBinding)
     func leaveProvider(binding binding: RawProviderBinding)
 
-    func visitRequirement(requirement requirement: Any.Type, binding: RawProviderBinding)
+    func visitRequirement(requirement requirement: AnyProvider.Type, binding: RawProviderBinding)
 }
 
 extension ComponentVisitor {
-    func enterModule<M : Module>(module module: M) {
+    func enterModule<M : Module>(module module: M.Type) {
     }
 
-    func leaveModule<M : Module>(module module: M) {
+    func leaveModule<M : Module>(module module: M.Type) {
     }
 
     func enterProvider(binding binding: RawProviderBinding) {
@@ -64,21 +65,13 @@ extension ComponentVisitor {
     func leaveProvider(binding binding: RawProviderBinding) {
     }
 
-    func enterSubcomponent<S: Subcomponent>(dependency dependency: S) {
+    func enterComponent<C: Component>(dependency dependency: C.Type) {
     }
 
-    func leaveSubcomponent<S: Subcomponent>(dependency dependency: S) {
+    func leaveComponent<C: Component>(dependency dependency: C.Type) {
     }
 
-    func visitRequirement(requirement requirement: Any.Type, binding: RawProviderBinding) {
-    }
-}
-
-extension Subcomponent {
-    private func doComponentVisit<V: ComponentVisitor>(visitor visitor: V) {
-        visitor.enterSubcomponent(dependency: self)
-        configure(binder: visitor)
-        visitor.leaveSubcomponent(dependency: self)
+    func visitRequirement(requirement requirement: AnyProvider.Type, binding: RawProviderBinding) {
     }
 }
 
@@ -87,7 +80,7 @@ extension ComponentVisitor {
         enterProvider(binding: binding)
 
         let requirements = visitorState.enqueuedRequirementFutures
-        defer { visitorState.enqueuedRequirementFutures.removeAll() }
+        visitorState.enqueuedRequirementFutures.removeAll()
 
         for requirement in requirements {
             visitRequirement(requirement: requirement, binding: binding)
@@ -97,20 +90,49 @@ extension ComponentVisitor {
     }
 
 
-    func install<M : Module>(module module: M) {
+    func install<M : Module>(module module: M.Type) {
         enterModule(module: module)
         module.configure(binder: self)
         leaveModule(module: module)
     }
 
-    func install<S : Subcomponent>(dependency dependency: S) {
-        enterSubcomponent(dependency: dependency)
+    func install<C : Cleanse.Component>(dependency dependency: C.Type) {
+        bind(ComponentFactory<C>.self).to { () -> ComponentFactory<C> in
+            preconditionFailure("Should not ever evaluate"); _ = Void()
+        }
+
+        enterComponent(dependency: dependency)
+
+        // If the seed isn't void
+        if C.Seed.self != Void.self {
+            if let seed = C.Seed.self as? AnyProvider.Type {
+                _internalBind(binding: RawProviderBinding(
+                    scope: nil,
+                    provider: seed.makeNew { preconditionFailure(); _ = Void() },
+                    collectionMergeFunc:  nil,
+                    sourceLocation: nil
+                    ))
+            } else {
+                _internalBind(binding: RawProviderBinding(
+                    scope: nil,
+                    provider: Provider<C.Seed> { preconditionFailure(); _ = Void() },
+                    collectionMergeFunc:  nil,
+                    sourceLocation: nil
+                    ))
+            }
+
+        }
+
         dependency.configure(binder: self)
-        leaveSubcomponent(dependency: dependency)
+        leaveComponent(dependency: dependency)
     }
 
     func _internalProvider<Element>(_ type: Element.Type, debugInfo: ProviderRequestDebugInfo?) -> Provider<Element> {
-        visitorState.enqueuedRequirementFutures.append(Element.self)
+        if let type = type as? AnyProvider.Type {
+            visitorState.enqueuedRequirementFutures.append(type)
+        } else {
+            visitorState.enqueuedRequirementFutures.append(Provider<Element>.self)
+        }
 
         return resolveProvider(Element.self, requiredBy: debugInfo?.providerRequiredFor)
     }

Cleanse/Configurable.swift

@@ -10,5 +10,5 @@ import Foundation
 
 /// Base protocol for Components and Models. It allows for shared installation, but disambguates function call
 public protocol Configurable {
-    func configure<B: Binder>(binder binder: B)
-}
+    static func configure<B: Binder>(binder binder: B)
+}