zcatalyst-cli 1.13.3 → 1.14.0

package/lib/cli_table/src/layout-manager.js

@@ -1,215 +1,237 @@
-"use strict";
 const Cell = require('./cell');
 const { ColSpanCell, RowSpanCell } = Cell;
+
 (function () {
-    function layoutTable(table) {
-        table.forEach((row, rowIndex) => {
-            let prevCell = null;
-            row.forEach((cell, columnIndex) => {
-                cell.y = rowIndex;
-                cell.x = prevCell ? prevCell.x + 1 : columnIndex;
-                for (let y = rowIndex; y >= 0; y--) {
-                    const row2 = table[y];
-                    const xMax = y === rowIndex ? columnIndex : row2.length;
-                    for (let x = 0; x < xMax; x++) {
-                        const cell2 = row2[x];
-                        while (cellsConflict(cell, cell2)) {
-                            cell.x++;
-                        }
-                    }
-                    prevCell = cell;
-                }
-            });
-        });
-    }
-    function maxWidth(table) {
-        let mw = 0;
-        table.forEach((row) => {
-            row.forEach((cell) => {
-                mw = Math.max(mw, cell.x + (cell.colSpan || 1));
-            });
-        });
-        return mw;
-    }
-    function maxHeight(table) {
-        return table.length;
-    }
-    function cellsConflict(cell1, cell2) {
-        const yMin1 = cell1.y;
-        const yMax1 = cell1.y - 1 + (cell1.rowSpan || 1);
-        const yMin2 = cell2.y;
-        const yMax2 = cell2.y - 1 + (cell2.rowSpan || 1);
-        const yConflict = !(yMin1 > yMax2 || yMin2 > yMax1);
-        const xMin1 = cell1.x;
-        const xMax1 = cell1.x - 1 + (cell1.colSpan || 1);
-        const xMin2 = cell2.x;
-        const xMax2 = cell2.x - 1 + (cell2.colSpan || 1);
-        const xConflict = !(xMin1 > xMax2 || xMin2 > xMax1);
-        return yConflict && xConflict;
-    }
-    function conflictExists(rows, x, y) {
-        const i_max = Math.min(rows.length - 1, y);
-        const cell = { x: x, y: y };
-        for (let i = 0; i <= i_max; i++) {
-            const row = rows[i];
-            for (let j = 0; j < row.length; j++) {
-                if (cellsConflict(cell, row[j])) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-    function allBlank(rows, y, xMin, xMax) {
-        for (let x = xMin; x < xMax; x++) {
-            if (conflictExists(rows, x, y)) {
-                return false;
-            }
-        }
-        return true;
-    }
-    function addRowSpanCells(table) {
-        table.forEach((row, rowIndex) => {
-            row.forEach((cell) => {
-                for (let i = 1; i < cell.rowSpan; i++) {
-                    const rowSpanCell = new RowSpanCell(cell);
-                    rowSpanCell.x = cell.x;
-                    rowSpanCell.y = cell.y + i;
-                    rowSpanCell.colSpan = cell.colSpan;
-                    insertCell(rowSpanCell, table[rowIndex + i]);
-                }
-            });
-        });
-    }
-    function addColSpanCells(cellRows) {
-        for (let rowIndex = cellRows.length - 1; rowIndex >= 0; rowIndex--) {
-            const cellColumns = cellRows[rowIndex];
-            for (let columnIndex = 0; columnIndex < cellColumns.length; columnIndex++) {
-                const cell = cellColumns[columnIndex];
-                for (let k = 1; k < cell.colSpan; k++) {
-                    const colSpanCell = new ColSpanCell();
-                    colSpanCell.x = cell.x + k;
-                    colSpanCell.y = cell.y;
-                    cellColumns.splice(columnIndex + 1, 0, colSpanCell);
-                }
-            }
-        }
-    }
-    function insertCell(cell, row) {
-        let x = 0;
-        while (x < row.length && row[x].x < cell.x) {
-            x++;
-        }
-        row.splice(x, 0, cell);
-    }
-    function fillInTable(table) {
-        const h_max = maxHeight(table);
-        const w_max = maxWidth(table);
-        for (let y = 0; y < h_max; y++) {
-            for (let x = 0; x < w_max; x++) {
-                if (!conflictExists(table, x, y)) {
-                    const opts = { x: x, y: y, colSpan: 1, rowSpan: 1 };
-                    x++;
-                    while (x < w_max && !conflictExists(table, x, y)) {
-                        opts.colSpan++;
-                        x++;
-                    }
-                    let y2 = y + 1;
-                    while (y2 < h_max && allBlank(table, y2, opts.x, opts.x + opts.colSpan)) {
-                        opts.rowSpan++;
-                        y2++;
-                    }
-                    const cell = new Cell(opts);
-                    cell.x = opts.x;
-                    cell.y = opts.y;
-                    insertCell(cell, table[y]);
-                }
-            }
-        }
-    }
-    function generateCells(rows) {
-        return rows.map((row) => {
-            if (!Array.isArray(row)) {
-                const key = Object.keys(row)[0];
-                row = row[key];
-                if (Array.isArray(row)) {
-                    row = row.slice();
-                    row.unshift(key);
-                }
-                else {
-                    row = [key, row];
-                }
-            }
-            return row.map((cell) => {
-                return new Cell(cell);
-            });
-        });
-    }
-    function makeTableLayout(rows) {
-        const cellRows = generateCells(rows);
-        layoutTable(cellRows);
-        fillInTable(cellRows);
-        addRowSpanCells(cellRows);
-        addColSpanCells(cellRows);
-        return cellRows;
-    }
-    module.exports = {
-        makeTableLayout: makeTableLayout,
-        layoutTable: layoutTable,
-        addRowSpanCells: addRowSpanCells,
-        maxWidth: maxWidth,
-        fillInTable: fillInTable,
-        computeWidths: makeComputeWidths('colSpan', 'desiredWidth', 'x', 1),
-        computeHeights: makeComputeWidths('rowSpan', 'desiredHeight', 'y', 1)
-    };
+	function layoutTable(table) {
+		table.forEach((row, rowIndex) => {
+			let prevCell = null;
+			row.forEach((cell, columnIndex) => {
+				cell.y = rowIndex;
+				cell.x = prevCell ? prevCell.x + 1 : columnIndex;
+				for (let y = rowIndex; y >= 0; y--) {
+					const row2 = table[y];
+					const xMax = y === rowIndex ? columnIndex : row2.length;
+					for (let x = 0; x < xMax; x++) {
+						const cell2 = row2[x];
+						while (cellsConflict(cell, cell2)) {
+							cell.x++;
+						}
+					}
+					prevCell = cell;
+				}
+			});
+		});
+	}
+
+	function maxWidth(table) {
+		let mw = 0;
+		table.forEach((row) => {
+			row.forEach((cell) => {
+				mw = Math.max(mw, cell.x + (cell.colSpan || 1));
+			});
+		});
+		return mw;
+	}
+
+	function maxHeight(table) {
+		return table.length;
+	}
+
+	function cellsConflict(cell1, cell2) {
+		const yMin1 = cell1.y;
+		const yMax1 = cell1.y - 1 + (cell1.rowSpan || 1);
+		const yMin2 = cell2.y;
+		const yMax2 = cell2.y - 1 + (cell2.rowSpan || 1);
+		const yConflict = !(yMin1 > yMax2 || yMin2 > yMax1);
+
+		const xMin1 = cell1.x;
+		const xMax1 = cell1.x - 1 + (cell1.colSpan || 1);
+		const xMin2 = cell2.x;
+		const xMax2 = cell2.x - 1 + (cell2.colSpan || 1);
+		const xConflict = !(xMin1 > xMax2 || xMin2 > xMax1);
+
+		return yConflict && xConflict;
+	}
+
+	function conflictExists(rows, x, y) {
+		const i_max = Math.min(rows.length - 1, y);
+		const cell = { x: x, y: y };
+		for (let i = 0; i <= i_max; i++) {
+			const row = rows[i];
+			for (let j = 0; j < row.length; j++) {
+				if (cellsConflict(cell, row[j])) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	function allBlank(rows, y, xMin, xMax) {
+		for (let x = xMin; x < xMax; x++) {
+			if (conflictExists(rows, x, y)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	function addRowSpanCells(table) {
+		table.forEach((row, rowIndex) => {
+			row.forEach((cell) => {
+				for (let i = 1; i < cell.rowSpan; i++) {
+					const rowSpanCell = new RowSpanCell(cell);
+					rowSpanCell.x = cell.x;
+					rowSpanCell.y = cell.y + i;
+					rowSpanCell.colSpan = cell.colSpan;
+					insertCell(rowSpanCell, table[rowIndex + i]);
+				}
+			});
+		});
+	}
+
+	function addColSpanCells(cellRows) {
+		for (let rowIndex = cellRows.length - 1; rowIndex >= 0; rowIndex--) {
+			const cellColumns = cellRows[rowIndex];
+			for (let columnIndex = 0; columnIndex < cellColumns.length; columnIndex++) {
+				const cell = cellColumns[columnIndex];
+				for (let k = 1; k < cell.colSpan; k++) {
+					const colSpanCell = new ColSpanCell();
+					colSpanCell.x = cell.x + k;
+					colSpanCell.y = cell.y;
+					cellColumns.splice(columnIndex + 1, 0, colSpanCell);
+				}
+			}
+		}
+	}
+
+	function insertCell(cell, row) {
+		let x = 0;
+		while (x < row.length && row[x].x < cell.x) {
+			x++;
+		}
+		row.splice(x, 0, cell);
+	}
+
+	function fillInTable(table) {
+		const h_max = maxHeight(table);
+		const w_max = maxWidth(table);
+		for (let y = 0; y < h_max; y++) {
+			for (let x = 0; x < w_max; x++) {
+				if (!conflictExists(table, x, y)) {
+					const opts = { x: x, y: y, colSpan: 1, rowSpan: 1 };
+					x++;
+					while (x < w_max && !conflictExists(table, x, y)) {
+						opts.colSpan++;
+						x++;
+					}
+					let y2 = y + 1;
+					while (y2 < h_max && allBlank(table, y2, opts.x, opts.x + opts.colSpan)) {
+						opts.rowSpan++;
+						y2++;
+					}
+
+					const cell = new Cell(opts);
+					cell.x = opts.x;
+					cell.y = opts.y;
+					insertCell(cell, table[y]);
+				}
+			}
+		}
+	}
+
+	function generateCells(rows) {
+		return rows.map((row) => {
+			if (!Array.isArray(row)) {
+				const key = Object.keys(row)[0];
+				row = row[key];
+				if (Array.isArray(row)) {
+					row = row.slice();
+					row.unshift(key);
+				} else {
+					row = [key, row];
+				}
+			}
+			return row.map((cell) => {
+				return new Cell(cell);
+			});
+		});
+	}
+
+	function makeTableLayout(rows) {
+		const cellRows = generateCells(rows);
+		layoutTable(cellRows);
+		fillInTable(cellRows);
+		addRowSpanCells(cellRows);
+		addColSpanCells(cellRows);
+		return cellRows;
+	}
+
+	module.exports = {
+		makeTableLayout: makeTableLayout,
+		layoutTable: layoutTable,
+		addRowSpanCells: addRowSpanCells,
+		maxWidth: maxWidth,
+		fillInTable: fillInTable,
+		computeWidths: makeComputeWidths('colSpan', 'desiredWidth', 'x', 1),
+		computeHeights: makeComputeWidths('rowSpan', 'desiredHeight', 'y', 1)
+	};
 })();
+
 function makeComputeWidths(colSpan, desiredWidth, x, forcedMin) {
-    return function (vals, table) {
-        const result = [];
-        const spanners = [];
-        table.forEach((row) => {
-            row.forEach((cell) => {
-                if ((cell[colSpan] || 1) > 1) {
-                    spanners.push(cell);
-                }
-                else {
-                    result[cell[x]] = Math.max(result[cell[x]] || 0, cell[desiredWidth] || 0, forcedMin);
-                }
-            });
-        });
-        vals.forEach((val, index) => {
-            if (typeof val === 'number') {
-                result[index] = val;
-            }
-        });
-        for (let k = spanners.length - 1; k >= 0; k--) {
-            const cell = spanners[k];
-            const span = cell[colSpan];
-            const col = cell[x];
-            let existingWidth = result[col];
-            let editableCols = typeof vals[col] === 'number' ? 0 : 1;
-            for (let i = 1; i < span; i++) {
-                existingWidth += 1 + result[col + i];
-                if (typeof vals[col + i] !== 'number') {
-                    editableCols++;
-                }
-            }
-            if (cell[desiredWidth] > existingWidth) {
-                let i = 0;
-                while (editableCols > 0 && cell[desiredWidth] > existingWidth) {
-                    if (typeof vals[col + i] !== 'number') {
-                        const dif = Math.round((cell[desiredWidth] - existingWidth) / editableCols);
-                        existingWidth += dif;
-                        result[col + i] += dif;
-                        editableCols--;
-                    }
-                    i++;
-                }
-            }
-        }
-        Object.assign(vals, result);
-        for (let j = 0; j < vals.length; j++) {
-            vals[j] = Math.max(forcedMin, vals[j] || 0);
-        }
-    };
+	return function (vals, table) {
+		const result = [];
+		const spanners = [];
+		table.forEach((row) => {
+			row.forEach((cell) => {
+				if ((cell[colSpan] || 1) > 1) {
+					spanners.push(cell);
+				} else {
+					result[cell[x]] = Math.max(
+						result[cell[x]] || 0,
+						cell[desiredWidth] || 0,
+						forcedMin
+					);
+				}
+			});
+		});
+
+		vals.forEach((val, index) => {
+			if (typeof val === 'number') {
+				result[index] = val;
+			}
+		});
+
+		// spanners.forEach(function(cell){
+		for (let k = spanners.length - 1; k >= 0; k--) {
+			const cell = spanners[k];
+			const span = cell[colSpan];
+			const col = cell[x];
+			let existingWidth = result[col];
+			let editableCols = typeof vals[col] === 'number' ? 0 : 1;
+			for (let i = 1; i < span; i++) {
+				existingWidth += 1 + result[col + i];
+				if (typeof vals[col + i] !== 'number') {
+					editableCols++;
+				}
+			}
+			if (cell[desiredWidth] > existingWidth) {
+				let i = 0;
+				while (editableCols > 0 && cell[desiredWidth] > existingWidth) {
+					if (typeof vals[col + i] !== 'number') {
+						const dif = Math.round((cell[desiredWidth] - existingWidth) / editableCols);
+						existingWidth += dif;
+						result[col + i] += dif;
+						editableCols--;
+					}
+					i++;
+				}
+			}
+		}
+
+		Object.assign(vals, result);
+		for (let j = 0; j < vals.length; j++) {
+			vals[j] = Math.max(forcedMin, vals[j] || 0);
+		}
+	};
 }

package/lib/cli_table/src/table.js

@@ -1,67 +1,83 @@
-"use strict";
 const utils = require('./utils');
 const tableLayout = require('./layout-manager');
+
 class Table extends Array {
-    constructor(options) {
-        super();
-        this.options = utils.mergeOptions(options);
-    }
-    toString() {
-        let array = this;
-        const headersPresent = this.options.head && this.options.head.length;
-        if (headersPresent) {
-            array = [this.options.head];
-            if (this.length) {
-                array.push.apply(array, this);
-            }
-        }
-        else {
-            this.options.style.head = [];
-        }
-        const cells = tableLayout.makeTableLayout(array);
-        cells.forEach(function (row) {
-            row.forEach(function (cell) {
-                cell.mergeTableOptions(this.options, cells);
-            }, this);
-        }, this);
-        tableLayout.computeWidths(this.options.colWidths, cells);
-        tableLayout.computeHeights(this.options.rowHeights, cells);
-        cells.forEach(function (row) {
-            row.forEach(function (cell) {
-                cell.init(this.options);
-            }, this);
-        }, this);
-        const result = [];
-        for (let rowIndex = 0; rowIndex < cells.length; rowIndex++) {
-            const row = cells[rowIndex];
-            const heightOfRow = this.options.rowHeights[rowIndex];
-            if (rowIndex === 0 ||
-                !this.options.style.compact ||
-                (rowIndex == 1 && headersPresent)) {
-                doDraw(row, 'top', result);
-            }
-            for (let lineNum = 0; lineNum < heightOfRow; lineNum++) {
-                doDraw(row, lineNum, result);
-            }
-            if (rowIndex + 1 == cells.length) {
-                doDraw(row, 'bottom', result);
-            }
-        }
-        return result.join('\n');
-    }
-    get width() {
-        const str = this.toString().split('\n');
-        return str[0].length;
-    }
+	constructor(options) {
+		super();
+
+		this.options = utils.mergeOptions(options);
+	}
+
+	toString() {
+		let array = this;
+		const headersPresent = this.options.head && this.options.head.length;
+		if (headersPresent) {
+			array = [this.options.head];
+			if (this.length) {
+				array.push.apply(array, this);
+			}
+		} else {
+			this.options.style.head = [];
+		}
+
+		const cells = tableLayout.makeTableLayout(array);
+
+		cells.forEach(function (row) {
+			row.forEach(function (cell) {
+				cell.mergeTableOptions(this.options, cells);
+			}, this);
+		}, this);
+
+		tableLayout.computeWidths(this.options.colWidths, cells);
+		tableLayout.computeHeights(this.options.rowHeights, cells);
+
+		cells.forEach(function (row) {
+			row.forEach(function (cell) {
+				cell.init(this.options);
+			}, this);
+		}, this);
+
+		const result = [];
+
+		for (let rowIndex = 0; rowIndex < cells.length; rowIndex++) {
+			const row = cells[rowIndex];
+			const heightOfRow = this.options.rowHeights[rowIndex];
+
+			if (
+				rowIndex === 0 ||
+				!this.options.style.compact ||
+				(rowIndex == 1 && headersPresent)
+			) {
+				doDraw(row, 'top', result);
+			}
+
+			for (let lineNum = 0; lineNum < heightOfRow; lineNum++) {
+				doDraw(row, lineNum, result);
+			}
+
+			if (rowIndex + 1 == cells.length) {
+				doDraw(row, 'bottom', result);
+			}
+		}
+
+		return result.join('\n');
+	}
+
+	get width() {
+		const str = this.toString().split('\n');
+		return str[0].length;
+	}
 }
+
 function doDraw(row, lineNum, result) {
-    const line = [];
-    row.forEach((cell) => {
-        line.push(cell.draw(lineNum));
-    });
-    const str = line.join('');
-    if (str.length) {
-        result.push(str);
-    }
+	const line = [];
+	row.forEach((cell) => {
+		line.push(cell.draw(lineNum));
+	});
+	const str = line.join('');
+	if (str.length) {
+		result.push(str);
+	}
 }
+
 module.exports = Table;