@oclif/core 1.8.0 → 1.9.0

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 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.9.0](https://github.com/oclif/core/compare/v1.8.2...v1.9.0) (2022-05-20)
+
+
+### Features
+
+* support TS directory imports for ESM ([#422](https://github.com/oclif/core/issues/422)) ([4c58e78](https://github.com/oclif/core/commit/4c58e782e86dd7ecf91294bac0d2c759b4454596))
+
+### [1.8.2](https://github.com/oclif/core/compare/v1.8.1...v1.8.2) (2022-05-18)
+
+
+### Bug Fixes
+
+* properly load index.js ES modules (cont) ([#417](https://github.com/oclif/core/issues/417)) ([77ba8b8](https://github.com/oclif/core/commit/77ba8b891f941e371bacd0dbedb32be25d6d2599))
+
+### [1.8.1](https://github.com/oclif/core/compare/v1.8.0...v1.8.1) (2022-05-10)
+
+
+### Bug Fixes
+
+* improve algo for collating command id ([#415](https://github.com/oclif/core/issues/415)) ([1a9bfdb](https://github.com/oclif/core/commit/1a9bfdb810e13506ed8fc4138cde1912981b97e3))
+
 ## [1.8.0](https://github.com/oclif/core/compare/v1.7.0...v1.8.0) (2022-05-06)
 
 

package/lib/cli-ux/list.js

@@ -2,7 +2,7 @@
 // tslint:disable
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderList = void 0;
-const maxBy_1 = require("lodash/maxBy");
+const util_1 = require("../util");
 const deps_1 = require("./deps");
 function linewrap(length, s) {
     const lw = require('@oclif/linewrap');
@@ -11,10 +11,11 @@ function linewrap(length, s) {
     })(s).trim();
 }
 function renderList(items) {
+    var _a, _b;
     if (items.length === 0) {
         return '';
     }
-    const maxLength = (0, maxBy_1.default)(items, '[0].length')[0].length;
+    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 lines = items.map(i => {
         let left = i[0];
         let right = i[1];

package/lib/cli-ux/open.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // this code is largely taken from opn
 const childProcess = require("child_process");
-const _ = require("lodash");
 const isWsl = require('is-wsl');
 function open(target, opts = {}) {
     // opts = {wait: true, ...opts}
@@ -59,7 +58,7 @@ function open(target, opts = {}) {
     return new Promise((resolve, reject) => {
         cp.once('error', reject);
         cp.once('close', code => {
-            if (_.isNumber(code) && code > 0) {
+            if (Number.isInteger(code) && code > 0) {
                 reject(new Error('Exited with code ' + code));
                 return;
             }

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

@@ -4,9 +4,9 @@ exports.table = void 0;
 const F = require("../../flags");
 const screen_1 = require("@oclif/screen");
 const chalk = require("chalk");
-const lodash_1 = require("lodash");
+const util_1 = require("../../util");
 const js_yaml_1 = require("js-yaml");
-const util_1 = require("util");
+const util_2 = require("util");
 const sw = require('string-width');
 const { orderBy } = require('natural-orderby');
 class Table {
@@ -17,7 +17,7 @@ class Table {
             const col = columns[key];
             const extended = col.extended || false;
             const get = col.get || ((row) => row[key]);
-            const header = typeof col.header === 'string' ? col.header : (0, lodash_1.capitalize)(key.replace(/_/g, ' '));
+            const header = typeof col.header === 'string' ? col.header : (0, util_1.capitalize)(key.replace(/_/g, ' '));
             const minWidth = Math.max(col.minWidth || 0, sw(header) + 1);
             return {
                 extended,
@@ -49,7 +49,7 @@ class Table {
             for (const col of this.columns) {
                 let val = col.get(d);
                 if (typeof val !== 'string')
-                    val = (0, util_1.inspect)(val, { breakLength: Number.POSITIVE_INFINITY });
+                    val = (0, util_2.inspect)(val, { breakLength: Number.POSITIVE_INFINITY });
                 row[col.key] = val;
             }
             return row;
@@ -183,7 +183,7 @@ class Table {
             if (options['no-truncate'] || (!process.stdout.isTTY && !process.env.CLI_UX_SKIP_TTY_CHECK))
                 return;
             // don't shorten if there is enough screen width
-            const dataMaxWidth = (0, lodash_1.sumBy)(columns, c => c.width);
+            const dataMaxWidth = (0, util_1.sumBy)(columns, c => c.width);
             const overWidth = dataMaxWidth - maxWidth;
             if (overWidth <= 0)
                 return;
@@ -194,7 +194,7 @@ class Table {
             // if sum(minWidth's) is greater than term width
             // nothing can be done so
             // display all as minWidth
-            const dataMinWidth = (0, lodash_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

package/lib/help/util.js

@@ -33,28 +33,27 @@ exports.template = template;
 function collateSpacedCmdIDFromArgs(argv, config) {
     if (argv.length === 1)
         return argv;
-    const ids = (0, util_1.collectUsableIds)(config.commandIDs);
     const findId = (argv) => {
+        const ids = (0, util_1.collectUsableIds)(config.commandIDs);
         const final = [];
         const idPresent = (id) => ids.includes(id);
         const isFlag = (s) => s.startsWith('-');
         const isArgWithValue = (s) => s.includes('=');
         const finalizeId = (s) => s ? [...final, s].join(':') : final.join(':');
-        const hasSubCommandsWithArgs = () => {
+        const hasArgs = () => {
+            var _a;
             const id = finalizeId();
             if (!id)
                 return false;
-            // Get a list of sub commands for the current command id. A command is returned as a subcommand if the `id` starts with the current command id.
-            // e.g. `foo:bar` is a subcommand of `foo`
-            const subCommands = config.commands.filter(c => (c.id).startsWith(id));
-            return Boolean(subCommands.find(cmd => { var _a; return cmd.strict === false || ((_a = cmd.args) === null || _a === void 0 ? void 0 : _a.length) > 0; }));
+            const cmd = config.findCommand(id);
+            return Boolean(cmd && (cmd.strict === false || ((_a = cmd.args) === null || _a === void 0 ? void 0 : _a.length) > 0));
         };
         for (const arg of argv) {
             if (idPresent(finalizeId(arg)))
                 final.push(arg);
             // If the parent topic has a command that expects positional arguments, then we cannot
             // assume that any subsequent string could be part of the command name
-            else if (isArgWithValue(arg) || isFlag(arg) || hasSubCommandsWithArgs())
+            else if (isArgWithValue(arg) || isFlag(arg) || hasArgs())
                 break;
             else
                 final.push(arg);

package/lib/module-loader.d.ts

@@ -71,4 +71,12 @@ export default class ModuleLoader {
         isESM: boolean;
         filePath: string;
     };
+    /**
+     * Try adding the different extensions from `s_EXTENSIONS` to find the file.
+     *
+     * @param {string} filePath - File path to load.
+     *
+     * @returns {string | null} Modified file path including extension or null if file is not found.
+     */
+    static findFile(filePath: string): string | null;
 }

package/lib/module-loader.js

@@ -10,7 +10,7 @@ const getPackageType = require('get-package-type');
  * Defines file extension resolution when source files do not have an extension.
  */
 // eslint-disable-next-line camelcase
-const s_EXTENSIONS = ['.js', '.mjs', '.cjs'];
+const s_EXTENSIONS = ['.ts', '.js', '.mjs', '.cjs'];
 /**
  * Provides a mechanism to use dynamic import / import() with tsconfig -> module: commonJS as otherwise import() gets
  * transpiled to require().
@@ -101,6 +101,8 @@ class ModuleLoader {
         switch (extension) {
             case '.js':
                 return getPackageType.sync(filePath) === 'module';
+            case '.ts':
+                return getPackageType.sync(filePath) === 'module';
             case '.mjs':
                 return true;
             default:
@@ -119,6 +121,7 @@ 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 {
@@ -127,20 +130,49 @@ class ModuleLoader {
         }
         catch {
             filePath = Config.tsPath(config.root, modulePath);
-            // Try all supported extensions.
-            if (!fs.existsSync(filePath)) {
-                // eslint-disable-next-line camelcase
-                for (const extension of s_EXTENSIONS) {
-                    const testPath = `${filePath}${extension}`;
-                    if (fs.existsSync(testPath)) {
-                        filePath = testPath;
-                        break;
+            let fileExists = false;
+            let isDirectory = false;
+            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)) {
+                        fileExists = false;
+                        isDirectory = true;
                     }
                 }
+                catch { }
+            }
+            if (!fileExists) {
+                // Try all supported extensions.
+                let foundPath = ModuleLoader.findFile(filePath);
+                if (!foundPath && isDirectory) {
+                    // Since filePath is a directory, try looking for index file.
+                    foundPath = ModuleLoader.findFile(path.join(filePath, 'index'));
+                }
+                if (foundPath) {
+                    filePath = foundPath;
+                }
             }
             isESM = ModuleLoader.isPathModule(filePath);
         }
         return { isESM, filePath };
     }
+    /**
+     * Try adding the different extensions from `s_EXTENSIONS` to find the file.
+     *
+     * @param {string} filePath - File path to load.
+     *
+     * @returns {string | null} Modified file path including extension or null if file is not found.
+     */
+    static findFile(filePath) {
+        // eslint-disable-next-line camelcase
+        for (const extension of s_EXTENSIONS) {
+            const testPath = `${filePath}${extension}`;
+            if (fs.existsSync(testPath)) {
+                return testPath;
+            }
+        }
+        return null;
+    }
 }
 exports.default = ModuleLoader;

package/lib/util.d.ts

@@ -4,4 +4,7 @@ declare 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 {};

package/lib/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isProd = exports.castArray = exports.sortBy = exports.uniqBy = exports.compact = void 0;
+exports.capitalize = exports.sumBy = exports.maxBy = exports.isProd = exports.castArray = exports.sortBy = exports.uniqBy = exports.compact = void 0;
 function compact(a) {
     return a.filter((a) => Boolean(a));
 }
@@ -44,3 +44,22 @@ function isProd() {
     return !['development', 'test'].includes((_a = process.env.NODE_ENV) !== null && _a !== void 0 ? _a : '');
 }
 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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -22,11 +22,10 @@
     "indent-string": "^4.0.0",
     "is-wsl": "^2.2.0",
     "js-yaml": "^3.14.1",
-    "lodash": "^4.17.21",
     "natural-orderby": "^2.0.3",
     "object-treeify": "^1.1.33",
     "password-prompt": "^1.1.2",
-    "semver": "^7.3.5",
+    "semver": "^7.3.7",
     "string-width": "^4.2.3",
     "strip-ansi": "^6.0.1",
     "supports-color": "^8.1.1",
@@ -49,7 +48,6 @@
     "@types/fs-extra": "^9.0.13",
     "@types/indent-string": "^4.0.1",
     "@types/js-yaml": "^3.12.7",
-    "@types/lodash": "^4.14.182",
     "@types/mocha": "^8.2.3",
     "@types/nock": "^11.1.0",
     "@types/node": "^15.14.9",