fix problems

Author: khachapurya

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

@@ -16,14 +16,16 @@ actual class JavaScriptEngine actual constructor() {
     private val quickJs: QuickJs = QuickJs.create()
     private val json: Json = Json.Default
 
+    private var context: Map<String, JsType> = mapOf()
+    actual fun setContextObjects(context: Map<String, JsType>) {
+        this.context = context
+    }
+
     @Volatile
     var isClosed = false
         private set
 
-    actual fun evaluate(
-        context: Map<String, JsType>,
-        script: String
-    ): JsType {
+    actual fun evaluate(script: String): JsType {
         if (isClosed) throw JavaScriptEvaluationException(message = "Engine already closed")
 
         return try {
@@ -39,6 +41,12 @@ actual class JavaScriptEngine actual constructor() {
         isClosed = true
     }
 
+    actual fun objectToJsonString(value: JsType): String? {
+        val script = "JSON.stringify(objectValue);"
+        val scriptWithContext = convertContextMapToJsScript(mapOf("objectValue" to value)) + script + "\n"
+        return quickJs.evaluate(scriptWithContext) as String
+    }
+
     private fun internalEvaluate(
         context: Map<String, JsType>,
         script: String
@@ -74,6 +82,7 @@ actual class JavaScriptEngine actual constructor() {
                 "\"$it\""
             }
             JsType.Null -> null
+            is JsType.AnyValue -> null
         }
     }
 

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

@@ -6,15 +6,27 @@ package dev.icerock.moko.javascript
 
 expect class JavaScriptEngine() {
     /**
-     * Evaluate some [script] with external [context].
+     * Evaluate some [script].
      *
      * @throws JavaScriptEvaluationException in case of an error in the engine evaluation or if the
      * engine has already been closed.
      */
-    fun evaluate(context: Map<String, JsType>, script: String): JsType
+    fun evaluate(script: String): JsType
+
+    /**
+     * Set some [context] with external [context].
+     */
+    fun setContextObjects(context: Map<String, JsType>)
+
+    /**
+     * Turns some [JsType] to JsonString.
+     */
+    fun objectToJsonString(value: JsType): String?
 
     /**
      * Closes the engine and releases the allocated memory.
      */
     fun close()
+
+
 }

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

@@ -11,6 +11,7 @@ sealed class 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()
+    data class AnyValue(override val value: Any) : JsType()
 
     /**
      * For "undefined" and "null".

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

@@ -22,21 +22,24 @@ import platform.JavaScriptCore.JSValue
 import platform.JavaScriptCore.setObject
 
 actual class JavaScriptEngine actual constructor() {
-    actual fun evaluate(context: Map<String, JsType>, script: String): JsType {
 
-        val jsContext = JSContext()
-
-        jsContext.exceptionHandler = { exceptionContext, exception ->
-            val message = "\"context = $exceptionContext, exception = $exception\""
-            throw JavaScriptEvaluationException(cause = null, message = message)
-        }
+    private val jsContext = JSContext()
 
+    actual fun setContextObjects(context: Map<String, JsType>) {
         context.forEach {
             jsContext.setObject(
                 `object` = prepareValueForJsContext(it.value),
                 forKeyedSubscript = NSString.create(string = it.key)
             )
         }
+    }
+
+    actual fun evaluate(script: String): JsType {
+
+        jsContext.exceptionHandler = { exceptionContext, exception ->
+            val message = "\"context = $exceptionContext, exception = $exception\""
+            throw JavaScriptEvaluationException(cause = null, message = message)
+        }
 
         val result = jsContext.evaluateScript(script)
 
@@ -47,6 +50,16 @@ actual class JavaScriptEngine actual constructor() {
         // Nothing to do here
     }
 
+    actual fun objectToJsonString(value: JsType): String? {
+        val localContext = JSContext()
+        localContext.setObject(
+            `object` = prepareValueForJsContext(value),
+            forKeyedSubscript = NSString.create(string = "objectValue")
+        )
+
+        return localContext.evaluateScript("JSON.stringify(objectValue);")?.toString_()
+    }
+
     private fun prepareValueForJsContext(valueWrapper: JsType): Any? {
         return if (valueWrapper is JsType.Json) valueWrapper.value.getValue()
         else valueWrapper.value
@@ -84,10 +97,9 @@ private fun JSValue.toMokoJSType(): JsType {
         isBoolean -> JsType.Bool(toBool())
         isString -> JsType.Str(toString_().orEmpty())
         isNumber -> JsType.DoubleNum(toDouble())
-        isObject -> JsType.Json(Json.encodeToJsonElement(toDictionary()))
+        isObject -> JsType.AnyValue(toObject()!!)
         isArray -> JsType.Json(Json.encodeToJsonElement(toArray()))
-        isUndefined -> JsType.Null
         isNull -> JsType.Null
-        else -> JsType.Null
+        else -> JsType.AnyValue(this)
     }
 }