chore: apply modern code styles

kneemer · Nov 21, 2018 · b38c3a4 · b38c3a4
1 parent 33b94d3
commit b38c3a4
Show file tree

Hide file tree

Showing 84 changed files with 465 additions and 714 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+indent_size = 2
+indent_style = space
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/.eslintrc b/.eslintrc
@@ -14,6 +14,17 @@
     "node": true
   },
   "rules": {
+    "template-curly-spacing": ["error", "never"],
+    "prefer-template": "error",
+    "no-useless-call": "error",
+    "no-lonely-if": "error",
+    "indent": ["error", 2, {
+      "SwitchCase": 1
+    }],
+    "no-else-return": ["error", {
+      "allowElseIf": false
+    }],
+    "eqeqeq": "error",
     "no-invalid-this": "error",
     "consistent-this": "error",
     "prefer-arrow-callback": "error",

diff --git a/.npmignore b/.npmignore
diff --git a/benchmarks/FB/hello.js b/benchmarks/FB/hello.js
@@ -10,7 +10,7 @@ if (cluster.isMaster) {
   }
 
   cluster.on('exit', worker => {
-    console.log('worker ' + worker.pid + ' died');
+    console.log(`worker ${worker.pid} died`);
   });
 
   return;
@@ -73,7 +73,7 @@ function handlePrepared(req, res) {
       [getRandomNumber()],
       (err, rows) => {
         results.push(rows[0]);
-        if (results.length == queries) res.end(JSON.stringify(results));
+        if (results.length === queries) res.end(JSON.stringify(results));
       }
     );
   }
@@ -91,7 +91,7 @@ function handleMysqlIsh(conn, req, res) {
       [getRandomNumber()],
       (err, rows) => {
         results.push(rows[0]);
-        if (results.length == queries) res.end(JSON.stringify(results));
+        if (results.length === queries) res.end(JSON.stringify(results));
       }
     );
   }
@@ -105,10 +105,10 @@ function handleMysqlIshPool(pool, req, res) {
   for (let i = 0; i < queries; ++i) {
     pool.getConnection(() => {
       mysql2conn.query(
-        'SELECT * FROM world WHERE id = ' + getRandomNumber(),
+        `SELECT * FROM world WHERE id = ${getRandomNumber()}`,
         (err, rows) => {
           results.push(rows[0]);
-          if (results.length == queries) res.end(JSON.stringify(results));
+          if (results.length === queries) res.end(JSON.stringify(results));
         }
       );
     });
@@ -125,7 +125,7 @@ function handleMaria(req, res) {
       .on('result', dbres => {
         dbres.on('row', row => {
           results.push(row);
-          if (results.length == queries) res.end(JSON.stringify(results));
+          if (results.length === queries) res.end(JSON.stringify(results));
         });
       });
   }
@@ -207,7 +207,7 @@ http
 
         function libmysqlQuery2(callback) {
           libmysql.query(
-            'SELECT * FROM world WHERE id = ' + getRandomNumber(),
+            `SELECT * FROM world WHERE id = ${getRandomNumber()}`,
             (err, res) => {
               if (err) {
                 throw err;
@@ -278,7 +278,7 @@ http
 
         function libmysqlQuery(callback) {
           libmysql.query(
-            'SELECT * FROM world WHERE id = ' + getRandomNumber(),
+            `SELECT * FROM world WHERE id = ${getRandomNumber()}`,
             (err, res) => {
               if (err) {
                 throw err;
@@ -293,10 +293,7 @@ http
 
                 rows[0].randomNumber = getRandomNumber();
                 libmysql.query(
-                  'UPDATE World SET randomNumber = ' +
-                    rows[0].randomNumber +
-                    ' WHERE id = ' +
-                    rows[0]['id'],
+                  `UPDATE World SET randomNumber = ${rows[0].randomNumber} WHERE id = ${rows[0]['id']}`,
                   err => {
                     if (err) {
                       throw err;

diff --git a/benchmarks/bench-fake-server-maria.js b/benchmarks/bench-fake-server-maria.js
@@ -38,11 +38,7 @@ function benchmarkSelects(n, cb) {
     const end = process.hrtime();
     const diff = common.hrdiff(start, end);
     console.log(
-      ' rows: ' +
-        (numSelects * 1e9) / diff +
-        ' results/sec, ' +
-        (rowsPerQuery * numSelects * 1e9) / diff +
-        ' rows/sec'
+      ` rows: ${(numSelects * 1e9) / diff} results/sec, ${(rowsPerQuery * numSelects * 1e9) / diff} rows/sec`
     );
     if (n > 1) benchmarkSelects(n - 1, cb);
     else cb();

diff --git a/benchmarks/bench-fake-server.js b/benchmarks/bench-fake-server.js
@@ -10,7 +10,7 @@ for (let i = 0; i < connections.length; ++i)
 let currConn = 0;
 function next() {
   currConn++;
-  if (currConn == connections.length) currConn = 0;
+  if (currConn === connections.length) currConn = 0;
   connection = connections[currConn];
 }
 // ======================
@@ -39,11 +39,7 @@ function benchmarkSelects(n, cb) {
     const end = process.hrtime();
     const diff = common.hrdiff(start, end);
     console.log(
-      ' rows: ' +
-        (numSelects * 1e9) / diff +
-        ' results/sec, ' +
-        (rowsPerQuery * numSelects * 1e9) / diff +
-        ' rows/sec'
+      ` rows: ${(numSelects * 1e9) / diff}} results/sec, ${(rowsPerQuery * numSelects * 1e9) / diff} rows/sec`
     );
     if (n > 1) benchmarkSelects(n - 1, cb);
     else cb();

diff --git a/benchmarks/bench-insert-select-parallel.js b/benchmarks/bench-insert-select-parallel.js
@@ -6,10 +6,10 @@ const connection = common.createConnection();
 const table = 'insert_test';
 //const text = "本日は晴天なり";
 const text = 'test abc xyz';
-connection.query('drop table ' + table).on('error', () => {});
+connection.query(`drop table ${table}`).on('error', () => {});
 connection.query(
   [
-    'CREATE TABLE `' + table + '` (',
+    `CREATE TABLE \`${table}\` (`,
     '`id` int(11) unsigned NOT NULL AUTO_INCREMENT,',
     '`title` varchar(255) NOT NULL,',
     'PRIMARY KEY (`id`)',
@@ -19,7 +19,7 @@ connection.query(
 
 function benchmarkInsert(numLeft, callback) {
   connection.query(
-    'INSERT INTO ' + table + ' SET title="' + text + '"',
+    `INSERT INTO ${table} SET title="${text}"`,
     err => {
       if (err) throw err;
       if (numLeft > 1) benchmarkInsert(numLeft - 1, callback);
@@ -34,7 +34,7 @@ function benchmarkInserts(n, cb) {
   benchmarkInsert(numInsert, () => {
     const end = process.hrtime();
     const diff = common.hrdiff(start, end);
-    console.log((numInsert * 1e9) / diff + ' inserts/sec');
+    console.log(`${(numInsert * 1e9) / diff} inserts/sec`);
     if (n > 1) benchmarkInserts(n - 1, cb);
     else cb();
   });
@@ -51,12 +51,7 @@ function benchmarkParallelSelects(n, size, cb) {
     const end = process.hrtime();
     const diff = common.hrdiff(start, end);
     console.log(
-      size +
-        ' rows: ' +
-        (n * 1e9) / diff +
-        ' results/sec, ' +
-        (size * n * 1e9) / diff +
-        ' rows/sec'
+      `${size} rows: ${(n * 1e9) / diff} results/sec, ${(size * n * 1e9) / diff} rows/sec`
     );
     cb();
   }
@@ -66,7 +61,7 @@ function benchmarkParallelSelects(n, size, cb) {
     numRunning++;
     connections[i] = common.createConnection();
     const cmd = connections[i].execute(
-      'select * from ' + table + ' limit ' + size,
+      `select * from ${table} limit ${size}`,
       []
     );
     cmd.on('end', commandDone);

diff --git a/benchmarks/bench-insert-select-prepared.js b/benchmarks/bench-insert-select-prepared.js
@@ -8,7 +8,7 @@ const table = 'insert_test';
 const text = 'test abc xyz';
 connection.query(
   [
-    'CREATE TEMPORARY TABLE `' + table + '` (',
+    `CREATE TEMPORARY TABLE \`${table}\` (`,
     '`id` int(11) unsigned NOT NULL AUTO_INCREMENT,',
     '`title` varchar(255),',
     'PRIMARY KEY (`id`)',
@@ -18,7 +18,7 @@ connection.query(
 
 function benchmarkInsert(numLeft, callback) {
   connection.execute(
-    'INSERT INTO ' + table + ' SET title="' + text + '"',
+    `INSERT INTO ${table} SET title="${text}"`,
     [],
     err => {
       if (err) throw err;
@@ -34,15 +34,15 @@ function benchmarkInserts(n, cb) {
   benchmarkInsert(numInsert, () => {
     const end = process.hrtime();
     const diff = common.hrdiff(start, end);
-    console.log((numInsert * 1e9) / diff + ' inserts/sec');
+    console.log(`${(numInsert * 1e9) / diff} inserts/sec`);
     if (n > 1) benchmarkInserts(n - 1, cb);
     else cb();
   });
 }
 
 function benchmarkSelect(numLeft, numSelect, callback) {
   connection.execute(
-    'select * from ' + table + ' limit ' + numSelect,
+    `select * from ${table} limit ${numSelect}`,
     [],
     err => {
       if (err) throw err;
@@ -59,12 +59,7 @@ function benchmarkSelects(n, size, cb) {
     const end = process.hrtime();
     const diff = common.hrdiff(start, end);
     console.log(
-      size +
-        ' rows: ' +
-        (numSelects * 1e9) / diff +
-        ' results/sec, ' +
-        (size * numSelects * 1e9) / diff +
-        ' rows/sec'
+      `${size} rows: ${(numSelects * 1e9) / diff} results/sec, ${(size * numSelects * 1e9) / diff} rows/sec`
     );
     if (n > 1) benchmarkSelects(n - 1, size, cb);
     else cb();

diff --git a/benchmarks/bench-insert-select.js b/benchmarks/bench-insert-select.js
@@ -7,7 +7,7 @@ const table = 'insert_test';
 const text = '本日は晴天なり';
 connection.query(
   [
-    'CREATE TEMPORARY TABLE `' + table + '` (',
+    `CREATE TEMPORARY TABLE \`${table}\` (`,
     '`id` int(11) unsigned NOT NULL AUTO_INCREMENT,',
     '`title` varchar(255),',
     'PRIMARY KEY (`id`)',
@@ -17,7 +17,7 @@ connection.query(
 
 function benchmarkInsert(numLeft, callback) {
   connection.query(
-    'INSERT INTO ' + table + ' SET title="' + text + '"',
+    `INSERT INTO ${table} SET title="${text}"`,
     err => {
       if (err) throw err;
       if (numLeft > 1) benchmarkInsert(numLeft - 1, callback);
@@ -32,14 +32,14 @@ function benchmarkInserts(n, cb) {
   benchmarkInsert(numInsert, () => {
     const end = process.hrtime();
     const diff = common.hrdiff(start, end);
-    console.log((numInsert * 1e9) / diff + ' inserts/sec');
+    console.log(`${(numInsert * 1e9) / diff} inserts/sec`);
     if (n > 1) benchmarkInserts(n - 1, cb);
     else cb();
   });
 }
 
 function benchmarkSelect(numLeft, numSelect, callback) {
-  connection.query('select * from ' + table + ' limit ' + numSelect, err => {
+  connection.query(`select * from ${table} limit ${numSelect}`, err => {
     if (err) throw err;
     if (numLeft > 1) benchmarkSelect(numLeft - 1, numSelect, callback);
     else callback();
@@ -53,12 +53,7 @@ function benchmarkSelects(n, size, cb) {
     const end = process.hrtime();
     const diff = common.hrdiff(start, end);
     console.log(
-      size +
-        ' rows: ' +
-        (numSelects * 1e9) / diff +
-        ' results/sec, ' +
-        (size * numSelects * 1e9) / diff +
-        ' rows/sec'
+      `${size} rows: ${(numSelects * 1e9) / diff} results/sec, ${(size * numSelects * 1e9) / diff} rows/sec`
     );
     if (n > 1) benchmarkSelects(n - 1, size, cb);
     else cb();

diff --git a/benchmarks/benchmark-query.js b/benchmarks/benchmark-query.js
@@ -17,13 +17,13 @@ const sql = process.argv[2];
         const curTime = Date.now();
         const last1000time = curTime - prev1000;
         prev1000 = curTime;
-        console.error(1000000 / last1000time + ' req/sec');
+        console.error(`${1000000 / last1000time} req/sec`);
       }
 
       if (left > 0) bench();
       else {
         console.error(
-          10000000 / (Date.now() - start) + ' req/sec (average 10000 reqs)'
+          `${10000000 / (Date.now() - start)} req/sec (average 10000 reqs)`
         );
         db.end();
         if (cb) cb();

diff --git a/benchmarks/http-select-and-render.js b/benchmarks/http-select-and-render.js
@@ -11,7 +11,7 @@ const port = process.env.PORT;
 http
   .createServer((req, res) => {
     const q = url.parse(req.url, true);
-    if (q.pathname == '/render') {
+    if (q.pathname === '/render') {
       const sql = q.query.q;
       const n = q.query.n;
       let rowsTotal = [];

diff --git a/benchmarks/ruby-mysql2/benchmark-query.js b/benchmarks/ruby-mysql2/benchmark-query.js
@@ -36,18 +36,16 @@ let numRequests = 0;
         const curTime = Date.now();
         const last1000time = curTime - prev1000;
         prev1000 = curTime;
-        console.error(1000000 / last1000time + ' req/sec');
+        console.error(`${1000000 / last1000time} req/sec`);
       }
 
       if (left > 0) bench();
       else {
         console.error(
-          (numRequests * 1000) / (Date.now() - start) +
-            ' req/sec (average 10000 reqs)'
+          `${(numRequests * 1000) / (Date.now() - start)} req/sec (average 10000 reqs)`
         );
         console.error(
-          (rowsReceived * 1000) / (Date.now() - start) +
-            ' row/sec (average 10000 reqs)'
+          `${(rowsReceived * 1000) / (Date.now() - start)} row/sec (average 10000 reqs)`
         );
         db.end();
         if (cb) cb();

diff --git a/benchmarks/run-unit.js b/benchmarks/run-unit.js
@@ -46,7 +46,7 @@ function runFolder(name, done) {
 
 function benchmarkModule(m, modulePath, done) {
   const results = [];
-  const bar = new progress(m.comment + ' [:bar] ', {
+  const bar = new progress(`${m.comment} [:bar] `, {
     total: nRepeats,
     clear: true
   });
@@ -122,11 +122,11 @@ function runFileList(base, list, done) {
     if (index >= list.length) {
       return done(null, results);
     }
-    const fname = base + '/' + list[index];
+    const fname = `${base}/${list[index]}`;
     fs.stat(fname, (err, stat) => {
       if (err) return done(err);
       if (stat.isDirectory()) return runFolder(fname, runOne);
-      else if (fname.slice(-3) == '.js') {
+      if (fname.endsWith('.js')) {
         const m = require(fname);
         return benchmarkModule(m, fname, runOne);
       }
@@ -137,7 +137,7 @@ function runFileList(base, list, done) {
 }
 
 //const name = process.argv[2] || __dirname + '/unit';
-runFolder(__dirname + '/unit', (err, results) => {
+runFolder(`${__dirname}/unit`, (err, results) => {
   //console.log(results);
-  fs.writeFileSync(__dirname + '/results.json', JSON.stringify(results));
+  fs.writeFileSync(`${__dirname}/results.json`, JSON.stringify(results));
 });