Move update listeners to PartialBuilder

JosephDuffy · May 17, 2019 · 158b706 · 158b706
1 parent 326262f
commit 158b706
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 9 deletions.
diff --git a/Source/Partial.swift b/Source/Partial.swift
@@ -11,8 +11,6 @@ public struct Partial<Wrapped>: CustomStringConvertible, CustomDebugStringConver
 
     internal var backingValue: Wrapped? = nil
 
-    internal var updateHandlers: [PartialKeyPath<Wrapped>: [(Any?) -> Void]] = [:]
-
     public init(backingValue: Wrapped? = nil) {
         self.backingValue = backingValue
     }
@@ -47,7 +45,6 @@ public struct Partial<Wrapped>: CustomStringConvertible, CustomDebugStringConver
 
     public mutating func set<Value>(value: Value, for key: KeyPath<Wrapped, Value>) {
         values[key] = value
-        updateHandlers[key]?.forEach { $0(value as Any) }
     }
 
     public mutating func set<Value>(value: Value?, for key: KeyPath<Wrapped, Value?>) {
@@ -58,12 +55,10 @@ public struct Partial<Wrapped>: CustomStringConvertible, CustomDebugStringConver
          a `backingValue` is set and a key is explicitly set to `nil`
          */
         values.updateValue(value, forKey: key)
-        updateHandlers[key]?.forEach { $0(value as Any) }
     }
 
     public mutating func removeValue<Value>(for key: KeyPath<Wrapped, Value>) {
         values.removeValue(forKey: key)
-        updateHandlers[key]?.forEach { $0(nil) }
     }
 
     public subscript<Value>(key: KeyPath<Wrapped, Value>) -> Value? {

diff --git a/Source/PartialBuilder.swift b/Source/PartialBuilder.swift
@@ -1,6 +1,8 @@
-public class PartialBuilder<Wrapped> {
+public final class PartialBuilder<Wrapped> {
 
-    public var partial: Partial<Wrapped>
+    public private(set) var partial: Partial<Wrapped>
+
+    private var updateHandlers: [PartialKeyPath<Wrapped>: [(Any?) -> Void]] = [:]
 
     public init(partial: Partial<Wrapped> = Partial<Wrapped>()) {
         self.partial = partial
@@ -10,6 +12,77 @@ public class PartialBuilder<Wrapped> {
         partial = Partial(backingValue: backingValue)
     }
 
+    public func value<Value>(for key: KeyPath<Wrapped, Value>) throws -> Value {
+        return try partial.value(for: key)
+    }
+
+    public func value<Value>(for key: KeyPath<Wrapped, Value?>) throws -> Value {
+        return try partial.value(for: key)
+    }
+
+    public func value<Value>(for key: KeyPath<Wrapped, Value>) throws -> Value where Value: PartialConvertible {
+        return try partial.value(for: key)
+    }
+
+    public func value<Value>(for key: KeyPath<Wrapped, Value?>) throws -> Value where Value: PartialConvertible {
+        return try partial.value(for: key)
+    }
+
+    public func partialValue<Value>(for key: KeyPath<Wrapped, Value>) throws -> Partial<Value> where Value: PartialConvertible {
+        return try partial.partialValue(for: key)
+    }
+
+    public func partialValue<Value>(for key: KeyPath<Wrapped, Value?>) throws -> Partial<Value> where Value: PartialConvertible {
+        return try partial.partialValue(for: key)
+    }
+
+    public func set<Value>(value: Value, for key: KeyPath<Wrapped, Value>) {
+        partial.set(value: value, for: key)
+        updateHandlers[key]?.forEach { $0(value as Any) }
+    }
+
+    public func set<Value>(value: Value?, for key: KeyPath<Wrapped, Value?>) {
+        partial.set(value: value, for: key)
+        updateHandlers[key]?.forEach { $0(value as Any) }
+    }
+
+    public func set<Value>(value: Partial<Value>, for key: KeyPath<Wrapped, Value>) where Value: PartialConvertible {
+        partial.set(value: value, for: key)
+        updateHandlers[key]?.forEach { $0(value as Any) }
+    }
+
+    public func removeValue<Value>(for key: KeyPath<Wrapped, Value>) {
+        partial.removeValue(for: key)
+        updateHandlers[key]?.forEach({ $0(nil) })
+    }
+
+    public subscript<Value>(key: KeyPath<Wrapped, Value>) -> Value? {
+        get {
+            return partial[key]
+        }
+        set {
+            partial.removeValue(for: key)
+        }
+    }
+
+    public subscript<Value>(key: KeyPath<Wrapped, Value?>) -> Value? {
+        get {
+            return partial[key]
+        }
+        set {
+            set(value: newValue, for: key)
+        }
+    }
+
+    public subscript<Value>(key: KeyPath<Wrapped, Value>) -> Partial<Value> where Value: PartialConvertible {
+        get {
+            return partial[key]
+        }
+        set {
+            set(value: newValue, for: key)
+        }
+    }
+
 }
 
 extension PartialBuilder where Wrapped: PartialConvertible {

diff --git a/Source/PartialConvertible.swift b/Source/PartialConvertible.swift
@@ -80,12 +80,10 @@ extension Partial {
 
     public mutating func set<Value>(value: Partial<Value>, for key: KeyPath<Wrapped, Value>) where Value: PartialConvertible {
         values[key] = value
-        updateHandlers[key]?.forEach { $0(value as Any) }
     }
 
     public mutating func set<Value>(value: Partial<Value>, for key: KeyPath<Wrapped, Value?>) where Value: PartialConvertible {
         values[key] = value
-        updateHandlers[key]?.forEach { $0(value as Any) }
     }
 
     public subscript<Value>(key: KeyPath<Wrapped, Value>) -> Partial<Value> where Value: PartialConvertible {