gardening

Author: swhitty

Sources/KeyValueDecoder.swift

@@ -29,8 +29,8 @@
 //  SOFTWARE.
 //
 
-import Foundation
 import CoreFoundation
+import Foundation
 
 /// Top level encoder that converts `[String: Any]`, `[Any]` or `Any` into `Codable` types.
 public final class KeyValueDecoder {

Sources/KeyValueEncoder.swift

@@ -100,7 +100,7 @@ extension KeyValueEncoder {
         }
     }
 
-    func encodeValue<T: Encodable>(_ value: T) throws -> EncodedValue{
+    func encodeValue<T: Encodable>(_ value: T) throws -> EncodedValue {
         try Encoder(userInfo: userInfo, nilEncodingStrategy: nilEncodingStrategy).encodeToValue(value)
     }
 }
@@ -422,7 +422,11 @@ private extension KeyValueEncoder {
                 return
             }
 
-            let encoder = Encoder(codingPath: codingPath.appending(index: count), userInfo: userInfo, nilEncodingStrategy: nilEncodingStrategy)
+            let encoder = Encoder(
+                codingPath: codingPath.appending(index: count),
+                userInfo: userInfo,
+                nilEncodingStrategy: nilEncodingStrategy
+            )
             if let value = try encoder.encodeToValue(value).getValue(strategy: nilEncodingStrategy) {
                 appendValue(value)
             } else {

Tests/KeyValueDecoderTests.swift

@@ -78,7 +78,7 @@ struct KeyValueDecoderTests {
             "name": "root",
             "desc": [["id": 2], ["id": 3]],
             "rel": ["left": ["id": 4, "desc": [["id": 5]] as Any],
-                    "right": ["id": 6]],
+                    "right": ["id": 6]]
         ]
 
         #expect(
@@ -828,7 +828,8 @@ struct KeyValueDecoderTests {
         #expect(NSNumber(value: UInt8.max).getInt64Value() == Int64(UInt8.max))
         #expect(NSNumber(value: UInt16.max).getInt64Value() == Int64(UInt16.max))
         #expect(NSNumber(value: UInt32.max).getInt64Value() == Int64(UInt32.max))
-        #expect(NSNumber(value: UInt64.max).getInt64Value() == -1) // NSNumber stores unsigned values with sign in the next largest size but 64bit is largest size.
+        // NSNumber stores unsigned values with sign in the next largest size but 64bit is largest size.
+        #expect(NSNumber(value: UInt64.max).getInt64Value() == -1)
         #expect(NSNumber(10.5).getInt64Value() == nil)
         #expect(NSNumber(true).getInt64Value() == nil)
     }
@@ -993,7 +994,11 @@ private extension KeyValueDecoder {
 
     }
 
-    static func decodeValue<K: CodingKey, T>(from value: [String: Any], keyedBy: K.Type = K.self, with closure: @escaping (inout KeyedDecodingContainer<K>) throws -> T) throws -> T {
+    static func decodeValue<K: CodingKey, T>(
+        from value: [String: Any],
+        keyedBy: K.Type = K.self,
+        with closure: @escaping (inout KeyedDecodingContainer<K>
+        ) throws -> T) throws -> T {
         let proxy = StubDecoder.Proxy { decoder in
             var container = try decoder.container(keyedBy: K.self)
             return try closure(&container)
@@ -1005,7 +1010,10 @@ private extension KeyValueDecoder {
         return proxy.result!
     }
 
-    static func decodeUnkeyedValue<T>(from value: [Any], with closure: @escaping (inout any UnkeyedDecodingContainer) throws -> T) throws -> T {
+    static func decodeUnkeyedValue<T>(
+        from value: [Any],
+        with closure: @escaping (inout any UnkeyedDecodingContainer) throws -> T
+    ) throws -> T {
         let proxy = StubDecoder.Proxy { decoder in
             var container = try decoder.unkeyedContainer()
             return try closure(&container)

Tests/KeyValueEncoderTests.swift

@@ -214,7 +214,7 @@ struct KeyValueEncodedTests {
                 "name": "root",
                 "desc": [["id": 2], ["id": 3]],
                 "rel": ["left": ["id": 4, "desc": [["id": 5]] as Any],
-                        "right": ["id": 6]],
+                        "right": ["id": 6]]
             ]
         )
     }
@@ -231,7 +231,7 @@ struct KeyValueEncodedTests {
                 "first": Optional<Any>.none as Any,
                 "second": "fish",
                 "third": Optional<Any>.none as Any,
-                "fourth": NSDictionary(),
+                "fourth": NSDictionary()
             ]
         )
     }
@@ -299,7 +299,7 @@ struct KeyValueEncodedTests {
                "tInt32": -40,
                "tInt64": Int64.max,
                "tArray": [["tInt": -1], ["tInt": -2]],
-               "tDictionary": ["rel": ["tInt": -3]],
+               "tDictionary": ["rel": ["tInt": -3]]
            ]
         )
     }
@@ -324,7 +324,7 @@ struct KeyValueEncodedTests {
                "tUInt32": 40,
                "tUInt64": UInt64.max,
                "tArray": [["tUInt": 50], ["tUInt": 60]],
-               "tDictionary": ["rel": ["tUInt": 70]],
+               "tDictionary": ["rel": ["tUInt": 70]]
            ]
         )
     }
@@ -622,7 +622,7 @@ struct KeyValueEncodedTests {
                 try $0.encode(Null(), forKey: "chips")
             }.getValue() as? NSDictionary == [
                 "fish": "$null",
-                "chips": "$null",
+                "chips": "$null"
             ]
         )
         #expect(
@@ -631,7 +631,7 @@ struct KeyValueEncodedTests {
                 try $0.encode(Null(), forKey: "chips")
             }.getValue() as? NSDictionary == [
                 "fish": NSNull(),
-                "chips": NSNull(),
+                "chips": NSNull()
             ]
         )
     }
@@ -688,7 +688,8 @@ private extension KeyValueEncoder {
 
     static func encodeKeyedValue<K: CodingKey>(keyedBy: K.Type = K.self,
                                                nilEncodingStrategy: NilEncodingStrategy = .default,
-                                               with closure: @escaping (inout KeyedEncodingContainer<K>) throws -> Void) throws -> EncodedValue {
+                                               with closure: @escaping (inout KeyedEncodingContainer<K>) throws -> Void) throws
+        -> EncodedValue {
         let encoder = KeyValueEncoder()
         encoder.nilEncodingStrategy = nilEncodingStrategy
         return try encoder.encodeValue {
@@ -741,7 +742,7 @@ struct Node: Codable, Equatable {
 
 extension KeyValueEncoder.EncodedValue: Swift.Equatable {
 
-    public static func ==(lhs: Self, rhs: Self) -> Bool {
+    public static func == (lhs: Self, rhs: Self) -> Bool {
         do {
             let lhsValue = try lhs.getValue()
             let rhsValue = try rhs.getValue()