@oclif/core 1.25.0 → 1.26.1

package/lib/help/util.js

@@ -45,7 +45,7 @@ function collateSpacedCmdIDFromArgs(argv, config) {
             if (!id)
                 return false;
             const cmd = config.findCommand(id);
-            return Boolean(cmd && (cmd.strict === false || cmd.args?.length > 0));
+            return Boolean(cmd && (cmd.strict === false || Object.values(cmd.args ?? {}).length > 0));
         };
         for (const arg of argv) {
             if (idPresent(finalizeId(arg)))

package/lib/parser/errors.d.ts

@@ -1,5 +1,5 @@
 import { CLIError } from '../errors';
-import { ParserArg, CLIParseErrorOptions, OptionFlag, Flag } from '../interfaces';
+import { ParserArg, CLIParseErrorOptions, OptionFlag, Flag, BooleanFlag } from '../interfaces';
 export { CLIError } from '../errors';
 export type Validation = {
     name: string;
@@ -40,6 +40,9 @@ export declare class UnexpectedArgsError 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: ParserArg<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.FlagInvalidOptionError = exports.UnexpectedArgsError = exports.RequiredFlagError = exports.RequiredArgsError = exports.InvalidArgsSpecError = exports.CLIParseError = exports.CLIError = void 0;
+exports.FailedFlagValidationError = exports.ArgInvalidOptionError = exports.FailedFlagParseError = exports.FlagInvalidOptionError = exports.UnexpectedArgsError = exports.RequiredFlagError = exports.RequiredArgsError = exports.InvalidArgsSpecError = exports.CLIParseError = exports.CLIError = void 0;
 const errors_1 = require("../errors");
 const deps_1 = require("./deps");
 const util_1 = require("../config/util");
@@ -71,6 +71,13 @@ 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.d.ts

@@ -18,6 +18,7 @@ export declare class Parser<T extends ParserInput, TFlags extends OutputFlags<T[
     }>;
     private _args;
     private _flags;
+    private _parseFlag;
     private _validateOptions;
     private _argv;
     private _debugOutput;

package/lib/parser/parse.js

@@ -158,13 +158,13 @@ class Parser {
                     flags[token.flag] = true;
                 }
                 // eslint-disable-next-line no-await-in-loop
-                flags[token.flag] = await flag.parse(flags[token.flag], this.context, flag);
+                flags[token.flag] = await this._parseFlag(flags[token.flag], flag);
             }
             else {
                 const input = token.input;
                 this._validateOptions(flag, input);
                 // eslint-disable-next-line no-await-in-loop
-                const value = flag.parse ? await flag.parse(input, this.context, flag) : input;
+                const value = await this._parseFlag(input, flag);
                 if (flag.multiple) {
                     flags[token.flag] = flags[token.flag] || [];
                     flags[token.flag].push(...(Array.isArray(value) ? value : [value]));
@@ -201,6 +201,17 @@ class Parser {
         }
         return flags;
     }
+    async _parseFlag(input, flag) {
+        try {
+            if (flag.type === 'boolean') {
+                return await flag.parse(input, this.context, flag);
+            }
+            return flag.parse ? await flag.parse(input, this.context, flag) : input;
+        }
+        catch (error) {
+            throw new m.errors.FailedFlagParseError(flag, error.message);
+        }
+    }
     _validateOptions(flag, input) {
         if (flag.options && !flag.options.includes(input))
             throw new m.errors.FlagInvalidOptionError(flag, input);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "1.25.0",
+  "version": "1.26.1",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -114,4 +114,4 @@
     "pretest": "yarn build --noEmit && tsc -p test --noEmit --skipLibCheck"
   },
   "types": "lib/index.d.ts"
-}
+}