Move to FoundationEssentials

vapor · Oct 4, 2024 · d6c451e · d6c451e
1 parent edaa7f5
commit d6c451e
Show file tree

Hide file tree

Showing 44 changed files with 246 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -179,7 +179,11 @@ A JSON Web Key (JWK) is a JavaScript Object Notation (JSON) data structure that
 You can add this JSON Web Key Set (JWKS) to your `JWTSigners`: 
 
 ```swift
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 import JWTKit
 
 let rsaModulus = "..."

diff --git a/Snippets/JWKExamples.swift b/Snippets/JWKExamples.swift
@@ -1,6 +1,11 @@
-import Foundation
 import JWTKit
 
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
+
 let rsaModulus = "..."
 
 let json = """

diff --git a/Snippets/JWTKitExamples.swift b/Snippets/JWTKitExamples.swift
@@ -1,7 +1,12 @@
-import Foundation
 // snippet.KEY_COLLECTION
 import JWTKit
 
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
+
 // Signs and verifies JWTs
 let keys = JWTKeyCollection()
 

diff --git a/Sources/JWTKit/Claims/ExpirationClaim.swift b/Sources/JWTKit/Claims/ExpirationClaim.swift
@@ -1,4 +1,8 @@
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 /// The "exp" (expiration time) claim identifies the expiration time on
 /// or after which the JWT MUST NOT be accepted for processing.  The

diff --git a/Sources/JWTKit/Claims/IssuedAtClaim.swift b/Sources/JWTKit/Claims/IssuedAtClaim.swift
@@ -1,4 +1,8 @@
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 /// The "iat" (issued at) claim identifies the time at which the JWT was
 /// issued.  This claim can be used to determine the age of the JWT.  Its

diff --git a/Sources/JWTKit/Claims/JWTMultiValueClaim.swift b/Sources/JWTKit/Claims/JWTMultiValueClaim.swift
@@ -1,4 +1,8 @@
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 public protocol JWTMultiValueClaim: JWTClaim where Value: Collection, Value.Element: Codable {
     init(value: Value.Element)

diff --git a/Sources/JWTKit/Claims/JWTUnixEpochClaim.swift b/Sources/JWTKit/Claims/JWTUnixEpochClaim.swift
@@ -1,4 +1,8 @@
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 public protocol JWTUnixEpochClaim: JWTClaim where Value == Date {}
 

diff --git a/Sources/JWTKit/Claims/LocaleClaim.swift b/Sources/JWTKit/Claims/LocaleClaim.swift
@@ -1,4 +1,8 @@
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 public struct LocaleClaim: JWTClaim, Equatable, ExpressibleByStringLiteral {
     /// See ``JWTClaim``.

diff --git a/Sources/JWTKit/Claims/NotBeforeClaim.swift b/Sources/JWTKit/Claims/NotBeforeClaim.swift
@@ -1,4 +1,8 @@
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 /// The "nbf" (not before) claim identifies the time before which the JWT
 /// MUST NOT be accepted for processing. The processing of the "nbf"

diff --git a/Sources/JWTKit/ECDSA/ECDSA.swift b/Sources/JWTKit/ECDSA/ECDSA.swift
@@ -1,7 +1,12 @@
 import Crypto
-import Foundation
 import X509
 
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
+
 public enum ECDSA: Sendable {}
 
 public protocol ECDSAKey: Sendable {

diff --git a/Sources/JWTKit/ECDSA/ECDSAKeyTypes.swift b/Sources/JWTKit/ECDSA/ECDSAKeyTypes.swift
@@ -1,7 +1,12 @@
 import Crypto
-import Foundation
 import X509
 
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
+
 /// A typealias representing the parameters of an ECDSA (Elliptic Curve Digital Signature Algorithm) key.
 ///
 /// This tuple consists of two strings representing the x and y coordinates on the elliptic curve.

diff --git a/Sources/JWTKit/ECDSA/ECDSASigner.swift b/Sources/JWTKit/ECDSA/ECDSASigner.swift
@@ -1,4 +1,8 @@
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 struct ECDSASigner<Key: ECDSAKey>: JWTAlgorithm, CryptoSigner {
     let privateKey: ECDSA.PrivateKey<Key.Curve>?

diff --git a/Sources/JWTKit/ECDSA/P256+CurveType.swift b/Sources/JWTKit/ECDSA/P256+CurveType.swift
@@ -1,5 +1,10 @@
 import Crypto
-import Foundation
+
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 // TODO: Remove @unchecked Sendable when Crypto is updated to use Sendable
 extension P256: ECDSACurveType {

diff --git a/Sources/JWTKit/ECDSA/P384+CurveType.swift b/Sources/JWTKit/ECDSA/P384+CurveType.swift
@@ -1,5 +1,10 @@
 import Crypto
-import Foundation
+
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 // TODO: Remove @unchecked Sendable when Crypto is updated to use Sendable
 extension P384: ECDSACurveType {

diff --git a/Sources/JWTKit/ECDSA/P521+CurveType.swift b/Sources/JWTKit/ECDSA/P521+CurveType.swift
@@ -1,5 +1,10 @@
 import Crypto
-import Foundation
+
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 // TODO: Remove @unchecked Sendable when Crypto is updated to use Sendable
 extension P521: ECDSACurveType {

diff --git a/Sources/JWTKit/EdDSA/EdDSA.swift b/Sources/JWTKit/EdDSA/EdDSA.swift
@@ -1,5 +1,10 @@
 import Crypto
-import Foundation
+
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 /// Namespace for the EdDSA (Edwards-curve Digital Signature Algorithm) signing algorithm.
 /// EdDSA is a modern signing algorithm that is efficient and fast.

diff --git a/Sources/JWTKit/EdDSA/EdDSASigner.swift b/Sources/JWTKit/EdDSA/EdDSASigner.swift
@@ -1,5 +1,10 @@
 import Crypto
-import Foundation
+
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 struct EdDSASigner: JWTAlgorithm, Sendable {
     let publicKey: EdDSA.PublicKey

diff --git a/Sources/JWTKit/EdDSA/JWTKeyCollection+EdDSA.swift b/Sources/JWTKit/EdDSA/JWTKeyCollection+EdDSA.swift
@@ -1,5 +1,10 @@
 import Crypto
-import Foundation
+
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 extension JWTKeyCollection {
     /// Adds an EdDSA key to the collection using an ``EdDSAKey``.

diff --git a/Sources/JWTKit/HMAC/HMAC.swift b/Sources/JWTKit/HMAC/HMAC.swift
@@ -1,5 +1,10 @@
 @preconcurrency import Crypto
-import Foundation
+
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 public struct HMACKey: Sendable {
     let key: SymmetricKey

diff --git a/Sources/JWTKit/HMAC/HMACSigner.swift b/Sources/JWTKit/HMAC/HMACSigner.swift
@@ -1,5 +1,10 @@
 @preconcurrency import Crypto
-import Foundation
+
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 struct HMACSigner<SHAType>: JWTAlgorithm where SHAType: HashFunction {
     let key: SymmetricKey

diff --git a/Sources/JWTKit/HMAC/JWTKeyCollection+HMAC.swift b/Sources/JWTKit/HMAC/JWTKeyCollection+HMAC.swift
@@ -1,5 +1,10 @@
 import Crypto
-import Foundation
+
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 extension JWTKeyCollection {
     /// Adds an HMAC key to the collection.

diff --git a/Sources/JWTKit/JWTAlgorithm.swift b/Sources/JWTKit/JWTAlgorithm.swift
@@ -1,4 +1,8 @@
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 /// A protocol defining the necessary functionality for a JWT (JSON Web Token) algorithm.
 /// All algorithms conform to ``JWTAlgorithm`` to provide custom signing and verification logic for JWT tokens.

diff --git a/Sources/JWTKit/JWTError.swift b/Sources/JWTKit/JWTError.swift
@@ -1,4 +1,8 @@
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 /// JWT error type.
 public struct JWTError: Error, Sendable, Equatable {

diff --git a/Sources/JWTKit/JWTHeaderField.swift b/Sources/JWTKit/JWTHeaderField.swift
@@ -1,4 +1,8 @@
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 public indirect enum JWTHeaderField: Hashable, Sendable, Codable {
     case null

diff --git a/Sources/JWTKit/JWTKeyCollection.swift b/Sources/JWTKit/JWTKeyCollection.swift
@@ -1,6 +1,11 @@
-import Foundation
 import Logging
 
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
+
 /// A collection of JWT and JWK signers for handling JSON Web Tokens (JWTs).
 ///
 /// This actor provides methods to manage multiple keys. It can be used to verify and decode JWTs, as well as to sign and encode JWTs.

diff --git a/Sources/JWTKit/JWTParser.swift b/Sources/JWTKit/JWTParser.swift
@@ -1,4 +1,8 @@
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 public protocol JWTParser: Sendable {
     var jsonDecoder: JWTJSONDecoder { get set }

diff --git a/Sources/JWTKit/JWTSerializer.swift b/Sources/JWTKit/JWTSerializer.swift
@@ -1,6 +1,11 @@
-import Foundation
 import X509
 
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
+
 public protocol JWTSerializer: Sendable {
     var jsonEncoder: any JWTJSONEncoder { get }
     func serialize(_ payload: some JWTPayload, header: JWTHeader) throws -> Data

diff --git a/Sources/JWTKit/JWTSigner.swift b/Sources/JWTKit/JWTSigner.swift
@@ -1,4 +1,8 @@
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 /// A JWT signer.
 final class JWTSigner: Sendable {

diff --git a/Sources/JWTKit/None/UnsecuredNoneSigner.swift b/Sources/JWTKit/None/UnsecuredNoneSigner.swift
@@ -1,4 +1,8 @@
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 struct UnsecuredNoneSigner: JWTAlgorithm {
     var name: String {

diff --git a/Sources/JWTKit/RSA/RSA.swift b/Sources/JWTKit/RSA/RSA.swift
@@ -1,8 +1,13 @@
 import Crypto
-import Foundation
 import X509
 import _CryptoExtras
 
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
+
 extension Insecure {
     /// Namespace encompassing functionality related to the RSA (Rivest–Shamir–Adleman) cryptographic algorithm.
     /// Relatively to other algorithms such as ECDSA and EdDSA, RSA is considered slow and should be avoided when possible.

diff --git a/Sources/JWTKit/RSA/RSASigner.swift b/Sources/JWTKit/RSA/RSASigner.swift
@@ -1,6 +1,11 @@
-import Foundation
 import _CryptoExtras
 
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
+
 struct RSASigner: JWTAlgorithm, CryptoSigner {
     let publicKey: Insecure.RSA.PublicKey
     let privateKey: Insecure.RSA.PrivateKey?

diff --git a/Sources/JWTKit/Utilities/Base64URL.swift b/Sources/JWTKit/Utilities/Base64URL.swift
@@ -1,4 +1,8 @@
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 extension String {
     package func base64URLDecodedData() -> Data? {

diff --git a/Sources/JWTKit/Utilities/CryptoSigner.swift b/Sources/JWTKit/Utilities/CryptoSigner.swift
@@ -1,5 +1,10 @@
 import Crypto
-import Foundation
+
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 public struct DigestAlgorithm: Sendable, Equatable {
     enum Backing {

diff --git a/Sources/JWTKit/Utilities/CustomizedJSONCoders.swift b/Sources/JWTKit/Utilities/CustomizedJSONCoders.swift
@@ -1,4 +1,8 @@
-import Foundation
+#if !canImport(Darwin)
+    import FoundationEssentials
+#else
+    import Foundation
+#endif
 
 public protocol JWTJSONDecoder: Sendable {
     func decode<T: Decodable>(_: T.Type, from string: Data) throws -> T