Refine JSON implementation for mutability, type safety, and performance

.swiftpm/xcode/xcshareddata/xcschemes/CommonSupport.xcscheme

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1640"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CommonSupport"
+               BuildableName = "CommonSupport"
+               BlueprintName = "CommonSupport"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CommonSupportTests"
+               BuildableName = "CommonSupportTests"
+               BlueprintName = "CommonSupportTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CommonSupport"
+            BuildableName = "CommonSupport"
+            BlueprintName = "CommonSupport"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </CodeCoverageTargets>
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            testExecutionOrdering = "random">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CommonSupportTests"
+               BuildableName = "CommonSupportTests"
+               BlueprintName = "CommonSupportTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CommonSupport"
+            BuildableName = "CommonSupport"
+            BlueprintName = "CommonSupport"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

.swiftpm/xcode/xcshareddata/xcschemes/JSON.xcscheme

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1640"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "JSON"
+               BuildableName = "JSON"
+               BlueprintName = "JSON"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "JSON"
+            BuildableName = "JSON"
+            BlueprintName = "JSON"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </CodeCoverageTargets>
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            testExecutionOrdering = "random">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "JSONTests"
+               BuildableName = "JSONTests"
+               BlueprintName = "JSONTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "JSON"
+            BuildableName = "JSON"
+            BlueprintName = "JSON"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Sources/AuthFoundation/Debugging/APIRequestObserver.swift

@@ -24,10 +24,6 @@ import OSLog
 import CommonSupport
 #endif
 
-#if !COCOAPODS
-import CommonSupport
-#endif
-
 #if compiler(<6.0)
 extension OSLog: @unchecked Sendable {}
 #endif

Sources/AuthFoundation/JWT/Extensions/ClaimConvertable+Extensions.swift

@@ -12,20 +12,83 @@
 
 import Foundation
 
+extension JSON {
+    var payload: [String: any Sendable] {
+        get {
+            value.anyValue as? [String: any Sendable] ?? [:]
+        }
+        set { value.anyValue = newValue }
+    }
+}
+
 @_documentation(visibility: private)
 extension String: ClaimConvertable {}
 
 @_documentation(visibility: private)
-extension Bool: ClaimConvertable {}
+extension Bool: ClaimConvertable {
+    public static func convert(from value: Any?) -> Self? {
+        if let value = value as? Bool {
+            return value
+        }
+
+        if let value = value as? Int,
+           value == 0 || value == 1
+        {
+            return value == 1
+        }
+
+        return nil
+    }
+}
 
 @_documentation(visibility: private)
-extension Int: ClaimConvertable {}
+extension Int: ClaimConvertable {
+    public static func convert(from value: Any?) -> Self? {
+        if let value = value as? Int {
+            return value
+        }
+
+        if let value = value as? Double {
+            return Int(value)
+        }
+
+        return nil
+    }
+}
 
 @_documentation(visibility: private)
-extension Double: ClaimConvertable {}
+extension Double: ClaimConvertable {
+    public static func convert(from value: Any?) -> Self? {
+        if let value = value as? Double {
+            return value
+        }
+
+        if let value = value as? Int {
+            return Double(value)
+        }
+
+        return nil
+    }
+}
 
 @_documentation(visibility: private)
-extension Float: ClaimConvertable {}
+extension Float: ClaimConvertable {
+    public static func convert(from value: Any?) -> Self? {
+        if let value = value as? Float {
+            return value
+        }
+
+        if let value = value as? Double {
+            return Float(value)
+        }
+
+        if let value = value as? Int {
+            return Float(value)
+        }
+
+        return nil
+    }
+}
 
 @_documentation(visibility: private)
 extension JWTClaim: ClaimConvertable {}

Sources/AuthFoundation/JWT/JWK.swift

@@ -16,10 +16,6 @@ import Foundation
 import CommonSupport
 #endif
 
-#if !COCOAPODS
-import CommonSupport
-#endif
-
 /// Describes an individual key from an authorization server, which can be used to validate tokens or encrypt content.
 ///
 /// > Warning: At this time, this class only supports RSA Public Keys.

Sources/AuthFoundation/JWT/JWT.swift

@@ -12,6 +12,10 @@
 
 import Foundation
 
+#if !COCOAPODS
+@_exported import JSON
+#endif
+
 /// Represents the contents of a JWT token, providing access to its payload contents.
 public struct JWT: RawRepresentable, Sendable, Codable, HasClaims, Expires {
     public typealias ClaimType = JWTClaim
@@ -93,25 +97,21 @@ public struct JWT: RawRepresentable, Sendable, Codable, HasClaims, Expires {
         else { throw JWTError.invalidBase64Encoding }
 
         self.header = try JSONDecoder().decode(JWT.Header.self, from: headerData)
-        guard let payload = try JSONSerialization.jsonObject(with: payloadData,
-                                                             options: []) as? [String: any Sendable]
-        else {
-            throw JWTError.badTokenStructure
-        }
-
-        self.payload = payload
+        self.body = try JSON(payloadData)
 
         if components.count == 3 {
             self.signature = components[2]
         }
     }
 
     /// Raw paylaod of claims, as a dictionary representation.
-    public var payload: [String: any Sendable]
+    public var body: JSON
 
     /// Signature of the JWT token.
     public var signature: String?
 
+    public var payload: [String: any Sendable] { body.payload }
+
     static func tokenComponents(from token: String) -> [String] {
         token
             .components(separatedBy: ".")