[Style] reorganize combine logic from SHFirestoreHelpers.swift to Com…

…bine+Helpers
SHcommit · May 8, 2024 · d1b6834 · d1b6834
1 parent ca1de5b
commit d1b6834
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/Sources/SHFirestoreService/Combine+FutureHelpers.swift b/Sources/SHFirestoreService/Combine+FutureHelpers.swift
@@ -10,6 +10,9 @@ import Foundation
 #if canImport(Combine) && os(iOS) && swift(>=5.0)
 import Combine
 
+@available(swift 5.0)
+@available(iOS 13.0, *)
+
 public extension Publisher
 where Output == Void, Failure == FirestoreServiceError {
   func sink(promise: @escaping Future<Output, Error>.Promise) -> AnyCancellable {

diff --git a/Sources/SHFirestoreService/Combine+Helpers.swift b/Sources/SHFirestoreService/Combine+Helpers.swift
@@ -10,11 +10,24 @@ import Foundation
 #if canImport(Combine) && os(iOS) && swift(>=5.0)
 import Combine
 
+@available(swift 5.0)
+@available(iOS 13.0, *)
+
 internal extension Publisher {
   func subscribeAndReceive(
     on queue: DispatchQueue
   ) -> Publishers.ReceiveOn<Publishers.SubscribeOn<Self, DispatchQueue>, DispatchQueue> {
     return self.subscribe(on: queue).receive(on: queue)
   }
 }
+
+internal extension Publisher where Failure == Error {
+  func convertFirestoreServiceError(
+  ) -> Publishers.MapError<Self, FirestoreServiceError> {
+    return self.mapError { error in
+      FirestoreServiceError.wrappedfirestoreError(error)
+    }
+  }
+}
+
 #endif
diff --git a/Sources/SHFirestoreService/SHFirestoreHelpers.swift b/Sources/SHFirestoreService/SHFirestoreHelpers.swift
@@ -5,22 +5,17 @@
 //  Created by 양승현 on 4/24/24.
 //
 
+#if os(iOS) && swift(>=5.0)
 import Foundation
-import Combine
 
-internal extension Publisher where Failure == Error {
-  func convertFirestoreServiceError(
-  ) -> Publishers.MapError<Self, FirestoreServiceError> {
-    return self.mapError { error in
-      FirestoreServiceError.wrappedfirestoreError(error)
-    }
-  }
-}
+@available(swift 5.0)
+@available(iOS 13.0, *)
 
 internal extension Encodable {
-  func toDictionary() throws -> [String: Any] {
+  typealias Dictionary = [String: Any]
+  func toDictionary() throws -> Dictionary {
     let data = try JSONEncoder().encode(self)
-    guard let dict = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+    guard let dict = try JSONSerialization.jsonObject(with: data) as? Dictionary else {
       throw Swift.EncodingError.invalidValue(
         self,
         Swift.EncodingError.Context.init(
@@ -30,3 +25,5 @@ internal extension Encodable {
     return dict
   }
 }
+
+#endif