Skip to content
Next Next commit
lib: respect terminal capabilities on styleText
This PR changes styleText API to respect terminal
capabilities and environment variables such as
NO_COLOR, NODE_DISABLE_COLORS, and FORCE_COLOR.
  • Loading branch information
RafaelGSS committed Aug 14, 2024
commit 9e3ada17fcf2988f32525824bb496d39f0a398e1
13 changes: 12 additions & 1 deletion doc/api/util.md
Original file line number Diff line number Diff line change
Expand Up @@ -1810,13 +1810,24 @@ console.log(util.stripVTControlCharacters('\u001B[4mvalue\u001B[0m'));
added:
- v21.7.0
- v20.12.0
changes:
- version: REPLACEME
pr-url: https://github.com/nodejs/node/pull/54388
description: Respect isTTY and colors environment variables
Comment thread
RafaelGSS marked this conversation as resolved.
Resolved
such as NO_COLORS, NODE_DISABLE_COLORS, and FORCE_COLOR.
-->

* `format` {string | Array} A text format or an Array
of text formats defined in `util.inspect.colors`.
* `text` {string} The text to to be formatted.
* `options` {Object}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to add this to the function's signature above.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in cc08b60

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not what I meant. You have to update

## `util.styleText(format, text)`

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RafaelGSS I've updated the doc for ya :)

* `validateStream` {boolean} When true, `stream` is checked to see if it can handle colors. **Default:** `true`.
* `stream` {Stream} A stream that will be validated if it can be colored. **Default:** `process.stdout`.

This function returns a formatted text considering the `format` passed.
This function returns a formatted text considering the `format` passed
for printing in a terminal, it is aware of the terminal's capabilities
Comment thread
RafaelGSS marked this conversation as resolved.
Resolved
and act according to the configuration set via `NO_COLORS`,
`NODE_DISABLE_COLORS` and `FORCE_COLOR` environment variables.
Comment thread
RafaelGSS marked this conversation as resolved.
Resolved

```mjs
import { styleText } from 'node:util';
Expand Down
22 changes: 21 additions & 1 deletion lib/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ const {
validateOneOf,
} = require('internal/validators');
const types = require('internal/util/types');

let utilColors;
function lazyUtilColors() {
utilColors ??= require('internal/util/colors');
return utilColors;
}

const binding = internalBinding('util');

const {
Expand Down Expand Up @@ -92,10 +99,23 @@ function escapeStyleCode(code) {
/**
* @param {string | string[]} format
* @param {string} text
* @param {object} [options={}]
* @param {boolean} [options.validateStream=true] - Whether to validate the stream.
* @param {Stream} [options.stream=process.stdout] - The output stream to write the styled text to.
Comment thread
RafaelGSS marked this conversation as resolved.
Resolved
* @returns {string}
*/
function styleText(format, text) {
function styleText(format, text, { validateStream = true, stream = process.stdout } = {}) {
validateString(text, 'text');
Comment thread
RafaelGSS marked this conversation as resolved.
Resolved

if (validateStream) {
if (
!stream ||
Comment thread
RafaelGSS marked this conversation as resolved.
Resolved
!lazyUtilColors().shouldColorize(stream)
) {
return text;
}
}

if (ArrayIsArray(format)) {
let left = '';
let right = '';
Expand Down
37 changes: 34 additions & 3 deletions test/parallel/test-util-styletext.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
'use strict';
require('../common');
const assert = require('assert');
const util = require('util');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this test is being significantly updated, it would be nice if it could be structured more using node:test

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it blocking? Otherwise, I prefer to do it in a follow-up PR.

const common = require('../common');
const assert = require('node:assert');
const util = require('node:util');
const { WriteStream } = require('node:tty');

const styled = '\u001b[31mtest\u001b[39m';
const noChange = 'test';

const fd = common.getTTYfd();
const writeStream = new WriteStream(fd);

[
undefined,
Expand Down Expand Up @@ -41,3 +49,26 @@ assert.throws(() => {
}, {
code: 'ERR_INVALID_ARG_VALUE',
});

assert.strictEqual(util.styleText('red', 'test'), styled);

const originalEnv = process.env;
[
{ isTTY: true, env: {}, expected: styled },
{ isTTY: false, env: {}, expected: noChange },
{ isTTY: true, env: { NODE_DISABLE_COLORS: '1' }, expected: noChange },
{ isTTY: true, env: { NO_COLOR: '1' }, expected: noChange },
{ isTTY: true, env: { FORCE_COLOR: '1' }, expected: styled },
{ isTTY: true, env: { FORCE_COLOR: '1', NODE_DISABLE_COLORS: '1' }, expected: styled },
{ isTTY: false, env: { FORCE_COLOR: '1', NO_COLOR: '1', NODE_DISABLE_COLORS: '1' }, expected: styled },
{ isTTY: true, env: { FORCE_COLOR: '1', NO_COLOR: '1', NODE_DISABLE_COLORS: '1' }, expected: styled },
].forEach((testCase) => {
writeStream.isTTY = testCase.isTTY;
process.env = {
...process.env,
...testCase.env
};
const output = util.styleText('red', 'test', { stream: writeStream });
assert.strictEqual(output, testCase.expected);
process.env = originalEnv;
});