[Feat] Enable to throw some errors when use FirestoreQueryHandler closure.

Author: SHcommit

Sources/SHFirestoreService/FirestoreQueryable.swift

@@ -11,7 +11,7 @@ import FirebaseFirestore
 
 #if os(iOS)
 public protocol FirestoreQueryable {
-  typealias FirestoreQueryHandler = (FirestoreReference) -> Query
+  typealias FirestoreQueryHandler = (FirestoreReference) throws -> Query
   typealias FirestoreQueryForPaginationHandler = (CollectionReference) -> Query
 
   var queryForPagination: Query? { get }

Sources/SHFirestoreService/FirestoreService.swift

@@ -252,17 +252,21 @@ extension FirestoreService: FirestoreQueryable {
     guard let collectionRef = endpoint.reference as? CollectionReference else {
       return Fail(error: FirestoreServiceError.collectionNotFound).eraseToAnyPublisher()
     }
-    let query = makeQuery(collectionRef)
-    return query.getDocuments()
-      .subscribe(on: backgroundQueue)
-      .receive(on: backgroundQueue)
-      .tryMap { querySnapshot in
-        try querySnapshot.documents.map { snapshot in
-          try snapshot.data(as: D.self)
+    do {
+      let query = try makeQuery(collectionRef)
+      return query.getDocuments()
+        .subscribe(on: backgroundQueue)
+        .receive(on: backgroundQueue)
+        .tryMap { querySnapshot in
+          try querySnapshot.documents.map { snapshot in
+            try snapshot.data(as: D.self)
+          }
         }
-      }
-      .convertFirestoreServiceError()
-      .eraseToAnyPublisher()
+        .convertFirestoreServiceError()
+        .eraseToAnyPublisher()
+    } catch {
+      return Fail(error: FirestoreServiceError.failedToMakeQuery(error)).eraseToAnyPublisher()
+    }
   }
 
   /// Notes:

Sources/SHFirestoreService/FirestoreServiceError.swift

@@ -18,6 +18,7 @@ import Foundation
   case encodingError(Error)
   case decodingError(Error)
   case failedTransaction(Error)
+  case failedToMakeQuery(Error)
 
   /// when paging
   case noMorePage
@@ -47,6 +48,8 @@ import Foundation
       return "Fail to retrieving collection: \(error?.localizedDescription ?? "Unknown error")"
     case .failedTransaction(let error):
       return "Fail transaction: \(error.localizedDescription)"
+    case .failedToMakeQuery(let error):
+      return "Fail to make query :\(error.localizedDescription)"
     }
   }
 }