mirror of
https://github.com/daylinmorgan/hwylterm.git
synced 2024-12-21 02:30:44 -06:00
support default flag type
This commit is contained in:
parent
88a0bc2ffe
commit
5a236cd6a5
2 changed files with 34 additions and 22 deletions
|
@ -176,19 +176,20 @@ type
|
|||
|
||||
CliCfg = object
|
||||
name*: string
|
||||
alias*: HashSet[string]
|
||||
alias*: HashSet[string] # only supported in subcommands
|
||||
version*: NimNode
|
||||
stopWords*: seq[string]
|
||||
help: CliHelp
|
||||
hidden*: seq[string]
|
||||
subcommands: seq[CliCfg]
|
||||
defaultFlagType: NimNode
|
||||
required*: seq[string]
|
||||
settings*: set[CliSetting]
|
||||
subName*: string # used for help generator
|
||||
subcommands: seq[CliCfg]
|
||||
preSub*, postSub*, pre*, post*, run*: NimNode
|
||||
subName*: string # used for help the generator
|
||||
version*: NimNode
|
||||
hidden*: seq[string]
|
||||
flags*: seq[CliFlag]
|
||||
builtinFlags*: seq[BuiltinFlag]
|
||||
flagDefs*: seq[CliFlag]
|
||||
required*: seq[string]
|
||||
inherit*: Inherit
|
||||
root*: bool
|
||||
|
||||
|
@ -288,6 +289,7 @@ func parseCliFlag(n: NimNode): CliFlag =
|
|||
if n.kind == nnkCommand:
|
||||
result.help = n[1]
|
||||
# option:
|
||||
# T string
|
||||
# help "some help description"
|
||||
else:
|
||||
parseFlagParams(result, n[1])
|
||||
|
@ -297,7 +299,14 @@ func parseCliFlag(n: NimNode): CliFlag =
|
|||
if result.typeNode == nil:
|
||||
result.typeNode = ident"bool"
|
||||
|
||||
# TODO: change how this works?
|
||||
func postParse(cfg: var CliCfg) =
|
||||
let defaultTypeNode = cfg.defaultFlagType or ident"bool"
|
||||
for f in cfg.flagDefs.mitems:
|
||||
if f.typeNode == nil:
|
||||
f.typeNode = defaultTypeNode
|
||||
if f.group in ["", "global"]:
|
||||
cfg.flags.add f
|
||||
|
||||
func parseCliFlags(cfg: var CliCfg, node: NimNode) =
|
||||
var group: string
|
||||
expectKind node, nnkStmtList
|
||||
|
@ -326,10 +335,8 @@ func parseCliFlags(cfg: var CliCfg, node: NimNode) =
|
|||
of nnkIdent, nnkStrLit:
|
||||
cfg.inherit.flags.add n[1].strval
|
||||
else: bad(n, "flag")
|
||||
|
||||
else: bad(n, "flag")
|
||||
|
||||
cfg.flags = cfg.flagDefs.filterIt(it.group in ["", "global"])
|
||||
|
||||
func parseCliSetting(s: string): CliSetting =
|
||||
try: parseEnum[CliSetting](s)
|
||||
|
@ -507,8 +514,6 @@ func propagate(c: var CliCfg) =
|
|||
child.inheritFrom(c)
|
||||
propagate(child)
|
||||
|
||||
|
||||
|
||||
func parseCliHelp(c: var CliCfg, node: NimNode) =
|
||||
## some possible DSL inputs:
|
||||
##
|
||||
|
@ -603,13 +608,16 @@ func parseCliBody(body: NimNode, name = "", root = false): CliCfg =
|
|||
result.preSub = node[1]
|
||||
of "postSub":
|
||||
result.postSub = node[1]
|
||||
of "defaultFlagType":
|
||||
result.defaultFlagType = node[1]
|
||||
else:
|
||||
error "unknown hwylCli setting: " & name
|
||||
|
||||
if result.name == "":
|
||||
error "missing required option: name"
|
||||
|
||||
# TODO: validate "required" flags exist here
|
||||
postParse result
|
||||
# TODO: validate "required" flags exist here?
|
||||
result.addBuiltinFlags()
|
||||
|
||||
if root:
|
||||
|
@ -664,15 +672,19 @@ func generateCliHelpProc(cfg: CliCfg, printHelpName: NimNode): NimNode =
|
|||
|
||||
result = quote do:
|
||||
proc `printHelpName`() =
|
||||
echo bb(render(newHwylCliHelp(
|
||||
header = `header`,
|
||||
footer = `footer`,
|
||||
usage = `usage`,
|
||||
description = `description`,
|
||||
subcmds = `subcmds`,
|
||||
flags = `helpFlags`,
|
||||
styles = `styles`,
|
||||
)))
|
||||
echo bb(
|
||||
render(
|
||||
newHwylCliHelp(
|
||||
header = `header`,
|
||||
footer = `footer`,
|
||||
usage = `usage`,
|
||||
description = `description`,
|
||||
subcmds = `subcmds`,
|
||||
flags = `helpFlags`,
|
||||
styles = `styles`,
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
proc checkVal(p: OptParser) =
|
||||
if p.val == "":
|
||||
|
|
2
todo.md
2
todo.md
|
@ -24,7 +24,7 @@
|
|||
- [x] don't recreate "global"" variables in var section
|
||||
- [ ] add flag overlap check before case statement generation (after parsing?)
|
||||
- [ ] add key-value flag support -> `--setting:a:off`
|
||||
- [ ] add defaultFlagType CliCfg setting
|
||||
- [x] add defaultFlagType CliCfg setting
|
||||
- [x] add node to flagDef to override builtin `parse(p, varName)`
|
||||
|
||||
## features
|
||||
|
|
Loading…
Reference in a new issue