Update swiftformat

stevapple · stevapple · commit b20d95cbc6b5 · 2021-05-01T18:28:04.000+08:00
diff --git a/.swiftformat b/.swiftformat
@@ -9,5 +9,11 @@
 --patternlet inline
 --stripunusedargs unnamed-only
 --ifdef no-indent
+--extensionacl on-declarations
+--disable typeSugar
+--disable andOperator
+--disable wrapMultilineStatementBraces
+--disable enumNamespaces
+--disable redundantExtensionACL
 
 # rules
diff --git a/Examples/CloudFunctions/Sources/CurrencyExchange/main.swift b/Examples/CloudFunctions/Sources/CurrencyExchange/main.swift
@@ -161,18 +161,16 @@ struct ExchangeRatesCalculator {
         dateFormatter.dateFormat = "dd/MMM/yy"
         let interval: DateInterval?
         if let period = try document.nodes(forXPath: "/exchangeRateMonthList/@Period").first?.stringValue,
-            period.count == 26
-        {
+           period.count == 26 {
             // "01/Sep/2018 to 30/Sep/2018"
             let startString = period[period.startIndex ..< period.index(period.startIndex, offsetBy: 11)]
             let to = period[startString.endIndex ..< period.index(startString.endIndex, offsetBy: 4)]
             let endString = period[to.endIndex ..< period.index(to.endIndex, offsetBy: 11)]
             if let startDate = dateFormatter.date(from: String(startString)),
-                let startDay = calendar.dateInterval(of: .day, for: startDate),
-                to == " to ",
-                let endDate = dateFormatter.date(from: String(endString)),
-                let endDay = calendar.dateInterval(of: .day, for: endDate)
-            {
+               let startDay = calendar.dateInterval(of: .day, for: startDate),
+               to == " to ",
+               let endDate = dateFormatter.date(from: String(endString)),
+               let endDay = calendar.dateInterval(of: .day, for: endDate) {
                 interval = DateInterval(start: startDay.start, end: endDay.end)
             } else {
                 interval = nil
@@ -184,9 +182,8 @@ struct ExchangeRatesCalculator {
         let ratesByCurrencyCode: [String: Decimal?] = Dictionary(uniqueKeysWithValues: try currencyCodes.map {
             let xpathCurrency = $0.replacingOccurrences(of: "'", with: "&apos;")
             if let rateString = try document.nodes(forXPath: "/exchangeRateMonthList/exchangeRate/currencyCode[text()='\(xpathCurrency)']/../rateNew/text()").first?.stringValue,
-                // We must parse the decimal data using the UK locale, not the system one.
-                let rate = Decimal(string: rateString, locale: self.locale)
-            {
+               // We must parse the decimal data using the UK locale, not the system one.
+               let rate = Decimal(string: rateString, locale: self.locale) {
                 return ($0, rate)
             } else {
                 return ($0, nil)
diff --git a/Package.swift b/Package.swift
@@ -22,7 +22,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
         .package(url: "https://github.com/swift-server/swift-backtrace.git", from: "1.1.0"),
         .package(url: "https://github.com/stevapple/tencent-cloud-core.git", .upToNextMinor(from: "0.2.0")),
-        .package(name: "Gzip", url: "https://github.com/1024jp/GzipSwift.git", from: "5.1.0")
+        .package(name: "Gzip", url: "https://github.com/1024jp/GzipSwift.git", from: "5.1.0"),
     ],
     targets: [
         .target(name: "TencentSCFRuntime", dependencies: [
@@ -46,7 +46,7 @@ let package = Package(
             .product(name: "NIOFoundationCompat", package: "swift-nio"),
         ]),
         .target(name: "TencentSCFEvents", dependencies: [
-            .byName(name: "Gzip")
+            .byName(name: "Gzip"),
         ]),
         .testTarget(name: "TencentSCFEventsTests", dependencies: ["TencentSCFEvents"]),
         // testing helper
diff --git a/Sources/TencentSCFEvents/APIGateway/APIGateway.swift b/Sources/TencentSCFEvents/APIGateway/APIGateway.swift
@@ -53,7 +53,7 @@ public enum APIGateway {
     public typealias Response = APIResponse
 }
 
-internal extension APIGateway {
-    static let defaultJSONDecoder = JSONDecoder()
-    static let defaultJSONEncoder = JSONEncoder()
+extension APIGateway {
+    internal static let defaultJSONDecoder = JSONDecoder()
+    internal static let defaultJSONEncoder = JSONEncoder()
 }
diff --git a/Sources/TencentSCFEvents/APIResponse.swift b/Sources/TencentSCFEvents/APIResponse.swift
@@ -33,7 +33,7 @@ extension APIResponse {
         do {
             rawBody = try body()
         } catch let err {
-            self.headers = headers.merging(["Content-Type": "application/json"]) { (_, default) in `default` }
+            self.headers = headers.merging(["Content-Type": "application/json"]) { _, `default` in `default` }
             self.statusCode = .internalServerError
             self.isBase64Encoded = false
             if let err = err as? EncodingError {
@@ -45,7 +45,7 @@ extension APIResponse {
         }
 
         self.statusCode = statusCode
-        self.headers = headers.merging(["Content-Type": rawBody.defaultMIME]) { (custom, _) in custom }
+        self.headers = headers.merging(["Content-Type": rawBody.defaultMIME]) { custom, _ in custom }
 
         switch rawBody {
         case .data(let dataBody):
@@ -67,7 +67,7 @@ extension APIResponse {
         case null
 
         public static func codable<T: Encodable>(_ body: T) throws -> Self {
-            return .json(String(data: try APIGateway.defaultJSONEncoder.encode(body), encoding: .utf8) ?? "")
+            .json(String(data: try APIGateway.defaultJSONEncoder.encode(body), encoding: .utf8) ?? "")
         }
 
         var defaultMIME: String {
@@ -80,3 +80,4 @@ extension APIResponse {
         }
     }
 }
+
diff --git a/Sources/TencentSCFEvents/CLS/CLSLog.swift b/Sources/TencentSCFEvents/CLS/CLSLog.swift
@@ -12,9 +12,9 @@
 //
 //===------------------------------------------------------------------------------------===//
 
-import Gzip
 import struct Foundation.Data
 import struct Foundation.Date
+import Gzip
 
 // https://intl.cloud.tencent.com/document/product/583/38845
 
@@ -29,7 +29,7 @@ public enum CLS {
         public init(from decoder: Decoder) throws {
             let rawContainer = try decoder.singleValueContainer()
             let data = try rawContainer.decode(CLS.Raw.self).data.gunzipped()
-            
+
             let _self = try CLS.jsonDecoder.decode(CLS._Logs.self, from: data)
             self.topicId = _self.topicId
             self.topicName = _self.topicName
@@ -49,7 +49,7 @@ public enum CLS {
             case timestamp
             case content
         }
-        
+
         public init(from decoder: Decoder) throws {
             let container = try decoder.container(keyedBy: CodingKeys.self)
             let timestring = try container.decode(String.self, forKey: .timestamp)
diff --git a/Sources/TencentSCFEvents/CLS/CLSRaw.swift b/Sources/TencentSCFEvents/CLS/CLSRaw.swift
@@ -16,7 +16,7 @@ import struct Foundation.Data
 
 // https://intl.cloud.tencent.com/document/product/583/38845
 
-extension CLS{
+extension CLS {
     struct _Logs: Decodable {
         let topicId: String
         let topicName: String
@@ -35,6 +35,7 @@ extension CLS{
         enum WrappingCodingKeys: String, CodingKey {
             case logs = "clslogs"
         }
+
         enum CodingKeys: String, CodingKey {
             case data
         }
diff --git a/Sources/TencentSCFEvents/Utils/Base64.swift b/Sources/TencentSCFEvents/Utils/Base64.swift
@@ -49,8 +49,7 @@ extension Base64 {
 
     @inlinable
     static func decode<Buffer: Collection>(encoded: Buffer, options: DecodingOptions = [])
-        throws -> [UInt8] where Buffer.Element == UInt8
-    {
+        throws -> [UInt8] where Buffer.Element == UInt8 {
         let alphabet = options.contains(.base64UrlAlphabet)
             ? Base64.decodeBase64Url
             : Base64.decodeBase64
diff --git a/Sources/TencentSCFEvents/Utils/HTTP.swift b/Sources/TencentSCFEvents/Utils/HTTP.swift
@@ -170,7 +170,7 @@ extension HTTPResponseStatus: Codable {
 
 extension String {
     internal var isValidHTTPToken: Bool {
-        self.utf8.allSatisfy { (char) -> Bool in
+        self.utf8.allSatisfy { char -> Bool in
             switch char {
             case UInt8(ascii: "a") ... UInt8(ascii: "z"),
                  UInt8(ascii: "A") ... UInt8(ascii: "Z"),
diff --git a/Sources/TencentSCFEvents/Utils/String.swift b/Sources/TencentSCFEvents/Utils/String.swift
@@ -25,8 +25,8 @@
 //
 //===------------------------------------------------------------------------------------===//
 
-internal extension String {
-    func jsonEncoded() -> String {
+extension String {
+    internal func jsonEncoded() -> String {
         var bytes = [UInt8]()
         let stringBytes = self.utf8
         var startCopyIndex = stringBytes.startIndex
diff --git a/Sources/TencentSCFRuntime/SCF+Codable.swift b/Sources/TencentSCFRuntime/SCF+Codable.swift
@@ -91,31 +91,31 @@ internal struct CodableVoidClosureWrapper<In: Decodable>: SCFHandler {
 }
 
 /// Implementation of  a`ByteBuffer` to `In` decoding.
-public extension EventLoopSCFHandler where In: Decodable {
-    func decode(buffer: ByteBuffer) throws -> In {
+extension EventLoopSCFHandler where In: Decodable {
+    public func decode(buffer: ByteBuffer) throws -> In {
         try self.decoder.decode(In.self, from: buffer)
     }
 }
 
 /// Implementation of  `Out` to `ByteBuffer` encoding.
-public extension EventLoopSCFHandler where Out: Encodable {
-    func encode(allocator: ByteBufferAllocator, value: Out) throws -> ByteBuffer? {
+extension EventLoopSCFHandler where Out: Encodable {
+    public func encode(allocator: ByteBufferAllocator, value: Out) throws -> ByteBuffer? {
         try self.encoder.encode(value, using: allocator)
     }
 }
 
 /// Default `ByteBuffer` to `In` decoder using Foundation's JSONDecoder.
 /// Advanced users that want to inject their own codec can do it by overriding these functions.
-public extension EventLoopSCFHandler where In: Decodable {
-    var decoder: SCFCodableDecoder {
+extension EventLoopSCFHandler where In: Decodable {
+    public var decoder: SCFCodableDecoder {
         SCF.defaultJSONDecoder
     }
 }
 
 /// Default `Out` to `ByteBuffer` encoder using Foundation's JSONEncoder.
 /// Advanced users that want to inject their own codec can do it by overriding these functions.
-public extension EventLoopSCFHandler where Out: Encodable {
-    var encoder: SCFCodableEncoder {
+extension EventLoopSCFHandler where Out: Encodable {
+    public var encoder: SCFCodableEncoder {
         SCF.defaultJSONEncoder
     }
 }
@@ -128,9 +128,9 @@ public protocol SCFCodableEncoder {
     func encode<T: Encodable>(_ value: T, using allocator: ByteBufferAllocator) throws -> ByteBuffer
 }
 
-private extension SCF {
-    static let defaultJSONDecoder = JSONDecoder()
-    static let defaultJSONEncoder = JSONEncoder()
+extension SCF {
+    fileprivate static let defaultJSONDecoder = JSONDecoder()
+    fileprivate static let defaultJSONEncoder = JSONEncoder()
 }
 
 extension JSONDecoder: SCFCodableDecoder {}
diff --git a/Sources/TencentSCFRuntimeCore/SCF+String.swift b/Sources/TencentSCFRuntimeCore/SCF+String.swift
@@ -98,9 +98,9 @@ internal struct StringVoidClosureWrapper: SCFHandler {
     }
 }
 
-public extension EventLoopSCFHandler where In == String {
+extension EventLoopSCFHandler where In == String {
     /// Implementation of a `ByteBuffer` to `String` decoding.
-    func decode(buffer: ByteBuffer) throws -> String {
+    public func decode(buffer: ByteBuffer) throws -> String {
         var buffer = buffer
         guard let string = buffer.readString(length: buffer.readableBytes) else {
             fatalError("buffer.readString(length: buffer.readableBytes) failed")
@@ -109,9 +109,9 @@ public extension EventLoopSCFHandler where In == String {
     }
 }
 
-public extension EventLoopSCFHandler where Out == String {
+extension EventLoopSCFHandler where Out == String {
     /// Implementation of `String` to `ByteBuffer` encoding.
-    func encode(allocator: ByteBufferAllocator, value: String) throws -> ByteBuffer? {
+    public func encode(allocator: ByteBufferAllocator, value: String) throws -> ByteBuffer? {
         // FIXME: reusable buffer
         var buffer = allocator.buffer(capacity: value.utf8.count)
         buffer.writeString(value)
diff --git a/Sources/TencentSCFRuntimeCore/SCFContext.swift b/Sources/TencentSCFRuntimeCore/SCFContext.swift
@@ -109,8 +109,7 @@ extension SCF {
         /// The role credential from SCF environment.
         public var credential: TencentCloud.Credential? {
             if let secretId = SCF.Env["TENCENTCLOUD_SECRETID"],
-                let secretKey = SCF.Env["TENCENTCLOUD_SECRETKEY"]
-            {
+               let secretKey = SCF.Env["TENCENTCLOUD_SECRETKEY"] {
                 return TencentCloud.Credential(secretId: secretId,
                                                secretKey: secretKey,
                                                sessionToken: SCF.Env["TENCENTCLOUD_SESSIONTOKEN"])
diff --git a/Sources/TencentSCFRuntimeCore/SCFHandler.swift b/Sources/TencentSCFRuntimeCore/SCFHandler.swift
@@ -51,20 +51,20 @@ public protocol SCFHandler: EventLoopSCFHandler {
     func handle(context: SCF.Context, event: In, callback: @escaping (Result<Out, Error>) -> Void)
 }
 
-internal extension SCF {
-    static let defaultOffloadQueue = DispatchQueue(label: "SCFHandler.offload")
+extension SCF {
+    internal static let defaultOffloadQueue = DispatchQueue(label: "SCFHandler.offload")
 }
 
-public extension SCFHandler {
+extension SCFHandler {
     /// The queue on which `handle` is invoked on.
-    var offloadQueue: DispatchQueue {
+    public var offloadQueue: DispatchQueue {
         SCF.defaultOffloadQueue
     }
 
     /// `SCFHandler` is offloading the processing to a `DispatchQueue`.
     /// This is slower but safer, in case the implementation blocks the `EventLoop`.
     /// Performance sensitive cloud functions should be based on `EventLoopSCFHandler` which does not offload.
-    func handle(context: SCF.Context, event: In) -> EventLoopFuture<Out> {
+    public func handle(context: SCF.Context, event: In) -> EventLoopFuture<Out> {
         let promise = context.eventLoop.makePromise(of: Out.self)
         // FIXME: reusable DispatchQueue
         self.offloadQueue.async {
@@ -74,8 +74,8 @@ public extension SCFHandler {
     }
 }
 
-public extension SCFHandler {
-    func shutdown(context: SCF.ShutdownContext) -> EventLoopFuture<Void> {
+extension SCFHandler {
+    public func shutdown(context: SCF.ShutdownContext) -> EventLoopFuture<Void> {
         let promise = context.eventLoop.makePromise(of: Void.self)
         self.offloadQueue.async {
             do {
@@ -90,7 +90,7 @@ public extension SCFHandler {
 
     /// Clean up the SCF resources synchronously.
     /// Concrete SCF handlers implement this method to shutdown resources like `HTTPClient`s and database connections.
-    func syncShutdown(context: SCF.ShutdownContext) throws {
+    public func syncShutdown(context: SCF.ShutdownContext) throws {
         // noop
     }
 }
@@ -138,9 +138,9 @@ public protocol EventLoopSCFHandler: ByteBufferSCFHandler {
     func decode(buffer: ByteBuffer) throws -> In
 }
 
-public extension EventLoopSCFHandler {
+extension EventLoopSCFHandler {
     /// Driver for `ByteBuffer` -> `In` decoding and `Out` -> `ByteBuffer` encoding
-    func handle(context: SCF.Context, event: ByteBuffer) -> EventLoopFuture<ByteBuffer?> {
+    public func handle(context: SCF.Context, event: ByteBuffer) -> EventLoopFuture<ByteBuffer?> {
         switch self.decodeIn(buffer: event) {
         case .failure(let error):
             return context.eventLoop.makeFailedFuture(CodecError.requestDecoding(error))
@@ -174,8 +174,8 @@ public extension EventLoopSCFHandler {
 }
 
 /// Implementation of  `ByteBuffer` to `Void` decoding.
-public extension EventLoopSCFHandler where Out == Void {
-    func encode(allocator: ByteBufferAllocator, value: Void) throws -> ByteBuffer? {
+extension EventLoopSCFHandler where Out == Void {
+    public func encode(allocator: ByteBufferAllocator, value: Void) throws -> ByteBuffer? {
         nil
     }
 }
@@ -206,8 +206,8 @@ public protocol ByteBufferSCFHandler {
     func shutdown(context: SCF.ShutdownContext) -> EventLoopFuture<Void>
 }
 
-public extension ByteBufferSCFHandler {
-    func shutdown(context: SCF.ShutdownContext) -> EventLoopFuture<Void> {
+extension ByteBufferSCFHandler {
+    public func shutdown(context: SCF.ShutdownContext) -> EventLoopFuture<Void> {
         context.eventLoop.makeSucceededFuture(())
     }
 }
diff --git a/Sources/TencentSCFRuntimeCore/SCFLifecycle.swift b/Sources/TencentSCFRuntimeCore/SCFLifecycle.swift
@@ -102,7 +102,7 @@ extension SCF {
                 self.run(promise: finishedPromise)
                 return finishedPromise.futureResult.mapResult { (handler, $0) }
             }
-            .flatMap { (handler, runnerResult) -> EventLoopFuture<Int> in
+            .flatMap { handler, runnerResult -> EventLoopFuture<Int> in
                 // After the SCF finishPromise has succeeded or failed we need to shutdown
                 // the handler.
                 let shutdownContext = ShutdownContext(logger: logger, eventLoop: self.eventLoop)
@@ -111,7 +111,7 @@ extension SCF {
                     // it with the runner result.
                     logger.error("Error shutting down handler: \(error)")
                     throw RuntimeError.shutdownError(shutdownError: error, runnerResult: runnerResult)
-                }.flatMapResult { (_) -> Result<Int, Error> in
+                }.flatMapResult { _ -> Result<Int, Error> in
                     // We had no error shutting down the cloud function, so let's return the
                     // runner's result.
                     runnerResult
diff --git a/Sources/TencentSCFRuntimeCore/SCFRunner.swift b/Sources/TencentSCFRuntimeCore/SCFRunner.swift
@@ -117,8 +117,8 @@ extension SCF {
     }
 }
 
-private extension SCF.Context {
-    convenience init(logger: Logger, eventLoop: EventLoop, allocator: ByteBufferAllocator, invocation: SCF.Invocation) {
+extension SCF.Context {
+    fileprivate convenience init(logger: Logger, eventLoop: EventLoop, allocator: ByteBufferAllocator, invocation: SCF.Invocation) {
         self.init(requestID: invocation.requestID,
                   memoryLimit: invocation.memoryLimit,
                   timeLimit: .milliseconds(Int(invocation.timeLimit)),
@@ -158,8 +158,8 @@ extension EventLoopFuture {
     }
 }
 
-private extension Result {
-    var successful: Bool {
+extension Result {
+    private var successful: Bool {
         switch self {
         case .success:
             return true
diff --git a/Sources/TencentSCFRuntimeCore/SCFRuntimeClient.swift b/Sources/TencentSCFRuntimeCore/SCFRuntimeClient.swift
diff --git a/Sources/TencentSCFRuntimeCore/Utils.swift b/Sources/TencentSCFRuntimeCore/Utils.swift
diff --git a/Sources/TencentSCFTesting/SCF+Testing.swift b/Sources/TencentSCFTesting/SCF+Testing.swift
diff --git a/Tests/TencentSCFEventsTests/APIGatewayTests.swift b/Tests/TencentSCFEventsTests/APIGatewayTests.swift
diff --git a/Tests/TencentSCFEventsTests/CLSLogTests.swift b/Tests/TencentSCFEventsTests/CLSLogTests.swift
diff --git a/Tests/TencentSCFRuntimeCoreTests/Utils.swift b/Tests/TencentSCFRuntimeCoreTests/Utils.swift

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public enum APIGateway {`
`53`	`53`	`public typealias Response = APIResponse`
`54`	`54`	`}`
`55`	`55`
`56`		`-internal extension APIGateway {`
`57`		`- static let defaultJSONDecoder = JSONDecoder()`
`58`		`- static let defaultJSONEncoder = JSONEncoder()`
	`56`	`+extension APIGateway {`
	`57`	`+ internal static let defaultJSONDecoder = JSONDecoder()`
	`58`	`+ internal static let defaultJSONEncoder = JSONEncoder()`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ extension APIResponse {`
`33`	`33`	`do {`
`34`	`34`	`rawBody = try body()`
`35`	`35`	`} catch let err {`
`36`		- self.headers = headers.merging(["Content-Type": "application/json"]) { (_, default) in `default` }
	`36`	+ self.headers = headers.merging(["Content-Type": "application/json"]) { _, `default` in `default` }
`37`	`37`	`self.statusCode = .internalServerError`
`38`	`38`	`self.isBase64Encoded = false`
`39`	`39`	`if let err = err as? EncodingError {`
`@@ -45,7 +45,7 @@ extension APIResponse {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`self.statusCode = statusCode`
`48`		`- self.headers = headers.merging(["Content-Type": rawBody.defaultMIME]) { (custom, _) in custom }`
	`48`	`+ self.headers = headers.merging(["Content-Type": rawBody.defaultMIME]) { custom, _ in custom }`
`49`	`49`
`50`	`50`	`switch rawBody {`
`51`	`51`	`case .data(let dataBody):`
`@@ -67,7 +67,7 @@ extension APIResponse {`
`67`	`67`	`case null`
`68`	`68`
`69`	`69`	`public static func codable<T: Encodable>(_ body: T) throws -> Self {`
`70`		`- return .json(String(data: try APIGateway.defaultJSONEncoder.encode(body), encoding: .utf8) ?? "")`
	`70`	`+ .json(String(data: try APIGateway.defaultJSONEncoder.encode(body), encoding: .utf8) ?? "")`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`var defaultMIME: String {`
`@@ -80,3 +80,4 @@ extension APIResponse {`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`}`
	`83`	`+`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import struct Foundation.Data`
`16`	`16`
`17`	`17`	`// https://intl.cloud.tencent.com/document/product/583/38845`
`18`	`18`
`19`		`-extension CLS{`
	`19`	`+extension CLS {`
`20`	`20`	`struct _Logs: Decodable {`
`21`	`21`	`let topicId: String`
`22`	`22`	`let topicName: String`
`@@ -35,6 +35,7 @@ extension CLS{`
`35`	`35`	`enum WrappingCodingKeys: String, CodingKey {`
`36`	`36`	`case logs = "clslogs"`
`37`	`37`	`}`
	`38`	`+`
`38`	`39`	`enum CodingKeys: String, CodingKey {`
`39`	`40`	`case data`
`40`	`41`	`}`