perf(util): optimise styleText

Author: AugustinMauroy

benchmark/util/style-text.js

@@ -9,10 +9,11 @@ const bench = common.createBenchmark(main, {
   messageType: ['string', 'number', 'boolean', 'invalid'],
   format: ['red', 'italic', 'invalid'],
   validateStream: [1, 0],
+  noColors: [1, 0],
   n: [1e3],
 });
 
-function main({ messageType, format, validateStream, n }) {
+function main({ messageType, format, validateStream, noColors, n }) {
   let str;
   switch (messageType) {
     case 'string':
@@ -29,6 +30,8 @@ function main({ messageType, format, validateStream, n }) {
       break;
   }
 
+  process.env.NO_COLORS = noColors ? true : false;
+
   bench.start();
   for (let i = 0; i < n; i++) {
     let colored = '';

lib/util.js

@@ -119,7 +119,6 @@ function styleText(format, text, { validateStream = true, stream = process.stdou
   validateString(text, 'text');
   validateBoolean(validateStream, 'options.validateStream');
 
-  let skipColorize;
   if (validateStream) {
     if (
       !isReadableStream(stream) &&
@@ -129,8 +128,9 @@ function styleText(format, text, { validateStream = true, stream = process.stdou
       throw new ERR_INVALID_ARG_TYPE('stream', ['ReadableStream', 'WritableStream', 'Stream'], stream);
     }
 
-    // If the stream is falsy or should not be colorized, set skipColorize to true
-    skipColorize = !lazyUtilColors().shouldColorize(stream);
+    if (!lazyUtilColors().shouldColorize(stream)) {
+      return text;
+    };
   }
 
   // If the format is not an array, convert it to an array
@@ -144,12 +144,12 @@ function styleText(format, text, { validateStream = true, stream = process.stdou
     if (formatCodes == null) {
       validateOneOf(key, 'format', ObjectKeys(inspect.colors));
     }
-    if (skipColorize) continue;
+
     left += escapeStyleCode(formatCodes[0]);
     right = `${escapeStyleCode(formatCodes[1])}${right}`;
   }
 
-  return skipColorize ? text : `${left}${text}${right}`;
+  return `${left}${text}${right}`;
 }
 
 /**

test/parallel/test-util-styletext.js

@@ -35,12 +35,16 @@ assert.throws(() => {
 }, {
   code: 'ERR_INVALID_ARG_VALUE',
 });
+assert.throws(() => {
+  util.styleText(['invalid'], 'text');
+}, {
+  code: 'ERR_INVALID_ARG_VALUE',
+});
 
 assert.strictEqual(
   util.styleText('red', 'test', { validateStream: false }),
   '\u001b[31mtest\u001b[39m',
 );
-
 assert.strictEqual(
   util.styleText(['bold', 'red'], 'test', { validateStream: false }),
   '\u001b[1m\u001b[31mtest\u001b[39m\u001b[22m',
@@ -55,21 +59,14 @@ assert.strictEqual(
   ),
 );
 
-assert.throws(() => {
-  util.styleText(['invalid'], 'text');
-}, {
-  code: 'ERR_INVALID_ARG_VALUE',
-});
-
 assert.throws(() => {
   util.styleText('red', 'text', { stream: {} });
 }, {
   code: 'ERR_INVALID_ARG_TYPE',
 });
 
-// does not throw
+// doesn't throw
 util.styleText('red', 'text', { stream: {}, validateStream: false });
-
 assert.strictEqual(
   util.styleText('red', 'test', { validateStream: false }),
   styled,