icerockdev · Alex009 · Jun 15, 2021 · Jun 15, 2021 · Jun 15, 2021 · Jun 15, 2021
diff --git a/javascript/src/commonTest/kotlin/dev/icerock/moko/javascript/SampleTest.kt b/javascript/src/commonTest/kotlin/dev/icerock/moko/javascript/SampleTest.kt
diff --git a/javascript/src/iosMain/kotlin/dev/icerock/moko/javascript/JavaScriptEngine.kt b/javascript/src/iosMain/kotlin/dev/icerock/moko/javascript/JavaScriptEngine.kt
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.javascript
+
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.encodeToJsonElement
+import platform.Foundation.NSArray
+import platform.Foundation.NSDictionary
+import platform.Foundation.NSJSONSerialization
+import platform.Foundation.NSString
+import platform.Foundation.NSUTF8StringEncoding
+import platform.Foundation.create
+import platform.Foundation.dataUsingEncoding
+import platform.JavaScriptCore.JSContext
+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)
+        }
+
+        context.forEach {
+            jsContext.setObject(
+                `object` = it.value.getValue(),
+                forKeyedSubscript = NSString.create(string = it.key)
+            )
+        }
+
+        val result = jsContext.evaluateScript(script)
+
+        return result?.toMokoJSType() ?: JsType.Null
+    }
+
+    actual fun close() {
+        // Nothing to do here
+    }
+}
+
+private fun JsonObject.toNSDictionary(): NSDictionary {
+    val data = NSString.create(string = this.toString()).dataUsingEncoding(NSUTF8StringEncoding)
+        ?: return NSDictionary()
+    return (NSJSONSerialization.JSONObjectWithData(
+        data = data,
+        options = 0,
+        error = null
+    ) as? NSDictionary) ?: NSDictionary()
+}
+
+private fun JsonArray.toNSArray(): NSArray {
+    val data = NSString.create(string = this.toString()).dataUsingEncoding(NSUTF8StringEncoding)
+        ?: return NSArray()
+    return (NSJSONSerialization.JSONObjectWithData(
+        data = data,
+        options = 0,
+        error = null
+    ) as? NSArray) ?: NSArray()
+}
+
+private fun JsonElement.getValue(): Any? {
+    return (this as? JsonObject)?.toNSDictionary()
+        ?: (this as? JsonArray)?.toNSArray()
+        ?: (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())
+        isString -> JsType.Str(toString_().orEmpty())
+        isNumber -> JsType.DoubleNum(toDouble())
+        isObject -> JsType.Json(Json.encodeToJsonElement(toDictionary()))
+        isArray -> JsType.Json(Json.encodeToJsonElement(toArray()))
+        isUndefined -> JsType.Null
+        isNull -> JsType.Null
+        else -> JsType.Null
+    }
+}
diff --git a/javascript/src/iosTest/kotlin/dev/icerock/moko/javascript/JavaScriptEngineTest.kt b/javascript/src/iosTest/kotlin/dev/icerock/moko/javascript/JavaScriptEngineTest.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.javascript
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.encodeToJsonElement
+
+class JavaScriptEngineTest {
+    @Test
+    fun `test json context`() {
+        val form = mapOf("selector_1" to "first_value", "selector_2" to "second_value")
+        val profile = mapOf("email" to "test@test.com")
+        val formJson = Json.encodeToJsonElement(form)
+        val profileJson = Json.encodeToJsonElement(profile)
+        val context: Map<String, JsType> = mapOf("form" to JsType.Json(formJson), "profile" to JsType.Json(profileJson))
+
+        val jsEngine = JavaScriptEngine()
+
+        assertEquals(JsType.Bool(true), jsEngine.evaluate(context = context, script = "form.selector_1 == \"first_value\""))
+
+        assertEquals(JsType.Bool(true), jsEngine.evaluate(context = context, script = "profile.email != null"))
+
+        assertEquals(JsType.Str("test@test.com"), jsEngine.evaluate(context = context, script = "profile.email"))
+
+        assertEquals(JsType.Null, jsEngine.evaluate(context = context, script = "profile.first_name"))
+    }
+
+    @Test
+    fun `test plus script`() {
+        val list = listOf<Int>(5, 15)
+        val listJson = Json.encodeToJsonElement(list)
+        val context: Map<String, JsType> = mapOf("list" to JsType.Json(listJson), "number" to JsType.IntNum(4), "doubleString" to JsType.Str(" Hello "))
+
+        val jsEngine = JavaScriptEngine()
+
+        assertEquals(JsType.DoubleNum(19.0), jsEngine.evaluate(context = context, script = "list[1]+number"))
+
+        assertEquals(JsType.Str(" Hello 5"), jsEngine.evaluate(context = context, script = "doubleString+list[0]"))
+    }
+}
diff --git a/sample/ios-app/ios-app.xcodeproj/project.pbxproj b/sample/ios-app/ios-app.xcodeproj/project.pbxproj
@@ -145,6 +145,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				English,
+				Base,
 			);
 			mainGroup = 287627F61F319065007FA12B;
 			productRefGroup = 287628001F319065007FA12B /* Products */;
@@ -270,6 +271,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 4VU932NX78;
 				INFOPLIST_FILE = src/Info.plist;
+				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.icerock.moko.sample.javascript;
 				PRODUCT_NAME = mokoSampleJavascript;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -288,6 +290,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 4VU932NX78;
 				INFOPLIST_FILE = src/Info.plist;
+				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.icerock.moko.sample.javascript;
 				PRODUCT_NAME = mokoSampleJavascript;
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/sample/ios-app/src/Resources/Base.lproj/Main.storyboard b/sample/ios-app/src/Resources/Base.lproj/Main.storyboard
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="zIh-nI-gcX">
-    <device id="retina4_0" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="zIh-nI-gcX">
+    <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -14,7 +11,7 @@
             <objects>
                 <navigationController id="zIh-nI-gcX" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="aGe-Yj-KQZ">
-                        <rect key="frame" x="0.0" y="20" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -28,16 +25,78 @@
         <!--Test-->
         <scene sceneID="B5V-K5-FDE">
             <objects>
-                <viewController id="TTy-86-aNs" customClass="TestViewController" customModule="mokoSample{{cap name}}" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="TTy-86-aNs" customClass="TestViewController" customModule="mokoSampleJavascript" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="gcA-zH-akF"/>
                         <viewControllerLayoutGuide type="bottom" id="gTY-6T-yQv"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="KxK-oh-5KO">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Hello" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HQE-GP-R06">
+                                <rect key="frame" x="32" y="60" width="256" height="34"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </textField>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fuj-5A-cPv">
+                                <rect key="frame" x="155" y="102" width="10.5" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Result" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="99J-an-5DE">
+                                <rect key="frame" x="32" y="181" width="256" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wAL-t8-BaM">
+                                <rect key="frame" x="32" y="210" width="256" height="0.0"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uVI-QF-cG0">
+                                <rect key="frame" x="36" y="518" width="248" height="30"/>
+                                <state key="normal" title="Run"/>
+                                <connections>
+                                    <action selector="run" destination="TTy-86-aNs" eventType="touchUpInside" id="gH6-Pt-K7R"/>
+                                </connections>
+                            </button>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text=" World!" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0cy-wj-dWi">
+                                <rect key="frame" x="32" y="131" width="256" height="34"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </textField>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="Fuj-5A-cPv" firstAttribute="centerX" secondItem="KxK-oh-5KO" secondAttribute="centerX" id="0rb-9x-EOW"/>
+                            <constraint firstItem="99J-an-5DE" firstAttribute="leading" secondItem="KxK-oh-5KO" secondAttribute="leadingMargin" constant="16" id="8s7-If-k2x"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="0cy-wj-dWi" secondAttribute="trailing" constant="16" id="DQv-Ss-QFC"/>
+                            <constraint firstItem="Fuj-5A-cPv" firstAttribute="top" secondItem="HQE-GP-R06" secondAttribute="bottom" constant="8" id="GdN-ff-D8d"/>
+                            <constraint firstItem="99J-an-5DE" firstAttribute="top" secondItem="0cy-wj-dWi" secondAttribute="bottom" constant="16" id="Ilt-yV-j2g"/>
+                            <constraint firstItem="gTY-6T-yQv" firstAttribute="top" secondItem="uVI-QF-cG0" secondAttribute="bottom" constant="20" id="Npq-Tz-PAf"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="wAL-t8-BaM" secondAttribute="trailing" constant="16" id="TFu-NC-MLP"/>
+                            <constraint firstItem="HQE-GP-R06" firstAttribute="top" secondItem="gcA-zH-akF" secondAttribute="bottom" constant="16" id="VzT-sB-6q9"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="HQE-GP-R06" secondAttribute="trailing" constant="16" id="XoK-8d-2Kg"/>
+                            <constraint firstItem="0cy-wj-dWi" firstAttribute="leading" secondItem="KxK-oh-5KO" secondAttribute="leadingMargin" constant="16" id="bxp-kd-M9O"/>
+                            <constraint firstItem="uVI-QF-cG0" firstAttribute="leading" secondItem="KxK-oh-5KO" secondAttribute="leadingMargin" constant="20" id="i30-ZX-5U3"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="99J-an-5DE" secondAttribute="trailing" constant="16" id="jeK-JC-qIA"/>
+                            <constraint firstItem="0cy-wj-dWi" firstAttribute="top" secondItem="Fuj-5A-cPv" secondAttribute="bottom" constant="8" symbolic="YES" id="kXc-kv-qYy"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="uVI-QF-cG0" secondAttribute="trailing" constant="20" id="leE-eN-qQ1"/>
+                            <constraint firstItem="HQE-GP-R06" firstAttribute="leading" secondItem="KxK-oh-5KO" secondAttribute="leadingMargin" constant="16" id="mey-lt-COi"/>
+                            <constraint firstItem="wAL-t8-BaM" firstAttribute="leading" secondItem="KxK-oh-5KO" secondAttribute="leadingMargin" constant="16" id="owH-qy-NVU"/>
+                            <constraint firstItem="wAL-t8-BaM" firstAttribute="top" secondItem="99J-an-5DE" secondAttribute="bottom" constant="8" id="tLk-AL-liM"/>
+                        </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Test" id="0jM-60-fjM"/>
+                    <connections>
+                        <outlet property="firstValueTextField" destination="HQE-GP-R06" id="XWA-np-uEg"/>
+                        <outlet property="resultLabel" destination="wAL-t8-BaM" id="OHw-r5-JIK"/>
+                        <outlet property="secondValueTextField" destination="0cy-wj-dWi" id="r0H-8r-1Hu"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Jxh-nl-GiI" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>

diff --git a/sample/ios-app/src/TestViewController.swift b/sample/ios-app/src/TestViewController.swift
@@ -7,7 +7,22 @@ import MultiPlatformLibrary
 
 class TestViewController: UIViewController {
 
+    @IBOutlet private var firstValueTextField: UITextField!
+    @IBOutlet private var secondValueTextField: UITextField!
+    @IBOutlet private var resultLabel: UILabel!
+
     override func viewDidLoad() {
         super.viewDidLoad()
     }
+
+    @IBAction private func run() {
+        let result = Calculator().run(a: firstValueTextField.text ?? "", b: secondValueTextField.text ?? "")
+        if let value = (result as? JsType.Str)?.value {
+            resultLabel.text = value
+        }
+
+        if let value = (result as? JsType.DoubleNum)?.value {
+            resultLabel.text = "\(value)"
+        }
+    }
 }
diff --git a/sample/mpp-library/build.gradle.kts b/sample/mpp-library/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
 
 dependencies {
     commonMainApi(Deps.Libs.MultiPlatform.coroutines)
+    commonMainApi(Deps.Libs.MultiPlatform.kotlinSerialization)
 
     commonMainApi(Deps.Libs.MultiPlatform.mokoJavascript)
 }

diff --git a/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/Calculator.kt b/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/Calculator.kt
@@ -4,6 +4,32 @@
 
 package com.icerockdev.library
 
+import dev.icerock.moko.javascript.JavaScriptEngine
+import dev.icerock.moko.javascript.JsType
+
 class Calculator {
-    fun run() = Unit
+    fun run(a: String, b: String): JsType {
+        val engine = JavaScriptEngine()
+        val testScript = "a+b"
+
+        val intA = a.toIntOrNull()
+        val intB = b.toIntOrNull()
+
+        val context = if (intA != null && intB != null) {
+            mapOf(
+                "a" to JsType.IntNum(intA),
+                "b" to JsType.IntNum(intB)
+            )
+        } else {
+            mapOf(
+                "a" to JsType.Str(a),
+                "b" to JsType.Str(b)
+            )
+        }
+
+        return engine.evaluate(
+            context = context,
+            script = testScript
+        )
+    }
 }