Skip to content

Commit 6d8a81f

Browse files
phantumcodephantumcode
authored
chore(datastore): resolve swiftformat errors and warnings (#3848)
* chore(datastore): resolve swiftformat errors and warnings * updated swiftformat rules * fix build error * update rules * fix build error * fix brace alignment
1 parent fe989b5 commit 6d8a81f

File tree

810 files changed

+18402
-12562
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

810 files changed

+18402
-12562
lines changed

‎AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/AWSDataStorePlugin+DataStoreBaseBehavior.swift

Lines changed: 305 additions & 203 deletions
Large diffs are not rendered by default.

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

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,34 +21,38 @@ extension AWSDataStorePlugin: DataStoreSubscribeBehavior {
2121
return publisher.filter { $0.modelName == modelName }.eraseToAnyPublisher()
2222
}
2323

24-
public func observe<M: Model>(_ modelType: M.Type) -> AmplifyAsyncThrowingSequence<MutationEvent> {
24+
public func observe(_ modelType: (some Model).Type) -> AmplifyAsyncThrowingSequence<MutationEvent> {
2525
let runner = ObserveTaskRunner(publisher: publisher(for: modelType.modelName))
2626
return runner.sequence
2727
}
2828

29-
public func observeQuery<M: Model>(for modelType: M.Type,
30-
where predicate: QueryPredicate?,
31-
sort sortInput: QuerySortInput?) -> AmplifyAsyncThrowingSequence<DataStoreQuerySnapshot<M>> {
29+
public func observeQuery<M: Model>(
30+
for modelType: M.Type,
31+
where predicate: QueryPredicate?,
32+
sort sortInput: QuerySortInput?
33+
) -> AmplifyAsyncThrowingSequence<DataStoreQuerySnapshot<M>> {
3234
switch initStorageEngineAndTryStartSync() {
3335
case .success(let storageEngineBehavior):
3436
let modelSchema = modelType.schema
35-
guard let dataStorePublisher = dataStorePublisher else {
37+
guard let dataStorePublisher else {
3638
return Fatal.preconditionFailure("`dataStorePublisher` is expected to exist for deployment targets >=iOS13.0")
3739
}
3840
guard let dispatchedModelSyncedEvent = dispatchedModelSyncedEvents[modelSchema.name] else {
3941
return Fatal.preconditionFailure("`dispatchedModelSyncedEvent` is expected to exist for \(modelSchema.name)")
4042
}
4143
let request = ObserveQueryRequest(options: [])
42-
let taskRunner = ObserveQueryTaskRunner(request: request,
43-
modelType: modelType,
44-
modelSchema: modelType.schema,
45-
predicate: predicate,
46-
sortInput: sortInput?.asSortDescriptors(),
47-
storageEngine: storageEngineBehavior,
48-
dataStorePublisher: dataStorePublisher,
49-
dataStoreConfiguration: configuration.pluginConfiguration,
50-
dispatchedModelSyncedEvent: dispatchedModelSyncedEvent,
51-
dataStoreStatePublisher: dataStoreStateSubject.eraseToAnyPublisher())
44+
let taskRunner = ObserveQueryTaskRunner(
45+
request: request,
46+
modelType: modelType,
47+
modelSchema: modelType.schema,
48+
predicate: predicate,
49+
sortInput: sortInput?.asSortDescriptors(),
50+
storageEngine: storageEngineBehavior,
51+
dataStorePublisher: dataStorePublisher,
52+
dataStoreConfiguration: configuration.pluginConfiguration,
53+
dispatchedModelSyncedEvent: dispatchedModelSyncedEvent,
54+
dataStoreStatePublisher: dataStoreStateSubject.eraseToAnyPublisher()
55+
)
5256
return taskRunner.sequence
5357
case .failure(let error):
5458
return Fatal.preconditionFailure("Unable to get storage adapter \(error.localizedDescription)")

‎AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/AWSDataStorePlugin.swift

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//
77

88
import Amplify
9-
import Combine
109
import AWSPluginsCore
10+
import Combine
1111
import Foundation
1212

1313
enum DataStoreState {
@@ -16,7 +16,7 @@ enum DataStoreState {
1616
case clear
1717
}
1818

19-
final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
19+
public final class AWSDataStorePlugin: DataStoreCategoryPlugin {
2020

2121
public var key: PluginKey = "awsDataStorePlugin"
2222

@@ -60,14 +60,17 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
6060
/// - Parameters:
6161
/// - modelRegistration: Register DataStore models.
6262
/// - dataStoreConfiguration: Configuration object for DataStore
63-
public init(modelRegistration: AmplifyModelRegistration,
64-
configuration dataStoreConfiguration: DataStoreConfiguration) {
63+
public init(
64+
modelRegistration: AmplifyModelRegistration,
65+
configuration dataStoreConfiguration: DataStoreConfiguration
66+
) {
6567
self.modelRegistration = modelRegistration
6668
self.configuration = InternalDatastoreConfiguration(
6769
isSyncEnabled: false,
6870
validAPIPluginKey: "awsAPIPlugin",
6971
validAuthPluginKey: "awsCognitoAuthPlugin",
70-
pluginConfiguration: dataStoreConfiguration)
72+
pluginConfiguration: dataStoreConfiguration
73+
)
7174

7275
self.storageEngineBehaviorFactory =
7376
StorageEngine.init(
@@ -86,14 +89,17 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
8689
/// - Parameters:
8790
/// - modelRegistration: Register DataStore models.
8891
/// - dataStoreConfiguration: Configuration object for DataStore
89-
public init(modelRegistration: AmplifyModelRegistration,
90-
configuration dataStoreConfiguration: DataStoreConfiguration = .default) {
92+
public init(
93+
modelRegistration: AmplifyModelRegistration,
94+
configuration dataStoreConfiguration: DataStoreConfiguration = .default
95+
) {
9196
self.modelRegistration = modelRegistration
9297
self.configuration = InternalDatastoreConfiguration(
9398
isSyncEnabled: false,
9499
validAPIPluginKey: "awsAPIPlugin",
95100
validAuthPluginKey: "awsCognitoAuthPlugin",
96-
pluginConfiguration: dataStoreConfiguration)
101+
pluginConfiguration: dataStoreConfiguration
102+
)
97103

98104
self.storageEngineBehaviorFactory =
99105
StorageEngine.init(
@@ -110,19 +116,22 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
110116
#endif
111117

112118
/// Internal initializer for testing
113-
init(modelRegistration: AmplifyModelRegistration,
114-
configuration dataStoreConfiguration: DataStoreConfiguration = .testDefault(),
115-
storageEngineBehaviorFactory: StorageEngineBehaviorFactory? = nil,
116-
dataStorePublisher: ModelSubcriptionBehavior,
117-
operationQueue: OperationQueue = OperationQueue(),
118-
validAPIPluginKey: String,
119-
validAuthPluginKey: String) {
119+
init(
120+
modelRegistration: AmplifyModelRegistration,
121+
configuration dataStoreConfiguration: DataStoreConfiguration = .testDefault(),
122+
storageEngineBehaviorFactory: StorageEngineBehaviorFactory? = nil,
123+
dataStorePublisher: ModelSubcriptionBehavior,
124+
operationQueue: OperationQueue = OperationQueue(),
125+
validAPIPluginKey: String,
126+
validAuthPluginKey: String
127+
) {
120128
self.modelRegistration = modelRegistration
121129
self.configuration = InternalDatastoreConfiguration(
122130
isSyncEnabled: false,
123131
validAPIPluginKey: validAPIPluginKey,
124132
validAuthPluginKey: validAuthPluginKey,
125-
pluginConfiguration: dataStoreConfiguration)
133+
pluginConfiguration: dataStoreConfiguration
134+
)
126135

127136
self.storageEngineBehaviorFactory = storageEngineBehaviorFactory ??
128137
StorageEngine.init(
@@ -161,8 +170,8 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
161170
}
162171

163172
do {
164-
if self.dataStorePublisher == nil {
165-
self.dataStorePublisher = DataStorePublisher()
173+
if dataStorePublisher == nil {
174+
dataStorePublisher = DataStorePublisher()
166175
}
167176
try resolveStorageEngine(dataStoreConfiguration: configuration.pluginConfiguration)
168177
try storageEngine.setUp(modelSchemas: ModelRegistry.modelSchemas)
@@ -251,7 +260,7 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
251260
}
252261

253262
func onReceiveValue(receiveValue: StorageEngineEvent) {
254-
guard let dataStorePublisher = self.dataStorePublisher else {
263+
guard let dataStorePublisher else {
255264
log.error("Data store publisher not initalized")
256265
return
257266
}
@@ -264,8 +273,10 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
264273
case .modelSyncedEvent(let modelSyncedEvent):
265274
log.verbose("Emitting DataStore event: modelSyncedEvent \(modelSyncedEvent)")
266275
dispatchedModelSyncedEvents[modelSyncedEvent.modelName]?.set(true)
267-
let modelSyncedEventPayload = HubPayload(eventName: HubPayload.EventName.DataStore.modelSynced,
268-
data: modelSyncedEvent)
276+
let modelSyncedEventPayload = HubPayload(
277+
eventName: HubPayload.EventName.DataStore.modelSynced,
278+
data: modelSyncedEvent
279+
)
269280
Amplify.Hub.dispatch(to: .dataStore, payload: modelSyncedEventPayload)
270281
case .syncQueriesReadyEvent:
271282
log.verbose("[Lifecycle event 4]: syncQueriesReady")
@@ -284,7 +295,7 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
284295
if let resettable = storageEngine as? Resettable {
285296
log.verbose("Resetting storageEngine")
286297
await resettable.reset()
287-
self.log.verbose("Resetting storageEngine: finished")
298+
log.verbose("Resetting storageEngine: finished")
288299
}
289300
}
290301

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

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
// SPDX-License-Identifier: Apache-2.0
66
//
77

8-
import Foundation
98
import Amplify
109
import AWSPluginsCore
10+
import Foundation
1111

12-
extension DataStoreConfiguration {
12+
public extension DataStoreConfiguration {
1313

14-
public static let defaultSyncInterval: TimeInterval = .hours(24)
15-
public static let defaultSyncMaxRecords: UInt = 10_000
16-
public static let defaultSyncPageSize: UInt = 1_000
14+
static let defaultSyncInterval: TimeInterval = .hours(24)
15+
static let defaultSyncMaxRecords: UInt = 10_000
16+
static let defaultSyncPageSize: UInt = 1_000
1717

1818
#if os(watchOS)
1919
/// Creates a custom configuration. The only required property is `conflictHandler`.
@@ -27,7 +27,7 @@ extension DataStoreConfiguration {
2727
/// - authModeStrategy: authorization strategy (.default | multiauth)
2828
/// - disableSubscriptions: called before establishing subscriptions. Return true to disable subscriptions.
2929
/// - Returns: an instance of `DataStoreConfiguration` with the passed parameters.
30-
public static func custom(
30+
static func custom(
3131
errorHandler: @escaping DataStoreErrorHandler = { error in
3232
Amplify.Logging.error(error: error)
3333
},
@@ -41,14 +41,16 @@ extension DataStoreConfiguration {
4141
authModeStrategy: AuthModeStrategyType = .default,
4242
disableSubscriptions: @escaping () -> Bool
4343
) -> DataStoreConfiguration {
44-
return DataStoreConfiguration(errorHandler: errorHandler,
45-
conflictHandler: conflictHandler,
46-
syncInterval: syncInterval,
47-
syncMaxRecords: syncMaxRecords,
48-
syncPageSize: syncPageSize,
49-
syncExpressions: syncExpressions,
50-
authModeStrategy: authModeStrategy,
51-
disableSubscriptions: disableSubscriptions)
44+
return DataStoreConfiguration(
45+
errorHandler: errorHandler,
46+
conflictHandler: conflictHandler,
47+
syncInterval: syncInterval,
48+
syncMaxRecords: syncMaxRecords,
49+
syncPageSize: syncPageSize,
50+
syncExpressions: syncExpressions,
51+
authModeStrategy: authModeStrategy,
52+
disableSubscriptions: disableSubscriptions
53+
)
5254
}
5355
#else
5456
/// Creates a custom configuration. The only required property is `conflictHandler`.
@@ -61,7 +63,7 @@ extension DataStoreConfiguration {
6163
/// - syncPageSize: the page size of each sync execution
6264
/// - authModeStrategy: authorization strategy (.default | multiauth)
6365
/// - Returns: an instance of `DataStoreConfiguration` with the passed parameters.
64-
public static func custom(
66+
static func custom(
6567
errorHandler: @escaping DataStoreErrorHandler = { error in
6668
Amplify.Logging.error(error: error)
6769
},
@@ -74,13 +76,15 @@ extension DataStoreConfiguration {
7476
syncExpressions: [DataStoreSyncExpression] = [],
7577
authModeStrategy: AuthModeStrategyType = .default
7678
) -> DataStoreConfiguration {
77-
return DataStoreConfiguration(errorHandler: errorHandler,
78-
conflictHandler: conflictHandler,
79-
syncInterval: syncInterval,
80-
syncMaxRecords: syncMaxRecords,
81-
syncPageSize: syncPageSize,
82-
syncExpressions: syncExpressions,
83-
authModeStrategy: authModeStrategy)
79+
return DataStoreConfiguration(
80+
errorHandler: errorHandler,
81+
conflictHandler: conflictHandler,
82+
syncInterval: syncInterval,
83+
syncMaxRecords: syncMaxRecords,
84+
syncPageSize: syncPageSize,
85+
syncExpressions: syncExpressions,
86+
authModeStrategy: authModeStrategy
87+
)
8488
}
8589
#endif
8690

@@ -89,12 +93,12 @@ extension DataStoreConfiguration {
8993
/// which work on the watchOS simulator but not on the device. Running DataStore on watchOS with subscriptions
9094
/// enabled is only possible during special circumstances such as actively streaming audio.
9195
/// See https://github.com/aws-amplify/amplify-swift/pull/3368 for more details.
92-
public static var subscriptionsDisabled: DataStoreConfiguration {
96+
static var subscriptionsDisabled: DataStoreConfiguration {
9397
.custom(disableSubscriptions: { true })
9498
}
9599
#else
96100
/// The default configuration.
97-
public static var `default`: DataStoreConfiguration {
101+
static var `default`: DataStoreConfiguration {
98102
.custom()
99103
}
100104
#endif

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

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//
77

88
import Amplify
9-
import Foundation
109
import AWSPluginsCore
10+
import Foundation
1111

1212
/// Error Handler function typealias
1313
public typealias DataStoreErrorHandler = (AmplifyError) -> Void
@@ -73,14 +73,16 @@ public struct DataStoreConfiguration {
7373
public let disableSubscriptions: () -> Bool
7474

7575
#if os(watchOS)
76-
init(errorHandler: @escaping DataStoreErrorHandler,
77-
conflictHandler: @escaping DataStoreConflictHandler,
78-
syncInterval: TimeInterval,
79-
syncMaxRecords: UInt,
80-
syncPageSize: UInt,
81-
syncExpressions: [DataStoreSyncExpression],
82-
authModeStrategy: AuthModeStrategyType = .default,
83-
disableSubscriptions: @escaping () -> Bool) {
76+
init(
77+
errorHandler: @escaping DataStoreErrorHandler,
78+
conflictHandler: @escaping DataStoreConflictHandler,
79+
syncInterval: TimeInterval,
80+
syncMaxRecords: UInt,
81+
syncPageSize: UInt,
82+
syncExpressions: [DataStoreSyncExpression],
83+
authModeStrategy: AuthModeStrategyType = .default,
84+
disableSubscriptions: @escaping () -> Bool
85+
) {
8486
self.errorHandler = errorHandler
8587
self.conflictHandler = conflictHandler
8688
self.syncInterval = syncInterval
@@ -91,13 +93,15 @@ public struct DataStoreConfiguration {
9193
self.disableSubscriptions = disableSubscriptions
9294
}
9395
#else
94-
init(errorHandler: @escaping DataStoreErrorHandler,
95-
conflictHandler: @escaping DataStoreConflictHandler,
96-
syncInterval: TimeInterval,
97-
syncMaxRecords: UInt,
98-
syncPageSize: UInt,
99-
syncExpressions: [DataStoreSyncExpression],
100-
authModeStrategy: AuthModeStrategyType = .default) {
96+
init(
97+
errorHandler: @escaping DataStoreErrorHandler,
98+
conflictHandler: @escaping DataStoreConflictHandler,
99+
syncInterval: TimeInterval,
100+
syncMaxRecords: UInt,
101+
syncPageSize: UInt,
102+
syncExpressions: [DataStoreSyncExpression],
103+
authModeStrategy: AuthModeStrategyType = .default
104+
) {
101105
self.errorHandler = errorHandler
102106
self.conflictHandler = conflictHandler
103107
self.syncInterval = syncInterval

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// SPDX-License-Identifier: Apache-2.0
66
//
77

8-
import Foundation
98
import Amplify
9+
import Foundation
1010

1111
struct InternalDatastoreConfiguration {
1212

@@ -32,7 +32,7 @@ struct InternalDatastoreConfiguration {
3232
let pluginConfiguration: DataStoreConfiguration
3333

3434
mutating func updateIsSyncEnabled(_ isEnabled: Bool) {
35-
self.isSyncEnabled = isEnabled
35+
isSyncEnabled = isEnabled
3636
}
3737

3838
mutating func updateIsEagerLoad(modelSchema: ModelSchema) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
// SPDX-License-Identifier: Apache-2.0
66
//
77

8-
import Foundation
98
import Amplify
109
import Combine
10+
import Foundation
1111

1212
public struct DataStoreListDecoder: ModelListDecoder {
1313

0 commit comments

Comments
 (0)