Skip to content

Commit e75d0e1

Browse files
phantumcodephantumcode
authored
chore(api): resolve swiftformat errors and warnings (#3845)
* chore(api): resolve swiftformat errors and warnings * updated swiftformat rules * fix build error * update rules
1 parent 6d8a81f commit e75d0e1

File tree

417 files changed

+18895
-15482
lines changed

Some content is hidden

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

417 files changed

+18895
-15482
lines changed

‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AWSAPIPlugin+APIAuthProviderFactoryBehavior.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import Amplify
99
import Foundation
1010

11-
extension AWSAPIPlugin {
12-
public func apiAuthProviderFactory() -> APIAuthProviderFactory {
11+
public extension AWSAPIPlugin {
12+
func apiAuthProviderFactory() -> APIAuthProviderFactory {
1313
return authProviderFactory
1414
}
1515
}

‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AWSAPIPlugin+AuthInformation.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import Amplify
99
import AWSPluginsCore
1010
import Foundation
1111

12-
extension AWSAPIPlugin {
13-
public func defaultAuthType() throws -> AWSAuthorizationType {
12+
public extension AWSAPIPlugin {
13+
func defaultAuthType() throws -> AWSAuthorizationType {
1414
try defaultAuthType(for: nil)
1515
}
1616

17-
public func defaultAuthType(for apiName: String?) throws -> AWSAuthorizationType {
17+
func defaultAuthType(for apiName: String?) throws -> AWSAuthorizationType {
1818
try pluginConfig.endpoints.getConfig(for: apiName).authorizationType
1919
}
2020
}

‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AWSAPIPlugin+Configure.swift

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
//
77

88
@_spi(InternalAmplifyConfiguration) import Amplify
9+
import AwsCommonRuntimeKit
910
import AWSPluginsCore
1011
import InternalAmplifyCredentials
11-
import AwsCommonRuntimeKit
1212

1313
public extension AWSAPIPlugin {
1414

@@ -22,11 +22,15 @@ public extension AWSAPIPlugin {
2222
func configure(using configuration: Any?) throws {
2323
let dependencies: ConfigurationDependencies
2424
if let configuration = configuration as? AmplifyOutputsData {
25-
dependencies = try ConfigurationDependencies(configuration: configuration,
26-
apiAuthProviderFactory: authProviderFactory)
25+
dependencies = try ConfigurationDependencies(
26+
configuration: configuration,
27+
apiAuthProviderFactory: authProviderFactory
28+
)
2729
} else if let jsonValue = configuration as? JSONValue {
28-
dependencies = try ConfigurationDependencies(configurationValues: jsonValue,
29-
apiAuthProviderFactory: authProviderFactory)
30+
dependencies = try ConfigurationDependencies(
31+
configurationValues: jsonValue,
32+
apiAuthProviderFactory: authProviderFactory
33+
)
3034

3135
} else {
3236
throw PluginError.pluginConfigurationError(

‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AWSAPIPlugin+GraphQLBehavior.swift

Lines changed: 45 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,57 @@ import Amplify
99

1010
public extension AWSAPIPlugin {
1111

12-
func query<R: Decodable>(request: GraphQLRequest<R>,
13-
listener: GraphQLOperation<R>.ResultListener?) -> GraphQLOperation<R> {
14-
let operation = AWSGraphQLOperation(request: request.toOperationRequest(operationType: .query),
15-
session: session,
16-
mapper: mapper,
17-
pluginConfig: pluginConfig,
18-
resultListener: listener)
12+
func query<R: Decodable>(
13+
request: GraphQLRequest<R>,
14+
listener: GraphQLOperation<R>.ResultListener?
15+
) -> GraphQLOperation<R> {
16+
let operation = AWSGraphQLOperation(
17+
request: request.toOperationRequest(operationType: .query),
18+
session: session,
19+
mapper: mapper,
20+
pluginConfig: pluginConfig,
21+
resultListener: listener
22+
)
1923
queue.addOperation(operation)
2024
return operation
2125
}
2226

2327
func query<R: Decodable>(request: GraphQLRequest<R>) async throws -> GraphQLTask<R>.Success {
24-
let operation = AWSGraphQLOperation(request: request.toOperationRequest(operationType: .query),
25-
session: session,
26-
mapper: mapper,
27-
pluginConfig: pluginConfig,
28-
resultListener: nil)
28+
let operation = AWSGraphQLOperation(
29+
request: request.toOperationRequest(operationType: .query),
30+
session: session,
31+
mapper: mapper,
32+
pluginConfig: pluginConfig,
33+
resultListener: nil
34+
)
2935
let task = AmplifyOperationTaskAdapter(operation: operation)
3036
queue.addOperation(operation)
3137
return try await task.value
3238
}
3339

34-
func mutate<R: Decodable>(request: GraphQLRequest<R>,
35-
listener: GraphQLOperation<R>.ResultListener?) -> GraphQLOperation<R> {
36-
let operation = AWSGraphQLOperation(request: request.toOperationRequest(operationType: .mutation),
37-
session: session,
38-
mapper: mapper,
39-
pluginConfig: pluginConfig,
40-
resultListener: listener)
40+
func mutate<R: Decodable>(
41+
request: GraphQLRequest<R>,
42+
listener: GraphQLOperation<R>.ResultListener?
43+
) -> GraphQLOperation<R> {
44+
let operation = AWSGraphQLOperation(
45+
request: request.toOperationRequest(operationType: .mutation),
46+
session: session,
47+
mapper: mapper,
48+
pluginConfig: pluginConfig,
49+
resultListener: listener
50+
)
4151
queue.addOperation(operation)
4252
return operation
4353
}
4454

4555
func mutate<R: Decodable>(request: GraphQLRequest<R>) async throws -> GraphQLTask<R>.Success {
46-
let operation = AWSGraphQLOperation(request: request.toOperationRequest(operationType: .mutation),
47-
session: session,
48-
mapper: mapper,
49-
pluginConfig: pluginConfig,
50-
resultListener: nil)
56+
let operation = AWSGraphQLOperation(
57+
request: request.toOperationRequest(operationType: .mutation),
58+
session: session,
59+
mapper: mapper,
60+
pluginConfig: pluginConfig,
61+
resultListener: nil
62+
)
5163
let task = AmplifyOperationTaskAdapter(operation: operation)
5264
queue.addOperation(operation)
5365
return try await task.value
@@ -65,18 +77,21 @@ public extension AWSAPIPlugin {
6577
authService: authService,
6678
apiAuthProviderFactory: authProviderFactory,
6779
inProcessListener: valueListener,
68-
resultListener: completionListener)
80+
resultListener: completionListener
81+
)
6982
queue.addOperation(operation)
7083
return operation
7184
}
7285

7386
func subscribe<R>(request: GraphQLRequest<R>) -> AmplifyAsyncThrowingSequence<GraphQLSubscriptionEvent<R>> {
7487
let request = request.toOperationRequest(operationType: .subscription)
75-
let runner = AWSGraphQLSubscriptionTaskRunner(request: request,
76-
pluginConfig: pluginConfig,
77-
appSyncClientFactory: appSyncRealTimeClientFactory,
78-
authService: authService,
79-
apiAuthProviderFactory: authProviderFactory)
88+
let runner = AWSGraphQLSubscriptionTaskRunner(
89+
request: request,
90+
pluginConfig: pluginConfig,
91+
appSyncClientFactory: appSyncRealTimeClientFactory,
92+
authService: authService,
93+
apiAuthProviderFactory: authProviderFactory
94+
)
8095
return runner.sequence
8196
}
8297
}

‎AmplifyPlugins/API/Sources/AWSAPIPlugin/AWSAPIPlugin+InterceptorBehavior.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ import Amplify
1010
public extension AWSAPIPlugin {
1111
func add(interceptor: URLRequestInterceptor, for apiName: String) throws {
1212
guard pluginConfig.endpoints[apiName] != nil else {
13-
throw PluginError.pluginConfigurationError("Failed to get endpoint configuration for apiName: \(apiName)",
14-
"")
13+
throw PluginError.pluginConfigurationError(
14+
"Failed to get endpoint configuration for apiName: \(apiName)",
15+
""
16+
)
1517
}
1618

1719
pluginConfig.addInterceptor(interceptor, toEndpoint: apiName)

0 commit comments

Comments
 (0)