Date Encoding

swhitty · Jul 28, 2023 · 11d3a41 · 11d3a41
1 parent 08a6ad5
commit 11d3a41
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/Sources/KeyValueEncoder.swift b/Sources/KeyValueEncoder.swift
@@ -107,12 +107,12 @@ extension KeyValueEncoder {
 
 extension KeyValueEncoder.NilEncodingStrategy {
 
-    func isNull(_ value: Any?) -> Bool {
+    public func isNull(_ value: Any?) -> Bool {
         guard let value else { return true }
         return isNull(value)
     }
 
-    func isNull(_ value: Any) -> Bool {
+    public func isNull(_ value: Any) -> Bool {
         switch self {
         case .removed:
             return Self.isOptionalNone(value)
@@ -187,8 +187,11 @@ private extension KeyValueEncoder {
         }
 
         func encodeToValue<T>(_ value: T) throws -> EncodedValue where T: Encodable {
-            try value.encode(to: self)
-            return try getEncodedValue()
+            guard let encoded = EncodedValue(value) else {
+                try value.encode(to: self)
+                return try getEncodedValue()
+            }
+            return encoded
         }
     }
 }

diff --git a/Tests/KeyValueDecoderTests.swift b/Tests/KeyValueDecoderTests.swift
@@ -738,6 +738,11 @@ final class KeyValueDecoderTests: XCTestCase {
             try KeyValueDecoder.makePlistCompatible().decode([Int?].self, from: plistAny),
             [1, 2, Int?.none, 4]
         )
+
+        XCTAssertEqual(
+            try KeyValueDecoder.makePlistCompatible().decode(String?.self, from: "$null"),
+            nil
+        )
     }
 
     func testJSONCompatibleDecoder() throws {

diff --git a/Tests/KeyValueEncoderTests.swift b/Tests/KeyValueEncoderTests.swift
@@ -645,6 +645,14 @@ final class KeyValueEncodedTests: XCTestCase {
         )
     }
 
+    func testEncoder_Encodes_Dates() {
+        let date = Date.now
+        XCTAssertEqual(
+            try KeyValueEncoder().encode(date) as? Date,
+            date
+        )
+    }
+
     func testJSONCompatibleEncoder() throws {
         let keyValueAny = try KeyValueEncoder.makeJSONCompatible().encode([1, 2, Int?.none, 4])
         XCTAssertEqual(