Merge branch 'main' into privacy-manifest

AckeeCZ · Apr 4, 2024 · 52a78c8 · 52a78c8
2 parents 3ea72af + 4c263f4
commit 52a78c8
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 ## Next
 
 - Add privacy manifest ([#148](https://github.com/AckeeCZ/ACKategories/pull/148), kudos to @olejnjak)
+- Add new helpers for Combine+Concurrency ([#147](https://github.com/AckeeCZ/ACKategories/pull/147), kudos to @olejnjak)
 
 ## 6.13.0
 - Merge [iOS template lib](https://github.com/AckeeCZ/iOS-MVVM-ProjectTemplate) ([#143](https://github.com/AckeeCZ/ACKategories/pull/143), kudos to @olejnjak)

diff --git a/Sources/ACKategories/Combine+Concurrency.swift b/Sources/ACKategories/Combine+Concurrency.swift
@@ -1,8 +1,10 @@
 import Combine
 
 @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public extension Future where Failure == Error {
-    convenience init(operation: @escaping () async throws -> Output) {
+public extension Future {
+    /// Run async operation as Publisher
+    /// - Parameter operation: Operation to be run
+    convenience init(operation: @escaping () async throws -> Output) where Failure == Error {
         self.init { promise in
             Task {
                 do {
@@ -13,11 +15,41 @@ public extension Future where Failure == Error {
             }
         }
     }
+
+    /// Run async operation as Publisher
+    /// - Parameter operation: Operation to be run
+    convenience init(operation: @escaping () async -> Result<Output, Failure>) {
+        self.init { promise in
+            Task { promise(await operation()) }
+        }
+    }
+
+    /// Run async operation as Publisher
+    /// - Parameter operation: Operation to be run
+    convenience init(operation: @escaping () async -> Output) where Failure == Never {
+        self.init { promise in
+            Task { promise(.success(await operation())) }
+        }
+    }
 }
 
 @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-public extension AnyPublisher where Failure == Error {
-    init(operation: @escaping () async throws -> Output) {
+public extension AnyPublisher {
+    /// Run async operation as Publisher
+    /// - Parameter operation: Operation to be run
+    init(operation: @escaping () async throws -> Output) where Failure == Error {
         self = Future { try await operation() }.eraseToAnyPublisher()
     }
+
+    /// Run async operation as Publisher
+    /// - Parameter operation: Operation to be run
+    init(operation: @escaping () async -> Result<Output, Failure>) {
+        self = Future { await operation() }.eraseToAnyPublisher()
+    }
+
+    /// Run async operation as Publisher
+    /// - Parameter operation: Operation to be run
+    init(operation: @escaping () async -> Output) where Failure == Never {
+        self = Future { await operation() }.eraseToAnyPublisher()
+    }
 }