@oclif/core 2.0.4 → 2.0.6

package/lib/interfaces/parser.d.ts

@@ -58,8 +58,8 @@ export type DefaultContext<T> = {
     options: T;
     flags: Record<string, string>;
 };
-export type FlagDefault<T, P = CustomOptions> = T | ((context: DefaultContext<OptionFlag<T, P> & P>) => Promise<T>);
-export type FlagDefaultHelp<T, P = CustomOptions> = T | ((context: DefaultContext<OptionFlag<T, P> & P>) => Promise<string | undefined>);
+export type FlagDefault<T, P = CustomOptions> = T | ((context: DefaultContext<P & OptionFlag<T, P>>) => Promise<T>);
+export type FlagDefaultHelp<T, P = CustomOptions> = T | ((context: DefaultContext<P & OptionFlag<T, P>>) => Promise<string | undefined>);
 export type ArgDefault<T, P = CustomOptions> = T | ((context: DefaultContext<Arg<T, P>>) => Promise<T>);
 export type ArgDefaultHelp<T, P = CustomOptions> = T | ((context: DefaultContext<Arg<T, P>>) => Promise<string | undefined>);
 export type FlagRelationship = string | {
@@ -199,13 +199,13 @@ export type BooleanFlag<T> = FlagProps & BooleanFlagProps & {
     parse: (input: boolean, context: Command, opts: FlagProps & BooleanFlagProps) => Promise<T>;
 };
 export type OptionFlagDefaults<T, P = CustomOptions, M = false> = FlagProps & OptionFlagProps & {
-    parse: FlagParser<T, string, P & OptionFlag<T, P>>;
+    parse: FlagParser<T, string, P>;
     defaultHelp?: FlagDefaultHelp<T>;
     input: string[];
     default?: M extends true ? FlagDefault<T[] | undefined, P> : FlagDefault<T | undefined, P>;
 };
 export type OptionFlag<T, P = CustomOptions> = FlagProps & OptionFlagProps & {
-    parse: FlagParser<T, string, P & OptionFlag<T, P>>;
+    parse: FlagParser<T, string, P>;
     defaultHelp?: FlagDefaultHelp<T, P>;
     input: string[];
 } & ({
@@ -225,13 +225,13 @@ export type FlagDefinition<T, P = CustomOptions> = {
     }) & Partial<OptionFlag<T, P>>): OptionFlag<T[]>;
     (options: P & {
         multiple: true;
-    } & Partial<OptionFlag<T>>): OptionFlag<T[] | undefined, P>;
+    } & Partial<OptionFlag<T>>): OptionFlag<T[] | undefined>;
     (options: P & ({
         required: true;
     } | {
         default: FlagDefault<T>;
-    }) & Partial<OptionFlag<T>>): OptionFlag<T, P>;
-    (options?: P & Partial<OptionFlag<T>>): OptionFlag<T | undefined, P>;
+    }) & Partial<OptionFlag<T>>): OptionFlag<T>;
+    (options?: P & Partial<OptionFlag<T>>): OptionFlag<T | undefined>;
 };
 export type Flag<T> = BooleanFlag<T> | OptionFlag<T>;
 export type Input<TFlags extends FlagOutput, BFlags extends FlagOutput, AFlags extends ArgOutput> = {

package/lib/parser/errors.d.ts

@@ -1,6 +1,6 @@
 import { CLIError } from '../errors';
 import { OptionFlag, Flag } from '../interfaces';
-import { Arg, ArgInput, BooleanFlag, CLIParseErrorOptions } from '../interfaces/parser';
+import { Arg, ArgInput, CLIParseErrorOptions } from '../interfaces/parser';
 export { CLIError } from '../errors';
 export type Validation = {
     name: string;
@@ -47,9 +47,6 @@ export declare class NonExistentFlagsError extends CLIParseError {
 export declare class FlagInvalidOptionError extends CLIParseError {
     constructor(flag: OptionFlag<any>, input: string);
 }
-export declare class FailedFlagParseError extends CLIParseError {
-    constructor(flag: BooleanFlag<any> | OptionFlag<any>, errMsg: string);
-}
 export declare class ArgInvalidOptionError extends CLIParseError {
     constructor(arg: Arg<any>, input: string);
 }

package/lib/parser/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FailedFlagValidationError = exports.ArgInvalidOptionError = exports.FailedFlagParseError = exports.FlagInvalidOptionError = exports.NonExistentFlagsError = exports.UnexpectedArgsError = exports.RequiredFlagError = exports.RequiredArgsError = exports.InvalidArgsSpecError = exports.CLIParseError = exports.CLIError = void 0;
+exports.FailedFlagValidationError = exports.ArgInvalidOptionError = exports.FlagInvalidOptionError = exports.NonExistentFlagsError = exports.UnexpectedArgsError = exports.RequiredFlagError = exports.RequiredArgsError = exports.InvalidArgsSpecError = exports.CLIParseError = exports.CLIError = void 0;
 const errors_1 = require("../errors");
 const help_1 = require("./help");
 const list_1 = require("../cli-ux/list");
@@ -74,13 +74,6 @@ class FlagInvalidOptionError extends CLIParseError {
     }
 }
 exports.FlagInvalidOptionError = FlagInvalidOptionError;
-class FailedFlagParseError extends CLIParseError {
-    constructor(flag, errMsg) {
-        const message = `Parsing --${flag.name} \n\t${errMsg}`;
-        super({ parse: {}, message });
-    }
-}
-exports.FailedFlagParseError = FailedFlagParseError;
 class ArgInvalidOptionError extends CLIParseError {
     constructor(arg, input) {
         const message = `Expected ${input} to be one of: ${arg.options.join(', ')}`;

package/lib/parser/parse.js

@@ -242,7 +242,8 @@ class Parser {
             return flag.parse ? await flag.parse(input, this.context, flag) : input;
         }
         catch (error) {
-            throw new errors_1.FailedFlagParseError(flag, error.message);
+            error.message = `Parsing --${flag.name} \n\t${error.message}\nSee more help with --help`;
+            throw error;
         }
     }
     _validateOptions(flag, input) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {