Commonize

core/build.gradle.kts

@@ -1,4 +1,5 @@
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
     kotlin("multiplatform")
@@ -23,28 +24,28 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
+            implementation(project(":external"))
+
             api(libs.coroutines.core)
         }
 
         commonTest.dependencies {
-            implementation(kotlin("test-common"))
-            implementation(kotlin("test-annotations-common"))
-        }
-
-        jsMain.dependencies {
-            implementation(project(":external"))
+            implementation(kotlin("test"))
+            implementation(libs.coroutines.test)
         }
 
         jsTest.dependencies {
             implementation(kotlin("test-js"))
         }
 
-        wasmJsMain.dependencies {
-            implementation(project(":external"))
-        }
-
         wasmJsTest.dependencies {
             implementation(kotlin("test-wasm-js"))
         }
     }
 }
+
+tasks.withType<KotlinCompilationTask<*>>().configureEach {
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
+}

core/src/wasmJsMain/kotlin/Cursor.kt → core/src/commonMain/kotlin/Cursor.kt

@@ -1,17 +1,17 @@
-package com.juul.indexeddb
-
 import com.juul.indexeddb.external.IDBCursor
 import com.juul.indexeddb.external.IDBCursorWithValue
+import com.juul.indexeddb.external.IDBKey
+import com.juul.indexeddb.external.JsAny
 import kotlinx.coroutines.channels.SendChannel
 
 public open class Cursor internal constructor(
     internal open val cursor: IDBCursor,
     private val channel: SendChannel<*>,
 ) {
-    public val key: JsAny
+    public val key: IDBKey
         get() = cursor.key
 
-    public val primaryKey: JsAny
+    public val primaryKey: IDBKey
         get() = cursor.primaryKey
 
     public fun close() {
@@ -26,12 +26,12 @@ public open class Cursor internal constructor(
         cursor.advance(count)
     }
 
-    public fun `continue`(key: Key) {
-        cursor.`continue`(key.toJs())
+    public fun `continue`(key: IDBKey) {
+        cursor.`continue`(key)
     }
 
-    public fun continuePrimaryKey(key: Key, primaryKey: Key) {
-        cursor.continuePrimaryKey(key.toJs(), primaryKey.toJs())
+    public fun continuePrimaryKey(key: IDBKey, primaryKey: IDBKey) {
+        cursor.continuePrimaryKey(key, primaryKey)
     }
 
     public enum class Direction(

core/src/wasmJsMain/kotlin/CursorStart.kt → core/src/commonMain/kotlin/CursorStart.kt

@@ -1,6 +1,5 @@
-package com.juul.indexeddb
-
 import com.juul.indexeddb.external.IDBCursor
+import com.juul.indexeddb.external.IDBKey
 
 public sealed class CursorStart {
 
@@ -15,19 +14,19 @@ public sealed class CursorStart {
     }
 
     public data class Continue(
-        val key: Key,
+        val key: IDBKey,
     ) : CursorStart() {
         override fun apply(cursor: IDBCursor) {
-            cursor.`continue`(key.toJs())
+            cursor.`continue`(key)
         }
     }
 
     public data class ContinuePrimaryKey(
-        val key: Key,
-        val primaryKey: Key,
+        val key: IDBKey,
+        val primaryKey: IDBKey,
     ) : CursorStart() {
         override fun apply(cursor: IDBCursor) {
-            cursor.continuePrimaryKey(key.toJs(), primaryKey.toJs())
+            cursor.continuePrimaryKey(key, primaryKey)
         }
     }
 }

core/src/wasmJsMain/kotlin/Database.kt → core/src/commonMain/kotlin/Database.kt

@@ -1,12 +1,11 @@
-package com.juul.indexeddb
-
 import com.juul.indexeddb.external.IDBDatabase
 import com.juul.indexeddb.external.IDBFactory
 import com.juul.indexeddb.external.IDBTransactionDurability
 import com.juul.indexeddb.external.IDBTransactionOptions
 import com.juul.indexeddb.external.IDBVersionChangeEvent
 import com.juul.indexeddb.external.indexedDB
-import kotlinx.browser.window
+import com.juul.indexeddb.external.window
+import com.juul.indexeddb.selfIndexedDB
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
@@ -91,9 +90,7 @@ public class Database internal constructor(
 
         val transaction = Transaction(
             ensureDatabase().transaction(
-                storeNames = ReadonlyArray(
-                    *store.map { it.toJsString() }.toTypedArray(),
-                ),
+                storeNames = store.toReadonlyArray(),
                 mode = "readonly",
                 options = IDBTransactionOptions(durability),
             ),
@@ -121,9 +118,7 @@ public class Database internal constructor(
         val transaction = WriteTransaction(
             ensureDatabase()
                 .transaction(
-                    storeNames = ReadonlyArray(
-                        *store.map { it.toJsString() }.toTypedArray(),
-                    ),
+                    storeNames = store.toReadonlyArray(),
                     mode = "readwrite",
                     options = IDBTransactionOptions(durability),
                 ),
@@ -145,6 +140,3 @@ public class Database internal constructor(
         database = null
     }
 }
-
-@Suppress("RedundantNullableReturnType")
-private val selfIndexedDB: IDBFactory? = js("self.indexedDB || self.webkitIndexedDB")

core/src/wasmJsMain/kotlin/Exceptions.kt → core/src/commonMain/kotlin/Exceptions.kt

@@ -1,6 +1,4 @@
-package com.juul.indexeddb
-
-import org.w3c.dom.events.Event
+import com.juul.indexeddb.external.Event
 
 public abstract class EventException(
     message: String?,

core/src/commonMain/kotlin/Index.kt

@@ -0,0 +1,31 @@
+import com.juul.indexeddb.external.IDBCursor
+import com.juul.indexeddb.external.IDBCursorWithValue
+import com.juul.indexeddb.external.IDBIndex
+import com.juul.indexeddb.external.IDBKey
+import com.juul.indexeddb.external.JsNumber
+import com.juul.indexeddb.external.ReadonlyArray
+
+public class Index internal constructor(
+    internal val index: IDBIndex,
+) : Queryable() {
+    override fun requestGet(key: IDBKey): Request<*> =
+        Request(index.get(key))
+
+    override fun requestGetAll(query: IDBKey?): Request<ReadonlyArray<*>> =
+        Request(index.getAll(query))
+
+    override fun requestOpenCursor(
+        query: IDBKey?,
+        direction: Cursor.Direction,
+    ): Request<IDBCursorWithValue?> =
+        Request(index.openCursor(query, direction.constant))
+
+    override fun requestOpenKeyCursor(
+        query: IDBKey?,
+        direction: Cursor.Direction,
+    ): Request<IDBCursor?> =
+        Request(index.openKeyCursor(query, direction.constant))
+
+    override fun requestCount(query: IDBKey?): Request<JsNumber> =
+        Request(index.count(query))
+}

core/src/commonMain/kotlin/JsArray.kt

@@ -0,0 +1,29 @@
+import com.juul.indexeddb.external.JsAny
+import com.juul.indexeddb.external.JsArray
+import com.juul.indexeddb.external.JsString
+import com.juul.indexeddb.external.ReadonlyArray
+import com.juul.indexeddb.external.set
+import com.juul.indexeddb.external.toJsString
+import com.juul.indexeddb.toReadonlyArray
+
+internal fun Array<out String>.toReadonlyArray(): ReadonlyArray<JsString> =
+    JsArray<JsString>()
+        .apply {
+            forEachIndexed { index, s ->
+                set(index, s.toJsString())
+            }
+        }.toReadonlyArray()
+
+internal fun Iterable<String?>.toJsArray(): JsArray<JsString?> =
+    JsArray<JsString?>().apply {
+        forEachIndexed { index, s ->
+            set(index, s?.toJsString())
+        }
+    }
+
+internal fun <T : JsAny?> JsArray(vararg values: T): JsArray<T> =
+    JsArray<T>().apply {
+        for (i in values.indices) {
+            set(i, values[i])
+        }
+    }

core/src/commonMain/kotlin/Jso.kt

@@ -0,0 +1,9 @@
+package com.juul.indexeddb
+
+import com.juul.indexeddb.external.JsAny
+
+// Copied from:
+// https://github.com/JetBrains/kotlin-wrappers/blob/91b2c1568ec6f779af5ec10d89b5e2cbdfe785ff/kotlin-extensions/src/main/kotlin/kotlinx/js/jso.kt
+
+internal expect fun <T : JsAny> jso(): T
+internal fun <T : JsAny> jso(block: T.() -> Unit): T = jso<T>().apply(block)

core/src/commonMain/kotlin/Key.kt

@@ -0,0 +1,39 @@
+import com.juul.indexeddb.external.IDBKey
+import com.juul.indexeddb.external.IDBKeyRange
+import com.juul.indexeddb.external.JsAny
+import com.juul.indexeddb.external.toJsString
+
+public object AutoIncrement
+
+public class KeyPath private constructor(
+    private val paths: List<String?>,
+) {
+    init {
+        require(paths.isNotEmpty()) { "A key path must have at least one member." }
+    }
+
+    public constructor(path: String?, vararg morePaths: String?) : this(listOf(path, *morePaths))
+
+    internal fun toJs(): JsAny? = if (paths.size == 1) paths[0]?.toJsString() else paths.toJsArray()
+}
+
+public fun lowerBound(
+    x: JsAny?,
+    open: Boolean = false,
+): IDBKey = IDBKey(IDBKeyRange.lowerBound(x, open))
+
+public fun upperBound(
+    y: JsAny?,
+    open: Boolean = false,
+): IDBKey = IDBKey(IDBKeyRange.upperBound(y, open))
+
+public fun bound(
+    x: JsAny?,
+    y: JsAny?,
+    lowerOpen: Boolean = false,
+    upperOpen: Boolean = false,
+): IDBKey = IDBKey(IDBKeyRange.bound(x, y, lowerOpen, upperOpen))
+
+public fun only(
+    z: JsAny?,
+): IDBKey = IDBKey(IDBKeyRange.only(z))

core/src/commonMain/kotlin/ObjectStore.kt

@@ -0,0 +1,25 @@
+import com.juul.indexeddb.external.IDBCursor
+import com.juul.indexeddb.external.IDBCursorWithValue
+import com.juul.indexeddb.external.IDBKey
+import com.juul.indexeddb.external.IDBObjectStore
+import com.juul.indexeddb.external.JsNumber
+import com.juul.indexeddb.external.ReadonlyArray
+
+public class ObjectStore internal constructor(
+    internal val objectStore: IDBObjectStore,
+) : Queryable() {
+    override fun requestGet(key: IDBKey): Request<*> =
+        Request(objectStore.get(key))
+
+    override fun requestGetAll(query: IDBKey?): Request<ReadonlyArray<*>> =
+        Request(objectStore.getAll(query))
+
+    override fun requestOpenCursor(query: IDBKey?, direction: Cursor.Direction): Request<IDBCursorWithValue?> =
+        Request(objectStore.openCursor(query, direction.constant))
+
+    override fun requestOpenKeyCursor(query: IDBKey?, direction: Cursor.Direction): Request<IDBCursor?> =
+        Request(objectStore.openKeyCursor(query, direction.constant))
+
+    override fun requestCount(query: IDBKey?): Request<JsNumber> =
+        Request(objectStore.count(query))
+}

core/src/wasmJsMain/kotlin/OnNextEvent.kt → core/src/commonMain/kotlin/OnNextEvent.kt

@@ -1,8 +1,6 @@
-package com.juul.indexeddb
-
+import com.juul.indexeddb.external.Event
+import com.juul.indexeddb.external.EventTarget
 import kotlinx.coroutines.suspendCancellableCoroutine
-import org.w3c.dom.events.Event
-import org.w3c.dom.events.EventTarget
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 

core/src/commonMain/kotlin/Platform.kt

@@ -0,0 +1,16 @@
+package com.juul.indexeddb
+
+import com.juul.indexeddb.external.IDBFactory
+import com.juul.indexeddb.external.JsAny
+import com.juul.indexeddb.external.JsArray
+import com.juul.indexeddb.external.JsByteArray
+import com.juul.indexeddb.external.ReadonlyArray
+import com.juul.indexeddb.external.toJsByteArray
+
+internal expect val selfIndexedDB: IDBFactory?
+
+internal expect fun <T : JsAny?> JsArray<T>.toReadonlyArray(): ReadonlyArray<T>
+
+internal expect fun <T : JsAny?> JsAny.unsafeCast(): T
+
+internal fun ByteArray.toJsByteArray(): JsByteArray = toTypedArray().toJsByteArray()

core/src/commonMain/kotlin/Queryable.kt

@@ -0,0 +1,13 @@
+import com.juul.indexeddb.external.IDBCursor
+import com.juul.indexeddb.external.IDBCursorWithValue
+import com.juul.indexeddb.external.IDBKey
+import com.juul.indexeddb.external.JsNumber
+import com.juul.indexeddb.external.ReadonlyArray
+
+public sealed class Queryable {
+    internal abstract fun requestGet(key: IDBKey): Request<*>
+    internal abstract fun requestGetAll(query: IDBKey?): Request<ReadonlyArray<*>>
+    internal abstract fun requestOpenCursor(query: IDBKey?, direction: Cursor.Direction): Request<IDBCursorWithValue?>
+    internal abstract fun requestOpenKeyCursor(query: IDBKey?, direction: Cursor.Direction): Request<IDBCursor?>
+    internal abstract fun requestCount(query: IDBKey?): Request<JsNumber>
+}

core/src/commonMain/kotlin/Request.kt

@@ -0,0 +1,6 @@
+import com.juul.indexeddb.external.IDBRequest
+import com.juul.indexeddb.external.JsAny
+
+internal class Request<T : JsAny?> internal constructor(
+    internal val request: IDBRequest<T>,
+)