@oclif/core 1.9.0 → 1.9.3

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 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.3](https://github.com/oclif/core/compare/v1.9.2...v1.9.3) (2022-06-16)
+
+### [1.9.2](https://github.com/oclif/core/compare/v1.9.1...v1.9.2) (2022-06-14)
+
+### [1.9.1](https://github.com/oclif/core/compare/v1.9.0...v1.9.1) (2022-06-14)
+
+
+### Bug Fixes
+
+* support CLIs with single top level command ([#426](https://github.com/oclif/core/issues/426)) ([44adb4d](https://github.com/oclif/core/commit/44adb4d387695548a017b38249b0bc3453aedbdf))
+
 ## [1.9.0](https://github.com/oclif/core/compare/v1.8.2...v1.9.0) (2022-05-20)
 
 

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

@@ -11,14 +11,16 @@ 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 = col.extended || false;
-            const get = col.get || ((row) => row[key]);
+            const extended = (_a = col.extended) !== null && _a !== void 0 ? _a : false;
+            const get = (_b = col.get) !== null && _b !== void 0 ? _b : ((row) => row[key]);
             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);
+            const minWidth = Math.max((_c = col.minWidth) !== null && _c !== void 0 ? _c : 0, sw(header) + 1);
             return {
                 extended,
                 get,
@@ -34,9 +36,9 @@ class Table {
             output: csv ? 'csv' : output,
             extended,
             filter,
-            'no-header': options['no-header'] || false,
-            'no-truncate': options['no-truncate'] || false,
-            printLine: printLine || ((s) => process.stdout.write(s + '\n')),
+            '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')),
             rowStart: ' ',
             sort,
             title,
@@ -130,9 +132,10 @@ 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]: d[col.key] || '',
+                    [col.key]: (_a = d[col.key]) !== null && _a !== void 0 ? _a : '',
                 };
             }, {});
         });
@@ -156,25 +159,18 @@ class Table {
     }
     outputTable() {
         // tslint:disable-next-line:no-this-assignment
-        const { data, columns, options } = this;
+        const { data, options } = this;
         // column truncation
         //
         // find max width for each column
-        for (const col of columns) {
-            // convert multi-line cell to single longest line
-            // for width calculations
-            const widthData = data.map((row) => {
-                const d = row[col.key];
-                const manyLines = d.split('\n');
-                if (manyLines.length > 1) {
-                    return '*'.repeat(Math.max(...manyLines.map((r) => sw(r))));
-                }
-                return d;
-            });
-            const widths = ['.'.padEnd(col.minWidth - 1), col.header, ...widthData.map((row) => row)].map(r => sw(r));
-            col.maxWidth = Math.max(...widths) + 1;
-            col.width = col.maxWidth;
-        }
+        const columns = this.columns.map(c => {
+            const maxWidth = Math.max(sw('.'.padEnd(c.minWidth - 1)), sw(c.header), getWidestColumnWith(data, c.key)) + 1;
+            return {
+                ...c,
+                maxWidth,
+                width: maxWidth,
+            };
+        });
         // terminal width
         const maxWidth = screen_1.stdtermwidth - 2;
         // truncation logic
@@ -310,3 +306,12 @@ exports.table = table;
     }
     table.flags = flags;
 })(table = exports.table || (exports.table = {}));
+const getWidestColumnWith = (data, columnKey) => {
+    return data.reduce((previous, current) => {
+        const d = current[columnKey];
+        // convert multi-line cell to single longest line
+        // for width calculations
+        const manyLines = d.split('\n');
+        return Math.max(previous, manyLines.length > 1 ? Math.max(...manyLines.map((r) => sw(r))) : sw(d));
+    }, 0);
+};

package/lib/config/plugin.js

@@ -159,7 +159,8 @@ class Plugin {
             const p = path.parse(file);
             const topics = p.dir.split('/');
             const command = p.name !== 'index' && p.name;
-            return [...topics, command].filter(f => f).join(':');
+            const id = [...topics, command].filter(f => f).join(':');
+            return id === '' ? '.' : id;
         });
         this._debug('found commands', ids);
         return ids;

package/lib/help/index.js

@@ -77,8 +77,10 @@ class Help extends HelpBase {
         if (!subject) {
             if (this.config.pjson.oclif.default) {
                 const rootCmd = this.config.findCommand(this.config.pjson.oclif.default);
-                if (rootCmd)
+                if (rootCmd) {
                     await this.showCommandHelp(rootCmd);
+                    return;
+                }
             }
             await this.showRootHelp();
             return;

package/lib/main.js

@@ -70,6 +70,11 @@ async function run(argv = process.argv.slice(2), options) {
             argvSlice = argv;
         }
     }
+    // If the the default command is '.' (signifying that the CLI is a single command CLI) and '.' is provided
+    // as an argument, we need to add back the '.' to argv since it was stripped out earlier as part of the
+    // command id.
+    if (config.pjson.oclif.default === '.' && id === '.' && argv[0] === '.')
+        argvSlice = ['.', ...argvSlice];
     await config.runCommand(id, argvSlice, cmd);
 }
 exports.run = run;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "1.9.0",
+  "version": "1.9.3",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {