@oclif/table 0.3.0 → 0.3.2

package/lib/table.js

@@ -340,11 +340,10 @@ function renderPlainTable(props) {
             horizontalAlignment,
             overflow,
             padding,
-            value: column.column,
+            value: headings[column.column] ?? column.column,
             width,
         });
-        const columnHeader = headings[text] ?? text;
-        return `${acc}${' '.repeat(marginLeft)}${columnHeader}${' '.repeat(marginRight)}`;
+        return `${acc}${' '.repeat(marginLeft)}${text}${' '.repeat(marginRight)}`;
     }, '');
     console.log(headerString);
     console.log('-'.repeat(headerString.length));
@@ -412,7 +411,7 @@ function Container(props) {
  * @throws {Error} Throws an error if the total number of rows across all tables exceeds 30,000.
  */
 export function printTables(tables, options) {
-    if (tables.reduce((acc, table) => acc + table.data.length, 0) > 30_000) {
+    if (tables.reduce((acc, table) => acc + table.data.length, 0) > 10_000) {
         throw new Error('The data is too large to print multiple tables. Please use `printTable` instead.');
     }
     const output = new Output();

package/lib/utils.js

@@ -68,27 +68,31 @@ export function getColumns(config, headings) {
         };
     });
     const numberOfBorders = widths.length + 1;
-    const calculateTableWidth = (widths) => widths.map((w) => w.width + w.padding * 2).reduce((a, b) => a + b, 0) + numberOfBorders;
-    // If the table is too wide, reduce the width of the largest column as little as possible to fit the table.
-    // At most, it will reduce the width to the length of the column's header plus padding.
-    // If the table is still too wide, it will reduce the width of the next largest column and so on
+    const calculateTableWidth = (widths) => widths.map((w) => w.width).reduce((a, b) => a + b, 0) + numberOfBorders;
     let tableWidth = calculateTableWidth(widths);
     const seen = new Set();
-    while (tableWidth > maxWidth) {
-        const largestColumn = widths.filter((w) => !seen.has(w.key)).sort((a, b) => b.width - a.width)[0];
-        if (!largestColumn)
-            break;
-        if (seen.has(largestColumn.key))
-            break;
-        const header = String(headings[largestColumn.key]).length;
-        // The minimum width of a column is the width of the header plus padding on both sides
-        const minWidth = header + largestColumn.padding * 2;
-        const difference = tableWidth - maxWidth;
-        const newWidth = largestColumn.width - difference < minWidth ? minWidth : largestColumn.width - difference;
-        largestColumn.width = newWidth;
-        tableWidth = calculateTableWidth(widths);
-        seen.add(largestColumn.key);
-    }
+    const reduceColumnWidths = (calcMinWidth) => {
+        // If the table is too wide, reduce the width of the largest column as little as possible to fit the table.
+        // If the table is still too wide, it will reduce the width of the next largest column and so on
+        while (tableWidth > maxWidth) {
+            const largestColumn = widths.filter((w) => !seen.has(w.key)).sort((a, b) => b.width - a.width)[0];
+            if (!largestColumn)
+                break;
+            if (seen.has(largestColumn.key))
+                break;
+            const minWidth = calcMinWidth(largestColumn);
+            const difference = tableWidth - maxWidth;
+            const newWidth = largestColumn.width - difference < minWidth ? minWidth : largestColumn.width - difference;
+            largestColumn.width = newWidth;
+            tableWidth = calculateTableWidth(widths);
+            seen.add(largestColumn.key);
+        }
+    };
+    // At most, reduce the width to the length of the column's header plus padding.
+    reduceColumnWidths((col) => stripAnsi(String(headings[col.key])).length + col.padding * 2);
+    seen.clear();
+    // At most, reduce the width to the padding + 3
+    reduceColumnWidths((col) => col.padding * 2 + 3);
     return widths;
 }
 export function getHeadings(config) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/table",
   "description": "Display table in terminal",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/table/issues",
   "dependencies": {