KTL-724 Added compiler arguments support

We are using `kotlin-compiler-arguments-description` maven dependency for extracting all known compiler arguments for the current kotlin version.
We've added an endpoint for getting all known compiler dependencies by the given platform.
We've extended `run` and `translate` endpoints with the user's compiler args.

Author: dkrasnoff

build.gradle.kts

@@ -12,8 +12,8 @@ version = "${libs.versions.kotlin.get()}-SNAPSHOT"
 val propertyFile = "application.properties"
 
 plugins {
-    alias(libs.plugins.spring.dependency.management)
     alias(libs.plugins.spring.boot)
+    alias(libs.plugins.spring.dependency.management)
     alias(libs.plugins.kotlin.plugin.spring)
     id("base-kotlin-jvm-conventions")
 }
@@ -39,11 +39,14 @@ val resourceDependency: Configuration by configurations.creating {
 }
 
 dependencies {
-    annotationProcessor("org.springframework:spring-context-indexer")
-    implementation("com.google.code.gson:gson")
+    annotationProcessor(libs.spring.context.indexer)
     implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation(libs.springdoc)
+    implementation("org.springframework.boot:spring-boot-starter-validation")
     implementation(libs.aws.springboot.container)
+    implementation(libs.springdoc)
+    implementation(libs.gson)
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.kotlin.compiler.arguments.description)
     implementation(libs.junit)
     implementation(libs.logback.logstash.encoder)
     implementation(libs.intellij.trove4j)
@@ -77,6 +80,8 @@ fun buildPropertyFile() {
 
 fun generateProperties(prefix: String = "") = """
     # this file is autogenerated by build.gradle.kts
+    server.error.include-message=always
+    server.error.include-binding-errors=always
     kotlin.version=${kotlinVersion}
     policy.file=${prefix + policy}
     indexes.file=${prefix + indexes}
@@ -131,7 +136,7 @@ val buildLambda by tasks.creating(Zip::class) {
     from(libWasmFolder) { into(libWasm) }
     from(libComposeWasmFolder) { into(libComposeWasm) }
     from(libJVMFolder) { into(libJVM) }
-    from(compilerPluginsForJVMFolder) {into(compilerPluginsForJVM)}
+    from(compilerPluginsForJVMFolder) { into(compilerPluginsForJVM) }
     from(libComposeWasmCompilerPluginsFolder) { into(libComposeWasmCompilerPlugins) }
     into("lib") {
         from(configurations.compileClasspath) { exclude("tomcat-embed-*") }
@@ -160,4 +165,13 @@ tasks.withType<Test> {
     doFirst {
         this@withType.environment("kotlin.wasm.node.path", executablePath)
     }
+
+    // We disable this on TeamCity, because we don't want to fail this test,
+    // when compiler server's test run as a K2 user project.
+    // But for our pull requests we still need to run this test, so we add it to our GitHub action.
+    if (providers.gradleProperty("teamcity").isPresent) {
+        filter {
+            excludeTestsMatching("com.compiler.server.CompilerArguments*")
+        }
+    }
 }

gradle/libs.versions.toml

@@ -31,6 +31,7 @@ kotlin-stdlib-wasm-js = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-
 kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
 kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
 kotlin-compiler = { group = "org.jetbrains.kotlin", name = "kotlin-compiler", version.ref = "kotlin" }
+kotlin-compiler-arguments-description = { group = "org.jetbrains.kotlin", name = "kotlin-compiler-arguments-description", version.ref = "kotlin" }
 kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" }
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-gradle-plugin-idea = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin-idea", version.ref = "kotlin" }
@@ -45,10 +46,9 @@ kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-cor
 kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinx-datetime" }
 kotlinx-io-bytestring = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-bytestring", version.ref = "kotlinx-io" }
 kotlinx-io-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-core", version.ref = "kotlinx-io" }
+kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
 kotlinx-serialization-json-jvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json-jvm", version.ref = "kotlinx-serialization" }
 kotlinx-serialization-core-jvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core-jvm", version.ref = "kotlinx-serialization" }
-springdoc = { group = "org.springdoc", name = "springdoc-openapi-starter-webmvc-ui", version.ref = "springdoc" }
-aws-springboot-container = { group = "com.amazonaws.serverless", name = "aws-serverless-java-container-springboot3", version.ref = "aws-serverless-java-container-springboot3" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 logback-logstash-encoder = { group = "net.logstash.logback", name = "logstash-logback-encoder", version.ref = "logstash-logback-encoder" }
 intellij-trove4j = { group = "org.jetbrains.intellij.deps", name = "trove4j", version.ref = "trove4j" }
@@ -68,6 +68,12 @@ compose-material3 = { group = "org.jetbrains.compose.material3", name = "materia
 compose-components-resources = { group = "org.jetbrains.compose.components", name = "components-resources", version.ref = "compose" }
 kotlin-serialization-plugin = {group= "org.jetbrains.kotlin", name="kotlin-serialization-compiler-plugin", version.ref = "kotlin"}
 gradle-develocity = {group = "com.gradle", name= "develocity-gradle-plugin", version.ref = "gradle-develocity"}
+gson = { group = "com.google.code.gson", name = "gson"}
+
+#spring stack dependencies
+aws-springboot-container = { group = "com.amazonaws.serverless", name = "aws-serverless-java-container-springboot3", version.ref = "aws-serverless-java-container-springboot3" }
+spring-context-indexer = { group = "org.springframework", name = "spring-context-indexer"}
+springdoc = { group = "org.springdoc", name = "springdoc-openapi-starter-webmvc-ui", version.ref = "springdoc" }
 
 [bundles]
 kotlin-stdlib = ["kotlin-stdlib", "kotlin-stdlib-jdk7", "kotlin-stdlib-jdk8"]

src/main/kotlin/com/compiler/server/api/CompilerArgumentResponse.kt

@@ -0,0 +1,18 @@
+package com.compiler.server.api
+
+import com.compiler.server.model.ExtendedCompilerArgumentValue
+import com.fasterxml.jackson.annotation.JsonTypeInfo
+
+data class CompilerArgumentResponse(val compilerArguments: Set<CompilerArgument>) {
+
+    data class CompilerArgument(
+        val name: String,
+        val shortName: String?,
+        val description: String?,
+        @field:JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "type")
+        val type: ExtendedCompilerArgumentValue<*>,
+        val disabled: Boolean,
+        var predefinedValues: Any?
+    )
+}
+

src/main/kotlin/com/compiler/server/api/ProjectFileRequestDto.kt

@@ -0,0 +1,6 @@
+package com.compiler.server.api
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class ProjectFileRequestDto(val text: String = "", val name: String = "")

src/main/kotlin/com/compiler/server/api/RunRequest.kt

@@ -0,0 +1,13 @@
+package com.compiler.server.api
+
+import com.compiler.server.model.ProjectType
+import com.compiler.server.validation.CompilerArgumentsConstraint
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class RunRequest(
+    val args: String = "",
+    val files: List<ProjectFileRequestDto> = listOf(),
+    @CompilerArgumentsConstraint(ProjectType.JAVA)
+    val compilerArguments: Map<String, Any> = emptyMap()
+)

src/main/kotlin/com/compiler/server/api/TestRequest.kt

@@ -0,0 +1,13 @@
+package com.compiler.server.api
+
+import com.compiler.server.model.ProjectType
+import com.compiler.server.validation.CompilerArgumentsConstraint
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class TestRequest(
+    val args: String = "",
+    val files: List<ProjectFileRequestDto> = listOf(),
+    @CompilerArgumentsConstraint(ProjectType.JAVA)
+    val compilerArguments: Map<String, Any> = emptyMap()
+)

src/main/kotlin/com/compiler/server/api/TranslateComposeWasmRequest.kt

@@ -0,0 +1,15 @@
+package com.compiler.server.api
+
+import com.compiler.server.model.ProjectType
+import com.compiler.server.validation.CompilerArgumentsConstraint
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+class TranslateComposeWasmRequest(
+    val args: String = "",
+    val files: List<ProjectFileRequestDto> = listOf(),
+    @CompilerArgumentsConstraint(ProjectType.COMPOSE_WASM)
+    val firstPhaseCompilerArguments: Map<String, Any> = emptyMap(),
+    @CompilerArgumentsConstraint(ProjectType.COMPOSE_WASM)
+    val secondPhaseCompilerArguments: Map<String, Any> = emptyMap()
+)

src/main/kotlin/com/compiler/server/api/TranslateJsRequest.kt

@@ -0,0 +1,15 @@
+package com.compiler.server.api
+
+import com.compiler.server.model.ProjectType
+import com.compiler.server.validation.CompilerArgumentsConstraint
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class TranslateJsRequest(
+    val args: String = "",
+    val files: List<ProjectFileRequestDto> = listOf(),
+    @CompilerArgumentsConstraint(ProjectType.JS)
+    val firstPhaseCompilerArguments: Map<String, Any> = emptyMap(),
+    @CompilerArgumentsConstraint(ProjectType.JS)
+    val secondPhaseCompilerArguments: Map<String, Any> = emptyMap()
+)

src/main/kotlin/com/compiler/server/api/TranslateWasmRequest.kt

@@ -0,0 +1,15 @@
+package com.compiler.server.api
+
+import com.compiler.server.model.ProjectType
+import com.compiler.server.validation.CompilerArgumentsConstraint
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+class TranslateWasmRequest(
+    val args: String = "",
+    val files: List<ProjectFileRequestDto> = listOf(),
+    @CompilerArgumentsConstraint(ProjectType.WASM)
+    val firstPhaseCompilerArguments: Map<String, Any> = emptyMap(),
+    @CompilerArgumentsConstraint(ProjectType.WASM)
+    val secondPhaseCompilerArguments: Map<String, Any> = emptyMap()
+)

src/main/kotlin/com/compiler/server/compiler/components/KotlinCompiler.kt

@@ -2,10 +2,12 @@ package com.compiler.server.compiler.components
 
 import com.compiler.server.executor.CommandLineArgument
 import com.compiler.server.executor.JavaExecutor
+import com.compiler.server.model.ExtendedCompilerArgument
 import com.compiler.server.model.JvmExecutionResult
 import com.compiler.server.model.OutputDirectory
 import com.compiler.server.model.bean.LibrariesFile
 import com.compiler.server.model.toExceptionDescriptor
+import com.compiler.server.utils.CompilerArgumentsUtil
 import component.KotlinEnvironment
 import executors.JUnitExecutors
 import executors.JavaRunnerExecutor
@@ -32,7 +34,9 @@ class KotlinCompiler(
   private val kotlinEnvironment: KotlinEnvironment,
   private val javaExecutor: JavaExecutor,
   private val librariesFile: LibrariesFile,
-  @Value("\${policy.file}") private val policyFileName: String
+  @Value("\${policy.file}") private val policyFileName: String,
+    private val compilerArgumentsUtil: CompilerArgumentsUtil,
+    private val jvmCompilerArguments: Set<ExtendedCompilerArgument>,
 ) {
   private val policyFile = File(policyFileName)
 
@@ -51,16 +55,16 @@ class KotlinCompiler(
 
     return stringWriter.toString()
   }
-  
+
   private fun JvmExecutionResult.addByteCode(compiled: JvmClasses) {
     jvmByteCode = compiled.files
       .mapNotNull { (_, bytes) -> runCatching { bytes.asHumanReadable() }.getOrNull() }
       .takeUnless { it.isEmpty() }
       ?.joinToString("\n\n")
   }
 
-  fun run(files: List<KtFile>, addByteCode: Boolean, args: String): JvmExecutionResult {
-    return execute(files, addByteCode) { output, compiled ->
+  fun run(files: List<KtFile>, addByteCode: Boolean, args: String, userCompilerArguments: Map<String, Any>): JvmExecutionResult {
+    return execute(files, addByteCode, userCompilerArguments) { output, compiled ->
       val mainClass = JavaRunnerExecutor::class.java.name
       val compiledMainClass = when (compiled.mainClasses.size) {
         0 -> return@execute JvmExecutionResult(
@@ -80,25 +84,22 @@ class KotlinCompiler(
     }
   }
 
-  fun test(files: List<KtFile>, addByteCode: Boolean): JvmExecutionResult {
-    return execute(files, addByteCode) { output, _ ->
+  fun test(files: List<KtFile>, addByteCode: Boolean, userCompilerArguments: Map<String, Any>): JvmExecutionResult {
+    return execute(files, addByteCode, userCompilerArguments) { output, _ ->
       val mainClass = JUnitExecutors::class.java.name
       javaExecutor.execute(argsFrom(mainClass, output, listOf(output.path.toString())))
         .asJUnitExecutionResult()
     }
   }
 
   @OptIn(ExperimentalPathApi::class)
-  fun compile(files: List<KtFile>): CompilationResult<JvmClasses> = usingTempDirectory { inputDir ->
+  fun compile(files: List<KtFile>, userCompilerArguments: Map<String, Any>): CompilationResult<JvmClasses> = usingTempDirectory { inputDir ->
     val ioFiles = files.writeToIoFiles(inputDir)
     usingTempDirectory { outputDir ->
-      val arguments = ioFiles.map { it.absolutePathString() } + KotlinEnvironment.additionalCompilerArguments + listOf(
-        "-cp", kotlinEnvironment.classpath.joinToString(PATH_SEPARATOR) { it.absolutePath },
-        "-module-name", "web-module",
-        "-no-stdlib", "-no-reflect",
-        "-progressive",
-        "-d", outputDir.absolutePathString(),
-      ) + kotlinEnvironment.compilerPlugins.map { plugin -> "-Xplugin=${plugin.absolutePath}" }
+      val arguments = ioFiles.map { it.absolutePathString() } +
+              compilerArgumentsUtil.convertCompilerArgumentsToCompilationString(jvmCompilerArguments, compilerArgumentsUtil.PREDEFINED_JVM_ARGUMENTS, userCompilerArguments) +
+              listOf("-d", outputDir.absolutePathString())
+
       K2JVMCompiler().tryCompilation(inputDir, ioFiles, arguments) {
         val outputFiles = buildMap {
           outputDir.visitFileTree {
@@ -137,11 +138,12 @@ class KotlinCompiler(
     }.toSet()
 
   private fun execute(
-    files: List<KtFile>,
-    addByteCode: Boolean,
-    block: (output: OutputDirectory, compilation: JvmClasses) -> JvmExecutionResult
+      files: List<KtFile>,
+      addByteCode: Boolean,
+      userCompilerArguments: Map<String, Any>,
+      block: (output: OutputDirectory, compilation: JvmClasses) -> JvmExecutionResult
   ): JvmExecutionResult = try {
-    when (val compilationResult = compile(files)) {
+    when (val compilationResult = compile(files, userCompilerArguments)) {
       is Compiled<JvmClasses> -> {
         usingTempDirectory { outputDir ->
           val output = write(compilationResult.result, outputDir)