Add compile subcommand to zipline-cli

Update Gradle plugin to invoke CLI to perform compilation. This allows compilation to not be subject to the version of Kotlin on the Gradle buildscript classpath.

Author: JakeWharton

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+ * New: "compile" subcommand in 'zipline-cli' compiles `.js` files to `.zipline` files.
+
 
 ## [1.17.0] - 2024-08-28
 [1.17.0]: https://github.com/cashapp/zipline/releases/tag/1.17.0

zipline-cli/build.gradle.kts

@@ -38,16 +38,19 @@ artifacts {
 kotlin {
   sourceSets {
     all {
+      languageSettings.optIn("app.cash.zipline.EngineApi")
       languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")
     }
   }
 }
 
 dependencies {
-  api(projects.ziplineApiValidator)
-  api(projects.ziplineLoader)
+  implementation(projects.ziplineApiValidator)
+  implementation(projects.ziplineBytecode)
+  implementation(projects.ziplineLoader)
   implementation(libs.clikt)
   implementation(libs.okHttp.core)
+  implementation(libs.kotlinx.serialization.json)
 
   testImplementation(projects.ziplineLoaderTesting)
   testImplementation(libs.assertk)

zipline-cli/src/main/kotlin/app/cash/zipline/cli/Compile.kt

@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2024 Cash App
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package app.cash.zipline.cli
+
+import app.cash.zipline.loader.ManifestSigner
+import app.cash.zipline.loader.SignatureAlgorithmId
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.parameters.options.associate
+import com.github.ajalt.clikt.parameters.options.convert
+import com.github.ajalt.clikt.parameters.options.flag
+import com.github.ajalt.clikt.parameters.options.help
+import com.github.ajalt.clikt.parameters.options.multiple
+import com.github.ajalt.clikt.parameters.options.option
+import com.github.ajalt.clikt.parameters.options.required
+import com.github.ajalt.clikt.parameters.types.file
+import okio.ByteString.Companion.decodeHex
+
+internal class Compile : CliktCommand(
+  name = "compile",
+  help = "Compile .js files to .zipline files",
+) {
+  private val inputDir by option("--input").file().required()
+    .help("Directory from which .js files will be loaded.")
+
+  private val outputDir by option("--output").file().required()
+    .help("Directory into which .zipline files will be written.")
+
+  private val addedFiles by option("--added").file().multiple()
+    .help("Input files added since the last compile. This will trigger incremental compilation.")
+  private val removedFiles by option("--removed").file().multiple()
+    .help("Input files removed since the last compile. This will trigger incremental compilation.")
+  private val modifiedFiles by option("--modified").file().multiple()
+    .help("Input files modified since the last compile. This will trigger incremental compilation.")
+
+  private val mainFunction by option()
+  private val mainModuleId by option()
+  private val version by option()
+  private val stripLineNumbers by option().flag()
+
+  private val signers by option("--signer")
+    .convert {
+      val (idName, name, keyHex) = it.split(':', limit = 3)
+      val id = SignatureAlgorithmId.valueOf(idName)
+      val key = keyHex.decodeHex()
+      Triple(id, name, key)
+    }
+    .multiple()
+
+  private val metadata by option().associate()
+
+  override fun run() {
+    val manifestSigner = ManifestSigner.Builder()
+      .apply {
+        for ((id, name, key) in signers) {
+          add(id, name, key)
+        }
+      }
+      .build()
+
+    val compiler = ZiplineCompiler(
+      outputDir = outputDir,
+      mainFunction = mainFunction,
+      mainModuleId = mainModuleId,
+      manifestSigner = manifestSigner,
+      version = version,
+      metadata = metadata,
+      stripLineNumbers = stripLineNumbers,
+    )
+
+    if (addedFiles.size or removedFiles.size or modifiedFiles.size != 0) {
+      compiler.incrementalCompile(
+        modifiedFiles = modifiedFiles,
+        addedFiles = addedFiles,
+        removedFiles = removedFiles,
+      )
+    } else {
+      compiler.compile(inputDir)
+    }
+  }
+}

zipline-cli/src/main/kotlin/app/cash/zipline/cli/Main.kt

@@ -30,6 +30,7 @@ fun main(vararg args: String) {
 
   NoOpCliktCommand()
     .subcommands(
+      Compile(),
       Download(),
       GenerateKeyPair(),
       ValidateZiplineApi(NAME_CHECK),

zipline-gradle-plugin/src/main/kotlin/app/cash/zipline/gradle/ZiplineCompiler.kt renamed to zipline-cli/src/main/kotlin/app/cash/zipline/cli/ZiplineCompiler.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package app.cash.zipline.gradle
+package app.cash.zipline.cli
 
 import app.cash.zipline.QuickJs
 import app.cash.zipline.ZiplineManifest

zipline-gradle-plugin/src/test/kotlin/app/cash/zipline/gradle/ZiplineCompilerTest.kt renamed to zipline-cli/src/test/kotlin/app/cash/zipline/cli/ZiplineCompilerTest.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package app.cash.zipline.gradle
+package app.cash.zipline.cli
 
 import app.cash.zipline.QuickJs
 import app.cash.zipline.ZiplineManifest