Use builtin functions, 2nd.

skygragon · skygragon · commit e599397af05e · 2018-01-03T13:00:12.000+08:00
* Array.from
* for-of loop
* Map

Signed-off-by: Eric Wang &lt;skygragon@gmail.com&gt;
diff --git a/lib/chalk.js b/lib/chalk.js
@@ -6,7 +6,7 @@ var supportsColor = require('supports-color');
 const chalk = {
   enabled: supportsColor.stdout,
   use256:  supportsColor.stdout && supportsColor.stdout.has256,
-  themes:  {},
+  themes:  new Map(),
   theme:   {}
 };
 
@@ -26,7 +26,7 @@ const DEFAULT = {
 };
 
 chalk.setTheme = function(name) {
-  const theme = this.themes[name] || this.themes.default || {};
+  const theme = this.themes.get(name) || this.themes.get('default') || {};
   this.theme = _.extendOwn(DEFAULT, theme);
 };
 
@@ -52,26 +52,26 @@ chalk.wrap = function(pre, post) {
 const bgName = x => 'bg' + x[0].toUpperCase() + x.substr(1);
 
 chalk.init = function() {
-  require('./helper').getCodeDirData('colors').forEach(function(f) {
-    const o = {};
+  const h = require('./helper');
+  for (let f of h.getCodeDirData('colors')) {
+    const theme = {};
     _.pairs(f.data).forEach(function(x) {
       const k = x[0];
       const v = x[1];
       const bgK = bgName(k);
 
       if (chalk.use256) {
-        o[k] = style.color.ansi256.hex(v);
-        o[bgK] = style.bgColor.ansi256.hex(v);
+        theme[k] = style.color.ansi256.hex(v);
+        theme[bgK] = style.bgColor.ansi256.hex(v);
       } else {
-        o[k] = style.color.ansi.hex(v);
-        o[bgK] = style.bgColor.ansi.hex(v);
+        theme[k] = style.color.ansi.hex(v);
+        theme[bgK] = style.bgColor.ansi.hex(v);
       }
     });
-    chalk.themes[f.name] = o;
-  });
+    chalk.themes.set(f.name, theme);
+  }
 
-  _.chain(['black', 'blue', 'cyan', 'gray', 'green', 'magenta', 'red', 'white', 'yellow'])
-  .each(function(color) {
+  for (let color of ['black', 'blue', 'cyan', 'gray', 'green', 'magenta', 'red', 'white', 'yellow']) {
     Object.defineProperty(chalk, color, {
       get:          () => chalk.wrap(chalk.theme[color], style.color.close),
       configurable: true
@@ -81,15 +81,14 @@ chalk.init = function() {
       get:          () => chalk.wrap(chalk.theme[bgcolor], style.bgColor.close),
       configurable: true
     });
-  });
+  }
 
-  _.chain(['bold', 'dim', 'italic', 'inverse', 'strikethrough', 'underline'])
-  .each(function(modifier) {
+  for (let modifier of ['bold', 'dim', 'italic', 'inverse', 'strikethrough', 'underline']) {
     Object.defineProperty(chalk, modifier, {
       get:          () => chalk.wrap(style[modifier].open, style[modifier].close),
       configurable: true
     });
-  });
+  }
 };
 
 module.exports = chalk;
diff --git a/lib/cli.js b/lib/cli.js
@@ -37,7 +37,7 @@ function initLogLevel() {
     request.debug = true;
 
     console.error = _.wrap(console.error, function(func) {
-      let args = _.toArray(arguments);
+      let args = Array.from(arguments);
       args.shift();
 
       // FIXME: hack HTTP request log, hope no one else use it...
diff --git a/lib/commands/cache.js b/lib/commands/cache.js
@@ -39,7 +39,7 @@ cmd.handler = function(argv) {
     });
 
   if (argv.delete) {
-    caches.forEach(function(f) { cache.del(f.name); });
+    for (let f of caches) cache.del(f.name);
   } else {
     _.sortBy(caches, function(f) {
       let x = parseInt(f.name.split('.')[0], 10);
diff --git a/lib/commands/list.js b/lib/commands/list.js
@@ -56,11 +56,10 @@ cmd.handler = function(argv) {
     }
 
     const stat = {};
-    const KEYS = ['locked', 'starred', 'ac', 'notac', 'None', 'Easy', 'Medium', 'Hard'];
-    KEYS.forEach(function(x) { stat[x] = 0; });
+    for (let x of ['locked', 'starred', 'ac', 'notac', 'None', 'Easy', 'Medium', 'Hard']) stat[x] = 0;
 
     problems = _.sortBy(problems, x => -x.id);
-    problems.forEach(function(problem) {
+    for (let problem of problems) {
       stat[problem.level] = (stat[problem.level] || 0) + 1;
       stat[problem.state] = (stat[problem.state] || 0) + 1;
       if (problem.locked) ++stat.locked;
@@ -82,19 +81,19 @@ cmd.handler = function(argv) {
 
         let buf = [];
         let len = 0;
-        badges.forEach(function(x) {
+        for (let x of badges) {
           if (len + x.length + 3 >= 60) {
             log.printf('%12s%s', ' ', chalk.dim(buf.join(' | ')));
             buf = [];
             len = 0;
           }
           buf.push(x);
           len += x.length + 3;
-        });
+        }
         if (buf.length > 0)
           log.printf('%12s%s', ' ', chalk.dim(buf.join(' | ')));
       }
-    });
+    }
 
     if (argv.stat) {
       log.info();
diff --git a/lib/commands/plugin.js b/lib/commands/plugin.js
@@ -101,9 +101,8 @@ cmd.handler = function(argv) {
   } else if (argv.config) {
     log.info(JSON.stringify(config.plugins[name] || {}, null, 2));
   } else {
-    plugins.forEach(function(p) {
+    for (let p of plugins)
       log.printf('%s %-18s %-15s %s', h.prettyText('', p.enabled), p.name, p.ver, p.desc);
-    });
   }
 };
 
diff --git a/lib/commands/stat.js b/lib/commands/stat.js
@@ -61,16 +61,16 @@ function showProgress(problems) {
     hard:   {all: 0, ac: 0}
   };
 
-  problems.forEach(function(problem) {
+  for (let problem of problems) {
     const level = problem.level.toLowerCase();
     const state = problem.state.toLowerCase();
 
-    if (!(level in stats)) return;
+    if (!(level in stats)) continue;
     ++stats[level].all;
 
-    if (!(state in stats[level])) return;
+    if (!(state in stats[level])) continue;
     ++stats[level][state];
-  });
+  }
 
   printLine('Easy', stats.easy.ac, stats.easy.all);
   printLine('Medium', stats.medium.ac, stats.medium.all);
@@ -104,9 +104,8 @@ function showGraph(problems) {
   log.info('    ' + header);
 
   const graph = [];
-  problems.forEach(function(problem) {
+  for (let problem of problems)
     graph[problem.id] = ICONS[problem.state] || ICONS.none;
-  });
 
   let line = [sprintf(' %03d', 0)];
   for (let i = 1, n = graph.length; i <= n; ++i) {
@@ -149,13 +148,13 @@ function showCal() {
   // load historical stats
   const graph = [];
   const stats = require('../cache').get(h.KEYS.stat) || {};
-  _.keys(stats).forEach(function(k) {
+  for (let k of _.keys(stats)) {
     const v = stats[k].ac || 0;
-    if (v === 0) return;
+    if (v === 0) continue;
 
     const d = moment(k, 'YYYY-MM-DD');
     graph[now.diff(d, 'days')] = v;
-  });
+  }
 
   // print header
   const buf = Buffer.alloc(120, ' ', 'ascii');
diff --git a/lib/commands/submit.js b/lib/commands/submit.js
@@ -2,8 +2,6 @@
 var fs = require('fs');
 var util = require('util');
 
-var _ = require('underscore');
-
 var h = require('../helper');
 var chalk = require('../chalk');
 var log = require('../log');
@@ -30,14 +28,14 @@ function printResult(actual, k) {
 
   const v = actual[k] || '';
   const lines = Array.isArray(v) ? v : [v];
-  lines.forEach(function(line) {
+  for (let line of lines) {
     if (k !== 'state') line = k + ': ' + line;
     log.info('  ' + h.prettyText(' ' + line, actual.ok));
-  });
+  }
 }
 
 function printLine() {
-  const args = _.toArray(arguments);
+  const args = Array.from(arguments);
   const actual = args.shift();
   const line = util.format.apply(util, args);
   log.info('  ' + h.prettyText(' ' + line, actual.ok));
@@ -77,10 +75,10 @@ cmd.handler = function(argv) {
           const myRuntime = parseFloat(result.runtime);
 
           let ratio = 0.0;
-          scores.forEach(function(score) {
+          for (let score of scores) {
             if (parseFloat(score[0]) > myRuntime)
               ratio += parseFloat(score[1]);
-          });
+          }
 
           printLine(result, 'Your runtime beats %d %% of %s submissions',
               ratio.toFixed(2), lang);
diff --git a/lib/commands/test.js b/lib/commands/test.js
@@ -46,10 +46,10 @@ function printResult(actual, expect, k) {
   if (expect && !_.isEqual(actual[k], expect[k])) ok = false;
 
   const lines = Array.isArray(v) ? v : [v];
-  lines.forEach(function(line) {
+  for (let line of lines) {
     if (k !== 'state') line = k + ': ' + line;
     log.info('  ' + h.prettyText(' ' + line, ok));
-  });
+  }
 }
 
 function runTest(argv) {
diff --git a/lib/commands/version.js b/lib/commands/version.js
@@ -67,13 +67,11 @@ cmd.handler = function(argv) {
   });
 
   log.info('\n[Themes]');
-  printLine('Colors', _.keys(chalk.themes));
-  printLine('Icons', _.keys(icon.themes));
+  printLine('Colors', Array.from(chalk.themes.keys()));
+  printLine('Icons', Array.from(icon.themes.keys()));
 
   log.info('\n[Plugins]');
-  Plugin.plugins.forEach(function(p, k) {
-    printLine(p.name, p.ver);
-  });
+  for (let p of Plugin.plugins) printLine(p.name, p.ver);
 };
 
 module.exports = cmd;
diff --git a/lib/core.js b/lib/core.js
@@ -62,19 +62,19 @@ core.filterProblems = function(opts, cb) {
   this.getProblems(function(e, problems) {
     if (e) return cb(e);
 
-    (opts.query || '').split('').forEach(function(q) {
+    for (let q of (opts.query || '').split('')) {
       const f = QUERY_HANDLERS[q];
-      if (!f) return;
+      if (!f) continue;
       problems = problems.filter(x => f(x, q));
-    });
+    }
 
-    (opts.tag || []).forEach(function(t) {
+    for (let t of (opts.tag || [])) {
       problems = problems.filter(function(x) {
         return x.category === t ||
           hasTag(x.companies, t) ||
           hasTag(x.tags, t);
       });
-    });
+    }
 
     return cb(null, problems);
   });
diff --git a/lib/icon.js b/lib/icon.js
@@ -11,19 +11,18 @@ const icons = {
   lock:   '🔒',
   none:   ' ',
 
-  themes: []
+  themes: new Map()
 };
 
 icons.setTheme = function(name) {
   const defaultName = h.isWindows() ? 'win7' : 'default';
-  const theme = this.themes[name] || this.themes[defaultName] || {};
+  const theme = this.themes.get(name) || this.themes.get(defaultName) || {};
   _.extendOwn(this, theme);
 };
 
 icons.init = function() {
-  h.getCodeDirData('icons').forEach(function(f) {
-    icons.themes[f.name] = f.data;
-  });
+  for (let f of h.getCodeDirData('icons'))
+    icons.themes.set(f.name, f.data);
 };
 
 module.exports = icons;
diff --git a/lib/log.js b/lib/log.js
@@ -7,48 +7,48 @@ var chalk = require('./chalk');
 const log = {
   output: _.bind(console.log, console),
   level:  null,
-  levels: {
-    TRACE: {value: 0, color: 'gray'},
-    DEBUG: {value: 1, color: 'gray'},
-    INFO:  {value: 2, color: ''},
-    WARN:  {value: 3, color: 'yellow'},
-    ERROR: {value: 4, color: 'red'}
-  }
+  levels: new Map([
+    ['TRACE', {value: 0, color: 'gray'}],
+    ['DEBUG', {value: 1, color: 'gray'}],
+    ['INFO',  {value: 2, color: ''}],
+    ['WARN',  {value: 3, color: 'yellow'}],
+    ['ERROR', {value: 4, color: 'red'}]
+  ])
 };
 
 log.setLevel = function(name) {
-  this.level = this.levels[name] || this.levels.INFO;
+  this.level = this.levels.get(name) || this.levels.get('INFO');
 };
 
 log.isEnabled = function(name) {
-  return this.level.value <= this.levels[name].value;
+  return this.level.value <= this.levels.get(name).value;
 };
 
 log.fail = function(e) {
   log.error(sprintf('%s [%d]', (e.msg || e), (e.statusCode || 0)));
 };
 
 log.printf = function() {
-  log.info(sprintf.apply(null, _.toArray(arguments)));
+  log.info(sprintf.apply(null, Array.from(arguments)));
 };
 
 log.init = function() {
   this.setLevel('INFO');
 
-  _.keys(this.levels).forEach(function(name) {
+  for (let name of this.levels.keys()) {
     log[name.toLowerCase()] = function() {
-      const level = log.levels[name];
+      const level = log.levels.get(name);
       if (log.level.value > level.value) return;
 
-      const args = _.toArray(arguments);
+      const args = Array.from(arguments);
       if (name !== 'INFO') args.unshift('[' + name + ']');
 
       let s = args.map(x => x.toString()).join(' ');
       if (level.color) s = chalk[level.color](s);
 
       this.output(s);
     };
-  });
+  }
 };
 
 module.exports = log;
diff --git a/lib/plugin.js b/lib/plugin.js
diff --git a/lib/plugins/leetcode.js b/lib/plugins/leetcode.js
diff --git a/lib/plugins/retry.js b/lib/plugins/retry.js
diff --git a/test/test_core.js b/test/test_core.js
diff --git a/test/test_log.js b/test/test_log.js
