@oclif/core 2.11.11 → 2.13.0

package/lib/config/config.js

@@ -17,9 +17,11 @@ const performance_1 = require("../performance");
 const settings_1 = require("../settings");
 const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
+const semver_1 = require("semver");
 // eslint-disable-next-line new-cap
 const debug = (0, util_2.Debug)();
 const _pjson = (0, util_3.requireJson)(__dirname, '..', '..', 'package.json');
+const BASE = `${_pjson.name}@${_pjson.version}`;
 function channelFromVersion(version) {
     const m = version.match(/[^-]+(?:-([^.]+))?/);
     return (m && m[1]) || 'stable';
@@ -60,7 +62,7 @@ class Permutations extends Map {
 class Config {
     constructor(options) {
         this.options = options;
-        this._base = `${_pjson.name}@${_pjson.version}`;
+        this._base = BASE;
         this.debug = 0;
         this.plugins = [];
         this.topicSeparator = ':';
@@ -69,6 +71,24 @@ class Config {
         this.topicPermutations = new Permutations();
         this._commands = new Map();
         this._topics = new Map();
+        if (options.config) {
+            if (Array.isArray(options.config.plugins) && Array.isArray(this.plugins)) {
+                // incoming config is v2 with plugins array and this config is v2 with plugins array
+                Object.assign(this, options.config);
+            }
+            else if (Array.isArray(options.config.plugins) && !Array.isArray(this.plugins)) {
+                // incoming config is v2 with plugins array and this config is v3 with plugin Map
+                Object.assign(this, options.config, { plugins: new Map(options.config.plugins.map(p => [p.name, p])) });
+            }
+            else if (!Array.isArray(options.config.plugins) && Array.isArray(this.plugins)) {
+                // incoming config is v3 with plugin Map and this config is v2 with plugins array
+                Object.assign(this, options.config, { plugins: options.config.getPluginsList() });
+            }
+            else {
+                // incoming config is v3 with plugin Map and this config is v3 with plugin Map
+                Object.assign(this, options.config);
+            }
+        }
     }
     static async load(opts = module.filename || __dirname) {
         // Handle the case when a file URL string is passed in such as 'import.meta.url'; covert to file path.
@@ -77,14 +97,33 @@ class Config {
         }
         if (typeof opts === 'string')
             opts = { root: opts };
-        if (isConfig(opts))
+        if (isConfig(opts)) {
+            const currentConfigBase = BASE.replace('@oclif/core@', '');
+            const incomingConfigBase = opts._base.replace('@oclif/core@', '');
+            /**
+             * Reload the Config based on the version required by the command.
+             * This is needed because the command is given the Config instantiated
+             * by the root plugin, which may be a different version than the one
+             * required by the command.
+             *
+             * Doing this ensures that the command can freely use any method on Config that
+             * exists in the version of Config required by the command but may not exist on the
+             * root's instance of Config.
+             */
+            if ((0, semver_1.lt)(incomingConfigBase, currentConfigBase)) {
+                debug(`reloading config from ${opts._base} to ${BASE}`);
+                return new Config({ ...opts.options, config: opts });
+            }
             return opts;
+        }
         const config = new Config(opts);
         await config.load();
         return config;
     }
     // eslint-disable-next-line complexity
     async load() {
+        if (this.options.config)
+            return;
         settings_1.settings.performanceEnabled = (settings_1.settings.performanceEnabled === undefined ? this.options.enablePerf : settings_1.settings.performanceEnabled) ?? false;
         const plugin = new Plugin.Plugin({ root: this.options.root });
         await plugin.load();

package/lib/interfaces/plugin.d.ts

@@ -1,3 +1,4 @@
+import { Config } from './config';
 import { Command } from '../command';
 import { PJSON } from './pjson';
 import { Topic } from './topic';
@@ -18,6 +19,7 @@ export interface Options extends PluginOptions {
     channel?: string;
     version?: string;
     enablePerf?: boolean;
+    config?: Config;
 }
 export interface Plugin {
     /**

package/package.json

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