table 6.6.0 → 6.7.3

package/dist/alignString.js

@@ -13,15 +13,7 @@ const alignRight = (subject, width) => {
     return ' '.repeat(width) + subject;
 };
 const alignCenter = (subject, width) => {
-    let halfWidth;
-    halfWidth = width / 2;
-    if (width % 2 === 0) {
-        return ' '.repeat(halfWidth) + subject + ' '.repeat(halfWidth);
-    }
-    else {
-        halfWidth = Math.floor(halfWidth);
-        return ' '.repeat(halfWidth) + subject + ' '.repeat(halfWidth + 1);
-    }
+    return ' '.repeat(Math.floor(width / 2)) + subject + ' '.repeat(Math.ceil(width / 2));
 };
 const alignJustify = (subject, width) => {
     const spaceSequenceCount = utils_1.countSpaceSequence(subject);
@@ -43,6 +35,9 @@ const alignJustify = (subject, width) => {
  */
 const alignString = (subject, containerWidth, alignment) => {
     const subjectWidth = string_width_1.default(subject);
+    if (subjectWidth === containerWidth) {
+        return subject;
+    }
     if (subjectWidth > containerWidth) {
         throw new Error('Subject parameter value width cannot be greater than the container width.');
     }

package/dist/alignTableData.js

@@ -1,21 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.alignTableData = void 0;
-const string_width_1 = __importDefault(require("string-width"));
 const alignString_1 = require("./alignString");
 const alignTableData = (rows, config) => {
     return rows.map((row) => {
         return row.map((cell, cellIndex) => {
-            const column = config.columns[cellIndex];
-            if (string_width_1.default(cell) === column.width) {
-                return cell;
-            }
-            else {
-                return alignString_1.alignString(cell, column.width, column.alignment);
-            }
+            const { width, alignment } = config.columns[cellIndex];
+            return alignString_1.alignString(cell, width, alignment);
         });
     });
 };

package/dist/drawBorder.d.ts

@@ -1,5 +1,5 @@
 import type { DrawVerticalLine } from './types/api';
-import type { BottomBorderConfig, JoinBorderConfig, TopBorderConfig } from './types/internal';
+import type { TableConfig, SeparatorGetter, TopBorderConfig, JoinBorderConfig, BottomBorderConfig } from './types/internal';
 declare type Separator = {
     readonly left: string;
     readonly right: string;
@@ -22,4 +22,5 @@ declare const drawBorderBottom: (columnWidths: number[], config: {
     border: BottomBorderConfig;
     drawVerticalLine: DrawVerticalLine;
 }) => string;
+export declare const createTableBorderGetter: (columnWidths: number[], config: TableConfig) => SeparatorGetter;
 export { drawBorder, drawBorderBottom, drawBorderJoin, drawBorderTop, };

package/dist/drawBorder.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.drawBorderTop = exports.drawBorderJoin = exports.drawBorderBottom = exports.drawBorder = void 0;
+exports.drawBorderTop = exports.drawBorderJoin = exports.drawBorderBottom = exports.drawBorder = exports.createTableBorderGetter = void 0;
 const drawContent_1 = require("./drawContent");
 const drawBorder = (columnWidths, config) => {
     const { separator, drawVerticalLine } = config;
@@ -9,9 +9,15 @@ const drawBorder = (columnWidths, config) => {
     });
     return drawContent_1.drawContent(columns, {
         drawSeparator: drawVerticalLine,
-        endSeparator: separator.right,
-        middleSeparator: separator.join,
-        startSeparator: separator.left,
+        separatorGetter: (index, columnCount) => {
+            if (index === 0) {
+                return separator.left;
+            }
+            if (index === columnCount) {
+                return separator.right;
+            }
+            return separator.join;
+        },
     }) + '\n';
 };
 exports.drawBorder = drawBorder;
@@ -55,3 +61,40 @@ const drawBorderBottom = (columnWidths, config) => {
     });
 };
 exports.drawBorderBottom = drawBorderBottom;
+const createTableBorderGetter = (columnWidths, config) => {
+    return (index, size) => {
+        if (!config.header) {
+            if (index === 0) {
+                return drawBorderTop(columnWidths, config);
+            }
+            if (index === size) {
+                return drawBorderBottom(columnWidths, config);
+            }
+            return drawBorderJoin(columnWidths, config);
+        }
+        // Deal with the header
+        if (index === 0) {
+            return drawBorderTop(columnWidths, {
+                ...config,
+                border: {
+                    ...config.border,
+                    topJoin: config.border.topBody,
+                },
+            });
+        }
+        if (index === 1) {
+            return drawBorderJoin(columnWidths, {
+                ...config,
+                border: {
+                    ...config.border,
+                    joinJoin: config.border.headerJoin,
+                },
+            });
+        }
+        if (index === size) {
+            return drawBorderBottom(columnWidths, config);
+        }
+        return drawBorderJoin(columnWidths, config);
+    };
+};
+exports.createTableBorderGetter = createTableBorderGetter;

package/dist/drawContent.d.ts

@@ -1,8 +1,6 @@
 declare type SeparatorConfig = {
     drawSeparator: (index: number, size: number) => boolean;
-    startSeparator: string;
-    middleSeparator: string;
-    endSeparator: string;
+    separatorGetter: (index: number, size: number) => string;
 };
 /**
  * Shared function to draw horizontal borders, rows or the entire table

package/dist/drawContent.js

@@ -5,21 +5,21 @@ exports.drawContent = void 0;
  * Shared function to draw horizontal borders, rows or the entire table
  */
 const drawContent = (contents, separatorConfig) => {
-    const { startSeparator, middleSeparator, endSeparator, drawSeparator } = separatorConfig;
+    const { separatorGetter, drawSeparator } = separatorConfig;
     const contentSize = contents.length;
     const result = [];
     if (drawSeparator(0, contentSize)) {
-        result.push(startSeparator);
+        result.push(separatorGetter(0, contentSize));
     }
     contents.forEach((content, contentIndex) => {
         result.push(content);
         // Only append the middle separator if the content is not the last
         if (contentIndex + 1 < contentSize && drawSeparator(contentIndex + 1, contentSize)) {
-            result.push(middleSeparator);
+            result.push(separatorGetter(contentIndex + 1, contentSize));
         }
     });
     if (drawSeparator(contentSize, contentSize)) {
-        result.push(endSeparator);
+        result.push(separatorGetter(contentSize, contentSize));
     }
     return result.join('');
 };

package/dist/drawHeader.d.ts

@@ -0,0 +1,2 @@
+import type { TableConfig } from './types/internal';
+export declare const drawHeader: (width: number, config: TableConfig) => string;

package/dist/drawHeader.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.drawHeader = void 0;
+const alignString_1 = require("./alignString");
+const drawRow_1 = require("./drawRow");
+const padTableData_1 = require("./padTableData");
+const truncateTableData_1 = require("./truncateTableData");
+const wrapCell_1 = require("./wrapCell");
+const drawHeader = (width, config) => {
+    if (!config.header) {
+        throw new Error('Can not draw header without header configuration');
+    }
+    const { alignment, paddingRight, paddingLeft, wrapWord } = config.header;
+    let content = config.header.content;
+    content = truncateTableData_1.truncateString(content, config.header.truncate);
+    const headerLines = wrapCell_1.wrapCell(content, width, wrapWord);
+    return headerLines.map((headerLine) => {
+        let line = alignString_1.alignString(headerLine, width, alignment);
+        line = padTableData_1.padString(line, paddingLeft, paddingRight);
+        return drawRow_1.drawRow([line], {
+            ...config,
+            drawVerticalLine: (index) => {
+                const columnCount = config.columns.length;
+                return config.drawVerticalLine(index === 0 ? 0 : columnCount, columnCount);
+            },
+        });
+    }).join('');
+};
+exports.drawHeader = drawHeader;

package/dist/drawRow.js

@@ -6,9 +6,15 @@ const drawRow = (row, config) => {
     const { border, drawVerticalLine } = config;
     return drawContent_1.drawContent(row, {
         drawSeparator: drawVerticalLine,
-        endSeparator: border.bodyRight,
-        middleSeparator: border.bodyJoin,
-        startSeparator: border.bodyLeft,
+        separatorGetter: (index, columnCount) => {
+            if (index === 0) {
+                return border.bodyLeft;
+            }
+            if (index === columnCount) {
+                return border.bodyRight;
+            }
+            return border.bodyJoin;
+        },
     }) + '\n';
 };
 exports.drawRow = drawRow;

package/dist/drawTable.js

@@ -1,8 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.drawTable = void 0;
+const string_width_1 = __importDefault(require("string-width"));
 const drawBorder_1 = require("./drawBorder");
 const drawContent_1 = require("./drawContent");
+const drawHeader_1 = require("./drawHeader");
 const drawRow_1 = require("./drawRow");
 const utils_1 = require("./utils");
 const drawTable = (rows, columnWidths, rowHeights, config) => {
@@ -12,6 +17,13 @@ const drawTable = (rows, columnWidths, rowHeights, config) => {
             return drawRow_1.drawRow(row, config);
         }).join('');
     });
+    if (config.header) {
+        // assume that topLeft/right border have width = 1
+        const headerWidth = string_width_1.default(drawRow_1.drawRow(rows[0], config)) - 2 -
+            config.header.paddingLeft - config.header.paddingRight;
+        const header = drawHeader_1.drawHeader(headerWidth, config);
+        contents.unshift(header);
+    }
     return drawContent_1.drawContent(contents, {
         drawSeparator: (index, size) => {
             // Top/bottom border
@@ -20,9 +32,7 @@ const drawTable = (rows, columnWidths, rowHeights, config) => {
             }
             return !singleLine && drawHorizontalLine(index, size);
         },
-        endSeparator: drawBorder_1.drawBorderBottom(columnWidths, config),
-        middleSeparator: drawBorder_1.drawBorderJoin(columnWidths, config),
-        startSeparator: drawBorder_1.drawBorderTop(columnWidths, config),
+        separatorGetter: drawBorder_1.createTableBorderGetter(columnWidths, config),
     });
 };
 exports.drawTable = drawTable;

package/dist/generated/validators.d.ts

@@ -4,10 +4,10 @@ declare function validate43(data: any, { instancePath, parentData, parentDataPro
     parentDataProperty: any;
     rootData?: any;
 }): boolean;
-declare function validate73(data: any, { instancePath, parentData, parentDataProperty, rootData }?: {
+declare function validate76(data: any, { instancePath, parentData, parentDataProperty, rootData }?: {
     instancePath?: string | undefined;
     parentData: any;
     parentDataProperty: any;
     rootData?: any;
 }): boolean;
-export { validate43 as _config_json, validate73 as _streamConfig_json };
+export { validate43 as _config_json, validate76 as _streamConfig_json };