@trenskow/print 0.1.7 → 0.1.9

package/lib/index.js

@@ -12,9 +12,13 @@ import NullStream from '@trenskow/null-stream';
 import keyd from 'keyd';
 
 let ttyColumn = 0;
+let forceTTY = ['1', 'true'].includes(process.env.FORCE_TTY);
+let ttyWidth = parseInt(process.env.TTY_WIDTH) || process.stdout.columns || 80;
 
 const printer = (stream) => {
 
+	const isTTY = forceTTY || stream.isTTY;
+
 	const print = (content = '', options = {}) => {
 
 		if (!Array.isArray(content)) content = [content];
@@ -31,13 +35,13 @@ const printer = (stream) => {
 
 			stream.write(output);
 
-			if (stream.isTTY) {
+			if (isTTY) {
 
 				const lines = output.split('\n');
 
 				if (lines.length > 1) ttyColumn = 0;
 
-				ttyColumn = (ttyColumn + lines[lines.length - 1].length) % stream.columns;
+				ttyColumn = (ttyColumn + lines[lines.length - 1].length) % (stream.columns || ttyWidth);
 
 			}
 
@@ -70,9 +74,9 @@ const printer = (stream) => {
 				};
 
 				print[modifier].nn = (content) => {
-					if (stream.isTTY) print.nn(`\x1b[${offset + idx}m`);
+					if (isTTY) print.nn(`\x1b[${offset + idx}m`);
 					print.nn(content);
-					if (stream.isTTY) print.nn('\x1b[0m');
+					if (isTTY) print.nn('\x1b[0m');
 				};
 
 			});
@@ -105,13 +109,13 @@ const printer = (stream) => {
 
 		return (content) => {
 
-			if (stream.isTTY) {
+			if (isTTY) {
 				print.nn(`\x1b[38;2;${colors.map((color) => Math.round(color * 255)).join(';')}m`);
 			}
 
 			print(content);
 
-			if (stream.isTTY) {
+			if (isTTY) {
 				print.nn('\x1b[0m');
 			}
 
@@ -121,7 +125,7 @@ const printer = (stream) => {
 
 	print.sentence = (sentence) => {
 
-		if (!stream.isTTY) return print(sentence);
+		if (!isTTY) return print(sentence);
 
 		const offset = ttyColumn;
 
@@ -130,7 +134,7 @@ const printer = (stream) => {
 		words
 			.forEach((word) => {
 
-				if (ttyColumn + word.length >= stream.columns) {
+				if (ttyColumn + word.length >= (stream.columns || ttyWidth)) {
 					print();
 					print.nn((new Array(offset).fill(' ').join('')));
 				}
@@ -165,7 +169,7 @@ const printer = (stream) => {
 			.map((column) => typeof column === 'function' ? column() : column)
 			.map((column) => `${''.padStart(paddingLeft, ' ')}${column || ''}`));
 
-		if (!stream.isTTY) {
+		if (!isTTY) {
 			print(data.map((row) => row.join('\t')).join('\n'));
 			return;
 		}
@@ -194,7 +198,7 @@ const printer = (stream) => {
 
 	Object.defineProperty(print, 'tty', {
 		get: () => {
-			return stream.isTTY ? printer(stream) : printer(new NullStream());
+			return isTTY ? printer(stream) : printer(new NullStream());
 		}
 	});
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@trenskow/print",
-	"version": "0.1.7",
+	"version": "0.1.9",
 	"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"
 	}
 }