wrap-ansi 0.3.0 → 2.1.0

package/index.js

@@ -1,5 +1,6 @@
 'use strict';
 var stringWidth = require('string-width');
+var stripAnsi = require('strip-ansi');
 
 var ESCAPES = [
 	'\u001b',
@@ -52,7 +53,7 @@ function wordLengths(str) {
 // ansi escape codes do not count towards length.
 function wrapWord(rows, word, cols) {
 	var insideEscape = false;
-	var visible = rows[rows.length - 1].length;
+	var visible = stripAnsi(rows[rows.length - 1]).length;
 
 	for (var i = 0; i < word.length; i++) {
 		var x = word[i];
@@ -92,14 +93,12 @@ function wrapWord(rows, word, cols) {
 // than cols characters.
 //
 // 'soft' allows long words to expand past the column length.
-module.exports = function (str, cols, opts) {
+function exec(str, cols, opts) {
 	var options = opts || {};
 
 	var pre = '';
 	var ret = '';
-	var insideEscape = false;
 	var escapeCode;
-	var visible = 0;
 
 	var lengths = wordLengths(str);
 	var words = str.split(' ');
@@ -123,7 +122,12 @@ module.exports = function (str, cols, opts) {
 			continue;
 		}
 
-		if (rowLength + lengths[i] > cols) {
+		if (rowLength + lengths[i] > cols && rowLength > 0) {
+			if (options.wordWrap === false && rowLength < cols) {
+				wrapWord(rows, word, cols);
+				continue;
+			}
+
 			rows.push('');
 		}
 
@@ -134,8 +138,6 @@ module.exports = function (str, cols, opts) {
 		return r.trim();
 	}).join('\n');
 
-	visible = 0;
-
 	for (var j = 0; j < pre.length; j++) {
 		var y = pre[j];
 
@@ -144,17 +146,8 @@ module.exports = function (str, cols, opts) {
 		if (ESCAPES.indexOf(y) !== -1) {
 			var code = parseFloat(/[0-9][^m]*/.exec(pre.slice(j, j + 4)));
 			escapeCode = code === END_CODE ? null : code;
-		} else if (insideEscape && y === 'm') {
-			insideEscape = false;
-			continue;
 		}
 
-		if (insideEscape) {
-			continue;
-		}
-
-		visible++;
-
 		if (escapeCode && ESCAPE_CODES[escapeCode]) {
 			if (pre[j + 1] === '\n') {
 				ret += wrapAnsi(ESCAPE_CODES[escapeCode]);
@@ -165,4 +158,11 @@ module.exports = function (str, cols, opts) {
 	}
 
 	return ret;
+}
+
+// for each line break, invoke the method separately.
+module.exports = function (str, cols, opts) {
+	return String(str).split('\n').map(function (substr) {
+		return exec(substr, cols, opts);
+	}).join('\n');
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrap-ansi",
-  "version": "0.3.0",
+  "version": "2.1.0",
   "description": "Wordwrap a string with ANSI escape codes",
   "license": "MIT",
   "repository": "chalk/wrap-ansi",
@@ -19,8 +19,8 @@
     "node": ">=0.10.0"
   },
   "scripts": {
-    "test": "xo && nyc node test.js",
-    "coverage": "nyc --reporter=text-lcov node test.js | coveralls"
+    "test": "xo && nyc ava",
+    "coveralls": "nyc report --reporter=text-lcov | coveralls"
   },
   "files": [
     "index.js"
@@ -53,13 +53,15 @@
     "text"
   ],
   "dependencies": {
-    "string-width": "^1.0.1"
+    "string-width": "^1.0.1",
+    "strip-ansi": "^3.0.1"
   },
   "devDependencies": {
-    "ava": "0.0.4",
+    "ava": "^0.16.0",
     "chalk": "^1.1.0",
     "coveralls": "^2.11.4",
-    "nyc": "^3.2.2",
+    "has-ansi": "^2.0.0",
+    "nyc": "^6.2.1",
     "strip-ansi": "^3.0.0",
     "xo": "*"
   }

package/readme.md

@@ -1,4 +1,4 @@
-# wrap-ansi [![Build Status](https://travis-ci.org/chalk/wrap-ansi.svg?branch=master)](https://travis-ci.org/chalk/wrap-ansi) [![Coverage Status](https://coveralls.io/repos/chalk/wrap-ansi/badge.svg?branch=master&service=github)](https://coveralls.io/github/chalk/wrap-ansi?branch=master)
+# wrap-ansi [![Build Status](https://travis-ci.org/chalk/wrap-ansi.svg?branch=master)](https://travis-ci.org/chalk/wrap-ansi) [![Coverage Status](https://coveralls.io/repos/github/chalk/wrap-ansi/badge.svg?branch=master)](https://coveralls.io/github/chalk/wrap-ansi?branch=master)
 
 > Wordwrap a string with [ANSI escape codes](http://en.wikipedia.org/wiki/ANSI_escape_code#Colors_and_Styles)
 
@@ -43,21 +43,31 @@ Type: `number`
 
 Number of columns to wrap the text to.
 
-#### options.hard
+#### options
 
-Type: `boolean`  
+##### hard
+
+Type: `boolean`<br>
 Default: `false`
 
 By default the wrap is soft, meaning long words may extend past the column width. Setting this to `true` will make it hard wrap at the column width.
 
+##### wordWrap
+
+Type: `boolean`<br>
+Default: `true`
+
+By default, an attempt is made to split words at spaces, ensuring that they don't extend past the configured columns. If wordWrap is `false`, each column will instead be completely filled splitting words as necessary.
+
 
 ## Related
 
 - [slice-ansi](https://github.com/chalk/slice-ansi) - Slice a string with ANSI escape codes
+- [cli-truncate](https://github.com/sindresorhus/cli-truncate) - Truncate a string to a specific width in the terminal
 - [chalk](https://github.com/chalk/chalk) - Terminal string styling done right
 - [jsesc](https://github.com/mathiasbynens/jsesc) - Generate ASCII-only output from Unicode strings. Useful for creating test fixtures.
 
 
 ## License
 
-MIT © [Sindre Sorhus](http://sindresorhus.com)
+MIT © [Sindre Sorhus](https://sindresorhus.com)