src/hwylterm/hwylcli.nim

@@ -25,7 +25,8 @@ type
     cmd* = "bold"
     settings*: set[HwylCliStyleSetting] = {Aliases}
   HwylCliHelp* = object
-    header*, footer*, description*, usage*: string
+    usage*: string
+    desc*: string
     subcmds*: seq[HwylSubCmdHelp]
     flags*: seq[HwylFlagHelp]
     styles*: HwylCliStyles
@@ -36,15 +37,13 @@ func firstLine(s: string): string =
   s.strip().dedent().strip().splitlines()[0]
 
 func newHwylCliHelp*(
-  header = "",
   usage = "",
-  footer = "",
-  description = "",
+  desc = "",
   subcmds: openArray[HwylSubCmdHelp] = @[],
   flags: openArray[HwylFlagHelp] = @[],
   styles = HwylCliStyles()
 ): HwylCliHelp =
-  result.description = dedent(description).strip()
+  result.desc = dedent(desc).strip()
   if Aliases in styles.settings:
     result.subcmds =
       subcmds.mapIt((it.name & " " & it.aliases, it.aliases, it.desc.firstLine))
@@ -100,17 +99,14 @@ func render*(cli: HwylCliHelp, subcmd: HwylSubCmdHelp): string =
 
 # TODO: split this into separate procs to make overriding more fluid
 func render*(cli: HwylCliHelp): string =
-  if cli.header != "":
-    result.add cli.header
-    result.add "\n"
   if cli.usage != "":
     result.add "[" & cli.styles.header & "]"
     result.add "usage[/]:\n"
     result.add indent(cli.usage, 2 )
   result.add "\n"
-  if cli.description != "":
+  if cli.desc != "":
     result.add "\n"
-    result.add cli.description
+    result.add cli.desc
     result.add "\n"
   if cli.subcmds.len > 0:
     result.add "\n"
@@ -124,8 +120,6 @@ func render*(cli: HwylCliHelp): string =
     result.add "flags[/]:\n"
     for f in cli.flags:
       result.add render(cli,f)
-  if cli.footer != "":
-    result.add cli.footer
 
 proc bb*(cli: HwylCliHelp): BbString = 
   result = bb(render(cli))
@@ -167,20 +161,18 @@ type
     flags: seq[string]
     groups: seq[string]
 
-  CliHelp = object
-    header*, footer*, description*, usage*, styles*: NimNode
-
   CliCfg = object
     name*: string
     alias*: HashSet[string]
     stopWords*: seq[string]
-    help: CliHelp
+    styles: NimNode
     hidden*: seq[string]
     subcommands: seq[CliCfg]
     settings*: set[CliSetting]
     preSub*, postSub*, pre*, post*, run*: NimNode
+    desc*: NimNode
     subName*: string # used for help the generator
-    version*: NimNode
+    version*, usage*: NimNode
     flags*: seq[CliFlag]
     builtinFlags*: seq[BuiltinFlag]
     flagDefs*: seq[CliFlag]
@@ -502,110 +494,60 @@ func propagate(c: var CliCfg) =
     propagate(child)
 
 
-
-func parseCliHelp(c: var CliCfg, node: NimNode) =
-  ## some possible DSL inputs:
-  ##
-  ## ```
-  ## help:
-  ##  header NimNode -> string
-  ##  usage NimNode -> string
-  ##  description NimNode -> string
-  ##  footer NimNode -> string
-  ##  styles NimNode -> HwylCliStyles()
-  ## ```
-  ##
-  ## ```
-  ## help NimNode
-  ## ```
-  ##
-  ## ```
-  ## ... NimNode
-  ## `
-
-  expectLen node, 2
-  var help: CliHelp = c.help
-  case node.kind:
-  # help NimNode or ... NimNode
-  of nnkPrefix, nnkCommand:
-    help.description = node[1]
-  # help:
-  #   description NimNode
-  #   usage: NimNode
-  of nnkCall:
-    if node[1].kind != nnkStmtList:
-      error "expected list of arguments for help"
-
-    for n in node[1]:
-      expectLen n, 2
-      let id = n[0].strVal
-      var val: NimNode
-      case n.kind
-      of nnkCommand:
-        val =n[1]
-      of nnKCall:
-        val = n[1][0]
-      else: bad(n, id)
-
-      case id:
-      of "usage": help.usage = val
-      of "description": help.description = val
-      of "header": help.header = val
-      of "footer": help.footer = val
-      of "styles": help.styles = val
-      else: error "unknown help option: " & id
-
-  else: bad(node, "help")
-
-  c.help = help
-
 func parseCliBody(body: NimNode, name = "", root = false): CliCfg =
   result.name = name
   result.root = root
-  for node in body:
-    if node.kind  notin [nnkCall, nnkCommand, nnkPrefix]:
-      error "unexpected node kind: " & $node.kind
-    let name = node[0].strVal
+  # TDOO: change call to n or node?
+  for call in body:
+    if call.kind  notin [nnkCall, nnkCommand, nnkPrefix]:
+      error "unexpected node kind: " & $call.kind
+    let name = call[0].strVal
     case name:
       of "name":
-        expectKind node[1], nnkStrLit
-        result.name = node[1].strVal
+        expectKind call[1], nnkStrLit
+        result.name = call[1].strVal
       of "alias":
         if root: error "alias not supported for root command"
-        pasrseCliAlias(result, node)
+        pasrseCliAlias(result, call)
       of "version", "V":
-        result.version = node[1]
+        result.version = call[1]
       of "usage", "?":
-        result.help.usage = node[1]
-      of "...", "help":
-        parseCliHelp(result, node)
+        result.usage = call[1]
+      of "description", "...":
+        result.desc = call[1]
       of "flags":
-        parseCliFlags(result, node[1])
+        parseCliFlags(result, call[1])
       of "settings":
-        parseCliSettings(result, node)
+        parseCliSettings(result, call)
       of "stopWords":
-        result.stopWords = parseIdentLikeList(node)
+        result.stopWords = parseIdentLikeList(call)
       of "subcommands":
-        parseCliSubcommands(result, node)
+        parseCliSubcommands(result, call)
       of "hidden":
-        parseHiddenFlags(result, node)
+        parseHiddenFlags(result, call)
       of "run":
-        result.run = node[1]
+        result.run = call[1]
+      of "styles":
+        result.styles = call[1]
       of "required":
-        result.required = parseIdentLikeList(node)
+        result.required = parseIdentLikeList(call)
       of "preSub":
-        result.preSub = node[1]
+        result.preSub = call[1]
       of "postSub":
-        result.postSub = node[1]
+        result.postSub = call[1]
       else:
         error "unknown hwylCli setting: " & name
+  #
+  # for sub in result.subcommands.mitems:
+  #   # sub.inheritFrom(result)
+  #   sub.pre = result.preSub
+    # sub.post = result.postSub
 
   if result.name == "":
     error "missing required option: name"
 
   # TODO: validate "required" flags exist here
   result.addBuiltinFlags()
-
   if root:
     propagate(result)
 
@@ -632,7 +574,7 @@ func subCmdsArray(cfg: CliCfg): NimNode =
   for s in cfg.subcommands:
     let cmd = newLit(s.subName)
     let aliases = newLit(s.alias.mapIt("($1)" % [it]).join(" "))
-    let desc = s.help.description or newLit("")
+    let desc = s.desc or newLit("")
     result.add quote do:
       (`cmd`, `aliases`, `desc`)
 
@@ -646,23 +588,19 @@ func defaultUsage(cfg: CliCfg): NimNode =
   s.add " [[[faint]flags[/]]"
   newLit(s)
 
-func generateCliHelpProc(cfg: CliCfg, printHelpName: NimNode): NimNode =
+func generateCliHelperProc(cfg: CliCfg, printHelpName: NimNode): NimNode =
   let
-    description = cfg.help.description or newLit""
-    header = cfg.help.header or newLit""
-    footer = cfg.help.footer or newLit""
-    usage  = cfg.help.usage or defaultUsage(cfg)
+    desc = cfg.desc or newLit("")
+    usage  = cfg.usage or defaultUsage(cfg)
     helpFlags = cfg.flagsArray()
     subcmds = cfg.subCmdsArray()
-    styles = cfg.help.styles or (quote do: HwylCliStyles())
-  <<< usage
+    styles = cfg.styles or (quote do: HwylCliStyles())
+
   result = quote do:
     proc `printHelpName`() =
       echo bb(render(newHwylCliHelp(
-        header = `header`,
-        footer = `footer`,
+        desc = `desc`,
         usage = `usage`,
-        description = `description`,
         subcmds = `subcmds`,
         flags = `helpFlags`,
         styles = `styles`,
@@ -876,7 +814,7 @@ func hwylCliImpl(cfg: CliCfg): NimNode =
     key = ident"key"
     val = ident"val"
     (longNoVal, shortNoVal) = cfg.getNoVals()
-    printHelpProc = generateCliHelpProc(cfg, printHelpName)
+    printHelperProc = generateCliHelperProc(cfg, printHelpName)
     flagVars = setFlagVars(cfg)
 
   result = newTree(nnkStmtList)
@@ -951,7 +889,7 @@ func hwylCliImpl(cfg: CliCfg): NimNode =
 
   result.add quote do:
     # block:
-      `printHelpProc`
+      `printHelperProc`
       `flagVars`
       proc `parserProcName`(`cmdLine`: openArray[string] = commandLineParams()): seq[string] =
         `parserBody`

tests/example.nim

@@ -10,6 +10,7 @@ type
 hwylCli:
   name "example"
   V "0.1.0"
+  ... "a description of hwylterm"
   flags:
     [global]
     color:

todo.md

@@ -21,8 +21,7 @@
 - [x] add support for inheriting a single flag from parent (even from a "group")
 - [x] add support to either (lengthen commands) or provide an alias for a subcommand
 - [x] add command aliases to hwylcli help with switch
-- [x] don't recreate "global"" variables in var section
-- [ ] make proper test suite for cli generator
+- [ ] don't recreate "global"" variables in var section
 
 
 ## features