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

package/lib/args.js

@@ -1,7 +1,7 @@
 "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 util_1 = require("./util");
+const index_1 = require("./util/index");
 const node_url_1 = require("node:url");
 function custom(defaults) {
     return (options = {}) => ({
@@ -14,7 +14,7 @@ function custom(defaults) {
 }
 exports.custom = custom;
 exports.boolean = custom({
-    parse: async (b) => Boolean(b) && (0, util_1.isNotFalsy)(b),
+    parse: async (b) => Boolean(b) && (0, index_1.isNotFalsy)(b),
 });
 exports.integer = custom({
     async parse(input, _, opts) {
@@ -31,14 +31,14 @@ exports.integer = custom({
 exports.directory = custom({
     async parse(input, _, opts) {
         if (opts.exists)
-            return (0, util_1.dirExists)(input);
+            return (0, index_1.dirExists)(input);
         return input;
     },
 });
 exports.file = custom({
     async parse(input, _, opts) {
         if (opts.exists)
-            return (0, util_1.fileExists)(input);
+            return (0, index_1.fileExists)(input);
         return input;
     },
 });

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

@@ -5,13 +5,13 @@ const stream_1 = require("../stream");
 const util_1 = require("../../util");
 const node_util_1 = require("node:util");
 class ActionBase {
-    constructor() {
-        this.std = 'stderr';
-        this.stdmockOrigs = {
-            stdout: stream_1.stdout.write,
-            stderr: stream_1.stderr.write,
-        };
-    }
+    type;
+    std = 'stderr';
+    stdmocks;
+    stdmockOrigs = {
+        stdout: stream_1.stdout.write,
+        stderr: stream_1.stderr.write,
+    };
     start(action, status, opts = {}) {
         this.std = opts.stdout ? 'stdout' : 'stderr';
         const task = { action, status, active: Boolean(this.task && this.task.active) };
@@ -31,6 +31,7 @@ class ActionBase {
         this._stdout(false);
     }
     get globals() {
+        ;
         global.ux = global.ux || {};
         const globals = global.ux;
         globals.action = globals.action || {};

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

@@ -2,10 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const base_1 = require("./base");
 class SimpleAction extends base_1.ActionBase {
-    constructor() {
-        super(...arguments);
-        this.type = 'simple';
-    }
+    type = 'simple';
     _start() {
         if (!this.task)
             return;

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

@@ -8,6 +8,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const screen_1 = require("../../screen");
 const spinners_1 = tslib_1.__importDefault(require("./spinners"));
 const strip_ansi_1 = tslib_1.__importDefault(require("strip-ansi"));
+const ansiEscapes = require('ansi-escapes');
 function color(s) {
     if (!supportsColor)
         return s;
@@ -15,9 +16,12 @@ function color(s) {
     return has256 ? `\u001B[38;5;104m${s}${ansi_styles_1.default.reset.open}` : chalk_1.default.magenta(s);
 }
 class SpinnerAction extends base_1.ActionBase {
+    type = 'spinner';
+    spinner;
+    frames;
+    frameIndex;
     constructor() {
         super();
-        this.type = 'spinner';
         this.frames = this.getFrames();
         this.frameIndex = 0;
     }
@@ -28,7 +32,7 @@ class SpinnerAction extends base_1.ActionBase {
         if (this.spinner)
             clearInterval(this.spinner);
         this._render();
-        this.spinner = setInterval(icon => this._render.bind(this)(icon), process.platform === 'win32' ? 500 : 100, 'spinner');
+        this.spinner = setInterval((icon) => this._render.bind(this)(icon), process.platform === 'win32' ? 500 : 100, 'spinner');
         const interval = this.spinner;
         interval.unref();
     }
@@ -55,7 +59,7 @@ class SpinnerAction extends base_1.ActionBase {
     }
     getFrames(opts) {
         if (opts?.style)
-            return spinners_1.default[process.platform === 'win32' ? 'line' : opts.style].frames;
+            return spinners_1.default[opts.style].frames;
         return spinners_1.default[process.platform === 'win32' ? 'line' : 'dots2'].frames;
     }
     _render(icon) {
@@ -71,15 +75,12 @@ class SpinnerAction extends base_1.ActionBase {
     _reset() {
         if (!this.output)
             return;
-        const ansiEscapes = require('ansi-escapes');
         const lines = this._lines(this.output);
         this._write(this.std, ansiEscapes.cursorLeft + ansiEscapes.cursorUp(lines) + ansiEscapes.eraseDown);
         this.output = undefined;
     }
     _lines(s) {
-        return (0, strip_ansi_1.default)(s).split('\n')
-            .map(l => Math.ceil(l.length / screen_1.errtermwidth))
-            .reduce((c, i) => c + i, 0);
+        return (0, strip_ansi_1.default)(s).split('\n').map((l) => Math.ceil(l.length / screen_1.errtermwidth)).reduce((c, i) => c + i, 0);
     }
 }
 exports.default = SpinnerAction;

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

@@ -159,7 +159,7 @@ exports.default = {
     },
     flip: {
         interval: 70,
-        frames: ['_', '_', '_', '-', '`', '`', '\'', '´', '-', '_', '_', '_'],
+        frames: ['_', '_', '_', '-', '`', '`', "'", '´', '-', '_', '_', '_'],
     },
     hamburger: {
         interval: 100,

package/lib/cli-ux/config.js

@@ -2,23 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = exports.Config = void 0;
 const tslib_1 = require("tslib");
-const util_1 = require("../util");
+const index_1 = require("../util/index");
 const simple_1 = tslib_1.__importDefault(require("./action/simple"));
 const spinner_1 = tslib_1.__importDefault(require("./action/spinner"));
 const g = global;
 const globals = g.ux || (g.ux = {});
-const actionType = (Boolean(process.stderr.isTTY)
-    && !process.env.CI
-    && !['dumb', 'emacs-color'].includes(process.env.TERM)
-    && 'spinner') || 'simple';
+const actionType = (Boolean(process.stderr.isTTY) &&
+    !process.env.CI &&
+    !['dumb', 'emacs-color'].includes(process.env.TERM) &&
+    'spinner') ||
+    'simple';
 const Action = actionType === 'spinner' ? spinner_1.default : simple_1.default;
 class Config {
-    constructor() {
-        this.outputLevel = 'info';
-        this.action = new Action();
-        this.errorsHandled = false;
-        this.showStackTrace = true;
-    }
+    outputLevel = 'info';
+    action = new Action();
+    errorsHandled = false;
+    showStackTrace = true;
     get debug() {
         return globals.debug || process.env.DEBUG === '*';
     }
@@ -34,7 +33,7 @@ class Config {
 }
 exports.Config = Config;
 function fetch() {
-    const major = (0, util_1.requireJson)(__dirname, '..', '..', 'package.json').version.split('.')[0];
+    const major = (0, index_1.requireJson)(__dirname, '..', '..', 'package.json').version.split('.')[0];
     if (globals[major])
         return globals[major];
     globals[major] = new Config();

package/lib/cli-ux/exit.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExitError = void 0;
 class ExitError extends Error {
+    ux;
+    code;
+    error;
     constructor(status, error) {
         const code = 'EEXIT';
         super(error ? error.message : `${code}: ${status}`);

package/lib/cli-ux/flush.js

@@ -1,22 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.flush = void 0;
-const __1 = require("..");
+const errors_1 = require("../errors");
+const stream_1 = require("./stream");
 function timeout(p, ms) {
     function wait(ms, unref = false) {
-        return new Promise(resolve => {
+        return new Promise((resolve) => {
             const t = setTimeout(() => resolve(null), ms);
             if (unref)
                 t.unref();
         });
     }
-    return Promise.race([p, wait(ms, true).then(() => __1.Errors.error('timed out'))]);
+    return Promise.race([p, wait(ms, true).then(() => (0, errors_1.error)('timed out'))]);
 }
 async function _flush() {
-    const p = new Promise(resolve => {
-        __1.stdout.once('drain', () => resolve(null));
+    const p = new Promise((resolve) => {
+        stream_1.stdout.once('drain', () => resolve(null));
     });
-    const flushed = __1.stdout.write('');
+    const flushed = stream_1.stdout.write('');
     if (flushed)
         return;
     return p;

package/lib/cli-ux/index.js

@@ -13,6 +13,7 @@ const node_util_1 = require("node:util");
 const wait_1 = tslib_1.__importDefault(require("./wait"));
 const hyperlinker = require('hyperlinker');
 class ux {
+    static config = config_1.config;
     static get prompt() {
         return uxPrompt.prompt;
     }
@@ -92,7 +93,6 @@ class ux {
     }
 }
 exports.ux = ux;
-ux.config = config_1.config;
 const { action, annotation, anykey, confirm, debug, done, flush, info, log, progress, prompt, styledHeader, styledJSON, styledObject, table, trace, tree, url, wait, } = ux;
 exports.action = action;
 exports.annotation = annotation;
@@ -128,7 +128,7 @@ const uxProcessExitHandler = async () => {
 };
 // to avoid MaxListenersExceededWarning
 // only attach named listener once
-const uxListener = process.listeners('exit').find(fn => fn.name === uxProcessExitHandler.name);
+const uxListener = process.listeners('exit').find((fn) => fn.name === uxProcessExitHandler.name);
 if (!uxListener) {
     process.once('exit', uxProcessExitHandler);
 }

package/lib/cli-ux/list.js

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

package/lib/cli-ux/prompt.js

@@ -21,7 +21,7 @@ function normal(options, retries = 100) {
         process.stdin.setEncoding('utf8');
         stream_1.stderr.write(options.prompt);
         process.stdin.resume();
-        process.stdin.once('data', b => {
+        process.stdin.once('data', (b) => {
             if (timer)
                 clearTimeout(timer);
             process.stdin.pause();
@@ -58,8 +58,13 @@ async function single(options) {
 }
 function replacePrompt(prompt) {
     const ansiEscapes = require('ansi-escapes');
-    stream_1.stderr.write(ansiEscapes.cursorHide + ansiEscapes.cursorUp(1) + ansiEscapes.cursorLeft + prompt
-        + ansiEscapes.cursorDown(1) + ansiEscapes.cursorLeft + ansiEscapes.cursorShow);
+    stream_1.stderr.write(ansiEscapes.cursorHide +
+        ansiEscapes.cursorUp(1) +
+        ansiEscapes.cursorLeft +
+        prompt +
+        ansiEscapes.cursorDown(1) +
+        ansiEscapes.cursorLeft +
+        ansiEscapes.cursorShow);
 }
 async function _prompt(name, inputOptions = {}) {
     const prompt = getPrompt(name, inputOptions.type, inputOptions.default);

package/lib/cli-ux/stream.js

@@ -5,6 +5,7 @@ exports.stderr = exports.stdout = void 0;
  * A wrapper around process.stdout and process.stderr that allows us to mock out the streams for testing.
  */
 class Stream {
+    channel;
     constructor(channel) {
         this.channel = channel;
     }

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

@@ -2,15 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const index_1 = require("../../index");
+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) {
-        index_1.ux.info(json);
+        info(json);
         return;
     }
     const cardinal = require('cardinal');
     const theme = require('cardinal/themes/jq');
-    index_1.ux.info(cardinal.highlight(json, { json: true, theme }));
+    info(cardinal.highlight(json, { json: true, theme }));
 }
 exports.default = styledJSON;

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

@@ -5,14 +5,14 @@ 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);
+    const keyLengths = Object.keys(obj).map((key) => key.toString().length);
     const maxKeyLength = Math.max(...keyLengths) + 2;
     function pp(obj) {
         if (typeof obj === 'string' || typeof obj === 'number')
             return obj;
         if (typeof obj === 'object') {
             return Object.keys(obj)
-                .map(k => k + ': ' + (0, node_util_1.inspect)(obj[k]))
+                .map((k) => k + ': ' + (0, node_util_1.inspect)(obj[k]))
                 .join(', ');
         }
         return (0, node_util_1.inspect)(obj);

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

@@ -13,6 +13,9 @@ const stream_1 = require("../stream");
 const screen_1 = require("../../screen");
 const string_width_1 = tslib_1.__importDefault(require("string-width"));
 class Table {
+    data;
+    options;
+    columns;
     constructor(data, columns, options = {}) {
         this.data = data;
         // assign columns
@@ -48,7 +51,7 @@ class Table {
     }
     display() {
         // build table rows from input array data
-        let rows = this.data.map(d => {
+        let rows = this.data.map((d) => {
             const row = {};
             for (const col of this.columns) {
                 let val = col.get(d);
@@ -77,9 +80,9 @@ class Table {
         // sort rows
         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 => ((v) => v[c.key]));
-            const sortKeysOrder = sorters.map(k => k[0] === '-' ? 'desc' : 'asc');
+            const sortHeaders = sorters.map((k) => (k[0] === '-' ? k.slice(1) : k));
+            const sortKeys = this.filterColumnsFromHeaders(sortHeaders).map((c) => (v) => v[c.key]);
+            const sortKeysOrder = sorters.map((k) => (k[0] === '-' ? 'desc' : 'asc'));
             rows = (0, natural_orderby_1.orderBy)(rows, sortKeys, sortKeysOrder);
         }
         // and filter columns
@@ -89,7 +92,7 @@ class Table {
         }
         else if (!this.options.extended) {
             // show extented columns/properties
-            this.columns = this.columns.filter(c => !c.extended);
+            this.columns = this.columns.filter((c) => !c.extended);
         }
         this.data = rows;
         switch (this.options.output) {
@@ -111,27 +114,27 @@ class Table {
         }
     }
     findColumnFromHeader(header) {
-        return this.columns.find(c => c.header.toLowerCase() === header.toLowerCase());
+        return this.columns.find((c) => c.header.toLowerCase() === header.toLowerCase());
     }
     filterColumnsFromHeaders(filters) {
         // unique
-        filters = [...(new Set(filters))];
+        filters = [...new Set(filters)];
         const cols = [];
         for (const f of filters) {
-            const c = this.columns.find(c => c.header.toLowerCase() === f.toLowerCase());
+            const c = this.columns.find((c) => c.header.toLowerCase() === f.toLowerCase());
             if (c)
                 cols.push(c);
         }
         return cols;
     }
     getCSVRow(d) {
-        const values = this.columns.map(col => d[col.key] || '');
+        const values = this.columns.map((col) => d[col.key] || '');
         const lineToBeEscaped = values.find((e) => e.includes('"') || e.includes('\n') || e.includes('\r\n') || e.includes('\r') || e.includes(','));
-        return values.map(e => lineToBeEscaped ? `"${e.replace('"', '""')}"` : e);
+        return values.map((e) => (lineToBeEscaped ? `"${e.replace('"', '""')}"` : e));
     }
     resolveColumnsToObjectArray() {
         const { data, columns } = this;
-        return data.map((d) => Object.fromEntries(columns.map(col => [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));
@@ -142,7 +145,7 @@ class Table {
     outputCSV() {
         const { data, columns, options } = this;
         if (!options['no-header']) {
-            options.printLine(columns.map(c => c.header).join(','));
+            options.printLine(columns.map((c) => c.header).join(','));
         }
         for (const d of data) {
             const row = this.getCSVRow(d);
@@ -154,7 +157,7 @@ class Table {
         // column truncation
         //
         // find max width for each column
-        const columns = this.columns.map(c => {
+        const columns = this.columns.map((c) => {
             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,
@@ -170,7 +173,7 @@ class Table {
             if (options['no-truncate'] || (!stream_1.stdout.isTTY && !process.env.CLI_UX_SKIP_TTY_CHECK))
                 return;
             // don't shorten if there is enough screen width
-            const dataMaxWidth = (0, util_1.sumBy)(columns, c => c.width);
+            const dataMaxWidth = (0, util_1.sumBy)(columns, (c) => c.width);
             const overWidth = dataMaxWidth - maxWidth;
             if (overWidth <= 0)
                 return;
@@ -181,16 +184,18 @@ class Table {
             // if sum(minWidth's) is greater than term width
             // nothing can be done so
             // display all as minWidth
-            const dataMinWidth = (0, util_1.sumBy)(columns, c => c.minWidth);
+            const dataMinWidth = (0, util_1.sumBy)(columns, (c) => c.minWidth);
             if (dataMinWidth >= maxWidth)
                 return;
             // some wiggle room left, add it back to "needy" columns
             let wiggleRoom = maxWidth - dataMinWidth;
-            const needyCols = columns.map(c => ({ key: c.key, needs: c.maxWidth - c.width })).sort((a, b) => a.needs - b.needs);
+            const needyCols = columns
+                .map((c) => ({ key: c.key, needs: c.maxWidth - c.width }))
+                .sort((a, b) => a.needs - b.needs);
             for (const { key, needs } of needyCols) {
                 if (!needs)
                     continue;
-                const col = columns.find(c => key === c.key);
+                const col = columns.find((c) => key === c.key);
                 if (!col)
                     continue;
                 if (wiggleRoom > needs) {
@@ -250,9 +255,9 @@ class Table {
                     let d = row[col.key];
                     d = d.split('\n')[i] || '';
                     const visualWidth = (0, string_width_1.default)(d);
-                    const colorWidth = (d.length - visualWidth);
+                    const colorWidth = d.length - visualWidth;
                     let cell = d.padEnd(width + colorWidth);
-                    if ((cell.length - colorWidth) > width || visualWidth === width) {
+                    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 = (0, slice_ansi_1.default)(cell, 0, width - 2) + '… ';
@@ -274,7 +279,7 @@ exports.table = table;
 (function (table) {
     table.Flags = {
         columns: F.string({ exclusive: ['extended'], description: 'only show provided columns (comma-separated)' }),
-        sort: F.string({ description: 'property to sort by (prepend \'-\' for descending)' }),
+        sort: F.string({ description: "property to sort by (prepend '-' for descending)" }),
         filter: F.string({ description: 'filter property by partial string matching, ex: name=foo' }),
         csv: F.boolean({ exclusive: ['no-truncate'], description: 'output is csv format [alias: --output=csv]' }),
         output: F.string({
@@ -293,6 +298,7 @@ exports.table = table;
             const e = (opts.except && typeof opts.except === 'string' ? [opts.except] : opts.except) || [];
             for (const key of o) {
                 if (!e.includes(key)) {
+                    ;
                     f[key] = table.Flags[key];
                 }
             }

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

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tree = void 0;
 const treeify = require('object-treeify');
 class Tree {
-    constructor() {
-        this.nodes = {};
-    }
+    nodes = {};
     insert(child, value = new Tree()) {
         this.nodes[child] = value;
         return this;

package/lib/cli-ux/wait.js

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

package/lib/command.d.ts

@@ -65,13 +65,7 @@ export declare abstract class Command {
      */
     static examples: Command.Example[];
     static hasDynamicHelp: boolean;
-    protected static '_--': boolean;
-    protected static _enableJsonFlag: boolean;
-    static get enableJsonFlag(): boolean;
-    static set enableJsonFlag(value: boolean);
-    static get '--'(): boolean;
-    static set '--'(value: boolean);
-    get passThroughEnabled(): boolean;
+    static enableJsonFlag: boolean;
     /**
      * instantiate and run the command
      *
@@ -81,13 +75,9 @@ export declare abstract class Command {
      * @returns {Promise<unknown>} result
      */
     static run<T extends Command>(this: new (argv: string[], config: Config) => T, argv?: string[], opts?: LoadOptions): Promise<ReturnType<T['run']>>;
-    protected static _baseFlags: FlagInput;
-    static get baseFlags(): FlagInput;
-    static set baseFlags(flags: FlagInput);
+    static baseFlags: FlagInput;
     /** A hash of flags for the command */
-    protected static _flags: FlagInput;
-    static get flags(): FlagInput;
-    static set flags(flags: FlagInput);
+    static flags: FlagInput;
     id: string | undefined;
     protected debug: (...args: any[]) => void;
     constructor(argv: string[], config: Config);
@@ -164,7 +154,9 @@ export declare namespace Command {
     };
     type Flag = IFlag<any>;
     namespace Flag {
-        type Cached = Omit<Flag, 'parse' | 'input'> & (BooleanFlagProps | OptionFlagProps);
+        type Cached = Omit<Flag, 'parse' | 'input'> & (BooleanFlagProps | OptionFlagProps) & {
+            hasDynamicHelp?: boolean;
+        };
         type Any = Flag | Cached;
     }
     type Arg = IArg<any>;