@oclif/core 2.1.3 → 2.1.5

package/lib/config/config.d.ts

@@ -132,5 +132,6 @@ export declare class Config implements IConfig {
      * @returns command instance {Command.Loadable} or undefined
      */
     private determinePriority;
+    private insertLegacyPlugins;
 }
 export declare function toCached(c: Command.Class, plugin?: IPlugin): Promise<Command.Cached>;

package/lib/config/config.js

@@ -239,6 +239,9 @@ class Config {
                         await withTimeout(timeout, search(module).call(context, { ...opts, config: this })) :
                         await search(module).call(context, { ...opts, config: this });
                     final.successes.push({ plugin: p, result });
+                    if (p.name === '@oclif/plugin-legacy' && event === 'init') {
+                        this.insertLegacyPlugins(result);
+                    }
                     debug('done');
                 }
                 catch (error) {
@@ -639,6 +642,14 @@ class Config {
         });
         return commandPlugins[0];
     }
+    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);
+            this.loadCommands(plugin);
+        }
+    }
 }
 exports.Config = Config;
 // when no manifest exists, the default is calculated.  This may throw, so we need to catch it

package/lib/parser/parse.js

@@ -241,10 +241,14 @@ class Parser {
         if (!flag.parse)
             return input;
         try {
+            const ctx = this.context;
+            ctx.token = token;
             if (flag.type === 'boolean') {
-                return await flag.parse(input, { ...this.context, token }, flag);
+                const ctx = this.context;
+                ctx.token = token;
+                return await flag.parse(input, ctx, flag);
             }
-            return flag.parse ? await flag.parse(input, { ...this.context, token }, flag) : input;
+            return flag.parse ? await flag.parse(input, ctx, flag) : input;
         }
         catch (error) {
             error.message = `Parsing --${flag.name} \n\t${error.message}\nSee more help with --help`;
@@ -260,13 +264,15 @@ class Parser {
         const args = {};
         const tokens = this._argTokens;
         let stdinRead = false;
+        const ctx = this.context;
         for (const [name, arg] of Object.entries(this.input.args)) {
             const token = tokens.find(t => t.arg === name);
+            ctx.token = token;
             if (token) {
                 if (arg.options && !arg.options.includes(token.input)) {
                     throw new errors_1.ArgInvalidOptionError(arg, token.input);
                 }
-                const parsed = await arg.parse(token.input, { ...this.context, token }, arg);
+                const parsed = await arg.parse(token.input, ctx, arg);
                 argv.push(parsed);
                 args[token.arg] = parsed;
             }
@@ -274,7 +280,7 @@ class Parser {
                 let stdin = await readStdin();
                 if (stdin) {
                     stdin = stdin.trim();
-                    const parsed = await arg.parse(stdin, { ...this.context, token }, arg);
+                    const parsed = await arg.parse(stdin, ctx, arg);
                     argv.push(parsed);
                     args[name] = parsed;
                 }

package/package.json

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