pixl-cli 1.1.0 → 1.1.1

package/cli.js

@@ -298,25 +298,12 @@ var cli = module.exports = {
 			max_col_widths[longest_col_idx]--;
 		}
 		
-		// finally prune affected columns, trying to preserve ANSI color inside column value
+		// finally prune affected columns by display width, preserving ANSI and emoji
 		rows.forEach( function(cols, idx) {
 			cols.forEach( function(col, idy) {
 				col = '' + col;
 				if (stringWidth(col) > max_col_widths[idy]) {
-					var suffix = '';
-					var prefix = '';
-					
-					while (col.match(/^(\u001b\[[^m]*?m)/)) {
-						prefix += RegExp.$1;
-						col = col.replace(/^(\u001b\[[^m]*?m)/, '');
-					}
-					
-					while (col.match(/(\u001b\[[^m]*?m)$/)) {
-						suffix = RegExp.$1 + suffix;
-						col = col.replace(/(\u001b\[[^m]*?m)$/, '');
-					}
-					
-					cols[idy] = prefix + col.substring(0, max_col_widths[idy] - 1) + '…' + suffix;
+					cols[idy] = Width.truncate(col, max_col_widths[idy], '…');
 				} // too wide
 			});
 		});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pixl-cli",
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"description": "Tools for building command-line apps for Node.js.",
 	"author": "Joseph Huckaby <jhuckaby@gmail.com>",
 	"homepage": "https://github.com/jhuckaby/pixl-cli",

package/util.js

@@ -9,7 +9,31 @@ var ansiPattern = new RegExp([
 // Split strings into user-perceived characters, including complete emoji sequences.
 var graphemeSegmenter = new Intl.Segmenter(undefined, { granularity: 'grapheme' });
 
+function splitAnsiGraphemes(text) {
+	// Split a string into complete ANSI sequences and Unicode grapheme clusters.
+	// ANSI sequences are kept intact so callers can preserve them while editing text.
+	var units = [];
+	var pattern = new RegExp(ansiPattern.source, 'g');
+	var offset = 0;
+	var match = null;
+	
+	var addText = function(value) {
+		for (var item of graphemeSegmenter.segment(value)) {
+			units.push({ text: item.segment, ansi: false });
+		}
+	};
+	
+	while ((match = pattern.exec(text))) {
+		if (match.index > offset) addText( text.substring(offset, match.index) );
+		units.push({ text: match[0], ansi: true });
+		offset = pattern.lastIndex;
+	}
+	if (offset < text.length) addText( text.substring(offset) );
+	return units;
+}
+
 module.exports = {
 	ansiPattern: ansiPattern,
-	graphemeSegmenter: graphemeSegmenter
+	graphemeSegmenter: graphemeSegmenter,
+	splitAnsiGraphemes: splitAnsiGraphemes
 };

package/width.js

@@ -65,11 +65,52 @@ function widestLine(text) {
 	return width;
 }
 
+function truncate(text, width, suffix) {
+	// Truncate a string to an exact terminal display width.  Preserve complete ANSI
+	// sequences and grapheme clusters, and retain trailing SGR codes to reset styles.
+	if (typeof(text) != 'string') text = '' + text;
+	if (suffix == null) suffix = '';
+	if (stringWidth(text) <= width) return text;
+	
+	var suffixWidth = stringWidth(suffix);
+	var contentWidth = Math.max(0, width - suffixWidth);
+	var outputWidth = 0;
+	var output = '';
+	var units = Util.splitAnsiGraphemes(text);
+	var trailingAnsi = [];
+	
+	for (var idx = units.length - 1; idx >= 0; idx--) {
+		if (!units[idx].ansi) break;
+		if (units[idx].text.match(/^(?:\u001B\[|\u009B)[^m]*m$/)) {
+			trailingAnsi.unshift(units[idx].text);
+		}
+	}
+	
+	for (var idx = 0, len = units.length; idx < len; idx++) {
+		var unit = units[idx];
+		if (unit.ansi) {
+			output += unit.text;
+			continue;
+		}
+		
+		var unitWidth = stringWidth(unit.text);
+		if ((outputWidth + unitWidth) > contentWidth) break;
+		output += unit.text;
+		outputWidth += unitWidth;
+	}
+	
+	// A wide grapheme may not fit the final available cell.  Pad that cell so the
+	// ellipsis still lands at the exact requested width and tables remain aligned.
+	if (outputWidth < contentWidth) output += ' '.repeat(contentWidth - outputWidth);
+	return output + suffix + trailingAnsi.join('');
+}
+
 // Preserve the compatibility aliases provided by the old CommonJS dependencies.
 stringWidth.default = stringWidth;
 widestLine.default = widestLine;
 
 module.exports = {
 	stringWidth: stringWidth,
-	widestLine: widestLine
+	widestLine: widestLine,
+	truncate: truncate
 };

package/wrap.js

@@ -2,34 +2,15 @@
 
 var Util = require('./util');
 var stringWidth = require('./width').stringWidth;
-var ansiPattern = Util.ansiPattern;
-var graphemeSegmenter = Util.graphemeSegmenter;
 
 function getWrapTokens(text) {
 	// Split text into alternating words and breakable whitespace, while preserving
 	// ANSI sequences as zero-width units in their original positions.
-	var units = [];
-	var pattern = new RegExp(ansiPattern.source, 'g');
-	var offset = 0;
-	var match = null;
-	
-	var addText = function(value) {
-		for (var item of graphemeSegmenter.segment(value)) {
-			units.push({
-				text: item.segment,
-				width: stringWidth(item.segment),
-				breakable: !!item.segment.match(/^(?:\s|\u200B)+$/u),
-				ansi: false
-			});
-		}
-	};
-	
-	while ((match = pattern.exec(text))) {
-		if (match.index > offset) addText( text.substring(offset, match.index) );
-		units.push({ text: match[0], width: 0, breakable: false, ansi: true });
-		offset = pattern.lastIndex;
-	}
-	if (offset < text.length) addText( text.substring(offset) );
+	var units = Util.splitAnsiGraphemes(text);
+	units.forEach( function(unit) {
+		unit.width = unit.ansi ? 0 : stringWidth(unit.text);
+		unit.breakable = !unit.ansi && !!unit.text.match(/^(?:\s|\u200B)+$/u);
+	} );
 	
 	var tokens = [];
 	var token = null;

package/agents/string-width/.editorconfig

@@ -1,12 +0,0 @@
-root = true
-
-[*]
-indent_style = tab
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.yml]
-indent_style = space
-indent_size = 2

package/agents/string-width/.gitattributes

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

package/agents/string-width/.github/security.md

@@ -1,3 +0,0 @@
-# Security Policy
-
-To report a security vulnerability, please use the [Tidelift security contact](https://tidelift.com/security). Tidelift will coordinate the fix and disclosure.

package/agents/string-width/.github/workflows/main.yml

@@ -1,22 +0,0 @@
-name: CI
-on:
-  - push
-  - pull_request
-jobs:
-  test:
-    name: Node.js ${{ matrix.node-version }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        node-version:
-          - 24
-          - 22
-          - 20
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-      - run: npm install
-      - run: npm test

package/agents/string-width/index.d.ts

@@ -1,39 +0,0 @@
-export type Options = {
-	/**
-	Count [ambiguous width characters](https://www.unicode.org/reports/tr11/#Ambiguous) as having narrow width (count of 1) instead of wide width (count of 2).
-
-	@default true
-
-	> Ambiguous characters behave like wide or narrow characters depending on the context (language tag, script identification, associated font, source of data, or explicit markup; all can provide the context). __If the context cannot be established reliably, they should be treated as narrow characters by default.__
-	> - http://www.unicode.org/reports/tr11/
-	*/
-	readonly ambiguousIsNarrow?: boolean;
-
-	/**
-	Whether [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code) should be counted.
-
-	@default false
-	*/
-	readonly countAnsiEscapeCodes?: boolean;
-};
-
-/**
-Get the visual width of a string - the number of columns required to display it.
-
-Some Unicode characters are [fullwidth](https://en.wikipedia.org/wiki/Halfwidth_and_fullwidth_forms) and use double the normal width. [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code) are stripped and doesn't affect the width.
-
-@example
-```
-import stringWidth from 'string-width';
-
-stringWidth('a');
-//=> 1
-
-stringWidth('古');
-//=> 2
-
-stringWidth('\u001B[1m古\u001B[22m');
-//=> 2
-```
-*/
-export default function stringWidth(string: string, options?: Options): number;

package/agents/string-width/index.js

@@ -1,207 +0,0 @@
-import stripAnsi from 'strip-ansi';
-import {eastAsianWidth} from 'get-east-asian-width';
-
-/**
-Logic:
-- Segment graphemes to match how terminals render clusters.
-- Width rules:
-	1. Skip non-printing clusters (Default_Ignorable, Control, pure nonspacing/enclosing Mark, lone Surrogates). Tabs are ignored by design.
-	2. RGI emoji clusters (\p{RGI_Emoji}) are double-width.
-	3. Minimally-qualified/unqualified emoji clusters (ZWJ sequences with 2+ Extended_Pictographic, or keycap sequences) are double-width.
-	4. Hangul jamo collapse each standard modern Hangul L+V or L+V+T syllable piece to width 2.
-	   Unmatched repeated leading/vowel/trailing jamo stay additive because that matches how the terminals we target render them.
-	5. Otherwise use East Asian Width of the cluster's first visible code point, and add widths for trailing spacing marks and Halfwidth/Fullwidth Forms within the same cluster (e.g., dakuten/handakuten/prolonged sound mark).
-*/
-
-const segmenter = new Intl.Segmenter();
-
-// Whole-cluster zero-width
-const zeroWidthClusterRegex = /^(?:\p{Default_Ignorable_Code_Point}|\p{Control}|\p{Format}|\p{Nonspacing_Mark}|\p{Enclosing_Mark}|\p{Surrogate})+$/v;
-
-// Pick the base scalar if the cluster starts with Prepend/Format/Marks
-const leadingNonPrintingRegex = /^[\p{Default_Ignorable_Code_Point}\p{Control}\p{Format}\p{Nonspacing_Mark}\p{Enclosing_Mark}\p{Surrogate}]+/v;
-const spacingMarkRegex = /\p{Spacing_Mark}/v;
-
-// RGI emoji sequences
-const rgiEmojiRegex = /^\p{RGI_Emoji}$/v;
-
-// Detect minimally-qualified/unqualified emoji sequences (missing VS16 but still render as double-width)
-const unqualifiedKeycapRegex = /^[\d#*]\u20E3$/;
-const extendedPictographicRegex = /\p{Extended_Pictographic}/gu;
-
-function isDoubleWidthNonRgiEmojiSequence(segment) {
-	// Real emoji clusters are < 30 chars; guard against pathological input
-	if (segment.length > 50) {
-		return false;
-	}
-
-	if (unqualifiedKeycapRegex.test(segment)) {
-		return true;
-	}
-
-	// ZWJ sequences with 2+ Extended_Pictographic
-	if (segment.includes('\u200D')) {
-		const pictographics = segment.match(extendedPictographicRegex);
-		return pictographics !== null && pictographics.length >= 2;
-	}
-
-	return false;
-}
-
-function baseVisible(segment) {
-	return segment.replace(leadingNonPrintingRegex, '');
-}
-
-function isZeroWidthCluster(segment) {
-	return zeroWidthClusterRegex.test(segment);
-}
-
-function isHangulLeadingJamo(codePoint) {
-	return (codePoint >= 0x11_00 && codePoint <= 0x11_5F)
-		|| (codePoint >= 0xA9_60 && codePoint <= 0xA9_7C);
-}
-
-function isHangulVowelJamo(codePoint) {
-	return (codePoint >= 0x11_60 && codePoint <= 0x11_A7)
-		|| (codePoint >= 0xD7_B0 && codePoint <= 0xD7_C6);
-}
-
-function isHangulTrailingJamo(codePoint) {
-	return (codePoint >= 0x11_A8 && codePoint <= 0x11_FF)
-		|| (codePoint >= 0xD7_CB && codePoint <= 0xD7_FB);
-}
-
-function isHangulJamo(codePoint) {
-	return isHangulLeadingJamo(codePoint)
-		|| isHangulVowelJamo(codePoint)
-		|| isHangulTrailingJamo(codePoint);
-}
-
-function hangulClusterWidth(visibleSegment, eastAsianWidthOptions) {
-	const codePoints = [];
-
-	for (const character of visibleSegment) {
-		if (zeroWidthClusterRegex.test(character)) {
-			continue;
-		}
-
-		codePoints.push(character.codePointAt(0));
-	}
-
-	if (codePoints.length === 0) {
-		return undefined;
-	}
-
-	let width = 0;
-
-	for (let index = 0; index < codePoints.length; index++) {
-		const codePoint = codePoints[index];
-		if (!isHangulJamo(codePoint)) {
-			if (width === 0) {
-				return undefined;
-			}
-
-			// Mixed cluster (e.g., L + precomposed syllable): use EAW for non-jamo remainder
-			for (let remaining = index; remaining < codePoints.length; remaining++) {
-				width += eastAsianWidth(codePoints[remaining], eastAsianWidthOptions);
-			}
-
-			return width;
-		}
-
-		// Modern Hangul L+V(+T) shapes as one syllable block. Unmatched jamo stay additive:
-		// U+1100 U+1100 U+1161 => U+1100 + (U+1100 U+1161) => 2 + 2.
-		if (
-			isHangulLeadingJamo(codePoint)
-			&& isHangulVowelJamo(codePoints[index + 1])
-		) {
-			width += 2;
-			index += isHangulTrailingJamo(codePoints[index + 2]) ? 2 : 1;
-			continue;
-		}
-
-		width += eastAsianWidth(codePoint, eastAsianWidthOptions);
-	}
-
-	return width;
-}
-
-function trailingWidth(visibleSegment, eastAsianWidthOptions) {
-	let extra = 0;
-	let first = true;
-
-	for (const character of visibleSegment) {
-		if (first) {
-			first = false;
-			continue;
-		}
-
-		if (
-			spacingMarkRegex.test(character)
-			|| (character >= '\uFF00' && character <= '\uFFEF')
-		) {
-			extra += eastAsianWidth(character.codePointAt(0), eastAsianWidthOptions);
-		}
-	}
-
-	return extra;
-}
-
-export default function stringWidth(input, options = {}) {
-	if (typeof input !== 'string' || input.length === 0) {
-		return 0;
-	}
-
-	const {
-		ambiguousIsNarrow = true,
-		countAnsiEscapeCodes = false,
-	} = options;
-
-	let string = input;
-
-	// Avoid calling stripAnsi when there are no ANSI escape sequences (ESC = 0x1B, CSI = 0x9B)
-	if (!countAnsiEscapeCodes && (string.includes('\u001B') || string.includes('\u009B'))) {
-		string = stripAnsi(string);
-	}
-
-	if (string.length === 0) {
-		return 0;
-	}
-
-	// Fast path: printable ASCII (0x20–0x7E) needs no segmenter, regex, or EAW lookup — width equals length.
-	if (/^[\u0020-\u007E]*$/.test(string)) {
-		return string.length;
-	}
-
-	let width = 0;
-	const eastAsianWidthOptions = {ambiguousAsWide: !ambiguousIsNarrow};
-
-	for (const {segment} of segmenter.segment(string)) {
-		// Zero-width / non-printing clusters
-		if (isZeroWidthCluster(segment)) {
-			continue;
-		}
-
-		// Emoji width logic
-		if (rgiEmojiRegex.test(segment) || isDoubleWidthNonRgiEmojiSequence(segment)) {
-			width += 2;
-			continue;
-		}
-
-		const visibleSegment = baseVisible(segment);
-		const hangulWidth = hangulClusterWidth(visibleSegment, eastAsianWidthOptions);
-		if (hangulWidth !== undefined) {
-			width += hangulWidth;
-			continue;
-		}
-
-		// Everything else: EAW of the cluster’s first visible scalar
-		const codePoint = visibleSegment.codePointAt(0);
-		width += eastAsianWidth(codePoint, eastAsianWidthOptions);
-
-		// Add width for trailing spacing marks and Halfwidth/Fullwidth Forms (e.g., ﾞ, ﾟ, ｰ)
-		width += trailingWidth(visibleSegment, eastAsianWidthOptions);
-	}
-
-	return width;
-}

package/agents/string-width/index.test-d.ts

@@ -1,7 +0,0 @@
-import {expectType} from 'tsd';
-import stringWidth from './index.js';
-
-expectType<number>(stringWidth('古'));
-expectType<number>(stringWidth('★', {}));
-expectType<number>(stringWidth('★', {ambiguousIsNarrow: false}));
-expectType<number>(stringWidth('\u001B[31m\u001B[39m', {countAnsiEscapeCodes: true}));

package/agents/string-width/license

@@ -1,9 +0,0 @@
-MIT License
-
-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:
-
-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.

package/agents/string-width/package.json

@@ -1,65 +0,0 @@
-{
-	"name": "string-width",
-	"version": "8.2.2",
-	"description": "Get the visual width of a string - the number of columns required to display it",
-	"license": "MIT",
-	"repository": "sindresorhus/string-width",
-	"funding": "https://github.com/sponsors/sindresorhus",
-	"author": {
-		"name": "Sindre Sorhus",
-		"email": "sindresorhus@gmail.com",
-		"url": "https://sindresorhus.com"
-	},
-	"type": "module",
-	"exports": {
-		"types": "./index.d.ts",
-		"default": "./index.js"
-	},
-	"sideEffects": false,
-	"engines": {
-		"node": ">=20"
-	},
-	"scripts": {
-		"test": "xo && ava && tsd"
-	},
-	"files": [
-		"index.js",
-		"index.d.ts"
-	],
-	"keywords": [
-		"string",
-		"character",
-		"unicode",
-		"width",
-		"visual",
-		"column",
-		"columns",
-		"fullwidth",
-		"full-width",
-		"wcwidth",
-		"wcswidth",
-		"full",
-		"ansi",
-		"escape",
-		"codes",
-		"cli",
-		"command-line",
-		"terminal",
-		"console",
-		"cjk",
-		"chinese",
-		"japanese",
-		"korean",
-		"fixed-width",
-		"east-asian-width"
-	],
-	"dependencies": {
-		"get-east-asian-width": "^1.5.0",
-		"strip-ansi": "^7.1.2"
-	},
-	"devDependencies": {
-		"ava": "^6.4.1",
-		"tsd": "^0.33.0",
-		"xo": "^1.2.3"
-	}
-}

package/agents/string-width/readme.md

@@ -1,66 +0,0 @@
-# string-width
-
-> Get the visual width of a string - the number of columns required to display it
-
-Some Unicode characters are [fullwidth](https://en.wikipedia.org/wiki/Halfwidth_and_fullwidth_forms) and use double the normal width. [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code) are stripped and do not affect the width.
-
-Useful to be able to measure the actual width of command-line output.
-
-## Install
-
-```sh
-npm install string-width
-```
-
-## Usage
-
-```js
-import stringWidth from 'string-width';
-
-stringWidth('a');
-//=> 1
-
-stringWidth('古');
-//=> 2
-
-stringWidth('\u001B[1m古\u001B[22m');
-//=> 2
-```
-
-## API
-
-### stringWidth(string, options?)
-
-#### string
-
-Type: `string`
-
-The string to be counted.
-
-#### options
-
-Type: `object`
-
-##### ambiguousIsNarrow
-
-Type: `boolean`\
-Default: `true`
-
-Count [ambiguous width characters](https://www.unicode.org/reports/tr11/#Ambiguous) as having narrow width (count of 1) instead of wide width (count of 2).
-
-> Ambiguous characters behave like wide or narrow characters depending on the context (language tag, script identification, associated font, source of data, or explicit markup; all can provide the context). **If the context cannot be established reliably, they should be treated as narrow characters by default.**
-> - http://www.unicode.org/reports/tr11/
-
-##### countAnsiEscapeCodes
-
-Type: `boolean`\
-Default: `false`
-
-Whether [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code) should be counted.
-
-## Related
-
-- [string-width-cli](https://github.com/sindresorhus/string-width-cli) - CLI for this module
-- [string-length](https://github.com/sindresorhus/string-length) - Get the real length of a string
-- [widest-line](https://github.com/sindresorhus/widest-line) - Get the visual width of the widest line in a string
-- [get-east-asian-width](https://github.com/sindresorhus/get-east-asian-width) - Determine the East Asian Width of a Unicode character