@oclif/core 3.20.1-dev.0 → 3.21.0

package/lib/cache.d.ts

@@ -1,14 +1,14 @@
 import { PJSON, Plugin } from './interfaces';
+type OclifCoreInfo = {
+    name: string;
+    version: string;
+};
 type CacheContents = {
     rootPlugin: Plugin;
     exitCodes: PJSON.Plugin['oclif']['exitCodes'];
     '@oclif/core': OclifCoreInfo;
 };
 type ValueOf<T> = T[keyof T];
-type OclifCoreInfo = {
-    name: string;
-    version: string;
-};
 /**
  * A simple cache for storing values that need to be accessed globally.
  */

package/lib/cli-ux/styled/table.js

@@ -155,7 +155,7 @@ class Table {
     getCSVRow(d) {
         const values = this.columns.map((col) => d[col.key] || '');
         const lineToBeEscaped = values.find((e) => e.includes('"') || e.includes('\n') || e.includes('\r\n') || e.includes('\r') || e.includes(','));
-        return values.map((e) => (lineToBeEscaped ? `"${e.replace('"', '""')}"` : e));
+        return values.map((e) => (lineToBeEscaped ? `"${e.replaceAll('"', '""')}"` : e));
     }
     outputCSV() {
         const { columns, data, options } = this;

package/lib/config/config.js

@@ -263,7 +263,7 @@ class Config {
             (settings_1.settings.performanceEnabled === undefined ? this.options.enablePerf : settings_1.settings.performanceEnabled) ?? false;
         const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, 'config.load');
         this.pluginLoader = new plugin_loader_1.default({ plugins: this.options.plugins, root: this.options.root });
-        this.rootPlugin = await this.pluginLoader.loadRoot();
+        this.rootPlugin = await this.pluginLoader.loadRoot({ pjson: this.options.pjson });
         // Cache the root plugin so that we can reference it later when determining if
         // we should skip ts-node registration for an ESM plugin.
         const cache = cache_1.default.getInstance();

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

@@ -1,3 +1,4 @@
+import { PJSON } from '../interfaces';
 import { Plugin as IPlugin } from '../interfaces/plugin';
 type PluginLoaderOptions = {
     plugins?: IPlugin[] | PluginsMap;
@@ -21,7 +22,9 @@ export default class PluginLoader {
         errors: (Error | string)[];
         plugins: PluginsMap;
     }>;
-    loadRoot(): Promise<IPlugin>;
+    loadRoot({ pjson }: {
+        pjson?: PJSON.Plugin;
+    }): Promise<IPlugin>;
     private loadCorePlugins;
     private loadDevPlugins;
     private loadPlugins;

package/lib/config/plugin-loader.js

@@ -51,7 +51,7 @@ class PluginLoader {
         }
         return { errors: this.errors, plugins: this.plugins };
     }
-    async loadRoot() {
+    async loadRoot({ pjson }) {
         let rootPlugin;
         if (this.pluginsProvided) {
             const plugins = [...this.plugins.values()];
@@ -59,7 +59,7 @@ class PluginLoader {
         }
         else {
             const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, 'plugin.load#root');
-            rootPlugin = new Plugin.Plugin({ isRoot: true, root: this.options.root });
+            rootPlugin = new Plugin.Plugin({ isRoot: true, pjson, root: this.options.root });
             await rootPlugin.load();
             marker?.addDetails({
                 commandCount: rootPlugin.commands.length,

package/lib/config/plugin.js

@@ -175,19 +175,22 @@ class Plugin {
         // Linked plugins already have a root so there's no need to search for it.
         // However there could be child plugins nested inside the linked plugin, in which
         // case we still need to search for the child plugin's root.
-        const root = this.type === 'link' && !this.parent ? this.options.root : await (0, find_root_1.findRoot)(this.options.name, this.options.root);
+        const root = this.options.pjson && this.options.isRoot
+            ? this.options.root
+            : this.type === 'link' && !this.parent
+                ? this.options.root
+                : await (0, find_root_1.findRoot)(this.options.name, this.options.root);
         if (!root)
             throw new errors_1.CLIError(`could not find package.json with ${(0, node_util_1.inspect)(this.options)}`);
         this.root = root;
         this._debug(`loading ${this.type} plugin from ${root}`);
-        this.pjson = await (0, fs_1.readJson)((0, node_path_1.join)(root, 'package.json'));
+        this.pjson = this.options.pjson ?? (await (0, fs_1.readJson)((0, node_path_1.join)(root, 'package.json')));
         this.flexibleTaxonomy = this.options?.flexibleTaxonomy || this.pjson.oclif?.flexibleTaxonomy || false;
         this.moduleType = this.pjson.type === 'module' ? 'module' : 'commonjs';
         this.name = this.pjson.name;
         this.alias = this.options.name ?? this.pjson.name;
-        const pjsonPath = (0, node_path_1.join)(root, 'package.json');
         if (!this.name)
-            throw new errors_1.CLIError(`no name in ${pjsonPath}`);
+            throw new errors_1.CLIError(`no name in package.json (${root})`);
         // eslint-disable-next-line new-cap
         this._debug = (0, util_2.Debug)(this.name);
         this.version = this.pjson.version;
@@ -364,7 +367,6 @@ class Plugin {
         }
     }
     warn(err, scope) {
-        console.trace();
         if (this.warned)
             return;
         if (typeof err === 'string')

package/lib/execute.d.ts

@@ -42,6 +42,6 @@ import { LoadOptions } from './interfaces';
 export declare function execute(options: {
     args?: string[];
     development?: boolean;
-    dir: string;
+    dir?: string;
     loadOptions?: LoadOptions;
 }): Promise<unknown>;

package/lib/execute.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.execute = void 0;
 const flush_1 = require("./cli-ux/flush");
+const errors_1 = require("./errors");
 const handle_1 = require("./errors/handle");
 const main_1 = require("./main");
 const settings_1 = require("./settings");
@@ -46,6 +47,9 @@ const settings_1 = require("./settings");
  * ```
  */
 async function execute(options) {
+    if (!options.dir && !options.loadOptions) {
+        throw new errors_1.CLIError('dir or loadOptions is required.');
+    }
     if (options.development) {
         // In dev mode -> use ts-node and dev plugins
         process.env.NODE_ENV = 'development';

package/lib/interfaces/plugin.d.ts

@@ -9,6 +9,7 @@ export interface PluginOptions {
     isRoot?: boolean;
     name?: string;
     parent?: Plugin;
+    pjson?: PJSON.Plugin;
     respectNoCacheDefault?: boolean;
     root: string;
     tag?: string;
@@ -20,6 +21,7 @@ export interface Options extends PluginOptions {
     devPlugins?: boolean;
     enablePerf?: boolean;
     jitPlugins?: boolean;
+    pjson?: PJSON.Plugin;
     plugins?: Map<string, Plugin>;
     userPlugins?: boolean;
     version?: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "3.20.1-dev.0",
+  "version": "3.21.0",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -38,7 +38,7 @@
     "@oclif/plugin-help": "^6",
     "@oclif/plugin-plugins": "^4",
     "@oclif/prettier-config": "^0.2.1",
-    "@oclif/test": "^3.1.16",
+    "@oclif/test": "^3.2.1",
     "@types/ansi-styles": "^3.2.1",
     "@types/benchmark": "^2.1.5",
     "@types/chai": "^4.3.11",
@@ -63,7 +63,7 @@
     "chai-as-promised": "^7.1.1",
     "commitlint": "^17.8.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-oclif": "^5.0.2",
     "eslint-config-oclif-typescript": "^3.0.48",
     "eslint-config-prettier": "^9.1.0",