tty: refactor to avoid unsafe array iteration

PR-URL: #36771 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Pooja D P <[email protected]>
nodejs · Jan 12, 2021 · 258aa50 · 258aa50
1 parent d5a9799
commit 258aa50
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/internal/tty.js b/lib/internal/tty.js
@@ -23,6 +23,7 @@
 'use strict';
 
 const {
+  ArrayPrototypeSome,
   RegExpPrototypeTest,
   StringPrototypeSplit,
   StringPrototypeToLowerCase,
@@ -202,10 +203,9 @@ function getColorDepth(env = process.env) {
     if (TERM_ENVS[termEnv]) {
       return TERM_ENVS[termEnv];
     }
-    for (const term of TERM_ENVS_REG_EXP) {
-      if (RegExpPrototypeTest(term, termEnv)) {
-        return COLORS_16;
-      }
+    if (ArrayPrototypeSome(TERM_ENVS_REG_EXP,
+                           (term) => RegExpPrototypeTest(term, termEnv))) {
+      return COLORS_16;
     }
   }
   // Move 16 color COLORTERM below 16m and 256

diff --git a/lib/tty.js b/lib/tty.js
@@ -132,7 +132,7 @@ WriteStream.prototype._refreshSize = function() {
     this.emit('error', errors.errnoException(err, 'getWindowSize'));
     return;
   }
-  const [newCols, newRows] = winSize;
+  const { 0: newCols, 1: newRows } = winSize;
   if (oldCols !== newCols || oldRows !== newRows) {
     this.columns = newCols;
     this.rows = newRows;