From d3facd7b56e1a96ad4c0fa0110490f0fc9100655 Mon Sep 17 00:00:00 2001 From: Mariano Vazquez Date: Sun, 12 Jul 2020 05:02:06 -0300 Subject: [PATCH] fix(yargs-interactive): Extend Interactive interface with yargs.Argv interface (#45831) --- types/yargs-interactive/index.d.ts | 4 +++- types/yargs-interactive/yargs-interactive-tests.ts | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/types/yargs-interactive/index.d.ts b/types/yargs-interactive/index.d.ts index c28b6eb9cd..3b1f26a8a1 100644 --- a/types/yargs-interactive/index.d.ts +++ b/types/yargs-interactive/index.d.ts @@ -4,6 +4,8 @@ // Nano Vazquez // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +import { Argv } from 'yargs'; + declare function yargsInteractive(): yargsInteractive.Interactive; declare namespace yargsInteractive { @@ -17,7 +19,7 @@ declare namespace yargsInteractive { interface Option { [key: string]: OptionData | { default: boolean }; } - interface Interactive { + interface Interactive extends Argv { usage(usage: string): Interactive; interactive(options: Option): Interactive; then(callback: (result: any) => any): Interactive; diff --git a/types/yargs-interactive/yargs-interactive-tests.ts b/types/yargs-interactive/yargs-interactive-tests.ts index b15a0bba62..61acdbc861 100644 --- a/types/yargs-interactive/yargs-interactive-tests.ts +++ b/types/yargs-interactive/yargs-interactive-tests.ts @@ -23,4 +23,7 @@ yargsInteractive() .interactive(options) .then((result: any) => { console.log(result); - }); + }) + .demandCommand(1, 1, 'You need to specify a command before moving on') + .help() + .wrap(null).version;