@oclif/core 2.0.3 → 2.0.5

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

@@ -49,6 +49,9 @@ const readStdin = async () => {
         }, { once: true });
     });
 };
+function isNegativeNumber(input) {
+    return /^-\d/g.test(input);
+}
 class Parser {
     constructor(input) {
         this.input = input;
@@ -137,7 +140,7 @@ class Parser {
                     dashdash = true;
                     continue;
                 }
-                if (this.input['--'] !== false) {
+                if (this.input['--'] !== false && !isNegativeNumber(input)) {
                     // At this point we have a value that begins with '-' or '--'
                     // but doesn't match up to a flag definition. So we assume that
                     // this is a misspelled flag or a non-existent flag,
@@ -193,7 +196,7 @@ class Parser {
                     flags[token.flag].push(...values);
                 }
                 else {
-                    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(value);
@@ -213,7 +216,7 @@ class Parser {
                 if (flag.type === 'option') {
                     if (input) {
                         this._validateOptions(flag, input);
-                        flags[k] = await flag.parse(input, this.context, flag);
+                        flags[k] = await this._parseFlag(input, flag);
                     }
                 }
                 else if (flag.type === 'boolean') {
@@ -230,6 +233,8 @@ class Parser {
         return flags;
     }
     async _parseFlag(input, flag) {
+        if (!flag.parse)
+            return input;
         try {
             if (flag.type === 'boolean') {
                 return await flag.parse(input, this.context, flag);
@@ -237,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.3",
+  "version": "2.0.5",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {