Use Swift 6.0 ISO8601 format parser/style if available

hummingbird-project · Dec 24, 2024 · 61991a4 · 61991a4
1 parent 6f0130b
commit 61991a4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/Sources/Hummingbird/Codable/URLEncodedForm/URLEncodedForm.swift b/Sources/Hummingbird/Codable/URLEncodedForm/URLEncodedForm.swift
@@ -12,7 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 internal enum URLEncodedForm {
     /// CodingKey used by URLEncodedFormEncoder and URLEncodedFormDecoder
@@ -43,10 +47,12 @@ internal enum URLEncodedForm {
         fileprivate static let `super` = Key(stringValue: "super")!
     }
 
+    #if compiler(<6.0)
     /// ISO8601 data formatter used throughout URL encoded form code
     static var iso8601Formatter: ISO8601DateFormatter {
         let formatter = ISO8601DateFormatter()
         formatter.formatOptions = .withInternetDateTime
         return formatter
     }
+    #endif
 }
diff --git a/Sources/Hummingbird/Codable/URLEncodedForm/URLEncodedFormDecoder.swift b/Sources/Hummingbird/Codable/URLEncodedForm/URLEncodedFormDecoder.swift
@@ -621,15 +621,17 @@ extension _URLEncodedFormDecoder {
             let seconds = try unbox(node, as: Double.self)
             return Date(timeIntervalSince1970: seconds)
         case .iso8601:
-            if #available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
-                let dateString = try unbox(node, as: String.self)
-                guard let date = URLEncodedForm.iso8601Formatter.date(from: dateString) else {
-                    throw DecodingError.dataCorrupted(.init(codingPath: self.codingPath, debugDescription: "Invalid date format"))
-                }
-                return date
-            } else {
-                preconditionFailure("ISO8601DateFormatter is unavailable on this platform")
+            let dateString = try unbox(node, as: String.self)
+            #if compiler(>=6.0)
+            guard let date = try? Date(dateString, strategy: .iso8601) else {
+                throw DecodingError.dataCorrupted(.init(codingPath: self.codingPath, debugDescription: "Invalid date format"))
             }
+            #else
+            guard let date = URLEncodedForm.iso8601Formatter.date(from: dateString) else {
+                throw DecodingError.dataCorrupted(.init(codingPath: self.codingPath, debugDescription: "Invalid date format"))
+            }
+            #endif
+            return date
         case .formatted(let formatter):
             let dateString = try unbox(node, as: String.self)
             guard let date = formatter.date(from: dateString) else {

diff --git a/Sources/Hummingbird/Codable/URLEncodedForm/URLEncodedFormEncoder.swift b/Sources/Hummingbird/Codable/URLEncodedForm/URLEncodedFormEncoder.swift
@@ -330,11 +330,11 @@ extension _URLEncodedFormEncoder {
         case .secondsSince1970:
             try self.encode(Double(date.timeIntervalSince1970).description)
         case .iso8601:
-            if #available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
-                try encode(URLEncodedForm.iso8601Formatter.string(from: date))
-            } else {
-                preconditionFailure("ISO8601DateFormatter is unavailable on this platform")
-            }
+            #if compiler(>=6.0)
+            try self.encode(date.formatted(.iso8601))
+            #else
+            try self.encode(URLEncodedForm.iso8601Formatter.string(from: date))
+            #endif
         case .formatted(let formatter):
             try self.encode(formatter.string(from: date))
         case .custom(let closure):