Check boxed Kotlin type to map

Author: simolus3

Sources/PowerSync/Kotlin/db/KotlinJsonParam.swift

@@ -26,4 +26,24 @@ extension JsonValue {
             return PowerSyncKotlin.JsonParam.Map(value: anyDict)
         }
     }
+    
+    static func kotlinValueToJsonParam(raw: Any?) -> JsonValue {
+        if let string = raw as? String {
+            return Self.string(string)
+        } else if let bool = raw as? KotlinBoolean {
+            return Self.bool(bool.boolValue)
+        } else if let int = raw as? KotlinInt {
+            return Self.int(int.intValue)
+        } else if let double = raw as? KotlinDouble {
+            return Self.double(double.doubleValue)
+        } else if let array = raw as? [Any?] {
+            return Self.array(array.map(kotlinValueToJsonParam))
+        } else if let object = raw as? [String: Any?] {
+            return Self.object(object.mapValues(kotlinValueToJsonParam))
+        } else {
+            // fatalError is fine here because this function is internal, so this being reached
+            // is an SDK bug.
+            fatalError("fromValue must only be called on outputs of JsonValue.toValue()");
+        }
+    }
 }

Sources/PowerSync/Kotlin/sync/KotlinSyncStreams.swift

@@ -11,7 +11,7 @@ class KotlinStreamDescription<T: PowerSyncKotlin.SyncStreamDescription> {
         self.inner = inner
         self.name = inner.name
         self.kotlinParameters = inner.parameters
-        self.parameters = inner.parameters?.mapValues { JsonValue.fromValue(raw: $0) }
+        self.parameters = inner.parameters?.mapValues { JsonValue.kotlinValueToJsonParam(raw: $0) }
     }
 }
 
@@ -104,7 +104,7 @@ func mapSyncStreamStatus(_ status: PowerSyncKotlin.SyncStreamStatus) -> SyncStre
         progress: progress,
         subscription: SyncSubscriptionDescription(
             name: subscription.name,
-            parameters: subscription.parameters?.mapValues { JsonValue.fromValue(raw: $0) },
+            parameters: subscription.parameters?.mapValues { JsonValue.kotlinValueToJsonParam(raw: $0) },
             active: subscription.active,
             isDefault: subscription.isDefault,
             hasExplicitSubscription: subscription.hasExplicitSubscription,

Sources/PowerSync/Protocol/db/JsonParam.swift

@@ -50,29 +50,6 @@ public enum JsonValue: Codable, Sendable, Equatable {
             return anyDict
         }
     }
-
-    /// Converts a raw Swift value into a ``JsonValue``.
-    ///
-    /// The value must be one of the types returned by ``JsonValue/toValue()``.
-    internal static func fromValue(raw: Any?) -> Self {
-        if let string = raw as? String {
-            return Self.string(string)
-        } else if let bool = raw as? Bool {
-            return Self.bool(bool)
-        } else if let int = raw as? Int {
-            return Self.int(int)
-        } else if let double = raw as? Double {
-            return Self.double(double)
-        } else if let array = raw as? [Any?] {
-            return Self.array(array.map(fromValue))
-        } else if let object = raw as? [String: Any?] {
-            return Self.object(object.mapValues(fromValue))
-        } else {
-            // fatalError is fine here because this function is internal, so this being reached
-            // is an SDK bug.
-            fatalError("fromValue must only be called on outputs of JsonValue.toValue()");
-        }
-    }
 }
 
 /// A typealias representing a top-level JSON object with string keys and `JSONValue` values.

Tests/PowerSyncTests/Kotlin/KotlinPowerSyncDatabaseImplTests.swift

@@ -741,7 +741,8 @@ final class KotlinPowerSyncDatabaseImplTests: XCTestCase {
 
         let _ = try await database.syncStream(name: "foo", params: [
             "text": JsonValue.string("text"),
-            "int": JsonValue.int(42),
+            "int1": JsonValue.int(1),
+            "int0": JsonValue.int(0),
             "double": JsonValue.double(1.23),
             "bool": JsonValue.bool(true),
         ]).subscribe()
@@ -751,7 +752,8 @@ final class KotlinPowerSyncDatabaseImplTests: XCTestCase {
         let stream = updatedStatus!.syncStreams![0]
         let params = stream.subscription.parameters!
         XCTAssertEqual(params["text"], JsonValue.string("text"))
-        XCTAssertEqual(params["int"], JsonValue.int(42))
+        XCTAssertEqual(params["int1"], JsonValue.int(1))
+        XCTAssertEqual(params["int0"], JsonValue.int(0))
         XCTAssertEqual(params["double"], JsonValue.double(1.23))
         XCTAssertEqual(params["bool"], JsonValue.bool(true))
     }