@oclif/core 3.0.0-beta.19 → 3.0.0-beta.20

package/lib/args.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.string = exports.url = exports.file = exports.directory = exports.integer = exports.boolean = exports.custom = void 0;
-const index_1 = require("./util/index");
+const fs_1 = require("./util/fs");
 const node_url_1 = require("node:url");
+const util_1 = require("./util/util");
 function custom(defaults) {
     return (options = {}) => ({
         parse: async (i, _context, _opts) => i,
@@ -14,7 +15,7 @@ function custom(defaults) {
 }
 exports.custom = custom;
 exports.boolean = custom({
-    parse: async (b) => Boolean(b) && (0, index_1.isNotFalsy)(b),
+    parse: async (b) => Boolean(b) && (0, util_1.isNotFalsy)(b),
 });
 exports.integer = custom({
     async parse(input, _, opts) {
@@ -31,14 +32,14 @@ exports.integer = custom({
 exports.directory = custom({
     async parse(input, _, opts) {
         if (opts.exists)
-            return (0, index_1.dirExists)(input);
+            return (0, fs_1.dirExists)(input);
         return input;
     },
 });
 exports.file = custom({
     async parse(input, _, opts) {
         if (opts.exists)
-            return (0, index_1.fileExists)(input);
+            return (0, fs_1.fileExists)(input);
         return input;
     },
 });

package/lib/cli-ux/action/base.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionBase = void 0;
 const stream_1 = require("../stream");
-const util_1 = require("../../util");
+const util_1 = require("../../util/util");
 const node_util_1 = require("node:util");
 class ActionBase {
     type;

package/lib/cli-ux/config.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = exports.Config = void 0;
 const tslib_1 = require("tslib");
-const index_1 = require("../util/index");
+const fs_1 = require("../util/fs");
 const simple_1 = tslib_1.__importDefault(require("./action/simple"));
 const spinner_1 = tslib_1.__importDefault(require("./action/spinner"));
 const g = global;
@@ -33,7 +33,7 @@ class Config {
 }
 exports.Config = Config;
 function fetch() {
-    const major = (0, index_1.requireJson)(__dirname, '..', '..', 'package.json').version.split('.')[0];
+    const major = (0, fs_1.requireJson)(__dirname, '..', '..', 'package.json').version.split('.')[0];
     if (globals[major])
         return globals[major];
     globals[major] = new Config();

package/lib/cli-ux/list.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderList = void 0;
-const index_1 = require("../util/index");
+const util_1 = require("../util/util");
 const screen_1 = require("../screen");
 const wordwrap = require('wordwrap');
 function linewrap(length, s) {
@@ -13,7 +13,7 @@ function renderList(items) {
     if (items.length === 0) {
         return '';
     }
-    const maxLength = (0, index_1.maxBy)(items, (item) => item[0].length)?.[0].length ?? 0;
+    const maxLength = (0, util_1.maxBy)(items, (item) => item[0].length)?.[0].length ?? 0;
     const lines = items.map((i) => {
         let left = i[0];
         let right = i[1];

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.table = void 0;
 const tslib_1 = require("tslib");
 const F = tslib_1.__importStar(require("../../flags"));
-const util_1 = require("../../util");
+const util_1 = require("../../util/util");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const node_util_1 = require("node:util");
 const natural_orderby_1 = require("natural-orderby");

package/lib/command.js

@@ -6,14 +6,15 @@ 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 index_1 = require("./util/index");
 const stream_1 = require("./cli-ux/stream");
 const config_1 = require("./config");
 const aggregate_flags_1 = require("./util/aggregate-flags");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const node_url_1 = require("node:url");
+const fs_1 = require("./util/fs");
+const util_2 = require("./util/util");
 const cli_ux_1 = require("./cli-ux");
-const pjson = (0, index_1.requireJson)(__dirname, '..', 'package.json');
+const pjson = (0, fs_1.requireJson)(__dirname, '..', 'package.json');
 /**
  * swallows stdout epipe errors
  * this occurs when stdout closes such as when piping to head
@@ -214,7 +215,7 @@ class Command {
             }
             const deprecateAliases = flagDef?.deprecateAliases;
             if (deprecateAliases) {
-                const aliases = (0, index_1.uniq)([...(flagDef?.aliases ?? []), ...(flagDef?.charAliases ?? [])]).map((a) => a.length === 1 ? `-${a}` : `--${a}`);
+                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)));

package/lib/config/config.js

@@ -7,19 +7,21 @@ const errors_1 = require("../errors");
 const util_1 = require("./util");
 const node_url_1 = require("node:url");
 const node_os_1 = require("node:os");
-const index_1 = require("../util/index");
+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");
-const util_2 = require("../help/util");
+const util_3 = require("../help/util");
 const module_loader_1 = require("../module-loader");
+const fs_1 = require("../util/fs");
 const settings_1 = require("../settings");
 const stream_1 = require("../cli-ux/stream");
 // eslint-disable-next-line new-cap
 const debug = (0, util_1.Debug)();
-const _pjson = (0, index_1.requireJson)(__dirname, '..', '..', 'package.json');
+const _pjson = (0, fs_1.requireJson)(__dirname, '..', '..', 'package.json');
 const BASE = `${_pjson.name}@${_pjson.version}`;
 function channelFromVersion(version) {
     const m = version.match(/[^-]+(?:-([^.]+))?/);
@@ -145,7 +147,7 @@ class Config {
         this.channel = this.options.channel || channelFromVersion(this.version);
         this.valid = Config._rootPlugin.valid;
         this.arch = (0, node_os_1.arch)() === 'ia32' ? 'x86' : (0, node_os_1.arch)();
-        this.platform = is_wsl_1.default ? 'wsl' : (0, index_1.getPlatform)();
+        this.platform = is_wsl_1.default ? 'wsl' : (0, os_1.getPlatform)();
         this.windows = this.platform === 'win32';
         this.bin = this.pjson.oclif.bin || this.name;
         this.binAliases = this.pjson.oclif.binAliases;
@@ -160,7 +162,7 @@ class Config {
         this.userAgent = `${this.name}/${this.version} ${this.platform}-${this.arch} node-${process.version}`;
         this.shell = this._shell();
         this.debug = this._debug();
-        this.home = process.env.HOME || (this.windows && this.windowsHome()) || (0, index_1.getHomeDir)() || (0, node_os_1.tmpdir)();
+        this.home = process.env.HOME || (this.windows && this.windowsHome()) || (0, os_1.getHomeDir)() || (0, node_os_1.tmpdir)();
         this.cacheDir = this.scopedEnvVar('CACHE_DIR') || this.macosCacheDir() || this.dir('cache');
         this.configDir = this.scopedEnvVar('CONFIG_DIR') || this.dir('config');
         this.dataDir = this.scopedEnvVar('DATA_DIR') || this.dir('data');
@@ -408,7 +410,7 @@ class Config {
      */
     findMatches(partialCmdId, argv) {
         const flags = argv
-            .filter((arg) => !(0, util_2.getHelpFlagAdditions)(this).includes(arg) && arg.startsWith('-'))
+            .filter((arg) => !(0, util_3.getHelpFlagAdditions)(this).includes(arg) && arg.startsWith('-'))
             .map((a) => a.replaceAll('-', ''));
         const possibleMatches = [...this.commandPermutations.get(partialCmdId)].map((k) => this._commands.get(k));
         const matches = possibleMatches.filter((command) => {
@@ -537,7 +539,7 @@ class Config {
         if (err instanceof Error) {
             const modifiedErr = err;
             modifiedErr.name = `${err.name} Plugin: ${this.name}`;
-            modifiedErr.detail = (0, index_1.compact)([
+            modifiedErr.detail = (0, util_2.compact)([
                 err.detail,
                 `module: ${this._base}`,
                 scope && `task: ${scope}`,
@@ -551,7 +553,7 @@ class Config {
         // err is an object
         process.emitWarning('Config.warn expected either a string or Error, but instead received an object');
         err.name = `${err.name} Plugin: ${this.name}`;
-        err.detail = (0, index_1.compact)([
+        err.detail = (0, util_2.compact)([
             err.detail,
             `module: ${this._base}`,
             scope && `task: ${scope}`,
@@ -562,7 +564,7 @@ class Config {
         process.emitWarning(JSON.stringify(err));
     }
     get isProd() {
-        return (0, index_1.isProd)();
+        return (0, util_2.isProd)();
     }
     isJitPluginCommand(c) {
         // Return true if the command's plugin is listed under oclif.jitPlugins AND if the plugin hasn't been loaded to this.plugins
@@ -629,7 +631,7 @@ class Config {
     }
     loadTopics(plugin) {
         const marker = performance_1.Performance.mark(`config.loadTopics#${plugin.name}`, { plugin: plugin.name });
-        for (const topic of (0, index_1.compact)(plugin.topics)) {
+        for (const topic of (0, util_2.compact)(plugin.topics)) {
             const existing = this._topics.get(topic.name);
             if (existing) {
                 existing.description = topic.description || existing.description;

package/lib/config/plugin-loader.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const Plugin = tslib_1.__importStar(require("./plugin"));
-const index_1 = require("../util/index");
 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");
 // eslint-disable-next-line new-cap
 const debug = (0, util_1.Debug)();
 class PluginLoader {
@@ -59,7 +60,7 @@ class PluginLoader {
     async loadDevPlugins(opts) {
         if (opts.devPlugins !== false) {
             // do not load oclif.devPlugins in production
-            if ((0, index_1.isProd)())
+            if ((0, util_2.isProd)())
                 return;
             try {
                 const { devPlugins } = opts.rootPlugin.pjson.oclif;
@@ -76,7 +77,7 @@ class PluginLoader {
             try {
                 const userPJSONPath = (0, node_path_1.join)(opts.dataDir, 'package.json');
                 debug('reading user plugins pjson %s', userPJSONPath);
-                const pjson = await (0, index_1.readJson)(userPJSONPath);
+                const pjson = await (0, fs_1.readJson)(userPJSONPath);
                 if (!pjson.oclif)
                     pjson.oclif = { schema: 1 };
                 if (!pjson.oclif.plugins)

package/lib/config/plugin.js

@@ -3,15 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Plugin = void 0;
 const errors_1 = require("../errors");
 const util_1 = require("./util");
-const index_1 = require("../util/index");
+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");
 const ts_node_1 = require("./ts-node");
-const _pjson = (0, index_1.requireJson)(__dirname, '..', '..', 'package.json');
+const _pjson = (0, fs_1.requireJson)(__dirname, '..', '..', 'package.json');
 function topicsToArray(input, base) {
     if (!input)
         return [];
@@ -36,7 +37,7 @@ async function findSourcesRoot(root) {
     for (const next of up(root)) {
         const cur = (0, node_path_1.join)(next, 'package.json');
         // eslint-disable-next-line no-await-in-loop
-        if (await (0, index_1.exists)(cur))
+        if (await (0, fs_1.exists)(cur))
             return (0, node_path_1.dirname)(cur);
     }
 }
@@ -57,11 +58,11 @@ async function findRootLegacy(name, root) {
         if (name) {
             cur = (0, node_path_1.join)(next, 'node_modules', name, 'package.json');
             // eslint-disable-next-line no-await-in-loop
-            if (await (0, index_1.exists)(cur))
+            if (await (0, fs_1.exists)(cur))
                 return (0, node_path_1.dirname)(cur);
             try {
                 // eslint-disable-next-line no-await-in-loop
-                const pkg = await (0, index_1.readJson)((0, node_path_1.join)(next, 'package.json'));
+                const pkg = await (0, fs_1.readJson)((0, node_path_1.join)(next, 'package.json'));
                 if (pkg.name === name)
                     return next;
             }
@@ -70,7 +71,7 @@ async function findRootLegacy(name, root) {
         else {
             cur = (0, node_path_1.join)(next, 'package.json');
             // eslint-disable-next-line no-await-in-loop
-            if (await (0, index_1.exists)(cur))
+            if (await (0, fs_1.exists)(cur))
                 return (0, node_path_1.dirname)(cur);
         }
     }
@@ -136,7 +137,7 @@ class Plugin {
             throw new errors_1.CLIError(`could not find package.json with ${(0, node_util_1.inspect)(this.options)}`);
         this.root = root;
         this._debug('reading %s plugin %s', this.type, root);
-        this.pjson = await (0, index_1.readJson)((0, node_path_1.join)(root, 'package.json'));
+        this.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;
@@ -144,7 +145,7 @@ class Plugin {
         const pjsonPath = (0, node_path_1.join)(root, 'package.json');
         if (!this.name)
             throw new errors_1.CLIError(`no name in ${pjsonPath}`);
-        if (!(0, index_1.isProd)() && !this.pjson.files)
+        if (!(0, util_2.isProd)() && !this.pjson.files)
             this.warn(`files attribute must be specified in ${pjsonPath}`);
         // eslint-disable-next-line new-cap
         this._debug = (0, util_1.Debug)(this.name);
@@ -155,7 +156,7 @@ class Plugin {
         else {
             this.pjson.oclif = this.pjson['cli-engine'] || {};
         }
-        this.hooks = (0, index_1.mapValues)(this.pjson.oclif.hooks || {}, (i) => (Array.isArray(i) ? i : [i]));
+        this.hooks = (0, util_2.mapValues)(this.pjson.oclif.hooks || {}, (i) => (Array.isArray(i) ? i : [i]));
         this.manifest = await this._manifest();
         this.commands = Object.entries(this.manifest.commands)
             .map(([id, c]) => ({
@@ -235,7 +236,7 @@ class Plugin {
         const readManifest = async (dotfile = false) => {
             try {
                 const p = (0, node_path_1.join)(this.root, `${dotfile ? '.' : ''}oclif.manifest.json`);
-                const manifest = await (0, index_1.readJson)(p);
+                const manifest = await (0, fs_1.readJson)(p);
                 if (!process.env.OCLIF_NEXT_VERSION && manifest.version.split('-')[0] !== this.version.split('-')[0]) {
                     process.emitWarning(`Mismatched version in ${this.name} plugin manifest. Expected: ${this.version} Received: ${manifest.version}\nThis usually means you have an oclif.manifest.json file that should be deleted in development. This file should be automatically generated when publishing.`);
                 }
@@ -304,7 +305,7 @@ class Plugin {
     }
     addErrorScope(err, scope) {
         err.name = `${err.name} Plugin: ${this.name}`;
-        err.detail = (0, index_1.compact)([
+        err.detail = (0, util_2.compact)([
             err.detail,
             `module: ${this._base}`,
             scope && `task: ${scope}`,

package/lib/config/ts-node.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsPath = exports.TS_CONFIGS = void 0;
-const index_1 = require("../util/index");
 const node_path_1 = require("node:path");
 const util_1 = require("./util");
 const node_fs_1 = require("node:fs");
+const util_2 = require("../util/util");
 const errors_1 = require("../errors");
+const fs_1 = require("../util/fs");
 const settings_1 = require("../settings");
 // eslint-disable-next-line new-cap
 const debug = (0, util_1.Debug)('ts-node');
@@ -35,7 +36,7 @@ function loadTSConfig(root) {
         }
     }
     if ((0, node_fs_1.existsSync)(tsconfigPath) && typescript) {
-        const tsconfig = typescript.parseConfigFileTextToJson(tsconfigPath, (0, index_1.readJsonSync)(tsconfigPath, false)).config;
+        const tsconfig = typescript.parseConfigFileTextToJson(tsconfigPath, (0, fs_1.readJsonSync)(tsconfigPath, false)).config;
         if (!tsconfig || !tsconfig.compilerOptions) {
             throw new Error(`Could not read and parse tsconfig.json at ${tsconfigPath}, or it ` +
                 'did not contain a "compilerOptions" section.');
@@ -117,7 +118,7 @@ function tsPath(root, orig, plugin) {
         debug(`Skipping ts-node registration for ${root} because tsNodeEnabled is explicitly set to false`);
         return orig;
     }
-    const isProduction = (0, index_1.isProd)();
+    const isProduction = (0, util_2.isProd)();
     /**
      * Skip ts-node registration for ESM plugins.
      * The node ecosystem is not mature enough to support auto-transpiling ESM modules at this time.

package/lib/flags.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.option = exports.help = exports.version = exports.string = exports.url = exports.file = exports.directory = exports.integer = exports.boolean = exports.custom = void 0;
-const index_1 = require("./util/index");
+const fs_1 = require("./util/fs");
 const errors_1 = require("./errors");
 const node_url_1 = require("node:url");
 const help_1 = require("./help");
@@ -57,14 +57,14 @@ exports.integer = custom({
 exports.directory = custom({
     async parse(input, _, opts) {
         if (opts.exists)
-            return (0, index_1.dirExists)(input);
+            return (0, fs_1.dirExists)(input);
         return input;
     },
 });
 exports.file = custom({
     async parse(input, _, opts) {
         if (opts.exists)
-            return (0, index_1.fileExists)(input);
+            return (0, fs_1.fileExists)(input);
         return input;
     },
 });

package/lib/help/command.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandHelp = void 0;
 const tslib_1 = require("tslib");
 const formatter_1 = require("./formatter");
-const util_1 = require("../util");
+const util_1 = require("../util/util");
 const docopts_1 = require("./docopts");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const ensure_arg_object_1 = require("../util/ensure-arg-object");
 const strip_ansi_1 = tslib_1.__importDefault(require("strip-ansi"));
 // Don't use os.EOL because we need to ensure that a string
 // written on any platform, that may use \r\n or \n, will be
@@ -34,7 +35,7 @@ class CommandHelp extends formatter_1.HelpFormatter {
             v.name = k;
             return v;
         }), (f) => [!f.char, f.char, f.name]);
-        const args = Object.values((0, util_1.ensureArgObject)(cmd.args)).filter((a) => !a.hidden);
+        const args = Object.values((0, ensure_arg_object_1.ensureArgObject)(cmd.args)).filter((a) => !a.hidden);
         const output = (0, util_1.compact)(this.sections().map(({ header, generate }) => {
             const body = generate({ cmd, flags, args }, header);
             // Generate can return a list of sections

package/lib/help/docopts.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocOpts = void 0;
-const index_1 = require("../util/index");
+const ensure_arg_object_1 = require("../util/ensure-arg-object");
 /**
  * DocOpts - See http://docopt.org/.
  *
@@ -79,7 +79,7 @@ class DocOpts {
     toString() {
         const opts = this.cmd.id === '.' || this.cmd.id === '' ? [] : ['<%= command.id %>'];
         if (this.cmd.args) {
-            const a = Object.values((0, index_1.ensureArgObject)(this.cmd.args)).map((arg) => arg.required ? arg.name.toUpperCase() : `[${arg.name.toUpperCase()}]`) || [];
+            const a = Object.values((0, ensure_arg_object_1.ensureArgObject)(this.cmd.args)).map((arg) => arg.required ? arg.name.toUpperCase() : `[${arg.name.toUpperCase()}]`) || [];
             opts.push(...a);
         }
         try {

package/lib/help/index.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadHelpClass = exports.Help = exports.HelpBase = exports.normalizeArgv = exports.getHelpFlagAdditions = exports.standardizeIDFromArgv = exports.CommandHelp = void 0;
 const tslib_1 = require("tslib");
-const index_1 = require("../util/index");
-const util_1 = require("./util");
+const util_1 = require("../util/util");
+const util_2 = require("./util");
 const command_1 = require("./command");
 const formatter_1 = require("./formatter");
 const root_1 = tslib_1.__importDefault(require("./root"));
@@ -15,13 +15,13 @@ const stream_1 = require("../cli-ux/stream");
 const strip_ansi_1 = tslib_1.__importDefault(require("strip-ansi"));
 var command_2 = require("./command");
 Object.defineProperty(exports, "CommandHelp", { enumerable: true, get: function () { return command_2.CommandHelp; } });
-var util_2 = require("./util");
-Object.defineProperty(exports, "standardizeIDFromArgv", { enumerable: true, get: function () { return util_2.standardizeIDFromArgv; } });
-Object.defineProperty(exports, "getHelpFlagAdditions", { enumerable: true, get: function () { return util_2.getHelpFlagAdditions; } });
-Object.defineProperty(exports, "normalizeArgv", { enumerable: true, get: function () { return util_2.normalizeArgv; } });
+var util_3 = require("./util");
+Object.defineProperty(exports, "standardizeIDFromArgv", { enumerable: true, get: function () { return util_3.standardizeIDFromArgv; } });
+Object.defineProperty(exports, "getHelpFlagAdditions", { enumerable: true, get: function () { return util_3.getHelpFlagAdditions; } });
+Object.defineProperty(exports, "normalizeArgv", { enumerable: true, get: function () { return util_3.normalizeArgv; } });
 function getHelpSubject(args, config) {
     // for each help flag that starts with '--' create a new flag with same name sans '--'
-    const mergedHelpFlags = (0, util_1.getHelpFlagAdditions)(config);
+    const mergedHelpFlags = (0, util_2.getHelpFlagAdditions)(config);
     for (const arg of args) {
         if (arg === '--')
             return;
@@ -58,15 +58,15 @@ class Help extends HelpBase {
     get sortedCommands() {
         let { commands } = this.config;
         commands = commands.filter((c) => this.opts.all || !c.hidden);
-        commands = (0, index_1.sortBy)(commands, (c) => c.id);
-        commands = (0, index_1.uniqBy)(commands, (c) => c.id);
+        commands = (0, util_1.sortBy)(commands, (c) => c.id);
+        commands = (0, util_1.uniqBy)(commands, (c) => c.id);
         return commands;
     }
     get sortedTopics() {
         let topics = this._topics;
         topics = topics.filter((t) => this.opts.all || !t.hidden);
-        topics = (0, index_1.sortBy)(topics, (t) => t.name);
-        topics = (0, index_1.uniqBy)(topics, (t) => t.name);
+        topics = (0, util_1.sortBy)(topics, (t) => t.name);
+        topics = (0, util_1.uniqBy)(topics, (t) => t.name);
         return topics;
     }
     constructor(config, opts = {}) {
@@ -74,9 +74,9 @@ class Help extends HelpBase {
     }
     async showHelp(argv) {
         const originalArgv = argv.slice(1);
-        argv = argv.filter((arg) => !(0, util_1.getHelpFlagAdditions)(this.config).includes(arg));
+        argv = argv.filter((arg) => !(0, util_2.getHelpFlagAdditions)(this.config).includes(arg));
         if (this.config.topicSeparator !== ':')
-            argv = (0, util_1.standardizeIDFromArgv)(argv, this.config);
+            argv = (0, util_2.standardizeIDFromArgv)(argv, this.config);
         const subject = getHelpSubject(argv, this.config);
         if (!subject) {
             if (this.config.pjson.oclif.default) {
@@ -134,13 +134,13 @@ class Help extends HelpBase {
         const state = this.config.pjson?.oclif?.state || plugin?.pjson?.oclif?.state || command.state;
         if (state) {
             this.log(state === 'deprecated'
-                ? `${(0, util_1.formatCommandDeprecationWarning)((0, util_1.toConfiguredId)(name, this.config), command.deprecationOptions)}\n`
+                ? `${(0, util_2.formatCommandDeprecationWarning)((0, util_2.toConfiguredId)(name, this.config), command.deprecationOptions)}\n`
                 : `This command is in ${state}.\n`);
         }
         if (command.deprecateAliases && command.aliases.includes(name)) {
             const actualCmd = this.config.commands.find((c) => c.aliases.includes(name));
             const opts = { ...command.deprecationOptions, ...(actualCmd ? { to: actualCmd.id } : {}) };
-            this.log(`${(0, util_1.formatCommandDeprecationWarning)((0, util_1.toConfiguredId)(name, this.config), opts)}\n`);
+            this.log(`${(0, util_2.formatCommandDeprecationWarning)((0, util_2.toConfiguredId)(name, this.config), opts)}\n`);
         }
         const summary = this.summary(command);
         if (summary) {
@@ -251,7 +251,7 @@ class Help extends HelpBase {
         let topicID = `${topic.name}:COMMAND`;
         if (this.config.topicSeparator !== ':')
             topicID = topicID.replaceAll(':', this.config.topicSeparator);
-        let output = (0, index_1.compact)([
+        let output = (0, util_1.compact)([
             summary,
             this.section(this.opts.usageHeader || 'USAGE', `$ ${this.config.bin} ${topicID}`),
             description && this.section('DESCRIPTION', this.wrap(description)),

package/lib/help/root.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const formatter_1 = require("./formatter");
-const index_1 = require("../util/index");
+const util_1 = require("../util/util");
 const strip_ansi_1 = tslib_1.__importDefault(require("strip-ansi"));
 class RootHelp extends formatter_1.HelpFormatter {
     config;
@@ -16,7 +16,7 @@ class RootHelp extends formatter_1.HelpFormatter {
         let description = this.config.pjson.oclif.description || this.config.pjson.description || '';
         description = this.render(description);
         description = description.split('\n')[0];
-        let output = (0, index_1.compact)([description, this.version(), this.usage(), this.description()]).join('\n\n');
+        let output = (0, util_1.compact)([description, this.version(), this.usage(), this.description()]).join('\n\n');
         if (this.opts.stripAnsi)
             output = (0, strip_ansi_1.default)(output);
         return output;

package/lib/index.d.ts

@@ -5,7 +5,7 @@ export * as Flags from './flags';
 export * as Parser from './parser';
 export * as ux from './cli-ux';
 export { CommandHelp, HelpBase, Help, loadHelpClass } from './help';
-export { Config, Plugin, tsPath } from './config';
+export { Config, Plugin } from './config';
 export { HelpSection, HelpSectionRenderer, HelpSectionKeyValueTable } from './help/formatter';
 export { Settings, settings } from './settings';
 export { stdout, stderr } from './cli-ux/stream';

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = exports.handle = exports.flush = exports.execute = exports.Performance = exports.Command = exports.toStandardizedId = exports.toConfiguredId = exports.stderr = exports.stdout = exports.settings = exports.tsPath = exports.Plugin = exports.Config = exports.loadHelpClass = exports.Help = exports.HelpBase = exports.CommandHelp = exports.ux = exports.Parser = exports.Flags = exports.Interfaces = exports.Errors = exports.Args = void 0;
+exports.run = exports.handle = exports.flush = exports.execute = exports.Performance = exports.Command = exports.toStandardizedId = exports.toConfiguredId = exports.stderr = exports.stdout = exports.settings = exports.Plugin = exports.Config = exports.loadHelpClass = exports.Help = exports.HelpBase = exports.CommandHelp = exports.ux = exports.Parser = exports.Flags = exports.Interfaces = exports.Errors = exports.Args = void 0;
 const tslib_1 = require("tslib");
 const stream_1 = require("./cli-ux/stream");
 function checkCWD() {
@@ -28,7 +28,6 @@ Object.defineProperty(exports, "loadHelpClass", { enumerable: true, get: functio
 var config_1 = require("./config");
 Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return config_1.Config; } });
 Object.defineProperty(exports, "Plugin", { enumerable: true, get: function () { return config_1.Plugin; } });
-Object.defineProperty(exports, "tsPath", { enumerable: true, get: function () { return config_1.tsPath; } });
 var settings_1 = require("./settings");
 Object.defineProperty(exports, "settings", { enumerable: true, get: function () { return settings_1.settings; } });
 var stream_2 = require("./cli-ux/stream");

package/lib/parser/errors.js

@@ -6,7 +6,7 @@ const errors_1 = require("../errors");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const help_1 = require("./help");
 const list_1 = require("../cli-ux/list");
-const index_1 = require("../util/index");
+const util_1 = require("../util/util");
 var errors_2 = require("../errors");
 Object.defineProperty(exports, "CLIError", { enumerable: true, get: function () { return errors_2.CLIError; } });
 class CLIParseError extends errors_1.CLIError {
@@ -96,7 +96,7 @@ exports.ArgInvalidOptionError = ArgInvalidOptionError;
 class FailedFlagValidationError extends CLIParseError {
     constructor({ parse, failed }) {
         const reasons = failed.map((r) => r.reason);
-        const deduped = (0, index_1.uniq)(reasons);
+        const deduped = (0, util_1.uniq)(reasons);
         const errString = deduped.length === 1 ? 'error' : 'errors';
         const message = `The following ${errString} occurred:\n  ${chalk_1.default.dim(deduped.join('\n  '))}`;
         super({ parse, message });

package/lib/parser/help.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.flagUsages = exports.flagUsage = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const index_1 = require("../util/index");
+const util_1 = require("../util/util");
 function flagUsage(flag, options = {}) {
     const label = [];
     if (flag.helpLabel) {
@@ -26,6 +26,6 @@ exports.flagUsage = flagUsage;
 function flagUsages(flags, options = {}) {
     if (flags.length === 0)
         return [];
-    return (0, index_1.sortBy)(flags, (f) => [f.char ? -1 : 1, f.char, f.name]).map((f) => flagUsage(f, options));
+    return (0, util_1.sortBy)(flags, (f) => [f.char ? -1 : 1, f.char, f.name]).map((f) => flagUsage(f, options));
 }
 exports.flagUsages = flagUsages;

package/lib/parser/parse.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Parser = void 0;
 /* eslint-disable no-await-in-loop */
 const errors_1 = require("./errors");
-const index_1 = require("../util/index");
+const util_1 = require("../util/util");
 const node_readline_1 = require("node:readline");
 let debug;
 try {
@@ -75,7 +75,7 @@ class Parser {
         this.context = input.context ?? {};
         this.argv = [...input.argv];
         this._setNames();
-        this.booleanFlags = (0, index_1.pickBy)(input.flags, (f) => f.type === 'boolean');
+        this.booleanFlags = (0, util_1.pickBy)(input.flags, (f) => f.type === 'boolean');
         this.flagAliases = Object.fromEntries(Object.values(input.flags).flatMap((flag) => [...(flag.aliases ?? []), ...(flag.charAliases ?? [])].map((a) => [a, flag])));
     }
     async parse() {
@@ -197,10 +197,10 @@ class Parser {
             // user provided some input
             if (tokenLength) {
                 // boolean
-                if (fws.inputFlag.flag.type === 'boolean' && (0, index_1.last)(fws.tokens)?.input) {
+                if (fws.inputFlag.flag.type === 'boolean' && (0, util_1.last)(fws.tokens)?.input) {
                     return {
                         ...fws,
-                        valueFunction: async (i) => parseFlagOrThrowError((0, index_1.last)(i.tokens)?.input !== `--no-${i.inputFlag.name}`, i.inputFlag.flag, this.context, (0, index_1.last)(i.tokens)),
+                        valueFunction: async (i) => parseFlagOrThrowError((0, util_1.last)(i.tokens)?.input !== `--no-${i.inputFlag.name}`, i.inputFlag.flag, this.context, (0, util_1.last)(i.tokens)),
                     };
                 }
                 // multiple with custom delimiter
@@ -215,7 +215,7 @@ class Parser {
                             .replace(/^"(.*)"$/, '$1')
                             .replace(/^'(.*)'$/, '$1'))
                             .map(async (v) => parseFlagOrThrowError(v, i.inputFlag.flag, this.context, {
-                            ...(0, index_1.last)(i.tokens),
+                            ...(0, util_1.last)(i.tokens),
                             input: v,
                         }))))
                             // eslint-disable-next-line unicorn/no-await-expression-member
@@ -233,7 +233,7 @@ class Parser {
                 if (fws.inputFlag.flag.type === 'option') {
                     return {
                         ...fws,
-                        valueFunction: async (i) => parseFlagOrThrowError(validateOptions(i.inputFlag.flag, (0, index_1.last)(fws.tokens)?.input), i.inputFlag.flag, this.context, (0, index_1.last)(fws.tokens)),
+                        valueFunction: async (i) => parseFlagOrThrowError(validateOptions(i.inputFlag.flag, (0, util_1.last)(fws.tokens)?.input), i.inputFlag.flag, this.context, (0, util_1.last)(fws.tokens)),
                     };
                 }
             }
@@ -249,7 +249,7 @@ class Parser {
                 if (fws.inputFlag.flag.type === 'boolean') {
                     return {
                         ...fws,
-                        valueFunction: async (i) => (0, index_1.isTruthy)(process.env[i.inputFlag.flag.env] ?? 'false'),
+                        valueFunction: async (i) => (0, util_1.isTruthy)(process.env[i.inputFlag.flag.env] ?? 'false'),
                     };
                 }
             }

package/lib/parser/validate.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validate = void 0;
 const errors_1 = require("./errors");
-const index_1 = require("../util/index");
+const util_1 = require("../util/util");
 async function validate(parse) {
     let cachedResolvedFlags;
     function validateArgs() {
@@ -82,7 +82,7 @@ async function validate(parse) {
             .filter((flagName) => flag.exactlyOne && flag.exactlyOne.includes(flagName)); // and in the exactlyOne list
         if (intersection.length === 0) {
             // the command's exactlyOne may or may not include itself, so we'll use Set to add + de-dupe
-            const deduped = (0, index_1.uniq)(flag.exactlyOne?.map((flag) => `--${flag}`) ?? []).join(', ');
+            const deduped = (0, util_1.uniq)(flag.exactlyOne?.map((flag) => `--${flag}`) ?? []).join(', ');
             const reason = `Exactly one of the following must be provided: ${deduped}`;
             return { ...base, status: 'failed', reason };
         }

package/lib/util/cache-command.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cacheCommand = void 0;
-const index_1 = require("./index");
 const aggregate_flags_1 = require("./aggregate-flags");
 const cache_default_value_1 = require("./cache-default-value");
+const ensure_arg_object_1 = require("./ensure-arg-object");
+const util_1 = require("./util");
 // In order to collect static properties up the inheritance chain, we need to recursively
 // access the prototypes until there's nothing left. This allows us to combine baseFlags
 // and flags as well as add in the json flag if enableJsonFlag is enabled.
 function mergePrototype(result, cmd) {
     const proto = Object.getPrototypeOf(cmd);
-    const filteredProto = (0, index_1.pickBy)(proto, (v) => v !== undefined);
+    const filteredProto = (0, util_1.pickBy)(proto, (v) => v !== undefined);
     return Object.keys(proto).length > 0 ? mergePrototype({ ...filteredProto, ...result }, proto) : result;
 }
 async function cacheFlags(cmdFlags, respectNoCacheDefault) {
@@ -68,7 +69,7 @@ async function cacheArgs(cmdArgs, respectNoCacheDefault) {
 async function cacheCommand(uncachedCmd, plugin, respectNoCacheDefault = false) {
     const cmd = mergePrototype(uncachedCmd, uncachedCmd);
     const flags = await cacheFlags((0, aggregate_flags_1.aggregateFlags)(cmd.flags, cmd.baseFlags, cmd.enableJsonFlag), respectNoCacheDefault);
-    const args = await cacheArgs((0, index_1.ensureArgObject)(cmd.args), respectNoCacheDefault);
+    const args = await cacheArgs((0, ensure_arg_object_1.ensureArgObject)(cmd.args), respectNoCacheDefault);
     const stdProperties = {
         id: cmd.id,
         summary: cmd.summary,

package/lib/util/ensure-arg-object.d.ts

@@ -0,0 +1,12 @@
+import { ArgInput } from '../interfaces/parser';
+import { Command } from '../command';
+/**
+ * Ensure that the provided args are an object. This is for backwards compatibility with v1 commands which
+ * defined args as an array.
+ *
+ * @param args Either an array of args or an object of args
+ * @returns ArgInput
+ */
+export declare function ensureArgObject(args?: any[] | ArgInput | {
+    [name: string]: Command.Arg.Cached;
+}): ArgInput;

package/lib/util/ensure-arg-object.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureArgObject = void 0;
+/**
+ * Ensure that the provided args are an object. This is for backwards compatibility with v1 commands which
+ * defined args as an array.
+ *
+ * @param args Either an array of args or an object of args
+ * @returns ArgInput
+ */
+function ensureArgObject(args) {
+    return (Array.isArray(args) ? (args ?? []).reduce((x, y) => ({ ...x, [y.name]: y }), {}) : args ?? {});
+}
+exports.ensureArgObject = ensureArgObject;

package/lib/util/fs.d.ts

@@ -0,0 +1,7 @@
+export declare function requireJson<T>(...pathParts: string[]): T;
+export declare function exists(path: string): Promise<boolean>;
+export declare const dirExists: (input: string) => Promise<string>;
+export declare const fileExists: (input: string) => Promise<string>;
+export declare function readJson<T = unknown>(path: string): Promise<T>;
+export declare function readJsonSync(path: string, parse: false): string;
+export declare function readJsonSync<T = unknown>(path: string, parse?: true): T;

package/lib/util/fs.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readJsonSync = exports.readJson = exports.fileExists = exports.dirExists = exports.exists = exports.requireJson = void 0;
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const node_fs_1 = require("node:fs");
+const debug = require('debug');
+function requireJson(...pathParts) {
+    return JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(...pathParts), 'utf8'));
+}
+exports.requireJson = requireJson;
+async function exists(path) {
+    try {
+        await (0, promises_1.access)(path);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+exports.exists = exists;
+const dirExists = async (input) => {
+    if (!(await exists(input))) {
+        throw new Error(`No directory found at ${input}`);
+    }
+    const fileStat = await (0, promises_1.stat)(input);
+    if (!fileStat.isDirectory()) {
+        throw new Error(`${input} exists but is not a directory`);
+    }
+    return input;
+};
+exports.dirExists = dirExists;
+const fileExists = async (input) => {
+    if (!(await exists(input))) {
+        throw new Error(`No file found at ${input}`);
+    }
+    const fileStat = await (0, promises_1.stat)(input);
+    if (!fileStat.isFile()) {
+        throw new Error(`${input} exists but is not a file`);
+    }
+    return input;
+};
+exports.fileExists = fileExists;
+async function readJson(path) {
+    debug('config')('readJson %s', path);
+    const contents = await (0, promises_1.readFile)(path, 'utf8');
+    return JSON.parse(contents);
+}
+exports.readJson = readJson;
+function readJsonSync(path, parse = true) {
+    const contents = (0, node_fs_1.readFileSync)(path, 'utf8');
+    return parse ? JSON.parse(contents) : contents;
+}
+exports.readJsonSync = readJsonSync;

package/lib/util/os.d.ts

@@ -0,0 +1,19 @@
+/// <reference types="node" />
+/**
+ * Call os.homedir() and return the result
+ *
+ * Wrapping this allows us to stub these in tests since os.homedir() is
+ * non-configurable and non-writable.
+ *
+ * @returns The user's home directory
+ */
+export declare function getHomeDir(): string;
+/**
+ * Call os.platform() and return the result
+ *
+ * Wrapping this allows us to stub these in tests since os.platform() is
+ * non-configurable and non-writable.
+ *
+ * @returns The process' platform
+ */
+export declare function getPlatform(): NodeJS.Platform;

package/lib/util/os.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPlatform = exports.getHomeDir = void 0;
+const node_os_1 = require("node:os");
+/**
+ * Call os.homedir() and return the result
+ *
+ * Wrapping this allows us to stub these in tests since os.homedir() is
+ * non-configurable and non-writable.
+ *
+ * @returns The user's home directory
+ */
+function getHomeDir() {
+    return (0, node_os_1.homedir)();
+}
+exports.getHomeDir = getHomeDir;
+/**
+ * Call os.platform() and return the result
+ *
+ * Wrapping this allows us to stub these in tests since os.platform() is
+ * non-configurable and non-writable.
+ *
+ * @returns The process' platform
+ */
+function getPlatform() {
+    return (0, node_os_1.platform)();
+}
+exports.getPlatform = getPlatform;

package/lib/util/util.d.ts

@@ -0,0 +1,22 @@
+export declare function pickBy<T extends {
+    [s: string]: T[keyof T];
+} | ArrayLike<T[keyof T]>>(obj: T, fn: (i: T[keyof T]) => boolean): Partial<T>;
+export declare function compact<T>(a: (T | undefined)[]): T[];
+export declare function uniqBy<T>(arr: T[], fn: (cur: T) => any): T[];
+export declare function last<T>(arr?: T[]): T | undefined;
+type SortTypes = string | number | undefined | boolean;
+export declare function sortBy<T>(arr: T[], fn: (i: T) => SortTypes | SortTypes[]): T[];
+export declare function castArray<T>(input?: T | T[]): T[];
+export declare function isProd(): boolean;
+export declare function maxBy<T>(arr: T[], fn: (i: T) => number): T | undefined;
+export declare function sumBy<T>(arr: T[], fn: (i: T) => number): number;
+export declare function capitalize(s: string): string;
+export declare function isTruthy(input: string): boolean;
+export declare function isNotFalsy(input: string): boolean;
+export declare function uniq<T>(arr: T[]): T[];
+export declare function mapValues<T extends Record<string, any>, TResult>(obj: {
+    [P in keyof T]: T[P];
+}, fn: (i: T[keyof T], k: keyof T) => TResult): {
+    [P in keyof T]: TResult;
+};
+export {};

package/lib/util/util.js

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapValues = exports.uniq = exports.isNotFalsy = exports.isTruthy = exports.capitalize = exports.sumBy = exports.maxBy = exports.isProd = exports.castArray = exports.sortBy = exports.last = exports.uniqBy = exports.compact = exports.pickBy = void 0;
+function pickBy(obj, fn) {
+    return Object.entries(obj).reduce((o, [k, v]) => {
+        if (fn(v))
+            o[k] = v;
+        return o;
+    }, {});
+}
+exports.pickBy = pickBy;
+function compact(a) {
+    // eslint-disable-next-line unicorn/prefer-native-coercion-functions
+    return a.filter((a) => Boolean(a));
+}
+exports.compact = compact;
+function uniqBy(arr, fn) {
+    return arr.filter((a, i) => {
+        const aVal = fn(a);
+        return !arr.find((b, j) => j > i && fn(b) === aVal);
+    });
+}
+exports.uniqBy = uniqBy;
+function last(arr) {
+    if (!arr)
+        return;
+    return arr.at(-1);
+}
+exports.last = last;
+function compare(a, b) {
+    a = a === undefined ? 0 : a;
+    b = b === undefined ? 0 : b;
+    if (Array.isArray(a) && Array.isArray(b)) {
+        if (a.length === 0 && b.length === 0)
+            return 0;
+        const diff = compare(a[0], b[0]);
+        if (diff !== 0)
+            return diff;
+        return compare(a.slice(1), b.slice(1));
+    }
+    if (a < b)
+        return -1;
+    if (a > b)
+        return 1;
+    return 0;
+}
+function sortBy(arr, fn) {
+    return arr.sort((a, b) => compare(fn(a), fn(b)));
+}
+exports.sortBy = sortBy;
+function castArray(input) {
+    if (input === undefined)
+        return [];
+    return Array.isArray(input) ? input : [input];
+}
+exports.castArray = castArray;
+function isProd() {
+    return !['development', 'test'].includes(process.env.NODE_ENV ?? '');
+}
+exports.isProd = isProd;
+function maxBy(arr, fn) {
+    if (arr.length === 0) {
+        return undefined;
+    }
+    return arr.reduce((maxItem, i) => {
+        const curr = fn(i);
+        const max = fn(maxItem);
+        return curr > max ? i : maxItem;
+    });
+}
+exports.maxBy = maxBy;
+function sumBy(arr, fn) {
+    return arr.reduce((sum, i) => sum + fn(i), 0);
+}
+exports.sumBy = sumBy;
+function capitalize(s) {
+    return s ? s.charAt(0).toUpperCase() + s.slice(1).toLowerCase() : '';
+}
+exports.capitalize = capitalize;
+function isTruthy(input) {
+    return ['true', '1', 'yes', 'y'].includes(input.toLowerCase());
+}
+exports.isTruthy = isTruthy;
+function isNotFalsy(input) {
+    return !['false', '0', 'no', 'n'].includes(input.toLowerCase());
+}
+exports.isNotFalsy = isNotFalsy;
+function uniq(arr) {
+    return [...new Set(arr)].sort();
+}
+exports.uniq = uniq;
+function mapValues(obj, fn) {
+    return Object.entries(obj).reduce((o, [k, v]) => {
+        o[k] = fn(v, k);
+        return o;
+    }, {});
+}
+exports.mapValues = mapValues;

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "3.0.0-beta.19",
+  "version": "3.0.0-beta.20",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
-    "@types/cli-progress": "^3.11.0",
     "ansi-escapes": "^4.3.2",
     "ansi-styles": "^4.3.0",
     "cardinal": "^2.1.1",
@@ -40,15 +39,16 @@
     "@oclif/test": "^3.0.1",
     "@types/ansi-styles": "^3.2.1",
     "@types/benchmark": "^2.1.2",
-    "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
+    "@types/chai": "^4.3.4",
     "@types/clean-stack": "^2.1.1",
+    "@types/cli-progress": "^3.11.0",
     "@types/ejs": "^3.1.2",
     "@types/indent-string": "^4.0.1",
     "@types/js-yaml": "^3.12.7",
     "@types/mocha": "^10.0.2",
-    "@types/node": "^18",
     "@types/node-notifier": "^8.0.2",
+    "@types/node": "^18",
     "@types/slice-ansi": "^4.0.0",
     "@types/strip-ansi": "^5.2.1",
     "@types/supports-color": "^8.1.1",

package/lib/util/index.d.ts

@@ -1,60 +0,0 @@
-/// <reference types="node" />
-import { ArgInput } from '../interfaces/parser';
-import { Command } from '../command';
-export declare function pickBy<T extends {
-    [s: string]: T[keyof T];
-} | ArrayLike<T[keyof T]>>(obj: T, fn: (i: T[keyof T]) => boolean): Partial<T>;
-export declare function compact<T>(a: (T | undefined)[]): T[];
-export declare function uniqBy<T>(arr: T[], fn: (cur: T) => any): T[];
-export declare function last<T>(arr?: T[]): T | undefined;
-type SortTypes = string | number | undefined | boolean;
-export declare function sortBy<T>(arr: T[], fn: (i: T) => SortTypes | SortTypes[]): T[];
-export declare function castArray<T>(input?: T | T[]): T[];
-export declare function isProd(): boolean;
-export declare function maxBy<T>(arr: T[], fn: (i: T) => number): T | undefined;
-export declare function sumBy<T>(arr: T[], fn: (i: T) => number): number;
-export declare function capitalize(s: string): string;
-export declare function exists(path: string): Promise<boolean>;
-export declare const dirExists: (input: string) => Promise<string>;
-export declare const fileExists: (input: string) => Promise<string>;
-export declare function isTruthy(input: string): boolean;
-export declare function isNotFalsy(input: string): boolean;
-export declare function requireJson<T>(...pathParts: string[]): T;
-/**
- * Ensure that the provided args are an object. This is for backwards compatibility with v1 commands which
- * defined args as an array.
- *
- * @param args Either an array of args or an object of args
- * @returns ArgInput
- */
-export declare function ensureArgObject(args?: any[] | ArgInput | {
-    [name: string]: Command.Arg.Cached;
-}): ArgInput;
-export declare function uniq<T>(arr: T[]): T[];
-/**
- * Call os.homedir() and return the result
- *
- * Wrapping this allows us to stub these in tests since os.homedir() is
- * non-configurable and non-writable.
- *
- * @returns The user's home directory
- */
-export declare function getHomeDir(): string;
-/**
- * Call os.platform() and return the result
- *
- * Wrapping this allows us to stub these in tests since os.platform() is
- * non-configurable and non-writable.
- *
- * @returns The process' platform
- */
-export declare function getPlatform(): NodeJS.Platform;
-export declare function readJson<T = unknown>(path: string): Promise<T>;
-export declare function readJsonSync(path: string, parse: false): string;
-export declare function readJsonSync<T = unknown>(path: string, parse?: true): T;
-export declare function mapValues<T extends Record<string, any>, TResult>(obj: {
-    [P in keyof T]: T[P];
-}, fn: (i: T[keyof T], k: keyof T) => TResult): {
-    [P in keyof T]: TResult;
-};
-export {};

package/lib/util/index.js

@@ -1,185 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapValues = exports.readJsonSync = exports.readJson = exports.getPlatform = exports.getHomeDir = exports.uniq = exports.ensureArgObject = exports.requireJson = exports.isNotFalsy = exports.isTruthy = exports.fileExists = exports.dirExists = exports.exists = exports.capitalize = exports.sumBy = exports.maxBy = exports.isProd = exports.castArray = exports.sortBy = exports.last = exports.uniqBy = exports.compact = exports.pickBy = void 0;
-const promises_1 = require("node:fs/promises");
-const node_os_1 = require("node:os");
-const node_path_1 = require("node:path");
-const node_fs_1 = require("node:fs");
-const debug = require('debug');
-function pickBy(obj, fn) {
-    return Object.entries(obj).reduce((o, [k, v]) => {
-        if (fn(v))
-            o[k] = v;
-        return o;
-    }, {});
-}
-exports.pickBy = pickBy;
-function compact(a) {
-    // eslint-disable-next-line unicorn/prefer-native-coercion-functions
-    return a.filter((a) => Boolean(a));
-}
-exports.compact = compact;
-function uniqBy(arr, fn) {
-    return arr.filter((a, i) => {
-        const aVal = fn(a);
-        return !arr.find((b, j) => j > i && fn(b) === aVal);
-    });
-}
-exports.uniqBy = uniqBy;
-function last(arr) {
-    if (!arr)
-        return;
-    return arr.at(-1);
-}
-exports.last = last;
-function compare(a, b) {
-    a = a === undefined ? 0 : a;
-    b = b === undefined ? 0 : b;
-    if (Array.isArray(a) && Array.isArray(b)) {
-        if (a.length === 0 && b.length === 0)
-            return 0;
-        const diff = compare(a[0], b[0]);
-        if (diff !== 0)
-            return diff;
-        return compare(a.slice(1), b.slice(1));
-    }
-    if (a < b)
-        return -1;
-    if (a > b)
-        return 1;
-    return 0;
-}
-function sortBy(arr, fn) {
-    return arr.sort((a, b) => compare(fn(a), fn(b)));
-}
-exports.sortBy = sortBy;
-function castArray(input) {
-    if (input === undefined)
-        return [];
-    return Array.isArray(input) ? input : [input];
-}
-exports.castArray = castArray;
-function isProd() {
-    return !['development', 'test'].includes(process.env.NODE_ENV ?? '');
-}
-exports.isProd = isProd;
-function maxBy(arr, fn) {
-    if (arr.length === 0) {
-        return undefined;
-    }
-    return arr.reduce((maxItem, i) => {
-        const curr = fn(i);
-        const max = fn(maxItem);
-        return curr > max ? i : maxItem;
-    });
-}
-exports.maxBy = maxBy;
-function sumBy(arr, fn) {
-    return arr.reduce((sum, i) => sum + fn(i), 0);
-}
-exports.sumBy = sumBy;
-function capitalize(s) {
-    return s ? s.charAt(0).toUpperCase() + s.slice(1).toLowerCase() : '';
-}
-exports.capitalize = capitalize;
-async function exists(path) {
-    try {
-        await (0, promises_1.access)(path);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-exports.exists = exists;
-const dirExists = async (input) => {
-    if (!(await exists(input))) {
-        throw new Error(`No directory found at ${input}`);
-    }
-    const fileStat = await (0, promises_1.stat)(input);
-    if (!fileStat.isDirectory()) {
-        throw new Error(`${input} exists but is not a directory`);
-    }
-    return input;
-};
-exports.dirExists = dirExists;
-const fileExists = async (input) => {
-    if (!(await exists(input))) {
-        throw new Error(`No file found at ${input}`);
-    }
-    const fileStat = await (0, promises_1.stat)(input);
-    if (!fileStat.isFile()) {
-        throw new Error(`${input} exists but is not a file`);
-    }
-    return input;
-};
-exports.fileExists = fileExists;
-function isTruthy(input) {
-    return ['true', '1', 'yes', 'y'].includes(input.toLowerCase());
-}
-exports.isTruthy = isTruthy;
-function isNotFalsy(input) {
-    return !['false', '0', 'no', 'n'].includes(input.toLowerCase());
-}
-exports.isNotFalsy = isNotFalsy;
-function requireJson(...pathParts) {
-    return JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(...pathParts), 'utf8'));
-}
-exports.requireJson = requireJson;
-/**
- * Ensure that the provided args are an object. This is for backwards compatibility with v1 commands which
- * defined args as an array.
- *
- * @param args Either an array of args or an object of args
- * @returns ArgInput
- */
-function ensureArgObject(args) {
-    return (Array.isArray(args) ? (args ?? []).reduce((x, y) => ({ ...x, [y.name]: y }), {}) : args ?? {});
-}
-exports.ensureArgObject = ensureArgObject;
-function uniq(arr) {
-    return [...new Set(arr)].sort();
-}
-exports.uniq = uniq;
-/**
- * Call os.homedir() and return the result
- *
- * Wrapping this allows us to stub these in tests since os.homedir() is
- * non-configurable and non-writable.
- *
- * @returns The user's home directory
- */
-function getHomeDir() {
-    return (0, node_os_1.homedir)();
-}
-exports.getHomeDir = getHomeDir;
-/**
- * Call os.platform() and return the result
- *
- * Wrapping this allows us to stub these in tests since os.platform() is
- * non-configurable and non-writable.
- *
- * @returns The process' platform
- */
-function getPlatform() {
-    return (0, node_os_1.platform)();
-}
-exports.getPlatform = getPlatform;
-async function readJson(path) {
-    debug('config')('readJson %s', path);
-    const contents = await (0, promises_1.readFile)(path, 'utf8');
-    return JSON.parse(contents);
-}
-exports.readJson = readJson;
-function readJsonSync(path, parse = true) {
-    const contents = (0, node_fs_1.readFileSync)(path, 'utf8');
-    return parse ? JSON.parse(contents) : contents;
-}
-exports.readJsonSync = readJsonSync;
-function mapValues(obj, fn) {
-    return Object.entries(obj).reduce((o, [k, v]) => {
-        o[k] = fn(v, k);
-        return o;
-    }, {});
-}
-exports.mapValues = mapValues;