Update WatchOS extension loading

Author: stevensJourney

Demo/GRDB Demo/GRDB Demo/GRDB_DemoApp.swift

@@ -31,12 +31,11 @@ func openDatabase()
         ).first!
         .appendingPathComponent("test.sqlite")
 
-    var config = Configuration()
-    config.configurePowerSync(
-        schema: schema
-    )
-
     do {
+        var config = Configuration()
+        config.configurePowerSync(
+            schema: schema
+        )
         let grdb = try DatabasePool(
             path: dbUrl.path,
             configuration: config

README.md

@@ -94,7 +94,7 @@ import GRDB
 
 // Configure GRDB with PowerSync support
 var config = Configuration()
-config.configurePowerSync(schema: mySchema)
+try config.configurePowerSync(schema: mySchema)
 
 // Create database with PowerSync enabled
 let dbPool = try DatabasePool(

Sources/PowerSync/resolvePowerSyncLoadableExtensionPath.swift

@@ -55,7 +55,8 @@
 ///
 /// - Returns: The file system path to the PowerSync SQLite extension, or `nil` on watchOS
 ///   (where the extension is statically loaded and doesn't require a path)
-/// - Throws: An error if the extension path cannot be resolved on platforms that require it
+/// - Throws: An error if the extension path cannot be resolved on platforms that require it or
+///   if the extension could not be registered on watchOS.
 public func resolvePowerSyncLoadableExtensionPath() throws -> String? {
     return try kotlinResolvePowerSyncLoadableExtensionPath()
 }

Sources/PowerSyncGRDB/Config/Configuration+PowerSync.swift

@@ -15,17 +15,25 @@ public extension Configuration {
     /// Example usage:
     /// ```swift
     /// var config = Configuration()
-    /// config.configurePowerSync(schema: mySchema)
+    /// try config.configurePowerSync(schema: mySchema)
     /// let dbQueue = try DatabaseQueue(path: dbPath, configuration: config)
     /// ```
     ///
     /// - Parameter schema: The PowerSync `Schema` describing your sync views.
+    /// - Throws: An error if the PowerSync extension path cannot be resolved,
+    ///   if extension loading cannot be enabled, or if the PowerSync extension
+    ///   fails to load or initialize.
     mutating func configurePowerSync(
         schema: Schema
-    ) {
+    ) throws {
+        // Handles the case on WatchOS where the extension is statically loaded.
+        // We need to register the extension before SQLite connections are established.
+        // This should only throw on non-WatchOS platforms if the extension path cannot be resolved. So we catch and ignore the error.
+        let extensionPath = try resolvePowerSyncLoadableExtensionPath()
+
         // Register the PowerSync core extension
         prepareDatabase { database in
-            guard let extensionPath = try resolvePowerSyncLoadableExtensionPath() else {
+            guard let extensionPath = extensionPath else {
                 // We get the extension path for non WatchOS platforms.
                 // The Kotlin registration for automatically loading the extension does not seem to work.
                 // We explicitly initialize the extension here.

Sources/PowerSyncGRDB/GRDBPowerSyncDatabase.swift

@@ -21,7 +21,7 @@ import PowerSync
 ///
 /// // Configure GRDB with PowerSync support
 /// var config = Configuration()
-/// config.configurePowerSync(schema: schema)
+/// try config.configurePowerSync(schema: schema)
 ///
 /// // Create the database pool
 /// let dbPool = try DatabasePool(path: "path/to/db", configuration: config)

Tests/PowerSyncGRDBTests/BasicTest.swift

@@ -59,7 +59,7 @@ final class GRDBTests: XCTestCase {
 
         var config = Configuration()
 
-        config.configurePowerSync(
+        try config.configurePowerSync(
             schema: schema
         )