Make addPowerSyncExtension public

Author: simolus3

core/src/androidMain/kotlin/com/powersync/DatabaseDriverFactory.android.kt

@@ -7,11 +7,11 @@ import androidx.sqlite.driver.bundled.BundledSQLiteDriver
 public actual class DatabaseDriverFactory(
     private val context: Context,
 ) {
-    internal actual fun addPowerSyncExtension(driver: BundledSQLiteDriver) {
-        driver.addExtension("libpowersync.so", "sqlite3_powersync_init")
-    }
-
     internal actual fun resolveDefaultDatabasePath(dbFilename: String): String {
         return context.getDatabasePath(dbFilename).path
     }
 }
+
+public actual fun BundledSQLiteDriver.addPowerSyncExtension() {
+    addExtension("libpowersync.so", "sqlite3_powersync_init")
+}

core/src/appleNonWatchOsMain/kotlin/com/powersync/DatabaseDriverFactory.appleNonWatchOs.kt

@@ -6,27 +6,25 @@ import kotlin.getValue
 
 @Suppress(names = ["EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING"])
 public actual class DatabaseDriverFactory {
-    internal actual fun addPowerSyncExtension(driver: BundledSQLiteDriver) {
-        driver.addExtension(powerSyncExtensionPath, "sqlite3_powersync_init")
-    }
-
     internal actual fun resolveDefaultDatabasePath(dbFilename: String): String {
         return appleDefaultDatabasePath(dbFilename)
     }
+}
 
-    private companion object {
-        val powerSyncExtensionPath by lazy {
-            // Try and find the bundle path for the SQLite core extension.
-            val bundlePath =
-                NSBundle.bundleWithIdentifier("co.powersync.sqlitecore")?.bundlePath
-                    ?: // The bundle is not installed in the project
-                    throw PowerSyncException(
-                        "Please install the PowerSync SQLite core extension",
-                        cause = Exception("The `co.powersync.sqlitecore` bundle could not be found in the project."),
-                    )
+public actual fun BundledSQLiteDriver.addPowerSyncExtension() {
+    addExtension(powerSyncExtensionPath, "sqlite3_powersync_init")
+}
 
-            // Construct full path to the shared library inside the bundle
-            bundlePath.let { "$it/powersync-sqlite-core" }
-        }
-    }
+private val powerSyncExtensionPath: String by lazy {
+    // Try and find the bundle path for the SQLite core extension.
+    val bundlePath =
+        NSBundle.bundleWithIdentifier("co.powersync.sqlitecore")?.bundlePath
+            ?: // The bundle is not installed in the project
+            throw PowerSyncException(
+                "Please install the PowerSync SQLite core extension",
+                cause = Exception("The `co.powersync.sqlitecore` bundle could not be found in the project."),
+            )
+
+    // Construct full path to the shared library inside the bundle
+    bundlePath.let { "$it/powersync-sqlite-core" }
 }

core/src/commonMain/kotlin/com/powersync/DatabaseDriverFactory.kt

@@ -8,11 +8,20 @@ import androidx.sqlite.driver.bundled.SQLITE_OPEN_READWRITE
 
 @Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
 public expect class DatabaseDriverFactory {
-    internal fun addPowerSyncExtension(driver: BundledSQLiteDriver)
-
     internal fun resolveDefaultDatabasePath(dbFilename: String): String
 }
 
+/**
+ * Registers the PowerSync core extension on connections opened by this [BundledSQLiteDriver].
+ *
+ * This method will be invoked by the PowerSync SDK when creating new databases. When using
+ * [PowerSyncDatabase.opened] with an existing connection pool, you should configure the driver
+ * backing that pool to load the extension.
+ */
+@ExperimentalPowerSyncAPI()
+public expect fun BundledSQLiteDriver.addPowerSyncExtension()
+
+@OptIn(ExperimentalPowerSyncAPI::class)
 internal fun openDatabase(
     factory: DatabaseDriverFactory,
     dbFilename: String,
@@ -27,8 +36,7 @@ internal fun openDatabase(
             factory.resolveDefaultDatabasePath(dbFilename)
         }
 
-    factory.addPowerSyncExtension(driver)
-
+    driver.addPowerSyncExtension()
     return driver.open(dbPath, if (readOnly) {
         SQLITE_OPEN_READONLY
     } else {

core/src/jvmMain/kotlin/com/powersync/DatabaseDriverFactory.jvm.kt

@@ -4,15 +4,13 @@ import androidx.sqlite.driver.bundled.BundledSQLiteDriver
 
 @Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING", "SqlNoDataSourceInspection")
 public actual class DatabaseDriverFactory {
-    internal actual fun addPowerSyncExtension(driver: BundledSQLiteDriver) {
-        driver.addExtension(powersyncExtension, "sqlite3_powersync_init")
-    }
-
     internal actual fun resolveDefaultDatabasePath(dbFilename: String): String {
         return dbFilename
     }
+}
 
-    public companion object {
-        private val powersyncExtension: String = extractLib("powersync")
-    }
+public actual fun BundledSQLiteDriver.addPowerSyncExtension() {
+    addExtension(powersyncExtension, "sqlite3_powersync_init")
 }
+
+private val powersyncExtension: String by lazy { extractLib("powersync") }

core/src/watchosMain/kotlin/com/powersync/DatabaseDriverFactory.watchos.kt

@@ -5,28 +5,26 @@ import com.powersync.static.powersync_init_static
 
 @Suppress(names = ["EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING"])
 public actual class DatabaseDriverFactory {
-    internal actual fun addPowerSyncExtension(driver: BundledSQLiteDriver) {
-        didLoadExtension
-    }
-
     internal actual fun resolveDefaultDatabasePath(dbFilename: String): String {
         return appleDefaultDatabasePath(dbFilename)
     }
+}
 
-    private companion object {
-        val didLoadExtension by lazy {
-            val rc = powersync_init_static()
-            if (rc != 0) {
-                throw PowerSyncException(
-                    "Could not load the PowerSync SQLite core extension",
-                    cause =
-                        Exception(
-                            "Calling powersync_init_static returned result code $rc",
-                        ),
-                )
-            }
+public actual fun BundledSQLiteDriver.addPowerSyncExtension() {
+    didLoadExtension
+}
 
-            true
-        }
+private val didLoadExtension by lazy {
+    val rc = powersync_init_static()
+    if (rc != 0) {
+        throw PowerSyncException(
+            "Could not load the PowerSync SQLite core extension",
+            cause =
+                Exception(
+                    "Calling powersync_init_static returned result code $rc",
+                ),
+        )
     }
+
+    true
 }