Merge pull request #411 from joreilly/sql_delight_wasm

SQLDelight Wasm aupport

Author: joreilly

common/build.gradle.kts

@@ -1,3 +1,8 @@
+@file:OptIn(ExperimentalWasmDsl::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
+
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.android.library)
@@ -36,11 +41,16 @@ kotlin {
     androidTarget()
     jvm()
 
-    js(IR) {
-        useCommonJs()
-        browser()
+    wasmJs {
+        moduleName = "peopleinspaceShared"
+        browser {
+            commonWebpackConfig {
+                outputFileName = "peopleinspaceShared.js"
+            }
+        }
     }
 
+
     sourceSets {
         commonMain.dependencies {
             implementation(libs.bundles.ktor.common)
@@ -83,22 +93,27 @@ kotlin {
             implementation(libs.ktor.client.java)
             implementation(libs.sqldelight.sqlite.driver)
             implementation(libs.slf4j)
+            implementation(libs.kotlinx.coroutines.swing)
         }
 
         appleMain.dependencies {
             implementation(libs.ktor.client.darwin)
             implementation(libs.sqldelight.native.driver)
         }
 
-        jsMain.dependencies {
-            implementation(libs.ktor.client.js)
+        wasmJsMain.dependencies {
+            implementation(libs.sqldelight.web.driver)
+            implementation(npm("@cashapp/sqldelight-sqljs-worker", "2.1.0"))
+            implementation(npm("sql.js", libs.versions.sqlJs.get()))
+            implementation(devNpm("copy-webpack-plugin", libs.versions.webPackPlugin.get()))
         }
     }
 }
 
 sqldelight {
     databases {
         create("PeopleInSpaceDatabase") {
+            generateAsync = true
             packageName.set("com.surrus.peopleinspace.db")
         }
     }

common/src/androidMain/kotlin/com/surrus/common/repository/actual.kt

@@ -1,5 +1,6 @@
 package com.surrus.common.repository
 
+import app.cash.sqldelight.async.coroutines.synchronous
 import app.cash.sqldelight.driver.android.AndroidSqliteDriver
 import com.surrus.common.di.PeopleInSpaceDatabaseWrapper
 import com.surrus.peopleinspace.db.PeopleInSpaceDatabase
@@ -12,9 +13,9 @@ import org.koin.dsl.module
 actual fun platformModule() = module {
     single {
         val driver =
-            AndroidSqliteDriver(PeopleInSpaceDatabase.Schema, get(), "peopleinspace.db")
+            AndroidSqliteDriver(PeopleInSpaceDatabase.Schema.synchronous(), get(), "peopleinspace.db")
 
-        PeopleInSpaceDatabaseWrapper(PeopleInSpaceDatabase(driver))
+        PeopleInSpaceDatabaseWrapper(driver, PeopleInSpaceDatabase(driver))
     }
     single<HttpClientEngine> { Android.create() }
 }

common/src/commonMain/kotlin/com/surrus/common/di/PeopleInSpaceDatabaseWrapper.kt

@@ -1,5 +1,6 @@
 package com.surrus.common.di
 
+import app.cash.sqldelight.db.SqlDriver
 import com.surrus.peopleinspace.db.PeopleInSpaceDatabase
 
-class PeopleInSpaceDatabaseWrapper(val instance: PeopleInSpaceDatabase?)
+class PeopleInSpaceDatabaseWrapper(val driver: SqlDriver, val instance: PeopleInSpaceDatabase)

common/src/commonMain/kotlin/com/surrus/common/repository/PeopleInSpaceRepository.kt

@@ -1,12 +1,14 @@
 package com.surrus.common.repository
 
+import app.cash.sqldelight.async.coroutines.awaitCreate
 import app.cash.sqldelight.coroutines.asFlow
 import app.cash.sqldelight.coroutines.mapToList
 import co.touchlab.kermit.Logger
 import com.surrus.common.di.PeopleInSpaceDatabaseWrapper
 import com.surrus.common.remote.Assignment
 import com.surrus.common.remote.IssPosition
 import com.surrus.common.remote.PeopleInSpaceApi
+import com.surrus.peopleinspace.db.PeopleInSpaceDatabase
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 
@@ -24,12 +26,14 @@ class PeopleInSpaceRepository(
 ) : PeopleInSpaceRepositoryInterface {
 
     val coroutineScope: CoroutineScope = MainScope()
-    private val peopleInSpaceQueries = peopleInSpaceDatabase.instance?.peopleInSpaceQueries
+    private val peopleInSpaceQueries = peopleInSpaceDatabase.instance.peopleInSpaceQueries
 
     val logger = Logger.withTag("PeopleInSpaceRepository")
 
     init {
         coroutineScope.launch {
+            // TODO figure out cleaner place to invoke this
+            PeopleInSpaceDatabase.Schema.awaitCreate(peopleInSpaceDatabase.driver)
             fetchAndStorePeople()
         }
     }

common/src/commonMain/sqldelight/com/surrus/peopleinspace/db/PeopleInSpace.sq

@@ -1,4 +1,4 @@
-CREATE TABLE People(
+CREATE TABLE IF NOT EXISTS People(
   name TEXT NOT NULL PRIMARY KEY,
   craft TEXT NOT NULL,
   personImageUrl TEXT,

common/src/iOSMain/kotlin/com/surrus/common/repository/actual.kt

@@ -1,5 +1,6 @@
 package com.surrus.common.repository
 
+import app.cash.sqldelight.async.coroutines.synchronous
 import app.cash.sqldelight.driver.native.NativeSqliteDriver
 import com.surrus.common.di.PeopleInSpaceDatabaseWrapper
 import com.surrus.peopleinspace.db.PeopleInSpaceDatabase
@@ -10,8 +11,8 @@ import org.koin.dsl.module
 
 actual fun platformModule() = module {
     single {
-        val driver = NativeSqliteDriver(PeopleInSpaceDatabase.Schema, "peopleinspace.db")
-        PeopleInSpaceDatabaseWrapper(PeopleInSpaceDatabase(driver))
+        val driver = NativeSqliteDriver(PeopleInSpaceDatabase.Schema.synchronous(), "peopleinspace.db")
+        PeopleInSpaceDatabaseWrapper(driver, PeopleInSpaceDatabase(driver))
     }
     single<HttpClientEngine> { Darwin.create() }
 }

common/src/jsMain/kotlin/com/surrus/common/repository/actual.kt

@@ -10,7 +10,7 @@ actual fun platformModule() = module {
     single {
         val driver = JdbcSqliteDriver(JdbcSqliteDriver.IN_MEMORY)
             .also { PeopleInSpaceDatabase.Schema.create(it) }
-        PeopleInSpaceDatabaseWrapper(PeopleInSpaceDatabase(driver))
+        PeopleInSpaceDatabaseWrapper(driver, PeopleInSpaceDatabase(driver))
     }
     single { Java.create() }
 }

common/src/jvmMain/kotlin/com/surrus/common/repository/actual.kt

@@ -0,0 +1,16 @@
+package com.surrus.common.repository
+
+import app.cash.sqldelight.driver.worker.createDefaultWebWorkerDriver
+import com.surrus.common.di.PeopleInSpaceDatabaseWrapper
+import com.surrus.peopleinspace.db.PeopleInSpaceDatabase
+import io.ktor.client.engine.HttpClientEngine
+import io.ktor.client.engine.js.Js
+import org.koin.dsl.module
+
+actual fun platformModule() = module {
+    single {
+        val driver = createDefaultWebWorkerDriver()
+        PeopleInSpaceDatabaseWrapper(driver, PeopleInSpaceDatabase(driver))
+    }
+    single<HttpClientEngine>  { Js.create() }
+}

common/src/wasmJsMain/kotlin/com/surrus/common/repository/actual.kt

@@ -5,5 +5,8 @@ import androidx.compose.ui.Modifier
 import com.surrus.common.viewmodel.ISSPositionViewModel
 
 @Composable
-actual fun ISSMapView(modifier: Modifier, viewModel: ISSPositionViewModel) {
+actual fun ISSMapView(
+    modifier: Modifier,
+    viewModel: ISSPositionViewModel
+) {
 }