feat: voyager integration wasm support only

programadorthi · Jun 25, 2024 · 36773d1 · 36773d1
1 parent 689a71d
commit 36773d1
Show file tree

Hide file tree

Showing 13 changed files with 98 additions and 44 deletions.
diff --git a/integration/voyager/build.gradle.kts b/integration/voyager/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
@@ -24,12 +27,37 @@ kotlin {
 
     configureJs()
 
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        nodejs()
+        browser()
+    }
+
+    configureWasm()
+
     macosX64()
     macosArm64()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
 
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
+    applyHierarchyTemplate {
+        common {
+            withJvm()
+
+            group("jsAndWasmShared") {
+                withJs()
+                withWasm()
+            }
+
+            group("native") {
+                group("macos") { withMacos() }
+                group("ios") { withIos() }
+            }
+        }
+    }
+
     sourceSets {
         commonMain {
             dependencies {
@@ -40,48 +68,37 @@ kotlin {
             }
         }
 
-        val jsMain by getting {
+        commonTest {
             dependencies {
-                implementation(libs.serialization.json)
+                implementation(kotlin("test"))
             }
         }
 
-        val jvmMain by getting {
-            dependsOn(commonMain.get())
+        jvmMain {
             dependencies {
                 api(libs.slf4j.api)
             }
         }
-        val jvmTest by getting {
-            dependsOn(commonTest.get())
+
+        jvmTest {
             dependencies {
                 implementation(libs.test.junit)
                 implementation(libs.test.coroutines.debug)
                 implementation(libs.test.kotlin.test.junit)
             }
         }
 
-        val nativeMain by creating {
-            dependsOn(commonMain.get())
+        val jsAndWasmSharedMain by getting {
+            dependencies {
+                implementation(kotlin("stdlib"))
+                implementation(libs.serialization.json)
+            }
         }
+    }
+}
 
-        val macosMain by creating {
-            dependsOn(nativeMain)
-        }
-        val macosX64Main by getting {
-            dependsOn(macosMain)
-        }
-        val macosArm64Main by getting {
-            dependsOn(macosMain)
-        }
-        val iosX64Main by getting {
-            dependsOn(nativeMain)
-        }
-        val iosArm64Main by getting {
-            dependsOn(nativeMain)
-        }
-        val iosSimulatorArm64Main by getting {
-            dependsOn(nativeMain)
-        }
+tasks.configureEach {
+    if (name == "compileJsAndWasmSharedMainKotlinMetadata") {
+        enabled = false
     }
 }
diff --git a/integration/voyager/common/src/dev/programadorthi/routing/voyager/VoyagerRoutingBuilder.kt b/integration/voyager/common/src/dev/programadorthi/routing/voyager/VoyagerRoutingBuilder.kt
@@ -50,9 +50,15 @@ public suspend fun PipelineContext<Unit, ApplicationCall>.screen(
     }
 
     when (call.routeMethod) {
-        RouteMethod.Push -> call.platformPush(routing, body)
-        RouteMethod.Replace -> call.platformReplace(routing, body)
-        RouteMethod.ReplaceAll -> call.platformReplaceAll(routing, body)
+        RouteMethod.Push -> call.platformPush(routing, body) {
+            call.voyagerNavigator.push(body())
+        }
+        RouteMethod.Replace -> call.platformReplace(routing, body) {
+            call.voyagerNavigator.replace(body())
+        }
+        RouteMethod.ReplaceAll -> call.platformReplaceAll(routing, body) {
+            call.voyagerNavigator.replaceAll(body())
+        }
         else ->
             error(
                 "Voyager needs a stack route method to work. You called a screen ${call.uri} using " +

diff --git a/...ration/voyager/common/src/dev/programadorthi/routing/voyager/history/VoyagerHistoryExt.kt b/...ration/voyager/common/src/dev/programadorthi/routing/voyager/history/VoyagerHistoryExt.kt
@@ -8,16 +8,19 @@ import dev.programadorthi.routing.core.application.ApplicationCall
 internal expect suspend fun ApplicationCall.platformPush(
     routing: Routing,
     body: suspend () -> Screen,
+    fallback: suspend () -> Unit,
 )
 
 internal expect suspend fun ApplicationCall.platformReplace(
     routing: Routing,
     body: suspend () -> Screen,
+    fallback: suspend () -> Unit,
 )
 
 internal expect suspend fun ApplicationCall.platformReplaceAll(
     routing: Routing,
     body: suspend () -> Screen,
+    fallback: suspend () -> Unit,
 )
 
 internal expect fun ApplicationCall.shouldNeglect(): Boolean

diff --git a/integration/voyager/js/src/dev/programadorthi/routing/voyager/SerializableType.kt b/integration/voyager/js/src/dev/programadorthi/routing/voyager/SerializableType.kt
@@ -0,0 +1,4 @@
+package dev.programadorthi.routing.voyager
+
+@Suppress("UNCHECKED_CAST")
+public actual fun <T> String.toSerializableType(): T = this as T
diff --git a/...ration/voyager/jsAndWasmShared/src/dev/programadorthi/routing/voyager/SerializableType.kt b/...ration/voyager/jsAndWasmShared/src/dev/programadorthi/routing/voyager/SerializableType.kt
@@ -0,0 +1,3 @@
+package dev.programadorthi.routing.voyager
+
+public expect fun <T> String.toSerializableType(): T
diff --git a/...i/routing/voyager/VoyagerRoutingExt.js.kt → ...i/routing/voyager/VoyagerRoutingExt.js.kt b/...i/routing/voyager/VoyagerRoutingExt.js.kt → ...i/routing/voyager/VoyagerRoutingExt.js.kt
diff --git a/...ger/history/VoyagerHistoryAttribute.js.kt → ...ger/history/VoyagerHistoryAttribute.js.kt b/...ger/history/VoyagerHistoryAttribute.js.kt → ...ger/history/VoyagerHistoryAttribute.js.kt
diff --git a/...g/voyager/history/VoyagerHistoryExt.js.kt → ...g/voyager/history/VoyagerHistoryExt.js.kt b/...g/voyager/history/VoyagerHistoryExt.js.kt → ...g/voyager/history/VoyagerHistoryExt.js.kt
@@ -6,7 +6,6 @@ import cafe.adriel.voyager.core.screen.Screen
 import dev.programadorthi.routing.core.Routing
 import dev.programadorthi.routing.core.application
 import dev.programadorthi.routing.core.application.ApplicationCall
-import dev.programadorthi.routing.voyager.voyagerNavigator
 import kotlinx.browser.window
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -21,8 +20,12 @@ internal actual fun ApplicationCall.shouldNeglect(): Boolean = neglect
 internal actual suspend fun ApplicationCall.platformPush(
     routing: Routing,
     body: suspend () -> Screen,
+    fallback: suspend () -> Unit,
 ) {
-    voyagerNavigator.push(body())
+    if (routing.historyMode == VoyagerHistoryMode.Memory) {
+        fallback()
+        return
+    }
     window.history.pushState(
         title = "routing",
         url = uriToAddressBar(),
@@ -33,8 +36,12 @@ internal actual suspend fun ApplicationCall.platformPush(
 internal actual suspend fun ApplicationCall.platformReplace(
     routing: Routing,
     body: suspend () -> Screen,
+    fallback: suspend () -> Unit,
 ) {
-    voyagerNavigator.replace(body())
+    if (routing.historyMode == VoyagerHistoryMode.Memory) {
+        fallback()
+        return
+    }
     window.history.replaceState(
         title = "routing",
         url = uriToAddressBar(),
@@ -45,8 +52,12 @@ internal actual suspend fun ApplicationCall.platformReplace(
 internal actual suspend fun ApplicationCall.platformReplaceAll(
     routing: Routing,
     body: suspend () -> Screen,
+    fallback: suspend () -> Unit,
 ) {
-    voyagerNavigator.replaceAll(body())
+    if (routing.historyMode == VoyagerHistoryMode.Memory) {
+        fallback()
+        return
+    }
     while (true) {
         window.history.replaceState(
             title = "",

diff --git a/...voyager/history/VoyagerHistoryState.js.kt → ...voyager/history/VoyagerHistoryState.js.kt b/...voyager/history/VoyagerHistoryState.js.kt → ...voyager/history/VoyagerHistoryState.js.kt
@@ -1,12 +1,14 @@
 package dev.programadorthi.routing.voyager.history
 
 import dev.programadorthi.routing.core.application.ApplicationCall
+import dev.programadorthi.routing.voyager.toSerializableType
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
-internal fun ApplicationCall.serialize(): String {
+internal fun <T> ApplicationCall.serialize(): T {
     val state = toHistoryState()
-    return Json.encodeToString(state)
+    val encoded = Json.encodeToString(state)
+    return encoded.toSerializableType()
 }
 
 internal fun Any?.deserialize(): VoyagerHistoryState? =

diff --git a/...ation/voyager/jvm/src/dev/programadorthi/routing/voyager/history/VoyagerHistoryExt.jvm.kt b/...ation/voyager/jvm/src/dev/programadorthi/routing/voyager/history/VoyagerHistoryExt.jvm.kt
@@ -4,29 +4,31 @@ import androidx.compose.runtime.Composable
 import cafe.adriel.voyager.core.screen.Screen
 import dev.programadorthi.routing.core.Routing
 import dev.programadorthi.routing.core.application.ApplicationCall
-import dev.programadorthi.routing.voyager.voyagerNavigator
 
 internal actual fun ApplicationCall.shouldNeglect(): Boolean = false
 
 internal actual suspend fun ApplicationCall.platformPush(
     routing: Routing,
     body: suspend () -> Screen,
+    fallback: suspend () -> Unit,
 ) {
-    voyagerNavigator.push(body())
+    fallback()
 }
 
 internal actual suspend fun ApplicationCall.platformReplace(
     routing: Routing,
     body: suspend () -> Screen,
+    fallback: suspend () -> Unit,
 ) {
-    voyagerNavigator.replace(body())
+    fallback()
 }
 
 internal actual suspend fun ApplicationCall.platformReplaceAll(
     routing: Routing,
     body: suspend () -> Screen,
+    fallback: suspend () -> Unit,
 ) {
-    voyagerNavigator.replaceAll(body())
+    fallback()
 }
 
 @Composable

diff --git a/...voyager/native/src/dev/programadorthi/routing/voyager/history/VoyagerHistoryExt.native.kt b/...voyager/native/src/dev/programadorthi/routing/voyager/history/VoyagerHistoryExt.native.kt
@@ -4,29 +4,31 @@ import androidx.compose.runtime.Composable
 import cafe.adriel.voyager.core.screen.Screen
 import dev.programadorthi.routing.core.Routing
 import dev.programadorthi.routing.core.application.ApplicationCall
-import dev.programadorthi.routing.voyager.voyagerNavigator
 
 internal actual fun ApplicationCall.shouldNeglect(): Boolean = false
 
 internal actual suspend fun ApplicationCall.platformPush(
     routing: Routing,
     body: suspend () -> Screen,
+    fallback: suspend () -> Unit,
 ) {
-    voyagerNavigator.push(body())
+    fallback()
 }
 
 internal actual suspend fun ApplicationCall.platformReplace(
     routing: Routing,
     body: suspend () -> Screen,
+    fallback: suspend () -> Unit,
 ) {
-    voyagerNavigator.replace(body())
+    fallback()
 }
 
 internal actual suspend fun ApplicationCall.platformReplaceAll(
     routing: Routing,
     body: suspend () -> Screen,
+    fallback: suspend () -> Unit,
 ) {
-    voyagerNavigator.replaceAll(body())
+    fallback()
 }
 
 @Composable

diff --git a/integration/voyager/wasmJs/src/dev/programadorthi/routing/voyager/SerializableType.kt b/integration/voyager/wasmJs/src/dev/programadorthi/routing/voyager/SerializableType.kt
@@ -0,0 +1,4 @@
+package dev.programadorthi.routing.voyager
+
+@Suppress("UNCHECKED_CAST")
+public actual fun <T> String.toSerializableType(): T = this as T
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -35,7 +35,7 @@ include(":integration:compose")
 include(":integration:compose-animation")
 include(":integration:javascript")
 include(":integration:uikit")
-//include(":integration:voyager")
+include(":integration:voyager")
 
 // Samples are disabled by default to avoid sync their.
 //include(":samples:android-activity")