@oclif/core 3.0.0-beta.13 → 3.0.0-beta.14

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

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.progress = exports.tree = exports.Table = exports.styledObject = exports.styledJSON = void 0;
-const json_1 = require("./json");
-exports.styledJSON = json_1.default;
-const object_1 = require("./object");
-exports.styledObject = object_1.default;
-const Table = require("./table");
-exports.Table = Table;
-const tree_1 = require("./tree");
-exports.tree = tree_1.default;
-const progress_1 = require("./progress");
-exports.progress = progress_1.default;
+exports.tree = exports.styledObject = exports.styledJSON = 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");
+Object.defineProperty(exports, "tree", { enumerable: true, get: function () { return tslib_1.__importDefault(tree_1).default; } });

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

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const chalk = require("chalk");
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const index_1 = require("../../index");
 function styledJSON(obj) {
     const json = JSON.stringify(obj, null, 2);
-    if (!chalk.level) {
+    if (!chalk_1.default.level) {
         index_1.ux.info(json);
         return;
     }

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const chalk = require("chalk");
-const util = require("util");
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const node_util_1 = require("node:util");
 function styledObject(obj, keys) {
     const output = [];
     const keyLengths = Object.keys(obj).map(key => key.toString().length);
@@ -12,14 +12,12 @@ function styledObject(obj, keys) {
             return obj;
         if (typeof obj === 'object') {
             return Object.keys(obj)
-                .map(k => k + ': ' + util.inspect(obj[k]))
+                .map(k => k + ': ' + (0, node_util_1.inspect)(obj[k]))
                 .join(', ');
         }
-        return util.inspect(obj);
+        return (0, node_util_1.inspect)(obj);
     }
-    const logKeyValue = (key, value) => {
-        return `${chalk.blue(key)}:` + ' '.repeat(maxKeyLength - key.length - 1) + pp(value);
-    };
+    const logKeyValue = (key, value) => `${chalk_1.default.blue(key)}:` + ' '.repeat(maxKeyLength - key.length - 1) + pp(value);
     for (const key of keys || Object.keys(obj).sort()) {
         const value = obj[key];
         if (Array.isArray(value)) {

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

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.table = void 0;
-const F = require("../../flags");
-const screen_1 = require("../../screen");
-const chalk = require("chalk");
+const tslib_1 = require("tslib");
+const F = tslib_1.__importStar(require("../../flags"));
 const util_1 = require("../../util");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const node_util_1 = require("node:util");
+const natural_orderby_1 = require("natural-orderby");
 const js_yaml_1 = require("js-yaml");
-const util_2 = require("util");
+const slice_ansi_1 = tslib_1.__importDefault(require("slice-ansi"));
 const stream_1 = require("../stream");
-const sw = require('string-width');
-const { orderBy } = require('natural-orderby');
-const sliceAnsi = require('slice-ansi');
+const screen_1 = require("../../screen");
+const string_width_1 = tslib_1.__importDefault(require("string-width"));
 class Table {
     constructor(data, columns, options = {}) {
         this.data = data;
@@ -20,8 +21,8 @@ class Table {
             const extended = col.extended ?? false;
             // turn null and undefined into empty strings by default
             const get = col.get ?? ((row) => row[key] ?? '');
-            const header = typeof col.header === 'string' ? col.header : (0, util_1.capitalize)(key.replace(/_/g, ' '));
-            const minWidth = Math.max(col.minWidth ?? 0, sw(header) + 1);
+            const header = typeof col.header === 'string' ? col.header : (0, util_1.capitalize)(key.replaceAll('_', ' '));
+            const minWidth = Math.max(col.minWidth ?? 0, (0, string_width_1.default)(header) + 1);
             return {
                 extended,
                 get,
@@ -52,14 +53,13 @@ class Table {
             for (const col of this.columns) {
                 let val = col.get(d);
                 if (typeof val !== 'string')
-                    val = (0, util_2.inspect)(val, { breakLength: Number.POSITIVE_INFINITY });
+                    val = (0, node_util_1.inspect)(val, { breakLength: Number.POSITIVE_INFINITY });
                 row[col.key] = val;
             }
             return row;
         });
         // filter rows
         if (this.options.filter) {
-            /* eslint-disable-next-line prefer-const */
             let [header, regex] = this.options.filter.split('=');
             const isNot = header[0] === '-';
             if (isNot)
@@ -78,11 +78,9 @@ class Table {
         if (this.options.sort) {
             const sorters = this.options.sort.split(',');
             const sortHeaders = sorters.map(k => k[0] === '-' ? k.slice(1) : k);
-            const sortKeys = this.filterColumnsFromHeaders(sortHeaders).map(c => {
-                return ((v) => v[c.key]);
-            });
+            const sortKeys = this.filterColumnsFromHeaders(sortHeaders).map(c => ((v) => v[c.key]));
             const sortKeysOrder = sorters.map(k => k[0] === '-' ? 'desc' : 'asc');
-            rows = orderBy(rows, sortKeys, sortKeysOrder);
+            rows = (0, natural_orderby_1.orderBy)(rows, sortKeys, sortKeysOrder);
         }
         // and filter columns
         if (this.options.columns) {
@@ -95,17 +93,21 @@ class Table {
         }
         this.data = rows;
         switch (this.options.output) {
-            case 'csv':
+            case 'csv': {
                 this.outputCSV();
                 break;
-            case 'json':
+            }
+            case 'json': {
                 this.outputJSON();
                 break;
-            case 'yaml':
+            }
+            case 'yaml': {
                 this.outputYAML();
                 break;
-            default:
+            }
+            default: {
                 this.outputTable();
+            }
         }
     }
     findColumnFromHeader(header) {
@@ -129,15 +131,7 @@ class Table {
     }
     resolveColumnsToObjectArray() {
         const { data, columns } = this;
-        return data.map((d) => {
-            // eslint-disable-next-line unicorn/prefer-object-from-entries
-            return columns.reduce((obj, col) => {
-                return {
-                    ...obj,
-                    [col.key]: d[col.key] ?? '',
-                };
-            }, {});
-        });
+        return data.map((d) => Object.fromEntries(columns.map(col => [col.key, d[col.key] ?? ''])));
     }
     outputJSON() {
         this.options.printLine(JSON.stringify(this.resolveColumnsToObjectArray(), undefined, 2));
@@ -161,7 +155,7 @@ class Table {
         //
         // find max width for each column
         const columns = this.columns.map(c => {
-            const maxWidth = Math.max(sw('.'.padEnd(c.minWidth - 1)), sw(c.header), getWidestColumnWith(data, c.key)) + 1;
+            const maxWidth = Math.max((0, string_width_1.default)('.'.padEnd(c.minWidth - 1)), (0, string_width_1.default)(c.header), getWidestColumnWith(data, c.key)) + 1;
             return {
                 ...c,
                 maxWidth,
@@ -224,14 +218,14 @@ class Table {
                 const header = col.header;
                 headers += header.padEnd(col.width);
             }
-            options.printLine(chalk.bold(headers));
+            options.printLine(chalk_1.default.bold(headers));
             // print header dividers
             let dividers = options.rowStart;
             for (const col of columns) {
                 const divider = ''.padEnd(col.width - 1, '─') + ' ';
                 dividers += divider.padEnd(col.width);
             }
-            options.printLine(chalk.bold(dividers));
+            options.printLine(chalk_1.default.bold(dividers));
         }
         // print rows
         for (const row of data) {
@@ -255,16 +249,16 @@ class Table {
                     const width = col.width;
                     let d = row[col.key];
                     d = d.split('\n')[i] || '';
-                    const visualWidth = sw(d);
+                    const visualWidth = (0, string_width_1.default)(d);
                     const colorWidth = (d.length - visualWidth);
                     let cell = d.padEnd(width + colorWidth);
                     if ((cell.length - colorWidth) > width || visualWidth === width) {
                         // truncate the cell, preserving ANSI escape sequences, and keeping
                         // into account the width of fullwidth unicode characters
-                        cell = sliceAnsi(cell, 0, width - 2) + '… ';
+                        cell = (0, slice_ansi_1.default)(cell, 0, width - 2) + '… ';
                         // pad with spaces; this is necessary in case the original string
                         // contained fullwidth characters which cannot be split
-                        cell += ' '.repeat(width - sw(cell));
+                        cell += ' '.repeat(width - (0, string_width_1.default)(cell));
                     }
                     l += cell;
                 }
@@ -292,7 +286,6 @@ exports.table = table;
         'no-truncate': F.boolean({ exclusive: ['csv'], description: 'do not truncate output to fit screen' }),
         'no-header': F.boolean({ exclusive: ['csv'], description: 'hide table header from output' }),
     };
-    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     function flags(opts) {
         if (opts) {
             const f = {};
@@ -308,13 +301,11 @@ exports.table = table;
         return table.Flags;
     }
     table.flags = flags;
-})(table = exports.table || (exports.table = {}));
-const getWidestColumnWith = (data, columnKey) => {
-    return data.reduce((previous, current) => {
-        const d = current[columnKey];
-        // convert multi-line cell to single longest line
-        // for width calculations
-        const manyLines = d.split('\n');
-        return Math.max(previous, manyLines.length > 1 ? Math.max(...manyLines.map((r) => sw(r))) : sw(d));
-    }, 0);
-};
+})(table || (exports.table = table = {}));
+const getWidestColumnWith = (data, columnKey) => data.reduce((previous, current) => {
+    const d = current[columnKey];
+    // convert multi-line cell to single longest line
+    // for width calculations
+    const manyLines = d.split('\n');
+    return Math.max(previous, manyLines.length > 1 ? Math.max(...manyLines.map((r) => (0, string_width_1.default)(r))) : (0, string_width_1.default)(d));
+}, 0);

package/lib/cli-ux/wait.js

@@ -1,7 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = (ms = 1000) => {
-    return new Promise(resolve => {
-        setTimeout(resolve, ms);
-    });
-};
+exports.default = (ms = 1000) => new Promise(resolve => {
+    setTimeout(resolve, ms);
+});

package/lib/command.d.ts

@@ -1,9 +1,9 @@
+import { ArgInput, ArgOutput, ArgProps, BooleanFlagProps, Deprecation, FlagInput, FlagOutput, Arg as IArg, Flag as IFlag, Input, OptionFlagProps, ParserOutput } from './interfaces/parser';
+import { CommandError } from './interfaces/errors';
 import { Config } from './config';
-import { PrettyPrintableError } from './errors';
-import { BooleanFlagProps, CompletableFlag, Deprecation, Arg as IArg, ArgInput, FlagInput, FlagOutput, Input, ArgProps, OptionFlagProps, ParserOutput, ArgOutput } from './interfaces/parser';
-import { Plugin } from './interfaces/plugin';
 import { LoadOptions } from './interfaces/config';
-import { CommandError } from './interfaces/errors';
+import { Plugin } from './interfaces/plugin';
+import { PrettyPrintableError } from './errors';
 /**
  * An abstract class which acts as the base for each command
  * in your project.
@@ -159,8 +159,10 @@ export declare namespace Command {
         hasDynamicHelp?: boolean;
         permutations?: string[];
         aliasPermutations?: string[];
+        isESM?: boolean;
+        relativePath?: string[];
     };
-    type Flag = CompletableFlag<any>;
+    type Flag = IFlag<any>;
     namespace Flag {
         type Cached = Omit<Flag, 'parse' | 'input'> & (BooleanFlagProps | OptionFlagProps);
         type Any = Flag | Cached;

package/lib/command.js

@@ -1,18 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Command = void 0;
-const url_1 = require("url");
-const chalk = require("chalk");
-const util_1 = require("util");
-const cli_ux_1 = require("./cli-ux");
+const tslib_1 = require("tslib");
+const Errors = tslib_1.__importStar(require("./errors"));
+const Parser = tslib_1.__importStar(require("./parser"));
+const node_util_1 = require("node:util");
+const util_1 = require("./help/util");
+const util_2 = require("./util");
+const stream_1 = require("./cli-ux/stream");
 const config_1 = require("./config");
-const Errors = require("./errors");
-const Parser = require("./parser");
-const util_2 = require("./help/util");
 const flags_1 = require("./flags");
-const util_3 = require("./util");
-const stream_1 = require("./cli-ux/stream");
-const pjson = (0, util_3.requireJson)(__dirname, '..', 'package.json');
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const node_url_1 = require("node:url");
+const cli_ux_1 = require("./cli-ux");
+const pjson = (0, util_2.requireJson)(__dirname, '..', 'package.json');
 /**
  * swallows stdout epipe errors
  * this occurs when stdout closes such as when piping to head
@@ -69,7 +70,7 @@ class Command {
             argv = process.argv.slice(2);
         // Handle the case when a file URL string is passed in such as 'import.meta.url'; covert to file path.
         if (typeof opts === 'string' && opts.startsWith('file://')) {
-            opts = (0, url_1.fileURLToPath)(opts);
+            opts = (0, node_url_1.fileURLToPath)(opts);
         }
         const config = await config_1.Config.load(opts || require.main?.filename || __dirname);
         const cmd = new this(argv, config);
@@ -84,6 +85,7 @@ class Command {
         return this._baseFlags;
     }
     static set baseFlags(flags) {
+        // eslint-disable-next-line prefer-object-spread
         this._baseFlags = Object.assign({}, this.baseFlags, flags);
         this.flags = {}; // force the flags setter to run
     }
@@ -91,6 +93,7 @@ class Command {
         return this._flags;
     }
     static set flags(flags) {
+        // eslint-disable-next-line prefer-object-spread
         this._flags = Object.assign({}, this._flags ?? {}, this.baseFlags, flags);
     }
     constructor(argv, config) {
@@ -101,7 +104,9 @@ class Command {
             this.debug = require('debug')(this.id ? `${this.config.bin}:${this.id}` : this.config.bin);
         }
         catch {
-            this.debug = () => { };
+            this.debug = () => {
+                // noop
+            };
         }
     }
     get ctor() {
@@ -140,14 +145,14 @@ class Command {
     }
     log(message = '', ...args) {
         if (!this.jsonEnabled()) {
-            message = typeof message === 'string' ? message : (0, util_1.inspect)(message);
-            stream_1.stdout.write((0, util_1.format)(message, ...args) + '\n');
+            message = typeof message === 'string' ? message : (0, node_util_1.inspect)(message);
+            stream_1.stdout.write((0, node_util_1.format)(message, ...args) + '\n');
         }
     }
     logToStderr(message = '', ...args) {
         if (!this.jsonEnabled()) {
-            message = typeof message === 'string' ? message : (0, util_1.inspect)(message);
-            stream_1.stderr.write((0, util_1.format)(message, ...args) + '\n');
+            message = typeof message === 'string' ? message : (0, node_util_1.inspect)(message);
+            stream_1.stderr.write((0, node_util_1.format)(message, ...args) + '\n');
         }
     }
     /**
@@ -183,32 +188,34 @@ class Command {
             const flagDef = this.ctor.flags[flag];
             const deprecated = flagDef?.deprecated;
             if (deprecated) {
-                this.warn((0, util_2.formatFlagDeprecationWarning)(flag, deprecated));
+                this.warn((0, util_1.formatFlagDeprecationWarning)(flag, deprecated));
             }
             const deprecateAliases = flagDef?.deprecateAliases;
-            const aliases = (flagDef?.aliases ?? []).map(a => a.length === 1 ? `-${a}` : `--${a}`);
-            if (deprecateAliases && aliases.length > 0) {
+            if (deprecateAliases) {
+                const aliases = (0, util_2.uniq)([...flagDef?.aliases ?? [], ...flagDef?.charAliases ?? []]).map(a => a.length === 1 ? `-${a}` : `--${a}`);
+                if (aliases.length === 0)
+                    return;
                 const foundAliases = aliases.filter(alias => this.argv.some(a => a.startsWith(alias)));
                 for (const alias of foundAliases) {
                     let preferredUsage = `--${flagDef?.name}`;
                     if (flagDef?.char) {
                         preferredUsage += ` | -${flagDef?.char}`;
                     }
-                    this.warn((0, util_2.formatFlagDeprecationWarning)(alias, { to: preferredUsage }));
+                    this.warn((0, util_1.formatFlagDeprecationWarning)(alias, { to: preferredUsage }));
                 }
             }
         }
     }
     warnIfCommandDeprecated() {
-        const [id] = (0, util_2.normalizeArgv)(this.config);
+        const [id] = (0, util_1.normalizeArgv)(this.config);
         if (this.ctor.deprecateAliases && this.ctor.aliases.includes(id)) {
-            const cmdName = (0, util_2.toConfiguredId)(this.ctor.id, this.config);
-            const aliasName = (0, util_2.toConfiguredId)(id, this.config);
-            this.warn((0, util_2.formatCommandDeprecationWarning)(aliasName, { to: cmdName }));
+            const cmdName = (0, util_1.toConfiguredId)(this.ctor.id, this.config);
+            const aliasName = (0, util_1.toConfiguredId)(id, this.config);
+            this.warn((0, util_1.formatCommandDeprecationWarning)(aliasName, { to: cmdName }));
         }
         if (this.ctor.state === 'deprecated') {
-            const cmdName = (0, util_2.toConfiguredId)(this.ctor.id, this.config);
-            this.warn((0, util_2.formatCommandDeprecationWarning)(cmdName, this.ctor.deprecationOptions));
+            const cmdName = (0, util_1.toConfiguredId)(this.ctor.id, this.config);
+            this.warn((0, util_1.formatCommandDeprecationWarning)(cmdName, this.ctor.deprecationOptions));
         }
     }
     async parse(options, argv = this.argv) {
@@ -231,7 +238,7 @@ class Command {
             if (!err.message)
                 throw err;
             try {
-                cli_ux_1.ux.action.stop(chalk.bold.red('!'));
+                cli_ux_1.ux.action.stop(chalk_1.default.bold.red('!'));
             }
             catch { }
             throw err;
@@ -239,7 +246,7 @@ class Command {
     }
     async finally(_) {
         try {
-            const config = Errors.config;
+            const { config } = Errors;
             if (config.errorLogger)
                 await config.errorLogger.flush();
         }

package/lib/config/config.d.ts

@@ -1,6 +1,6 @@
-import { Options, Plugin as IPlugin } from '../interfaces/plugin';
-import { Config as IConfig, ArchTypes, PlatformTypes, LoadOptions, VersionDetails } from '../interfaces/config';
+import { ArchTypes, Config as IConfig, LoadOptions, PlatformTypes, VersionDetails } from '../interfaces/config';
 import { Hook, Hooks, PJSON, Topic } from '../interfaces';
+import { Plugin as IPlugin, Options } from '../interfaces/plugin';
 import { Command } from '../command';
 export declare class Config implements IConfig {
     options: Options;