Replace dedicated configurator with definition properties + refine fun

libraries/scripting/common/src/kotlin/script/experimental/annotations/scriptAnnotations.kt

@@ -13,7 +13,6 @@
 package kotlin.script.experimental.annotations
 
 import kotlin.reflect.KClass
-import kotlin.script.experimental.api.ScriptCompilationConfigurator
 import kotlin.script.experimental.api.ScriptDefinition
 import kotlin.script.experimental.api.ScriptEvaluator
 import kotlin.script.experimental.definitions.ScriptDefinitionFromAnnotatedBaseClass
@@ -36,12 +35,6 @@ annotation class KotlinScriptFileExtension(
     val extension: String
 )
 
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-annotation class KotlinScriptCompilationConfigurator(
-    val compilationConfigurator: KClass<out ScriptCompilationConfigurator>
-)
-
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 annotation class KotlinScriptEvaluator(

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

@@ -14,18 +14,10 @@ typealias ScriptCompileConfiguration = ChainedPropertyBag
 
 typealias ProcessedScriptData = ChainedPropertyBag
 
-
-interface ScriptCompilationConfigurator {
-
-    // constructor(properties: ScriptDefinitionPropertiesBag) // the constructor is expected from implementations
-
-    val defaultConfiguration: ScriptCompileConfiguration
-
-    suspend fun refineConfiguration(
+interface RefineScriptCompilationConfiguration {
+    suspend operator fun invoke(
         scriptSource: ScriptSource,
         configuration: ScriptCompileConfiguration,
         processedScriptData: ProcessedScriptData = ProcessedScriptData()
-    ): ResultWithDiagnostics<ScriptCompileConfiguration> =
-        configuration.cloneWithNewParent(defaultConfiguration).asSuccess()
+    ): ResultWithDiagnostics<ScriptCompileConfiguration>
 }
-

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

@@ -35,6 +35,8 @@ object ScriptCompileConfigurationProperties {
 
     val compilerOptions by typedKey<List<String>>() // Q: CommonCompilerOptions instead?
 
+    val refineConfiguration by typedKey<RefineScriptCompilationConfiguration>() // dynamic configurator
+
     val refineBeforeParsing by typedKey<Boolean>() // default: false
 
     val refineConfigurationOnAnnotations by typedKey<List<KotlinType>>()

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

@@ -19,8 +19,6 @@ interface ScriptDefinition {
 
     val properties: ScriptDefinitionPropertiesBag
 
-    val compilationConfigurator: ScriptCompilationConfigurator?
-
     val evaluator: ScriptEvaluator<*>?
 }
 

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

@@ -31,7 +31,7 @@ interface GetScriptingClass {
 
 fun ScriptingEnvironment.getScriptingClass(type: KotlinType, contextClass: KClass<*>): KClass<*> {
     val getClass = getOrNull(ScriptingEnvironmentProperties.getScriptingClass)
-            ?: throw IllegalArgumentException("Expecting 'getScriptingClass' property in the scripting environment: unable to load scripting class $type")
+        ?: throw IllegalArgumentException("Expecting 'getScriptingClass' property in the scripting environment: unable to load scripting class $type")
     return getClass(type, contextClass, this)
 }
 

libraries/scripting/common/src/kotlin/script/experimental/basic/basicScript.kt

@@ -5,33 +5,7 @@
 
 package kotlin.script.experimental.basic
 
-import kotlin.reflect.full.createInstance
-import kotlin.script.experimental.annotations.KotlinScriptDefaultCompilationConfiguration
 import kotlin.script.experimental.api.*
-import kotlin.script.experimental.util.TypedKey
-
-private const val ILLEGAL_CONFIG_ANN_ARG =
-    "Illegal argument to KotlinScriptDefaultCompilationConfiguration annotation: expecting List-derived object or default-constructed class of configuration parameters"
-
-open class AnnotationsBasedCompilationConfigurator(val properties: ScriptDefinitionPropertiesBag) : ScriptCompilationConfigurator {
-
-    override val defaultConfiguration by lazy(LazyThreadSafetyMode.PUBLICATION) {
-        val baseClass = properties.getScriptBaseClass(this)
-        val cfg = baseClass.annotations.filterIsInstance(KotlinScriptDefaultCompilationConfiguration::class.java).flatMap { ann ->
-            val params = try {
-                ann.compilationConfiguration.objectInstance ?: ann.compilationConfiguration.createInstance()
-            } catch (e: Throwable) {
-                throw IllegalArgumentException(ILLEGAL_CONFIG_ANN_ARG, e)
-            }
-            params.forEach { param ->
-                if (param !is Pair<*, *> || param.first !is TypedKey<*>)
-                    throw IllegalArgumentException("$ILLEGAL_CONFIG_ANN_ARG: invalid parameter $param")
-            }
-            params as List<Pair<TypedKey<*>, Any?>>
-        }
-        ScriptCompileConfiguration(properties, cfg)
-    }
-}
 
 class DummyEvaluator<ScriptBase : Any>(val environment: ScriptingEnvironment) : ScriptEvaluator<ScriptBase> {
     override suspend fun eval(

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

@@ -6,17 +6,20 @@
 package kotlin.script.experimental.definitions
 
 import kotlin.reflect.KClass
+import kotlin.reflect.full.createInstance
 import kotlin.reflect.full.findAnnotation
 import kotlin.reflect.full.primaryConstructor
 import kotlin.script.experimental.annotations.*
 import kotlin.script.experimental.api.*
-import kotlin.script.experimental.basic.AnnotationsBasedCompilationConfigurator
 import kotlin.script.experimental.basic.DummyEvaluator
 import kotlin.script.experimental.util.TypedKey
 import kotlin.script.experimental.util.chainPropertyBags
 
 private const val ERROR_MSG_PREFIX = "Unable to construct script definition: "
 
+private const val ILLEGAL_CONFIG_ANN_ARG =
+    "Illegal argument to KotlinScriptDefaultCompilationConfiguration annotation: expecting List-derived object or default-constructed class of configuration parameters"
+
 open class ScriptDefinitionFromAnnotatedBaseClass(
     protected val baseClassType: KotlinType,
     val environment: ScriptingEnvironment
@@ -40,21 +43,28 @@ open class ScriptDefinitionFromAnnotatedBaseClass(
 
     override val properties = run {
         val baseProperties = chainPropertyBags(explicitDefinition?.properties, environment)
-        val propertiesData = arrayListOf<Pair<TypedKey<*>, Any>>(ScriptDefinitionProperties.baseClass to baseClassType)
+        val propertiesData = arrayListOf<Pair<TypedKey<*>, Any?>>(ScriptDefinitionProperties.baseClass to baseClassType)
         baseClass.findAnnotation<KotlinScriptFileExtension>()?.let {
             propertiesData += ScriptDefinitionProperties.fileExtension to it.extension
         }
         if (baseProperties.getOrNull(ScriptDefinitionProperties.name) == null) {
             propertiesData += ScriptDefinitionProperties.name to mainAnnotation.name
         }
+        baseClass.annotations.filterIsInstance(KotlinScriptDefaultCompilationConfiguration::class.java).forEach { ann ->
+            val params = try {
+                ann.compilationConfiguration.objectInstance ?: ann.compilationConfiguration.createInstance()
+            } catch (e: Throwable) {
+                throw IllegalArgumentException(ILLEGAL_CONFIG_ANN_ARG, e)
+            }
+            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?>)
+            }
+        }
         ScriptingEnvironment(baseProperties, propertiesData)
     }
 
-    override val compilationConfigurator =
-        baseClass.findAnnotation<KotlinScriptCompilationConfigurator>()?.compilationConfigurator?.instantiateScriptHandler()
-            ?: explicitDefinition?.compilationConfigurator
-            ?: AnnotationsBasedCompilationConfigurator::class.instantiateScriptHandler()
-
     override val evaluator =
         baseClass.findAnnotation<KotlinScriptEvaluator>()?.evaluator?.instantiateScriptHandler()
             ?: explicitDefinition?.evaluator