Refactor computeVersion to a separate option class

Author: MaciejG604

modules/cli/src/main/scala/scala/cli/commands/publish/Publish.scala

@@ -111,7 +111,7 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
           .sequence
       },
       computeVersion = value {
-        publishParams.computeVersion
+        publishParams.projectVersionOptions.computeVersion
           .map(Positioned.commandLine)
           .map(ComputeVersion.parse)
           .sequence

modules/cli/src/main/scala/scala/cli/commands/publish/PublishParamsOptions.scala

@@ -2,7 +2,7 @@ package scala.cli.commands.publish
 
 import caseapp.*
 
-import scala.cli.commands.shared.HelpGroup
+import scala.cli.commands.shared.{HelpGroup, ProjectVersionOptions}
 import scala.cli.commands.tags
 import scala.cli.signing.shared.PasswordOption
 import scala.cli.signing.util.ArgParsers.*
@@ -11,6 +11,8 @@ import scala.cli.util.MaybeConfigPasswordOption
 
 // format: off
 final case class PublishParamsOptions(
+  @Recurse
+  projectVersionOptions: ProjectVersionOptions = ProjectVersionOptions(),
 
   @Group(HelpGroup.Publishing.toString)
   @HelpMessage("Organization to publish artifacts under")
@@ -33,10 +35,6 @@ final case class PublishParamsOptions(
   @Tag(tags.inShortHelp)
     version: Option[String] = None,
   @Group(HelpGroup.Publishing.toString)
-  @HelpMessage("How to compute the version to publish artifacts as")
-  @Tag(tags.restricted)
-    computeVersion: Option[String] = None,
-  @Group(HelpGroup.Publishing.toString)
   @HelpMessage("URL to put in publishing metadata")
   @Tag(tags.restricted)
   @Tag(tags.inShortHelp)

modules/cli/src/main/scala/scala/cli/commands/publish/checks/ComputeVersionCheck.scala

@@ -29,7 +29,7 @@ final case class ComputeVersionCheck(
       }
       else
         None
-    val cv = options.publishParams.computeVersion
+    val cv = options.publishParams.projectVersionOptions.computeVersion
       .orElse(fromGitOpt)
     cv.map(OptionCheck.DefaultValue.simple(_, Nil, Nil)).toRight {
       new MissingPublishOptionError(

modules/cli/src/main/scala/scala/cli/commands/shared/ProjectVersionOptions.scala

@@ -0,0 +1,19 @@
+package scala.cli.commands.shared
+
+import caseapp.*
+
+import scala.cli.commands.tags
+
+// format: off
+final case class ProjectVersionOptions(
+  @HelpMessage("Method used to compute the project version")
+  @ValueDescription("git|git:tag|command:...")
+  @Tag(tags.restricted)
+    computeVersion: Option[String] = None
+)
+// format: on
+
+object ProjectVersionOptions {
+  implicit lazy val parser: Parser[ProjectVersionOptions] = Parser.derive
+  implicit lazy val help: Help[ProjectVersionOptions]     = Help.derive
+}

modules/cli/src/main/scala/scala/cli/commands/shared/SharedOptions.scala

@@ -319,7 +319,7 @@ final case class SharedOptions(
       sourceGeneratorOptions = bo.SourceGeneratorOptions(
         useBuildInfo = sourceGenerator.useBuildInfo,
         computeVersion = value {
-          sourceGenerator.computeVersion
+          sourceGenerator.projectVersionOptions.computeVersion
             .map(Positioned.commandLine)
             .map(ComputeVersion.parse)
             .sequence

modules/cli/src/main/scala/scala/cli/commands/shared/SourceGeneratorOptions.scala

@@ -6,14 +6,13 @@ import scala.cli.commands.tags
 
 // format: off
 final case class SourceGeneratorOptions(
+  @Recurse
+  projectVersionOptions: ProjectVersionOptions = ProjectVersionOptions(),
   @Group(HelpGroup.SourceGenerator.toString)
-  @Tag(tags.experimental)
+  @Tag(tags.restricted)
   @HelpMessage("Generate BuildInfo for project")
   @Name("buildInfo")
-    useBuildInfo: Option[Boolean] = None,
-  @HelpMessage("Method used to compute the project version for BuildInfo")
-  @Tag(tags.experimental)
-    computeVersion: Option[String] = None,
+    useBuildInfo: Option[Boolean] = None
 )
 // format: on