@cjser/chalk 5.6.2-cjser.2 → 6.0.0-cjser.2

package/source/vendor/ansi-styles/index.js

@@ -1,10 +1,14 @@
 const ANSI_BACKGROUND_OFFSET = 10;
+const ANSI_UNDERLINE_OFFSET = 20;
 
-const wrapAnsi16 = (offset = 0) => code => `\u001B[${code + offset}m`;
+const wrapAnsi16 = (offset = 0) => code => `\u{1B}[${code + offset}m`;
 
-const wrapAnsi256 = (offset = 0) => code => `\u001B[${38 + offset};5;${code}m`;
+const wrapAnsi256 = (offset = 0) => code => `\u{1B}[${38 + offset};5;${code}m`;
 
-const wrapAnsi16m = (offset = 0) => (red, green, blue) => `\u001B[${38 + offset};2;${red};${green};${blue}m`;
+const wrapAnsi16m = (offset = 0) => (red, green, blue) => `\u{1B}[${38 + offset};2;${red};${green};${blue}m`;
+
+// `SGR 58` has no basic 16-color form, so the basic color code is mapped to its palette index instead.
+const wrapUnderlineAnsi = code => `\u{1B}[58;5;${code < 90 ? code - 30 : code - 90 + 8}m`;
 
 const styles = {
 	modifier: {
@@ -14,6 +18,11 @@ const styles = {
 		dim: [2, 22],
 		italic: [3, 23],
 		underline: [4, 24],
+		// Extended underline styles (`SGR 4:x` sub-parameters). Not in upstream `ansi-styles`.
+		underlineDouble: ['4:2', 24],
+		underlineCurly: ['4:3', 24],
+		underlineDotted: ['4:4', 24],
+		underlineDashed: ['4:5', 24],
 		overline: [53, 55],
 		inverse: [7, 27],
 		hidden: [8, 28],
@@ -63,11 +72,35 @@ const styles = {
 		bgCyanBright: [106, 49],
 		bgWhiteBright: [107, 49],
 	},
+	// Underline color (`SGR 58`/`59`). Not in upstream `ansi-styles`.
+	underlineColor: {
+		underlineBlack: ['58;5;0', 59],
+		underlineRed: ['58;5;1', 59],
+		underlineGreen: ['58;5;2', 59],
+		underlineYellow: ['58;5;3', 59],
+		underlineBlue: ['58;5;4', 59],
+		underlineMagenta: ['58;5;5', 59],
+		underlineCyan: ['58;5;6', 59],
+		underlineWhite: ['58;5;7', 59],
+
+		// Bright color
+		underlineBlackBright: ['58;5;8', 59],
+		underlineGray: ['58;5;8', 59], // Alias of `underlineBlackBright`
+		underlineGrey: ['58;5;8', 59], // Alias of `underlineBlackBright`
+		underlineRedBright: ['58;5;9', 59],
+		underlineGreenBright: ['58;5;10', 59],
+		underlineYellowBright: ['58;5;11', 59],
+		underlineBlueBright: ['58;5;12', 59],
+		underlineMagentaBright: ['58;5;13', 59],
+		underlineCyanBright: ['58;5;14', 59],
+		underlineWhiteBright: ['58;5;15', 59],
+	},
 };
 
 export const modifierNames = Object.keys(styles.modifier);
 export const foregroundColorNames = Object.keys(styles.color);
 export const backgroundColorNames = Object.keys(styles.bgColor);
+export const underlineColorNames = Object.keys(styles.underlineColor);
 export const colorNames = [...foregroundColorNames, ...backgroundColorNames];
 
 function assembleStyles() {
@@ -76,13 +109,14 @@ function assembleStyles() {
 	for (const [groupName, group] of Object.entries(styles)) {
 		for (const [styleName, style] of Object.entries(group)) {
 			styles[styleName] = {
-				open: `\u001B[${style[0]}m`,
-				close: `\u001B[${style[1]}m`,
+				open: `\u{1B}[${style[0]}m`,
+				close: `\u{1B}[${style[1]}m`,
 			};
 
 			group[styleName] = styles[styleName];
 
-			codes.set(style[0], style[1]);
+			// Only the leading SGR parameter identifies a style, so `4:3` and `58;5;1` are keyed as `4` and `58`.
+			codes.set(Number.parseInt(style[0], 10), style[1]);
 		}
 
 		Object.defineProperty(styles, groupName, {
@@ -96,8 +130,9 @@ function assembleStyles() {
 		enumerable: false,
 	});
 
-	styles.color.close = '\u001B[39m';
-	styles.bgColor.close = '\u001B[49m';
+	styles.color.close = '\u{1B}[39m';
+	styles.bgColor.close = '\u{1B}[49m';
+	styles.underlineColor.close = '\u{1B}[59m';
 
 	styles.color.ansi = wrapAnsi16();
 	styles.color.ansi256 = wrapAnsi256();
@@ -105,6 +140,9 @@ function assembleStyles() {
 	styles.bgColor.ansi = wrapAnsi16(ANSI_BACKGROUND_OFFSET);
 	styles.bgColor.ansi256 = wrapAnsi256(ANSI_BACKGROUND_OFFSET);
 	styles.bgColor.ansi16m = wrapAnsi16m(ANSI_BACKGROUND_OFFSET);
+	styles.underlineColor.ansi = wrapUnderlineAnsi;
+	styles.underlineColor.ansi256 = wrapAnsi256(ANSI_UNDERLINE_OFFSET);
+	styles.underlineColor.ansi16m = wrapAnsi16m(ANSI_UNDERLINE_OFFSET);
 
 	// From https://github.com/Qix-/color-convert/blob/3f0e0d4e92e235796ccb17f6e85c72094a651f49/conversions.js
 	Object.defineProperties(styles, {
@@ -133,7 +171,7 @@ function assembleStyles() {
 		},
 		hexToRgb: {
 			value(hex) {
-				const matches = /[a-f\d]{6}|[a-f\d]{3}/i.exec(hex.toString(16));
+				const matches = /[\da-f]{6}|[\da-f]{3}/i.exec(hex.toString(16));
 				if (!matches) {
 					return [0, 0, 0];
 				}
@@ -147,7 +185,7 @@ function assembleStyles() {
 				const integer = Number.parseInt(colorString, 16);
 
 				return [
-					/* eslint-disable no-bitwise */
+					/* eslint-disable no-bitwise -- We need the speed */
 					(integer >> 16) & 0xFF,
 					(integer >> 8) & 0xFF,
 					integer & 0xFF,

package/source/vendor/supports-color/browser.js

@@ -1,18 +1,16 @@
-/* eslint-env browser */
-
 const level = (() => {
 	if (!('navigator' in globalThis)) {
 		return 0;
 	}
 
 	if (globalThis.navigator.userAgentData) {
-		const brand = navigator.userAgentData.brands.find(({brand}) => brand === 'Chromium');
-		if (brand && brand.version > 93) {
+		const brand = globalThis.navigator.userAgentData.brands.find(({brand}) => brand === 'Chromium');
+		if (brand?.version > 93) {
 			return 3;
 		}
 	}
 
-	if (/\b(Chrome|Chromium)\//.test(globalThis.navigator.userAgent)) {
+	if (/\b(?:Chrome|Chromium)\//.test(globalThis.navigator.userAgent)) {
 		return 1;
 	}
 

package/source/vendor/supports-color/index.js

@@ -30,18 +30,29 @@ if (
 	flagForceColor = 1;
 }
 
+// Whether `FORCE_COLOR` names a level. Shared with the exact-level check below so that the two cannot disagree on what counts as numeric.
+function hasNumericForceColor() {
+	return /^\d+$/.test(env.FORCE_COLOR);
+}
+
 function envForceColor() {
-	if ('FORCE_COLOR' in env) {
-		if (env.FORCE_COLOR === 'true') {
-			return 1;
-		}
+	if (!('FORCE_COLOR' in env)) {
+		return;
+	}
 
-		if (env.FORCE_COLOR === 'false') {
-			return 0;
-		}
+	if (env.FORCE_COLOR === 'false') {
+		return 0;
+	}
+
+	if (env.FORCE_COLOR === 'true' || env.FORCE_COLOR.length === 0) {
+		return 1;
+	}
 
-		return env.FORCE_COLOR.length === 0 ? 1 : Math.min(Number.parseInt(env.FORCE_COLOR, 10), 3);
+	if (!hasNumericForceColor()) {
+		return;
 	}
+
+	return Math.min(Number.parseInt(env.FORCE_COLOR, 10), 3);
 }
 
 function translateLevel(level) {
@@ -81,6 +92,11 @@ function _supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) {
 		}
 	}
 
+	// A numeric `FORCE_COLOR` requests an exact level, while `FORCE_COLOR=true` and `FORCE_COLOR=` only enable color and let the level be detected.
+	if (forceColor !== undefined && hasNumericForceColor()) {
+		return forceColor;
+	}
+
 	// Check for Azure DevOps pipelines.
 	// Has to be above the `!streamIsTTY` check.
 	if ('TF_BUILD' in env && 'AGENT_NAME' in env) {
@@ -124,7 +140,7 @@ function _supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) {
 	}
 
 	if ('TEAMCITY_VERSION' in env) {
-		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+		return /^(?:9\.0*[1-9]\d*\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
 	}
 
 	if (env.COLORTERM === 'truecolor') {
@@ -144,7 +160,7 @@ function _supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) {
 	}
 
 	if ('TERM_PROGRAM' in env) {
-		const version = Number.parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
+		const version = Number.parseInt((env.TERM_PROGRAM_VERSION || '').split('.', 1)[0], 10);
 
 		switch (env.TERM_PROGRAM) {
 			case 'iTerm.app': {
@@ -158,7 +174,7 @@ function _supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) {
 		}
 	}
 
-	if (/-256(color)?$/i.test(env.TERM)) {
+	if (/-256(?:color)?$/i.test(env.TERM)) {
 		return 2;
 	}