Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Never call preSubcommand hooks on help command #1956

Closed
wants to merge 6 commits into from
Closed

Never call preSubcommand hooks on help command #1956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e8bea4a
Fix version() parameter type
aweebit Aug 3, 2023
e4d00db
Change initial variable values in test for better error messages
aweebit Aug 2, 2023
35e9571
Do not use undefined long help option flag in legacy code
aweebit Aug 3, 2023
a253ec6
Revert "Fix version() parameter type"
aweebit Aug 12, 2023
8dd417f
Fix help for commands with executable handler & only a short help flag
aweebit Aug 13, 2023
77828ba
Never call preSubcommand hooks on help command
aweebit Aug 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions lib/command.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,13 +1095,19 @@ Expecting one of '${allowedValues.join("', '")}'`);
if (!subcommandName) {
this.help();
}

const subCommand = this._findCommand(subcommandName);
if (subCommand && !subCommand._executableHandler) {
if (!subCommand) {
this.help({ error: true });
}
if (!subCommand._executableHandler) {
subCommand.help();
}

// Fallback to parsing the help flag to invoke the help.
return this._dispatchSubcommand(subcommandName, [], [this._helpLongFlag]);
this._executeSubCommand(subcommandName, [
this._helpLongFlag || this._helpShortFlag
]);
}

/**
Expand Down Expand Up @@ -2034,7 +2040,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
}
context.write(helpInformation);

this.emit(this._helpLongFlag); // deprecated
if (this._helpLongFlag) {
this.emit(this._helpLongFlag); // deprecated
}
this.emit('afterHelp', context);
getCommandAndParents(this).forEach(command => command.emit('afterAllHelp', context));
}
Expand Down
10 changes: 5 additions & 5 deletions tests/command.addHelpText.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ describe('context checks with full parse', () => {
});

test('when help requested then context.error is false', () => {
let context = {};
let context;
const program = new commander.Command();
program
.exitOverride()
Expand All @@ -193,7 +193,7 @@ describe('context checks with full parse', () => {
});

test('when help for error then context.error is true', () => {
let context = {};
let context;
const program = new commander.Command();
program
.exitOverride()
Expand All @@ -206,7 +206,7 @@ describe('context checks with full parse', () => {
});

test('when help on program then context.command is program', () => {
let context = {};
let context;
const program = new commander.Command();
program
.exitOverride()
Expand All @@ -218,7 +218,7 @@ describe('context checks with full parse', () => {
});

test('when help on subcommand and "before" subcommand then context.command is subcommand', () => {
let context = {};
let context;
const program = new commander.Command();
program
.exitOverride();
Expand All @@ -231,7 +231,7 @@ describe('context checks with full parse', () => {
});

test('when help on subcommand and "beforeAll" on program then context.command is subcommand', () => {
let context = {};
let context;
const program = new commander.Command();
program
.exitOverride()
Expand Down