Reformat

Author: simolus3

core/src/commonIntegrationTest/kotlin/com/powersync/sync/AbstractSyncTest.kt

@@ -2,11 +2,15 @@ package com.powersync.sync
 
 import com.powersync.ExperimentalPowerSyncAPI
 
-abstract class AbstractSyncTest(private val useNewSyncImplementation: Boolean) {
-
+/**
+ * Small utility to run tests both with the legacy Kotlin sync implementation and the new
+ * implementation from the core extension.
+ */
+abstract class AbstractSyncTest(
+    private val useNewSyncImplementation: Boolean,
+) {
     @OptIn(ExperimentalPowerSyncAPI::class)
     val options: SyncOptions get() {
         return SyncOptions(useNewSyncImplementation)
     }
 }
-

core/src/commonIntegrationTest/kotlin/com/powersync/sync/SyncIntegrationTest.kt

@@ -35,9 +35,11 @@ import kotlin.test.assertNotNull
 import kotlin.time.Duration.Companion.seconds
 
 @OptIn(LegacySyncImplementation::class)
-abstract class BaseSyncIntegrationTest(useNewSyncImplementation: Boolean) : AbstractSyncTest(
-    useNewSyncImplementation
-) {
+abstract class BaseSyncIntegrationTest(
+    useNewSyncImplementation: Boolean,
+) : AbstractSyncTest(
+        useNewSyncImplementation,
+    ) {
     private suspend fun PowerSyncDatabase.expectUserCount(amount: Int) {
         val users = getAll("SELECT * FROM users;") { UserRow.from(it) }
         users shouldHaveSize amount
@@ -560,9 +562,9 @@ abstract class BaseSyncIntegrationTest(useNewSyncImplementation: Boolean) : Abst
         }
 }
 
-class LegacySyncIntegrationTest: BaseSyncIntegrationTest(false)
+class LegacySyncIntegrationTest : BaseSyncIntegrationTest(false)
 
-class NewSyncIntegrationTest: BaseSyncIntegrationTest(true) {
+class NewSyncIntegrationTest : BaseSyncIntegrationTest(true) {
     // The legacy sync implementation doesn't prefetch credentials.
 
     @OptIn(LegacySyncImplementation::class)
@@ -571,10 +573,11 @@ class NewSyncIntegrationTest: BaseSyncIntegrationTest(true) {
         databaseTest {
             val prefetchCalled = CompletableDeferred<Unit>()
             val completePrefetch = CompletableDeferred<Unit>()
-            every { connector.prefetchCredentials() } returns scope.launch {
-                prefetchCalled.complete(Unit)
-                completePrefetch.await()
-            }
+            every { connector.prefetchCredentials() } returns
+                scope.launch {
+                    prefetchCalled.complete(Unit)
+                    completePrefetch.await()
+                }
 
             turbineScope(timeout = 10.0.seconds) {
                 val turbine = database.currentStatus.asFlow().testIn(this)

core/src/commonIntegrationTest/kotlin/com/powersync/sync/SyncProgressTest.kt

@@ -19,9 +19,11 @@ import kotlin.test.assertNull
 import kotlin.test.assertTrue
 
 @OptIn(LegacySyncImplementation::class)
-abstract class BaseSyncProgressTest(useNewSyncImplementation: Boolean) : AbstractSyncTest(
-    useNewSyncImplementation
-) {
+abstract class BaseSyncProgressTest(
+    useNewSyncImplementation: Boolean,
+) : AbstractSyncTest(
+        useNewSyncImplementation,
+    ) {
     private var lastOpId = 0
 
     @BeforeTest
@@ -345,5 +347,6 @@ abstract class BaseSyncProgressTest(useNewSyncImplementation: Boolean) : Abstrac
         }
 }
 
-class LegacySyncProgressTest: BaseSyncProgressTest(false)
-class NewSyncProgressTest: BaseSyncProgressTest(true)
+class LegacySyncProgressTest : BaseSyncProgressTest(false)
+
+class NewSyncProgressTest : BaseSyncProgressTest(true)

core/src/commonIntegrationTest/kotlin/com/powersync/testutils/TestUtils.kt

@@ -9,7 +9,6 @@ import co.touchlab.kermit.Severity
 import co.touchlab.kermit.TestConfig
 import co.touchlab.kermit.TestLogWriter
 import com.powersync.DatabaseDriverFactory
-import com.powersync.ExperimentalPowerSyncAPI
 import com.powersync.bucket.WriteCheckpointData
 import com.powersync.bucket.WriteCheckpointResponse
 import com.powersync.connectors.PowerSyncBackendConnector
@@ -19,7 +18,6 @@ import com.powersync.db.PowerSyncDatabaseImpl
 import com.powersync.db.schema.Schema
 import com.powersync.sync.LegacySyncImplementation
 import com.powersync.sync.SyncLine
-import com.powersync.sync.SyncOptions
 import dev.mokkery.answering.returns
 import dev.mokkery.everySuspend
 import dev.mokkery.mock

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

@@ -2,5 +2,11 @@ package com.powersync
 
 @RequiresOptIn(message = "This API is experimental and not covered by PowerSync semver releases. It can be changed at any time")
 @Retention(AnnotationRetention.BINARY)
-@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.CONSTRUCTOR)
+@Target(
+    AnnotationTarget.CLASS,
+    AnnotationTarget.FUNCTION,
+    AnnotationTarget.CONSTRUCTOR,
+    AnnotationTarget.PROPERTY,
+    AnnotationTarget.VALUE_PARAMETER,
+)
 public annotation class ExperimentalPowerSyncAPI

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

@@ -95,7 +95,7 @@ public interface PowerSyncDatabase : Queries {
         crudThrottleMs: Long = 1000L,
         retryDelayMs: Long = 5000L,
         params: Map<String, JsonParam?> = emptyMap(),
-        options: SyncOptions = SyncOptions.defaults
+        options: SyncOptions = SyncOptions.defaults,
     )
 
     /**

core/src/commonMain/kotlin/com/powersync/bucket/BucketStorage.kt

@@ -31,20 +31,32 @@ internal interface BucketStorage {
 
     @LegacySyncImplementation
     suspend fun getBucketStates(): List<BucketState>
+
     @LegacySyncImplementation
     suspend fun getBucketOperationProgress(): Map<String, LocalOperationCounters>
+
     @LegacySyncImplementation
     suspend fun removeBuckets(bucketsToDelete: List<String>)
+
     @LegacySyncImplementation
     fun setTargetCheckpoint(checkpoint: Checkpoint)
+
     @LegacySyncImplementation
     suspend fun saveSyncData(syncDataBatch: SyncDataBatch)
+
     @LegacySyncImplementation
     suspend fun syncLocalDatabase(
         targetCheckpoint: Checkpoint,
         partialPriority: BucketPriority? = null,
     ): SyncLocalDatabaseResult
 
-    suspend fun control(op: String, payload: String?): List<Instruction>
-    suspend fun control(op: String, payload: ByteArray): List<Instruction>
+    suspend fun control(
+        op: String,
+        payload: String?,
+    ): List<Instruction>
+
+    suspend fun control(
+        op: String,
+        payload: ByteArray,
+    ): List<Instruction>
 }

core/src/commonMain/kotlin/com/powersync/bucket/BucketStorageImpl.kt

@@ -153,10 +153,10 @@ internal class BucketStorageImpl(
             val rows =
                 db.getAll("SELECT name, count_at_last, count_since_last FROM ps_buckets") { cursor ->
                     cursor.getString(0)!! to
-                            LocalOperationCounters(
-                                atLast = cursor.getLong(1)!!.toInt(),
-                                sinceLast = cursor.getLong(2)!!.toInt(),
-                            )
+                        LocalOperationCounters(
+                            atLast = cursor.getLong(1)!!.toInt(),
+                            sinceLast = cursor.getLong(2)!!.toInt(),
+                        )
                 }
 
             for ((name, counters) in rows) {
@@ -365,18 +365,22 @@ internal class BucketStorageImpl(
         return JsonUtil.json.decodeFromString<List<Instruction>>(result)
     }
 
-    override suspend fun control(op: String, payload: String?): List<Instruction> {
-        return db.writeTransaction { tx ->
+    override suspend fun control(
+        op: String,
+        payload: String?,
+    ): List<Instruction> =
+        db.writeTransaction { tx ->
             logger.v { "powersync_control($op, $payload)" }
 
             tx.get("SELECT powersync_control(?, ?) AS r", listOf(op, payload), ::handleControlResult)
         }
-    }
 
-    override suspend fun control(op: String, payload: ByteArray): List<Instruction> {
-        return db.writeTransaction { tx ->
+    override suspend fun control(
+        op: String,
+        payload: ByteArray,
+    ): List<Instruction> =
+        db.writeTransaction { tx ->
             logger.v { "powersync_control($op, binary payload)" }
             tx.get("SELECT powersync_control(?, ?) AS r", listOf(op, payload), ::handleControlResult)
         }
-    }
 }

core/src/commonMain/kotlin/com/powersync/connectors/PowerSyncBackendConnector.kt

@@ -59,7 +59,7 @@ public abstract class PowerSyncBackendConnector {
     public open fun prefetchCredentials(): Job {
         fetchRequest?.takeIf { it.isActive }?.let { return it }
 
-        val request  =
+        val request =
             scope.launch {
                 fetchCredentials().also { value ->
                     cachedCredentials = value

core/src/commonMain/kotlin/com/powersync/db/PowerSyncDatabaseImpl.kt

@@ -2,7 +2,6 @@ package com.powersync.db
 
 import co.touchlab.kermit.Logger
 import com.powersync.DatabaseDriverFactory
-import com.powersync.ExperimentalPowerSyncAPI
 import com.powersync.PowerSyncDatabase
 import com.powersync.PowerSyncException
 import com.powersync.bucket.BucketPriority
@@ -153,7 +152,7 @@ internal class PowerSyncDatabaseImpl(
         crudThrottleMs: Long,
         retryDelayMs: Long,
         params: Map<String, JsonParam?>,
-        options: SyncOptions
+        options: SyncOptions,
     ) {
         waitReady()
         mutex.withLock {