Rearrange compilation related API

libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt

@@ -49,7 +49,7 @@ object MyScriptCompilationConfiguration : ScriptCompilationConfiguration(
 
 private val resolver = FilesAndMavenResolver()
 
-fun myConfigureOnAnnotations(script: ScriptDataFacade): ResultWithDiagnostics<ScriptCompilationConfiguration?> {
+fun myConfigureOnAnnotations(script: ScriptConfigurationRefinementContext): ResultWithDiagnostics<ScriptCompilationConfiguration?> {
     val annotations = script.collectedData?.get(ScriptCollectedData.foundAnnotations)?.takeIf { it.isNotEmpty() }
         ?: return null.asSuccess()
     val scriptContents = object : ScriptContents {

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

@@ -3,8 +3,119 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("unused")
+
 package kotlin.script.experimental.api
 
+import kotlin.reflect.KClass
+import kotlin.script.experimental.util.PropertiesCollection
+
+interface ScriptCompilationConfigurationKeys
+
+open class ScriptCompilationConfiguration(baseConfigurations: Iterable<ScriptCompilationConfiguration>, body: Builder.() -> Unit) :
+    PropertiesCollection(Builder(baseConfigurations).apply(body).data) {
+
+    constructor(body: Builder.() -> Unit = {}) : this(emptyList(), body)
+    constructor(
+        vararg baseConfigurations: ScriptCompilationConfiguration, body: Builder.() -> Unit = {}
+    ) : this(baseConfigurations.asIterable(), body)
+
+    class Builder internal constructor(baseConfigurations: Iterable<ScriptCompilationConfiguration>) :
+        ScriptCompilationConfigurationKeys,
+        PropertiesCollection.Builder(baseConfigurations)
+
+    // inherited from script compilationConfiguration for using as a keys anchor
+    companion object : ScriptCompilationConfigurationKeys
+
+    object Default : ScriptCompilationConfiguration()
+}
+
+val ScriptCompilationConfigurationKeys.displayName by PropertiesCollection.key<String>("Kotlin script") // Name of the script type
+
+val ScriptCompilationConfigurationKeys.fileExtension by PropertiesCollection.key<String>("kts") // file extension
+
+val ScriptCompilationConfigurationKeys.baseClass by PropertiesCollection.key<KotlinType>() // script base class
+
+val ScriptCompilationConfigurationKeys.scriptBodyTarget by PropertiesCollection.key<ScriptBodyTarget>(ScriptBodyTarget.Constructor)
+
+val ScriptCompilationConfigurationKeys.implicitReceivers by PropertiesCollection.key<List<KotlinType>>() // in the order from outer to inner scope
+
+val ScriptCompilationConfigurationKeys.providedProperties by PropertiesCollection.key<Map<String, KotlinType>>() // external variables
+
+val ScriptCompilationConfigurationKeys.defaultImports by PropertiesCollection.key<List<String>>()
+
+val ScriptCompilationConfigurationKeys.dependencies by PropertiesCollection.key<List<ScriptDependency>>()
+
+val ScriptCompilationConfigurationKeys.copyAnnotationsFrom by PropertiesCollection.key<List<KotlinType>>()
+
+val ScriptCompilationConfigurationKeys.compilerOptions by PropertiesCollection.key<List<String>>() // Q: CommonCompilerOptions instead?
+
+val ScriptCompilationConfigurationKeys.refineConfigurationBeforeParsing by PropertiesCollection.key<RefineConfigurationBeforeParsingData>()
+
+val ScriptCompilationConfigurationKeys.refineConfigurationOnAnnotations by PropertiesCollection.key<RefineConfigurationOnAnnotationsData>()
+
+val ScriptCompilationConfigurationKeys.refineConfigurationOnSections by PropertiesCollection.key<RefineConfigurationOnSectionsData>()
+
+val ScriptCompilationConfigurationKeys.sourceFragments by PropertiesCollection.key<List<ScriptSourceNamedFragment>>()
+
+// DSL:
+
+val ScriptCompilationConfiguration.Builder.refineConfiguration get() = RefineConfigurationBuilder()
+
+
+class RefineConfigurationBuilder : PropertiesCollection.Builder() {
+
+    fun beforeParsing(handler: RefineScriptCompilationConfigurationHandler) {
+        set(ScriptCompilationConfiguration.refineConfigurationBeforeParsing, RefineConfigurationBeforeParsingData(handler))
+    }
+
+    fun onAnnotations(annotations: List<KotlinType>, handler: RefineScriptCompilationConfigurationHandler) {
+        set(ScriptCompilationConfiguration.refineConfigurationOnAnnotations, RefineConfigurationOnAnnotationsData(annotations, handler))
+    }
+
+    fun onAnnotations(vararg annotations: KotlinType, handler: RefineScriptCompilationConfigurationHandler) {
+        onAnnotations(annotations.asList(), handler)
+    }
+
+    inline fun <reified T : Annotation> onAnnotations(noinline handler: RefineScriptCompilationConfigurationHandler) {
+        onAnnotations(listOf(KotlinType(T::class)), handler)
+    }
+
+    fun onAnnotations(vararg annotations: KClass<out Annotation>, handler: RefineScriptCompilationConfigurationHandler) {
+        onAnnotations(annotations.map { KotlinType(it) }, handler)
+    }
+
+    fun onAnnotations(annotations: Iterable<KClass<out Annotation>>, handler: RefineScriptCompilationConfigurationHandler) {
+        onAnnotations(annotations.map { KotlinType(it) }, handler)
+    }
+
+    fun onSections(sections: List<String>, handler: RefineScriptCompilationConfigurationHandler) {
+        set(ScriptCompilationConfiguration.refineConfigurationOnSections, RefineConfigurationOnSectionsData(sections, handler))
+    }
+
+    fun onSections(vararg sections: String, handler: RefineScriptCompilationConfigurationHandler) {
+        onSections(sections.asList(), handler)
+    }
+}
+
+typealias RefineScriptCompilationConfigurationHandler = (ScriptConfigurationRefinementContext) -> ResultWithDiagnostics<ScriptCompilationConfiguration?>
+
+// to make it "hasheable" for cashing
+class RefineConfigurationBeforeParsingData(
+    val handler: RefineScriptCompilationConfigurationHandler
+)
+
+class RefineConfigurationOnAnnotationsData(
+    val annotations: List<KotlinType>,
+    val handler: RefineScriptCompilationConfigurationHandler
+)
+
+class RefineConfigurationOnSectionsData(
+    val sections: List<String>,
+    val handler: RefineScriptCompilationConfigurationHandler
+)
+
+
 interface ScriptCompiler {
 
     suspend operator fun invoke(

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

@@ -1,45 +0,0 @@
-/*
- * Copyright 2000-2018 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")
-
-package kotlin.script.experimental.api
-
-import kotlin.script.experimental.util.PropertiesCollection
-
-
-interface ScriptCollectedDataKeys
-
-class ScriptCollectedData(properties: Map<PropertiesCollection.Key<*>, Any>) : PropertiesCollection(properties) {
-
-    companion object : ScriptCollectedDataKeys
-}
-
-val ScriptCollectedDataKeys.foundAnnotations by PropertiesCollection.key<List<Annotation>>()
-
-val ScriptCollectedDataKeys.foundFragments by PropertiesCollection.key<List<ScriptSourceNamedFragment>>()
-
-class ScriptDataFacade(
-    val source: ScriptSource,
-    val compilationConfiguration: ScriptCompilationConfiguration,
-    val collectedData: ScriptCollectedData? = null
-)
-
-typealias RefineScriptCompilationConfigurationHandler = (ScriptDataFacade) -> ResultWithDiagnostics<ScriptCompilationConfiguration?>
-
-// to make it "hasheable" for cashing
-class RefineConfigurationBeforeParsingData(
-    val handler: RefineScriptCompilationConfigurationHandler
-)
-
-class RefineConfigurationOnAnnotationsData(
-    val annotations: List<KotlinType>,
-    val handler: RefineScriptCompilationConfigurationHandler
-)
-
-class RefineConfigurationOnSectionsData(
-    val sections: List<String>,
-    val handler: RefineScriptCompilationConfigurationHandler
-)

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

@@ -8,6 +8,7 @@
 package kotlin.script.experimental.api
 
 import java.net.URL
+import kotlin.script.experimental.util.PropertiesCollection
 
 interface ScriptSource {
     val location: URL?
@@ -39,3 +40,20 @@ interface ScriptDependency {
     // Q: anything generic here?
 }
 
+
+interface ScriptCollectedDataKeys
+
+class ScriptCollectedData(properties: Map<PropertiesCollection.Key<*>, Any>) : PropertiesCollection(properties) {
+
+    companion object : ScriptCollectedDataKeys
+}
+
+val ScriptCollectedDataKeys.foundAnnotations by PropertiesCollection.key<List<Annotation>>()
+
+val ScriptCollectedDataKeys.foundFragments by PropertiesCollection.key<List<ScriptSourceNamedFragment>>()
+
+class ScriptConfigurationRefinementContext(
+    val source: ScriptSource,
+    val compilationConfiguration: ScriptCompilationConfiguration,
+    val collectedData: ScriptCollectedData? = null
+)

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

@@ -1,100 +0,0 @@
-/*
- * Copyright 2000-2018 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")
-
-package kotlin.script.experimental.api
-
-import kotlin.reflect.KClass
-import kotlin.script.experimental.util.PropertiesCollection
-
-interface ScriptCompilationConfigurationKeys
-
-open class ScriptCompilationConfiguration(baseConfigurations: Iterable<ScriptCompilationConfiguration>, body: Builder.() -> Unit) :
-    PropertiesCollection(Builder(baseConfigurations).apply(body).data) {
-
-    constructor(body: Builder.() -> Unit = {}) : this(emptyList(), body)
-    constructor(
-        vararg baseConfigurations: ScriptCompilationConfiguration, body: Builder.() -> Unit = {}
-    ) : this(baseConfigurations.asIterable(), body)
-
-    class Builder internal constructor(baseConfigurations: Iterable<ScriptCompilationConfiguration>) :
-        ScriptCompilationConfigurationKeys,
-        PropertiesCollection.Builder(baseConfigurations)
-
-    // inherited from script compilationConfiguration for using as a keys anchor
-    companion object : ScriptCompilationConfigurationKeys
-
-    object Default : ScriptCompilationConfiguration()
-}
-
-val ScriptCompilationConfigurationKeys.displayName by PropertiesCollection.key<String>("Kotlin script") // Name of the script type
-
-val ScriptCompilationConfigurationKeys.fileExtension by PropertiesCollection.key<String>("kts") // file extension
-
-val ScriptCompilationConfigurationKeys.baseClass by PropertiesCollection.key<KotlinType>() // script base class
-
-val ScriptCompilationConfigurationKeys.scriptBodyTarget by PropertiesCollection.key<ScriptBodyTarget>(ScriptBodyTarget.Constructor)
-
-val ScriptCompilationConfigurationKeys.implicitReceivers by PropertiesCollection.key<List<KotlinType>>() // in the order from outer to inner scope
-
-val ScriptCompilationConfigurationKeys.providedProperties by PropertiesCollection.key<Map<String, KotlinType>>() // external variables
-
-val ScriptCompilationConfigurationKeys.defaultImports by PropertiesCollection.key<List<String>>()
-
-val ScriptCompilationConfigurationKeys.dependencies by PropertiesCollection.key<List<ScriptDependency>>()
-
-val ScriptCompilationConfigurationKeys.copyAnnotationsFrom by PropertiesCollection.key<List<KotlinType>>()
-
-val ScriptCompilationConfigurationKeys.compilerOptions by PropertiesCollection.key<List<String>>() // Q: CommonCompilerOptions instead?
-
-val ScriptCompilationConfigurationKeys.refineConfigurationBeforeParsing by PropertiesCollection.key<RefineConfigurationBeforeParsingData>()
-
-val ScriptCompilationConfigurationKeys.refineConfigurationOnAnnotations by PropertiesCollection.key<RefineConfigurationOnAnnotationsData>()
-
-val ScriptCompilationConfigurationKeys.refineConfigurationOnSections by PropertiesCollection.key<RefineConfigurationOnSectionsData>()
-
-val ScriptCompilationConfigurationKeys.sourceFragments by PropertiesCollection.key<List<ScriptSourceNamedFragment>>()
-
-// DSL:
-
-val ScriptCompilationConfiguration.Builder.refineConfiguration get() = RefineConfigurationBuilder()
-
-
-class RefineConfigurationBuilder : PropertiesCollection.Builder() {
-
-    fun beforeParsing(handler: RefineScriptCompilationConfigurationHandler) {
-        set(ScriptCompilationConfiguration.refineConfigurationBeforeParsing, RefineConfigurationBeforeParsingData(handler))
-    }
-
-    fun onAnnotations(annotations: List<KotlinType>, handler: RefineScriptCompilationConfigurationHandler) {
-        set(ScriptCompilationConfiguration.refineConfigurationOnAnnotations, RefineConfigurationOnAnnotationsData(annotations, handler))
-    }
-
-    fun onAnnotations(vararg annotations: KotlinType, handler: RefineScriptCompilationConfigurationHandler) {
-        onAnnotations(annotations.asList(), handler)
-    }
-
-    inline fun <reified T : Annotation> onAnnotations(noinline handler: RefineScriptCompilationConfigurationHandler) {
-        onAnnotations(listOf(KotlinType(T::class)), handler)
-    }
-
-    fun onAnnotations(vararg annotations: KClass<out Annotation>, handler: RefineScriptCompilationConfigurationHandler) {
-        onAnnotations(annotations.map { KotlinType(it) }, handler)
-    }
-
-    fun onAnnotations(annotations: Iterable<KClass<out Annotation>>, handler: RefineScriptCompilationConfigurationHandler) {
-        onAnnotations(annotations.map { KotlinType(it) }, handler)
-    }
-
-    fun onSections(sections: List<String>, handler: RefineScriptCompilationConfigurationHandler) {
-        set(ScriptCompilationConfiguration.refineConfigurationOnSections, RefineConfigurationOnSectionsData(sections, handler))
-    }
-
-    fun onSections(vararg sections: String, handler: RefineScriptCompilationConfigurationHandler) {
-        onSections(sections.asList(), handler)
-    }
-}
-

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

@@ -40,7 +40,7 @@ open class JvmScriptCompiler(
     ): ResultWithDiagnostics<CompiledScript<*>> {
         val refineConfigurationFn = scriptCompilationConfiguration[ScriptCompilationConfiguration.refineConfigurationBeforeParsing]
         val refinedConfiguration =
-            refineConfigurationFn?.handler?.invoke(ScriptDataFacade(script, scriptCompilationConfiguration))?.let {
+            refineConfigurationFn?.handler?.invoke(ScriptConfigurationRefinementContext(script, scriptCompilationConfiguration))?.let {
                 when (it) {
                     is ResultWithDiagnostics.Failure -> return it
                     is ResultWithDiagnostics.Success -> it.value

libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/BridgeDependenciesResolver.kt

@@ -44,7 +44,7 @@ class BridgeDependenciesResolver(
                 if (refineFn == null) null
                 else {
                     val res = refineFn(
-                        ScriptDataFacade(scriptContents.toScriptSource(), scriptCompilationConfiguration, processedScriptData)
+                        ScriptConfigurationRefinementContext(scriptContents.toScriptSource(), scriptCompilationConfiguration, processedScriptData)
                     )
                     when (res) {
                         is ResultWithDiagnostics.Failure ->