@trenskow/print 0.1.6 → 0.1.8

package/lib/index.js

@@ -6,6 +6,8 @@
 // See license in LICENSE.
 //
 
+import { PassThrough } from 'stream';
+
 import NullStream from '@trenskow/null-stream';
 import keyd from 'keyd';
 
@@ -143,21 +145,34 @@ const printer = (stream) => {
 
 	};
 
-	print.table = ({ columns, data, options: { header } = { header: true } }) => {
+	print.table = ({ columns, data, options: { paddingLeft = 0 } = {} }) => {
 
 		if (!Array.isArray(data)) data = [data];
 
+		let header = true;
+
+		if (Array.isArray(columns)) {
+
+			header = false;
+
+			columns = Object.fromEntries(
+				columns.map((column) => [column, column]));
+
+		}
+
 		data = data.map((row) => Object.keys(columns)
 			.map((column) => keyd(row).get(column) || '')
 			.map((column) => typeof column === 'function' ? column() : column)
-			.map((column) => `${column || ''}`));
+			.map((column) => `${''.padStart(paddingLeft, ' ')}${column || ''}`));
 
 		if (!stream.isTTY) {
 			print(data.map((row) => row.join('\t')).join('\n'));
 			return;
 		}
 
-		data = [header ? Object.values(columns) : [], ...data];
+		if (header) {
+			data = [Object.values(columns), ...data];
+		}
 
 		const columnWidth = Object.keys(columns)
 			.map((_, idx) => {
@@ -166,7 +181,7 @@ const printer = (stream) => {
 
 		data.forEach((row, idx) => {
 
-			print.nn(idx === 0 && header ? '\x1b[1m' : '\x1b[0m');
+			print.tty.nn(idx === 0 && header ? `${''.padStart(paddingLeft, ' ')}\x1b[1m` : '\x1b[0m');
 
 			print(
 				row
@@ -193,6 +208,22 @@ print.out = print;
 print.err = printer(process.stderr);
 print.stream = printer;
 
+print.toString = (writer) => {
+
+	const stream = new PassThrough();
+
+	let string = '';
+
+	stream.on('data', (chunk) => string += chunk.toString());
+
+	writer(printer(stream));
+
+	stream.end();
+
+	return string;
+
+};
+
 const parallelProgress = (options = {}) => {
 
 	options.simpleOutput = !process.stdout.isTTY || options.simpleOutput;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@trenskow/print",
-	"version": "0.1.6",
+	"version": "0.1.8",
 	"description": "A simple package for printing to the console (or other streams).",
 	"main": "index.js",
 	"type": "module",
@@ -31,6 +31,6 @@
 	},
 	"dependencies": {
 		"@trenskow/null-stream": "^0.1.1",
-		"keyd": "^2.1.17"
+		"keyd": "^2.1.18"
 	}
 }