Fix JS tests

Author: tschuchortdev

core/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -18,6 +19,35 @@ buildConfig {
     }
 }
 
+/* Multiple variants are offered of the dependencies kotlin-dom-api-compat and kotlin-stdlib-js. Usually, Gradle picks
+* them automatically based on what kind of build it is, i.e. it would look for a platform JVM variant for this JVM build.
+* Naturally, there is no JVM version for JS libraries. We need to fix the variant attributes manually so the right variant
+* will be picked for runtime use in the JS compile tests. */
+configurations.all {
+    resolutionStrategy.dependencySubstitution {
+        substitute(module(libs.kotlin.domApiCompat.get().module.toString()))
+            .using(variant(module(libs.kotlin.domApiCompat.get().toString())) {
+            attributes {
+                attribute(Attribute.of("org.jetbrains.kotlin.platform.type", KotlinPlatformType::class.java), KotlinPlatformType.js)
+                attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage::class.java, "kotlin-runtime"))
+            }
+        })
+    }
+}
+
+configurations.all {
+    resolutionStrategy.dependencySubstitution {
+        substitute(module(libs.kotlin.stdlibJs.get().module.toString()))
+            .using(variant(module(libs.kotlin.stdlibJs.get().toString())) {
+            attributes {
+                attribute(Attribute.of("org.jetbrains.kotlin.platform.type", KotlinPlatformType::class.java), KotlinPlatformType.js)
+                attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage::class.java, "kotlin-runtime"))
+                attribute(Attribute.of("org.jetbrains.kotlin.js.compiler", String::class.java), "ir")
+            }
+        })
+    }
+}
+
 dependencies {
     implementation(libs.autoService)
     ksp(libs.autoService.ksp)
@@ -31,6 +61,9 @@ dependencies {
     // These dependencies are only needed as a "sample" compiler plugin to test that
     // running compiler plugins passed via the pluginClasspath CLI option works
     testRuntimeOnly(libs.kotlin.scriptingCompiler)
+    // Include Kotlin/JS standard library in test classpath for auto loading
+    testRuntimeOnly(libs.kotlin.stdlibJs)
+    testRuntimeOnly(libs.kotlin.domApiCompat)
     testRuntimeOnly(libs.intellij.core)
     testRuntimeOnly(libs.intellij.util)
 

core/src/main/kotlin/com/tschuchort/compiletesting/HostEnvironment.kt

@@ -27,6 +27,11 @@ internal object HostEnvironment {
         findInClasspath(kotlinDependencyRegex("kotlin-stdlib-js"))
     }
 
+    val kotlinDomApiCompatKlib: File? by lazy {
+        findInClasspath(kotlinDependencyRegex("kotlin-dom-api-compat"))
+    }
+
+
     val kotlinReflectJar: File? by lazy {
         findInClasspath(kotlinDependencyRegex("kotlin-reflect"))
     }
@@ -40,7 +45,7 @@ internal object HostEnvironment {
     }
 
     private fun kotlinDependencyRegex(prefix: String): Regex {
-        return Regex("$prefix(-[0-9]+\\.[0-9]+(\\.[0-9]+)?)([-0-9a-zA-Z]+)?\\.jar")
+        return Regex("$prefix(-[0-9]+\\.[0-9]+(\\.[0-9]+)?)([-0-9a-zA-Z]+)?(\\.jar|\\.klib)")
     }
 
     /** Tries to find a file matching the given [regex] in the host process' classpath */
@@ -60,7 +65,11 @@ internal object HostEnvironment {
 
         val classpaths = classGraph.classpathFiles
         val modules = classGraph.modules.mapNotNull { it.locationFile }
+        val klibs = System.getProperty("java.class.path")
+            .split(File.pathSeparator)
+            .filter { it.endsWith(".klib") }
+            .map(::File)
 
-        return (classpaths + modules).distinctBy(File::getAbsolutePath)
+        return (classpaths + modules + klibs).distinctBy(File::getAbsolutePath)
     }
 }

core/src/main/kotlin/com/tschuchort/compiletesting/KotlinJsCompilation.kt

@@ -47,6 +47,15 @@ class KotlinJsCompilation : AbstractKotlinCompilation<K2JSCompilerArguments>() {
     HostEnvironment.kotlinStdLibJsJar
   }
 
+  /**
+   * Path to the kotlin-dom-api-compat.klib
+   * If none is given, it will be searched for in the host
+   * process' classpaths
+   */
+  var kotlinStdLibDomApi: File? by default {
+    HostEnvironment.kotlinDomApiCompatKlib
+  }
+
   /**
    * Generate TypeScript declarations .d.ts file alongside JS file. Available in IR backend only
    */
@@ -67,7 +76,7 @@ class KotlinJsCompilation : AbstractKotlinCompilation<K2JSCompilerArguments>() {
     args.outputFile = File(outputDir, outputFileName).absolutePath
     args.outputDir = outputDir.absolutePath
     args.sourceMapBaseDirs = jsClasspath().joinToString(separator = File.pathSeparator)
-    args.libraries = listOfNotNull(kotlinStdLibJsJar).joinToString(separator = ":")
+    args.libraries = listOfNotNull(kotlinStdLibJsJar, kotlinStdLibDomApi).joinToString(separator = File.pathSeparator)
 
     args.irProduceKlibDir = irProduceKlibDir
     args.irProduceKlibFile = irProduceKlibFile

core/src/test/kotlin/com/tschuchort/compiletesting/KotlinJsCompilationTests.kt

@@ -13,7 +13,6 @@ import org.junit.Test
 import org.junit.rules.TemporaryFolder
 import java.io.File
 
-@Ignore("These no longer work with Kotlin JS IR")
 @Suppress("MemberVisibilityCanBePrivate")
 class KotlinJsCompilationTests {
 	@Rule @JvmField val temporaryFolder = TemporaryFolder()

gradle/libs.versions.toml

@@ -24,6 +24,8 @@ javapoet = "com.squareup:javapoet:1.13.0"
 kotlin-compilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
 kotlin-annotationProcessingEmbeddable = { module = "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable", version.ref = "kotlin" }
 kotlin-scriptingCompiler = { module = "org.jetbrains.kotlin:kotlin-scripting-compiler", version.ref = "kotlin" }
+kotlin-stdlibJs = { module = "org.jetbrains.kotlin:kotlin-stdlib-js", version.ref = "kotlin" }
+kotlin-domApiCompat = { module = "org.jetbrains.kotlin:kotlin-dom-api-compat", version.ref = "kotlin" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 kotlin-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }