slice-ansi 2.0.0 → 5.0.0

package/index.js

@@ -1,58 +1,105 @@
-'use strict';
-const isFullwidthCodePoint = require('is-fullwidth-code-point');
-const astralRegex = require('astral-regex');
-const ansiStyles = require('ansi-styles');
+import isFullwidthCodePoint from 'is-fullwidth-code-point';
+import ansiStyles from 'ansi-styles';
+
+const astralRegex = /^[\uD800-\uDBFF][\uDC00-\uDFFF]$/;
 
 const ESCAPES = [
 	'\u001B',
 	'\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];
+
+	for (let ansiCode of ansiCodes) {
+		const ansiCodeOrigin = ansiCode;
+		if (ansiCode.includes(';')) {
+			ansiCode = ansiCode.split(';')[0][0] + '0';
+		}
+
+		const item = ansiStyles.codes.get(Number.parseInt(ansiCode, 10));
+		if (item) {
+			const indexEscape = ansiCodes.indexOf(item.toString());
+			if (indexEscape === -1) {
+				output.push(wrapAnsi(isEscapes ? item : ansiCodeOrigin));
+			} else {
+				ansiCodes.splice(indexEscape, 1);
+			}
+		} 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(Number.parseInt(endAnsiCode, 10)));
+			// TODO: Remove the use of `.reduce` here.
+			// eslint-disable-next-line unicorn/no-array-reduce
+			output = output.reduce((current, next) => next === fistEscapeCode ? [next, ...current] : [...current, next], []);
+		}
+	}
+
+	return output.join('');
+};
 
-	end = typeof end === 'number' ? end : arr.length;
+export default function sliceAnsi(string, begin, end) {
+	const characters = [...string];
+	const ansiCodes = [];
 
-	let insideEscape = false;
-	let escapeCode = null;
+	let stringEnd = 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 + 4));
-			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 < stringEnd) {
+				isInsideEscape = true;
+
+				if (ansiCode !== undefined) {
+					ansiCodes.push(ansiCode);
+				}
+			}
+		} else if (isInsideEscape && character === 'm') {
+			isInsideEscape = false;
 			leftEscape = true;
 		}
 
-		if (!insideEscape && !leftEscape) {
-			++visible;
+		if (!isInsideEscape && !leftEscape) {
+			visible++;
 		}
 
-		if (!astralRegex({exact: true}).test(x) && isFullwidthCodePoint(x.codePointAt())) {
-			++visible;
-		}
+		if (!astralRegex.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);
-		} else if (visible >= end) {
-			if (escapeCode !== null) {
-				output += wrapAnsi(ansiStyles.codes.get(parseInt(escapeCode, 10)) || END_CODE);
+			if (typeof end !== 'number') {
+				stringEnd++;
 			}
+		}
+
+		if (visible > begin && visible <= stringEnd) {
+			output += character;
+		} else if (visible === begin && !isInsideEscape && ansiCode !== undefined) {
+			output = checkAnsi(ansiCodes);
+		} else if (visible >= stringEnd) {
+			output += checkAnsi(ansiCodes, true, ansiCode);
 			break;
 		}
 	}
 
 	return output;
-};
+}

package/license

@@ -1,6 +1,7 @@
 MIT License
 
 Copyright (c) DC <threedeecee@gmail.com>
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://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:
 

package/package.json

@@ -1,11 +1,14 @@
 {
 	"name": "slice-ansi",
-	"version": "2.0.0",
+	"version": "5.0.0",
 	"description": "Slice a string with ANSI escape codes",
 	"license": "MIT",
 	"repository": "chalk/slice-ansi",
+	"funding": "https://github.com/chalk/slice-ansi?sponsor=1",
+	"type": "module",
+	"exports": "./index.js",
 	"engines": {
-		"node": ">=6"
+		"node": ">=12"
 	},
 	"scripts": {
 		"test": "xo && ava"
@@ -37,15 +40,14 @@
 		"text"
 	],
 	"dependencies": {
-		"ansi-styles": "^3.2.0",
-		"astral-regex": "^1.0.0",
-		"is-fullwidth-code-point": "^2.0.0"
+		"ansi-styles": "^6.0.0",
+		"is-fullwidth-code-point": "^4.0.0"
 	},
 	"devDependencies": {
-		"ava": "^0.25.0",
-		"chalk": "^2.0.1",
-		"random-item": "^1.0.0",
-		"strip-ansi": "^5.0.0",
-		"xo": "^0.23.0"
+		"ava": "^3.15.0",
+		"chalk": "^4.1.0",
+		"random-item": "^4.0.0",
+		"strip-ansi": "^7.0.0",
+		"xo": "^0.38.2"
 	}
 }

package/readme.md

@@ -1,33 +1,30 @@
-# slice-ansi [![Build Status](https://travis-ci.org/chalk/slice-ansi.svg?branch=master)](https://travis-ci.org/chalk/slice-ansi) [![XO: Linted](https://img.shields.io/badge/xo-linted-blue.svg)](https://github.com/xojs/xo)
+# slice-ansi [![XO: Linted](https://img.shields.io/badge/xo-linted-blue.svg)](https://github.com/xojs/xo)
 
 > Slice a string with [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code#Colors_and_Styles)
 
-
 ## Install
 
 ```
 $ npm install slice-ansi
 ```
 
-
 ## Usage
 
 ```js
-const chalk = require('chalk');
-const sliceAnsi = require('slice-ansi');
+import chalk from 'chalk';
+import sliceAnsi from '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`
 
@@ -45,20 +42,25 @@ Type: `number`
 
 Zero-based index at which to end the slice.
 
-
 ## Related
 
 - [wrap-ansi](https://github.com/chalk/wrap-ansi) - Wordwrap 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
 
-
 ## Maintainers
 
 - [Sindre Sorhus](https://github.com/sindresorhus)
 - [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>