oclif 3.17.0 → 3.17.2

package/.oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.17.0",
+  "version": "3.17.2",
   "commands": {
     "generate": {
       "id": "generate",

package/lib/commands/manifest.js

@@ -50,7 +50,7 @@ class Manifest extends core_1.Command {
                     (0, shelljs_1.exec)(`7z x -bd -y "${tarball}"`, { cwd: fullPath });
                 }
                 else {
-                    (0, shelljs_1.exec)(`tar -xJf "${tarball}"`, { cwd: fullPath });
+                    (0, shelljs_1.exec)(`tar -xzf "${tarball}"`, { cwd: fullPath });
                 }
                 const manifest = await fs.readJSON(path.join(fullPath, 'package', 'oclif.manifest.json'));
                 for (const command of Object.values(manifest.commands)) {

package/lib/commands/readme.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// tslint:disable no-implicit-dependencies
 const core_1 = require("@oclif/core");
 const fs = require("fs-extra");
 const _ = require("lodash");
@@ -13,9 +12,16 @@ const columns = Number.parseInt(process.env.COLUMNS, 10) || 120;
 const slugify = new (require('github-slugger'))();
 class Readme extends core_1.Command {
     async run() {
+        var _a, _b;
         this.flags = (await this.parse(Readme)).flags;
         const cwd = process.cwd();
         const readmePath = path.resolve(cwd, 'README.md');
+        const tsConfigPath = path.resolve(cwd, 'tsconfig.json');
+        const tsConfig = await fs.readJSON(tsConfigPath).catch(() => ({}));
+        const outDir = (_b = (_a = tsConfig.compilerOptions) === null || _a === void 0 ? void 0 : _a.outDir) !== null && _b !== void 0 ? _b : 'lib';
+        if (!await fs.pathExists(outDir)) {
+            this.warn(`No compiled source found at ${outDir}. Some commands may be missing.`);
+        }
         const config = await core_1.Config.load({ root: cwd, devPlugins: false, userPlugins: false });
         try {
             const p = require.resolve('@oclif/plugin-legacy', { paths: [cwd] });
@@ -23,7 +29,7 @@ class Readme extends core_1.Command {
             await plugin.load();
             config.plugins.push(plugin);
         }
-        catch (_a) { }
+        catch (_c) { }
         await config.runHook('init', { id: 'readme', argv: this.argv });
         this.HelpClass = await (0, core_1.loadHelpClass)(config);
         let readme = await fs.readFile(readmePath, 'utf8');
@@ -177,21 +183,24 @@ USAGE
      * fetches the path to a command
      */
     commandPath(plugin, c) {
+        var _a, _b;
         const commandsDir = plugin.pjson.oclif.commands;
         if (!commandsDir)
             return;
+        const hasTypescript = ((_a = plugin.pjson.devDependencies) === null || _a === void 0 ? void 0 : _a.typescript) || ((_b = plugin.pjson.dependencies) === null || _b === void 0 ? void 0 : _b.typescript);
         let p = path.join(plugin.root, commandsDir, ...c.id.split(':'));
-        const libRegex = new RegExp('^lib' + (path.sep === '\\' ? '\\\\' : path.sep));
+        const outDir = path.dirname(commandsDir.replace(`.${path.sep}`, ''));
+        const outDirRegex = new RegExp('^' + outDir + (path.sep === '\\' ? '\\\\' : path.sep));
         if (fs.pathExistsSync(path.join(p, 'index.js'))) {
             p = path.join(p, 'index.js');
         }
         else if (fs.pathExistsSync(p + '.js')) {
             p += '.js';
         }
-        else if (plugin.pjson.devDependencies && plugin.pjson.devDependencies.typescript) {
+        else if (hasTypescript) {
             // check if non-compiled scripts are available
             const base = p.replace(plugin.root + path.sep, '');
-            p = path.join(plugin.root, base.replace(libRegex, 'src' + path.sep));
+            p = path.join(plugin.root, base.replace(outDirRegex, 'src' + path.sep));
             if (fs.pathExistsSync(path.join(p, 'index.ts'))) {
                 p = path.join(p, 'index.ts');
             }
@@ -204,9 +213,8 @@ USAGE
         else
             return;
         p = p.replace(plugin.root + path.sep, '');
-        if (plugin.pjson.devDependencies && plugin.pjson.devDependencies.typescript) {
-            p = p.replace(libRegex, 'src' + path.sep);
-            p = p.replace(/\.js$/, '.ts');
+        if (hasTypescript) {
+            p = p.replace(outDirRegex, 'src' + path.sep).replace(/\.js$/, '.ts');
         }
         p = p.replace(/\\/g, '/'); // Replace windows '\' by '/'
         return p;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "3.17.0",
+  "version": "3.17.2",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run"