chore(datastore): resolve swiftformat errors and warnings

AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/AWSDataStorePlugin+DataStoreSubscribeBehavior.swift

@@ -21,34 +21,38 @@ extension AWSDataStorePlugin: DataStoreSubscribeBehavior {
         return publisher.filter { $0.modelName == modelName }.eraseToAnyPublisher()
     }
 
-    public func observe<M: Model>(_ modelType: M.Type) -> AmplifyAsyncThrowingSequence<MutationEvent> {
+    public func observe(_ modelType: (some Model).Type) -> AmplifyAsyncThrowingSequence<MutationEvent> {
         let runner = ObserveTaskRunner(publisher: publisher(for: modelType.modelName))
         return runner.sequence
     }
 
-    public func observeQuery<M: Model>(for modelType: M.Type,
-                                       where predicate: QueryPredicate?,
-                                       sort sortInput: QuerySortInput?) -> AmplifyAsyncThrowingSequence<DataStoreQuerySnapshot<M>> {
+    public func observeQuery<M: Model>(
+        for modelType: M.Type,
+        where predicate: QueryPredicate?,
+        sort sortInput: QuerySortInput?
+    ) -> AmplifyAsyncThrowingSequence<DataStoreQuerySnapshot<M>> {
         switch initStorageEngineAndTryStartSync() {
         case .success(let storageEngineBehavior):
             let modelSchema = modelType.schema
-            guard let dataStorePublisher = dataStorePublisher else {
+            guard let dataStorePublisher else {
                 return Fatal.preconditionFailure("`dataStorePublisher` is expected to exist for deployment targets >=iOS13.0")
             }
             guard let dispatchedModelSyncedEvent = dispatchedModelSyncedEvents[modelSchema.name] else {
                 return Fatal.preconditionFailure("`dispatchedModelSyncedEvent` is expected to exist for \(modelSchema.name)")
             }
             let request = ObserveQueryRequest(options: [])
-            let taskRunner = ObserveQueryTaskRunner(request: request,
-                                                    modelType: modelType,
-                                                    modelSchema: modelType.schema,
-                                                    predicate: predicate,
-                                                    sortInput: sortInput?.asSortDescriptors(),
-                                                    storageEngine: storageEngineBehavior,
-                                                    dataStorePublisher: dataStorePublisher,
-                                                    dataStoreConfiguration: configuration.pluginConfiguration,
-                                                    dispatchedModelSyncedEvent: dispatchedModelSyncedEvent,
-                                                    dataStoreStatePublisher: dataStoreStateSubject.eraseToAnyPublisher())
+            let taskRunner = ObserveQueryTaskRunner(
+                request: request,
+                modelType: modelType,
+                modelSchema: modelType.schema,
+                predicate: predicate,
+                sortInput: sortInput?.asSortDescriptors(),
+                storageEngine: storageEngineBehavior,
+                dataStorePublisher: dataStorePublisher,
+                dataStoreConfiguration: configuration.pluginConfiguration,
+                dispatchedModelSyncedEvent: dispatchedModelSyncedEvent,
+                dataStoreStatePublisher: dataStoreStateSubject.eraseToAnyPublisher()
+            )
             return taskRunner.sequence
         case .failure(let error):
             return Fatal.preconditionFailure("Unable to get storage adapter \(error.localizedDescription)")

AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/AWSDataStorePlugin.swift

@@ -6,8 +6,8 @@
 //
 
 import Amplify
-import Combine
 import AWSPluginsCore
+import Combine
 import Foundation
 
 enum DataStoreState {
@@ -16,7 +16,7 @@ enum DataStoreState {
     case clear
 }
 
-final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
+public final class AWSDataStorePlugin: DataStoreCategoryPlugin {
 
     public var key: PluginKey = "awsDataStorePlugin"
 
@@ -60,14 +60,17 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
     /// - Parameters:
     ///   - modelRegistration: Register DataStore models.
     ///   - dataStoreConfiguration: Configuration object for DataStore
-    public init(modelRegistration: AmplifyModelRegistration,
-                configuration dataStoreConfiguration: DataStoreConfiguration) {
+    public init(
+        modelRegistration: AmplifyModelRegistration,
+        configuration dataStoreConfiguration: DataStoreConfiguration
+    ) {
         self.modelRegistration = modelRegistration
         self.configuration = InternalDatastoreConfiguration(
             isSyncEnabled: false,
             validAPIPluginKey: "awsAPIPlugin",
             validAuthPluginKey: "awsCognitoAuthPlugin",
-            pluginConfiguration: dataStoreConfiguration)
+            pluginConfiguration: dataStoreConfiguration
+        )
 
         self.storageEngineBehaviorFactory =
         StorageEngine.init(
@@ -86,14 +89,17 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
     /// - Parameters:
     ///   - modelRegistration: Register DataStore models.
     ///   - dataStoreConfiguration: Configuration object for DataStore
-    public init(modelRegistration: AmplifyModelRegistration,
-                configuration dataStoreConfiguration: DataStoreConfiguration = .default) {
+    public init(
+        modelRegistration: AmplifyModelRegistration,
+        configuration dataStoreConfiguration: DataStoreConfiguration = .default
+    ) {
         self.modelRegistration = modelRegistration
         self.configuration = InternalDatastoreConfiguration(
             isSyncEnabled: false,
             validAPIPluginKey: "awsAPIPlugin",
             validAuthPluginKey: "awsCognitoAuthPlugin",
-            pluginConfiguration: dataStoreConfiguration)
+            pluginConfiguration: dataStoreConfiguration
+        )
 
         self.storageEngineBehaviorFactory =
         StorageEngine.init(
@@ -110,19 +116,22 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
     #endif
 
     /// Internal initializer for testing
-    init(modelRegistration: AmplifyModelRegistration,
-         configuration dataStoreConfiguration: DataStoreConfiguration = .testDefault(),
-         storageEngineBehaviorFactory: StorageEngineBehaviorFactory? = nil,
-         dataStorePublisher: ModelSubcriptionBehavior,
-         operationQueue: OperationQueue = OperationQueue(),
-         validAPIPluginKey: String,
-         validAuthPluginKey: String) {
+    init(
+        modelRegistration: AmplifyModelRegistration,
+        configuration dataStoreConfiguration: DataStoreConfiguration = .testDefault(),
+        storageEngineBehaviorFactory: StorageEngineBehaviorFactory? = nil,
+        dataStorePublisher: ModelSubcriptionBehavior,
+        operationQueue: OperationQueue = OperationQueue(),
+        validAPIPluginKey: String,
+        validAuthPluginKey: String
+    ) {
         self.modelRegistration = modelRegistration
         self.configuration = InternalDatastoreConfiguration(
             isSyncEnabled: false,
             validAPIPluginKey: validAPIPluginKey,
             validAuthPluginKey: validAuthPluginKey,
-            pluginConfiguration: dataStoreConfiguration)
+            pluginConfiguration: dataStoreConfiguration
+        )
 
         self.storageEngineBehaviorFactory = storageEngineBehaviorFactory ??
         StorageEngine.init(
@@ -161,8 +170,8 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
         }
 
         do {
-            if self.dataStorePublisher == nil {
-                self.dataStorePublisher = DataStorePublisher()
+            if dataStorePublisher == nil {
+                dataStorePublisher = DataStorePublisher()
             }
             try resolveStorageEngine(dataStoreConfiguration: configuration.pluginConfiguration)
             try storageEngine.setUp(modelSchemas: ModelRegistry.modelSchemas)
@@ -251,7 +260,7 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
     }
 
     func onReceiveValue(receiveValue: StorageEngineEvent) {
-        guard let dataStorePublisher = self.dataStorePublisher else {
+        guard let dataStorePublisher else {
             log.error("Data store publisher not initalized")
             return
         }
@@ -264,8 +273,10 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
         case .modelSyncedEvent(let modelSyncedEvent):
             log.verbose("Emitting DataStore event: modelSyncedEvent \(modelSyncedEvent)")
             dispatchedModelSyncedEvents[modelSyncedEvent.modelName]?.set(true)
-            let modelSyncedEventPayload = HubPayload(eventName: HubPayload.EventName.DataStore.modelSynced,
-                                                     data: modelSyncedEvent)
+            let modelSyncedEventPayload = HubPayload(
+                eventName: HubPayload.EventName.DataStore.modelSynced,
+                data: modelSyncedEvent
+            )
             Amplify.Hub.dispatch(to: .dataStore, payload: modelSyncedEventPayload)
         case .syncQueriesReadyEvent:
             log.verbose("[Lifecycle event 4]: syncQueriesReady")
@@ -284,7 +295,7 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
         if let resettable = storageEngine as? Resettable {
             log.verbose("Resetting storageEngine")
             await resettable.reset()
-            self.log.verbose("Resetting storageEngine: finished")
+            log.verbose("Resetting storageEngine: finished")
         }
     }
 

AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Configuration/DataStoreConfiguration+Helper.swift

@@ -5,15 +5,15 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-import Foundation
 import Amplify
 import AWSPluginsCore
+import Foundation
 
-extension DataStoreConfiguration {
+public extension DataStoreConfiguration {
 
-    public static let defaultSyncInterval: TimeInterval = .hours(24)
-    public static let defaultSyncMaxRecords: UInt = 10_000
-    public static let defaultSyncPageSize: UInt = 1_000
+    static let defaultSyncInterval: TimeInterval = .hours(24)
+    static let defaultSyncMaxRecords: UInt = 10_000
+    static let defaultSyncPageSize: UInt = 1_000
 
     #if os(watchOS)
     /// Creates a custom configuration. The only required property is `conflictHandler`.
@@ -27,7 +27,7 @@ extension DataStoreConfiguration {
     ///   - authModeStrategy: authorization strategy (.default | multiauth)
     ///   - disableSubscriptions: called before establishing subscriptions. Return true to disable subscriptions.
     /// - Returns: an instance of `DataStoreConfiguration` with the passed parameters.
-    public static func custom(
+    static func custom(
         errorHandler: @escaping DataStoreErrorHandler = { error in
             Amplify.Logging.error(error: error)
         },
@@ -41,14 +41,16 @@ extension DataStoreConfiguration {
         authModeStrategy: AuthModeStrategyType = .default,
         disableSubscriptions: @escaping () -> Bool
     ) -> DataStoreConfiguration {
-        return DataStoreConfiguration(errorHandler: errorHandler,
-                                      conflictHandler: conflictHandler,
-                                      syncInterval: syncInterval,
-                                      syncMaxRecords: syncMaxRecords,
-                                      syncPageSize: syncPageSize,
-                                      syncExpressions: syncExpressions,
-                                      authModeStrategy: authModeStrategy,
-                                      disableSubscriptions: disableSubscriptions)
+        return DataStoreConfiguration(
+            errorHandler: errorHandler,
+            conflictHandler: conflictHandler,
+            syncInterval: syncInterval,
+            syncMaxRecords: syncMaxRecords,
+            syncPageSize: syncPageSize,
+            syncExpressions: syncExpressions,
+            authModeStrategy: authModeStrategy,
+            disableSubscriptions: disableSubscriptions
+        )
     }
     #else
     /// Creates a custom configuration. The only required property is `conflictHandler`.
@@ -61,7 +63,7 @@ extension DataStoreConfiguration {
     ///   - syncPageSize: the page size of each sync execution
     ///   - authModeStrategy: authorization strategy (.default | multiauth)
     /// - Returns: an instance of `DataStoreConfiguration` with the passed parameters.
-    public static func custom(
+    static func custom(
         errorHandler: @escaping DataStoreErrorHandler = { error in
             Amplify.Logging.error(error: error)
         },
@@ -74,13 +76,15 @@ extension DataStoreConfiguration {
         syncExpressions: [DataStoreSyncExpression] = [],
         authModeStrategy: AuthModeStrategyType = .default
     ) -> DataStoreConfiguration {
-        return DataStoreConfiguration(errorHandler: errorHandler,
-                                      conflictHandler: conflictHandler,
-                                      syncInterval: syncInterval,
-                                      syncMaxRecords: syncMaxRecords,
-                                      syncPageSize: syncPageSize,
-                                      syncExpressions: syncExpressions,
-                                      authModeStrategy: authModeStrategy)
+        return DataStoreConfiguration(
+            errorHandler: errorHandler,
+            conflictHandler: conflictHandler,
+            syncInterval: syncInterval,
+            syncMaxRecords: syncMaxRecords,
+            syncPageSize: syncPageSize,
+            syncExpressions: syncExpressions,
+            authModeStrategy: authModeStrategy
+        )
     }
     #endif
 
@@ -89,12 +93,12 @@ extension DataStoreConfiguration {
     /// which work on the watchOS simulator but not on the device. Running DataStore on watchOS with subscriptions
     /// enabled is only possible during special circumstances such as actively streaming audio.
     /// See https://github.com/aws-amplify/amplify-swift/pull/3368 for more details.
-    public static var subscriptionsDisabled: DataStoreConfiguration {
+    static var subscriptionsDisabled: DataStoreConfiguration {
         .custom(disableSubscriptions: { true })
     }
     #else
     /// The default configuration.
-    public static var `default`: DataStoreConfiguration {
+    static var `default`: DataStoreConfiguration {
         .custom()
     }
     #endif

AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Configuration/DataStoreConfiguration.swift

@@ -6,8 +6,8 @@
 //
 
 import Amplify
-import Foundation
 import AWSPluginsCore
+import Foundation
 
 /// Error Handler function typealias
 public typealias DataStoreErrorHandler = (AmplifyError) -> Void
@@ -73,14 +73,16 @@ public struct DataStoreConfiguration {
     public let disableSubscriptions: () -> Bool
 
     #if os(watchOS)
-    init(errorHandler: @escaping DataStoreErrorHandler,
-         conflictHandler: @escaping DataStoreConflictHandler,
-         syncInterval: TimeInterval,
-         syncMaxRecords: UInt,
-         syncPageSize: UInt,
-         syncExpressions: [DataStoreSyncExpression],
-         authModeStrategy: AuthModeStrategyType = .default,
-         disableSubscriptions: @escaping () -> Bool) {
+    init(
+        errorHandler: @escaping DataStoreErrorHandler,
+        conflictHandler: @escaping DataStoreConflictHandler,
+        syncInterval: TimeInterval,
+        syncMaxRecords: UInt,
+        syncPageSize: UInt,
+        syncExpressions: [DataStoreSyncExpression],
+        authModeStrategy: AuthModeStrategyType = .default,
+        disableSubscriptions: @escaping () -> Bool
+    ) {
         self.errorHandler = errorHandler
         self.conflictHandler = conflictHandler
         self.syncInterval = syncInterval
@@ -91,13 +93,15 @@ public struct DataStoreConfiguration {
         self.disableSubscriptions = disableSubscriptions
     }
     #else
-    init(errorHandler: @escaping DataStoreErrorHandler,
-         conflictHandler: @escaping DataStoreConflictHandler,
-         syncInterval: TimeInterval,
-         syncMaxRecords: UInt,
-         syncPageSize: UInt,
-         syncExpressions: [DataStoreSyncExpression],
-         authModeStrategy: AuthModeStrategyType = .default) {
+    init(
+        errorHandler: @escaping DataStoreErrorHandler,
+        conflictHandler: @escaping DataStoreConflictHandler,
+        syncInterval: TimeInterval,
+        syncMaxRecords: UInt,
+        syncPageSize: UInt,
+        syncExpressions: [DataStoreSyncExpression],
+        authModeStrategy: AuthModeStrategyType = .default
+    ) {
         self.errorHandler = errorHandler
         self.conflictHandler = conflictHandler
         self.syncInterval = syncInterval

AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Configuration/InternalDatastoreConfiguration.swift

@@ -5,8 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-import Foundation
 import Amplify
+import Foundation
 
 struct InternalDatastoreConfiguration {
 
@@ -32,7 +32,7 @@ struct InternalDatastoreConfiguration {
     let pluginConfiguration: DataStoreConfiguration
 
     mutating func updateIsSyncEnabled(_ isEnabled: Bool) {
-        self.isSyncEnabled = isEnabled
+        isSyncEnabled = isEnabled
     }
 
     mutating func updateIsEagerLoad(modelSchema: ModelSchema) {

AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Core/DataStoreListDecoder.swift

@@ -5,9 +5,9 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-import Foundation
 import Amplify
 import Combine
+import Foundation
 
 public struct DataStoreListDecoder: ModelListDecoder {