Use klib files as libraries for JS and Wasm compilers

Author: ilgonmic

build.gradle.kts

@@ -54,12 +54,12 @@ val copyDependencies by tasks.creating(Copy::class) {
     into(libJVMFolder)
 }
 val copyJSDependencies by tasks.creating(Copy::class) {
-    from(files(Callable { kotlinJsDependency.map { zipTree(it) } }))
+    from(kotlinJsDependency)
     into(libJSFolder)
 }
 
 val copyWasmDependencies by tasks.creating(Copy::class) {
-    from(files(Callable { kotlinWasmDependency.map { zipTree(it) } }))
+    from(kotlinWasmDependency)
     into(libWasmFolder)
 }
 
@@ -114,6 +114,7 @@ dependencies {
     kotlinDependency("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")
     kotlinDependency("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3")
     kotlinJsDependency("org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion")
+    kotlinJsDependency("org.jetbrains.kotlin:kotlin-dom-api-compat:$kotlinVersion")
     kotlinWasmDependency("org.jetbrains.kotlin:kotlin-stdlib-wasm-js:$kotlinVersion")
 
     annotationProcessor("org.springframework:spring-context-indexer")

indexation/src/main/kotlin/KotlinEnvironmentConfiguration.kt

@@ -15,7 +15,9 @@ class KotlinEnvironmentConfiguration(fileName: String) {
             ?: error("No kotlin libraries found in: ${jvmFile.absolutePath}")
         }
 
-    val additionalJsClasspath = listOfNotNull(jsFile)
-    KotlinEnvironment(classPath, additionalJsClasspath, listOfNotNull(wasmFile))
+    val additionalJsClasspath = jsFile.listFiles()?.toList() ?: emptyList()
+    val additionalWasmClasspath = wasmFile.listFiles()?.toList() ?: emptyList()
+
+    KotlinEnvironment(classPath, additionalJsClasspath, additionalWasmClasspath)
   }
 }

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

@@ -16,7 +16,9 @@ class KotlinEnvironmentConfiguration(val librariesFile: LibrariesFile) {
             ?: error("No kotlin libraries found in: ${librariesFile.jvm.absolutePath}")
         }
 
-    val additionalJsClasspath = listOfNotNull(librariesFile.js)
-    return KotlinEnvironment(classPath, additionalJsClasspath, listOfNotNull(librariesFile.wasm))
+    val additionalJsClasspath = librariesFile.js.listFiles()?.toList() ?: emptyList()
+    val additionalWasmClasspath = librariesFile.wasm.listFiles()?.toList() ?: emptyList()
+
+    return KotlinEnvironment(classPath, additionalJsClasspath, additionalWasmClasspath)
   }
 }