First version with typeinfo

Author: ilgonmic

build.gradle.kts

@@ -39,7 +39,7 @@ val resourceDependency: Configuration by configurations.creating {
 }
 
 
-val kotlinComposeWasmIcLocalCache: Configuration by configurations.creating {
+val kotlinComposeWasmStdlibTypeInfo: Configuration by configurations.creating {
     isTransitive = false
     isCanBeResolved = true
     isCanBeConsumed = false
@@ -50,23 +50,7 @@ val kotlinComposeWasmIcLocalCache: Configuration by configurations.creating {
         )
         attribute(
             CacheAttribute.cacheAttribute,
-            CacheAttribute.LOCAL
-        )
-    }
-}
-
-val kotlinComposeWasmIcLambdaCache: Configuration by configurations.creating {
-    isTransitive = false
-    isCanBeResolved = true
-    isCanBeConsumed = false
-    attributes {
-        attribute(
-            Category.CATEGORY_ATTRIBUTE,
-            objects.categoryComposeCache
-        )
-        attribute(
-            CacheAttribute.cacheAttribute,
-            CacheAttribute.LAMBDA
+            CacheAttribute.STDLIB
         )
     }
 }
@@ -99,8 +83,7 @@ dependencies {
 
     resourceDependency(libs.skiko.js.wasm.runtime)
 
-    kotlinComposeWasmIcLocalCache(project(":cache-maker"))
-    kotlinComposeWasmIcLambdaCache(project(":cache-maker"))
+    kotlinComposeWasmStdlibTypeInfo(project(":cache-maker"))
 }
 
 fun buildPropertyFile() {
@@ -138,7 +121,7 @@ tasks.withType<KotlinCompile> {
     }
     dependsOn(":executors:jar")
     dependsOn(":indexation:run")
-    dependsOn(kotlinComposeWasmIcLocalCache)
+    dependsOn(kotlinComposeWasmStdlibTypeInfo)
     buildPropertyFile()
 }
 println("Using Kotlin compiler ${libs.versions.kotlin.get()}")
@@ -171,7 +154,7 @@ val buildLambda by tasks.creating(Zip::class) {
     from(libJVMFolder) { into(libJVM) }
     from(compilerPluginsForJVMFolder) {into(compilerPluginsForJVM)}
     from(libComposeWasmCompilerPluginsFolder) { into(libComposeWasmCompilerPlugins) }
-    from(kotlinComposeWasmIcLambdaCache)
+    from(kotlinComposeWasmStdlibTypeInfo) { into(cachesComposeWasm) }
     into("lib") {
         from(configurations.compileClasspath) { exclude("tomcat-embed-*") }
     }

buildSrc/src/main/kotlin/CacheAttribute.kt

@@ -1,8 +1,7 @@
 import org.gradle.api.attributes.Attribute
 
 enum class CacheAttribute {
-    LOCAL,
-    LAMBDA;
+    STDLIB;
 
     companion object {
         val cacheAttribute = Attribute.of("org.jetbrains.kotlin-compiler-server.cache", CacheAttribute::class.java)

cache-maker/Dockerfile

@@ -8,23 +8,13 @@ RUN if [ -z "$KOTLIN_VERSION" ]; then \
         exit 1; \
     fi
 
-ENV KOTLIN_LIB=$KOTLIN_VERSION
-ENV KOTLIN_LIB_JS=${KOTLIN_VERSION}-js
-ENV KOTLIN_LIB_WASM=${KOTLIN_VERSION}-wasm
-ENV KOTLIN_LIB_COMPOSE_WASM=${KOTLIN_VERSION}-compose-wasm
-ENV KOTLIN_COMPOSE_WASM_COMPILER_PLUGINS=${KOTLIN_VERSION}-compose-wasm-compiler-plugins
-ENV KOTLIN_CACHES_COMPOSE_WASM=${KOTLIN_VERSION}-caches-compose-wasm
+ENV KOTLIN_VERSION=$KOTLIN_VERSION
 
 RUN mkdir -p $BASE_DIR
 WORKDIR $BASE_DIR
 ADD . $BASE_DIR
 
-RUN rm -rf $KOTLIN_LIB
-RUN rm -rf $KOTLIN_LIB_JS
-RUN rm -rf $KOTLIN_LIB_WASM
-RUN rm -rf $KOTLIN_LIB_COMPOSE_WASM
-RUN rm -rf $KOTLIN_COMPOSE_WASM_COMPILER_PLUGINS
-RUN rm -rf $KOTLIN_CACHES_COMPOSE_WASM
+RUN sed -i 's@kotlin = ".*"@kotlin = "'$KOTLIN_VERSION'"@g' gradle/libs.versions.toml
 RUN ./gradlew clean
 
-RUN ./gradlew :cache-maker:run
+RUN ./gradlew :cache-maker:compileProductionExecutableKotlinWasmJs

cache-maker/build.gradle.kts

@@ -1,56 +1,55 @@
 plugins {
-    kotlin("jvm")
-    application
+    kotlin("multiplatform")
 }
 
-dependencies {
-    implementation(project(":common", configuration = "default"))
-}
+kotlin {
+    wasmJs {
+        outputModuleName.set("stdlib")
+        binaries.executable().forEach {
+            it.linkTask.configure {
+                compilerOptions.freeCompilerArgs.add("-Xir-dce=false")
+            }
+        }
+    }
 
-application {
-    mainClass.set("com.compiler.server.cache.MainKt")
+    sourceSets {
+        wasmJsMain {
+            dependencies {
+                implementation(libs.bundles.compose)
+                implementation(libs.kotlinx.coroutines.core.compose.wasm)
+            }
+        }
+    }
 }
 
-val runTask = tasks.named<JavaExec>("run") {
-    dependsOn(":dependencies:copyDependencies")
-    dependsOn(":dependencies:copyWasmDependencies")
-    dependsOn(":dependencies:copyComposeWasmCompilerPlugins")
-    dependsOn(":dependencies:copyComposeWasmDependencies")
-
-    val kotlinVersion = libs.versions.kotlin.get()
-    inputs.property("kotlinVersion", kotlinVersion)
-
-    inputs.dir(libWasmFolder)
-    inputs.dir(libComposeWasmFolder)
-    inputs.dir(libComposeWasmCompilerPluginsFolder)
+val composeWasmStdlibTypeInfo: Provider<RegularFile> = layout.buildDirectory
+    .file("compose-wasm-stdlib-output/stdlib.typeinfo.bin")
 
-    outputs.dir(cachesComposeWasmFolder)
-
-    args(
-        kotlinVersion,
-        libJVMFolder.asFile.absolutePath,
-        cachesComposeWasmFolder,
-    )
-}
-
-val outputLambdaCacheDir: Provider<Directory> = layout.buildDirectory.dir("incremental-cache")
-val buildCacheForLambda by tasks.registering(Exec::class) {
+val buildComposeWasmStdlibModule by tasks.registering(Exec::class) {
     workingDir = rootDir
     executable = "${project.name}/docker-build-incremental-cache.sh"
 
-    val outputDir = outputLambdaCacheDir
+    val outputDir = composeWasmStdlibTypeInfo.map { it.asFile.parentFile }
 
-    outputs.dir(outputDir.map { it.dir(cachesComposeWasm) })
+    inputs.file(layout.projectDirectory.file("Dockerfile"))
+    inputs.file(layout.projectDirectory.file("docker-build-incremental-cache.sh"))
+    outputs.dir(outputDir)
 
     argumentProviders.add {
         listOf(
             lambdaPrefix, // baseDir
-            outputDir.get().asFile.normalize().absolutePath, // targetDir
+            outputDir.get().normalize().absolutePath, // targetDir
         )
     }
 }
 
-val kotlinComposeWasmIc: Configuration by configurations.creating {
+val prepareTypeInfoIntoComposeWasmCache by tasks.registering(Sync::class) {
+    dependsOn(buildComposeWasmStdlibModule)
+    from(composeWasmStdlibTypeInfo)
+    into(cachesComposeWasmFolder)
+}
+
+val kotlinComposeWasmStdlibTypeInfo: Configuration by configurations.creating {
     isTransitive = false
     isCanBeResolved = false
     isCanBeConsumed = true
@@ -62,30 +61,16 @@ val kotlinComposeWasmIc: Configuration by configurations.creating {
     }
 }
 
-kotlinComposeWasmIc.outgoing.variants.create("local") {
+kotlinComposeWasmStdlibTypeInfo.outgoing.variants.create("stdlib") {
     attributes {
         attribute(
             CacheAttribute.cacheAttribute,
-            CacheAttribute.LOCAL
+            CacheAttribute.STDLIB
         )
     }
 
     artifact(cachesComposeWasmFolder) {
         type = "directory"
-        builtBy(runTask)
-    }
-}
-
-kotlinComposeWasmIc.outgoing.variants.create("lambda") {
-    attributes {
-        attribute(
-            CacheAttribute.cacheAttribute,
-            CacheAttribute.LAMBDA
-        )
-    }
-
-    artifact(outputLambdaCacheDir) {
-        type = "directory"
-        builtBy(buildCacheForLambda)
+        builtBy(prepareTypeInfoIntoComposeWasmCache)
     }
 }

cache-maker/docker-build-incremental-cache.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-kotlinVersion=$(awk '{ if ($1 == "kotlin") { gsub(/"/, "", $2); print $2; } }' FS=' = ' ./gradle/libs.versions.toml)
+kotlinVersion=$(awk '{ if ($1 == "kotlinWasmStdlibCompiler") { gsub(/"/, "", $2); print $2; } }' FS=' = ' ./gradle/libs.versions.toml)
 
 baseDir=$1
 targetDir=$2
@@ -15,7 +15,7 @@ docker build . --file cache-maker/Dockerfile --tag $image_tag --build-arg BASE_D
 
 container=$(docker create $image_tag)
 
-docker cp $container:$baseDir/$kotlinVersion-caches-compose-wasm $targetDir
+docker cp $container:$baseDir/cache-maker/build/compileSync/wasmJs/main/productionExecutable/kotlin/. $targetDir
 
 docker start $container
 docker stop $container