Remove Kotlin Types from API

CHANGELOG.md

@@ -1,5 +1,89 @@
 # Changelog
 
+# 1.0.0-Beta.14
+
+- Improved the stability of watched queries. Watched queries were previously susceptible to runtime crashes if an exception was thrown in the update stream. Errors are now gracefully handled.
+
+- Added `readLock` and `writeLock` APIs. These methods allow obtaining a SQLite connection context without starting a transaction.
+
+- Removed references to the PowerSync Kotlin SDK from all public API protocols. Dedicated Swift protocols are now defined. These protocols align better with Swift primitives. See the `BRAKING CHANGES` section for more details. Updated protocols include:
+
+  - `ConnectionContext` - The context provided by `readLock` and `writeLock`
+  - `Transaction` - The context provided by `readTransaction` and `writeTransaction`
+  - `CrudBatch` - Response from `getCrudBatch`
+  - `CrudTransaction` Response from `getNextCrudTransaction`
+  - `CrudEntry` - Crud entries for `CrudBatch` and `CrudTransaction`
+  - `UpdateType` - Operation type for `CrudEntry`s
+  - `SqlCursor` - Cursor used to map SQLite results to typed result sets
+  - `JsonParam` - JSON parameters used to declare client parameters in the `connect` method
+  - `JsonValue` - Individual JSON field types for `JsonParam`
+
+- Database and transaction/lock level query `execute` methods now have `@discardableResult` annotation.
+
+- Query methods' `parameters` typing has been updated to `[Any?]` from `[Any]`. This makes passing `nil` or optional values to queries easier.
+
+- `AttachmentContext`, `AttachmentQueue`, `AttachmentService` and `SyncingService` are are now explicitly declared as `open` classes, allowing them to be subclassed outside the defining module.
+
+**BREAKING CHANGES**:
+
+- Completing CRUD transactions or CRUD batches, in the `PowerSyncBackendConnector` `uploadData` handler, now has a simpler invocation.
+
+```diff
+- _ = try await transaction.complete.invoke(p1: nil)
++ try await transaction.complete()
+```
+
+- `index` based `SqlCursor` getters now throw if the query result column value is `nil`. This is now consistent with the behaviour of named column getter operations. New `getXxxxxOptional(index: index)` methods are available if the query result value could be `nil`.
+
+```diff
+let results = try transaction.getAll(
+                sql: "SELECT * FROM my_table",
+                parameters: [id]
+            ) { cursor in
+-                 cursor.getString(index: 0)!
++                 cursor.getStringOptional(index: 0)
++                 // OR
++                 // try cursor.getString(index: 0) // if the value should be required
+            }
+```
+
+- `SqlCursor` getters now directly return Swift types. `getLong` has been replaced with `getInt64`.
+
+```diff
+let results = try transaction.getAll(
+                sql: "SELECT * FROM my_table",
+                parameters: [id]
+            ) { cursor in
+-                 cursor.getBoolean(index: 0)?.boolValue,
++                 cursor.getBooleanOptional(index: 0),
+-                 cursor.getLong(index: 0)?.int64Value,
++                 cursor.getInt64Optional(index: 0)
++                 // OR
++                 // try cursor.getInt64(index: 0) // if the value should be required
+            }
+```
+
+- Client parameters now need to be specified with strictly typed `JsonValue` enums.
+
+```diff
+try await database.connect(
+    connector: PowerSyncBackendConnector(),
+    params: [
+-        "foo": "bar"
++        "foo": .string("bar")
+    ]
+)
+```
+
+- `SyncStatus` values now use Swift primitives for status attributes. `lastSyncedAt` now is of `Date` type.
+
+```diff
+- let lastTime: Date? = db.currentStatus.lastSyncedAt.map {
+-     Date(timeIntervalSince1970: TimeInterval($0.epochSeconds))
+- }
++ let time: Date? = db.currentStatus.lastSyncedAt
+```
+
 # 1.0.0-Beta.13
 
 - Update `powersync-kotlin` dependency to version `1.0.0-BETA32`, which includes:

Demo/PowerSyncExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -15,8 +15,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/powersync-ja/powersync-kotlin.git",
       "state" : {
-        "revision" : "633a2924f7893f7ebeb064cbcd9c202937673633",
-        "version" : "1.0.0-BETA30.0"
+        "branch" : "crudhasmore",
+        "revision" : "ae49c22188af0b0086b69b14787809b96f82899e"
       }
     },
     {

Demo/PowerSyncExample/PowerSync/SupabaseConnector.swift

@@ -101,19 +101,18 @@ class SupabaseConnector: PowerSyncBackendConnector {
 
                 switch entry.op {
                 case .put:
-                    var data: [String: AnyCodable] = entry.opData?.mapValues { AnyCodable($0) } ?? [:]
-                    data["id"] = AnyCodable(entry.id)
+                    var data = entry.opData ?? [:]
+                    data["id"] = entry.id
                     try await table.upsert(data).execute()
                 case .patch:
                     guard let opData = entry.opData else { continue }
-                    let encodableData = opData.mapValues { AnyCodable($0) }
-                    try await table.update(encodableData).eq("id", value: entry.id).execute()
+                    try await table.update(opData).eq("id", value: entry.id).execute()
                 case .delete:
                     try await table.delete().eq("id", value: entry.id).execute()
                 }
             }
 
-            _ = try await transaction.complete.invoke(p1: nil)
+            try await transaction.complete()
 
         } catch {
             if let errorCode = PostgresFatalCodes.extractErrorCode(from: error),
@@ -127,7 +126,7 @@ class SupabaseConnector: PowerSyncBackendConnector {
                 /// elsewhere instead of discarding, and/or notify the user.
                 print("Data upload error: \(error)")
                 print("Discarding entry: \(lastEntry!)")
-                _ = try await transaction.complete.invoke(p1: nil)
+                try await transaction.complete()
                 return
             }
 

Demo/PowerSyncExample/PowerSync/SystemManager.swift

@@ -127,9 +127,8 @@ class SystemManager {
                 sql: "SELECT photo_id FROM \(TODOS_TABLE) WHERE list_id = ? AND photo_id IS NOT NULL",
                 parameters: [id]
             ) { cursor in
-                // FIXME Transactions should allow throwing in the mapper and should use generics correctly
-                cursor.getString(index: 0) ?? "invalid" // :(
-            } as? [String] // :(
+                try cursor.getString(index: 0)
+            }
 
             _ = try transaction.execute(
                 sql: "DELETE FROM \(LISTS_TABLE) WHERE id = ?",
@@ -141,7 +140,7 @@ class SystemManager {
                 parameters: [id]
             )
 
-            return attachmentIDs ?? [] // :(
+            return attachmentIDs
         })
 
         if let attachments {

Package.resolved

@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/powersync-ja/powersync-kotlin.git",
       "state" : {
-        "revision" : "144d2110eaca2537f49f5e86e5a6c78acf502f94",
-        "version" : "1.0.0-BETA32.0"
+        "branch" : "crudhasmore",
+        "revision" : "ae49c22188af0b0086b69b14787809b96f82899e"
       }
     },
     {

Package.swift

@@ -17,7 +17,9 @@ let package = Package(
             targets: ["PowerSync"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/powersync-ja/powersync-kotlin.git", exact: "1.0.0-BETA32.0"),
+        // TODO
+       // .package(url: "https://github.com/powersync-ja/powersync-kotlin.git", exact: "1.0.0-BETA32.0"),
+        .package(path: "/Users/stevenontong/Documents/platform_code/powersync/powersync-kotlin"),
         .package(url: "https://github.com/powersync-ja/powersync-sqlite-core-swift.git", "0.3.12"..<"0.4.0")
     ],
     targets: [

Sources/PowerSync/Kotlin/DatabaseLogger.swift

@@ -44,7 +44,7 @@ private class KermitLogWriterAdapter: Kermit_coreLogWriter {
 ///
 /// This class bridges Swift log writers with the Kotlin logging system and supports
 /// runtime configuration of severity levels and writer lists.
-internal class DatabaseLogger: LoggerProtocol {
+class DatabaseLogger: LoggerProtocol {
     /// The underlying Kermit logger instance provided by the PowerSyncKotlin SDK.
     public let kLogger = PowerSyncKotlin.generateLogger(logger: nil)
     public let logger: any LoggerProtocol

Sources/PowerSync/Kotlin/KotlinAdapter.swift

@@ -1,7 +1,6 @@
 import PowerSyncKotlin
 
-
-internal struct KotlinAdapter {
+enum KotlinAdapter {
     struct Index {
         static func toKotlin(_ index: IndexProtocol) -> PowerSyncKotlin.Index {
             PowerSyncKotlin.Index(
@@ -26,7 +25,7 @@ internal struct KotlinAdapter {
         static func toKotlin(_ table: TableProtocol) -> PowerSyncKotlin.Table {
             PowerSyncKotlin.Table(
                 name: table.name,
-                columns: table.columns.map {Column.toKotlin($0)},
+                columns: table.columns.map { Column.toKotlin($0) },
                 indexes: table.indexes.map { Index.toKotlin($0) },
                 localOnly: table.localOnly,
                 insertOnly: table.insertOnly,