Factor main class options

Author: alexarchambault

modules/cli/src/main/scala/scala/cli/commands/MainClassOptions.scala

@@ -0,0 +1,18 @@
+package scala.cli.commands
+
+import caseapp._
+
+// format: off
+final case class MainClassOptions(
+  @Group("Entrypoint")
+  @HelpMessage("Specify which main class to run")
+  @ValueDescription("main-class")
+  @Name("M")
+    mainClass: Option[String] = None
+)
+// format: on
+
+object MainClassOptions {
+  implicit val parser = Parser[MainClassOptions]
+  implicit val help   = Help[MainClassOptions]
+}

modules/cli/src/main/scala/scala/cli/commands/PackageOptions.scala

@@ -15,6 +15,8 @@ final case class PackageOptions(
     watch: SharedWatchOptions = SharedWatchOptions(),
   @Recurse
     compileCross: CompileCrossOptions = CompileCrossOptions(),
+  @Recurse
+    mainClass: MainClassOptions = MainClassOptions(),
 
   @Group("Package")
   @HelpMessage("Set destination path")
@@ -32,11 +34,6 @@ final case class PackageOptions(
   @HelpMessage("Generate an assembly JAR")
     assembly: Boolean = false,
 
-  @Group("Package")
-  @HelpMessage("Specify which main class to run")
-  @ValueDescription("main-class")
-  @Name("M")
-    mainClass: Option[String] = None,
   @Recurse
     packager: PackagerOptions = PackagerOptions(),
   @Group("Package")
@@ -72,7 +69,7 @@ final case class PackageOptions(
   def buildOptions: BuildOptions = {
     val baseOptions = shared.buildOptions(enableJmh = false, jmhVersion = None)
     baseOptions.copy(
-      mainClass = mainClass.filter(_.nonEmpty),
+      mainClass = mainClass.mainClass.filter(_.nonEmpty),
       packageOptions = baseOptions.packageOptions.copy(
         version = Some(packager.version),
         launcherApp = packager.launcherApp,

modules/cli/src/main/scala/scala/cli/commands/RunOptions.scala

@@ -22,12 +22,8 @@ final case class RunOptions(
     watch: SharedWatchOptions = SharedWatchOptions(),
   @Recurse
     compileCross: CompileCrossOptions = CompileCrossOptions(),
-
-  @Group("Runner")
-  @HelpMessage("Specify which main class to run")
-  @ValueDescription("main-class")
-  @Name("M")
-    mainClass: Option[String] = None
+  @Recurse
+    mainClass: MainClassOptions = MainClassOptions()
 ) {
   // format: on
 
@@ -37,7 +33,7 @@ final case class RunOptions(
       jmhVersion = benchmarking.jmhVersion
     )
     baseOptions.copy(
-      mainClass = mainClass,
+      mainClass = mainClass.mainClass,
       javaOptions = baseOptions.javaOptions.copy(
         javaOpts = baseOptions.javaOptions.javaOpts ++ sharedJava.allJavaOpts
       )

website/docs/reference/cli-options.md

@@ -328,6 +328,21 @@ Decrease verbosity
 
 Use progress bars
 
+## Main class options
+
+Available in commands:
+- [`package`](./commands#package)
+- [`run`](./commands#run)
+
+
+<!-- Automatically generated, DO NOT EDIT MANUALLY -->
+
+#### `--main-class`
+
+Aliases: `-M`
+
+Specify which main class to run
+
 ## Metabrowse options
 
 Available in commands:
@@ -392,12 +407,6 @@ Generate a library JAR rather than an executable JAR
 
 Generate an assembly JAR
 
-#### `--main-class`
-
-Aliases: `-M`
-
-Specify which main class to run
-
 #### `--deb`
 
 Build debian package, available only on linux
@@ -552,20 +561,6 @@ Aliases: `-a`
 
 Don't actually run the REPL, only fetch it
 
-## Run options
-
-Available in commands:
-- [`run`](./commands#run)
-
-
-<!-- Automatically generated, DO NOT EDIT MANUALLY -->
-
-#### `--main-class`
-
-Aliases: `-M`
-
-Specify which main class to run
-
 ## Scala.JS options
 
 Available in commands:

website/docs/reference/commands.md

@@ -105,6 +105,7 @@ Accepts options:
 - [dependency](./cli-options.md#dependency-options)
 - [jvm](./cli-options.md#jvm-options)
 - [logging](./cli-options.md#logging-options)
+- [main class](./cli-options.md#main-class-options)
 - [package](./cli-options.md#package-options)
 - [packager](./cli-options.md#packager-options)
 - [Scala.JS](./cli-options.md#scalajs-options)
@@ -129,7 +130,7 @@ Accepts options:
 - [java](./cli-options.md#java-options)
 - [jvm](./cli-options.md#jvm-options)
 - [logging](./cli-options.md#logging-options)
-- [run](./cli-options.md#run-options)
+- [main class](./cli-options.md#main-class-options)
 - [Scala.JS](./cli-options.md#scalajs-options)
 - [Scala Native](./cli-options.md#scala-native-options)
 - [scalac](./cli-options.md#scalac-options)