Fix kotlin/js code and samples (#179)

Author: Mr3zee

build.gradle.kts

@@ -7,7 +7,6 @@ import util.kotlinVersionParsed
 
 plugins {
     alias(libs.plugins.serialization) apply false
-    alias(libs.plugins.ksp) apply false
     alias(libs.plugins.kotlinx.rpc) apply false
     alias(libs.plugins.atomicfu) apply false
     alias(libs.plugins.conventions.kover)

core/src/jsMain/kotlin/kotlinx/rpc/internal/WithRPCStubObject.js.kt

@@ -39,7 +39,18 @@ public actual fun <R : Any> findRPCStubProvider(kClass: KClass<*>, resultKClass:
     )
 }
 
-private val KClass<*>.jClass get(): JsClass<*> = asDynamic().jClass_1.unsafeCast<JsClass<*>>()
+/**
+ * [KClassImpl] is internal in kjs stdlib, and it's jClass property is obfuscated by the webpack.
+ * Hence, we need to find it manually.
+ */
+private val KClass<*>.jClass get(): JsClass<*> {
+    return Object.entries(this)
+        // key (_) is obfuscated here
+        .firstOrNull { (_, value) -> value != null && Object.hasOwn(value,"\$metadata\$") }
+        ?.component2()
+        ?.unsafeCast<JsClass<*>>()
+        ?: error("jClass property was not found")
+}
 
 /**
  * Workaround for bugs in [findAssociatedObject]

gradle-conventions-settings/src/main/kotlin/util/KotlinVersion.kt

@@ -94,7 +94,7 @@ inline fun ExtensionAware.whenKotlinIsAtLeast(
     major: Int,
     minor: Int,
     patch: Int = 0,
-    action: () -> Unit,
+    action: () -> Unit = {},
 ): ActionApplied {
     val kotlinVersion: KotlinVersion by extra
 

gradle.properties

@@ -29,3 +29,12 @@ systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true
 
 # uncomment to debug compilation process
 #kotlin.compiler.execution.strategy=in-process
+
+# Otherwise produces:
+# w: A compileOnly dependency is used in targets: Kotlin/JS.
+# Dependencies:
+#    - org.jetbrains.kotlinx:atomicfu:0.22.0 (source sets: jsMain)
+#
+# Using compileOnly dependencies in these targets is not currently supported
+# because compileOnly dependencies must be present during the compilation of projects that depend on this project.
+kotlin.suppressGradlePluginWarnings=IncorrectCompileOnlyDependencyWarning

publishLocal.sh

@@ -8,5 +8,10 @@ set -euxo pipefail
 
 ./gradlew publishAllPublicationsToBuildRepoRepository
 ./gradlew -p compiler-plugin publishAllPublicationsToBuildRepoRepository
-./gradlew -p ksp-plugin publishAllPublicationsToBuildRepoRepository
 ./gradlew -p gradle-plugin publishAllPublicationsToBuildRepoRepository
+
+if [ -x "./gradlew -p ksp-plugin publishAllPublicationsToBuildRepoRepository" ]; then
+  echo "KSP is on"
+else
+  echo "KSP is off"
+fi;

samples/ktor-web-app/.gitignore

@@ -2,4 +2,5 @@
 **/.gradle
 
 local.properties
-server/src/main/resources/static
+server/src/main/resources/static/*
+!server/src/main/resources/static/index.html

samples/ktor-web-app/README.md

@@ -13,6 +13,6 @@ To run server without compiling frontend, simply run `main` function in [Applica
 
 To Run server with latest frontend use this command:
 ```bash
-./gradlew server:run
+./gradlew server:runApp
 ```
 Note that this configuration uses production distribution of frontend app, which makes each build slower, as it takes more time to compile production webpack.

samples/ktor-web-app/build.gradle.kts

@@ -6,7 +6,6 @@ plugins {
     alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.kotlinx.rpc) apply false
     alias(libs.plugins.kotlinx.rpc.platform) apply false
-    alias(libs.plugins.ksp) apply false
 }
 
 allprojects {

samples/ktor-web-app/frontend/src/jsMain/kotlin/App.kt

@@ -2,10 +2,8 @@
  * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-import kotlinx.coroutines.flow.flow
 import kotlinx.rpc.RPCClient
 import kotlinx.rpc.withService
-import kotlinx.rpc.streamScoped
 import react.FC
 import react.Props
 import react.dom.html.ReactHTML.div
@@ -39,21 +37,13 @@ val AppContainer = FC<AppContainerProps> { props ->
 
     useEffectOnceAsync {
         val greeting = service.hello("Alex", UserData("Berlin", "Smith"))
-        data = WelcomeData(
-            greeting,
-            flow {
-                streamScoped {
-                    service.subscribeToNews().collect {
-                        emit(it)
-                    }
-                }
-            },
-        )
+        data = WelcomeData(greeting)
     }
 
     data?.also { welcomeData ->
         Welcome {
             this.data = welcomeData
+            this.service = service
         }
     } ?: run {
         div {

samples/ktor-web-app/frontend/src/jsMain/kotlin/Welcome.kt

@@ -4,6 +4,7 @@
 
 import emotion.react.css
 import kotlinx.coroutines.flow.Flow
+import kotlinx.rpc.streamScoped
 import react.FC
 import react.Props
 import react.dom.html.ReactHTML.div
@@ -16,30 +17,32 @@ import web.cssom.px
 
 data class WelcomeData(
     val serverGreeting: String,
-    val news: Flow<String>,
 )
 
 external interface WelcomeProps : Props {
+    var service: MyService
     var data: WelcomeData
 }
 
-fun useArticles(data: WelcomeData): List<String> {
+fun useArticles(service: MyService): List<String> {
     var articles by useState(emptyList<String>())
 
     useEffectOnceAsync {
         var localArticles = articles
-        data.news.collect {
-            @Suppress("SuspiciousCollectionReassignment")
-            localArticles += it
-            articles = localArticles
+        streamScoped {
+            service.subscribeToNews().collect {
+                @Suppress("SuspiciousCollectionReassignment")
+                localArticles += it
+                articles = localArticles
+            }
         }
     }
 
     return articles
 }
 
 val Welcome = FC<WelcomeProps> { props ->
-    val articles = useArticles(props.data)
+    val articles = useArticles(props.service)
 
     div {
         css {