fix url decoding failure for recent versions of Foundation

mattpolzin · Oct 3, 2024 · 570acbd · 570acbd
1 parent bbb38ef
commit 570acbd
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/Sources/OpenAPIKit/JSONReference.swift b/Sources/OpenAPIKit/JSONReference.swift
@@ -469,7 +469,19 @@ extension JSONReference: Decodable {
             }
             self = .internal(internalReference)
         } else {
-            guard let externalReference = URL(string: referenceString) else {
+            let externalReferenceCandidate: URL?
+            #if canImport(FoundationEssentials)
+            externalReferenceCandidate = URL(string: referenceString, encodingInvalidCharacters: false)
+            #elseif os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+            if #available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *) {
+                externalReferenceCandidate = URL(string: referenceString, encodingInvalidCharacters: false)
+            } else {
+                externalReferenceCandidate = URL(string: referenceString)
+            }
+            #else
+            externalReferenceCandidate = URL(string: referenceString)
+            #endif
+            guard let externalReference = externalReferenceCandidate else {
                 throw InconsistencyError(
                     subjectName: "JSON Reference",
                     details: "Failed to parse a valid URI for a JSON Reference from '\(referenceString)'",

diff --git a/Sources/OpenAPIKit30/JSONReference.swift b/Sources/OpenAPIKit30/JSONReference.swift
@@ -333,7 +333,19 @@ extension JSONReference: Decodable {
             }
             self = .internal(internalReference)
         } else {
-            guard let externalReference = URL(string: referenceString) else {
+            let externalReferenceCandidate: URL?
+#if canImport(FoundationEssentials)
+            externalReferenceCandidate = URL(string: referenceString, encodingInvalidCharacters: false)
+#elseif os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+            if #available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *) {
+                externalReferenceCandidate = URL(string: referenceString, encodingInvalidCharacters: false)
+            } else {
+                externalReferenceCandidate = URL(string: referenceString)
+            }
+#else
+            externalReferenceCandidate = URL(string: referenceString)
+#endif
+            guard let externalReference = externalReferenceCandidate else {
                 throw InconsistencyError(
                     subjectName: "JSON Reference",
                     details: "Failed to parse a valid URI for a JSON Reference from '\(referenceString)'",