Subcommand-nesting (#137)

* Express GitRemote * Show problematic usecase for sub-accounting
zio · Sep 28, 2022 · 77e4b28 · 77e4b28
1 parent b42d4f8
commit 77e4b28
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/examples/shared/src/main/scala/zio/cli/examples/GitExample.scala b/examples/shared/src/main/scala/zio/cli/examples/GitExample.scala
@@ -46,14 +46,18 @@ object GitExample extends ZIOCliDefault {
   }
 
   val remoteHelp: HelpDoc = HelpDoc.p("Remote subcommand description")
-  val remote = Command("remote", verboseFlag, Args.none)
-    .withHelp(remoteHelp)
-    .map(Subcommand.Remote(_))
-    .subcommands(remoteAdd, remoteRemove)
-    .map { case (verbose, remoteSubcommand) =>
-      remoteSubcommand
+  val remote = {
+    // val gitRemote       = Command("remote", verboseFlag).withHelp(remoteHelp).map(Subcommand.Remote(_))
+    // val gitRemoteAdd    = Command("remote").withHelp(remoteHelp).subcommands(remoteAdd)
+    // val gitRemoteRemove = Command("remote").withHelp(remoteHelp).subcommands(remoteRemove)
+    // gitRemote | gitRemoteAdd | gitRemoteRemove
+    Command("remote", verboseFlag)
+      .withHelp(remoteHelp)
+      .map(Subcommand.Remote(_))
+      .subcommands(remoteAdd, remoteRemove)
+      .map(_._2) //TODO: We shouldn't have to discard the standalone remote command
 
-    }
+  }
 
   val git: Command[Subcommand] =
     Command("git", Options.none, Args.none).subcommands(add, remote)
@@ -66,14 +70,13 @@ object GitExample extends ZIOCliDefault {
   ) {
     case Subcommand.Add(modified, directory) =>
       printLine(s"Executing `git add $directory` with modified flag set to $modified")
-
-    case Subcommand.Remote(verbose) =>
-      printLine(s"Executing `git remote` with verbose flag set to $verbose")
-
     case Subcommand.Remote.Add(name, url) =>
       printLine(s"Executing `git remote add $name $url`")
     case Subcommand.Remote.Remove(name) =>
       printLine(s"Executing `git remote remove $name`")
+    case Subcommand.Remote(verbose) =>
+      printLine(s"Executing `git remote` with verbose flag set to $verbose")
+
   }
 }
 

diff --git a/zio-cli/shared/src/main/scala/zio/cli/Command.scala b/zio-cli/shared/src/main/scala/zio/cli/Command.scala
@@ -222,9 +222,13 @@ object Command {
       args: List[String],
       conf: CliConfig
     ): IO[ValidationError, CommandDirective[(A, B)]] = {
-      val helpDirectiveForChild =
+      val helpDirectiveForChild = {
+        val safeTail = args match {
+          case Nil          => Nil
+          case head :: tail => tail
+        }
         self.child
-          .parse(args.tail, conf)
+          .parse(safeTail, conf)
           .collect(ValidationError(ValidationErrorType.InvalidArgument, HelpDoc.empty)) {
             case CommandDirective.BuiltIn(BuiltInOption.ShowHelp(synopsis, helpDoc)) =>
               val parentName = self.names.headOption.getOrElse("")
@@ -235,6 +239,7 @@ object Command {
                 )
               }
           }
+      }
 
       val helpDirectiveForParent =
         ZIO.succeed(CommandDirective.builtIn(BuiltInOption.ShowHelp(self.synopsis, self.helpDoc)))