Add Kotlin/JS

ephemient · ephemient · commit c168fd9a8c17 · 2023-12-02T07:23:15.000-05:00
diff --git a/.gitattributes b/.gitattributes
@@ -2,6 +2,9 @@
 kt/gradlew linguist-generated
 kt/gradlew.bat linguist-generated
 
+# generated by Kotlin/JS
+kt/kotlin-js-store/yarn.lock
+
 # generated by Poetry
 py/poetry.lock linguist-generated
 
diff --git a/.github/workflows/kt.yml b/.github/workflows/kt.yml
@@ -46,6 +46,10 @@ jobs:
           path: |
             kt/aoc2023-exe/build/bin/*/debugExecutable/*.kexe
             kt/aoc2023-exe/build/bin/*/releaseExecutable/*.kexe
+      - uses: actions/upload-artifact@v3
+        with:
+          name: aoc2023-js
+          path: kt/build/js/packages/aoc2023-aoc2023-exe/kotlin/*
 
   run-jvm:
     needs: [ get-inputs, build ]
@@ -84,3 +88,22 @@ jobs:
       - run: linuxX64/releaseExecutable/aoc2023-exe.kexe
         env:
           AOC2023_DATADIR: inputs
+
+  run-node:
+    needs: [ get-inputs, build ]
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: inputs
+          path: inputs
+      - uses: actions/download-artifact@v3
+        with:
+          name: aoc2023-js
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 21.3.0
+      - run: node aoc2023-aoc2023-exe.js
+        env:
+          AOC2023_DATADIR: inputs
diff --git a/kt/README.md b/kt/README.md
@@ -18,7 +18,7 @@ Run [kotlinx.benchmark](https://github.com/Kotlin/kotlinx-benchmark) ([JMH](http
 Print solutions for the inputs provided in local data files:
 
 ```sh
-./gradlew :aoc2023-exe:jvmRun :aoc2023-exe:run{Debug,Release}Executable{LinuxX64,Macos{X64,Arm64}}
+./gradlew :aoc2023-exe:jvmRun :aoc2023-exe:runReleaseExecutable{LinuxX64,Macos{X64,Arm64}} :aoc2023-exe:jsNodeProductionRun
 ```
 
 Run all checks, including [Detekt](https://detekt.github.io/) static code analysis and [ktlint](https://ktlint.github.io/) formatter:
diff --git a/kt/aoc2023-exe/build.gradle.kts b/kt/aoc2023-exe/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
     id("com.github.ephemient.aoc2023.detekt")
     id("com.github.ephemient.aoc2023.kotlin.multiplatform.jvm.platform")
     id("com.github.ephemient.aoc2023.kotlin.multiplatform.native.platforms")
+    id("com.github.ephemient.aoc2023.kotlin.multiplatform.js.platform")
 }
 
 application {
@@ -20,6 +21,12 @@ kotlin {
         withJava()
     }
 
+    js {
+        useCommonJs()
+        nodejs()
+        binaries.executable()
+    }
+
     targets.withType<KotlinJvmTarget> {
         mainRun {
             mainClass = application.mainClass
@@ -36,7 +43,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation(projects.aoc2023Lib)
-                implementation(libs.kotlinx.coroutines)
             }
         }
 
@@ -51,6 +57,12 @@ kotlin {
                 implementation(libs.okio)
             }
         }
+
+        jsMain {
+            dependencies {
+                implementation(libs.kotlin.wrappers.node)
+            }
+        }
     }
 }
 
@@ -62,6 +74,7 @@ benchmark {
     targets {
         register("jvmTest")
     }
+
     configurations {
         getByName("main") {
             warmups = 1
diff --git a/kt/aoc2023-exe/src/commonMain/kotlin/com/github/ephemient/aoc2023/exe/CommonMain.kt b/kt/aoc2023-exe/src/commonMain/kotlin/com/github/ephemient/aoc2023/exe/CommonMain.kt
@@ -1,10 +1,8 @@
 package com.github.ephemient.aoc2023.exe
 
 import com.github.ephemient.aoc2023.days
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 
-internal suspend fun mainImpl(vararg args: String): Unit = withContext(Dispatchers.Default) {
+internal fun mainImpl(args: Array<out String>) {
     for (day in days) {
         if (args.isNotEmpty() && day.name !in args) continue
         println("Day ${day.name}")
diff --git a/kt/aoc2023-exe/src/commonMain/kotlin/com/github/ephemient/aoc2023/exe/IO.kt b/kt/aoc2023-exe/src/commonMain/kotlin/com/github/ephemient/aoc2023/exe/IO.kt
@@ -1,3 +1,3 @@
 package com.github.ephemient.aoc2023.exe
 
-internal expect suspend fun getDayInput(day: Int): String
+internal expect fun getDayInput(day: Int): String
diff --git a/kt/aoc2023-exe/src/commonTest/kotlin/com/github/ephemient/aoc2023/exe/Day1Bench.kt b/kt/aoc2023-exe/src/commonTest/kotlin/com/github/ephemient/aoc2023/exe/Day1Bench.kt
@@ -5,17 +5,14 @@ import kotlinx.benchmark.Benchmark
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.Setup
 import kotlinx.benchmark.State
-import kotlinx.coroutines.runBlocking
 
 @State(Scope.Benchmark)
 class Day1Bench {
     private lateinit var input: String
 
     @Setup
     fun setup() {
-        input = runBlocking {
-            getDayInput(1)
-        }
+        input = getDayInput(1)
     }
 
     @Benchmark
diff --git a/kt/aoc2023-exe/src/commonTest/kotlin/com/github/ephemient/aoc2023/exe/Day2Bench.kt b/kt/aoc2023-exe/src/commonTest/kotlin/com/github/ephemient/aoc2023/exe/Day2Bench.kt
@@ -5,17 +5,14 @@ import kotlinx.benchmark.Benchmark
 import kotlinx.benchmark.Scope
 import kotlinx.benchmark.Setup
 import kotlinx.benchmark.State
-import kotlinx.coroutines.runBlocking
 
 @State(Scope.Benchmark)
 class Day2Bench {
     private lateinit var input: String
 
     @Setup
     fun setup() {
-        input = runBlocking {
-            getDayInput(2)
-        }
+        input = getDayInput(2)
     }
 
     @Benchmark
diff --git a/kt/aoc2023-exe/src/jsMain/kotlin/com/github/ephemient/aoc2023/exe/IO.kt b/kt/aoc2023-exe/src/jsMain/kotlin/com/github/ephemient/aoc2023/exe/IO.kt
@@ -0,0 +1,10 @@
+package com.github.ephemient.aoc2023.exe
+
+import node.buffer.BufferEncoding
+import node.fs.readFileSync
+import node.process.process
+
+internal actual fun getDayInput(day: Int): String {
+    val dataDir = process.env["AOC2023_DATADIR"]?.ifEmpty { null } ?: "."
+    return readFileSync("$dataDir/day$day.txt", BufferEncoding.utf8)
+}
diff --git a/kt/aoc2023-exe/src/jsMain/kotlin/com/github/ephemient/aoc2023/exe/JsMain.kt b/kt/aoc2023-exe/src/jsMain/kotlin/com/github/ephemient/aoc2023/exe/JsMain.kt
@@ -0,0 +1,9 @@
+package com.github.ephemient.aoc2023.exe
+
+import node.process.process
+
+@ExperimentalJsExport
+@JsExport
+fun main() {
+    mainImpl(with(process.argv) { copyOfRange(2, size) })
+}
diff --git a/kt/aoc2023-exe/src/jvmMain/kotlin/com/github/ephemient/aoc2023/exe/IO.kt b/kt/aoc2023-exe/src/jvmMain/kotlin/com/github/ephemient/aoc2023/exe/IO.kt
@@ -1,10 +1,6 @@
 package com.github.ephemient.aoc2023.exe
 
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import java.io.File
 
-@Suppress("InjectDispatcher")
-internal actual suspend fun getDayInput(day: Int): String = withContext(Dispatchers.IO) {
+internal actual fun getDayInput(day: Int): String =
     File(System.getenv("AOC2023_DATADIR")?.ifEmpty { null } ?: ".", "day$day.txt").readText()
-}
diff --git a/kt/aoc2023-exe/src/jvmMain/kotlin/com/github/ephemient/aoc2023/exe/JvmMain.kt b/kt/aoc2023-exe/src/jvmMain/kotlin/com/github/ephemient/aoc2023/exe/JvmMain.kt
@@ -2,4 +2,6 @@
 
 package com.github.ephemient.aoc2023.exe
 
-suspend fun main(vararg args: String): Unit = mainImpl(*args)
+fun main(vararg args: String) {
+    mainImpl(args)
+}
diff --git a/kt/aoc2023-exe/src/nativeMain/kotlin/com/github/ephemient/aoc2023/exe/IO.kt b/kt/aoc2023-exe/src/nativeMain/kotlin/com/github/ephemient/aoc2023/exe/IO.kt
@@ -2,15 +2,12 @@ package com.github.ephemient.aoc2023.exe
 
 import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.toKString
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.IO
-import kotlinx.coroutines.withContext
 import okio.Path.Companion.toPath
 import okio.buffer
 import platform.posix.getenv
 
 @OptIn(ExperimentalForeignApi::class)
-internal actual suspend fun getDayInput(day: Int): String = withContext(Dispatchers.IO) {
+internal actual fun getDayInput(day: Int): String {
     val dataDir = (getenv("AOC2023_DATADIR")?.toKString()?.ifEmpty { null } ?: ".").toPath()
-    okio.FileSystem.SYSTEM.source(dataDir / "day$day.txt").buffer().readUtf8()
+    return okio.FileSystem.SYSTEM.source(dataDir / "day$day.txt").buffer().readUtf8()
 }
diff --git a/kt/aoc2023-exe/src/nativeMain/kotlin/com/github/ephemient/aoc2023/exe/NativeMain.kt b/kt/aoc2023-exe/src/nativeMain/kotlin/com/github/ephemient/aoc2023/exe/NativeMain.kt
@@ -1,7 +1,5 @@
 package com.github.ephemient.aoc2023.exe
 
-import kotlinx.coroutines.runBlocking
-
-fun main(vararg args: String): Unit = runBlocking {
-    mainImpl(*args)
+fun main(vararg args: String) {
+    mainImpl(args)
 }
diff --git a/kt/aoc2023-lib/build.gradle.kts b/kt/aoc2023-lib/build.gradle.kts
@@ -3,14 +3,19 @@ plugins {
     id("com.github.ephemient.aoc2023.detekt")
     id("com.github.ephemient.aoc2023.kotlin.multiplatform.jvm.platform")
     id("com.github.ephemient.aoc2023.kotlin.multiplatform.native.platforms")
+    id("com.github.ephemient.aoc2023.kotlin.multiplatform.js.platform")
 }
 
 kotlin {
+    js {
+        browser()
+        nodejs()
+    }
+
     sourceSets {
         commonTest {
             dependencies {
                 implementation(kotlin("test"))
-                implementation(libs.kotlinx.coroutines.test)
             }
         }
 
diff --git a/kt/aoc2023-lib/src/commonMain/kotlin/com/github/ephemient/aoc2023/Days.kt b/kt/aoc2023-lib/src/commonMain/kotlin/com/github/ephemient/aoc2023/Days.kt
@@ -8,5 +8,5 @@ val days = listOf(
 data class Day(
     val day: Int,
     val name: String = day.toString(),
-    val solver: (String) -> List<suspend () -> Any?>,
+    val solver: (String) -> List<() -> Any?>,
 )
diff --git a/kt/aoc2023-lib/src/commonTest/kotlin/com/github/ephemient/aoc2023/Day1Test.kt b/kt/aoc2023-lib/src/commonTest/kotlin/com/github/ephemient/aoc2023/Day1Test.kt
@@ -1,17 +1,16 @@
 package com.github.ephemient.aoc2023
 
-import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class Day1Test {
     @Test
-    fun part1() = runTest {
+    fun part1() {
         assertEquals(142, Day1(example1).part1())
     }
 
     @Test
-    fun part2() = runTest {
+    fun part2() {
         assertEquals(281, Day1(example2).part2())
     }
 
diff --git a/kt/aoc2023-lib/src/commonTest/kotlin/com/github/ephemient/aoc2023/Day2Test.kt b/kt/aoc2023-lib/src/commonTest/kotlin/com/github/ephemient/aoc2023/Day2Test.kt
@@ -1,17 +1,16 @@
 package com.github.ephemient.aoc2023
 
-import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class Day2Test {
     @Test
-    fun part1() = runTest {
+    fun part1() {
         assertEquals(8, Day2(example).part1())
     }
 
     @Test
-    fun part2() = runTest {
+    fun part2() {
         assertEquals(2286, Day2(example).part2())
     }
 
diff --git a/kt/buildSrc/build.gradle.kts b/kt/buildSrc/build.gradle.kts
@@ -18,10 +18,14 @@ gradlePlugin {
             id = "com.github.ephemient.aoc2023.kotlin.multiplatform.native.platforms"
             implementationClass = "com.github.ephemient.aoc2023.buildsrc.KotlinMultiplatformNativePlatformsPlugin"
         }
+        create("KotlinMultiplatformJsPlatformPlugin") {
+            id = "com.github.ephemient.aoc2023.kotlin.multiplatform.js.platform"
+            implementationClass = "com.github.ephemient.aoc2023.buildsrc.KotlinMultiplatformJsPlatformPlugin"
+        }
     }
 }
 
 dependencies {
-    implementation(kotlin("gradle-plugin", libs.versions.kotlin.get()))
+    implementation(kotlin("gradle-plugin", libs.versions.kotlin.asProvider().get()))
     implementation(libs.detekt.plugin)
 }
diff --git a/kt/buildSrc/src/main/kotlin/com/github/ephemient/aoc2023/buildsrc/KotlinMultiplatformPlugins.kt b/kt/buildSrc/src/main/kotlin/com/github/ephemient/aoc2023/buildsrc/KotlinMultiplatformPlugins.kt
@@ -3,8 +3,11 @@ package com.github.ephemient.aoc2023.buildsrc
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.getValue
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 
 class KotlinMultiplatformBasePlugin : Plugin<Project> {
     override fun apply(target: Project) {
@@ -42,3 +45,18 @@ class KotlinMultiplatformNativePlatformsPlugin : Plugin<Project> {
         }
     }
 }
+
+class KotlinMultiplatformJsPlatformPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        target.rootProject.apply<NodeJsRootPlugin>()
+        target.rootProject.configure<NodeJsRootExtension> {
+            nodeVersion = "21.3.0"
+        }
+
+        target.apply<KotlinMultiplatformBasePlugin>()
+        target.pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
+            val kotlin: KotlinMultiplatformExtension by target.extensions
+            kotlin.js()
+        }
+    }
+}
diff --git a/kt/gradle/libs.versions.toml b/kt/gradle/libs.versions.toml
@@ -4,8 +4,8 @@ detekt = "1.23.4"
 graal-sdk = "23.1.1"
 junit-jupiter = "5.10.1"
 kotlin = "1.9.21"
+kotlin-wrappers = "18.16.12-pre.652"
 kotlinx-benchmark = "0.4.9"
-kotlinx-coroutines = "1.7.3"
 okio = "3.6.0"
 native-image-plugin = "0.9.28"
 
@@ -21,9 +21,8 @@ detekt-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", v
 graal-sdk = { module = "org.graalvm.sdk:graal-sdk", version.ref = "graal-sdk" }
 junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit-jupiter" }
 junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" }
+kotlin-wrappers-node = { module = "org.jetbrains.kotlin-wrappers:kotlin-node", version.ref = "kotlin-wrappers" }
 kotlinx-benchmark = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "kotlinx-benchmark" }
-kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
-kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
 okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
 
 [bundles]
diff --git a/kt/kotlin-js-store/yarn.lock b/kt/kotlin-js-store/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ plugins {`
`9`	`9`	`id("com.github.ephemient.aoc2023.detekt")`
`10`	`10`	`id("com.github.ephemient.aoc2023.kotlin.multiplatform.jvm.platform")`
`11`	`11`	`id("com.github.ephemient.aoc2023.kotlin.multiplatform.native.platforms")`
	`12`	`+ id("com.github.ephemient.aoc2023.kotlin.multiplatform.js.platform")`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`application {`
`@@ -20,6 +21,12 @@ kotlin {`
`20`	`21`	`withJava()`
`21`	`22`	`}`
`22`	`23`
	`24`	`+ js {`
	`25`	`+ useCommonJs()`
	`26`	`+ nodejs()`
	`27`	`+ binaries.executable()`
	`28`	`+ }`
	`29`	`+`
`23`	`30`	`targets.withType<KotlinJvmTarget> {`
`24`	`31`	`mainRun {`
`25`	`32`	`mainClass = application.mainClass`
`@@ -36,7 +43,6 @@ kotlin {`
`36`	`43`	`commonMain {`
`37`	`44`	`dependencies {`
`38`	`45`	`implementation(projects.aoc2023Lib)`
`39`		`- implementation(libs.kotlinx.coroutines)`
`40`	`46`	`}`
`41`	`47`	`}`
`42`	`48`
`@@ -51,6 +57,12 @@ kotlin {`
`51`	`57`	`implementation(libs.okio)`
`52`	`58`	`}`
`53`	`59`	`}`
	`60`	`+`
	`61`	`+ jsMain {`
	`62`	`+ dependencies {`
	`63`	`+ implementation(libs.kotlin.wrappers.node)`
	`64`	`+ }`
	`65`	`+ }`
`54`	`66`	`}`
`55`	`67`	`}`
`56`	`68`
`@@ -62,6 +74,7 @@ benchmark {`
`62`	`74`	`targets {`
`63`	`75`	`register("jvmTest")`
`64`	`76`	`}`
	`77`	`+`
`65`	`78`	`configurations {`
`66`	`79`	`getByName("main") {`
`67`	`80`	`warmups = 1`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`package com.github.ephemient.aoc2023.exe`
`2`	`2`
`3`		`-internal expect suspend fun getDayInput(day: Int): String`
	`3`	`+internal expect fun getDayInput(day: Int): String`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`package com.github.ephemient.aoc2023.exe`
`2`	`2`
`3`		`-import kotlinx.coroutines.runBlocking`
`4`		`-`
`5`		`-fun main(vararg args: String): Unit = runBlocking {`
`6`		`- mainImpl(*args)`
	`3`	`+fun main(vararg args: String) {`
	`4`	`+ mainImpl(args)`
`7`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,19 @@ plugins {`
`3`	`3`	`id("com.github.ephemient.aoc2023.detekt")`
`4`	`4`	`id("com.github.ephemient.aoc2023.kotlin.multiplatform.jvm.platform")`
`5`	`5`	`id("com.github.ephemient.aoc2023.kotlin.multiplatform.native.platforms")`
	`6`	`+ id("com.github.ephemient.aoc2023.kotlin.multiplatform.js.platform")`
`6`	`7`	`}`
`7`	`8`
`8`	`9`	`kotlin {`
	`10`	`+ js {`
	`11`	`+ browser()`
	`12`	`+ nodejs()`
	`13`	`+ }`
	`14`	`+`
`9`	`15`	`sourceSets {`
`10`	`16`	`commonTest {`
`11`	`17`	`dependencies {`
`12`	`18`	`implementation(kotlin("test"))`
`13`		`- implementation(libs.kotlinx.coroutines.test)`
`14`	`19`	`}`
`15`	`20`	`}`
`16`	`21`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ val days = listOf(`
`8`	`8`	`data class Day(`
`9`	`9`	`val day: Int,`
`10`	`10`	`val name: String = day.toString(),`
`11`		`- val solver: (String) -> List<suspend () -> Any?>,`
	`11`	`+ val solver: (String) -> List<() -> Any?>,`
`12`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,14 @@ gradlePlugin {`
`18`	`18`	`id = "com.github.ephemient.aoc2023.kotlin.multiplatform.native.platforms"`
`19`	`19`	`implementationClass = "com.github.ephemient.aoc2023.buildsrc.KotlinMultiplatformNativePlatformsPlugin"`
`20`	`20`	`}`
	`21`	`+ create("KotlinMultiplatformJsPlatformPlugin") {`
	`22`	`+ id = "com.github.ephemient.aoc2023.kotlin.multiplatform.js.platform"`
	`23`	`+ implementationClass = "com.github.ephemient.aoc2023.buildsrc.KotlinMultiplatformJsPlatformPlugin"`
	`24`	`+ }`
`21`	`25`	`}`
`22`	`26`	`}`
`23`	`27`
`24`	`28`	`dependencies {`
`25`		`- implementation(kotlin("gradle-plugin", libs.versions.kotlin.get()))`
	`29`	`+ implementation(kotlin("gradle-plugin", libs.versions.kotlin.asProvider().get()))`
`26`	`30`	`implementation(libs.detekt.plugin)`
`27`	`31`	`}`