add when(fulfilled:) and when(resolved:) tuple arity functions for thenables and cancellable thenables

add an associated type R representing the result type in Thenable which improves when(resolved:) return type

Author: Skoti

Sources/PromiseKit/Cancellation/CancellableThenable.swift

@@ -296,48 +296,55 @@ public extension CancellableThenable {
 
 public extension CancellableThenable {
     /**
-     - Returns: The error with which this cancellable promise was rejected; `nil` if this promise is not rejected.
-     */
-    var error: Error? {
-        return thenable.error
-    }
-
-    /**
-     - Returns: `true` if the cancellable promise has not yet resolved.
+     - `true` if the cancellable promise has not yet resolved.
      */
     var isPending: Bool {
         return thenable.isPending
     }
 
     /**
-     - Returns: `true` if the cancellable promise has resolved.
+     - `true` if the cancellable promise has resolved.
      */
     var isResolved: Bool {
         return thenable.isResolved
     }
 
     /**
-     - Returns: `true` if the cancellable promise was fulfilled.
+     - `true` if the cancellable promise was fulfilled.
      */
     var isFulfilled: Bool {
         return thenable.isFulfilled
     }
 
-    /**
-     - Returns: `true` if the cancellable promise was rejected.
-     */
-    var isRejected: Bool {
-        return thenable.isRejected
+    /// The result with which this cancellable promise was resolved or `nil` if this cancellable promise is pending.
+    var result: U.R? {
+        return thenable.result
     }
 
     /**
-     - Returns: The value with which this cancellable promise was fulfilled or `nil` if this cancellable promise is pending or rejected.
+     - The value with which this cancellable promise was fulfilled or `nil` if this cancellable promise is pending or rejected.
      */
     var value: U.T? {
         return thenable.value
     }
 }
 
+public extension CancellableThenable where U.R == Result<U.T, Error> {
+    /**
+     - The error with which this cancellable promise was rejected; `nil` if this promise is not rejected.
+     */
+    var error: Error? {
+        return thenable.error
+    }
+
+    /**
+     - `true` if the cancellable promise was rejected.
+     */
+    var isRejected: Bool {
+        return thenable.isRejected
+    }
+}
+
 public extension CancellableThenable where U.T: Sequence {
     /**
      `CancellablePromise<[U.T]>` => `U.T` -> `V` => `CancellablePromise<[V]>`
@@ -479,7 +486,7 @@ public extension CancellableThenable where U.T: Sequence {
 }
 
 public extension CancellableThenable where U.T: Collection {
-    /// - Returns: a cancellable promise fulfilled with the first value of this `Collection` or, if empty, a promise rejected with PMKError.emptySequence.
+    /// - a cancellable promise fulfilled with the first value of this `Collection` or, if empty, a promise rejected with PMKError.emptySequence.
     var firstValue: CancellablePromise<U.T.Iterator.Element> {
         return map(on: nil) { aa in
             if let a1 = aa.first {
@@ -499,7 +506,7 @@ public extension CancellableThenable where U.T: Collection {
         }
     }
 
-    /// - Returns: a cancellable promise fulfilled with the last value of this `Collection` or, if empty, a promise rejected with PMKError.emptySequence.
+    /// - a cancellable promise fulfilled with the last value of this `Collection` or, if empty, a promise rejected with PMKError.emptySequence.
     var lastValue: CancellablePromise<U.T.Iterator.Element> {
         return map(on: nil) { aa in
             if aa.isEmpty {
@@ -518,3 +525,7 @@ public extension CancellableThenable where U.T: Sequence, U.T.Iterator.Element:
         return map(on: on) { $0.sorted() }
     }
 }
+
+func asThenables<CT: CancellableThenable>(_ cancellableThenables: [CT]) -> [CT.U] {
+    cancellableThenables.map { $0.thenable }
+}

Sources/PromiseKit/Guarantee.swift

@@ -51,12 +51,12 @@ public final class Guarantee<T>: Thenable {
     }
 
     /// - See: `Thenable.result`
-    public var result: Result<T, Error>? {
+    public var result: T? {
         switch box.inspect() {
         case .pending:
             return nil
         case .resolved(let value):
-            return .success(value)
+            return value
         }
     }
 
@@ -163,7 +163,6 @@ public extension Guarantee {
      any part of your chain may use. Like the main thread for example.
      */
     func wait() -> T {
-
         if Thread.isMainThread {
             conf.logHandler(.waitOnMainThread)
         }

Sources/PromiseKit/Result+Utils.swift

@@ -0,0 +1,13 @@
+import Foundation
+
+extension Result {
+    
+    var error: Failure? {
+        switch self {
+        case let .failure(error):
+            return error
+        case .success:
+            return nil
+        }
+    }
+}

Sources/PromiseKit/Thenable.swift

@@ -4,15 +4,21 @@ import Dispatch
 public protocol Thenable: AnyObject {
     /// The type of the wrapped value
     associatedtype T
+    /// The type of the result
+    associatedtype R
 
     /// `pipe` is immediately executed when this `Thenable` is resolved
     func pipe(to: @escaping(Result<T, Error>) -> Void)
 
     /// The resolved result or nil if pending.
-    var result: Result<T, Error>? { get }
+    var result: R? { get }
+    
+    /// The resolved result's value or nil if pending.
+    var value: T? { get }
 }
 
 public extension Thenable {
+    
     /**
      The provided closure executes when this promise is fulfilled.
 
@@ -218,59 +224,56 @@ public extension Thenable {
 
 public extension Thenable {
     /**
-     - Returns: The error with which this promise was rejected; `nil` if this promise is not rejected.
+     - Returns: `true` if this thenable was fulfilled.
      */
-    var error: Error? {
-        switch result {
-        case .none:
-            return nil
-        case .some(.success):
-            return nil
-        case .some(.failure(let error)):
-            return error
-        }
+    var isFulfilled: Bool {
+        return value != nil
     }
 
     /**
-     - Returns: `true` if the promise has not yet resolved.
+     - Returns: `true` if this thenable has not yet resolved.
      */
     var isPending: Bool {
         return result == nil
     }
 
     /**
-     - Returns: `true` if the promise has resolved.
+     - Returns: `true` if this thenable has resolved.
      */
     var isResolved: Bool {
         return !isPending
     }
+}
 
+public extension Thenable where R == T {
     /**
-     - Returns: `true` if the promise was fulfilled.
+     - Returns: The value with which this thenable was fulfilled or `nil` if this thenable is pending.
      */
-    var isFulfilled: Bool {
-        return value != nil
+    var value: T? {
+        return result
     }
+}
 
+public extension Thenable where R == Result<Self.T, Error> {
     /**
-     - Returns: `true` if the promise was rejected.
+     - Returns: The value with which this thenable was fulfilled or `nil` if this thenable is pending or rejected.
+     */
+    var value: T? {
+        return try? result?.get()
+    }
+    
+    /**
+     - Returns: `true` if this thenable was rejected.
      */
     var isRejected: Bool {
         return error != nil
     }
-
+    
     /**
-     - Returns: The value with which this promise was fulfilled or `nil` if this promise is pending or rejected.
+     - Returns: The error with which this thenable was rejected; `nil` if this thenable is not rejected or pending.
      */
-    var value: T? {
-        switch result {
-        case .none:
-            return nil
-        case .some(.success(let value)):
-            return value
-        case .some(.failure):
-            return nil
-        }
+    var error: Error? {
+        return result?.error
     }
 }