Refactor configurations handling:

- rearrange compile call parameters for clarity, more defaults
- remove baseConfiguration method - it is now covered by defaultConfiguration
for static part, and refineConfiguration call if a config parameter is
specified
- implement proper configurations chaining, documented in comment to compile function
- minor renamings and refactorings

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

@@ -9,8 +9,8 @@ interface ScriptCompiler {
 
     suspend fun compile(
         script: ScriptSource,
-        configuration: ScriptCompileConfiguration,
-        configurator: ScriptCompilationConfigurator? = null
+        configurator: ScriptCompilationConfigurator? = null,
+        additionalConfiguration: ScriptCompileConfiguration? = null // overrides parameters from configurator.defaultConfiguration
     ): ResultWithDiagnostics<CompiledScript<*>>
 }
 

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

@@ -21,8 +21,6 @@ interface ScriptCompilationConfigurator {
 
     val defaultConfiguration: ScriptCompileConfiguration
 
-    suspend fun baseConfiguration(scriptSource: ScriptSource): ResultWithDiagnostics<ScriptCompileConfiguration>
-
     suspend fun refineConfiguration(
         scriptSource: ScriptSource,
         configuration: ScriptCompileConfiguration,

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

@@ -33,8 +33,10 @@ object ScriptCompileConfigurationProperties {
 
     val compilerOptions by typedKey<List<String>>() // Q: CommonCompilerOptions instead?
 
-    val updateConfigurationOnAnnotations by typedKey<List<KClass<out Annotation>>>()
+    val refineBeforeParsing by typedKey<Boolean>() // default: false
 
-    val updateConfigurationOnSections by typedKey<List<String>>()
+    val refineConfigurationOnAnnotations by typedKey<List<KClass<out Annotation>>>()
+
+    val refineConfigurationOnSections by typedKey<List<String>>()
 }