slice-ansi 2.1.0 → 3.0.0

package/index.js

@@ -8,49 +8,87 @@ const ESCAPES = [
 	'\u009B'
 ];
 
-const END_CODE = 39;
-
 const wrapAnsi = code => `${ESCAPES[0]}[${code}m`;
 
-module.exports = (str, begin, end) => {
-	const arr = [...str.normalize()];
+const checkAnsi = (ansiCodes, isEscapes, endAnsiCode) => {
+	let output = [];
+	ansiCodes = [...ansiCodes];
 
-	end = typeof end === 'number' ? end : arr.length;
+	for (let ansiCode of ansiCodes) {
+		const ansiCodeOrigin = ansiCode;
+		if (ansiCode.match(';')) {
+			ansiCode = ansiCode.split(';')[0][0] + '0';
+		}
 
-	let insideEscape = false;
-	let escapeCode = null;
+		const item = ansiStyles.codes.get(parseInt(ansiCode, 10));
+		if (item) {
+			const indexEscape = ansiCodes.indexOf(item.toString());
+			if (indexEscape >= 0) {
+				ansiCodes.splice(indexEscape, 1);
+			} else {
+				output.push(wrapAnsi(isEscapes ? item : ansiCodeOrigin));
+			}
+		} else if (isEscapes) {
+			output.push(wrapAnsi(0));
+			break;
+		} else {
+			output.push(wrapAnsi(ansiCodeOrigin));
+		}
+	}
+
+	if (isEscapes) {
+		output = output.filter((element, index) => output.indexOf(element) === index);
+		if (endAnsiCode !== undefined) {
+			const fistEscapeCode = wrapAnsi(ansiStyles.codes.get(parseInt(endAnsiCode, 10)));
+			output = output.reduce((current, next) => next === fistEscapeCode ? [next, ...current] : [...current, next], []);
+		}
+	}
+
+	return output.join('');
+};
+
+module.exports = (string, begin, end) => {
+	const characters = [...string.normalize()];
+	const ansiCodes = [];
+
+	end = typeof end === 'number' ? end : characters.length;
+
+	let isInsideEscape = false;
+	let ansiCode;
 	let visible = 0;
 	let output = '';
 
-	for (const [i, x] of arr.entries()) {
+	for (const [index, character] of characters.entries()) {
 		let leftEscape = false;
 
-		if (ESCAPES.includes(x)) {
-			insideEscape = true;
-			const code = /\d[^m]*/.exec(str.slice(i, i + 18));
-			escapeCode = code === END_CODE ? null : code;
-		} else if (insideEscape && x === 'm') {
-			insideEscape = false;
+		if (ESCAPES.includes(character)) {
+			const code = /\d[^m]*/.exec(string.slice(index, index + 18));
+			ansiCode = code && code.length > 0 ? code[0] : undefined;
+			if (visible < end) {
+				isInsideEscape = true;
+				if (ansiCode !== undefined) {
+					ansiCodes.push(ansiCode);
+				}
+			}
+		} else if (isInsideEscape && character === 'm') {
+			isInsideEscape = false;
 			leftEscape = true;
 		}
 
-		if (!insideEscape && !leftEscape) {
+		if (!isInsideEscape && !leftEscape) {
 			++visible;
 		}
 
-		if (!astralRegex({exact: true}).test(x) && isFullwidthCodePoint(x.codePointAt())) {
+		if (!astralRegex({exact: true}).test(character) && isFullwidthCodePoint(character.codePointAt())) {
 			++visible;
 		}
 
 		if (visible > begin && visible <= end) {
-			output += x;
-		} else if (visible === begin && !insideEscape && escapeCode !== null && escapeCode !== END_CODE) {
-			output += wrapAnsi(escapeCode);
+			output += character;
+		} else if (visible === begin && !isInsideEscape && ansiCode !== undefined) {
+			output = checkAnsi(ansiCodes);
 		} else if (visible >= end) {
-			if (escapeCode !== null) {
-				output += wrapAnsi(ansiStyles.codes.get(parseInt(escapeCode, 10)) || END_CODE);
-			}
-
+			output += checkAnsi(ansiCodes, true, ansiCode);
 			break;
 		}
 	}

package/package.json

@@ -1,11 +1,11 @@
 {
 	"name": "slice-ansi",
-	"version": "2.1.0",
+	"version": "3.0.0",
 	"description": "Slice a string with ANSI escape codes",
 	"license": "MIT",
 	"repository": "chalk/slice-ansi",
 	"engines": {
-		"node": ">=6"
+		"node": ">=8"
 	},
 	"scripts": {
 		"test": "xo && ava"
@@ -37,14 +37,14 @@
 		"text"
 	],
 	"dependencies": {
-		"ansi-styles": "^3.2.0",
-		"astral-regex": "^1.0.0",
-		"is-fullwidth-code-point": "^2.0.0"
+		"ansi-styles": "^4.0.0",
+		"astral-regex": "^2.0.0",
+		"is-fullwidth-code-point": "^3.0.0"
 	},
 	"devDependencies": {
-		"ava": "^1.1.0",
+		"ava": "^2.1.0",
 		"chalk": "^2.4.2",
-		"random-item": "^1.0.0",
+		"random-item": "^3.0.0",
 		"strip-ansi": "^5.0.0",
 		"xo": "^0.24.0"
 	}

package/readme.md

@@ -16,18 +16,18 @@ $ npm install slice-ansi
 const chalk = require('chalk');
 const sliceAnsi = require('slice-ansi');
 
-const input = 'The quick brown ' + chalk.red('fox jumped over ') +
+const string = 'The quick brown ' + chalk.red('fox jumped over ') +
 	'the lazy ' + chalk.green('dog and then ran away with the unicorn.');
 
-console.log(sliceAnsi(input, 20, 30));
+console.log(sliceAnsi(string, 20, 30));
 ```
 
 
 ## API
 
-### sliceAnsi(input, beginSlice, [endSlice])
+### sliceAnsi(string, beginSlice, endSlice?)
 
-#### input
+#### string
 
 Type: `string`
 
@@ -59,6 +59,14 @@ Zero-based index at which to end the slice.
 - [Josh Junon](https://github.com/qix-)
 
 
-## License
+---
 
-MIT
+<div align="center">
+	<b>
+		<a href="https://tidelift.com/subscription/pkg/npm-slice_ansi?utm_source=npm-slice-ansi&utm_medium=referral&utm_campaign=readme">Get professional support for this package with a Tidelift subscription</a>
+	</b>
+	<br>
+	<sub>
+		Tidelift helps make open source sustainable for maintainers while giving companies<br>assurances about security, maintenance, and licensing for their dependencies.
+	</sub>
+</div>