Update swiftformat (#196)

changes: 
* Update swiftformat from 0.44 to 0.47
* Adjust rules

Author: fabianfett

.swiftformat

@@ -1,6 +1,6 @@
 # file options
 
---swiftversion 5.1
+--swiftversion 5.2
 --exclude .build
 
 # format options
@@ -9,5 +9,10 @@
 --patternlet inline
 --stripunusedargs unnamed-only
 --ifdef no-indent
+--extensionacl on-declarations
+--disable typeSugar
+--disable andOperator
+--disable wrapMultilineStatementBraces
+--disable enumNamespaces
 
 # rules

Sources/AWSLambdaEvents/AppSync.swift

@@ -146,8 +146,8 @@ public enum AppSync {
     }
 }
 
-public extension AppSync {
-    enum Response<ResultType: Encodable>: Encodable {
+extension AppSync {
+    public enum Response<ResultType: Encodable>: Encodable {
         public func encode(to encoder: Encoder) throws {
             var container = encoder.singleValueContainer()
             switch self {
@@ -165,5 +165,5 @@ public extension AppSync {
         case dictionary([String: ResultType])
     }
 
-    typealias JSONStringResponse = Response<String>
+    public typealias JSONStringResponse = Response<String>
 }

Sources/AWSLambdaEvents/Cloudwatch.swift

@@ -21,8 +21,8 @@ public protocol CloudwatchDetail: Decodable {
     static var name: String { get }
 }
 
-public extension CloudwatchDetail {
-    var detailType: String {
+extension CloudwatchDetail {
+    public var detailType: String {
         Self.name
     }
 }

Sources/AWSLambdaEvents/DynamoDB.swift

@@ -15,7 +15,7 @@
 import struct Foundation.Date
 
 // https://docs.aws.amazon.com/lambda/latest/dg/with-ddb.html
-public struct DynamoDB {
+public enum DynamoDB {
     public struct Event: Decodable {
         public let records: [EventRecord]
 
@@ -311,14 +311,12 @@ extension DynamoDB {
         public init() {}
 
         @inlinable public func decode<T: Decodable>(_ type: T.Type, from image: [String: AttributeValue])
-            throws -> T
-        {
+            throws -> T {
             try self.decode(type, from: .map(image))
         }
 
         @inlinable public func decode<T: Decodable>(_ type: T.Type, from value: AttributeValue)
-            throws -> T
-        {
+            throws -> T {
             let decoder = _DecoderImpl(userInfo: userInfo, from: value, codingPath: [])
             return try decoder.decode(T.self)
         }
@@ -511,7 +509,7 @@ extension DynamoDB {
 
         func nestedContainer<NestedKey>(keyedBy type: NestedKey.Type, forKey key: K) throws
             -> KeyedDecodingContainer<NestedKey> where NestedKey: CodingKey {
-            return try self.decoderForKey(key).container(keyedBy: type)
+            try self.decoderForKey(key).container(keyedBy: type)
         }
 
         func nestedUnkeyedContainer(forKey key: K) throws -> UnkeyedDecodingContainer {
@@ -557,8 +555,7 @@ extension DynamoDB {
         }
 
         @inline(__always) private func decodeFixedWidthInteger<T: FixedWidthInteger>(key: Self.Key)
-            throws -> T
-        {
+            throws -> T {
             let value = try getValue(forKey: key)
 
             guard case .number(let number) = value else {
@@ -577,8 +574,7 @@ extension DynamoDB {
         }
 
         @inline(__always) private func decodeLosslessStringConvertible<T: LosslessStringConvertible>(
-            key: Self.Key) throws -> T
-        {
+            key: Self.Key) throws -> T {
             let value = try getValue(forKey: key)
 
             guard case .number(let number) = value else {
@@ -677,7 +673,7 @@ extension DynamoDB {
         }
 
         func decode<T>(_: T.Type) throws -> T where T: Decodable {
-            return try T(from: self.impl)
+            try T(from: self.impl)
         }
 
         @inline(__always) private func createTypeMismatchError(type: Any.Type, value: AttributeValue) -> DecodingError {
@@ -688,8 +684,7 @@ extension DynamoDB {
         }
 
         @inline(__always) private func decodeFixedWidthInteger<T: FixedWidthInteger>() throws
-            -> T
-        {
+            -> T {
             guard case .number(let number) = self.value else {
                 throw self.createTypeMismatchError(type: T.self, value: self.value)
             }
@@ -705,8 +700,7 @@ extension DynamoDB {
         }
 
         @inline(__always) private func decodeLosslessStringConvertible<T: LosslessStringConvertible>()
-            throws -> T
-        {
+            throws -> T {
             guard case .number(let number) = self.value else {
                 throw self.createTypeMismatchError(type: T.self, value: self.value)
             }
@@ -850,7 +844,7 @@ extension DynamoDB {
 
         mutating func nestedContainer<NestedKey>(keyedBy type: NestedKey.Type) throws
             -> KeyedDecodingContainer<NestedKey> where NestedKey: CodingKey {
-            return try self.impl.container(keyedBy: type)
+            try self.impl.container(keyedBy: type)
         }
 
         mutating func nestedUnkeyedContainer() throws -> UnkeyedDecodingContainer {
@@ -869,8 +863,7 @@ extension DynamoDB {
         }
 
         @inline(__always) private mutating func decodeFixedWidthInteger<T: FixedWidthInteger>() throws
-            -> T
-        {
+            -> T {
             defer {
                 currentIndex += 1
                 if currentIndex == count {
@@ -891,8 +884,7 @@ extension DynamoDB {
         }
 
         @inline(__always) private mutating func decodeLosslessStringConvertible<T: LosslessStringConvertible>()
-            throws -> T
-        {
+            throws -> T {
             defer {
                 currentIndex += 1
                 if currentIndex == count {

Tests/AWSLambdaEventsTests/Utils/DateWrapperTests.swift

@@ -42,7 +42,7 @@ class DateWrapperTests: XCTestCase {
                 XCTFail("Unexpected error: \(error)"); return
             }
 
-            XCTAssertEqual(context.codingPath.compactMap { $0.stringValue }, ["date"])
+            XCTAssertEqual(context.codingPath.map(\.stringValue), ["date"])
             XCTAssertEqual(context.debugDescription, "Expected date to be in ISO8601 date format, but `\(date)` is not in the correct format")
             XCTAssertNil(context.underlyingError)
         }
@@ -74,7 +74,7 @@ class DateWrapperTests: XCTestCase {
                 XCTFail("Unexpected error: \(error)"); return
             }
 
-            XCTAssertEqual(context.codingPath.compactMap { $0.stringValue }, ["date"])
+            XCTAssertEqual(context.codingPath.map(\.stringValue), ["date"])
             XCTAssertEqual(context.debugDescription, "Expected date to be in ISO8601 date format with fractional seconds, but `\(date)` is not in the correct format")
             XCTAssertNil(context.underlyingError)
         }
@@ -132,7 +132,7 @@ class DateWrapperTests: XCTestCase {
                 XCTFail("Unexpected error: \(error)"); return
             }
 
-            XCTAssertEqual(context.codingPath.compactMap { $0.stringValue }, ["date"])
+            XCTAssertEqual(context.codingPath.map(\.stringValue), ["date"])
             XCTAssertEqual(context.debugDescription, "Expected date to be in RFC5322 date-time format with fractional seconds, but `\(date)` is not in the correct format")
             XCTAssertNil(context.underlyingError)
         }

docker/Dockerfile

@@ -15,7 +15,7 @@ RUN echo 'export PATH="$HOME/.tools:$PATH"' >> $HOME/.profile
 
 # swiftformat (until part of the toolchain)
 
-ARG swiftformat_version=0.44.6
+ARG swiftformat_version=0.47.3
 RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
 RUN cd $HOME/.tools/swift-format && swift build -c release
 RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat