Add KTO

Author: JSMonk

build.gradle.kts

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack
 
 val serializationVersion = "1.6.2"
-val ktorVersion = "2.3.0"
+val ktorVersion = "3.0.0-wasm2"
 val logbackVersion = "1.2.11"
 val kotlinWrappersVersion = "1.0.0-pre.561"
 val kmongoVersion = "4.5.0"
@@ -19,6 +19,7 @@ version = "1.0-SNAPSHOT"
 repositories {
     mavenCentral()
     maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
 }
 
 kotlin {
@@ -38,6 +39,10 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
+                implementation(compose.runtime)
+                implementation("io.ktor:ktor-client-core:$ktorVersion")
+                implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
+                implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion")
             }
         }
@@ -51,7 +56,6 @@ kotlin {
 
         val jvmMain by getting {
             dependencies {
-                implementation("io.ktor:ktor-client-core:$ktorVersion")
                 implementation("io.ktor:ktor-serialization:$ktorVersion")
                 implementation("io.ktor:ktor-server-content-negotiation:$ktorVersion")
                 implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
@@ -66,10 +70,7 @@ kotlin {
 
         val jsMain by getting {
             dependencies {
-                implementation("io.ktor:ktor-client-core:$ktorVersion")
                 implementation("io.ktor:ktor-client-js:$ktorVersion")
-                implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
-                implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
                 implementation(project.dependencies.enforcedPlatform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:$kotlinWrappersVersion"))
                 implementation("org.jetbrains.kotlin-wrappers:kotlin-react")
                 implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom")
@@ -78,7 +79,6 @@ kotlin {
 
         val wasmJsMain by getting {
             dependencies {
-                implementation(compose.runtime)
                 implementation(compose.ui)
                 implementation(compose.foundation)
                 implementation(compose.material3)

src/jsMain/kotlin/Api.kt renamed to src/commonMain/kotlin/Api.kt

@@ -33,12 +33,12 @@ fun ShoppingList(viewModel: ShoppingListViewModel) {
     ShoppingListTheme {
         Surface {
             Column(Modifier.fillMaxSize()) {
-                Input(onCreateItem = viewModel::addShoppingListItem)
+                Input(onCreateItem = viewModel::pushShoppingListItem)
                 LazyColumn {
                     items(shoppingList.size) { index ->
                         ShoppingItem(
                             shoppingListItem = shoppingList[index],
-                            onDeleteClick = viewModel::deleteShoppingListItem
+                            onDeleteClick = viewModel::removeShoppingListItem
                         )
                     }
                 }
@@ -66,12 +66,11 @@ fun Input(onCreateItem: (ShoppingListItem) -> Unit) = Column {
 
         OutlinedTextField(
             value = input.value,
+            singleLine = true,
             onValueChange = { input.value = it },
             keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
             keyboardActions = KeyboardActions(onDone = { createShoppingItem() }),
-            modifier = Modifier
-                .weight(1f)
-                .padding(8.dp),
+            modifier = Modifier.weight(1f).padding(8.dp),
         )
         OutlinedButton(
             onClick = { createShoppingItem() },
@@ -88,7 +87,7 @@ fun ShoppingItem(shoppingListItem: ShoppingListItem, onDeleteClick: (ShoppingLis
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(8.dp),
+            .padding(16.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Text("[${shoppingListItem.priority}] ${shoppingListItem.desc}", Modifier.weight(1f))

src/wasmJsMain/kotlin/Api.kt

@@ -7,27 +7,25 @@ import kotlinx.coroutines.promise
 
 @OptIn(DelicateCoroutinesApi::class)
 class ShoppingListViewModel {
-    private val jsonClient = HttpClient()
-
     var shoppingList by mutableStateOf(listOf<ShoppingListItem>())
         private set
 
     fun fetchShoppingList() {
         GlobalScope.promise {
-            shoppingList = jsonClient.get(ShoppingListItem.path)
+            shoppingList = getShoppingList()
         }
     }
 
-    fun addShoppingListItem(shoppingListItem: ShoppingListItem) {
+    fun pushShoppingListItem(shoppingListItem: ShoppingListItem) {
         GlobalScope.promise {
-            jsonClient.post(ShoppingListItem.path, shoppingListItem)
+            addShoppingListItem(shoppingListItem)
             shoppingList += shoppingListItem
         }
     }
 
-    fun deleteShoppingListItem(shoppingListItem: ShoppingListItem) {
+    fun removeShoppingListItem(shoppingListItem: ShoppingListItem) {
         GlobalScope.promise {
-            jsonClient.delete(ShoppingListItem.path + "/${shoppingListItem.id}")
+            deleteShoppingListItem(shoppingListItem)
             shoppingList -= shoppingListItem
         }
     }