Refactor default JSR-223 engine implementation:

- rename classes for clarity - sort out dependencies - move common pars to jvm-host jar - switch to configurations only customization
2019-05-20 12:20:10 +02:00
parent 8cd5b11da5
commit a3d1fe312e
8 changed files with 57 additions and 57 deletions
@@ -12,12 +12,14 @@ dependencies {
    compile(project(":kotlin-scripting-jvm"))
    compile(project(":kotlin-scripting-jvm-host"))
    compile(project(":kotlin-scripting-compiler"))
-    compileOnly(project(":compiler:cli"))
+    compileOnly(project(":compiler:cli-common"))
    compileOnly(project(":kotlin-reflect-api"))
    compileOnly(intellijCoreDep())
    runtime(project(":kotlin-compiler"))
    runtime(project(":kotlin-reflect"))
    testCompile(commonDep("junit"))
+    testCompileOnly(project(":compiler:cli"))
+    testCompileOnly(project(":core:util.runtime"))
 }

 sourceSets {
@@ -1,2 +1,2 @@
-kotlin.script.experimental.jsr223.KotlinJsr223JvmScriptEngineFactory
+kotlin.script.experimental.jsr223.KotlinJsr223DefaultScriptEngineFactory

@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.cli.common.repl.KOTLIN_SCRIPT_STATE_BINDINGS_KEY
 import javax.script.Bindings
 import javax.script.ScriptEngine
 import kotlin.script.experimental.annotations.KotlinScript
-import kotlin.script.templates.ScriptTemplateDefinition
 import kotlin.script.templates.standard.ScriptTemplateWithBindings

@Suppress("unused")
@@ -47,4 +46,4 @@ abstract class KotlinJsr223DefaultScript(val jsr223Bindings: Bindings) : ScriptT
        }

    fun createBindings(): Bindings = withMyEngine { it.createBindings() }
-}
+}
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package kotlin.script.experimental.jsr223
+
+import org.jetbrains.kotlin.cli.common.repl.KotlinJsr223JvmScriptEngineFactoryBase
+import javax.script.ScriptEngine
+import kotlin.script.experimental.api.ScriptCompilationConfiguration
+import kotlin.script.experimental.jvm.dependenciesFromCurrentContext
+import kotlin.script.experimental.jvm.jvm
+import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromTemplate
+import kotlin.script.experimental.jvmhost.createJvmEvaluationConfigurationFromTemplate
+import kotlin.script.experimental.jvmhost.jsr223.KotlinJsr223ScriptEngineImpl
+
+class KotlinJsr223DefaultScriptEngineFactory : KotlinJsr223JvmScriptEngineFactoryBase() {
+
+    private val compilationConfiguration = createJvmCompilationConfigurationFromTemplate<KotlinJsr223DefaultScript>()
+    private val evaluationConfiguration = createJvmEvaluationConfigurationFromTemplate<KotlinJsr223DefaultScript>()
+
+    override fun getScriptEngine(): ScriptEngine =
+        KotlinJsr223ScriptEngineImpl(
+            this,
+            ScriptCompilationConfiguration(compilationConfiguration) {
+                jvm {
+                    dependenciesFromCurrentContext(wholeClasspath = true)
+                }
+            },
+            evaluationConfiguration
+        )
+}
+
@@ -1,27 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("unused")
-
-// could be used externally in javax.script.ScriptEngineFactory META-INF file
-
-package kotlin.script.experimental.jsr223
-
-import org.jetbrains.kotlin.cli.common.repl.KotlinJsr223JvmScriptEngineFactoryBase
-import org.jetbrains.kotlin.cli.common.repl.ScriptArgsWithTypes
-import javax.script.Bindings
-import javax.script.ScriptContext
-import javax.script.ScriptEngine
-
-class KotlinJsr223JvmScriptEngineFactory : KotlinJsr223JvmScriptEngineFactoryBase() {
-
-    override fun getScriptEngine(): ScriptEngine =
-        KotlinJsr223ScriptEngine(
-            this,
-            { ctx, types -> ScriptArgsWithTypes(arrayOf(ctx.getBindings(ScriptContext.ENGINE_SCOPE)), types ?: emptyArray()) },
-            arrayOf(Bindings::class)
-        )
-}
-
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.junit.Assert
 import org.junit.Test
 import javax.script.*
-import kotlin.script.experimental.jsr223.KotlinJsr223ScriptEngine
+import kotlin.script.experimental.jvmhost.jsr223.KotlinJsr223ScriptEngineImpl

 class KotlinJsr223ScriptEngineIT {

@@ -44,7 +44,7 @@ class KotlinJsr223ScriptEngineIT {
        val factory = ScriptEngineManager().getEngineByExtension("kts").factory
        Assert.assertNotNull(factory)
        val engine = factory!!.scriptEngine
-        Assert.assertNotNull(engine as? KotlinJsr223ScriptEngine)
+        Assert.assertNotNull(engine as? KotlinJsr223ScriptEngineImpl)
        Assert.assertSame(factory, engine!!.factory)
        val bindings = engine.createBindings()
        Assert.assertTrue(bindings is SimpleBindings)
@@ -89,7 +89,7 @@ class KotlinJsr223ScriptEngineIT {
    fun testEngineRepeatWithReset() {
        val code = "open class A {}\n" +
                    "class B : A() {}"
-        val engine = ScriptEngineManager().getEngineByExtension("kts") as KotlinJsr223ScriptEngine
+        val engine = ScriptEngineManager().getEngineByExtension("kts") as KotlinJsr223ScriptEngineImpl

        val res1 = engine.eval(code)
        Assert.assertNull(res1)
@@ -127,7 +127,7 @@ obj

    @Test
    fun testSimpleCompilable() {
-        val engine = ScriptEngineManager().getEngineByExtension("kts") as KotlinJsr223ScriptEngine
+        val engine = ScriptEngineManager().getEngineByExtension("kts") as KotlinJsr223ScriptEngineImpl
        val comp1 = engine.compile("val x = 3")
        val comp2 = engine.compile("x + 2")
        val res1 = comp1.eval()
@@ -138,7 +138,7 @@ obj

    @Test
    fun testMultipleCompilable() {
-        val engine = ScriptEngineManager().getEngineByExtension("kts") as KotlinJsr223ScriptEngine
+        val engine = ScriptEngineManager().getEngineByExtension("kts") as KotlinJsr223ScriptEngineImpl
        val compiled1 = engine.compile("""listOf(1,2,3).joinToString(",")""")
        val compiled2 = engine.compile("""val x = bindings["boundValue"] as Int + bindings["z"] as Int""")
        val compiled3 = engine.compile("""x""")
@@ -3,7 +3,7 @@
 * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
 */

-package kotlin.script.experimental.jsr223
+package kotlin.script.experimental.jvmhost.jsr223

 import org.jetbrains.kotlin.cli.common.repl.InvokeWrapper
 import org.jetbrains.kotlin.cli.common.repl.renderReplStackTrace
@@ -1,39 +1,31 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
 */

-package kotlin.script.experimental.jsr223
+package kotlin.script.experimental.jvmhost.jsr223

 import org.jetbrains.kotlin.cli.common.repl.*
 import java.util.concurrent.locks.ReentrantReadWriteLock
+import javax.script.Bindings
 import javax.script.ScriptContext
 import javax.script.ScriptEngineFactory
-import kotlin.reflect.KClass
+import kotlin.script.experimental.api.ScriptCompilationConfiguration
 import kotlin.script.experimental.api.ScriptEvaluationConfiguration
 import kotlin.script.experimental.jvm.baseClassLoader
-import kotlin.script.experimental.jvm.dependenciesFromCurrentContext
 import kotlin.script.experimental.jvm.jvm
-import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromTemplate
-import kotlin.script.experimental.jvmhost.createJvmEvaluationConfigurationFromTemplate
 import kotlin.script.experimental.jvmhost.repl.JvmReplCompiler
 import kotlin.script.experimental.jvmhost.repl.JvmReplEvaluator
 import kotlin.script.experimental.jvmhost.repl.JvmReplEvaluatorState

-class KotlinJsr223ScriptEngine(
+// TODO: reimplement without legacy REPL infrastructure
+
+class KotlinJsr223ScriptEngineImpl(
    factory: ScriptEngineFactory,
-    val getScriptArgs: (ScriptContext, Array<out KClass<out Any>>?) -> ScriptArgsWithTypes?,
-    val scriptArgsTypes: Array<out KClass<out Any>>?
+    val compilationConfiguration: ScriptCompilationConfiguration,
+    val evaluationConfiguration: ScriptEvaluationConfiguration
 ) : KotlinJsr223JvmScriptEngineBase(factory), KotlinJsr223InvocableScriptEngine {

-    val compilationConfiguration = createJvmCompilationConfigurationFromTemplate<KotlinJsr223DefaultScript> {
-        jvm {
-            dependenciesFromCurrentContext(wholeClasspath = true)
-        }
-    }
-
-    val evaluationConfiguration = createJvmEvaluationConfigurationFromTemplate<KotlinJsr223DefaultScript>()
-
    override val replCompiler: ReplCompiler by lazy {
        JvmReplCompiler(compilationConfiguration)
    }
@@ -43,11 +35,12 @@ class KotlinJsr223ScriptEngine(

    override val replEvaluator: ReplFullEvaluator get() = localEvaluator

-    internal val state: IReplStageState<*> get() = getCurrentState(getContext())
+    val state: IReplStageState<*> get() = getCurrentState(getContext())

    override fun createState(lock: ReentrantReadWriteLock): IReplStageState<*> = replEvaluator.createState(lock)

-    override fun overrideScriptArgs(context: ScriptContext): ScriptArgsWithTypes? = getScriptArgs(context, scriptArgsTypes)
+    override fun overrideScriptArgs(context: ScriptContext): ScriptArgsWithTypes? =
+        ScriptArgsWithTypes(arrayOf(context.getBindings(ScriptContext.ENGINE_SCOPE).orEmpty()), arrayOf(Bindings::class))

    override val invokeWrapper: InvokeWrapper?
        get() = null