@oclif/core 1.12.1 → 1.13.0

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.13.0](https://github.com/oclif/core/compare/v1.12.1...v1.13.0) (2022-07-28)
+
+
+### Features
+
+* drop node12, use es2020 ([ac749e3](https://github.com/oclif/core/commit/ac749e32917400386f0ee4056aa5b66a52f3d0e0))
+* min/max for integer flag ([7e05ef7](https://github.com/oclif/core/commit/7e05ef7195269012055f30095552e61359fad47e))
+* node14/es2020 for bigint, pr feedback ([03a50b8](https://github.com/oclif/core/commit/03a50b874a8e7ef621c23d846e63864e3850ee4a))
+
 ### [1.12.1](https://github.com/oclif/core/compare/v1.12.0...v1.12.1) (2022-07-21)
 
 

package/lib/cli-ux/list.js

@@ -11,11 +11,10 @@ function linewrap(length, s) {
     })(s).trim();
 }
 function renderList(items) {
-    var _a, _b;
     if (items.length === 0) {
         return '';
     }
-    const maxLength = (_b = (_a = (0, util_1.maxBy)(items, item => item[0].length)) === null || _a === void 0 ? void 0 : _a[0].length) !== null && _b !== void 0 ? _b : 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/prompt.js

@@ -46,11 +46,10 @@ function getPrompt(name, type, defaultValue) {
     return prompt;
 }
 async function single(options) {
-    var _a;
     const raw = process.stdin.isRaw;
     if (process.stdin.setRawMode)
         process.stdin.setRawMode(true);
-    options.required = (_a = options.required) !== null && _a !== void 0 ? _a : false;
+    options.required = options.required ?? false;
     const response = await normal(options);
     if (process.stdin.setRawMode)
         process.stdin.setRawMode(Boolean(raw));

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

@@ -11,17 +11,15 @@ const sw = require('string-width');
 const { orderBy } = require('natural-orderby');
 class Table {
     constructor(data, columns, options = {}) {
-        var _a, _b;
         this.data = data;
         // assign columns
         this.columns = Object.keys(columns).map((key) => {
-            var _a, _b, _c;
             const col = columns[key];
-            const extended = (_a = col.extended) !== null && _a !== void 0 ? _a : false;
+            const extended = col.extended ?? false;
             // turn null and undefined into empty strings by default
-            const get = (_b = col.get) !== null && _b !== void 0 ? _b : ((row) => { var _a; return (_a = row[key]) !== null && _a !== void 0 ? _a : ''; });
+            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((_c = col.minWidth) !== null && _c !== void 0 ? _c : 0, sw(header) + 1);
+            const minWidth = Math.max(col.minWidth ?? 0, sw(header) + 1);
             return {
                 extended,
                 get,
@@ -37,9 +35,9 @@ class Table {
             output: csv ? 'csv' : output,
             extended,
             filter,
-            'no-header': (_a = options['no-header']) !== null && _a !== void 0 ? _a : false,
-            'no-truncate': (_b = options['no-truncate']) !== null && _b !== void 0 ? _b : false,
-            printLine: printLine !== null && printLine !== void 0 ? printLine : ((s) => process.stdout.write(s + '\n')),
+            'no-header': options['no-header'] ?? false,
+            'no-truncate': options['no-truncate'] ?? false,
+            printLine: printLine ?? ((s) => process.stdout.write(s + '\n')),
             rowStart: ' ',
             sort,
             title,
@@ -133,10 +131,9 @@ class Table {
         return data.map((d) => {
             // eslint-disable-next-line unicorn/prefer-object-from-entries
             return columns.reduce((obj, col) => {
-                var _a;
                 return {
                     ...obj,
-                    [col.key]: (_a = d[col.key]) !== null && _a !== void 0 ? _a : '',
+                    [col.key]: d[col.key] ?? '',
                 };
             }, {});
         });

package/lib/command.js

@@ -58,8 +58,7 @@ class Command {
         return this._flags;
     }
     static set flags(flags) {
-        var _a;
-        this._flags = Object.assign({}, (_a = this._flags) !== null && _a !== void 0 ? _a : {}, this.globalFlags, flags);
+        this._flags = Object.assign({}, this._flags ?? {}, this.globalFlags, flags);
     }
     get ctor() {
         return this.constructor;
@@ -130,12 +129,11 @@ class Command {
             options = this.constructor;
         const opts = { context: this, ...options };
         // the spread operator doesn't work with getters so we have to manually add it here
-        opts.flags = Object.assign({}, options === null || options === void 0 ? void 0 : options.flags, options === null || options === void 0 ? void 0 : options.globalFlags);
+        opts.flags = Object.assign({}, options?.flags, options?.globalFlags);
         return Parser.parse(argv, opts);
     }
     async catch(err) {
-        var _a, _b;
-        process.exitCode = (_b = (_a = process.exitCode) !== null && _a !== void 0 ? _a : err.exitCode) !== null && _b !== void 0 ? _b : 1;
+        process.exitCode = process.exitCode ?? err.exitCode ?? 1;
         if (this.jsonEnabled()) {
             index_1.CliUx.ux.styledJSON(this.toErrorJson(err));
         }

package/lib/config/config.js

@@ -40,8 +40,7 @@ class Permutations extends Map {
         }
     }
     get(key) {
-        var _a;
-        return (_a = super.get(key)) !== null && _a !== void 0 ? _a : new Set();
+        return super.get(key) ?? new Set();
     }
     getValid(key) {
         return this.validPermutations.get(key);
@@ -357,12 +356,11 @@ class Config {
         return [...this._topics.values()];
     }
     s3Key(type, ext, options = {}) {
-        var _a;
         if (typeof ext === 'object')
             options = ext;
         else if (ext)
             options.ext = ext;
-        const template = (_a = this.pjson.oclif.update.s3.templates[options.platform ? 'target' : 'vanilla'][type]) !== null && _a !== void 0 ? _a : '';
+        const template = this.pjson.oclif.update.s3.templates[options.platform ? 'target' : 'vanilla'][type] ?? '';
         return ejs.render(template, { ...this, ...options });
     }
     s3Url(key) {
@@ -501,7 +499,6 @@ class Config {
         return id;
     }
     loadCommands(plugin) {
-        var _a;
         for (const command of plugin.commands) {
             if (this._commands.has(command.id)) {
                 const prioritizedCommand = this.determinePriority([this._commands.get(command.id), command]);
@@ -514,7 +511,7 @@ class Config {
             for (const permutation of permutations) {
                 this.commandPermutations.add(permutation, command.id);
             }
-            for (const alias of (_a = command.aliases) !== null && _a !== void 0 ? _a : []) {
+            for (const alias of command.aliases ?? []) {
                 if (this._commands.has(alias)) {
                     const prioritizedCommand = this.determinePriority([this._commands.get(alias), command]);
                     this._commands.set(prioritizedCommand.id, { ...prioritizedCommand, id: alias });
@@ -576,12 +573,10 @@ class Config {
      * @returns command instance {Command.Loadable} or undefined
      */
     determinePriority(commands) {
-        var _a, _b;
-        const oclifPlugins = (_b = (_a = this.pjson.oclif) === null || _a === void 0 ? void 0 : _a.plugins) !== null && _b !== void 0 ? _b : [];
+        const oclifPlugins = this.pjson.oclif?.plugins ?? [];
         const commandPlugins = commands.sort((a, b) => {
-            var _a, _b;
-            const pluginAliasA = (_a = a.pluginAlias) !== null && _a !== void 0 ? _a : 'A-Cannot-Find-This';
-            const pluginAliasB = (_b = b.pluginAlias) !== null && _b !== void 0 ? _b : 'B-Cannot-Find-This';
+            const pluginAliasA = a.pluginAlias ?? 'A-Cannot-Find-This';
+            const pluginAliasB = b.pluginAlias ?? 'B-Cannot-Find-This';
             const aIndex = oclifPlugins.indexOf(pluginAliasA);
             const bIndex = oclifPlugins.indexOf(pluginAliasB);
             // When both plugin types are 'core' plugins sort based on index

package/lib/config/plugin.js

@@ -99,7 +99,6 @@ class Plugin {
         this.warned = false;
     }
     async load() {
-        var _a;
         this.type = this.options.type || 'core';
         this.tag = this.options.tag;
         const root = await findRoot(this.options.name, this.options.root);
@@ -109,7 +108,7 @@ class Plugin {
         this._debug('reading %s plugin %s', this.type, root);
         this.pjson = await (0, util_3.loadJSON)(path.join(root, 'package.json'));
         this.name = this.pjson.name;
-        this.alias = (_a = this.options.name) !== null && _a !== void 0 ? _a : this.pjson.name;
+        this.alias = this.options.name ?? this.pjson.name;
         const pjsonPath = path.join(root, 'package.json');
         if (!this.name)
             throw new Error(`no name in ${pjsonPath}`);

package/lib/errors/errors/cli.js

@@ -14,7 +14,7 @@ function addOclifExitCode(error, options) {
     if (!('oclif' in error)) {
         error.oclif = {};
     }
-    error.oclif.exit = (options === null || options === void 0 ? void 0 : options.exit) === undefined ? 2 : options.exit;
+    error.oclif.exit = options?.exit === undefined ? 2 : options.exit;
     return error;
 }
 exports.addOclifExitCode = addOclifExitCode;

package/lib/errors/handle.js

@@ -9,7 +9,6 @@ const _1 = require(".");
 const clean = require("clean-stack");
 const cli_1 = require("./errors/cli");
 const handle = (err) => {
-    var _a, _b, _c;
     try {
         if (!err)
             err = new cli_1.CLIError('no error?');
@@ -21,7 +20,7 @@ const handle = (err) => {
         if (shouldPrint) {
             console.error(pretty ? pretty : stack);
         }
-        const exitCode = ((_a = err.oclif) === null || _a === void 0 ? void 0 : _a.exit) !== undefined && ((_b = err.oclif) === null || _b === void 0 ? void 0 : _b.exit) !== false ? (_c = err.oclif) === null || _c === void 0 ? void 0 : _c.exit : 1;
+        const exitCode = err.oclif?.exit !== undefined && err.oclif?.exit !== false ? err.oclif?.exit : 1;
         if (config_1.config.errorLogger && err.code !== 'EEXIT') {
             if (stack) {
                 config_1.config.errorLogger.log(stack);

package/lib/errors/index.js

@@ -23,7 +23,6 @@ function exit(code = 0) {
 }
 exports.exit = exit;
 function error(input, options = {}) {
-    var _a;
     let err;
     if (typeof input === 'string') {
         err = new cli_2.CLIError(input, options);
@@ -39,14 +38,13 @@ function error(input, options = {}) {
         const message = (0, pretty_print_1.default)(err);
         console.error(message);
         if (config_2.config.errorLogger)
-            config_2.config.errorLogger.log((_a = err === null || err === void 0 ? void 0 : err.stack) !== null && _a !== void 0 ? _a : '');
+            config_2.config.errorLogger.log(err?.stack ?? '');
     }
     else
         throw err;
 }
 exports.error = error;
 function warn(input) {
-    var _a;
     let err;
     if (typeof input === 'string') {
         err = new cli_2.CLIError.Warn(input);
@@ -60,6 +58,6 @@ function warn(input) {
     const message = (0, pretty_print_1.default)(err);
     console.error(message);
     if (config_2.config.errorLogger)
-        config_2.config.errorLogger.log((_a = err === null || err === void 0 ? void 0 : err.stack) !== null && _a !== void 0 ? _a : '');
+        config_2.config.errorLogger.log(err?.stack ?? '');
 }
 exports.warn = warn;

package/lib/help/docopts.js

@@ -73,10 +73,9 @@ class DocOpts {
         return new DocOpts(cmd).toString();
     }
     toString() {
-        var _a;
         const opts = this.cmd.id === '.' || this.cmd.id === '' ? [] : ['<%= command.id %>'];
         if (this.cmd.args) {
-            const a = ((_a = this.cmd.args) === null || _a === void 0 ? void 0 : _a.map(arg => `[${arg.name.toUpperCase()}]`)) || [];
+            const a = this.cmd.args?.map(arg => `[${arg.name.toUpperCase()}]`) || [];
             opts.push(...a);
         }
         try {
@@ -119,13 +118,12 @@ class DocOpts {
         return elementMap;
     }
     combineElementsToFlag(elementMap, flagName, flagNames, unionString) {
-        var _a;
         if (!this.flagMap[flagName]) {
             return;
         }
-        let isRequired = (_a = this.flagMap[flagName]) === null || _a === void 0 ? void 0 : _a.required;
+        let isRequired = this.flagMap[flagName]?.required;
         if (typeof isRequired !== 'boolean' || !isRequired) {
-            isRequired = flagNames.reduce((required, toCombine) => { var _a; return required || ((_a = this.flagMap[toCombine]) === null || _a === void 0 ? void 0 : _a.required) || false; }, false);
+            isRequired = flagNames.reduce((required, toCombine) => required || this.flagMap[toCombine]?.required || false, false);
         }
         for (const toCombine of flagNames) {
             elementMap[flagName] = `${elementMap[flagName] || ''}${unionString}${elementMap[toCombine] || ''}`;

package/lib/help/index.js

@@ -112,13 +112,12 @@ class Help extends HelpBase {
         (0, errors_1.error)(`Command ${subject} not found.`);
     }
     async showCommandHelp(command) {
-        var _a, _b, _c, _d;
         const name = command.id;
         const depth = name.split(':').length;
         const subTopics = this.sortedTopics.filter(t => t.name.startsWith(name + ':') && t.name.split(':').length === depth + 1);
         const subCommands = this.sortedCommands.filter(c => c.id.startsWith(name + ':') && c.id.split(':').length === depth + 1);
         const plugin = this.config.plugins.find(p => p.name === command.pluginName);
-        const state = ((_b = (_a = this.config.pjson) === null || _a === void 0 ? void 0 : _a.oclif) === null || _b === void 0 ? void 0 : _b.state) || ((_d = (_c = plugin === null || plugin === void 0 ? void 0 : plugin.pjson) === null || _c === void 0 ? void 0 : _c.oclif) === null || _d === void 0 ? void 0 : _d.state) || command.state;
+        const state = this.config.pjson?.oclif?.state || plugin?.pjson?.oclif?.state || command.state;
         if (state)
             this.log(`This command is in ${state}.\n`);
         const summary = this.summary(command);
@@ -137,10 +136,9 @@ class Help extends HelpBase {
         }
     }
     async showRootHelp() {
-        var _a, _b;
         let rootTopics = this.sortedTopics;
         let rootCommands = this.sortedCommands;
-        const state = (_b = (_a = this.config.pjson) === null || _a === void 0 ? void 0 : _a.oclif) === null || _b === void 0 ? void 0 : _b.state;
+        const state = this.config.pjson?.oclif?.state;
         if (state)
             this.log(`${this.config.bin} is in ${state}.\n`);
         this.log(this.formatRoot());
@@ -160,12 +158,11 @@ class Help extends HelpBase {
         }
     }
     async showTopicHelp(topic) {
-        var _a, _b;
         const name = topic.name;
         const depth = name.split(':').length;
         const subTopics = this.sortedTopics.filter(t => t.name.startsWith(name + ':') && t.name.split(':').length === depth + 1);
         const commands = this.sortedCommands.filter(c => c.id.startsWith(name + ':') && c.id.split(':').length === depth + 1);
-        const state = (_b = (_a = this.config.pjson) === null || _a === void 0 ? void 0 : _a.oclif) === null || _b === void 0 ? void 0 : _b.state;
+        const state = this.config.pjson?.oclif?.state;
         if (state)
             this.log(`This topic is in ${state}.\n`);
         this.log(this.formatTopic(topic));

package/lib/help/util.js

@@ -41,12 +41,11 @@ function collateSpacedCmdIDFromArgs(argv, config) {
         const isArgWithValue = (s) => s.includes('=');
         const finalizeId = (s) => s ? [...final, s].join(':') : final.join(':');
         const hasArgs = () => {
-            var _a;
             const id = finalizeId();
             if (!id)
                 return false;
             const cmd = config.findCommand(id);
-            return Boolean(cmd && (cmd.strict === false || ((_a = cmd.args) === null || _a === void 0 ? void 0 : _a.length) > 0));
+            return Boolean(cmd && (cmd.strict === false || cmd.args?.length > 0));
         };
         for (const arg of argv) {
             if (idPresent(finalizeId(arg)))
@@ -87,9 +86,8 @@ function standardizeIDFromArgv(argv, config) {
 }
 exports.standardizeIDFromArgv = standardizeIDFromArgv;
 function getHelpFlagAdditions(config) {
-    var _a;
     const helpFlags = ['--help'];
-    const additionalHelpFlags = (_a = config.pjson.oclif.additionalHelpFlags) !== null && _a !== void 0 ? _a : [];
+    const additionalHelpFlags = config.pjson.oclif.additionalHelpFlags ?? [];
     return [...new Set([...helpFlags, ...additionalHelpFlags]).values()];
 }
 exports.getHelpFlagAdditions = getHelpFlagAdditions;

package/lib/main.js

@@ -25,8 +25,7 @@ const helpAddition = (argv, config) => {
 };
 exports.helpAddition = helpAddition;
 const versionAddition = (argv, config) => {
-    var _a;
-    const additionalVersionFlags = (_a = config === null || config === void 0 ? void 0 : config.pjson.oclif.additionalVersionFlags) !== null && _a !== void 0 ? _a : [];
+    const additionalVersionFlags = config?.pjson.oclif.additionalVersionFlags ?? [];
     const mergedVersionFlags = [...new Set(['--version', ...additionalVersionFlags]).values()];
     if (mergedVersionFlags.includes(argv[0]))
         return true;
@@ -35,14 +34,13 @@ const versionAddition = (argv, config) => {
 exports.versionAddition = versionAddition;
 // eslint-disable-next-line default-param-last
 async function run(argv = process.argv.slice(2), options) {
-    var _a;
     // Handle the case when a file URL string or URL is passed in such as 'import.meta.url'; covert to file path.
     if (options && ((typeof options === 'string' && options.startsWith('file://')) || options instanceof url_2.URL)) {
         options = (0, url_1.fileURLToPath)(options);
     }
     // return Main.run(argv, options)
     const config = await config_1.Config.load(options || (module.parent && module.parent.parent && module.parent.parent.filename) || __dirname);
-    if (config.topicSeparator !== ':' && !((_a = argv[0]) === null || _a === void 0 ? void 0 : _a.includes(':')))
+    if (config.topicSeparator !== ':' && !argv[0]?.includes(':'))
         argv = (0, help_1.standardizeIDFromArgv)(argv, config);
     let [id, ...argvSlice] = argv;
     // run init hook

package/lib/module-loader.js

@@ -121,7 +121,6 @@ class ModuleLoader {
      * @returns {{isESM: boolean, filePath: string}} An object including file path and whether the module is ESM.
      */
     static resolvePath(config, modulePath) {
-        var _a, _b;
         let isESM;
         let filePath;
         try {
@@ -135,7 +134,7 @@ class ModuleLoader {
             if (fs.existsSync(filePath)) {
                 fileExists = true;
                 try {
-                    if ((_b = (_a = fs.lstatSync(filePath)) === null || _a === void 0 ? void 0 : _a.isDirectory) === null || _b === void 0 ? void 0 : _b.call(_a)) {
+                    if (fs.lstatSync(filePath)?.isDirectory?.()) {
                         fileExists = false;
                         isDirectory = true;
                     }

package/lib/parser/flags.d.ts

@@ -6,7 +6,10 @@ export declare function build<T>(defaults: {
 } & Partial<OptionFlag<T>>): Definition<T>;
 export declare function build(defaults: Partial<OptionFlag<string>>): Definition<string>;
 export declare function boolean<T = boolean>(options?: Partial<BooleanFlag<T>>): BooleanFlag<T>;
-export declare const integer: Definition<number>;
+export declare const integer: (opts?: {
+    min?: number;
+    max?: number;
+} & Partial<OptionFlag<number>>) => OptionFlag<number | undefined>;
 export declare const directory: (opts?: {
     exists?: boolean;
 } & Partial<OptionFlag<string>>) => OptionFlag<string | undefined>;

package/lib/parser/flags.js

@@ -26,13 +26,22 @@ function boolean(options = {}) {
     };
 }
 exports.boolean = boolean;
-exports.integer = build({
-    parse: async (input) => {
-        if (!/^-?\d+$/.test(input))
-            throw new Error(`Expected an integer but received: ${input}`);
-        return Number.parseInt(input, 10);
-    },
-});
+const integer = (opts = {}) => {
+    return build({
+        ...opts,
+        parse: async (input) => {
+            if (!/^-?\d+$/.test(input))
+                throw new Error(`Expected an integer but received: ${input}`);
+            const num = Number.parseInt(input, 10);
+            if (opts.min !== undefined && num < opts.min)
+                throw new Error(`Expected an integer greater than or equal to ${opts.min} but received: ${input}`);
+            if (opts.max !== undefined && num > opts.max)
+                throw new Error(`Expected an integer less than or equal to ${opts.max} but received: ${input}`);
+            return num;
+        },
+    })();
+};
+exports.integer = integer;
 const directory = (opts = {}) => {
     return build({
         ...opts,

package/lib/parser/index.d.ts

@@ -8,7 +8,10 @@ export { flagUsages } from './help';
 export declare function parse<TFlags, TArgs extends {
     [name: string]: string;
 }>(argv: string[], options: Input<TFlags>): Promise<ParserOutput<TFlags, TArgs>>;
-declare const boolean: typeof flags.boolean, integer: import("../interfaces").Definition<number>, url: import("../interfaces").Definition<import("url").URL>, directory: (opts?: {
+declare const boolean: typeof flags.boolean, integer: (opts?: {
+    min?: number | undefined;
+    max?: number | undefined;
+} & Partial<import("../interfaces").OptionFlag<number>>) => import("../interfaces").OptionFlag<number | undefined>, url: import("../interfaces").Definition<import("url").URL>, directory: (opts?: {
     exists?: boolean | undefined;
 } & Partial<import("../interfaces").OptionFlag<string>>) => import("../interfaces").OptionFlag<string | undefined>, file: (opts?: {
     exists?: boolean | undefined;

package/lib/parser/validate.js

@@ -30,7 +30,6 @@ function validate(parse) {
         }
     }
     function validateAcrossFlags(flag) {
-        var _a;
         const intersection = Object.entries(parse.input.flags)
             .map(entry => entry[0]) // array of flag names
             .filter(flagName => parse.output.flags[flagName] !== undefined) // with values
@@ -38,7 +37,7 @@ function validate(parse) {
         if (intersection.length === 0) {
             // the command's exactlyOne may or may not include itself, so we'll use Set to add + de-dupe
             throw new errors_1.CLIError(`Exactly one of the following must be provided: ${[
-                ...new Set((_a = flag.exactlyOne) === null || _a === void 0 ? void 0 : _a.map(flag => `--${flag}`)),
+                ...new Set(flag.exactlyOne?.map(flag => `--${flag}`)),
             ].join(', ')}`);
         }
     }

package/lib/util.js

@@ -40,8 +40,7 @@ function castArray(input) {
 }
 exports.castArray = castArray;
 function isProd() {
-    var _a;
-    return !['development', 'test'].includes((_a = process.env.NODE_ENV) !== null && _a !== void 0 ? _a : '');
+    return !['development', 'test'].includes(process.env.NODE_ENV ?? '');
 }
 exports.isProd = isProd;
 function maxBy(arr, fn) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "1.12.1",
+  "version": "1.13.0",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -77,7 +77,7 @@
     "typescript": "4.5.5"
   },
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=14.0.0"
   },
   "files": [
     "/lib",