fix: only output help and version for non-sub commands

egoist · egoist · commit 54d5fab50fca · 2021-10-06T21:14:15.000+08:00
diff --git a/src/CAC.ts b/src/CAC.ts
@@ -214,13 +214,13 @@ class CAC extends EventEmitter {
       this.setParsedInfo(parsed)
     }
 
-    if (this.options.help && this.showHelpOnExit) {
+    if (this.options.help && this.showHelpOnExit && this.matchedCommandName == null) {
       this.outputHelp()
       run = false
       this.unsetMatchedCommand()
     }
 
-    if (this.options.version && this.showVersionOnExit) {
+    if (this.options.version && this.showVersionOnExit && this.matchedCommandName == null) {
       this.outputVersion()
       run = false
       this.unsetMatchedCommand()

Original file line number	Diff line number	Diff line change
`@@ -214,13 +214,13 @@ class CAC extends EventEmitter {`
`214`	`214`	`this.setParsedInfo(parsed)`
`215`	`215`	`}`
`216`	`216`
`217`		`- if (this.options.help && this.showHelpOnExit) {`
	`217`	`+ if (this.options.help && this.showHelpOnExit && this.matchedCommandName == null) {`
`218`	`218`	`this.outputHelp()`
`219`	`219`	`run = false`
`220`	`220`	`this.unsetMatchedCommand()`
`221`	`221`	`}`
`222`	`222`
`223`		`- if (this.options.version && this.showVersionOnExit) {`
	`223`	`+ if (this.options.version && this.showVersionOnExit && this.matchedCommandName == null) {`
`224`	`224`	`this.outputVersion()`
`225`	`225`	`run = false`
`226`	`226`	`this.unsetMatchedCommand()`