chore: update package

Author: DominicGBauer

CHANGELOG.md

@@ -2,13 +2,22 @@
 
 ## 1.0.0-Beta.6
 
-* Allow `execute` to be handled
 * BREAKING CHANGE: `watch` queries are now throwable and therefore will need to be accompanied by a `try` e.g.
 
 ```swift
 try database.watch()
 ```
 
+* BREAKING CHANGE: `transaction` functions are now throwable and therefore will need to be accompanied by a `try` e.g.
+
+```swift
+try await database.writeTransaction { transaction in
+  try transaction.execute(...)
+}
+```
+* Allow `execute` errors to be handled
+* `userId` is now set to `nil` by default and therefore it is no longer required to be set to `nil` when instantiating `PowerSyncCredentials` and can therefore be left out.
+
 ## 1.0.0-Beta.5
 
 * Implement improvements to errors originating in Kotlin so that they can be handled in Swift

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

@@ -16,7 +16,7 @@ let package = Package(
             targets: ["PowerSync"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/powersync-ja/powersync-kotlin.git", exact: "1.0.0-BETA22.0"),
+        .package(url: "https://github.com/powersync-ja/powersync-kotlin.git", exact: "1.0.0-BETA23.0"),
         .package(url: "https://github.com/powersync-ja/powersync-sqlite-core-swift.git", "0.3.9"..<"0.4.0")
     ],
     targets: [

Package.resolved

@@ -195,45 +195,30 @@ final class KotlinPowerSyncDatabaseImpl: PowerSyncDatabaseProtocol {
     }
 
     public func writeTransaction<R>(callback: @escaping (any PowerSyncTransaction) throws -> R) async throws -> R {
-        var err: Error? = nil
-        let result = try await kotlinDatabase.writeTransaction { transaction in
-            do {
-                let res = try callback(transaction)
-                return res as R
-            } catch {
-                err = error
-                return TransactionResponse.rollback
-            }
-        }
-        
-        if(err != nil) {
-            throw err!
-        }
-        
-        return result as! R
+        return try await kotlinDatabase.writeTransaction(callback: TransactionCallback(callback: callback)) as! R
     }
 
     public func readTransaction<R>(callback: @escaping (any PowerSyncTransaction) throws -> R) async throws -> R {
-        var err: Error? = nil
-        let result = try await kotlinDatabase.readTransaction { transaction in
-            do {
-                let res = try callback(transaction)
-                return res as R
-            } catch {
-                err = error
-                return TransactionResponse.rollback
-            }
-        }
-        
-        if(err != nil) {
-            throw err!
-        }
-        
-        return result as! R
+        return try await kotlinDatabase.readTransaction(callback: TransactionCallback(callback: callback)) as! R
     }
+}
+
+class TransactionCallback<R>: PowerSyncKotlin.ThrowableTransactionCallback {
+    let callback: (PowerSyncTransaction) throws -> R
 
-    public func readTransaction<R>(callback: @escaping (any PowerSyncTransaction) -> R) async throws -> R {
-        return try await kotlinDatabase.readTransaction(callback: callback) as! R
+    init(callback: @escaping (PowerSyncTransaction) throws -> R) {
+        self.callback = callback
+    }
+
+    func execute(transaction: PowerSyncKotlin.PowerSyncTransaction) throws -> Any{
+        do {
+            return try callback(transaction)
+        } catch let error {
+            return PowerSyncKotlin.PowerSyncException(
+                message: error.localizedDescription,
+                cause: PowerSyncKotlin.KotlinThrowable(message: error.localizedDescription)
+            )
+        }
     }
 }