@oclif/core 1.8.1 → 1.8.2

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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)
 
 

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.8.1",
+  "version": "1.8.2",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {