Pass scripting (host) environment independently from properties/configuration

libraries/scripting/common/src/kotlin/script/experimental/api/scriptDefinition.kt

@@ -29,8 +29,3 @@ object ScriptDefinitionProperties {
     val baseClass by typedKey<KotlinType>() // script base class
 }
 
-fun ScriptDefinitionPropertiesBag.getScriptBaseClass(contextClass: KClass<*>): KClass<*> =
-    getScriptingClass(get(ScriptDefinitionProperties.baseClass), contextClass)
-
-fun ScriptDefinitionPropertiesBag.getScriptBaseClass(context: Any): KClass<*> =
-    getScriptingClass(get(ScriptDefinitionProperties.baseClass), context::class)

libraries/scripting/common/src/kotlin/script/experimental/definitions/definitionFromAnnotation.kt

@@ -15,7 +15,6 @@ import kotlin.script.experimental.annotations.KotlinScriptDefinition
 import kotlin.script.experimental.annotations.KotlinScriptFileExtension
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.util.TypedKey
-import kotlin.script.experimental.util.chainPropertyBags
 
 private const val ERROR_MSG_PREFIX = "Unable to construct script definition: "
 
@@ -44,12 +43,12 @@ open class ScriptDefinitionFromAnnotatedBaseClass(
         baseClass.findAnnotation<KotlinScriptDefinition>()?.definition.takeIf { it != this::class }?.let { it.instantiateScriptHandler() }
 
     override val properties = run {
-        val baseProperties = chainPropertyBags(explicitDefinition?.properties, environment)
-        val propertiesData = arrayListOf<Pair<TypedKey<*>, Any?>>(ScriptDefinitionProperties.baseClass to baseClassType)
+        val baseProperties = explicitDefinition?.properties
+        val propertiesData = hashMapOf<TypedKey<*>, Any?>(ScriptDefinitionProperties.baseClass to baseClassType)
         baseClass.findAnnotation<KotlinScriptFileExtension>()?.let {
-            propertiesData += ScriptDefinitionProperties.fileExtension to it.extension
+            propertiesData[ScriptDefinitionProperties.fileExtension] = it.extension
         }
-        if (baseProperties.getOrNull(ScriptDefinitionProperties.name) == null) {
+        if (baseProperties?.getOrNull(ScriptDefinitionProperties.name) == null) {
             propertiesData += ScriptDefinitionProperties.name to mainAnnotation.name
         }
         baseClass.annotations.filterIsInstance(KotlinScriptDefaultCompilationConfiguration::class.java).forEach { ann ->
@@ -61,10 +60,12 @@ open class ScriptDefinitionFromAnnotatedBaseClass(
             params.forEach { param ->
                 if (param !is Pair<*, *> || param.first !is TypedKey<*>)
                     throw IllegalArgumentException("$ILLEGAL_CONFIG_ANN_ARG: invalid parameter $param")
-                propertiesData.add(param as Pair<TypedKey<*>, Any?>)
+                (param as Pair<TypedKey<*>, Any?>).let { (k, v) ->
+                    propertiesData[k] = v
+                }
             }
         }
-        ScriptingEnvironment(baseProperties, propertiesData)
+        ScriptingEnvironment.createOptimized(baseProperties, propertiesData)
     }
 
     private fun <T : Any> KClass<T>.instantiateScriptHandler(): T {

libraries/scripting/common/src/kotlin/script/experimental/util/propertyBag.kt

@@ -42,6 +42,7 @@ open class ChainedPropertyBag private constructor(private val parent: ChainedPro
     companion object {
         fun createOptimized(parent: ChainedPropertyBag?, data: Map<TypedKey<*>, Any?>): ChainedPropertyBag = when {
             parent != null && data.isEmpty() -> parent
+            parent != null && parent.data.isEmpty() -> createOptimized(parent.parent, data)
             else -> ChainedPropertyBag(parent, data)
         }
     }

libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJVMCompilerImpl.kt

@@ -70,7 +70,7 @@ class KJVMCompiledScript<out ScriptBase : Any>(
     }
 }
 
-class KJVMCompilerImpl : KJVMCompilerProxy {
+class KJVMCompilerImpl(val hostEnvironment: ScriptingEnvironment) : KJVMCompilerProxy {
 
     override fun compile(
         script: ScriptSource,
@@ -104,7 +104,7 @@ class KJVMCompilerImpl : KJVMCompilerProxy {
             val kotlinCompilerConfiguration = org.jetbrains.kotlin.config.CompilerConfiguration().apply {
                 add(
                     JVMConfigurationKeys.SCRIPT_DEFINITIONS,
-                    BridgeScriptDefinition(scriptDefinition, scriptCompileConfiguration, ::updateClasspath)
+                    BridgeScriptDefinition(scriptDefinition, scriptCompileConfiguration, hostEnvironment, ::updateClasspath)
                 )
                 put<MessageCollector>(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector)
                 put(JVMConfigurationKeys.RETAIN_OUTPUT_IN_MEMORY, true)
@@ -238,17 +238,23 @@ class ScriptDiagnosticsMessageCollector : MessageCollector {
 
 internal class BridgeScriptDefinition(
     scriptDefinition: ScriptDefinition,
-    calculatedBcriptCompilerConfiguration: ScriptCompileConfiguration,
+    calculatedScriptCompilerConfiguration: ScriptCompileConfiguration,
+    hostEnvironment: ScriptingEnvironment,
     updateClasspath: (List<File>) -> Unit
-) : KotlinScriptDefinition(calculatedBcriptCompilerConfiguration.getScriptBaseClass(BridgeScriptDefinition::class)) {
+) : KotlinScriptDefinition(
+    hostEnvironment.getScriptingClass(
+        scriptDefinition.properties[ScriptDefinitionProperties.baseClass],
+        BridgeScriptDefinition::class
+    )
+) {
     override val acceptedAnnotations = run {
         val cl = this::class.java.classLoader
-        calculatedBcriptCompilerConfiguration.getOrNull(ScriptCompileConfigurationProperties.refineConfigurationOnAnnotations)
+        calculatedScriptCompilerConfiguration.getOrNull(ScriptCompileConfigurationProperties.refineConfigurationOnAnnotations)
             ?.map { (cl.loadClass(it.typeName) as Class<out Annotation>).kotlin }
             ?: emptyList()
     }
 
     override val dependencyResolver: DependenciesResolver =
-        BridgeDependenciesResolver(scriptDefinition, calculatedBcriptCompilerConfiguration, updateClasspath)
+        BridgeDependenciesResolver(scriptDefinition, calculatedScriptCompilerConfiguration, updateClasspath)
 }