Skip to content

Commit 6ded630

Browse files
Šimon Šestákclaude
Šimon Šesták
and
claude
committed
style: Fix SwiftLint violations across codebase
- Sort imports alphabetically in test files - Fix trailing comma, whitespace, and brace spacing issues - Add swiftlint disable comments for intentional patterns (nesting, force unwrapping, identifier names) - Fix modifier order (private static → static private) - Add default value for networkObservers parameter in array init Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 89e3771 commit 6ded630

10 files changed

Lines changed: 45 additions & 27 deletions

‎Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ let package = Package(
2727
.target(
2828
name: "GraphQLAPIKit",
2929
dependencies: [
30-
.product(name: "Apollo", package: "apollo-ios"),
30+
.product(name: "Apollo", package: "apollo-ios")
3131
]
3232
),
3333
.testTarget(

‎Sources/GraphQLAPIKit/Errors/GraphQLAPIAdapterError.swift‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ public enum GraphQLAPIAdapterError: LocalizedError {
1818
/// Errors returned by GraphQL API as part of `errors` field
1919
case graphQl([GraphQLError])
2020

21-
2221
init(error: Error) {
2322
if let error = error as? GraphQLAPIAdapterError {
2423
self = error
2524
} else if let error = error as? ApolloError {
2625
self = .graphQl(error.errors.map(GraphQLError.init))
2726
} else if let error = error as? URLSessionClient.URLSessionClientError,
28-
case let URLSessionClient.URLSessionClientError.networkError(_, response, underlyingError) = error
29-
{
27+
case let URLSessionClient.URLSessionClientError.networkError(_, response, underlyingError) = error {
3028
if let response = response {
3129
self = .network(code: response.statusCode, error: underlyingError)
3230
} else {

‎Sources/GraphQLAPIKit/Extensions/GraphQLAPIAdapter+Extensions.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import Apollo
22
import ApolloAPI
33
import Foundation
44

5+
// swiftlint:disable:next no_extension_access_modifier
56
public extension GraphQLAPIAdapterProtocol {
67
func fetch<Query: GraphQLQuery>(
78
query: Query,

‎Sources/GraphQLAPIKit/GraphQLAPIAdapter.swift‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ public protocol GraphQLAPIAdapterProtocol: AnyObject {
3838
public final class GraphQLAPIAdapter: GraphQLAPIAdapterProtocol {
3939
private let apollo: ApolloClientProtocol
4040

41+
// swiftlint:disable function_default_parameter_at_end
4142
public init<each Observer: GraphQLNetworkObserver>(
4243
url: URL,
4344
urlSessionConfiguration: URLSessionConfiguration = .default,
4445
defaultHeaders: [String: String] = [:],
4546
networkObservers: repeat each Observer
4647
) {
48+
// swiftlint:enable function_default_parameter_at_end
4749
var observers: [any GraphQLNetworkObserver] = []
4850
repeat observers.append(each networkObservers)
4951

@@ -68,7 +70,7 @@ public final class GraphQLAPIAdapter: GraphQLAPIAdapterProtocol {
6870
url: URL,
6971
urlSessionConfiguration: URLSessionConfiguration = .default,
7072
defaultHeaders: [String: String] = [:],
71-
networkObservers: [any GraphQLNetworkObserver]
73+
networkObservers: [any GraphQLNetworkObserver] = []
7274
) {
7375
let provider = NetworkInterceptorProvider(
7476
client: URLSessionClient(sessionConfiguration: urlSessionConfiguration),

‎Sources/GraphQLAPIKit/Interceptors/NetworkInterceptorProvider.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ struct NetworkInterceptorProvider: InterceptorProvider {
2121
func interceptors<Operation: GraphQLOperation>(for operation: Operation) -> [ApolloInterceptor] {
2222
// Headers first, then before-observers, then network fetch, then after-observers
2323
[
24-
RequestHeaderInterceptor(defaultHeaders: defaultHeaders),
24+
RequestHeaderInterceptor(defaultHeaders: defaultHeaders)
2525
]
2626
+ pairOfObserverInterceptors.map(\.before) // Before network - captures timing
2727
+ [
@@ -35,8 +35,8 @@ struct NetworkInterceptorProvider: InterceptorProvider {
3535
JSONResponseParsingInterceptor()
3636
]
3737
}
38-
39-
static private func makePair<T: GraphQLNetworkObserver>(of observer: T) -> (before: ApolloInterceptor, after: ApolloInterceptor) {
38+
39+
private static func makePair<T: GraphQLNetworkObserver>(of observer: T) -> (before: ApolloInterceptor, after: ApolloInterceptor) {
4040
let contextStore = ObserverContextStore<T.Context>()
4141
let beforeInterceptor = ObserverInterceptor(observer: observer, contextStore: contextStore)
4242
let afterInterceptor = ObserverInterceptor(observer: observer, contextStore: contextStore)

‎Tests/GraphQLAPIKitTests/GraphQLAPIAdapterErrorTests.swift‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import XCTest
21
import Apollo
32
@testable import GraphQLAPIKit
3+
import XCTest
44

55
final class GraphQLAPIAdapterErrorTests: XCTestCase {
66
func testGraphQLAPIAdapterErrorPassthrough() {
@@ -46,12 +46,14 @@ final class GraphQLAPIAdapterErrorTests: XCTestCase {
4646
code: 500,
4747
userInfo: [NSLocalizedDescriptionKey: "Server error"]
4848
)
49+
// swiftlint:disable force_unwrapping
4950
let response = HTTPURLResponse(
5051
url: URL(string: "https://example.com")!,
5152
statusCode: 500,
5253
httpVersion: nil,
5354
headerFields: nil
5455
)!
56+
// swiftlint:enable force_unwrapping
5557
let urlSessionError = URLSessionClient.URLSessionClientError.networkError(
5658
data: Data(),
5759
response: response,

‎Tests/GraphQLAPIKitTests/GraphQLAPIAdapterIntegrationTests.swift‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Apollo
22
import ApolloAPI
3-
import XCTest
43
@testable import GraphQLAPIKit
4+
import XCTest
55

66
// MARK: - MockURLProtocol
77

@@ -22,11 +22,11 @@ final class MockURLProtocol: URLProtocol {
2222
mockError = nil
2323
}
2424

25-
override class func canInit(with request: URLRequest) -> Bool {
25+
override static func canInit(with request: URLRequest) -> Bool {
2626
true
2727
}
2828

29-
override class func canonicalRequest(for request: URLRequest) -> URLRequest {
29+
override static func canonicalRequest(for request: URLRequest) -> URLRequest {
3030
request
3131
}
3232

@@ -44,12 +44,16 @@ final class MockURLProtocol: URLProtocol {
4444
statusCode: 200
4545
)
4646

47+
guard let url = request.url else {
48+
return
49+
}
50+
4751
let httpResponse = HTTPURLResponse(
48-
url: request.url!,
52+
url: url,
4953
statusCode: response.statusCode,
5054
httpVersion: "HTTP/1.1",
5155
headerFields: ["Content-Type": "application/json"]
52-
)!
56+
)! // swiftlint:disable:this force_unwrapping
5357

5458
client?.urlProtocol(self, didReceive: httpResponse, cacheStoragePolicy: .notAllowed)
5559
client?.urlProtocol(self, didLoad: response.data)
@@ -60,9 +64,9 @@ final class MockURLProtocol: URLProtocol {
6064

6165
/// A valid GraphQL response with minimal data
6266
private var validGraphQLResponse: Data {
63-
"""
67+
Data("""
6468
{"data": {"__typename": "Query"}}
65-
""".data(using: .utf8)!
69+
""".utf8)
6670
}
6771
}
6872

@@ -72,7 +76,9 @@ enum MockSchema: SchemaMetadata {
7276
static let configuration: any SchemaConfiguration.Type = MockSchemaConfiguration.self
7377

7478
static func objectType(forTypename typename: String) -> Object? {
75-
if typename == "Query" { return MockQuery.Data.self.__parentType as? Object }
79+
if typename == "Query" {
80+
return MockQuery.Data.self.__parentType as? Object
81+
}
7682
return nil
7783
}
7884
}
@@ -94,6 +100,7 @@ final class MockQuery: GraphQLQuery {
94100

95101
init() {}
96102

103+
// swiftlint:disable nesting identifier_name
97104
struct MockQueryData: RootSelectionSet {
98105
typealias Schema = MockSchema
99106

@@ -106,6 +113,7 @@ final class MockQuery: GraphQLQuery {
106113
self.__data = _dataDict
107114
}
108115
}
116+
// swiftlint:enable nesting identifier_name
109117
}
110118

111119
// MARK: - Mock Request Headers
@@ -172,6 +180,7 @@ final class GraphQLAPIAdapterIntegrationTests: XCTestCase {
172180
]
173181

174182
let adapter = GraphQLAPIAdapter(
183+
// swiftlint:disable:next force_unwrapping
175184
url: URL(string: "https://api.example.com/graphql")!,
176185
urlSessionConfiguration: mockSessionConfiguration(),
177186
defaultHeaders: defaultHeaders,
@@ -207,10 +216,10 @@ final class GraphQLAPIAdapterIntegrationTests: XCTestCase {
207216
])
208217

209218
let adapter = GraphQLAPIAdapter(
219+
// swiftlint:disable:next force_unwrapping
210220
url: URL(string: "https://api.example.com/graphql")!,
211221
urlSessionConfiguration: mockSessionConfiguration(),
212-
defaultHeaders: [:],
213-
networkObservers: observer
222+
networkObservers: [observer]
214223
)
215224

216225
_ = adapter.fetch(query: MockQuery(), context: contextHeaders, queue: .main) { _ in
@@ -246,6 +255,7 @@ final class GraphQLAPIAdapterIntegrationTests: XCTestCase {
246255
])
247256

248257
let adapter = GraphQLAPIAdapter(
258+
// swiftlint:disable:next force_unwrapping
249259
url: URL(string: "https://api.example.com/graphql")!,
250260
urlSessionConfiguration: mockSessionConfiguration(),
251261
defaultHeaders: defaultHeaders,
@@ -282,10 +292,13 @@ final class GraphQLAPIAdapterIntegrationTests: XCTestCase {
282292
let defaultHeaders = ["X-Shared-Header": "shared-value"]
283293

284294
let adapter = GraphQLAPIAdapter(
295+
// swiftlint:disable:next force_unwrapping
285296
url: URL(string: "https://api.example.com/graphql")!,
286297
urlSessionConfiguration: mockSessionConfiguration(),
287298
defaultHeaders: defaultHeaders,
288-
networkObservers: observer1, observer2, observer3
299+
networkObservers: observer1,
300+
observer2,
301+
observer3
289302
)
290303

291304
_ = adapter.fetch(query: MockQuery(), context: nil, queue: .main) { _ in
@@ -319,10 +332,10 @@ final class GraphQLAPIAdapterIntegrationTests: XCTestCase {
319332
let observer = IntegrationMockObserver()
320333

321334
let adapter = GraphQLAPIAdapter(
335+
// swiftlint:disable:next force_unwrapping
322336
url: URL(string: "https://api.example.com/graphql")!,
323337
urlSessionConfiguration: mockSessionConfiguration(),
324-
defaultHeaders: [:],
325-
networkObservers: observer
338+
networkObservers: [observer]
326339
)
327340

328341
_ = adapter.fetch(query: MockQuery(), context: nil, queue: .main) { _ in
@@ -340,5 +353,4 @@ final class GraphQLAPIAdapterIntegrationTests: XCTestCase {
340353
XCTAssertEqual(capturedRequest.value(forHTTPHeaderField: "X-APOLLO-OPERATION-NAME"), "MockQuery")
341354
XCTAssertNotNil(capturedRequest.value(forHTTPHeaderField: "Content-Type"))
342355
}
343-
344356
}

‎Tests/GraphQLAPIKitTests/GraphQLAPIAdapterTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import Apollo
22
import ApolloAPI
3-
import XCTest
43
@testable import GraphQLAPIKit
4+
import XCTest
55

66
final class GraphQLAPIAdapterTests: XCTestCase {
7+
// swiftlint:disable:next force_unwrapping
78
let testURL = URL(string: "https://api.example.com/graphql")!
89

910
// MARK: - Initialization Tests
@@ -37,5 +38,4 @@ final class GraphQLAPIAdapterTests: XCTestCase {
3738
)
3839
XCTAssertNotNil(adapter)
3940
}
40-
4141
}

‎Tests/GraphQLAPIKitTests/GraphQLErrorTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import XCTest
21
import Apollo
32
@testable import GraphQLAPIKit
3+
import XCTest
44

55
final class GraphQLErrorTests: XCTestCase {
66
func testGraphQLErrorWithMessageAndCode() {

‎Tests/GraphQLAPIKitTests/GraphQLNetworkObserverTests.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
import XCTest
21
@testable import GraphQLAPIKit
2+
import XCTest
33

44
final class GraphQLNetworkObserverTests: XCTestCase {
55

66
// MARK: - MockObserver
77

8+
// swiftlint:disable nesting
89
final class MockObserver: GraphQLNetworkObserver {
910
struct Context: Sendable {
11+
// swiftlint:enable nesting
1012
let requestId: String
1113
let startTime: Date
1214
}
@@ -60,6 +62,7 @@ final class GraphQLNetworkObserverTests: XCTestCase {
6062

6163
func testProtocolMethodSignatures() {
6264
let observer = MockObserver()
65+
// swiftlint:disable:next force_unwrapping
6366
let url = URL(string: "https://api.example.com/graphql")!
6467

6568
var request = URLRequest(url: url)

0 commit comments

Comments
 (0)