@oclif/core 1.7.0 → 1.8.2

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.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)
+
+
+### Features
+
+* improve Command interface ([#416](https://github.com/oclif/core/issues/416)) ([ed625e1](https://github.com/oclif/core/commit/ed625e1554a09e578e645ddd7aa2ddb1b368c03f))
+
 ## [1.7.0](https://github.com/oclif/core/compare/v1.6.4...v1.7.0) (2022-04-11)
 
 

package/lib/config/config.d.ts

@@ -43,16 +43,16 @@ export declare class Config implements IConfig {
     loadDevPlugins(): Promise<void>;
     loadUserPlugins(): Promise<void>;
     runHook<T extends keyof Hooks>(event: T, opts: Hooks[T]['options'], timeout?: number): Promise<Hook.Result<Hooks[T]['return']>>;
-    runCommand<T = unknown>(id: string, argv?: string[], cachedCommand?: Command.Plugin): Promise<T>;
+    runCommand<T = unknown>(id: string, argv?: string[], cachedCommand?: Command.Loadable): Promise<T>;
     scopedEnvVar(k: string): string | undefined;
     scopedEnvVarTrue(k: string): boolean;
     scopedEnvVarKey(k: string): string;
     findCommand(id: string, opts: {
         must: true;
-    }): Command.Plugin;
+    }): Command.Loadable;
     findCommand(id: string, opts?: {
         must: boolean;
-    }): Command.Plugin | undefined;
+    }): Command.Loadable | undefined;
     findTopic(id: string, opts: {
         must: true;
     }): Topic;
@@ -72,18 +72,18 @@ export declare class Config implements IConfig {
      * @param argv string[] process.argv containing the flags and arguments provided by the user
      * @returns string[]
      */
-    findMatches(partialCmdId: string, argv: string[]): Command.Plugin[];
+    findMatches(partialCmdId: string, argv: string[]): Command.Loadable[];
     /**
      * Returns an array of all commands. If flexible taxonomy is enabled then all permutations will be appended to the array.
-     * @returns Command.Plugin[]
+     * @returns Command.Loadable[]
      */
-    getAllCommands(): Command.Plugin[];
+    getAllCommands(): Command.Loadable[];
     /**
      * Returns an array of all command ids. If flexible taxonomy is enabled then all permutations will be appended to the array.
      * @returns string[]
      */
     getAllCommandIDs(): string[];
-    get commands(): Command.Plugin[];
+    get commands(): Command.Loadable[];
     get commandIDs(): string[];
     get topics(): Topic[];
     s3Key(type: keyof PJSON.S3.Templates, ext?: '.tar.gz' | '.tar.xz' | IConfig.s3Key.Options, options?: IConfig.s3Key.Options): string;
@@ -126,7 +126,7 @@ export declare class Config implements IConfig {
      * plugin as discovered (will not change the order)
      *
      * @param commands commands to determine the priority of
-     * @returns command instance {Command.Plugin} or undefined
+     * @returns command instance {Command.Loadable} or undefined
      */
     private determinePriority;
 }

package/lib/config/config.js

@@ -324,7 +324,7 @@ class Config {
     }
     /**
      * Returns an array of all commands. If flexible taxonomy is enabled then all permutations will be appended to the array.
-     * @returns Command.Plugin[]
+     * @returns Command.Loadable[]
      */
     getAllCommands() {
         const commands = [...this._commands.values()];
@@ -573,7 +573,7 @@ class Config {
      * plugin as discovered (will not change the order)
      *
      * @param commands commands to determine the priority of
-     * @returns command instance {Command.Plugin} or undefined
+     * @returns command instance {Command.Loadable} or undefined
      */
     determinePriority(commands) {
         var _a, _b;

package/lib/config/plugin.d.ts

@@ -14,7 +14,7 @@ export declare class Plugin implements IPlugin {
     alias: string;
     tag?: string;
     manifest: Manifest;
-    commands: Command.Plugin[];
+    commands: Command.Loadable[];
     hooks: {
         [k: string]: string[];
     };

package/lib/help/index.d.ts

@@ -20,7 +20,7 @@ export declare abstract class HelpBase extends HelpFormatter {
 export declare class Help extends HelpBase {
     protected CommandHelpClass: typeof CommandHelp;
     private get _topics();
-    protected get sortedCommands(): Interfaces.Command.Plugin[];
+    protected get sortedCommands(): Interfaces.Command.Loadable[];
     protected get sortedTopics(): Interfaces.Topic[];
     constructor(config: Interfaces.Config, opts?: Partial<Interfaces.HelpOptions>);
     showHelp(argv: string[]): Promise<void>;

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/interfaces/command.d.ts

@@ -1,5 +1,6 @@
 import { Config, LoadOptions } from './config';
 import { ArgInput, BooleanFlagProps, FlagInput, OptionFlagProps } from './parser';
+import { Plugin as IPlugin } from './plugin';
 export declare type Example = string | {
     description: string;
     command: string;
@@ -78,7 +79,7 @@ export declare namespace Command {
         _base: string;
     }
     interface Class extends Base {
-        plugin?: Plugin;
+        plugin?: IPlugin;
         flags?: FlagInput<any>;
         args?: ArgInput;
         strict: boolean;
@@ -89,6 +90,12 @@ export declare namespace Command {
     interface Instance {
         _run(argv: string[]): Promise<any>;
     }
+    interface Loadable extends Command {
+        load(): Promise<Class>;
+    }
+    /**
+     * @deprecated use Command.Loadable instead.
+     */
     interface Plugin extends Command {
         load(): Promise<Class>;
     }

package/lib/interfaces/config.d.ts

@@ -88,27 +88,27 @@ export interface Config {
     valid: boolean;
     flexibleTaxonomy?: boolean;
     topicSeparator: ':' | ' ';
-    readonly commands: Command.Plugin[];
+    readonly commands: Command.Loadable[];
     readonly topics: Topic[];
     readonly commandIDs: string[];
     runCommand<T = unknown>(id: string, argv?: string[]): Promise<T>;
-    runCommand<T = unknown>(id: string, argv?: string[], cachedCommand?: Command.Plugin): Promise<T>;
+    runCommand<T = unknown>(id: string, argv?: string[], cachedCommand?: Command.Loadable): Promise<T>;
     runHook<T extends keyof Hooks>(event: T, opts: Hooks[T]['options'], timeout?: number): Promise<Hook.Result<Hooks[T]['return']>>;
     getAllCommandIDs(): string[];
-    getAllCommands(): Command.Plugin[];
+    getAllCommands(): Command.Loadable[];
     findCommand(id: string, opts: {
         must: true;
-    }): Command.Plugin;
+    }): Command.Loadable;
     findCommand(id: string, opts?: {
         must: boolean;
-    }): Command.Plugin | undefined;
+    }): Command.Loadable | undefined;
     findTopic(id: string, opts: {
         must: true;
     }): Topic;
     findTopic(id: string, opts?: {
         must: boolean;
     }): Topic | undefined;
-    findMatches(id: string, argv: string[]): Command.Plugin[];
+    findMatches(id: string, argv: string[]): Command.Loadable[];
     scopedEnvVar(key: string): string | undefined;
     scopedEnvVarKey(key: string): string;
     scopedEnvVarTrue(key: string): boolean;

package/lib/interfaces/hooks.d.ts

@@ -54,7 +54,7 @@ export interface Hooks {
         options: {
             id: string;
             argv: string[];
-            matches: Command.Plugin[];
+            matches: Command.Loadable[];
         };
         return: unknown;
     };

package/lib/interfaces/plugin.d.ts

@@ -60,7 +60,7 @@ export interface Plugin {
      * if it appears to be an npm package but does not look like it's really a CLI plugin, this is set to false
      */
     valid: boolean;
-    commands: Command.Plugin[];
+    commands: Command.Loadable[];
     hooks: {
         [k: string]: string[];
     };

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

@@ -119,6 +119,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 +128,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.js 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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "1.7.0",
+  "version": "1.8.2",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -13,7 +13,7 @@
     "chalk": "^4.1.2",
     "clean-stack": "^3.0.1",
     "cli-progress": "^3.10.0",
-    "debug": "^4.3.3",
+    "debug": "^4.3.4",
     "ejs": "^3.1.6",
     "fs-extra": "^9.1.0",
     "get-package-type": "^0.1.0",
@@ -26,7 +26,7 @@
     "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 +49,7 @@
     "@types/fs-extra": "^9.0.13",
     "@types/indent-string": "^4.0.1",
     "@types/js-yaml": "^3.12.7",
-    "@types/lodash": "^4.14.178",
+    "@types/lodash": "^4.14.182",
     "@types/mocha": "^8.2.3",
     "@types/nock": "^11.1.0",
     "@types/node": "^15.14.9",