mxcl · RomanPodymov · Sep 18, 2024 · Sep 18, 2024 · Sep 18, 2024 · Sep 18, 2024
diff --git a/Sources/Catchable.swift b/Sources/Catchable.swift
@@ -83,7 +83,7 @@ public extension CatchMixin {
                     on.async(flags: flags) {
                         do {
                             let rv = try body(error)
-                            guard rv !== rp else { throw PMKError.returnedSelf }
+                            guard rv !== rp else { throw PMKError<Void>.returnedSelf }
                             rv.pipe(to: rp.box.seal)
                         } catch {
                             rp.box.seal(.rejected(error))

diff --git a/Sources/Configuration.swift b/Sources/Configuration.swift
@@ -32,4 +32,8 @@ public struct PMKConfiguration {
 }
 
 /// Modify this as soon as possible in your application’s lifetime
+#if swift(>=6.0)
+nonisolated(unsafe) public var conf = PMKConfiguration()
+#else
 public var conf = PMKConfiguration()
+#endif
diff --git a/Sources/Error.swift b/Sources/Error.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-public enum PMKError: Error {
+public enum PMKError<T: Sendable>: Error {
     /**
      The completionHandler with form `(T?, Error?)` was called with `(nil, nil)`.
      This is invalid as per Cocoa/Apple calling conventions.
@@ -24,7 +24,7 @@ public enum PMKError: Error {
     case flatMap(Any, Any.Type)
 
     /// `nil` was returned from `compactMap`
-    case compactMap(Any, Any.Type)
+    case compactMap(T)
 
     /**
      The lastValue or firstValue of a sequence was requested but the sequence was empty.
@@ -42,8 +42,8 @@ extension PMKError: CustomDebugStringConvertible {
         switch self {
         case .flatMap(let obj, let type):
             return "Could not `flatMap<\(type)>`: \(obj)"
-        case .compactMap(let obj, let type):
-            return "Could not `compactMap<\(type)>`: \(obj)"
+        case .compactMap(let obj):
+            return "Could not `compactMap<>`: \(obj)"
         case .invalidCallingConvention:
             return "A closure was called with an invalid calling convention, probably (nil, nil)"
         case .returnedSelf:
@@ -79,7 +79,7 @@ extension Error {
     public var isCancelled: Bool {
         do {
             throw self
-        } catch PMKError.cancelled {
+        } catch PMKError<Void>.cancelled {
             return true
         } catch let error as CancellableError {
             return error.isCancelled

diff --git a/Sources/Resolver.swift b/Sources/Resolver.swift
@@ -36,7 +36,7 @@ public extension Resolver {
         } else if let obj = obj {
             fulfill(obj)
         } else {
-            reject(PMKError.invalidCallingConvention)
+            reject(PMKError<Void>.invalidCallingConvention)
         }
     }
 

diff --git a/Sources/Thenable.swift b/Sources/Thenable.swift
@@ -38,7 +38,7 @@ public extension Thenable {
                 on.async(flags: flags) {
                     do {
                         let rv = try body(value)
-                        guard rv !== rp else { throw PMKError.returnedSelf }
+                        guard rv !== rp else { throw PMKError<Void>.returnedSelf }
                         rv.pipe(to: rp.box.seal)
                     } catch {
                         rp.box.seal(.rejected(error))
@@ -136,7 +136,7 @@ public extension Thenable {
                         if let rv = try transform(value) {
                             rp.box.seal(.fulfilled(rv))
                         } else {
-                            throw PMKError.compactMap(value, U.self)
+                            throw PMKError.compactMap(value)
                         }
                     } catch {
                         rp.box.seal(.rejected(error))
@@ -167,7 +167,7 @@ public extension Thenable {
                         if let rv = value[keyPath: keyPath] {
                             rp.box.seal(.fulfilled(rv))
                         } else {
-                            throw PMKError.compactMap(value, U.self)
+                            throw PMKError.compactMap(value)
                         }
                     } catch {
                         rp.box.seal(.rejected(error))
@@ -498,7 +498,7 @@ public extension Thenable where T: Collection {
             if let a1 = aa.first {
                 return a1
             } else {
-                throw PMKError.emptySequence
+                throw PMKError<Void>.emptySequence
             }
         }
     }
@@ -508,15 +508,15 @@ public extension Thenable where T: Collection {
             for x in $0 where test(x) {
                 return x
             }
-            throw PMKError.emptySequence
+            throw PMKError<Void>.emptySequence
         }
     }
 
     /// - Returns: a promise fulfilled with the last value of this `Collection` or, if empty, a promise rejected with PMKError.emptySequence.
     var lastValue: Promise<T.Iterator.Element> {
         return map(on: nil) { aa in
             if aa.isEmpty {
-                throw PMKError.emptySequence
+                throw PMKError<Void>.emptySequence
             } else {
                 let i = aa.index(aa.endIndex, offsetBy: -1)
                 return aa[i]

diff --git a/Sources/race.swift b/Sources/race.swift
@@ -36,7 +36,7 @@ public func race<U: Thenable>(_ thenables: U...) -> Promise<U.T> {
 */
 public func race<U: Thenable>(_ thenables: [U]) -> Promise<U.T> {
     guard !thenables.isEmpty else {
-        return Promise(error: PMKError.badInput)
+        return Promise(error: PMKError<Void>.badInput)
     }
     return _race(thenables)
 }
@@ -72,7 +72,7 @@ public func race<T>(_ guarantees: Guarantee<T>...) -> Guarantee<T> {
 public func race<U: Thenable>(fulfilled thenables: [U]) -> Promise<U.T> {
     var countdown = thenables.count
     guard countdown > 0 else {
-        return Promise(error: PMKError.badInput)
+        return Promise(error: PMKError<Void>.badInput)
     }
 
     let rp = Promise<U.T>(.pending)
@@ -87,7 +87,7 @@ public func race<U: Thenable>(fulfilled thenables: [U]) -> Promise<U.T> {
                     guard rp.isPending else { return }
                     countdown -= 1
                     if countdown == 0 {
-                        rp.box.seal(.rejected(PMKError.noWinner))
+                        rp.box.seal(.rejected(PMKError<Void>.noWinner))
                     }
                 case .fulfilled(let value):
                     guard rp.isPending else { return }

diff --git a/Sources/when.swift b/Sources/when.swift
@@ -175,7 +175,7 @@ public func when<U: Thenable, V: Thenable, W: Thenable, X: Thenable, Y: Thenable
 public func when<It: IteratorProtocol>(fulfilled promiseIterator: It, concurrently: Int) -> Promise<[It.Element.T]> where It.Element: Thenable {
 
     guard concurrently > 0 else {
-        return Promise(error: PMKError.badInput)
+        return Promise(error: PMKError<Void>.badInput)
     }
 
     var generator = promiseIterator

diff --git a/Tests/A+/2.3.1.swift b/Tests/A+/2.3.1.swift
@@ -10,8 +10,11 @@ class Test231: XCTestCase {
                     return promise
                 }
                 promise.catch { err in
-                    if case PMKError.returnedSelf = err {
+                    switch err {
+                    case PMKError<Void>.returnedSelf:
                         expectation.fulfill()
+                    default:
+                        break
                     }
                 }
             }
@@ -21,8 +24,11 @@ class Test231: XCTestCase {
                     return promise
                 }
                 promise.catch { err in
-                    if case PMKError.returnedSelf = err {
+                    switch err {
+                    case PMKError<Void>.returnedSelf:
                         expectation.fulfill()
+                    default:
+                        break
                     }
                 }
             }

diff --git a/Tests/CoreObjC/AnyPromiseTests.swift b/Tests/CoreObjC/AnyPromiseTests.swift
@@ -12,7 +12,7 @@ class AnyPromiseTests: XCTestCase {
     }
 
     func testRejectedResult() {
-        switch AnyPromise(Promise<Int>(error: PMKError.badInput)).result {
+        switch AnyPromise(Promise<Int>(error: PMKError<Void>.badInput)).result {
         case .rejected(let err)?:
             print(err)
             break

diff --git a/Tests/CorePromise/CancellableErrorTests.swift b/Tests/CorePromise/CancellableErrorTests.swift
@@ -134,7 +134,7 @@ class CancellationTests: XCTestCase {
 
 #if swift(>=3.2)
     func testIsCancelled() {
-        XCTAssertTrue(PMKError.cancelled.isCancelled)
+        XCTAssertTrue(PMKError<Void>.cancelled.isCancelled)
         XCTAssertTrue(URLError.cancelled.isCancelled)
         XCTAssertTrue(CocoaError.cancelled.isCancelled)
         XCTAssertFalse(CocoaError(_nsError: NSError(domain: NSCocoaErrorDomain, code: CocoaError.Code.coderInvalidValue.rawValue)).isCancelled)

diff --git a/Tests/CorePromise/ErrorTests.swift b/Tests/CorePromise/ErrorTests.swift
@@ -3,20 +3,20 @@ import XCTest
 
 class PMKErrorTests: XCTestCase {
     func testCustomStringConvertible() {
-        XCTAssertNotNil(PMKError.invalidCallingConvention.errorDescription)
-        XCTAssertNotNil(PMKError.returnedSelf.errorDescription)
-        XCTAssertNotNil(PMKError.badInput.errorDescription)
-        XCTAssertNotNil(PMKError.cancelled.errorDescription)
-        XCTAssertNotNil(PMKError.compactMap(1, Int.self).errorDescription)
-        XCTAssertNotNil(PMKError.emptySequence.errorDescription)
+        XCTAssertNotNil(PMKError<Void>.invalidCallingConvention.errorDescription)
+        XCTAssertNotNil(PMKError<Void>.returnedSelf.errorDescription)
+        XCTAssertNotNil(PMKError<Void>.badInput.errorDescription)
+        XCTAssertNotNil(PMKError<Void>.cancelled.errorDescription)
+        XCTAssertNotNil(PMKError<Int>.compactMap(1).errorDescription)
+        XCTAssertNotNil(PMKError<Void>.emptySequence.errorDescription)
     }
 
     func testCustomDebugStringConvertible() {
-        XCTAssertFalse(PMKError.invalidCallingConvention.debugDescription.isEmpty)
-        XCTAssertFalse(PMKError.returnedSelf.debugDescription.isEmpty)
-        XCTAssertNotNil(PMKError.badInput.debugDescription.isEmpty)
-        XCTAssertFalse(PMKError.cancelled.debugDescription.isEmpty)
-        XCTAssertFalse(PMKError.compactMap(1, Int.self).debugDescription.isEmpty)
-        XCTAssertFalse(PMKError.emptySequence.debugDescription.isEmpty)
+        XCTAssertFalse(PMKError<Void>.invalidCallingConvention.debugDescription.isEmpty)
+        XCTAssertFalse(PMKError<Void>.returnedSelf.debugDescription.isEmpty)
+        XCTAssertNotNil(PMKError<Void>.badInput.debugDescription.isEmpty)
+        XCTAssertFalse(PMKError<Void>.cancelled.debugDescription.isEmpty)
+        XCTAssertFalse(PMKError<Int>.compactMap(1).debugDescription.isEmpty)
+        XCTAssertFalse(PMKError<Void>.emptySequence.debugDescription.isEmpty)
     }
 }
diff --git a/Tests/CorePromise/RaceTests.swift b/Tests/CorePromise/RaceTests.swift
@@ -43,7 +43,12 @@ class RaceTests: XCTestCase {
         let ex = expectation(description: "")
         let empty = [Promise<Int>]()
         race(empty).catch {
-            guard case PMKError.badInput = $0 else { return XCTFail() }
+            switch $0 {
+                case PMKError<Void>.badInput:
+                    break
+                default:
+                    XCTFail()
+            }
             ex.fulfill()
         }
         wait(for: [ex], timeout: 10)
@@ -67,7 +72,12 @@ class RaceTests: XCTestCase {
         let ex = expectation(description: "")
         let empty = [Promise<Int>]()
         race(fulfilled: empty).catch {
-            guard case PMKError.badInput = $0 else { return XCTFail() }
+            switch $0 {
+            case PMKError<Void>.badInput:
+                break
+            default:
+                return XCTFail()
+            }
             ex.fulfill()
         }
         wait(for: [ex], timeout: 10)
@@ -81,8 +91,13 @@ class RaceTests: XCTestCase {
             XCTFail()
             ex.fulfill()
         }.catch {
-            guard let pmkError = $0 as? PMKError else { return XCTFail() }
-            guard case .noWinner = pmkError else { return XCTFail() }
+            guard let pmkError = $0 as? PMKError<Void> else { return XCTFail() }
+            switch pmkError {
+            case .noWinner:
+                break
+            default:
+                return XCTFail()
+            }
             guard pmkError.debugDescription == "All thenables passed to race(fulfilled:) were rejected" else { return XCTFail() }
             ex.fulfill()
         }

diff --git a/Tests/CorePromise/RegressionTests.swift b/Tests/CorePromise/RegressionTests.swift
@@ -18,8 +18,11 @@ class RegressionTests: XCTestCase {
             let promise1 = Promise<Void>(error: Error.dummy)
             let promise2 = promise1.recover(on: nil) { _ in promise1 }
             promise2.catch(on: nil) { err in
-                if case PMKError.returnedSelf = err {
+                switch err {
+                case PMKError<Void>.returnedSelf:
                     XCTFail()
+                default:
+                    break
                 }
             }
         }

diff --git a/Tests/CorePromise/ResolverTests.swift b/Tests/CorePromise/ResolverTests.swift
@@ -85,7 +85,10 @@ class WrapTests: XCTestCase {
             kittenFetcher.fetchWithCompletionBlock(block: seal.resolve)
         }.catch { error in
             defer { ex.fulfill() }
-            guard case PMKError.invalidCallingConvention = error else {
+            switch error {
+            case PMKError<Void>.invalidCallingConvention:
+                break
+            default:
                 return XCTFail()
             }
         }

diff --git a/Tests/CorePromise/ThenableTests.swift b/Tests/CorePromise/ThenableTests.swift
@@ -100,8 +100,11 @@ class ThenableTests: XCTestCase {
         Promise.value("a").compactMap {
             Int($0)
         }.catch {
-            if case PMKError.compactMap = $0 {} else {
-                XCTFail()
+            switch $0 {
+            case PMKError<String>.compactMap:
+                break
+            default:
+                return XCTFail()
             }
             ex.fulfill()
         }
@@ -214,7 +217,7 @@ class ThenableTests: XCTestCase {
         // extensive use of `done` in A+ tests since PMK 5
 
         let ex = expectation(description: "")
-        Promise<Int>(error: PMKError.badInput).then { x -> Promise<Int> in
+        Promise<Int>(error: PMKError<Void>.badInput).then { x -> Promise<Int> in
             XCTFail()
             return .value(x)
         }.catch { _ in

diff --git a/Tests/CorePromise/WhenConcurrentTests.swift b/Tests/CorePromise/WhenConcurrentTests.swift
@@ -124,8 +124,12 @@ class WhenConcurrentTestCase_Swift: XCTestCase {
 
         guard let e1 = p1.error else { return XCTFail() }
         guard let e2 = p2.error else { return XCTFail() }
-        guard case PMKError.badInput = e1 else { return XCTFail() }
-        guard case PMKError.badInput = e2 else { return XCTFail() }
+        switch (e1, e2) {
+            case (PMKError<Void>.badInput, PMKError<Void>.badInput):
+                break
+            default:
+                return XCTFail()
+        }
     }
 
     func testStopsDequeueingOnceRejected() {

diff --git a/Tests/CorePromise/ZalgoTests.swift b/Tests/CorePromise/ZalgoTests.swift
@@ -40,7 +40,7 @@ class ZalgoTests: XCTestCase {
 
         p1.catch { err in
             defer{ ex.1.fulfill() }
-            guard case PMKError.returnedSelf = err else { return XCTFail() }
+            guard case PMKError<Void>.returnedSelf = err else { return XCTFail() }
         }
 
         waitForExpectations(timeout: 1)

diff --git a/Tests/DeprecationTests.swift b/Tests/DeprecationTests.swift
@@ -148,7 +148,7 @@ class DeprecationTests: XCTestCase {
     }
 
     func testPMKErrorFlatMap() {
-        XCTAssertNotNil(PMKError.flatMap(1, Int.self).errorDescription)
+        XCTAssertNotNil(PMKError<Int>.flatMap(1, Int.self).errorDescription)
     }
 }