add support for enums and count flags

src/hwylterm/hwylcli.nim

@@ -121,6 +121,9 @@ proc `$`*(cli: HwylCliHelp): string =
 # ----------------------------------------
 
 type
+  Count* = object
+    val*: int
+
   CliSetting = enum
     NoHelpFlag, NoArgsShowHelp
   BuiltinFlag = object
@@ -453,6 +456,7 @@ func parseCliBody(body: NimNode, name = ""): CliCfg =
   if result.name == "":
     error "missing required option: name"
 
+  # TODO: validate "required" flags exist here
   result.addBuiltinFlags()
 
 func flagToTuple(f: CliFlag | BuiltinFlag): NimNode =
@@ -523,6 +527,22 @@ proc parse*(p: OptParser, key: string, val: string, target: var int) =
       "failed to parse value for [b]" & key & "[/] as integer: [b]" & val
     )
 
+macro enumNames(a: typed): untyped =
+  ## unexported macro copied from std/enumutils
+  result = newNimNode(nnkBracket)
+  for ai in a.getType[1][1..^1]:
+    assert ai.kind == nnkSym
+    result.add newLit ai.strVal
+
+proc parse*[E: enum](p: OptParser, key: string, val: string, target: var E) =
+  try:
+    target = parseEnum[E](val)
+  except:
+    let choices = enumNames(E).join(",")
+    hwylCliError(
+      "failed to parse value for [b]" & key & "[/] as enum: [b]" & val & "[/], expected one of: " & choices
+    )
+
 proc parse*(p: OptParser, key: string, val: string, target: var float) =
   try:
     target = parseFloat(val)
@@ -531,11 +551,14 @@ proc parse*(p: OptParser, key: string, val: string, target: var float) =
       "failed to parse value for [b]" & key & "[/] as float: [b]" & val
     )
 
-proc parse[T](p: OptParser, key: string, val: string, target: var seq[T]) =
+proc parse*[T](p: OptParser, key: string, val: string, target: var seq[T]) =
   var parsed: T
   parse(p, key, val, parsed)
   target.add parsed
 
+proc parse*(p: OptParser, key: string, val: string, target: var Count) =
+  inc target.val
+
 func shortLongCaseStmt(cfg: CliCfg, printHelpName: NimNode, version: NimNode): NimNode = 
   var caseStmt = nnkCaseStmt.newTree(ident("key"))
   caseStmt.add nnkOfBranch.newTree(newLit(""), quote do: hwylCliError("empty flag not supported currently"))
@@ -567,15 +590,18 @@ func shortLongCaseStmt(cfg: CliCfg, printHelpName: NimNode, version: NimNode): N
 func isBool(f: CliFlag): bool =
   f.typeNode == ident"bool"
 
+func isCount(f: CliFlag): bool = 
+  f.typeNode == ident"Count"
+
 func getNoVals(cfg: CliCfg): tuple[long: NimNode, short: NimNode] =
-  let boolFlags = cfg.flags.filterIt(it.isBool)
+  let flagFlags = cfg.flags.filterIt(it.isBool or it.isCount)
   let long =
     nnkBracket.newTree(
-      (boolFlags.mapIt(it.long) & cfg.builtinFlags.mapIt(it.long)).filterIt(it != "").mapIt(newLit(it))
+      (flagFlags.mapIt(it.long) & cfg.builtinFlags.mapIt(it.long)).filterIt(it != "").mapIt(newLit(it))
     )
   let short =
     nnkCurly.newTree(
-      (boolFlags.mapIt(it.short) & cfg.builtinFlags.mapIt(it.short)).filterIt(it != '\x00').mapIt(newLit(it))
+      (flagFlags.mapIt(it.short) & cfg.builtinFlags.mapIt(it.short)).filterIt(it != '\x00').mapIt(newLit(it))
     )
   result = (nnkPrefix.newTree(ident"@",long), short)
 

tests/example.nim

@@ -1,6 +1,10 @@
 import std/strformat
 import hwylterm/hwylcli
 
+type
+  Color = enum
+    red, blue, green
+
 hwylCli:
   name "example"
   V "0.1.0"
@@ -20,14 +24,18 @@ hwylCli:
   subcommands:
     --- one
     ... "the first subcommand"
-    required flag
     flags:
-      `long-flag` "some help"
+      color:
-      flag:
+        T Color
-        ? "some other help"
+        ? "a color (red, green, blue)"
+      verbose:
+        T Count
+        ? "a count flag"
+        - v
     run:
       echo "hello from `example one` command!"
-      echo "long-flag and flag are: " & `long-flag` & "," & `flag` & " by default strings"
+      echo fmt"{color=}"
+      echo fmt"{verbose=}"
 
     --- two
     ... """