@oclif/core 3.21.1 → 3.22.0

package/lib/config/config.js

@@ -349,6 +349,7 @@ class Config {
             dataDir: this.dataDir,
             devPlugins: this.options.devPlugins,
             force: opts?.force ?? false,
+            pluginAdditions: this.options.pluginAdditions,
             rootPlugin: this.rootPlugin,
             userPlugins: this.options.userPlugins,
         });

package/lib/config/plugin-loader.d.ts

@@ -10,6 +10,11 @@ type LoadOpts = {
     force?: boolean;
     rootPlugin: IPlugin;
     userPlugins?: boolean;
+    pluginAdditions?: {
+        core?: string[];
+        dev?: string[];
+        path?: string;
+    };
 };
 type PluginsMap = Map<string, IPlugin>;
 export default class PluginLoader {

package/lib/config/plugin-loader.js

@@ -23,6 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const minimatch_1 = require("minimatch");
 const node_path_1 = require("node:path");
 const performance_1 = require("../performance");
 const fs_1 = require("../util/fs");
@@ -31,6 +32,9 @@ const Plugin = __importStar(require("./plugin"));
 const util_2 = require("./util");
 // eslint-disable-next-line new-cap
 const debug = (0, util_2.Debug)();
+function findMatchingDependencies(dependencies, patterns) {
+    return Object.keys(dependencies).filter((p) => patterns.some((w) => (0, minimatch_1.minimatch)(p, w)));
+}
 class PluginLoader {
     options;
     errors = [];
@@ -75,8 +79,23 @@ class PluginLoader {
         return rootPlugin;
     }
     async loadCorePlugins(opts) {
-        if (opts.rootPlugin.pjson.oclif.plugins) {
-            await this.loadPlugins(opts.rootPlugin.root, 'core', opts.rootPlugin.pjson.oclif.plugins);
+        const { plugins: corePlugins } = opts.rootPlugin.pjson.oclif;
+        if (corePlugins) {
+            const plugins = findMatchingDependencies(opts.rootPlugin.pjson.dependencies ?? {}, corePlugins);
+            await this.loadPlugins(opts.rootPlugin.root, 'core', plugins);
+        }
+        const { core: pluginAdditionsCore, path } = opts.pluginAdditions ?? { core: [] };
+        if (pluginAdditionsCore) {
+            if (path) {
+                // If path is provided, load plugins from the path
+                const pjson = await (0, fs_1.readJson)((0, node_path_1.join)(path, 'package.json'));
+                const plugins = findMatchingDependencies(pjson.dependencies ?? {}, pluginAdditionsCore);
+                await this.loadPlugins(path, 'core', plugins);
+            }
+            else {
+                const plugins = findMatchingDependencies(opts.rootPlugin.pjson.dependencies ?? {}, pluginAdditionsCore);
+                await this.loadPlugins(opts.rootPlugin.root, 'core', plugins);
+            }
         }
     }
     async loadDevPlugins(opts) {
@@ -86,8 +105,26 @@ class PluginLoader {
                 return;
             try {
                 const { devPlugins } = opts.rootPlugin.pjson.oclif;
-                if (devPlugins)
-                    await this.loadPlugins(opts.rootPlugin.root, 'dev', devPlugins);
+                if (devPlugins) {
+                    const allDeps = { ...opts.rootPlugin.pjson.dependencies, ...opts.rootPlugin.pjson.devDependencies };
+                    const plugins = findMatchingDependencies(allDeps ?? {}, devPlugins);
+                    await this.loadPlugins(opts.rootPlugin.root, 'dev', plugins);
+                }
+                const { dev: pluginAdditionsDev, path } = opts.pluginAdditions ?? { core: [] };
+                if (pluginAdditionsDev) {
+                    if (path) {
+                        // If path is provided, load plugins from the path
+                        const pjson = await (0, fs_1.readJson)((0, node_path_1.join)(path, 'package.json'));
+                        const allDeps = { ...pjson.dependencies, ...pjson.devDependencies };
+                        const plugins = findMatchingDependencies(allDeps ?? {}, pluginAdditionsDev);
+                        await this.loadPlugins(path, 'dev', plugins);
+                    }
+                    else {
+                        const allDeps = { ...opts.rootPlugin.pjson.dependencies, ...opts.rootPlugin.pjson.devDependencies };
+                        const plugins = findMatchingDependencies(allDeps ?? {}, pluginAdditionsDev);
+                        await this.loadPlugins(opts.rootPlugin.root, 'dev', plugins);
+                    }
+                }
             }
             catch (error) {
                 process.emitWarning(error);
@@ -136,7 +173,13 @@ class PluginLoader {
                         parent.children = [];
                     parent.children.push(instance);
                 }
-                await this.loadPlugins(instance.root, type, instance.pjson.oclif.plugins || [], instance);
+                if (instance.pjson.oclif.plugins) {
+                    const allDeps = type === 'dev'
+                        ? { ...instance.pjson.dependencies, ...instance.pjson.devDependencies }
+                        : instance.pjson.dependencies;
+                    const plugins = findMatchingDependencies(allDeps ?? {}, instance.pjson.oclif.plugins);
+                    await this.loadPlugins(instance.root, type, plugins, instance);
+                }
             }
             catch (error) {
                 this.errors.push(error);

package/lib/config/plugin.d.ts

@@ -26,7 +26,6 @@ export declare class Plugin implements IPlugin {
     type: string;
     valid: boolean;
     version: string;
-    protected warned: boolean;
     _base: string;
     protected _debug: (..._: any) => void;
     private commandCache;

package/lib/config/plugin.js

@@ -103,7 +103,6 @@ class Plugin {
     type;
     valid = false;
     version;
-    warned = false;
     _base = `${_pjson.name}@${_pjson.version}`;
     // eslint-disable-next-line new-cap
     _debug = (0, util_2.Debug)();
@@ -272,7 +271,7 @@ class Plugin {
                     return [id, cached];
                 }
                 catch (error) {
-                    const scope = 'cacheCommand';
+                    const scope = `findCommand (${id})`;
                     if (Boolean(errorOnManifestCreate) === false)
                         this.warn(error, scope);
                     else
@@ -367,8 +366,6 @@ class Plugin {
         }
     }
     warn(err, scope) {
-        if (this.warned)
-            return;
         if (typeof err === 'string')
             err = new Error(err);
         process.emitWarning(this.addErrorScope(err, scope));

package/lib/interfaces/plugin.d.ts

@@ -22,6 +22,11 @@ export interface Options extends PluginOptions {
     enablePerf?: boolean;
     jitPlugins?: boolean;
     pjson?: PJSON.Plugin;
+    pluginAdditions?: {
+        core?: string[];
+        dev?: string[];
+        path?: string;
+    };
     plugins?: Map<string, Plugin>;
     userPlugins?: boolean;
     version?: string;

package/lib/module-loader.js

@@ -14,6 +14,12 @@ const getPackageType = require('get-package-type');
 // eslint-disable-next-line camelcase
 const s_EXTENSIONS = ['.ts', '.js', '.mjs', '.cjs', '.mts', '.cts'];
 const isPlugin = (config) => config.type !== undefined;
+function handleError(error, isESM, path) {
+    if (error.code === 'MODULE_NOT_FOUND' || error.code === 'ERR_MODULE_NOT_FOUND') {
+        throw new errors_1.ModuleLoadError(`${isESM ? 'import()' : 'require'} failed to load ${path}: ${error.message}`);
+    }
+    throw error;
+}
 /**
  * Loads and returns a module.
  *
@@ -39,10 +45,7 @@ async function load(config, modulePath) {
         return (isESM ? await import((0, node_url_1.pathToFileURL)(filePath).href) : require(filePath));
     }
     catch (error) {
-        if (error.code === 'MODULE_NOT_FOUND' || error.code === 'ERR_MODULE_NOT_FOUND') {
-            throw new errors_1.ModuleLoadError(`${isESM ? 'import()' : 'require'} failed to load ${filePath || modulePath}`);
-        }
-        throw error;
+        handleError(error, isESM, filePath ?? modulePath);
     }
 }
 exports.load = load;
@@ -73,10 +76,7 @@ async function loadWithData(config, modulePath) {
         return { filePath, isESM, module };
     }
     catch (error) {
-        if (error.code === 'MODULE_NOT_FOUND' || error.code === 'ERR_MODULE_NOT_FOUND') {
-            throw new errors_1.ModuleLoadError(`${isESM ? 'import()' : 'require'} failed to load ${filePath || modulePath}: ${error.message}`);
-        }
-        throw error;
+        handleError(error, isESM, filePath ?? modulePath);
     }
 }
 exports.loadWithData = loadWithData;
@@ -109,10 +109,7 @@ async function loadWithDataFromManifest(cached, modulePath) {
         return { filePath, isESM, module };
     }
     catch (error) {
-        if (error.code === 'MODULE_NOT_FOUND' || error.code === 'ERR_MODULE_NOT_FOUND') {
-            throw new errors_1.ModuleLoadError(`${isESM ? 'import()' : 'require'} failed to load ${filePath || modulePath}: ${error.message}`);
-        }
-        throw error;
+        handleError(error, isESM, filePath ?? modulePath);
     }
 }
 exports.loadWithDataFromManifest = loadWithDataFromManifest;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "3.21.1",
+  "version": "3.22.0",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -21,6 +21,7 @@
     "indent-string": "^4.0.0",
     "is-wsl": "^2.2.0",
     "js-yaml": "^3.14.1",
+    "minimatch": "^9.0.3",
     "natural-orderby": "^2.0.3",
     "object-treeify": "^1.1.33",
     "password-prompt": "^1.1.3",