Merge branch 'android-quickjs' into ios-javascript

# Conflicts:
#	buildSrc/src/main/kotlin/Deps.kt
#	sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/Calculator.kt

Author: Dorofeev

buildSrc/src/main/kotlin/Deps.kt

@@ -8,18 +8,20 @@ object Deps {
     private const val androidAppCompatVersion = "1.1.0"
     private const val materialDesignVersion = "1.0.0"
     private const val androidLifecycleVersion = "2.1.0"
-    private const val androidCoreTestingVersion = "2.1.0"
+    private const val androidCoreTestingVersion = "1.3.0"
+    private const val testJUnitExtVersion = "1.1.2"
     private const val quickjsVersion = "0.9.0"
 
     private const val coroutinesVersion = "1.4.2"
     private const val kotlinxSerializationVersion = "1.1.0"
     private const val mokoTestVersion = "0.3.0"
+
     const val mokoJavascriptVersion = "0.1.0"
 
     object Android {
         const val compileSdk = 30
         const val targetSdk = 30
-        const val minSdk = 16
+        const val minSdk = 18
     }
 
     object Libs {
@@ -28,6 +30,11 @@ object Deps {
             const val material = "com.google.android.material:material:$materialDesignVersion"
             const val lifecycle = "androidx.lifecycle:lifecycle-extensions:$androidLifecycleVersion"
 
+            const val testRunner = "androidx.test:runner:$androidCoreTestingVersion"
+            const val testRules = "androidx.test:rules:$androidCoreTestingVersion"
+            const val testJUnitExt = "androidx.test.ext:junit:$testJUnitExtVersion"
+            const val testJUnitExtKtx = "androidx.test.ext:junit-ktx:$testJUnitExtVersion"
+
             const val quickjs = "app.cash.quickjs:quickjs-android:$quickjsVersion"
         }
 
@@ -37,7 +44,13 @@ object Deps {
             const val kotlinSerialization =
                 "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxSerializationVersion"
 
+            const val kotlinTest =
+                "org.jetbrains.kotlin:kotlin-test-common:$kotlinTestVersion"
+            const val kotlinTestAnnotations =
+                "org.jetbrains.kotlin:kotlin-test-annotations-common:$kotlinTestVersion"
             const val mokoTest = "dev.icerock.moko:test-core:$mokoTestVersion"
+            const val mokoTestRobolectric = "dev.icerock.moko:test-roboelectric:$mokoTestVersion"
+
             const val mokoJavascript = "dev.icerock.moko:javascript:$mokoJavascriptVersion"
         }
     }

javascript/build.gradle.kts

@@ -7,10 +7,24 @@ plugins {
     id("publication-convention")
 }
 
+android {
+    testOptions.unitTests.isIncludeAndroidResources = true
+    defaultConfig {
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+}
+
 dependencies {
     androidMainImplementation(Deps.Libs.Android.quickjs)
 
     commonMainImplementation(Deps.Libs.MultiPlatform.kotlinSerialization)
 
+    commonTestImplementation(Deps.Libs.MultiPlatform.kotlinTest)
+    commonTestImplementation(Deps.Libs.MultiPlatform.kotlinTestAnnotations)
     commonTestImplementation(Deps.Libs.MultiPlatform.mokoTest)
+
+    androidTestImplementation(Deps.Libs.Android.testRunner)
+    androidTestImplementation(Deps.Libs.Android.testRules)
+    androidTestImplementation(Deps.Libs.Android.testJUnitExt)
+    androidTestImplementation(Deps.Libs.Android.testJUnitExtKtx)
 }

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

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.javascript
+
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+class JavaScriptEngineTest {
+    private var _javaScriptEngine: JavaScriptEngine? = null
+
+    private val javaScriptEngine: JavaScriptEngine
+        get() = _javaScriptEngine!!
+
+    @Before
+    fun init() {
+        _javaScriptEngine = JavaScriptEngine()
+    }
+
+    @After
+    fun dispose() {
+        javaScriptEngine.close()
+    }
+
+    @Test
+    fun equalityTest() {
+        val jsScript = """
+            var a = 1 + 2;
+            a
+        """.trimIndent()
+        val result = javaScriptEngine.evaluate(emptyMap(), jsScript)
+
+        println("DBG $result")
+
+        //assertTrue { result is JsType.IntNum }
+        //assertEquals(expected = 3, actual = result.intValue())
+    }
+}

javascript/src/androidMain/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="dev.icerock.moko.javascript" />
+<manifest package="dev.icerock.moko.javascript" />

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

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.javascript
+
+import app.cash.quickjs.QuickJs
+import app.cash.quickjs.QuickJsException
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.encodeToJsonElement
+
+actual class JavaScriptEngine actual constructor(){
+    private val quickJs: QuickJs = QuickJs.create()
+    private val json: Json = Json.Default
+
+    @Volatile
+    var isClosed = false
+        private set
+
+    actual fun evaluate(
+        context: Map<String, JsType>,
+        script: String
+    ): JsType {
+        if (isClosed) throw JavaScriptEvaluationException(message = "Engine already closed")
+
+        return try {
+            internalEvaluate(context, script)
+        } catch (exception: QuickJsException) {
+            throw JavaScriptEvaluationException(exception)
+        }
+    }
+
+    actual fun close() {
+        if (isClosed) return
+        quickJs.close()
+        isClosed = true
+    }
+
+    private fun internalEvaluate(
+        context: Map<String, JsType>,
+        script: String
+    ): JsType {
+        context.forEach { pair ->
+            quickJs.set(pair.key, pair.value.javaClass, pair.value)
+        }
+        val result = quickJs.evaluate(script)
+        return handleQuickJsResult(result)
+    }
+
+    private fun handleQuickJsResult(result: Any?): JsType {
+        return when (result) {
+            result == null -> JsType.Null
+            is Boolean -> JsType.Bool(result)
+            is Int -> JsType.IntNum(result)
+            is Double -> JsType.DoubleNum(result)
+            is Float -> JsType.DoubleNum(result.toDouble())
+            is String -> try {
+                JsType.Json(json.encodeToJsonElement(result))
+            } catch (ex: SerializationException) {
+                JsType.Str(result)
+            }
+            else -> throw JavaScriptEvaluationException(
+                message = "Impossible JavaScriptEngine handler state with result [$result]"
+            )
+        }
+    }
+}

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

@@ -18,3 +18,10 @@ sealed class JsType {
      */
     object Null : JsType()
 }
+
+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 }

sample/android-app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:label="moko-fields test app"
+        android:label="moko-javascript test app"
         android:theme="@style/Theme.AppCompat.DayNight"
         tools:ignore="GoogleAppIndexingWarning">