Setup a common sourceSet in between wasmJs and JS targets to publish …

.gitignore

@@ -13,4 +13,5 @@ gradle-app.setting
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
 # gradle/wrapper/gradle-wrapper.properties
 /.idea/
-/kotlin-js-store/
+/kotlin-js-store/
+/.kotlin/

build.gradle.kts

@@ -1,7 +1,9 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon
 
 plugins {
-    kotlin("multiplatform") version "1.9.24"
+    kotlin("multiplatform") version "2.1.10"
     `maven-publish`
     signing
 }
@@ -26,6 +28,7 @@ afterEvaluate {
 
 repositories {
     mavenCentral()
+    mavenLocal()
 }
 
 val artifactId = "kotlinx-browser"
@@ -39,16 +42,43 @@ if (!versionSuffix.isNullOrBlank()) {
 }
 
 kotlin {
+    js()
+
     @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
         nodejs()
     }
 
     sourceSets {
-        val wasmJsTest by getting {
+        val commonMain by getting
+        val commonTest by getting
+        val browserMain by creating {
+            dependsOn(commonMain)
+        }
+        val browserTest by creating {
+            dependsOn(commonTest)
             dependencies {
                 implementation(kotlin("test"))
             }
         }
+        val jsMain by getting {
+            dependsOn(browserMain)
+            dependencies {
+                implementation(kotlin("wasm-js-interop", "0.0.1-SNAPSHOT"))
+            }
+        }
+        val jsTest by getting {
+            dependsOn(browserTest)
+        }
+        val wasmJsMain by getting {
+            dependsOn(browserMain)
+        }
+        val wasmJsTest by getting {
+            dependsOn(browserTest)
+        }
     }
+}
+
+tasks.withType<KotlinCompileCommon>().configureEach {
+    enabled = false
 }

generator/build.gradle.kts

@@ -18,15 +18,15 @@ task("downloadIDL", JavaExec::class) {
     dependsOn("build")
 }
 
-task("generateWasmStdlibFromIDL", JavaExec::class) {
-    mainClass = "org.jetbrains.kotlin.tools.dukat.LaunchWasmKt"
+task("generateStdlibFromIDL", JavaExec::class) {
+    mainClass = "org.jetbrains.kotlin.tools.dukat.LaunchBrowserKt"
     classpath = sourceSets["main"].runtimeClasspath
     dependsOn("build")
     systemProperty("line.separator", "\n")
 }
 
-task("generateWasmJsUtils", JavaExec::class) {
-    mainClass.set("org.jetbrains.kotlin.generators.wasm.js.GenerateKt")
+task("generateUtils", JavaExec::class) {
+    mainClass.set("org.jetbrains.kotlin.generators.helpers.GenerateKt")
     classpath = sourceSets["main"].runtimeClasspath
     dependsOn("build")
 }

generator/src/main/kotlin/dukat/launchWasm.kt → generator/src/main/kotlin/dukat/launchBrowser.kt

@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.tools.dukat.wasm.translateIdlToSourceSet
 import java.io.File
 
 fun main() {
-    val outputDirectory = "../src/wasmJsMain/kotlin/org.w3c/"
+    val outputDirectory = "../src/browserMain/kotlin/org.w3c/"
     val input = "../idl/org.w3c.dom.idl"
 
     val sourceSet = translateIdlToSourceSet(input)

generator/src/main/kotlin/dukat/wasm/convertToModel.kt

@@ -380,9 +380,7 @@ private class IdlFileConverter(
                 SUPPRESS_UNUSED_PARAMETER_ANNOTATION
             ),
             body = BlockStatementModel(
-                listOf(
-                    ExpressionStatementModel(callJsFunction("return obj[${key.name}];"))
-                )
+                listOf(ReturnStatementModel(callJsFunction("obj[${key.name}]")))
             ),
             visibilityModifier = VisibilityModifierModel.INTERNAL,
             comment = null,
@@ -555,8 +553,8 @@ private class IdlFileConverter(
 
     fun IDLDictionaryDeclaration.generateFunctionBody(): List<StatementModel> =
         listOf<StatementModel>(
-            ExpressionStatementModel(
-                callJsFunction("return { ${members.joinToString { it.name }} };")
+            ReturnStatementModel(
+                callJsFunction("({ ${members.joinToString(", ") { "${it.name}: ${it.name}" }} })")
             )
         )
 

generator/src/main/kotlin/helpers/generate.kt

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.generators.wasm.js
+package org.jetbrains.kotlin.generators.helpers
 
 import org.jetbrains.kotlin.tools.dukat.getHeader
 import java.io.File
@@ -15,25 +15,100 @@ fun main() {
 }
 
 fun generatePublicStdlibFunctions() {
-    FileWriter(File("../src/wasmJsMain/kotlin/arrayCopy.kt")).use { writer: FileWriter ->
+    val conversions = listOf(
+        Conversion("Byte", "Int8"),
+        Conversion("UByte", "Uint8", isUnsigned = true),
+        Conversion("Short", "Int16"),
+        Conversion("UShort", "Uint16", isUnsigned = true),
+        Conversion("Int", "Int32"),
+        Conversion("UInt", "Uint32", isUnsigned = true),
+        Conversion("Float", "Float32"),
+        Conversion("Double", "Float64")
+    )
+
+    FileWriter(File("../src/browserMain/kotlin/arrayCopy.kt")).use { writer: FileWriter ->
         with(writer) {
             appendLine(getHeader(seeDetailsAt = "generator/src/main/kotlin/helpers/generate.kt"))
+            appendLine("package org.khronos.webgl")
 
+            conversions.forEach { (ktType, jsType, isUnsigned) ->
+                appendExpectConversionsForType(ktType, jsType, isUnsigned)
+            }
+        }
+    }
+    FileWriter(File("../src/jsMain/kotlin/arrayCopy.js.kt")).use { writer: FileWriter ->
+        with(writer) {
+            appendLine(getHeader(seeDetailsAt = "generator/src/main/kotlin/helpers/generate.kt"))
+
+            appendLine("package org.khronos.webgl")
+
+            conversions.forEach { (ktType, jsType, isUnsigned) ->
+                appendJsConversionsForType(ktType, jsType, isUnsigned)
+            }
+        }
+    }
+    FileWriter(File("../src/wasmJsMain/kotlin/arrayCopy.wasm.kt")).use { writer: FileWriter ->
+        with(writer) {
+            appendLine(getHeader(seeDetailsAt = "generator/src/main/kotlin/helpers/generate.kt"))
             appendLine("package org.khronos.webgl")
 
-            appendConversionsForType("Byte", "Int8")
-            appendConversionsForType("UByte", "Uint8", isUnsigned = true)
-            appendConversionsForType("Short", "Int16")
-            appendConversionsForType("UShort", "Uint16", isUnsigned = true)
-            appendConversionsForType("Int", "Int32")
-            appendConversionsForType("UInt", "Uint32", isUnsigned = true)
-            appendConversionsForType("Float", "Float32")
-            appendConversionsForType("Double", "Float64")
+            conversions.forEach { (ktType, jsType, isUnsigned) ->
+                appendWasmConversionsForType(ktType, jsType, isUnsigned)
+            }
         }
     }
 }
 
-private fun FileWriter.appendConversionsForType(
+
+private fun FileWriter.appendExpectConversionsForType(
+    ktType: String,
+    jsType: String,
+    isUnsigned: Boolean = false,
+) {
+    val kotlinArrayType = "${ktType}Array"
+    val jsArrayType = "${jsType}Array"
+
+    appendLine()
+    appendLine("/** Returns a new [$kotlinArrayType] containing all the elements of this [$jsArrayType]. */")
+    if (isUnsigned) {
+        appendLine("@ExperimentalUnsignedTypes")
+    }
+    appendLine("public expect fun $jsArrayType.to$kotlinArrayType(): $kotlinArrayType")
+    appendLine()
+    appendLine("/** Returns a new [$jsArrayType] containing all the elements of this [$kotlinArrayType]. */")
+    if (isUnsigned) {
+        appendLine("@ExperimentalUnsignedTypes")
+    }
+    appendLine("public expect fun $kotlinArrayType.to$jsArrayType(): $jsArrayType")
+}
+
+
+private fun FileWriter.appendJsConversionsForType(
+    ktType: String,
+    jsType: String,
+    isUnsigned: Boolean = false,
+) {
+    val kotlinArrayType = "${ktType}Array"
+    val jsArrayType = "${jsType}Array"
+
+    appendLine()
+    appendLine("/** Returns a new [$kotlinArrayType] containing all the elements of this [$jsArrayType]. */")
+    if (isUnsigned) {
+        appendLine("@ExperimentalUnsignedTypes")
+    }
+    appendLine("public actual inline fun $jsArrayType.to$kotlinArrayType(): $kotlinArrayType =")
+    appendLine("    unsafeCast<$kotlinArrayType>()")
+
+    appendLine()
+    appendLine("/** Returns a new [$jsArrayType] containing all the elements of this [$kotlinArrayType]. */")
+    if (isUnsigned) {
+        appendLine("@ExperimentalUnsignedTypes")
+    }
+    appendLine("public actual inline fun $kotlinArrayType.to$jsArrayType(): $jsArrayType =")
+    appendLine("    unsafeCast<$jsArrayType>()")
+}
+
+private fun FileWriter.appendWasmConversionsForType(
     ktType: String,
     jsType: String,
     isUnsigned: Boolean = false,
@@ -46,7 +121,7 @@ private fun FileWriter.appendConversionsForType(
     if (isUnsigned) {
         appendLine("@ExperimentalUnsignedTypes")
     }
-    appendLine("public fun $jsArrayType.to$kotlinArrayType(): $kotlinArrayType =")
+    appendLine("public actual fun $jsArrayType.to$kotlinArrayType(): $kotlinArrayType =")
     if (isUnsigned) {
         appendLine("    $kotlinArrayType(this.length) { this[it].to$ktType() }")
     } else {
@@ -58,7 +133,7 @@ private fun FileWriter.appendConversionsForType(
     if (isUnsigned) {
         appendLine("@ExperimentalUnsignedTypes")
     }
-    appendLine("public fun $kotlinArrayType.to$jsArrayType(): $jsArrayType {")
+    appendLine("public actual fun $kotlinArrayType.to$jsArrayType(): $jsArrayType {")
     appendLine("    val result = $jsArrayType(this.size)")
     appendLine("    for (index in this.indices) {")
     if (isUnsigned) {
@@ -73,7 +148,7 @@ private fun FileWriter.appendConversionsForType(
 }
 
 fun generateTests() {
-    FileWriter(File("../src/wasmJsTest/kotlin/arrayCopyTest.kt")).use { writer: FileWriter ->
+    FileWriter(File("../src/browserTest/kotlin/arrayCopyTest.kt")).use { writer: FileWriter ->
         with(writer) {
             appendLine(getHeader(seeDetailsAt = "generator/src/main/kotlin/helpers/generate.kt"))
 
@@ -146,4 +221,7 @@ private fun FileWriter.appendTestFunction(
     appendLine("        testJsRoundTrip($ktArrayOf(0.to$ktType(), (-42).to$ktType(), $ktType.MIN_VALUE, $ktType.MAX_VALUE))")
     appendLine("        testJsRoundTrip($kotlinArrayType(1000) { it.to$ktType() })")
     appendLine("    }")
-}
+}
+
+data class Conversion(val jsType: String, val ktType: String, val isUnsigned: Boolean = false)
+data class InteropCorrespondence(val interopType: String, val wasmType: String, val jsType: String)

settings.gradle.kts

@@ -3,7 +3,7 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        kotlin("multiplatform").version("1.9.23")
+        kotlin("multiplatform").version("2.1.10")
     }
 }
 

src/browserMain/kotlin/arrayCopy.kt

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2010-2025 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+
+// NOTE: THIS FILE IS AUTO-GENERATED, DO NOT EDIT!
+// See generator/src/main/kotlin/helpers/generate.kt for details
+
+
+package org.khronos.webgl
+
+/** Returns a new [ByteArray] containing all the elements of this [Int8Array]. */
+public expect fun Int8Array.toByteArray(): ByteArray
+
+/** Returns a new [Int8Array] containing all the elements of this [ByteArray]. */
+public expect fun ByteArray.toInt8Array(): Int8Array
+
+/** Returns a new [UByteArray] containing all the elements of this [Uint8Array]. */
+@ExperimentalUnsignedTypes
+public expect fun Uint8Array.toUByteArray(): UByteArray
+
+/** Returns a new [Uint8Array] containing all the elements of this [UByteArray]. */
+@ExperimentalUnsignedTypes
+public expect fun UByteArray.toUint8Array(): Uint8Array
+
+/** Returns a new [ShortArray] containing all the elements of this [Int16Array]. */
+public expect fun Int16Array.toShortArray(): ShortArray
+
+/** Returns a new [Int16Array] containing all the elements of this [ShortArray]. */
+public expect fun ShortArray.toInt16Array(): Int16Array
+
+/** Returns a new [UShortArray] containing all the elements of this [Uint16Array]. */
+@ExperimentalUnsignedTypes
+public expect fun Uint16Array.toUShortArray(): UShortArray
+
+/** Returns a new [Uint16Array] containing all the elements of this [UShortArray]. */
+@ExperimentalUnsignedTypes
+public expect fun UShortArray.toUint16Array(): Uint16Array
+
+/** Returns a new [IntArray] containing all the elements of this [Int32Array]. */
+public expect fun Int32Array.toIntArray(): IntArray
+
+/** Returns a new [Int32Array] containing all the elements of this [IntArray]. */
+public expect fun IntArray.toInt32Array(): Int32Array
+
+/** Returns a new [UIntArray] containing all the elements of this [Uint32Array]. */
+@ExperimentalUnsignedTypes
+public expect fun Uint32Array.toUIntArray(): UIntArray
+
+/** Returns a new [Uint32Array] containing all the elements of this [UIntArray]. */
+@ExperimentalUnsignedTypes
+public expect fun UIntArray.toUint32Array(): Uint32Array
+
+/** Returns a new [FloatArray] containing all the elements of this [Float32Array]. */
+public expect fun Float32Array.toFloatArray(): FloatArray
+
+/** Returns a new [Float32Array] containing all the elements of this [FloatArray]. */
+public expect fun FloatArray.toFloat32Array(): Float32Array
+
+/** Returns a new [DoubleArray] containing all the elements of this [Float64Array]. */
+public expect fun Float64Array.toDoubleArray(): DoubleArray
+
+/** Returns a new [Float64Array] containing all the elements of this [DoubleArray]. */
+public expect fun DoubleArray.toFloat64Array(): Float64Array