Add wasmJs target support. Rewrite several code generators to use Kot…

…linPoet. Add tests checking that every generated tag is instantiated without issues.
Kotlin · Jan 11, 2024 · 6285a17 · 6285a17
1 parent 9a68512
commit 6285a17
Show file tree

Hide file tree

Showing 26 changed files with 4,716 additions and 871 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,18 +1,20 @@
 import Build_gradle.MavenPomFile
 import kotlinx.html.js.packageJson
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 /**
  * This build script supports following parameters:
  * -PversionTag   - works together with "branch-build" profile and overrides "-SNAPSHOT" suffix of the version.
  */
 plugins {
-    kotlin("multiplatform") version "1.9.10"
+    kotlin("multiplatform") version "1.9.22"
     id("maven-publish")
     id("signing")
 }
 
 group = "org.jetbrains.kotlinx"
-version = "0.10.1"
+version = "0.11.0-SNAPSHOT"
 
 buildscript {
     dependencies {
@@ -90,7 +92,7 @@ kotlin {
             }
         }
     }
-    js(IR) {
+    js {
         moduleName = project.name
         browser()
 
@@ -99,6 +101,16 @@ kotlin {
             pom { name by "${project.name}-js" }
         }
     }
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        moduleName = project.name
+        browser()
+
+        mavenPublication {
+            groupId = group as String
+            pom { name by "${project.name}-wasm-js" }
+        }
+    }
 
     mingwX64()
     linuxX64()
@@ -117,6 +129,17 @@ kotlin {
     macosX64()
     macosArm64()
 
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
+    applyDefaultHierarchyTemplate {
+        common {
+            group("jsCommon") {
+                withJs()
+                // TODO: switch to `withWasmJs()` after upgrade to Kotlin 2.0
+                withWasm()
+            }
+        }
+    }
+
     metadata {
         mavenPublication {
             groupId = group as String
@@ -134,7 +157,7 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation(kotlin("stdlib-common"))
+                implementation(kotlin("stdlib"))
             }
         }
 
@@ -144,61 +167,6 @@ kotlin {
             }
         }
 
-        val jsMain by getting {
-            dependencies {
-                implementation(kotlin("stdlib-js"))
-            }
-        }
-
-        val jsTest by getting {
-            dependencies {
-                implementation(kotlin("test-js"))
-            }
-        }
-
-        val jvmMain by getting {
-            dependencies {
-                implementation(kotlin("stdlib"))
-            }
-        }
-
-        val jvmTest by getting {
-            dependencies {
-                implementation(kotlin("test-junit"))
-            }
-        }
-
-        val nativeMain by creating
-        val nativeTest by creating
-
-        val nativeTargets = listOf(
-            "mingwX64",
-            "linuxX64",
-            "linuxArm64",
-            "iosX64",
-            "iosArm64",
-            "iosArm32",
-            "iosSimulatorArm64",
-            "watchosX86",
-            "watchosX64",
-            "watchosArm32",
-            "watchosArm64",
-            "watchosSimulatorArm64",
-            "tvosX64",
-            "tvosArm64",
-            "tvosSimulatorArm64",
-            "macosX64",
-            "macosArm64",
-            "watchosDeviceArm64",
-        )
-
-        val commonMain by getting
-        nativeMain.dependsOn(commonMain)
-
-        nativeTargets.forEach { target ->
-            findByName("${target}Main")?.dependsOn(nativeMain)
-            findByName("${target}Test")?.dependsOn(nativeTest)
-        }
     }
 }
 
@@ -220,9 +188,14 @@ tasks.register<Task>("generate") {
 
     doLast {
         kotlinx.html.generate.generate(
-            "kotlinx.html",
-            "src/commonMain/kotlin/generated",
-            "src/jsMain/kotlin/generated"
+            pkg = "kotlinx.html",
+            todir = "src/commonMain/kotlin/generated",
+            jsdir = "src/jsMain/kotlin/generated",
+            wasmJsDir = "src/wasmJsMain/kotlin/generated"
+        )
+        kotlinx.html.generate.generateJsTagTests(
+            jsdir = "src/jsTest/kotlin/generated",
+            wasmJsDir = "src/wasmJsTest/kotlin/generated",
         )
     }
 }

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -9,4 +9,5 @@ repositories {
 dependencies {
     implementation(kotlin("stdlib"))
     implementation("com.sun.xsom:xsom:20140925")
+    implementation("com.squareup:kotlinpoet:1.15.3")
 }
diff --git a/buildSrc/src/main/kotlin/kotlinx/html/generate/attributes.kt b/buildSrc/src/main/kotlin/kotlinx/html/generate/attributes.kt
@@ -1,5 +1,12 @@
 package kotlinx.html.generate
 
+import com.squareup.kotlinpoet.ClassName
+import com.squareup.kotlinpoet.FunSpec
+import com.squareup.kotlinpoet.LambdaTypeName
+import com.squareup.kotlinpoet.ParameterSpec
+import com.squareup.kotlinpoet.PropertySpec
+import com.squareup.kotlinpoet.TypeName
+
 fun String.quote() = "\"$this\""
 
 fun Appendable.attributePseudoDelegate(request: AttributeRequest) {
@@ -52,13 +59,15 @@ fun Appendable.facade(repository: Repository, facade: AttributeFacade) {
     }
 }
 
-fun Appendable.eventProperty(parent: String, attribute: AttributeInfo) {
+fun Appendable.eventProperty(parent: String, attribute: AttributeInfo, shouldUnsafeCast: Boolean) {
     val type = "(org.w3c.dom.events.Event) -> Unit"
-    variable(receiver = parent, variable = Var(
+    variable(
+        receiver = parent, variable = Var(
             name = attribute.fieldName + "Function",
             type = type,
             mutable = true
-    ))
+        )
+    )
     emptyLine()
 
     getter().defineIs(StringBuilder().apply {
@@ -67,11 +76,48 @@ fun Appendable.eventProperty(parent: String, attribute: AttributeInfo) {
     })
     setter {
         receiverDot("consumer")
-        functionCall("onTagEvent", listOf(
+        val newValue = if (shouldUnsafeCast) {
+            "newValue.unsafeCast<(Event) -> Unit>()"
+        } else {
+            "newValue"
+        }
+        functionCall(
+            "onTagEvent", listOf(
                 "this",
                 attribute.name.quote(),
-                "newValue.unsafeCast<(Event) -> Unit>()"
-        ))
+                newValue
+            )
+        )
     }
     emptyLine()
 }
+
+fun eventProperty(parent: TypeName, attribute: AttributeInfo, shouldUnsafeCast: Boolean): PropertySpec {
+    val propertyType = LambdaTypeName.get(
+        returnType = ClassName("kotlin", "Unit"),
+        parameters = listOf(ParameterSpec.unnamed(ClassName("kotlinx.html.org.w3c.dom.events", "Event"))),
+    )
+    return PropertySpec.builder(attribute.fieldName + "Function", propertyType)
+        .mutable()
+        .receiver(parent)
+        .getter(
+            FunSpec.getterBuilder()
+                .addStatement("throw UnsupportedOperationException(\"You can't read variable ${attribute.fieldName}\")")
+                .build()
+        )
+        .setter(
+            FunSpec.setterBuilder()
+                .addParameter("newValue", propertyType)
+                .addStatement(
+                    "consumer.onTagEvent(this, %S, %L)",
+                    attribute.name,
+                    if (shouldUnsafeCast) {
+                        "newValue.unsafeCast<(Event) -> Unit>()"
+                    } else {
+                        "newValue"
+                    }
+                )
+                .build()
+        )
+        .build()
+}