Fixed onProcess hooks on subcommands, usage formatting

Author: Anders Brams

.vscode/launch.json

@@ -10,7 +10,7 @@
       "preLaunchTask": "tsc: build - tsconfig.json",
       "outFiles": ["${workspaceFolder}/dist/**/*.js"],
       "autoAttachChildProcesses": true,
-      "args": ["demo", "--help"]
+      "args": ["todd", "--help"]
     },
     {
       "type": "node",

src/cli-command.ts

@@ -276,12 +276,12 @@ export class CliCommand {
     const command = this.getCommand(opts.raw ? processArgs : processArgs.slice(2))
 
     // Run hooks
-    await this.runOnProcessHooks(parsed, 'args', this.argsMap)
-    await this.runOnProcessHooks(parsed, 'opts', this.opts)
+    await command.runOnProcessHooks(parsed, 'args', this.argsMap)
+    await command.runOnProcessHooks(parsed, 'opts', this.opts)
 
     // Run validators
-    await this.runValidators(parsed, 'args', this.argsMap)
-    await this.runValidators(parsed, 'opts', this.opts)
+    await command.runValidators(parsed, 'args', this.argsMap)
+    await command.runValidators(parsed, 'opts', this.opts)
 
     // Run handler
     if (command.handler !== undefined) {

src/presentation.ts

@@ -50,15 +50,15 @@ const formatOptions = (opts: OptionDefinition[]): string => {
     let optString = optStrings[i]
     optString = padToLength(optString, maxOptionLength + padding)
 
+    if (opt.required) {
+      optString += ' (required)'
+    }
     if (opt.description) {
       optString += ` ${opt.description}`
     }
     if (opt.defaultValue !== undefined) {
       optString += ` (default: ${JSON.stringify(opt.defaultValue)})`
     }
-    if (opt.required) {
-      optString += '(required)'
-    }
     optStrings[i] = optString
   }