@oclif/core 2.8.6 → 2.8.8

package/lib/config/config.d.ts

@@ -135,6 +135,15 @@ export declare class Config implements IConfig {
      * @returns command instance {Command.Loadable} or undefined
      */
     private determinePriority;
+    /**
+      * Insert legacy plugins
+      *
+      * Replace invalid CLI plugins (cli-engine plugins, mostly Heroku) loaded via `this.loadPlugins`
+      * with oclif-compatible ones returned by @oclif/plugin-legacy init hook.
+      *
+      * @param plugins array of oclif-compatible plugins
+      * @returns void
+      */
     private insertLegacyPlugins;
 }
 export declare function toCached(c: Command.Class, plugin?: IPlugin | undefined, isWritingManifest?: boolean): Promise<Command.Cached>;

package/lib/config/config.js

@@ -703,11 +703,23 @@ class Config {
         });
         return commandPlugins[0];
     }
+    /**
+      * Insert legacy plugins
+      *
+      * Replace invalid CLI plugins (cli-engine plugins, mostly Heroku) loaded via `this.loadPlugins`
+      * with oclif-compatible ones returned by @oclif/plugin-legacy init hook.
+      *
+      * @param plugins array of oclif-compatible plugins
+      * @returns void
+      */
     insertLegacyPlugins(plugins) {
         for (const plugin of plugins) {
             const idx = this.plugins.findIndex(p => p.name === plugin.name);
-            if (idx !== -1)
-                this.plugins = this.plugins.splice(idx, 1, plugin);
+            if (idx !== -1) {
+                // invalid plugin instance found in `this.plugins`
+                // replace with the oclif-compatible one
+                this.plugins.splice(idx, 1, plugin);
+            }
             this.loadCommands(plugin);
         }
     }

package/lib/parser/parse.js

@@ -85,7 +85,7 @@ class Parser {
             if (this.flagAliases[char]) {
                 return this.flagAliases[char].name;
             }
-            return Object.keys(this.input.flags).find(k => this.input.flags[k].char === char);
+            return Object.keys(this.input.flags).find(k => (this.input.flags[k].char === char && char !== undefined && this.input.flags[k].char !== undefined));
         };
         const parseFlag = (arg) => {
             const long = arg.startsWith('--');
@@ -106,11 +106,12 @@ class Parser {
             const flag = this.input.flags[name];
             if (flag.type === 'option') {
                 this.currentFlag = flag;
-                const input = long || arg.length < 3 ? this.argv.shift() : arg.slice(arg[2] === '=' ? 3 : 2);
-                if (typeof input !== 'string') {
+                const value = long || arg.length < 3 ? this.argv.shift() : arg.slice(arg[2] === '=' ? 3 : 2);
+                // if the value ends up being one of the command's flags, the user didn't provide an input
+                if (typeof value !== 'string' || this.input.flags[findLongFlag(value)] || this.input.flags[findShortFlag(value)]) {
                     throw new errors_1.CLIError(`Flag --${name} expects a value`);
                 }
-                this.raw.push({ type: 'flag', flag: flag.name, input });
+                this.raw.push({ type: 'flag', flag: flag.name, input: value });
             }
             else {
                 this.raw.push({ type: 'flag', flag: flag.name, input: arg });

package/package.json

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