chore: resolve SwiftFormat errors and warnings at the categories module (#3843)

* resolve swiftformat errors and warnings

* resolve review comments

* move braces back to same-line

* fix argument spacing

Author: phantumcode

Amplify/Amplify.swift

@@ -33,37 +33,37 @@ public class Amplify {
     // ease of testing.
 
     /// - Tag: Amplify.Analytics
-    public static internal(set) var Analytics = AnalyticsCategory()
+    public internal(set) static var Analytics = AnalyticsCategory()
 
     /// - Tag: Amplify.API
-    public static internal(set) var API: APICategory = APICategory()
+    public internal(set) static var API = APICategory()
 
     /// - Tag: Amplify.Auth
-    public static internal(set) var Auth = AuthCategory()
+    public internal(set) static var Auth = AuthCategory()
 
     /// - Tag: Amplify.DataStore
-    public static internal(set) var DataStore = DataStoreCategory()
+    public internal(set) static var DataStore = DataStoreCategory()
 
     /// - Tag: Amplify.Geo
-    public static internal(set) var Geo = GeoCategory()
+    public internal(set) static var Geo = GeoCategory()
 
     /// - Tag: Amplify.Hub
-    public static internal(set) var Hub = HubCategory()
+    public internal(set) static var Hub = HubCategory()
 
     /// - Tag: Amplify.Notifications
-    public static internal(set) var Notifications = NotificationsCategory()
+    public internal(set) static var Notifications = NotificationsCategory()
 
     /// - Tag: Amplify.Predictions
-    public static internal(set) var Predictions = PredictionsCategory()
+    public internal(set) static var Predictions = PredictionsCategory()
 
     /// - Tag: Amplify.Storage
-    public static internal(set) var Storage = StorageCategory()
+    public internal(set) static var Storage = StorageCategory()
 
     /// Special case category. We protect this with an AtomicValue because it is used by reset()
     /// methods during setup & teardown of tests
     ///
     /// - Tag: Amplify.Logging
-    public static internal(set) var Logging: LoggingCategory {
+    public internal(set) static var Logging: LoggingCategory {
         get {
             loggingAtomic.get()
         }
@@ -73,13 +73,15 @@ public class Amplify {
     }
     private static let loggingAtomic = AtomicValue<LoggingCategory>(initialValue: LoggingCategory())
 
+    // swiftlint:disable cyclomatic_complexity
+
     /// Adds `plugin` to the category
     ///
     /// See: [Category.removePlugin(for:)](x-source-tag://Category.removePlugin)
     ///
     /// - Parameter plugin: The plugin to add
     /// - Tag: Amplify.add_plugin
-    public static func add<P: Plugin>(plugin: P) throws {
+    public static func add(plugin: some Plugin) throws {
         log.debug("Adding plugin: \(plugin))")
         switch plugin {
         case let plugin as AnalyticsCategoryPlugin:
@@ -105,8 +107,11 @@ public class Amplify {
         default:
             throw PluginError.pluginConfigurationError(
                 "Plugin category does not exist.",
-                "Verify that the library version is correct and supports the plugin's category.")
+                "Verify that the library version is correct and supports the plugin's category."
+            )
         }
+
+        // swiftlint:enable cyclomatic_complexity
     }
 }
 

Amplify/Categories/API/APICategory.swift

@@ -6,7 +6,7 @@
 //
 
 /// The API category provides a solution for making HTTP requests to REST and GraphQL endpoints.
-final public class APICategory: Category {
+public final class APICategory: Category {
     /// The category type for API
     public var categoryType: CategoryType {
         .api
@@ -57,8 +57,10 @@ final public class APICategory: Category {
         let key = plugin.key
         guard !key.isEmpty else {
             let pluginDescription = String(describing: plugin)
-            let error = APIError.invalidConfiguration("Plugin \(pluginDescription) has an empty `key`.",
-                "Set the `key` property for \(String(describing: plugin))")
+            let error = APIError.invalidConfiguration(
+                "Plugin \(pluginDescription) has an empty `key`.",
+                "Set the `key` property for \(String(describing: plugin))"
+            )
             throw error
         }
 
@@ -81,8 +83,10 @@ final public class APICategory: Category {
     public func getPlugin(for key: PluginKey) throws -> APICategoryPlugin {
         guard let plugin = plugins[key] else {
             let keys = plugins.keys.joined(separator: ", ")
-            let error = APIError.invalidConfiguration("No plugin has been added for '\(key)'.",
-                "Either add a plugin for '\(key)', or use one of the known keys: \(keys)")
+            let error = APIError.invalidConfiguration(
+                "No plugin has been added for '\(key)'.",
+                "Either add a plugin for '\(key)', or use one of the known keys: \(keys)"
+            )
             throw error
         }
         return plugin

Amplify/Categories/API/ClientBehavior/APICategory+ReachabilityBehavior.swift

@@ -6,8 +6,8 @@
 //
 
 #if canImport(Combine)
-import Foundation
 import Combine
+import Foundation
 
 extension APICategory: APICategoryReachabilityBehavior {
 #if !os(watchOS)

Amplify/Categories/API/ClientBehavior/APICategoryBehavior.swift

@@ -7,8 +7,8 @@
 
 /// Behavior of the API category that clients will use
 public typealias APICategoryBehavior =
-    APICategoryRESTBehavior &
+    APICategoryAuthProviderFactoryBehavior &
     APICategoryGraphQLBehavior &
     APICategoryInterceptorBehavior &
-    APICategoryReachabilityBehavior &
-    APICategoryAuthProviderFactoryBehavior
+    APICategoryRESTBehavior &
+    APICategoryReachabilityBehavior

Amplify/Categories/API/ClientBehavior/APICategoryGraphQLBehavior.swift

@@ -35,7 +35,7 @@ public protocol APICategoryGraphQLBehavior: AnyObject {
     ///   - request: The GraphQL request containing apiName, document, variables, and responseType
     ///   - valueListener: Invoked when the GraphQL subscription receives a new value from the service
     ///   - completionListener: Invoked when the subscription has terminated
-    /// - Returns: The AmplifyInProcessReportingOperation being enqueued    
+    /// - Returns: The AmplifyInProcessReportingOperation being enqueued
     func subscribe<R: Decodable>(
         request: GraphQLRequest<R>
     ) -> AmplifyAsyncThrowingSequence<GraphQLSubscriptionEvent<R>>

Amplify/Categories/API/ClientBehavior/APICategoryReachabilityBehavior.swift

@@ -6,8 +6,8 @@
 //
 
 #if canImport(Combine)
-import Foundation
 import Combine
+import Foundation
 
 /// API Reachability Behavior
 public protocol APICategoryReachabilityBehavior {

Amplify/Categories/API/Operation/AmplifyOperation+APIPublishers.swift

@@ -6,8 +6,8 @@
 //
 
 #if canImport(Combine)
-import Foundation
 import Combine
+import Foundation
 
 // MARK: - GraphQLSubscriptionOperation
 

Amplify/Categories/API/Operation/NondeterminsticOperation.swift

@@ -5,8 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-
 import Combine
+
 /**
  A non-deterministic operation offers multiple paths to accomplish its task.
  It attempts the next path if all preceding paths have failed with an error that allows for continuation.
@@ -62,7 +62,7 @@ final class NondeterminsticOperation<T> {
             self?.task = Task { [weak self] in
                 do {
                     if let self {
-                        promise(.success(try await self.run()))
+                        try await promise(.success(run()))
                     } else {
                         promise(.failure(NondeterminsticOperationError.cancelled))
                     }

Amplify/Categories/API/Operation/RetryableGraphQLOperation.swift

@@ -5,8 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-import Foundation
 import Combine
+import Foundation
 
 
 // MARK: - RetryableGraphQLOperation
@@ -16,7 +16,7 @@ public final class RetryableGraphQLOperation<Payload: Decodable> {
     private let nondeterminsticOperation: NondeterminsticOperation<GraphQLTask<Payload>.Success>
 
     public init(
-        requestStream: AsyncStream<() async throws -> GraphQLTask<Payload>.Success>
+        requestStream: AsyncStream < () async throws -> GraphQLTask<Payload>.Success>
     ) {
         self.nondeterminsticOperation = NondeterminsticOperation(
             operations: requestStream,
@@ -80,7 +80,7 @@ public final class RetryableGraphQLSubscriptionOperation<Payload: Decodable> {
     private let nondeterminsticOperation: NondeterminsticOperation<AmplifyAsyncThrowingSequence<SubscriptionEvents>>
 
     public init(
-        requestStream: AsyncStream<() async throws -> AmplifyAsyncThrowingSequence<SubscriptionEvents>>
+        requestStream: AsyncStream < () async throws -> AmplifyAsyncThrowingSequence < SubscriptionEvents>>
     ) {
         self.nondeterminsticOperation = NondeterminsticOperation(operations: requestStream)
     }
@@ -91,15 +91,15 @@ public final class RetryableGraphQLSubscriptionOperation<Payload: Decodable> {
 
     public func subscribe() -> AnyPublisher<SubscriptionEvents, APIError> {
         let subject = PassthroughSubject<SubscriptionEvents, APIError>()
-        self.task = Task { await self.trySubscribe(subject) }
+        task = Task { await self.trySubscribe(subject) }
         return subject.eraseToAnyPublisher()
     }
 
     private func trySubscribe(_ subject: PassthroughSubject<SubscriptionEvents, APIError>) async {
         var apiError: APIError?
         do {
             try Task.checkCancellation()
-            let sequence = try await self.nondeterminsticOperation.run()
+            let sequence = try await nondeterminsticOperation.run()
             defer { sequence.cancel() }
             for try await event in sequence {
                 try Task.checkCancellation()
@@ -122,13 +122,13 @@ public final class RetryableGraphQLSubscriptionOperation<Payload: Decodable> {
     }
 
     public func cancel() {
-        self.task?.cancel()
-        self.nondeterminsticOperation.cancel()
+        task?.cancel()
+        nondeterminsticOperation.cancel()
     }
 }
 
-extension AsyncSequence {
-    fileprivate var asyncStream: AsyncStream<Self.Element> {
+private extension AsyncSequence {
+    var asyncStream: AsyncStream<Self.Element> {
         AsyncStream { continuation in
             Task {
                 var it = self.makeAsyncIterator()
@@ -145,11 +145,11 @@ extension AsyncSequence {
     }
 }
 
-extension RetryableGraphQLSubscriptionOperation {
-    public static var log: Logger {
+public extension RetryableGraphQLSubscriptionOperation {
+    static var log: Logger {
         Amplify.Logging.logger(forCategory: CategoryType.api.displayName, forNamespace: String(describing: self))
     }
-    public var log: Logger {
+    var log: Logger {
         Self.log
     }
 }

Amplify/Categories/API/Request/GraphQLOperationRequest.swift

@@ -32,14 +32,16 @@ public struct GraphQLOperationRequest<R: Decodable>: AmplifyOperationRequest {
     public let options: Options
 
     /// Initializer for GraphQLOperationRequest
-    public init(apiName: String?,
-                operationType: GraphQLOperationType,
-                document: String,
-                variables: [String: Any]? = nil,
-                responseType: R.Type,
-                decodePath: String? = nil,
-                authMode: AuthorizationMode? = nil,
-                options: Options) {
+    public init(
+        apiName: String?,
+        operationType: GraphQLOperationType,
+        document: String,
+        variables: [String: Any]? = nil,
+        responseType: R.Type,
+        decodePath: String? = nil,
+        authMode: AuthorizationMode? = nil,
+        options: Options
+    ) {
         self.apiName = apiName
         self.operationType = operationType
         self.document = document