tty: refactor to avoid unsafe array iteration

aduh95 · danielleadams · commit 258aa509865a · 2021-01-12T07:10:44.000-05:00
PR-URL: #36771 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Pooja D P <Pooja.D.P@ibm.com>
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;

-Original file line number
+Diff line change
 'use strict';
 const{
 + ArrayPrototypeSome,
  RegExpPrototypeTest,
  StringPrototypeSplit,
  StringPrototypeToLowerCase,
 if(TERM_ENVS[termEnv]){
 returnTERM_ENVS[termEnv];
+}
 -for(consttermofTERM_ENVS_REG_EXP){
 -if(RegExpPrototypeTest(term,termEnv)){
 -returnCOLORS_16;
 -}
 +if(ArrayPrototypeSome(TERM_ENVS_REG_EXP,
 +(term)=>RegExpPrototypeTest(term,termEnv))){
 +returnCOLORS_16;
+}
+}
 // Move 16 color COLORTERM below 16m and 256
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ WriteStream.prototype._refreshSize = function() {`
`132`	`132`	`this.emit('error',errors.errnoException(err,'getWindowSize'));`
`133`	`133`	`return;`
`134`	`134`	`}`
`135`		`-const[newCols,newRows]=winSize;`
	`135`	`+const{0: newCols,1: newRows}=winSize;`
`136`	`136`	`if(oldCols!==newCols\|\|oldRows!==newRows){`
`137`	`137`	`this.columns=newCols;`
`138`	`138`	`this.rows=newRows;`