@oclif/core 3.0.0-beta.21 → 3.0.0-beta.23

package/lib/cli-ux/index.d.ts

@@ -15,7 +15,7 @@ export declare class ux {
     static get action(): ActionBase;
     static styledObject(obj: any, keys?: string[]): void;
     static styledHeader(header: string): void;
-    static get styledJSON(): typeof styled.styledJSON;
+    static styledJSON(obj: unknown): void;
     static get table(): typeof styled.Table.table;
     static get tree(): typeof styled.tree;
     static get wait(): typeof uxWait;
@@ -29,7 +29,7 @@ export declare class ux {
     static annotation(text: string, annotation: string): void;
     static flush(ms?: number): Promise<void>;
 }
-declare const action: ActionBase, annotation: typeof ux.annotation, anykey: typeof uxPrompt.anykey, confirm: typeof uxPrompt.confirm, debug: typeof ux.debug, done: typeof ux.done, flush: typeof ux.flush, info: typeof ux.info, log: typeof ux.log, progress: typeof styled.progress, prompt: typeof uxPrompt.prompt, styledHeader: typeof ux.styledHeader, styledJSON: typeof styled.styledJSON, styledObject: typeof ux.styledObject, table: typeof styled.Table.table, trace: typeof ux.trace, tree: typeof styled.tree, url: typeof ux.url, wait: (ms?: number) => Promise<void>;
+declare const action: ActionBase, annotation: typeof ux.annotation, anykey: typeof uxPrompt.anykey, confirm: typeof uxPrompt.confirm, debug: typeof ux.debug, done: typeof ux.done, flush: typeof ux.flush, info: typeof ux.info, log: typeof ux.log, progress: typeof styled.progress, prompt: typeof uxPrompt.prompt, styledHeader: typeof ux.styledHeader, styledJSON: typeof ux.styledJSON, styledObject: typeof ux.styledObject, table: typeof styled.Table.table, trace: typeof ux.trace, tree: typeof styled.tree, url: typeof ux.url, wait: (ms?: number) => Promise<void>;
 declare const error: typeof Errors.error, exit: typeof Errors.exit, warn: typeof Errors.warn;
 export { action, annotation, anykey, confirm, debug, done, error, exit, flush, info, log, progress, prompt, styledHeader, styledJSON, styledObject, table, trace, tree, url, wait, warn, };
 export { ExitError } from './exit';

package/lib/cli-ux/index.js

@@ -35,8 +35,15 @@ class ux {
     static styledHeader(header) {
         this.info(chalk_1.default.dim('=== ') + chalk_1.default.bold(header) + '\n');
     }
-    static get styledJSON() {
-        return styled.styledJSON;
+    static styledJSON(obj) {
+        const json = JSON.stringify(obj, null, 2);
+        if (!chalk_1.default.level) {
+            info(json);
+            return;
+        }
+        const cardinal = require('cardinal');
+        const theme = require('cardinal/themes/jq');
+        this.info(cardinal.highlight(json, { json: true, theme }));
     }
     static get table() {
         return styled.Table.table;

package/lib/cli-ux/styled/index.d.ts

@@ -1,5 +1,4 @@
 export * as Table from './table';
 export { default as progress } from './progress';
-export { default as styledJSON } from './json';
 export { default as styledObject } from './object';
 export { default as tree } from './tree';

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

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tree = exports.styledObject = exports.styledJSON = exports.progress = exports.Table = void 0;
+exports.tree = exports.styledObject = exports.progress = exports.Table = void 0;
 const tslib_1 = require("tslib");
 exports.Table = tslib_1.__importStar(require("./table"));
 var progress_1 = require("./progress");
 Object.defineProperty(exports, "progress", { enumerable: true, get: function () { return tslib_1.__importDefault(progress_1).default; } });
-var json_1 = require("./json");
-Object.defineProperty(exports, "styledJSON", { enumerable: true, get: function () { return tslib_1.__importDefault(json_1).default; } });
 var object_1 = require("./object");
 Object.defineProperty(exports, "styledObject", { enumerable: true, get: function () { return tslib_1.__importDefault(object_1).default; } });
 var tree_1 = require("./tree");

package/lib/config/config.js

@@ -5,12 +5,12 @@ const tslib_1 = require("tslib");
 const ejs = tslib_1.__importStar(require("ejs"));
 const errors_1 = require("../errors");
 const util_1 = require("./util");
+const performance_1 = require("../performance");
 const node_url_1 = require("node:url");
 const node_os_1 = require("node:os");
 const util_2 = require("../util/util");
 const os_1 = require("../util/os");
 const node_path_1 = require("node:path");
-const performance_1 = require("../performance");
 const plugin_loader_1 = tslib_1.__importDefault(require("./plugin-loader"));
 const is_wsl_1 = tslib_1.__importDefault(require("is-wsl"));
 const node_util_1 = require("node:util");
@@ -132,9 +132,8 @@ class Config {
     }
     // eslint-disable-next-line complexity
     async load() {
-        settings_1.settings.performanceEnabled =
-            (settings_1.settings.performanceEnabled === undefined ? this.options.enablePerf : settings_1.settings.performanceEnabled) ?? false;
-        const marker = performance_1.Performance.mark('config.load');
+        settings_1.settings.performanceEnabled = (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({ root: this.options.root, plugins: this.options.plugins });
         Config._rootPlugin = await this.pluginLoader.loadRoot();
         this.root = Config._rootPlugin.root;
@@ -204,7 +203,7 @@ class Config {
         marker?.stop();
     }
     async loadPluginsAndCommands(opts) {
-        const pluginsMarker = performance_1.Performance.mark('config.loadAllPlugins');
+        const pluginsMarker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, 'config.loadAllPlugins');
         const { plugins, errors } = await this.pluginLoader.loadChildren({
             devPlugins: this.options.devPlugins,
             userPlugins: this.options.userPlugins,
@@ -214,7 +213,7 @@ class Config {
         });
         this.plugins = plugins;
         pluginsMarker?.stop();
-        const commandsMarker = performance_1.Performance.mark('config.loadAllCommands');
+        const commandsMarker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, 'config.loadAllCommands');
         for (const plugin of this.plugins.values()) {
             this.loadCommands(plugin);
             this.loadTopics(plugin);
@@ -225,7 +224,7 @@ class Config {
         }
     }
     async runHook(event, opts, timeout, captureErrors) {
-        const marker = performance_1.Performance.mark(`config.runHook#${event}`);
+        const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, `config.runHook#${event}`);
         debug('start %s hook', event);
         const search = (m) => {
             if (typeof m === 'function')
@@ -270,7 +269,7 @@ class Config {
             };
             const hooks = p.hooks[event] || [];
             for (const hook of hooks) {
-                const marker = performance_1.Performance.mark(`config.runHook#${p.name}(${hook})`);
+                const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, `config.runHook#${p.name}(${hook})`);
                 try {
                     /* eslint-disable no-await-in-loop */
                     const { isESM, module, filePath } = await (0, module_loader_1.loadWithData)(p, (0, node_path_1.join)(p.root, hook));
@@ -304,7 +303,7 @@ class Config {
         return final;
     }
     async runCommand(id, argv = [], cachedCommand = null) {
-        const marker = performance_1.Performance.mark(`config.runCommand#${id}`);
+        const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, `config.runCommand#${id}`);
         debug('runCommand %s %o', id, argv);
         let c = cachedCommand ?? this.findCommand(id);
         if (!c) {
@@ -586,7 +585,7 @@ class Config {
         return id;
     }
     loadCommands(plugin) {
-        const marker = performance_1.Performance.mark(`config.loadCommands#${plugin.name}`, { plugin: plugin.name });
+        const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, `config.loadCommands#${plugin.name}`, { plugin: plugin.name });
         for (const command of plugin.commands) {
             // set canonical command id
             if (this._commands.has(command.id)) {
@@ -630,7 +629,7 @@ class Config {
         marker?.stop();
     }
     loadTopics(plugin) {
-        const marker = performance_1.Performance.mark(`config.loadTopics#${plugin.name}`, { plugin: plugin.name });
+        const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, `config.loadTopics#${plugin.name}`, { plugin: plugin.name });
         for (const topic of (0, util_2.compact)(plugin.topics)) {
             const existing = this._topics.get(topic.name);
             if (existing) {

package/lib/config/plugin-loader.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const Plugin = tslib_1.__importStar(require("./plugin"));
-const util_1 = require("./util");
 const performance_1 = require("../performance");
+const util_1 = require("./util");
 const util_2 = require("../util/util");
 const node_path_1 = require("node:path");
 const fs_1 = require("../util/fs");
@@ -28,7 +28,7 @@ class PluginLoader {
             rootPlugin = plugins.find((p) => p.root === this.options.root) ?? plugins[0];
         }
         else {
-            const marker = performance_1.Performance.mark('plugin.load#root');
+            const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, 'plugin.load#root');
             rootPlugin = new Plugin.Plugin({ root: this.options.root, isRoot: true });
             await rootPlugin.load();
             marker?.addDetails({
@@ -94,7 +94,7 @@ class PluginLoader {
     async loadPlugins(root, type, plugins, parent) {
         if (!plugins || plugins.length === 0)
             return;
-        const mark = performance_1.Performance.mark(`config.loadPlugins#${type}`);
+        const mark = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, `config.loadPlugins#${type}`);
         debug('loading plugins', plugins);
         await Promise.all((plugins || []).map(async (plugin) => {
             try {
@@ -113,7 +113,7 @@ class PluginLoader {
                 }
                 if (this.plugins.has(name))
                     return;
-                const pluginMarker = performance_1.Performance.mark(`plugin.load#${name}`);
+                const pluginMarker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, `plugin.load#${name}`);
                 const instance = new Plugin.Plugin(opts);
                 await instance.load();
                 pluginMarker?.addDetails({

package/lib/config/plugin.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Plugin = void 0;
 const errors_1 = require("../errors");
 const util_1 = require("./util");
+const performance_1 = require("../performance");
 const util_2 = require("../util/util");
 const node_path_1 = require("node:path");
 const fs_1 = require("../util/fs");
 const module_loader_1 = require("../module-loader");
-const performance_1 = require("../performance");
 const cache_command_1 = require("../util/cache-command");
 const node_util_1 = require("node:util");
 const globby_1 = require("globby");
@@ -179,7 +179,7 @@ class Plugin {
     get commandIDs() {
         if (!this.commandsDir)
             return [];
-        const marker = performance_1.Performance.mark(`plugin.commandIDs#${this.name}`, { plugin: this.name });
+        const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, `plugin.commandIDs#${this.name}`, { plugin: this.name });
         this._debug(`loading IDs from ${this.commandsDir}`);
         const patterns = ['**/*.+(js|cjs|mjs|ts|tsx)', '!**/*.+(d.ts|test.ts|test.js|spec.ts|spec.js)?(x)'];
         const ids = (0, globby_1.sync)(patterns, { cwd: this.commandsDir }).map((file) => {
@@ -195,7 +195,7 @@ class Plugin {
         return ids;
     }
     async findCommand(id, opts = {}) {
-        const marker = performance_1.Performance.mark(`plugin.findCommand#${this.name}.${id}`, { id, plugin: this.name });
+        const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, `plugin.findCommand#${this.name}.${id}`, { id, plugin: this.name });
         const fetch = async () => {
             if (!this.commandsDir)
                 return;
@@ -256,7 +256,7 @@ class Plugin {
                 }
             }
         };
-        const marker = performance_1.Performance.mark(`plugin.manifest#${this.name}`, { plugin: this.name });
+        const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, `plugin.manifest#${this.name}`, { plugin: this.name });
         if (!ignoreManifest) {
             const manifest = await readManifest();
             if (manifest) {

package/lib/main.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = exports.versionAddition = exports.helpAddition = void 0;
+const performance_1 = require("./performance");
 const node_url_1 = require("node:url");
 const node_util_1 = require("node:util");
 const help_1 = require("./help");
 const config_1 = require("./config");
-const performance_1 = require("./performance");
 const stream_1 = require("./cli-ux/stream");
 const debug = require('debug')('oclif:main');
 const log = (message = '', ...args) => {
@@ -34,8 +34,8 @@ const versionAddition = (argv, config) => {
 };
 exports.versionAddition = versionAddition;
 async function run(argv, options) {
-    const marker = performance_1.Performance.mark('main.run');
-    const initMarker = performance_1.Performance.mark('main.run#init');
+    const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, 'main.run');
+    const initMarker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, 'main.run#init');
     const collectPerf = async () => {
         marker?.stop();
         if (!initMarker?.stopped)

package/lib/performance.d.ts

@@ -8,21 +8,26 @@ type PerfResult = {
     scope: string | undefined;
 };
 type PerfHighlights = {
-    configLoadTime: number;
-    runTime: number;
-    initTime: number;
-    commandLoadTime: number;
-    commandRunTime: number;
+    'oclif.configLoadMs': number;
+    'oclif.runMs': number;
+    'oclif.initMs': number;
+    'oclif.commandLoadMs': number;
+    'oclif.initHookMs': number;
+    'oclif.prerunHookMs': number;
+    'oclif.postrunHookMs': number;
+    'oclif.commandRunMs': number;
+    'oclif.corePluginsLoadMs': number;
+    'oclif.userPluginsLoadMs': number;
+    'oclif.linkedPluginsLoadMs': number;
     pluginLoadTimes: Record<string, {
         duration: number;
         details: Details;
     }>;
-    corePluginsLoadTime: number;
-    userPluginsLoadTime: number;
-    linkedPluginsLoadTime: number;
     hookRunTimes: Record<string, Record<string, number>>;
 };
+export declare const OCLIF_MARKER_OWNER = "@oclif/core";
 declare class Marker {
+    owner: string;
     name: string;
     details: Details;
     module: string;
@@ -31,7 +36,7 @@ declare class Marker {
     stopped: boolean;
     private startMarker;
     private stopMarker;
-    constructor(name: string, details?: Details);
+    constructor(owner: string, name: string, details?: Details);
     addDetails(details: Details): void;
     stop(): void;
     measure(): void;
@@ -39,19 +44,21 @@ declare class Marker {
 export declare class Performance {
     private static markers;
     private static _results;
-    private static _highlights;
+    private static _oclifPerf;
     static get enabled(): boolean;
-    static get results(): PerfResult[];
-    static getResult(name: string): PerfResult | undefined;
-    static get highlights(): PerfHighlights;
+    /** returns a map of owner, PerfResult[].  Excludes oclif PerfResult, which you can get from oclifPerf */
+    static get results(): Map<string, PerfResult[]>;
+    static getResult(owner: string, name: string): PerfResult | undefined;
+    static get oclifPerf(): PerfHighlights | Record<string, never>;
     /**
      * Add a new performance marker
      *
+     * @param owner An npm package like `@oclif/core` or `@salesforce/source-tracking`
      * @param name Name of the marker. Use `module.method#scope` format
      * @param details Arbitrary details to attach to the marker
      * @returns Marker instance
      */
-    static mark(name: string, details?: Details): Marker | undefined;
+    static mark(owner: string, name: string, details?: Details): Marker | undefined;
     /**
      * Collect performance results into static Performance.results
      *

package/lib/performance.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Performance = void 0;
+exports.Performance = exports.OCLIF_MARKER_OWNER = void 0;
 const node_perf_hooks_1 = require("node:perf_hooks");
 const settings_1 = require("./settings");
+exports.OCLIF_MARKER_OWNER = '@oclif/core';
 class Marker {
+    owner;
     name;
     details;
     module;
@@ -12,7 +14,8 @@ class Marker {
     stopped = false;
     startMarker;
     stopMarker;
-    constructor(name, details = {}) {
+    constructor(owner, name, details = {}) {
+        this.owner = owner;
         this.name = name;
         this.details = details;
         this.startMarker = `${this.name}-start`;
@@ -36,41 +39,43 @@ class Marker {
     }
 }
 class Performance {
-    static markers = {};
-    static _results = [];
-    static _highlights;
+    /* Key: marker.name */
+    static markers = new Map();
+    /* Key: marker.owner */
+    static _results = new Map();
+    static _oclifPerf;
     static get enabled() {
         return settings_1.settings.performanceEnabled ?? false;
     }
+    /** returns a map of owner, PerfResult[].  Excludes oclif PerfResult, which you can get from oclifPerf */
     static get results() {
         if (!Performance.enabled)
-            return [];
-        if (Performance._results.length > 0)
-            return Performance._results;
-        throw new Error('Perf results not available. Did you forget to call await Performance.collect()?');
+            return new Map();
+        return new Map([...Performance._results.entries()].filter(([owner]) => owner !== exports.OCLIF_MARKER_OWNER));
     }
-    static getResult(name) {
-        return Performance.results.find((r) => r.name === name);
+    static getResult(owner, name) {
+        return Performance._results.get(owner)?.find(r => r.name === name);
     }
-    static get highlights() {
+    static get oclifPerf() {
         if (!Performance.enabled)
             return {};
-        if (Performance._highlights)
-            return Performance._highlights;
+        if (Performance._oclifPerf)
+            return Performance._oclifPerf;
         throw new Error('Perf results not available. Did you forget to call await Performance.collect()?');
     }
     /**
      * Add a new performance marker
      *
+     * @param owner An npm package like `@oclif/core` or `@salesforce/source-tracking`
      * @param name Name of the marker. Use `module.method#scope` format
      * @param details Arbitrary details to attach to the marker
      * @returns Marker instance
      */
-    static mark(name, details = {}) {
+    static mark(owner, name, details = {}) {
         if (!Performance.enabled)
             return;
-        const marker = new Marker(name, details);
-        Performance.markers[marker.name] = marker;
+        const marker = new Marker(owner, name, details);
+        Performance.markers.set(marker.name, marker);
         return marker;
     }
     /**
@@ -81,9 +86,9 @@ class Performance {
     static async collect() {
         if (!Performance.enabled)
             return;
-        if (Performance._results.length > 0)
+        if (Performance._results.size > 0)
             return;
-        const markers = Object.values(Performance.markers);
+        const markers = [...Performance.markers.values()];
         if (markers.length === 0)
             return;
         for (const marker of markers.filter((m) => !m.stopped)) {
@@ -92,28 +97,28 @@ class Performance {
         return new Promise((resolve) => {
             const perfObserver = new node_perf_hooks_1.PerformanceObserver((items) => {
                 for (const entry of items.getEntries()) {
-                    if (Performance.markers[entry.name]) {
-                        const marker = Performance.markers[entry.name];
-                        Performance._results.push({
+                    const marker = Performance.markers.get(entry.name);
+                    if (marker) {
+                        const result = {
                             name: entry.name,
                             module: marker.module,
                             method: marker.method,
                             scope: marker.scope,
                             duration: entry.duration,
                             details: marker.details,
-                        });
+                        };
+                        const existing = Performance._results.get(marker.owner) ?? [];
+                        Performance._results.set(marker.owner, [...existing, result]);
                     }
                 }
-                const command = Performance.results.find((r) => r.name.startsWith('config.runCommand'));
-                const commandLoadTime = command
-                    ? Performance.getResult(`plugin.findCommand#${command.details.plugin}.${command.details.command}`)
-                        ?.duration ?? 0
-                    : 0;
-                const pluginLoadTimes = Object.fromEntries(Performance.results
+                const oclifResults = Performance._results.get(exports.OCLIF_MARKER_OWNER) ?? [];
+                const command = oclifResults.find(r => r.name.startsWith('config.runCommand'));
+                const commandLoadTime = command ? Performance.getResult(exports.OCLIF_MARKER_OWNER, `plugin.findCommand#${command.details.plugin}.${command.details.command}`)?.duration ?? 0 : 0;
+                const pluginLoadTimes = Object.fromEntries(oclifResults
                     .filter(({ name }) => name.startsWith('plugin.load#'))
                     .sort((a, b) => b.duration - a.duration)
                     .map(({ scope, duration, details }) => [scope, { duration, details }]));
-                const hookRunTimes = Performance.results
+                const hookRunTimes = oclifResults
                     .filter(({ name }) => name.startsWith('config.runHook#'))
                     .reduce((acc, perfResult) => {
                     const event = perfResult.details.event;
@@ -130,22 +135,24 @@ class Performance {
                     }
                     return acc;
                 }, {});
-                const pluginLoadTimeByType = Object.fromEntries(Performance.results
+                const pluginLoadTimeByType = Object.fromEntries(oclifResults
                     .filter(({ name }) => name.startsWith('config.loadPlugins#'))
                     .sort((a, b) => b.duration - a.duration)
                     .map(({ scope, duration }) => [scope, duration]));
-                const commandRunTime = Performance.results.find(({ name }) => name.startsWith('config.runCommand#'))?.duration ?? 0;
-                Performance._highlights = {
-                    configLoadTime: Performance.getResult('config.load')?.duration ?? 0,
-                    runTime: Performance.getResult('main.run')?.duration ?? 0,
-                    initTime: Performance.getResult('main.run#init')?.duration ?? 0,
-                    commandRunTime,
-                    commandLoadTime,
+                Performance._oclifPerf = {
+                    'oclif.configLoadMs': Performance.getResult(exports.OCLIF_MARKER_OWNER, 'config.load')?.duration ?? 0,
+                    'oclif.runMs': Performance.getResult(exports.OCLIF_MARKER_OWNER, 'main.run')?.duration ?? 0,
+                    'oclif.initMs': Performance.getResult(exports.OCLIF_MARKER_OWNER, 'main.run#init')?.duration ?? 0,
+                    'oclif.commandRunMs': oclifResults.find(({ name }) => name.startsWith('config.runCommand#'))?.duration ?? 0,
+                    'oclif.commandLoadMs': commandLoadTime,
+                    'oclif.corePluginsLoadMs': pluginLoadTimeByType.core ?? 0,
+                    'oclif.userPluginsLoadMs': pluginLoadTimeByType.user ?? 0,
+                    'oclif.linkedPluginsLoadMs': pluginLoadTimeByType.link ?? 0,
+                    'oclif.postrunHookMs': hookRunTimes.postrun?.total ?? 0,
+                    'oclif.prerunHookMs': hookRunTimes.prerun?.total ?? 0,
+                    'oclif.initHookMs': hookRunTimes.init?.total ?? 0,
                     pluginLoadTimes,
                     hookRunTimes,
-                    corePluginsLoadTime: pluginLoadTimeByType.core ?? 0,
-                    userPluginsLoadTime: pluginLoadTimeByType.user ?? 0,
-                    linkedPluginsLoadTime: pluginLoadTimeByType.link ?? 0,
                 };
                 resolve();
             });
@@ -168,33 +175,44 @@ class Performance {
     static debug() {
         if (!Performance.enabled)
             return;
-        const debug = require('debug')('perf');
-        debug('Total Time: %sms', Performance.highlights.runTime.toFixed(4));
-        debug('Init Time: %sms', Performance.highlights.initTime.toFixed(4));
-        debug('Config Load Time: %sms', Performance.highlights.configLoadTime.toFixed(4));
-        debug('  • Plugins Load Time: %sms', Performance.getResult('config.loadAllPlugins')?.duration.toFixed(4) ?? 0);
-        debug('  • Commands Load Time: %sms', Performance.getResult('config.loadAllCommands')?.duration.toFixed(4) ?? 0);
-        debug('Core Plugin Load Time: %sms', Performance.highlights.corePluginsLoadTime.toFixed(4));
-        debug('User Plugin Load Time: %sms', Performance.highlights.userPluginsLoadTime.toFixed(4));
-        debug('Linked Plugin Load Time: %sms', Performance.highlights.linkedPluginsLoadTime.toFixed(4));
-        debug('Plugin Load Times:');
-        for (const [plugin, result] of Object.entries(Performance.highlights.pluginLoadTimes)) {
+        const oclifDebug = require('debug')('oclif-perf');
+        oclifDebug('Total Time: %sms', Performance.oclifPerf['oclif.runMs'].toFixed(4));
+        oclifDebug('Init Time: %sms', Performance.oclifPerf['oclif.initMs'].toFixed(4));
+        oclifDebug('Config Load Time: %sms', Performance.oclifPerf['oclif.configLoadMs'].toFixed(4));
+        oclifDebug('  • Plugins Load Time: %sms', Performance.getResult(exports.OCLIF_MARKER_OWNER, 'config.loadAllPlugins')?.duration.toFixed(4) ?? 0);
+        oclifDebug('  • Commands Load Time: %sms', Performance.getResult(exports.OCLIF_MARKER_OWNER, 'config.loadAllCommands')?.duration.toFixed(4) ?? 0);
+        oclifDebug('Core Plugin Load Time: %sms', Performance.oclifPerf['oclif.corePluginsLoadMs'].toFixed(4));
+        oclifDebug('User Plugin Load Time: %sms', Performance.oclifPerf['oclif.userPluginsLoadMs'].toFixed(4));
+        oclifDebug('Linked Plugin Load Time: %sms', Performance.oclifPerf['oclif.linkedPluginsLoadMs'].toFixed(4));
+        oclifDebug('Plugin Load Times:');
+        for (const [plugin, result] of Object.entries(Performance.oclifPerf.pluginLoadTimes)) {
             if (result.details.hasManifest) {
-                debug(`  ${plugin}: ${result.duration.toFixed(4)}ms`);
+                oclifDebug(`  ${plugin}: ${result.duration.toFixed(4)}ms`);
             }
             else {
-                debug(`  ${plugin}: ${result.duration.toFixed(4)}ms (no manifest!)`);
+                oclifDebug(`  ${plugin}: ${result.duration.toFixed(4)}ms (no manifest!)`);
             }
         }
-        debug('Hook Run Times:');
-        for (const [event, runTimes] of Object.entries(Performance.highlights.hookRunTimes)) {
-            debug(`  ${event}:`);
+        oclifDebug('Hook Run Times:');
+        for (const [event, runTimes] of Object.entries(Performance.oclifPerf.hookRunTimes)) {
+            oclifDebug(`  ${event}:`);
             for (const [plugin, duration] of Object.entries(runTimes)) {
-                debug(`    ${plugin}: ${duration.toFixed(4)}ms`);
+                oclifDebug(`    ${plugin}: ${duration.toFixed(4)}ms`);
+            }
+        }
+        oclifDebug('Command Load Time: %sms', Performance.oclifPerf['oclif.commandLoadMs'].toFixed(4));
+        oclifDebug('Command Run Time: %sms', Performance.oclifPerf['oclif.commandRunMs'].toFixed(4));
+        const nonCoreDebug = require('debug')('non-oclif-perf');
+        const nonCorePerf = Performance.results;
+        if (nonCorePerf.size > 0) {
+            nonCoreDebug('Non-Core Performance Measurements:');
+            for (const [owner, results] of nonCorePerf) {
+                nonCoreDebug(`  ${owner}:`);
+                for (const result of results) {
+                    nonCoreDebug(`    ${result.name}: ${result.duration.toFixed(4)}ms`);
+                }
             }
         }
-        debug('Command Load Time: %sms', Performance.highlights.commandLoadTime.toFixed(4));
-        debug('Command Run Time: %sms', Performance.highlights.commandRunTime.toFixed(4));
     }
 }
 exports.Performance = Performance;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "3.0.0-beta.21",
+  "version": "3.0.0-beta.23",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -59,7 +59,7 @@
     "chai-as-promised": "^7.1.1",
     "commitlint": "^17.7.2",
     "cross-env": "^7.0.3",
-    "eslint": "^8.49.0",
+    "eslint": "^8.50.0",
     "eslint-config-oclif": "^5.0.0",
     "eslint-config-oclif-typescript": "^2.0.1",
     "eslint-config-prettier": "^9.0.0",

package/lib/cli-ux/styled/json.d.ts

@@ -1 +0,0 @@
-export default function styledJSON(obj: unknown): void;

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

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const node_util_1 = require("node:util");
-const stream_1 = require("../stream");
-const info = (output) => stream_1.stdout.write((0, node_util_1.format)(output) + '\n');
-function styledJSON(obj) {
-    const json = JSON.stringify(obj, null, 2);
-    if (!chalk_1.default.level) {
-        info(json);
-        return;
-    }
-    const cardinal = require('cardinal');
-    const theme = require('cardinal/themes/jq');
-    info(cardinal.highlight(json, { json: true, theme }));
-}
-exports.default = styledJSON;