@oclif/core 3.0.0-beta.7 → 3.0.0-beta.9

package/lib/index.d.ts

@@ -13,7 +13,7 @@ import * as Parser from './parser';
 import { Hook } from './interfaces/hooks';
 import settings, { Settings } from './settings';
 import { HelpSection, HelpSectionRenderer, HelpSectionKeyValueTable } from './help/formatter';
-import ux from './ux';
+import * as ux from './ux';
 import { stderr, stdout } from './ux/stream';
 import Performance from './performance';
 import flush from './ux/flush';

package/lib/index.js

@@ -34,8 +34,8 @@ const Parser = require("./parser");
 exports.Parser = Parser;
 const settings_1 = require("./settings");
 exports.settings = settings_1.default;
-const ux_1 = require("./ux");
-exports.ux = ux_1.default;
+const ux = require("./ux");
+exports.ux = ux;
 const stream_1 = require("./ux/stream");
 Object.defineProperty(exports, "stderr", { enumerable: true, get: function () { return stream_1.stderr; } });
 Object.defineProperty(exports, "stdout", { enumerable: true, get: function () { return stream_1.stdout; } });

package/lib/ux/index.d.ts

@@ -1,3 +1,4 @@
+import * as Errors from '../errors';
 import { ActionBase } from './action/base';
 import { config, Config } from './config';
 import { ExitError } from './exit';
@@ -31,11 +32,27 @@ export default class ux {
     static url(text: string, uri: string, params?: {}): void;
     static annotation(text: string, annotation: string): void;
     static flush(ms?: number): Promise<void>;
-    static error(err: Error | string, options?: {
-        code?: string;
-        exit?: number;
-    }): never;
-    static exit(code?: number): never;
-    static warn(err: Error | string): void;
 }
-export { ActionBase, config, Config, ExitError, IPromptOptions, Table, };
+declare const action: ActionBase;
+declare const annotation: typeof ux.annotation;
+declare const anykey: typeof uxPrompt.anykey;
+declare const confirm: typeof uxPrompt.confirm;
+declare const debug: typeof ux.debug;
+declare const done: typeof ux.done;
+declare const error: typeof Errors.error;
+declare const exit: typeof Errors.exit;
+declare const flush: typeof ux.flush;
+declare const info: typeof ux.info;
+declare const log: typeof ux.log;
+declare const progress: typeof styled.progress;
+declare const prompt: typeof uxPrompt.prompt;
+declare const styledHeader: typeof ux.styledHeader;
+declare const styledJSON: typeof styled.styledJSON;
+declare const styledObject: typeof ux.styledObject;
+declare const table: typeof styled.Table.table;
+declare const trace: typeof ux.trace;
+declare const tree: typeof styled.tree;
+declare const url: typeof ux.url;
+declare const wait: (ms?: number) => Promise<void>;
+declare const warn: typeof Errors.warn;
+export { action, annotation, anykey, confirm, debug, done, error, exit, flush, info, log, progress, prompt, styledHeader, styledJSON, styledObject, table, trace, tree, url, wait, warn, ActionBase, config, Config, ExitError, IPromptOptions, Table, };

package/lib/ux/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Table = exports.ExitError = exports.Config = exports.config = exports.ActionBase = void 0;
+exports.Table = exports.ExitError = exports.Config = exports.config = exports.ActionBase = exports.warn = exports.wait = exports.url = exports.tree = exports.trace = exports.table = exports.styledObject = exports.styledJSON = exports.styledHeader = exports.prompt = exports.progress = exports.log = exports.info = exports.flush = exports.exit = exports.error = exports.done = exports.debug = exports.confirm = exports.anykey = exports.annotation = exports.action = void 0;
 const tslib_1 = require("tslib");
 const Errors = require("../errors");
 const util = require("util");
@@ -19,7 +19,7 @@ tslib_1.__exportStar(require("./styled/table"), exports);
 const uxPrompt = require("./prompt");
 const wait_1 = require("./wait");
 const stream_1 = require("./stream");
-const flush_1 = require("./flush");
+const _flush = require("./flush");
 const hyperlinker = require('hyperlinker');
 class ux {
     static get prompt() {
@@ -39,10 +39,10 @@ class ux {
     }
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     static styledObject(obj, keys) {
-        this.log(styled.styledObject(obj, keys));
+        this.info(styled.styledObject(obj, keys));
     }
     static styledHeader(header) {
-        this.log(chalk.dim('=== ') + chalk.bold(header) + '\n');
+        this.info(chalk.dim('=== ') + chalk.bold(header) + '\n');
     }
     static get styledJSON() {
         return styled.styledJSON;
@@ -63,12 +63,12 @@ class ux {
         config_1.config.action.stop();
     }
     static trace(format, ...args) {
-        if (ux.config.outputLevel === 'trace') {
+        if (this.config.outputLevel === 'trace') {
             stream_1.stdout.write(util.format(format, ...args) + '\n');
         }
     }
     static debug(format, ...args) {
-        if (['trace', 'debug'].includes(ux.config.outputLevel)) {
+        if (['trace', 'debug'].includes(this.config.outputLevel)) {
             stream_1.stdout.write(util.format(format, ...args) + '\n');
         }
     }
@@ -98,20 +98,55 @@ class ux {
         }
     }
     static async flush(ms = 10000) {
-        await (0, flush_1.default)(ms);
-    }
-    static error(err, options = {}) {
-        throw Errors.error(err, options);
-    }
-    static exit(code = 0) {
-        throw Errors.exit(code);
-    }
-    static warn(err) {
-        Errors.warn(err);
+        await _flush.default(ms);
     }
 }
 exports.default = ux;
 ux.config = config_1.config;
+const action = ux.action;
+exports.action = action;
+const annotation = ux.annotation;
+exports.annotation = annotation;
+const anykey = ux.anykey;
+exports.anykey = anykey;
+const confirm = ux.confirm;
+exports.confirm = confirm;
+const debug = ux.debug;
+exports.debug = debug;
+const done = ux.done;
+exports.done = done;
+const error = Errors.error;
+exports.error = error;
+const exit = Errors.exit;
+exports.exit = exit;
+const flush = ux.flush;
+exports.flush = flush;
+const info = ux.info;
+exports.info = info;
+const log = ux.log;
+exports.log = log;
+const progress = ux.progress;
+exports.progress = progress;
+const prompt = ux.prompt;
+exports.prompt = prompt;
+const styledHeader = ux.styledHeader;
+exports.styledHeader = styledHeader;
+const styledJSON = ux.styledJSON;
+exports.styledJSON = styledJSON;
+const styledObject = ux.styledObject;
+exports.styledObject = styledObject;
+const table = ux.table;
+exports.table = table;
+const trace = ux.trace;
+exports.trace = trace;
+const tree = ux.tree;
+exports.tree = tree;
+const url = ux.url;
+exports.url = url;
+const wait = ux.wait;
+exports.wait = wait;
+const warn = Errors.warn;
+exports.warn = warn;
 const uxProcessExitHandler = async () => {
     try {
         await ux.done();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.9",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -96,10 +96,8 @@
     "./execute": "./lib/execute.js",
     "./flush": "./lib/ux/flush.js",
     "./handle": "./lib/errors/handle.js",
-    "./interfaces": "./lib/interfaces/index.js",
     "./run": "./lib/main.js",
-    "./settings": "./lib/settings.js",
-    "./ux": "./lib/ux/index.js"
+    "./settings": "./lib/settings.js"
   },
   "repository": "oclif/core",
   "oclif": {