feat: pass Decodable struct to flag evaluation (cont'd)

Sources/Confidence/Confidence.swift

@@ -119,7 +119,7 @@ public class Confidence: ConfidenceEventSender {
     - Parameter key:expects dot-notation to retrieve a specific entry in the flag's value, e.g. "flagname.myentry"
     - Parameter defaultValue: returned in case of errors or in case of the variant's rule indicating to use the default value.
     */
-    public func getEvaluation<T>(key: String, defaultValue: T) -> Evaluation<T> {
+    public func getEvaluation<T: Decodable>(key: String, defaultValue: T) -> Evaluation<T> {
         cacheQueue.sync {  [weak self] in
             guard let self = self else {
                 return Evaluation(
@@ -145,7 +145,7 @@ public class Confidence: ConfidenceEventSender {
     - Parameter key:expects dot-notation to retrieve a specific entry in the flag's value, e.g. "flagname.myentry"
     - Parameter defaultValue: returned in case of errors or in case of the variant's rule indicating to use the default value.
     */
-    public func getValue<T>(key: String, defaultValue: T) -> T {
+    public func getValue<T: Decodable>(key: String, defaultValue: T) -> T {
         return getEvaluation(key: key, defaultValue: defaultValue).value
     }
 

Sources/Confidence/ConfidenceValue.swift

@@ -210,6 +210,56 @@ extension ConfidenceValue {
     }
 }
 
+extension ConfidenceValue {
+    // swiftlint:disable cyclomatic_complexity
+    // swiftlint:disable identifier_name
+    public func asJSONData() -> Data? {
+        func flatten(_ value: ConfidenceValueInternal) -> Any? {
+            switch value {
+            case .boolean(let v): return v
+            case .string(let v): return v
+            case .integer(let v): return v
+            case .double(let v): return v
+            case .date(let v):
+                // Convert DateComponents to ISO8601 string for JSON serialization
+                if let date = Calendar.current.date(from: v) {
+                    let formatter = ISO8601DateFormatter()
+                    formatter.timeZone = TimeZone.current
+                    formatter.formatOptions = [.withFullDate]
+                    return formatter.string(from: date)
+                }
+                return nil
+            case .timestamp(let v):
+                // Convert Date to ISO8601 string for JSON serialization
+                let formatter = ISO8601DateFormatter()
+                formatter.timeZone = TimeZone.current
+                formatter.formatOptions = [.withInternetDateTime]
+                return formatter.string(from: v)
+            case .list(let values):
+                return values.compactMap { flatten($0) }
+            case .structure(let values):
+                var dict: [String: Any] = [:]
+                for (key, val) in values {
+                    if let flattened = flatten(val) {
+                        dict[key] = flattened
+                    }
+                }
+                return dict
+            case .null:
+                return NSNull()
+            }
+        }
+
+        if let flattened = flatten(self.value) {
+            return try? JSONSerialization.data(withJSONObject: flattened, options: .sortedKeys)
+        }
+        return nil
+    }
+    // swiftlint:enable cyclomatic_complexity
+    // swiftlint:enable identifier_name
+}
+
+
 public enum ConfidenceValueType: CaseIterable {
     case boolean
     case string

Sources/Confidence/FlagEvaluation.swift

@@ -26,7 +26,7 @@ struct FlagResolution: Encodable, Decodable, Equatable {
 extension FlagResolution {
     // swiftlint:disable function_body_length
     // swiftlint:disable cyclomatic_complexity
-    func evaluate<T>(
+    func evaluate<T: Decodable>(
         flagName: String,
         defaultValue: T,
         context: ConfidenceStruct,
@@ -55,7 +55,7 @@ extension FlagResolution {
             }
 
             guard let value = resolvedFlag.value else {
-                // No backend error, but nil value returned. This can happend with "noSegmentMatch" or "archived", for example
+                // No backend error, but nil value returned. This can happen with "noSegmentMatch" or "archived", for example
                 Task {
                     if resolvedFlag.shouldApply {
                         await flagApplier?.apply(flagName: parsedKey.flag, resolveToken: self.resolveToken)
@@ -71,7 +71,7 @@ extension FlagResolution {
             }
 
             let parsedValue = try getValue(path: parsedKey.path, value: value)
-            let typedValue: T? = getTyped(value: parsedValue)
+            let typedValue: T? = getTyped(value: parsedValue, debugLogger: debugLogger)
 
             if resolvedFlag.resolveReason == .match {
                 var resolveReason: ResolveReason = .match
@@ -140,9 +140,9 @@ extension FlagResolution {
             )
         }
     }
+
     // swiftlint:enable function_body_length
     // swiftlint:enable cyclomatic_complexity
-
     private func checkBackendErrors<T>(resolvedFlag: ResolvedValue, defaultValue: T) -> Evaluation<T>? {
         if resolvedFlag.resolveReason == .targetingKeyError {
             return Evaluation(
@@ -153,8 +153,8 @@ extension FlagResolution {
                 errorMessage: "Invalid targeting key"
             )
         } else if resolvedFlag.resolveReason == .error ||
-        resolvedFlag.resolveReason == .unknown ||
-        resolvedFlag.resolveReason == .unspecified {
+            resolvedFlag.resolveReason == .unknown ||
+            resolvedFlag.resolveReason == .unspecified {
             return Evaluation(
                 value: defaultValue,
                 variant: nil,
@@ -168,7 +168,7 @@ extension FlagResolution {
     }
 
     // swiftlint:disable:next cyclomatic_complexity
-    private func getTyped<T>(value: ConfidenceValue) -> T? {
+    private func getTyped<T>(value: ConfidenceValue, debugLogger: DebugLogger?) -> T? {
         if let value = self as? T {
             return value
         }
@@ -198,12 +198,44 @@ extension FlagResolution {
         case .list:
             return value.asList() as? T
         case .structure:
+            // Try to decode as a Codable type if T is not ConfidenceStruct
+            if T.self != ConfidenceStruct.self {
+                return tryDecodeCodable(value: value, debugLogger: debugLogger)
+            }
             return value.asStructure() as? T
         case .null:
             return nil
         }
     }
 
+    private func tryDecodeCodable<T>(value: ConfidenceValue, debugLogger: DebugLogger?) -> T? {
+        guard let decodable = T.self as? Decodable.Type else {
+            debugLogger?.logMessage(
+                message: "tryDecodeCodable: Type \(T.self) does not conform to Decodable",
+                isWarning: true)
+            return nil
+        }
+
+        guard let data = value.asJSONData() else {
+            debugLogger?.logMessage(
+                message: "tryDecodeCodable: Failed to encode ConfidenceValue to JSON",
+                isWarning: true)
+            return nil
+        }
+        do {
+            let decoded = try JSONDecoder().decode(decodable, from: data) as? T
+            if decoded == nil {
+                debugLogger?.logMessage(
+                    message: "tryDecodeCodable: Failed to cast decoded value to type \(T.self)",
+                    isWarning: true)
+            }
+            return decoded
+        } catch {
+            debugLogger?.logMessage(message: "tryDecodeCodable: Failed to decode JSON: \(error)", isWarning: true)
+            return nil
+        }
+    }
+
     private func getValue(path: [String], value: ConfidenceValue) throws -> ConfidenceValue {
         if path.isEmpty {
             guard value.asStructure() != nil else {

Tests/ConfidenceTests/ConfidenceDeviceInfoContextDecoratorTests.swift

@@ -1,6 +1,7 @@
 import XCTest
 @testable import Confidence
 
+#if os(iOS) || os(tvOS) || os(visionOS) || targetEnvironment(macCatalyst)
 final class DeviceInfoContextDecoratorTests: XCTestCase {
     func testEmptyConstructMakesNoOp() {
         let result = ConfidenceDeviceInfoContextDecorator().decorated(context: [:])
@@ -32,3 +33,4 @@ final class DeviceInfoContextDecoratorTests: XCTestCase {
         XCTAssertNotNil(result["device"])
     }
 }
+#endif