chore: update to latest clikt

Signed-off-by: Sam Gammon <sam@elide.dev>

Author: sgammon

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ abiCheck = "0.17.0"
 antlr = "4.+"
 assertj = "3.+" 
 checksumPlugin = "1.4.0"
-clikt = "3.+"
+clikt = "5.+"
 commonMark = "0.+"
 downloadTaskPlugin = "5.6.0"
 geantyref = "1.+"

pkl-cli/src/main/kotlin/org/pkl/cli/Main.kt

@@ -17,6 +17,7 @@
 
 package org.pkl.cli
 
+import com.github.ajalt.clikt.core.main
 import com.github.ajalt.clikt.core.subcommands
 import org.pkl.cli.commands.*
 import org.pkl.commons.cli.cliMain

pkl-cli/src/main/kotlin/org/pkl/cli/commands/AnalyzeCommand.kt

@@ -15,6 +15,7 @@
  */
 package org.pkl.cli.commands
 
+import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
 import com.github.ajalt.clikt.parameters.options.option
@@ -25,16 +26,17 @@ import org.pkl.cli.CliImportAnalyzerOptions
 import org.pkl.commons.cli.commands.ModulesCommand
 import org.pkl.commons.cli.commands.single
 
-class AnalyzeCommand(helpLink: String) :
+class AnalyzeCommand(private val helpLink: String) :
   NoOpCliktCommand(
     name = "analyze",
-    help = "Commands related to static analysis",
-    epilog = "For more information, visit $helpLink"
   ) {
   init {
     subcommands(AnalyzeImportsCommand(helpLink))
   }
 
+  override fun help(context: Context): String = "Commands related to static analysis"
+  override fun helpEpilog(context: Context): String = "For more information, visit $helpLink"
+
   companion object {
     class AnalyzeImportsCommand(helpLink: String) :
       ModulesCommand(

pkl-cli/src/main/kotlin/org/pkl/cli/commands/ProjectCommand.kt

@@ -15,6 +15,7 @@
  */
 package org.pkl.cli.commands
 
+import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
 import com.github.ajalt.clikt.parameters.arguments.argument
@@ -31,16 +32,17 @@ import org.pkl.commons.cli.commands.BaseCommand
 import org.pkl.commons.cli.commands.TestOptions
 import org.pkl.commons.cli.commands.single
 
-class ProjectCommand(helpLink: String) :
+class ProjectCommand(private val helpLink: String) :
   NoOpCliktCommand(
     name = "project",
-    help = "Run commands related to projects",
-    epilog = "For more information, visit $helpLink"
   ) {
   init {
     subcommands(ResolveCommand(helpLink), PackageCommand(helpLink))
   }
 
+  override fun help(context: Context): String = "Run commands related to projects"
+  override fun helpEpilog(context: Context): String = "For more information, visit $helpLink"
+
   companion object {
     class ResolveCommand(helpLink: String) :
       BaseCommand(

pkl-cli/src/main/kotlin/org/pkl/cli/commands/RootCommand.kt

@@ -15,25 +15,27 @@
  */
 package org.pkl.cli.commands
 
+import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.context
 import com.github.ajalt.clikt.parameters.options.versionOption
 
-class RootCommand(name: String, version: String, helpLink: String) :
+class RootCommand(name: String, version: String, private val helpLink: String) :
   NoOpCliktCommand(
     name = name,
-    printHelpOnEmptyArgs = true,
-    epilog = "For more information, visit $helpLink",
   ) {
   init {
     versionOption(version, names = setOf("-v", "--version"), message = { it })
 
     context {
-      correctionSuggestor = { given, possible ->
+      suggestTypoCorrection = { given, possible ->
         if (!given.startsWith("-")) {
           registeredSubcommands().map { it.commandName }
         } else possible
       }
     }
   }
+
+  override fun helpEpilog(context: Context): String = "For more information, visit $helpLink"
+  override val printHelpOnEmptyArgs: Boolean get() = true
 }

pkl-cli/src/main/kotlin/org/pkl/cli/commands/ServerCommand.kt

@@ -16,16 +16,21 @@
 package org.pkl.cli.commands
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
 import org.pkl.cli.CliServer
 import org.pkl.commons.cli.CliBaseOptions
 
-class ServerCommand(helpLink: String) :
+class ServerCommand(private val helpLink: String) :
   CliktCommand(
     name = "server",
-    help = "Run as a server that communicates over standard input/output",
-    epilog = "For more information, visit $helpLink"
   ) {
 
+  override fun help(context: Context): String =
+    "Run as a server that communicates over standard input/output"
+
+  override fun helpEpilog(context: Context): String =
+    "For more information, visit $helpLink"
+
   override fun run() {
     CliServer(CliBaseOptions()).run()
   }

pkl-codegen-java/src/main/kotlin/org/pkl/codegen/java/Main.kt

@@ -17,6 +17,7 @@
 
 package org.pkl.codegen.java
 
+import com.github.ajalt.clikt.core.main
 import com.github.ajalt.clikt.parameters.options.*
 import com.github.ajalt.clikt.parameters.types.path
 import java.nio.file.Path

pkl-codegen-kotlin/src/main/kotlin/org/pkl/codegen/kotlin/Main.kt

@@ -17,6 +17,7 @@
 
 package org.pkl.codegen.kotlin
 
+import com.github.ajalt.clikt.core.main
 import com.github.ajalt.clikt.parameters.options.associate
 import com.github.ajalt.clikt.parameters.options.default
 import com.github.ajalt.clikt.parameters.options.flag

pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/commands/BaseCommand.kt

@@ -16,9 +16,15 @@
 package org.pkl.commons.cli.commands
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.parameters.groups.provideDelegate
 
-abstract class BaseCommand(name: String, helpLink: String, help: String = "") :
-  CliktCommand(name = name, help = help, epilog = "For more information, visit $helpLink") {
+abstract class BaseCommand(name: String, private val helpLink: String, help: String = "") :
+  CliktCommand(name = name) {
+  private val helpText = help
+
+  override fun help(context: Context): String = helpText
+  override fun helpEpilog(context: Context): String = "For more information, visit $helpLink"
+
   val baseOptions: BaseOptions by BaseOptions()
 }

pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/commands/OptionExtensions.kt

@@ -43,7 +43,7 @@ fun <EachT : Any, ValueT> NullableOption<EachT, ValueT>.splitAll(
     transformEach = { it },
     transformAll = { it.flatten().ifEmpty { default } },
     validator = {},
-    nvalues = 1,
-    valueSplit = Regex.fromLiteral(separator)
+    nvalues = 1..1,
+    valueSplit = { Regex.fromLiteral(separator).split(it) },
   )
 }