Restrict options based on the message

Author: romanowski

modules/cli-options/src/main/scala/scala/cli/commands/MarkdownOptions.scala

@@ -5,7 +5,7 @@ import caseapp.*
 // format: off
 final case class MarkdownOptions(
   @Group("Markdown")
-  @HelpMessage("Enable markdown support (experimental)")
+  @HelpMessage("[experimental] Enable markdown support.")
   @Name("md")
   @Name("markdown")
     enableMarkdown: Boolean = false // TODO: add a separate scope for Markdown and remove this option once it's stable

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

@@ -0,0 +1,54 @@
+package scala.cli.commands
+
+import caseapp.Name
+import caseapp.core.app.Command
+import caseapp.core.parser.Parser
+import caseapp.core.util.Formatter
+import caseapp.core.{Arg, Error}
+
+object RestrictedCommandsParser {
+  def isExperimentalOrRestricted(a: Arg) =
+    a.helpMessage.exists(m =>
+      m.message.contains("[experimental]") || m.message.contains("[restricted]")
+    )
+
+  def apply[T, TD](parser: Parser.Aux[T, TD]): Parser.Aux[T, TD] = new Parser[T] {
+
+    type D = TD
+
+    private def isArgSupported(a: Arg): Boolean =
+      scala.cli.ScalaCli.allowRestrictedFeatures || !isExperimentalOrRestricted(a)
+
+    def args: Seq[caseapp.core.Arg] = parser.args.filter(isArgSupported)
+
+    def get(
+      d: D,
+      nameFormatter: caseapp.core.util.Formatter[caseapp.Name]
+    ): Either[caseapp.core.Error, T] =
+      parser.get(d, nameFormatter)
+
+    def init: D = parser.init
+
+    def withDefaultOrigin(origin: String): caseapp.core.parser.Parser.Aux[T, D] =
+      RestrictedCommandsParser(parser.withDefaultOrigin(origin))
+
+    override def step(
+      args: List[String],
+      index: Int,
+      d: D,
+      nameFormatter: Formatter[Name]
+    ): Either[(Error, Arg, List[String]), Option[(D, Arg, List[String])]] =
+      parser.step(args, index, d, nameFormatter) match {
+        case Right(Some(_, arg, _)) if !isArgSupported(arg) =>
+          Left((
+            Error.UnrecognizedArgument(
+              s"`${args(index)}` option is not supported in `scala` command.\n  Please run it with `scala-cli` command or with `--power` flag."
+            ),
+            arg,
+            Nil
+          ))
+        case other =>
+          other
+      }
+  }
+}

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

@@ -17,12 +17,16 @@ import scala.cli.commands.util.CommandHelpers
 import scala.cli.commands.util.SharedOptionsUtil.*
 import scala.util.{Properties, Try}
 
-abstract class ScalaCommand[T](implicit parser: Parser[T], help: Help[T])
-    extends Command()(parser, help) with NeedsArgvCommand with CommandHelpers {
+abstract class ScalaCommand[T](implicit myParser: Parser[T], help: Help[T])
+    extends Command()(myParser, help) with NeedsArgvCommand with CommandHelpers {
+
   def sharedOptions(t: T): Option[SharedOptions] = // hello borked unused warning
     None
   override def hasFullHelp = true
 
+  override def parser: Parser[T] =
+    RestrictedCommandsParser(myParser)
+
   def isRestricted: Boolean = false
 
   protected var argvOpt = Option.empty[Array[String]]

modules/integration/src/test/scala/scala/cli/integration/SipScalaTests.scala

@@ -58,6 +58,32 @@ class SipScalaTests extends ScalaCliSuite {
     expect(output.contains(s"directive is not supported"))
   }
 
+  def noMarkdownOptions(): Unit = TestInputs.empty.fromRoot { root =>
+    val code =
+      """
+        | println("ala")
+        |""".stripMargin
+
+    val source = root / "A.sc"
+    os.write(source, code)
+
+    val cliPath = os.Path(TestUtil.cliPath, os.pwd)
+
+    os.proc(cliPath, "--markdown", source).call(cwd = root)
+
+    os.copy(cliPath, root / "scala")
+    os.perms.set(root / "scala", "rwxr-xr-x")
+
+    val res = os.proc(root / "scala", "--markdown", source).call(
+      cwd = root,
+      check = false,
+      mergeErrIntoOut = true
+    )
+    expect(res.exitCode == 1)
+    val output = res.out.text()
+    expect(output.contains(s"option is not supported"))
+  }
+
   if (TestUtil.isNativeCli && !Properties.isWin) {
     test("no directories command when run as scala") {
       noDirectoriesCommandTest("scala")
@@ -69,6 +95,10 @@ class SipScalaTests extends ScalaCliSuite {
     test("no publish directives when run as scala") {
       noPublishDirectives()
     }
+
+    test("no markdown option when run as scala") {
+      noMarkdownOptions()
+    }
   }
 
   def runVersionCommand(binaryName: String) =