tests sharing and improvements of engine

Author: Alex009

buildSrc/src/main/kotlin/Deps.kt

@@ -30,6 +30,7 @@ object Deps {
             const val material = "com.google.android.material:material:$materialDesignVersion"
             const val lifecycle = "androidx.lifecycle:lifecycle-extensions:$androidLifecycleVersion"
 
+            const val kotlinTestJUnit = "org.jetbrains.kotlin:kotlin-test-junit:$kotlinTestVersion"
             const val testRunner = "androidx.test:runner:$androidCoreTestingVersion"
             const val testRules = "androidx.test:rules:$androidCoreTestingVersion"
             const val testJUnitExt = "androidx.test.ext:junit:$testJUnitExtVersion"

javascript/build.gradle.kts

@@ -18,7 +18,20 @@ android {
         exclude("META-INF/*.kotlin_module")
         exclude("META-INF/AL2.0")
         exclude("META-INF/LGPL2.1")
+    }
+}
+
+kotlin {
+    sourceSets {
+        val mobileDeviceTest by creating
+
+        val commonTest by getting
+        val iosTest by getting
+        val androidAndroidTest by getting
 
+        mobileDeviceTest.dependsOn(commonTest)
+        iosTest.dependsOn(mobileDeviceTest)
+        androidAndroidTest.dependsOn(mobileDeviceTest)
     }
 }
 
@@ -31,6 +44,7 @@ dependencies {
     commonTestImplementation(Deps.Libs.MultiPlatform.kotlinTestAnnotations)
     commonTestImplementation(Deps.Libs.MultiPlatform.mokoTest)
 
+    androidTestImplementation(Deps.Libs.Android.kotlinTestJUnit)
     androidTestImplementation(Deps.Libs.Android.testRunner)
     androidTestImplementation(Deps.Libs.Android.testRules)
     androidTestImplementation(Deps.Libs.Android.testJUnitExt)

javascript/src/androidAndroidTest/kotlin/dev/icerock/moko/javascript/JavaScriptEngineTest.kt

@@ -7,7 +7,9 @@ package dev.icerock.moko.javascript
 import app.cash.quickjs.QuickJs
 import app.cash.quickjs.QuickJsException
 import kotlinx.serialization.SerializationException
+import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 
 actual class JavaScriptEngine actual constructor() {
@@ -46,22 +48,39 @@ actual class JavaScriptEngine actual constructor() {
         return handleQuickJsResult(result)
     }
 
+    // TODO fix pass of arguments - now wrapping of string and json invalid and will be broken on multilined strings
     private fun convertContextMapToJsScript(context: Map<String, JsType>): String {
         if (context.isEmpty()) return ""
 
         return context.mapNotNull { pair ->
-            pair.value.value?.let { "var ${pair.key} = $it;" }
+            prepareValueForJs(pair.value)?.let { "var ${pair.key} = $it;" }
         }.joinToString(separator = "")
     }
 
+    private fun prepareValueForJs(valueWrapper: JsType): String? {
+        return when (valueWrapper) {
+            is JsType.Bool -> valueWrapper.value.toString()
+            is JsType.DoubleNum -> valueWrapper.value.toString()
+            is JsType.Json -> valueWrapper.value.let {
+                Json.encodeToString(JsonElement.serializer(), it)
+            }.let {
+                "JSON.parse(\"$it\")"
+            }
+            is JsType.Str -> valueWrapper.value.let {
+                "\"$it\""
+            }
+            JsType.Null -> null
+        }
+    }
+
     private fun handleQuickJsResult(result: Any?): JsType {
-        return when {
-            result == null -> JsType.Null
-            result is Boolean -> JsType.Bool(result)
-            result is Int -> JsType.IntNum(result)
-            result is Double -> JsType.DoubleNum(result)
-            result is Float -> JsType.DoubleNum(result.toDouble())
-            result is String -> try {
+        return when (result) {
+            null -> JsType.Null
+            is Boolean -> JsType.Bool(result)
+            is Int -> JsType.DoubleNum(result.toDouble())
+            is Double -> JsType.DoubleNum(result)
+            is Float -> JsType.DoubleNum(result.toDouble())
+            is String -> try {
                 val serializeResult = json.parseToJsonElement(result)
                 if (serializeResult is JsonObject) {
                     JsType.Json(serializeResult)
@@ -70,6 +89,8 @@ actual class JavaScriptEngine actual constructor() {
                 }
             } catch (ex: SerializationException) {
                 JsType.Str(result)
+            } catch (ex: IllegalStateException) {
+                JsType.Str(result)
             }
             else -> throw JavaScriptEvaluationException(
                 message = "Impossible JavaScriptEngine handler state with result [$result]"

javascript/src/androidMain/kotlin/dev/icerock/moko/javascript/JavaScriptEngine.kt

@@ -7,33 +7,23 @@ package dev.icerock.moko.javascript
 import kotlinx.serialization.json.JsonElement
 
 sealed class JsType {
-    data class Bool(val value: Boolean): JsType()
-    data class Str(val value: String): JsType()
-    data class IntNum(val value: Int): JsType()
-    data class DoubleNum(val value: Double): JsType()
-    data class Json(val value: JsonElement): JsType()
+    data class Bool(override val value: Boolean) : JsType()
+    data class Str(override val value: String) : JsType()
+    data class DoubleNum(override val value: Double) : JsType()
+    data class Json(override val value: JsonElement) : JsType()
 
     /**
      * For "undefined" and "null".
      */
-    object Null : JsType()
-}
-
-val JsType.value: Any?
-    get() {
-        return when (this) {
-            is JsType.Bool -> value
-            is JsType.Str -> value
-            is JsType.IntNum -> value
-            is JsType.DoubleNum -> value
-            is JsType.Json -> value.toString()
-            is JsType.Null -> null
-        }
+    object Null : JsType() {
+        override val value: Any? get() = null
     }
 
+    abstract val value: Any?
+}
+
 fun JsType.boolValue(): Boolean = (this as JsType.Bool).value
 fun JsType.stringValue(): String = (this as JsType.Str).value
-fun JsType.intValue(): Int = (this as JsType.IntNum).value
 fun JsType.doubleValue(): Double = (this as JsType.DoubleNum).value
 fun JsType.jsonValue(): JsonElement = (this as JsType.Json).value
 fun JsType.nullValue(): Any? = (this as JsType.Null).let { null }

javascript/src/commonMain/kotlin/dev/icerock/moko/javascript/JsType.kt

@@ -33,7 +33,7 @@ actual class JavaScriptEngine actual constructor() {
 
         context.forEach {
             jsContext.setObject(
-                `object` = it.value.getValue(),
+                `object` = prepareValueForJsContext(it.value),
                 forKeyedSubscript = NSString.create(string = it.key)
             )
         }
@@ -46,6 +46,11 @@ actual class JavaScriptEngine actual constructor() {
     actual fun close() {
         // Nothing to do here
     }
+
+    private fun prepareValueForJsContext(valueWrapper: JsType): Any? {
+        return if (valueWrapper is JsType.Json) valueWrapper.value.getValue()
+        else valueWrapper.value
+    }
 }
 
 private fun JsonObject.toNSDictionary(): NSDictionary {
@@ -74,17 +79,6 @@ private fun JsonElement.getValue(): Any? {
         ?: (this as? JsonPrimitive)?.content
 }
 
-private fun JsType.getValue(): Any? {
-    return when (this) {
-        is JsType.Bool -> value
-        is JsType.Str -> value
-        is JsType.IntNum -> value
-        is JsType.DoubleNum -> value
-        is JsType.Json -> value.getValue()
-        is JsType.Null -> null
-    }
-}
-
 private fun JSValue.toMokoJSType(): JsType {
     return when {
         isBoolean -> JsType.Bool(toBool())