From 130de1b4e6316d763cc457a07caeab98dd9ff846 Mon Sep 17 00:00:00 2001 From: Corey Butler Date: Wed, 29 Apr 2020 22:01:59 -0500 Subject: [PATCH] Added missing logic to disable help. --- package-lock.json | 2 +- package.json | 2 +- src/base.js | 6 ++++-- test/unit/01-sanity/01-sanity.js | 6 +++++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index ca1332e..7fa5182 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@author.io/shell", - "version": "1.3.9", + "version": "1.3.12", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b18f57d..98b0495 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@author.io/shell", - "version": "1.3.11", + "version": "1.3.12", "description": "A micro-framework for creating CLI-like experiences. This supports Node.js and browsers.", "main": "src/index.js", "scripts": { diff --git a/src/base.js b/src/base.js index 0e3bbf3..359573e 100644 --- a/src/base.js +++ b/src/base.js @@ -16,14 +16,16 @@ export default class Base { #name = 'Unknown' #middleware = new Middleware() #hasCustomDefaultHandler = false - #defaultHandler = function () { + #defaultHandler = function (meta) { if (this.parent !== null && this.parent.hasCustomDefaultHandler) { return this.parent.defaultHandler(...arguments) } else if (this.shell.hasCustomDefaultHandler) { return this.shell.defaultHandler(...arguments) } - console.log(this.help) + if (this.#autohelp) { + console.log(this.help) + } } constructor(cfg = {}) { diff --git a/test/unit/01-sanity/01-sanity.js b/test/unit/01-sanity/01-sanity.js index af2e0ba..f0d602b 100644 --- a/test/unit/01-sanity/01-sanity.js +++ b/test/unit/01-sanity/01-sanity.js @@ -131,7 +131,8 @@ test('Subcommand Config', t => { // const shell = new Shell({ // name: 'test', // version: '1.0.0', -// defaultHandler: () => console.log('yo'), +// disableHelp: true, +// // defaultHandler: () => console.log('yo'), // commands: [ // { // name: 'account', @@ -144,6 +145,9 @@ test('Subcommand Config', t => { // name: 'create', // description: 'Create a user account.', // arguments: '', +// help () { +// return 'overridden help' +// }, // flags: { // name: { // alias: 'n',