util(styleText): optimise + benchmark

Co-Authored-By: Antoine du Hamel <[email protected]>

Author: AugustinMauroy

benchmark/util/style-text.js

@@ -6,13 +6,23 @@ const { styleText } = require('node:util');
 const assert = require('node:assert');
 
 const bench = common.createBenchmark(main, {
-  messageType: ['string', 'number', 'boolean', 'invalid'],
-  format: ['red', 'italic', 'invalid'],
-  validateStream: [1, 0],
-  n: [1e3],
-});
+  withColor: {
+    messageType: ['string', 'number', 'boolean', 'invalid'],
+    format: ['red', 'italic', 'invalid'],
+    validateStream: [1, 0],
+    noColor: [''],
+    n: [1e3],
+  },
+  withoutColor: {
+    messageType: ['string', 'number', 'boolean', 'invalid'],
+    format: ['red', 'italic', 'invalid'],
+    validateStream: [1, 0],
+    noColor: ['1'],
+    n: [1e3],
+  },
+}, { byGroups: true });
 
-function main({ messageType, format, validateStream, n }) {
+function main({ messageType, format, validateStream, noColor, n }) {
   let str;
   switch (messageType) {
     case 'string':
@@ -29,6 +39,8 @@ function main({ messageType, format, validateStream, n }) {
       break;
   }
 
+  process.env.NO_COLOR = noColor;
+
   bench.start();
   for (let i = 0; i < n; i++) {
     let colored = '';

lib/util.js

@@ -119,7 +119,7 @@ function styleText(format, text, { validateStream = true, stream = process.stdou
   validateString(text, 'text');
   validateBoolean(validateStream, 'options.validateStream');
 
-  let skipColorize;
+  let shouldColorize = true;
   if (validateStream) {
     if (
       !isReadableStream(stream) &&
@@ -130,26 +130,29 @@ function styleText(format, text, { validateStream = true, stream = process.stdou
     }
 
     // If the stream is falsy or should not be colorized, set skipColorize to true
-    skipColorize = !lazyUtilColors().shouldColorize(stream);
+    shouldColorize = lazyUtilColors().shouldColorize(stream);
   }
 
   // If the format is not an array, convert it to an array
   const formatArray = ArrayIsArray(format) ? format : [format];
+  const { colors } = inspect;
 
-  let left = '';
-  let right = '';
-  for (const key of formatArray) {
-    const formatCodes = inspect.colors[key];
+  // We want to loop through the format array to check if the format is valid
+  // including if it's shouldn't be colorized
+  const { left, right } = formatArray.reduce((acc, key) => {
+    const formatCodes = colors[key];
     // If the format is not a valid style, throw an error
     if (formatCodes == null) {
-      validateOneOf(key, 'format', ObjectKeys(inspect.colors));
+      validateOneOf(key, 'format', ObjectKeys(colors));
     }
-    if (skipColorize) continue;
-    left += escapeStyleCode(formatCodes[0]);
-    right = `${escapeStyleCode(formatCodes[1])}${right}`;
-  }
+    if(shouldColorize) {
+      acc.left += escapeStyleCode(formatCodes[0]);
+      acc.right = `${escapeStyleCode(formatCodes[1])}${acc.right}`;
+    }
+    return acc;
+  }, { left: '', right: '' });
 
-  return skipColorize ? text : `${left}${text}${right}`;
+  return shouldColorize ? `${left}${text}${right}` : text;
 }
 
 /**