From 396b14b6c642affd46b0533f5af7c31e073ad29a Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Sun, 19 Sep 2021 17:44:33 -0400
Subject: [PATCH 1/2] util: expose stripVTControlCharacters()

This commit exposes the existing stripVTControlCharacters()
method with docs and some additional input validation.

PR-URL: https://github.com/nodejs/node/pull/40214
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/util.md              | 15 +++++++++++++++
 lib/internal/util/inspect.js |  3 +++
 lib/util.js                  |  4 +++-
 test/parallel/test-util.js   | 10 +++++++++-
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/doc/api/util.md b/doc/api/util.md
index ea8bbd5e286887..576db37779fc30 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -1111,6 +1111,21 @@ doSomething[kCustomPromisifiedSymbol] = (foo) => {
 };
 ```
 
+## `util.stripVTControlCharacters(str)`
+<!-- YAML
+added: REPLACEME
+-->
+
+* `str` {string}
+* Returns: {string}
+
+Returns `str` with any ANSI escape codes removed.
+
+```js
+console.log(util.stripVTControlCharacters('\u001B[4mvalue\u001B[0m'));
+// Prints "value"
+```
+
 ## Class: `util.TextDecoder`
 <!-- YAML
 added: v8.3.0
diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
index 6f8eb710a9255f..298a9d98976b76 100644
--- a/lib/internal/util/inspect.js
+++ b/lib/internal/util/inspect.js
@@ -140,6 +140,7 @@ const assert = require('internal/assert');
 const { NativeModule } = require('internal/bootstrap/loaders');
 const {
   validateObject,
+  validateString,
 } = require('internal/validators');
 
 let hexSlice;
@@ -2113,6 +2114,8 @@ if (internalBinding('config').hasIntl) {
  * Remove all VT control characters. Use to estimate displayed string width.
  */
 function stripVTControlCharacters(str) {
+  validateString(str, 'str');
+
   return str.replace(ansi, '');
 }
 
diff --git a/lib/util.js b/lib/util.js
index e3f151541ee2fb..fbd8c550318650 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -57,7 +57,8 @@ const {
 const {
   format,
   formatWithOptions,
-  inspect
+  inspect,
+  stripVTControlCharacters,
 } = require('internal/util/inspect');
 const { debuglog } = require('internal/util/debuglog');
 const {
@@ -369,6 +370,7 @@ module.exports = {
   isPrimitive,
   log,
   promisify,
+  stripVTControlCharacters,
   toUSVString,
   TextDecoder,
   TextEncoder,
diff --git a/test/parallel/test-util.js b/test/parallel/test-util.js
index 42218be8581579..6b26f3398fa0b7 100644
--- a/test/parallel/test-util.js
+++ b/test/parallel/test-util.js
@@ -21,7 +21,7 @@
 
 'use strict';
 // Flags: --expose-internals
-require('../common');
+const common = require('../common');
 const assert = require('assert');
 const util = require('util');
 const errors = require('internal/errors');
@@ -178,3 +178,11 @@ assert.strictEqual(util.toUSVString('string\ud801'), 'string\ufffd');
     true
   );
 }
+
+assert.throws(() => {
+  util.stripVTControlCharacters({});
+}, {
+  code: 'ERR_INVALID_ARG_TYPE',
+  message: 'The "str" argument must be of type string.' +
+           common.invalidArgTypeHelper({})
+});

From 606bb521591a29df5401732bfbd19c1e31239ed9 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Sat, 25 Sep 2021 11:48:38 -0400
Subject: [PATCH 2/2] util: improve ansi escape code regex

PR-URL: https://github.com/nodejs/node/pull/40214
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 lib/internal/util/inspect.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
index 298a9d98976b76..4936ab761ddccb 100644
--- a/lib/internal/util/inspect.js
+++ b/lib/internal/util/inspect.js
@@ -223,7 +223,8 @@ const meta = [
 // License: MIT, authors: @sindresorhus, Qix-, arjunmehta and LitoMore
 // Matches all ansi escape code sequences in a string
 const ansiPattern = '[\\u001B\\u009B][[\\]()#;?]*' +
-  '(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)' +
+  '(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*' +
+  '|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)' +
   '|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))';
 const ansi = new RegExp(ansiPattern, 'g');