tech(swiftlint): Fix warnings (#20)

Author: pjechris

.github/workflows/doc.yml

@@ -6,7 +6,7 @@ on:
       - main
 
 jobs:
-  test:
+  doc:
     runs-on: macos-latest
 
     steps:

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Lint code
-      uses: swiftlint lint
+      run: swiftlint lint
 
     - name: Run tests
       run: swift test --enable-test-discovery

.swiftlint.yml

@@ -16,5 +16,7 @@ opt_in_rules:
   - empty_count
   - indentation_width
 
-line_length: 120
-warning_threshold: 0
+line_length:
+  warning: 120
+  ignores_comments: true
+warning_threshold: 1

Sources/SimpleHTTP/MultipartForm/MultipartFormData.swift

@@ -176,16 +176,25 @@ public struct MultipartFormData {
     private func mimeType(from url: URL) -> String {
         if #available(iOS 14.0, *), #available(macOS 11.0, *) {
             guard let type = UTType(filenameExtension: url.pathExtension), let mime = type.preferredMIMEType else {
-              return HTTPContentType.octetStream.value
+                return HTTPContentType.octetStream.value
             }
+
             return mime
-        } else {
-            if let id = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, url.pathExtension as CFString, nil)?.takeRetainedValue(),
-               let contentType = UTTypeCopyPreferredTagWithClass(id, kUTTagClassMIMEType)?.takeRetainedValue() {
-                return contentType as String
-            }
-            return HTTPContentType.octetStream.value
         }
+
+        let contentType = UTTypeCreatePreferredIdentifierForTag(
+            kUTTagClassFilenameExtension,
+            url.pathExtension as CFString,
+            nil
+        )
+            .flatMap { UTTypeCopyPreferredTagWithClass($0.takeRetainedValue(), kUTTagClassMIMEType) }
+            .map { $0.takeRetainedValue() }
+
+        if let contentType = contentType {
+            return contentType as String
+        }
+
+        return HTTPContentType.octetStream.value
     }
 
 }

Sources/SimpleHTTP/MultipartForm/MultipartFormDataEncoder.swift

@@ -20,17 +20,17 @@ struct MultipartFormDataEncoder {
         var encoded = Data()
 
         if var first = bodyParts.first {
-          first.hasInitialBoundary = true
-          bodyParts[0] = first
+            first.hasInitialBoundary = true
+            bodyParts[0] = first
         }
 
         if var last = bodyParts.last {
-          last.hasFinalBoundary = true
-          bodyParts[bodyParts.count - 1] = last
+            last.hasFinalBoundary = true
+            bodyParts[bodyParts.count - 1] = last
         }
 
         for bodyPart in bodyParts {
-          encoded.append(try encodeBodyPart(bodyPart))
+            encoded.append(try encodeBodyPart(bodyPart))
         }
 
         return encoded

Sources/SimpleHTTP/MultipartForm/URLRequest+Multipart.swift

@@ -6,10 +6,10 @@ import FoundationNetworking
 
 extension URLRequest {
     public mutating func multipartBody(_ body: MultipartFormData) throws {
-      var multipartEncode = MultipartFormDataEncoder(body: body)
+        var multipartEncode = MultipartFormDataEncoder(body: body)
 
-      httpBody = try multipartEncode.encode()
+        httpBody = try multipartEncode.encode()
 
-      setHeaders([.contentType: HTTPContentType.multipart(boundary: body.boundary).value])
+        setHeaders([.contentType: HTTPContentType.multipart(boundary: body.boundary).value])
     }
 }

Sources/SimpleHTTP/Request/Path.swift

@@ -37,7 +37,7 @@ public struct Path: Equatable, ExpressibleByStringLiteral, ExpressibleByStringIn
         self.init(value: stringInterpolation.description)
     }
 
-    public static func ==(lhs: Path, rhs: String) -> Bool {
+    public static func == (lhs: Path, rhs: String) -> Bool {
         lhs.value == rhs
     }
 }

Sources/SimpleHTTP/Request/Request+URLRequest.swift

@@ -9,7 +9,11 @@ extension Request {
     /// - Parameter encoder: the encoder to use to encode the body is present
     /// - Parameter relativeTo: the base URL to append to the request path
     /// - Parameter accepting: if not nil will be used to set "Accept" header value
-    public func toURLRequest(encoder: ContentDataEncoder, relativeTo baseURL: URL, accepting: ContentDataDecoder? = nil) throws -> URLRequest {
+    public func toURLRequest(
+        encoder: ContentDataEncoder,
+        relativeTo baseURL: URL,
+        accepting: ContentDataDecoder? = nil
+    ) throws -> URLRequest {
         let request = try toURLRequest(encoder: encoder)
             .relativeTo(baseURL)
 

Sources/SimpleHTTP/Response/URLSession+DataResponse.swift

@@ -8,6 +8,8 @@ extension URLSession {
     public func data(for urlRequest: URLRequest) async throws -> URLDataResponse {
         let (data, response) = try await data(for: urlRequest)
 
+        // swiftlint:disable force_cast
         return URLDataResponse(data: data, response: response as! HTTPURLResponse)
+        // swiftlint:enable force_cast
     }
 }

Sources/SimpleHTTP/Session/SessionConfiguration.swift

@@ -37,7 +37,7 @@ public struct SessionConfiguration {
         interceptors: CompositeInterceptor = [],
         dataError: DataError.Type
     ) {
-        self.init(encoder: encoder, decoder: decoder,  decodingQueue: decodingQueue, interceptors: interceptors)
+        self.init(encoder: encoder, decoder: decoder, decodingQueue: decodingQueue, interceptors: interceptors)
         self.errorConverter = {
             try decoder.decode(dataError, from: $0)
         }