.editorconfig

@@ -7,6 +7,6 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[{package.json,*.yml}]
+[*.yml]
 indent_style = space
 indent_size = 2

.gitattributes

@@ -1 +1 @@
-* text=auto
+* text=auto eol=lf

.gitignore

@@ -1,2 +1,3 @@
 node_modules
+yarn.lock
 .nyc_output

.npmrc

@@ -0,0 +1 @@
+package-lock=false

.travis.yml

@@ -1,5 +1,7 @@
 language: node_js
 node_js:
-  - '4'
-  - 'node'
-after_success: npm run coveralls
+  - '10'
+  - '8'
+  - '6'
+after_success:
+  - './node_modules/.bin/nyc report --reporter=text-lcov | ./node_modules/.bin/coveralls'

index.js

@@ -1,68 +1,42 @@
 'use strict';
-var stringWidth = require('string-width');
-var stripAnsi = require('strip-ansi');
-
-var ESCAPES = [
-	'\u001b',
-	'\u009b'
-];
-
-var END_CODE = 39;
-
-var ESCAPE_CODES = {
-	0: 0,
-	1: 22,
-	2: 22,
-	3: 23,
-	4: 24,
-	7: 27,
-	8: 28,
-	9: 29,
-	30: 39,
-	31: 39,
-	32: 39,
-	33: 39,
-	34: 39,
-	35: 39,
-	36: 39,
-	37: 39,
-	90: 39,
-	40: 49,
-	41: 49,
-	42: 49,
-	43: 49,
-	44: 49,
-	45: 49,
-	46: 49,
-	47: 49
-};
+const stringWidth = require('string-width');
+const stripAnsi = require('strip-ansi');
+const ansiStyles = require('ansi-styles');
+
+const ESCAPES = new Set([
+	'\u001B',
+	'\u009B'
+]);
+
+const END_CODE = 39;
 
-function wrapAnsi(code) {
-	return ESCAPES[0] + '[' + code + 'm';
-}
+const wrapAnsi = code => `${ESCAPES.values().next().value}[${code}m`;
 
-// calculate the length of words split on ' ', ignoring
-// the extra characters added by ansi escape codes.
-function wordLengths(str) {
-	return str.split(' ').map(function (s) {
-		return stringWidth(s);
-	});
-}
+// Calculate the length of words split on ' ', ignoring
+// the extra characters added by ansi escape codes
+const wordLengths = string => string.split(' ').map(character => stringWidth(character));
 
-// wrap a long word across multiple rows.
-// ansi escape codes do not count towards length.
-function wrapWord(rows, word, cols) {
-	var insideEscape = false;
-	var visible = stripAnsi(rows[rows.length - 1]).length;
+// Wrap a long word across multiple rows
+// Ansi escape codes do not count towards length
+const wrapWord = (rows, word, columns) => {
+	const characters = [...word];
 
-	for (var i = 0; i < word.length; i++) {
-		var x = word[i];
+	let insideEscape = false;
+	let visible = stringWidth(stripAnsi(rows[rows.length - 1]));
 
-		rows[rows.length - 1] += x;
+	for (const [index, character] of characters.entries()) {
+		const characterLength = stringWidth(character);
+
+		if (visible + characterLength <= columns) {
+			rows[rows.length - 1] += character;
+		} else {
+			rows.push(character);
+			visible = 0;
+		}
 
-		if (ESCAPES.indexOf(x) !== -1) {
+		if (ESCAPES.has(character)) {
 			insideEscape = true;
-		} else if (insideEscape && x === 'm') {
+		} else if (insideEscape && character === 'm') {
 			insideEscape = false;
 			continue;
 		}
@@ -71,98 +45,118 @@ function wrapWord(rows, word, cols) {
 			continue;
 		}
 
-		visible++;
+		visible += characterLength;
 
-		if (visible >= cols && i < word.length - 1) {
+		if (visible === columns && index < characters.length - 1) {
 			rows.push('');
 			visible = 0;
 		}
 	}
 
-	// it's possible that the last row we copy over is only
-	// ansi escape characters, handle this edge-case.
+	// It's possible that the last row we copy over is only
+	// ansi escape characters, handle this edge-case
 	if (!visible && rows[rows.length - 1].length > 0 && rows.length > 1) {
 		rows[rows.length - 2] += rows.pop();
 	}
-}
+};
 
-// the wrap-ansi module can be invoked
-// in either 'hard' or 'soft' wrap mode.
+// The wrap-ansi module can be invoked
+// in either 'hard' or 'soft' wrap mode
 //
 // 'hard' will never allow a string to take up more
-// than cols characters.
+// than columns characters
 //
-// 'soft' allows long words to expand past the column length.
-function exec(str, cols, opts) {
-	var options = opts || {};
+// 'soft' allows long words to expand past the column length
+const exec = (string, columns, options = {}) => {
+	if (options.trim !== false && string.trim() === '') {
+		return '';
+	}
+
+	let pre = '';
+	let ret = '';
+	let escapeCode;
+
+	const lengths = wordLengths(string);
+	const rows = [''];
 
-	var pre = '';
-	var ret = '';
-	var escapeCode;
+	for (const [index, word] of string.split(' ').entries()) {
+		if (options.trim !== false) {
+			rows[rows.length - 1] = rows[rows.length - 1].trimLeft();
+		}
 
-	var lengths = wordLengths(str);
-	var words = str.split(' ');
-	var rows = [''];
+		let rowLength = stringWidth(rows[rows.length - 1]);
 
-	for (var i = 0, word; (word = words[i]) !== undefined; i++) {
-		var rowLength = stringWidth(rows[rows.length - 1]);
+		if (index !== 0) {
+			if (rowLength === columns && (options.wordWrap === false || options.trim === false)) {
+				// If we start with a new word but the current row length equals the length of the columns, add a new row
+				rows.push('');
+				rowLength = 0;
+			}
 
-		if (rowLength) {
 			rows[rows.length - 1] += ' ';
 			rowLength++;
 		}
 
-		// in 'hard' wrap mode, the length of a line is
-		// never allowed to extend past 'cols'.
-		if (lengths[i] > cols && options.hard) {
-			if (rowLength) {
+		// In 'hard' wrap mode, the length of a line is
+		// never allowed to extend past 'columns'
+		if (options.hard && lengths[index] > columns) {
+			const remainingColumns = (columns - rowLength);
+			const breaksStartingThisLine = 1 + Math.floor((lengths[index] - remainingColumns - 1) / columns);
+			const breaksStartingNextLine = Math.floor((lengths[index] - 1) / columns);
+			if (breaksStartingNextLine < breaksStartingThisLine) {
 				rows.push('');
 			}
-			wrapWord(rows, word, cols);
+
+			wrapWord(rows, word, columns);
 			continue;
 		}
 
-		if (rowLength + lengths[i] > cols && rowLength > 0) {
-			if (options.wordWrap === false && rowLength < cols) {
-				wrapWord(rows, word, cols);
+		if (rowLength + lengths[index] > columns && rowLength > 0) {
+			if (options.wordWrap === false && rowLength < columns) {
+				wrapWord(rows, word, columns);
 				continue;
 			}
 
 			rows.push('');
 		}
 
+		if (rowLength + lengths[index] > columns && options.wordWrap === false) {
+			wrapWord(rows, word, columns);
+			continue;
+		}
+
 		rows[rows.length - 1] += word;
 	}
 
-	pre = rows.map(function (r) {
-		return r.trim();
-	}).join('\n');
-
-	for (var j = 0; j < pre.length; j++) {
-		var y = pre[j];
+	pre = rows.map(row => options.trim === false ? row : row.trim()).join('\n');
 
-		ret += y;
+	for (const [index, character] of [...pre].entries()) {
+		ret += character;
 
-		if (ESCAPES.indexOf(y) !== -1) {
-			var code = parseFloat(/[0-9][^m]*/.exec(pre.slice(j, j + 4)));
+		if (ESCAPES.has(character)) {
+			const code = parseFloat(/\d[^m]*/.exec(pre.slice(index, index + 4)));
 			escapeCode = code === END_CODE ? null : code;
 		}
 
-		if (escapeCode && ESCAPE_CODES[escapeCode]) {
-			if (pre[j + 1] === '\n') {
-				ret += wrapAnsi(ESCAPE_CODES[escapeCode]);
-			} else if (y === '\n') {
+		const code = ansiStyles.codes.get(Number(escapeCode));
+
+		if (escapeCode && code) {
+			if (pre[index + 1] === '\n') {
+				ret += wrapAnsi(code);
+			} else if (character === '\n') {
 				ret += wrapAnsi(escapeCode);
 			}
 		}
 	}
 
 	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');
+// For each newline, invoke the method separately
+module.exports = (string, columns, options) => {
+	return String(string)
+		.normalize()
+		.split('\n')
+		.map(line => exec(line, columns, options))
+		.join('\n');
 };

license

@@ -1,21 +1,9 @@
-The MIT License (MIT)
+MIT License
 
 Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.