Update loader

Author: vani2

ApexyLoaderExample/ApexyLoaderExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -12,14 +12,12 @@ protocol OrganizationLoading: ContentLoading {
     var state: LoadingState<Organization> { get }
 }
 
+@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 final class OrganizationLoader: WebLoader<Organization>, OrganizationLoading {
     func load() {
         guard startLoading() else { return }
-        request(OrganizationEndpoint()) { result in
-            // imitation of waiting for the request for 3 seconds
-            DispatchQueue.main.asyncAfter(deadline: .now() + 3.0) {
-                self.finishLoading(result)
-            }
+        Task {
+            await request(OrganizationEndpoint())
         }
     }
 }

ApexyLoaderExample/ApexyLoaderExample/Sources/Business Logic/Loaders/OrganizationLoader.swift

@@ -12,14 +12,12 @@ protocol RepoLoading: ContentLoading {
     var state: LoadingState<[Repository]> { get }
 }
 
+@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 final class RepositoriesLoader: WebLoader<[Repository]>, RepoLoading {
     func load() {
         guard startLoading() else { return }
-        request(RepositoriesEndpoint()) { result in
-            // imitation of waiting for the request for 5 seconds
-            DispatchQueue.main.asyncAfter(deadline: .now() + 5.0) {
-                self.finishLoading(result)
-            }
+        Task {
+            await request(RepositoriesEndpoint())
         }
     }
 }

ApexyLoaderExample/ApexyLoaderExample/Sources/Business Logic/Loaders/RepositoriesLoader.swift

@@ -22,10 +22,13 @@ protocol UserProfileLoading: ContentLoading {
     var state: LoadingState<UserProfile> { get }
 }
 
+@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 final class UserProfileLoader: WebLoader<UserProfile>, UserProfileLoading {
     func load() {
         guard startLoading() else { return }
-        request(UserProfileEndpoint())
+        Task {
+            await request(UserProfileEndpoint())
+        }
     }
 }
 ```

Documentation/loader.md

@@ -21,10 +21,13 @@ protocol UserProfileLoading: ContentLoading {
     var state: LoadingState<UserProfile> { get }
 }
 
+@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 final class UserProfileLoader: WebLoader<UserProfile>, UserProfileLoading {
     func load() {
         guard startLoading() else { return }
-        request(UserProfileEndpoint())
+        Task {
+            await request(UserProfileEndpoint())
+        }
     }
 }
 ```

Documentation/loader_ru.md

@@ -2,28 +2,27 @@ import Apexy
 import Foundation
 
 /// Loads content by network.
+@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 open class WebLoader<Content>: ContentLoader<Content> {
     private let apiClient: Client
-    public private(set) var progress: Progress?
 
     /// Creates an instance of `WebLoader` to load content by network using specified `Client`.
     /// - Parameter apiClient: An instance of the `Client` protocol. Use `AlamofireClient` or `URLSessionClient`.
     public init(apiClient: Client) {
         self.apiClient = apiClient
     }
 
-    deinit {
-        progress?.cancel()
-    }
-
     /// Sends requests to the network.
     ///
     /// - Warning: You must call `startLoading` before calling this method!
     /// - Parameter endpoint: An object representing request.
-    public func request<T>(_ endpoint: T) where T: Endpoint, T.Content == Content {
-        progress = apiClient.request(endpoint) { [weak self] result in
-            self?.progress = nil
-            self?.finishLoading(result)
+    @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
+    public func request<T>(_ endpoint: T) async where T: Endpoint, T.Content == Content {
+        do {
+            let content = try await apiClient.request(endpoint)
+            finishLoading(.success(content))
+        } catch {
+            finishLoading(.failure(error))
         }
     }
 
@@ -32,21 +31,28 @@ open class WebLoader<Content>: ContentLoader<Content> {
     /// - Parameters:
     ///   - endpoint: An object representing request.
     ///   - transform: A closure that transforms successfull result.
-    public func request<T>(_ endpoint: T, transform: @escaping (T.Content) -> Content) where T: Endpoint {
-        progress = apiClient.request(endpoint) { [weak self] result in
-            self?.progress = nil
-            self?.finishLoading(result.map(transform))
+    @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
+    public func request<T>(_ endpoint: T, transform: @escaping (T.Content) -> Content) async where T: Endpoint {
+        do {
+            let content = try await apiClient.request(endpoint)
+            finishLoading(.success(transform(content)))
+        } catch {
+            finishLoading(.failure(error))
         }
     }
 
     /// Sends requests to the network and calls completion handler.
     /// - Parameters:
     ///   - endpoint: An object representing request.
     ///   - completion: A completion handler.
-    public func request<T>(_ endpoint: T, completion: @escaping (Result<T.Content, Error>) -> Void) where T: Endpoint {
-        progress = apiClient.request(endpoint) { [weak self] result in
-            self?.progress = nil
-            completion(result)
+    @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
+    public func request<T>(_ endpoint: T, completion: @escaping (Result<T.Content, Error>) -> Void) async where T: Endpoint {
+        do {
+            let content = try await apiClient.request(endpoint)
+            completion(.success(content))
+        } catch {
+            completion(.failure(error))
         }
     }
+    
 }