table 6.5.1 → 6.7.2

package/dist/drawTable.js

@@ -3,46 +3,36 @@ 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 drawRow_1 = __importDefault(require("./drawRow"));
-/**
- * Group the array into sub-arrays by sizes.
- *
- * @example
- * chunkBySizes(['a', 'b', 'c', 'd', 'e'], [2, 1, 2]) = [ ['a', 'b'], ['c'], ['d', 'e'] ]
- */
-const groupBySizes = (array, sizes) => {
-    let startIndex = 0;
-    return sizes.map((rowHeight) => {
-        const chunk = array.slice(startIndex, startIndex + rowHeight);
-        startIndex += rowHeight;
-        return chunk;
-    });
-};
-const shouldDrawBorderJoin = (rowIndex, rowCount, config) => {
-    const { singleLine, drawHorizontalLine } = config;
-    return !singleLine && rowIndex + 1 < rowCount && drawHorizontalLine(rowIndex + 1, rowCount);
-};
-exports.default = (rows, columnWidths, rowHeights, config) => {
-    const { drawHorizontalLine, } = config;
-    const groupedRows = groupBySizes(rows, rowHeights).map((group) => {
+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) => {
+    const { drawHorizontalLine, singleLine, } = config;
+    const contents = utils_1.groupBySizes(rows, rowHeights).map((group) => {
         return group.map((row) => {
-            return drawRow_1.default(row, config);
+            return drawRow_1.drawRow(row, config);
         }).join('');
     });
-    const rowCount = groupedRows.length;
-    let output = '';
-    if (drawHorizontalLine(0, rowCount)) {
-        output += drawBorder_1.drawBorderTop(columnWidths, config);
+    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);
     }
-    groupedRows.forEach((row, rowIndex) => {
-        output += row;
-        if (shouldDrawBorderJoin(rowIndex, rowCount, config)) {
-            output += drawBorder_1.drawBorderJoin(columnWidths, config);
-        }
+    return drawContent_1.drawContent(contents, {
+        drawSeparator: (index, size) => {
+            // Top/bottom border
+            if (index === 0 || index === size) {
+                return drawHorizontalLine(index, size);
+            }
+            return !singleLine && drawHorizontalLine(index, size);
+        },
+        separatorGetter: drawBorder_1.createTableBorderGetter(columnWidths, config),
     });
-    if (drawHorizontalLine(rowCount, rowCount)) {
-        output += drawBorder_1.drawBorderBottom(columnWidths, config);
-    }
-    return output;
 };
+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 validate70(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, validate70 as _streamConfig_json };
+export { validate43 as _config_json, validate76 as _streamConfig_json };