Update eslint and all the things it now complains about

Author: e-n-f

.eslintrc

@@ -1,8 +1,10 @@
-var validate = require('./lib/validate');
-var Step = require('step');
+'use strict';
+
+const validate = require('./lib/validate');
+const Step = require('step');
 
 module.exports = function(filepath, callback) {
-  var results = {};
+  const results = {};
 
   function fail(err) {
     err = err || new Error('Any unspecified error was encountered');
@@ -32,7 +34,7 @@ module.exports = function(filepath, callback) {
       results.source = source;
       validate[results.protocol.slice(0,-1)](results, this);
     },
-    function(err) {
+    (err) => {
       if (err) return fail(err);
       callback(null, true);
     }

index.js

@@ -1,15 +1,18 @@
-var os = require('os');
-var path = require('path');
-var util = require('util');
+/* jshint esversion: 6 */
+'use strict';
+
+const os = require('os');
+const path = require('path');
+const util = require('util');
 
 module.exports = function invalid(err) {
-  var msg = typeof err === 'string' ?
+  let msg = typeof err === 'string' ?
     util.format.apply(this, arguments) : err.message;
 
   msg = msg
     .replace(new RegExp(path.join(os.tmpdir(),'[0-9a-z]+-'), 'g'), '');
 
-  var error = new Error(msg);
+  const error = new Error(msg);
   error.code = 'EINVALID';
 
   if (err.stack) error.stack = err.stack;

lib/invalid.js

@@ -1,5 +1,8 @@
-var TileJSON = require('@mapbox/tilejson');
-var url = require('url');
+/* jshint esversion: 6 */
+'use strict';
+
+const TileJSON = require('@mapbox/tilejson');
+const url = require('url');
 
 module.exports = Mapbox;
 

lib/tilelive-mapbox.js

@@ -1,15 +1,18 @@
-var url = require('url');
-var fs = require('fs');
-var split = require('split');
-var zlib = require('zlib');
+/* jshint esversion: 6 */
+'use strict';
+
+const url = require('url');
+const fs = require('fs');
+const split = require('split');
+const zlib = require('zlib');
 
 module.exports = Serialtiles;
 
 function Serialtiles(uri, callback) {
-  var filepath = url.parse(uri).pathname;
-  var serialtiles = this;
+  const filepath = url.parse(uri).pathname;
+  const serialtiles = this;
 
-  fs.stat(filepath, function(err, stats) {
+  fs.stat(filepath, (err, stats) => {
     if (err) return callback(err);
     serialtiles.filestats = stats;
     serialtiles.filepath = filepath;
@@ -18,27 +21,27 @@ function Serialtiles(uri, callback) {
 }
 
 Serialtiles.prototype.getInfo = function(callback) {
-  var gotInfo = false;
-  var read = fs.createReadStream(this.filepath).pipe(zlib.createGunzip());
+  let gotInfo = false;
+  const read = fs.createReadStream(this.filepath).pipe(zlib.createGunzip());
 
   read.pipe(split())
-    .on('data', function(item) {
-      var isInfo = item !== 'JSONBREAKFASTTIME' && item.indexOf('{"z":') !== 0 && item.length;
+    .on('data', (item) => {
+      const isInfo = item !== 'JSONBREAKFASTTIME' && item.indexOf('{"z":') !== 0 && item.length;
       if (isInfo && !gotInfo) {
         gotInfo = true;
 
         try {
           item = JSON.parse(item);
           callback(null, item);
         }
-        catch(err) {
+        catch (err) {
           callback(err);
         }
 
         read.unpipe(split);
       }
     })
-    .on('end', function() {
+    .on('end', () => {
       if (!gotInfo) callback(new Error('Missing Info object'));
     });
 };

lib/tilelive-serialtiles.js

@@ -1,17 +1,20 @@
-var sniffer = require('@mapbox/mapbox-file-sniff');
-var path = require('path');
-
-var tilelive = require('@mapbox/tilelive');
-var Vector = require('@mapbox/tilelive-vector');
-var MBTiles = require('@mapbox/mbtiles');
-var Omnivore = require('@mapbox/tilelive-omnivore');
-var TileJSON = require('@mapbox/tilejson');
-var Serialtiles = require('../lib/tilelive-serialtiles');
-var Mapbox = require('../lib/tilelive-mapbox');
-var invalid = require('./invalid');
-var kmlValidator = require('./validators/kml.js');
-var log = require('fastlog')('mapbox-upload-validate', process.env.FASTLOG_LEVEL || 'info');
-var prettyBytes = require('pretty-bytes');
+/* jshint esversion: 6 */
+'use strict';
+
+const sniffer = require('@mapbox/mapbox-file-sniff');
+const path = require('path');
+
+const tilelive = require('@mapbox/tilelive');
+const Vector = require('@mapbox/tilelive-vector');
+const MBTiles = require('@mapbox/mbtiles');
+const Omnivore = require('@mapbox/tilelive-omnivore');
+const TileJSON = require('@mapbox/tilejson');
+const Serialtiles = require('../lib/tilelive-serialtiles');
+const Mapbox = require('../lib/tilelive-mapbox');
+const invalid = require('./invalid');
+const kmlValidator = require('./validators/kml.js');
+const log = require('fastlog')('mapbox-upload-validate', process.env.FASTLOG_LEVEL || 'info');
+const prettyBytes = require('pretty-bytes');
 
 Vector.registerProtocols(tilelive);
 MBTiles.registerProtocols(tilelive);
@@ -26,18 +29,18 @@ if (process.env.MapboxUploadValidateFonts)
   Vector.mapnik.register_fonts(process.env.MapboxUploadValidateFonts, { recurse: true });
 
 module.exports.limits = function loadLimits() {
-  var limits = {
+  const limits = {
     max_metadata: 60 * 1024
   };
   // copy to defaults:
   limits._defaults = JSON.parse(JSON.stringify(limits));
 
   // allow env overrides
-  for(var limit in limits) {
-    var env = 'LIMITS_' + limit.toUpperCase();
-    var val = process.env[env];
-    if(val) {
-      if(val.length === 0 || isNaN(val)) {
+  for (const limit in limits) {
+    const env = 'LIMITS_' + limit.toUpperCase();
+    const val = process.env[env];
+    if (val) {
+      if (val.length === 0 || isNaN(val)) {
         log.warn('Environment variable specified ' + env + ', but value is invalid: ' + val + '. The default (' + limits._defaults[limit] + ') will be used.');
       } else {
         log.info('Environment variable ' + env + ' overrides default ' + limits._defaults[limit] + ' => ' + val);
@@ -52,7 +55,7 @@ module.exports.limits = function loadLimits() {
 module.exports.filepath = function validateFilepath(filepath, callback) {
   filepath = path.resolve(filepath);
 
-  sniffer.fromFile(filepath, function(err, info) {
+  sniffer.fromFile(filepath, (err, info) => {
     if (err) return callback(invalid(err));
     return callback(null, {
       protocol: info.protocol,
@@ -70,13 +73,13 @@ module.exports.info = function validateInfo(info, limits, callback) {
   // Lightweight KML validation before gdal/mapnik KML drivers
   // which never finish if KMLs have too many layers
   if (info.filetype === 'kml') {
-    var kmlValid = kmlValidator(info.filepath);
+    const kmlValid = kmlValidator(info.filepath);
     if (kmlValid !== true) {
       return callback(invalid(kmlValid));
     }
   }
 
-  tilelive.info(info.uri, function(err, info) {
+  tilelive.info(info.uri, (err, info) => {
     if (err) return callback(invalid(err));
     if (info.prepare) return callback(invalid('Source cannot contain prepare key'));
 
@@ -86,7 +89,7 @@ module.exports.info = function validateInfo(info, limits, callback) {
     // don't count pre-generated tilestats objects from mbtiles
     if (info.tilestats) delete info.tilestats;
 
-    var metadataLength = JSON.stringify(info).length;
+    const metadataLength = JSON.stringify(info).length;
     if (metadataLength > limits.max_metadata)
       return callback(invalid('Metadata ' + prettyBytes(metadataLength) + ' exceeds limit of ' + prettyBytes(limits.max_metadata) + '.'));
 
@@ -95,7 +98,7 @@ module.exports.info = function validateInfo(info, limits, callback) {
 };
 
 module.exports.source = function validateSource(uri, callback) {
-  tilelive.load(uri, function(err, source) {
+  tilelive.load(uri, (err, source) => {
     if (err) return callback(invalid(err));
     callback(null, source);
   });

lib/validate.js

@@ -1,18 +1,21 @@
-var gdal = require('gdal');
+/* jshint esversion: 6 */
+'use strict';
+
+const gdal = require('gdal');
 
 module.exports = kmlLayers;
 
 function kmlLayers(infile) {
 
-  var ds_kml = {};
-  var lyr_cnt = 0;
-  var msg = [];
+  let ds_kml = {};
+  let lyr_cnt = 0;
+  let msg = [];
 
   function layername_count(ds) {
-    var lyr_name_cnt = {};
-    var dupes = {};
-    ds.layers.forEach(function(lyr) {
-      var lyr_name = lyr.name;
+    const lyr_name_cnt = {};
+    const dupes = {};
+    ds.layers.forEach((lyr) => {
+      const lyr_name = lyr.name;
       if (lyr_name in lyr_name_cnt) {
         lyr_name_cnt[lyr_name]++;
         dupes[lyr_name] = lyr_name_cnt[lyr_name];
@@ -40,10 +43,10 @@ function kmlLayers(infile) {
     return lyr_cnt + ' layers found. Maximum of ' + module.exports.max_layer_count + ' layers allowed.';
   }
 
-  var duplicate_lyr_msg = layername_count(ds_kml);
+  const duplicate_lyr_msg = layername_count(ds_kml);
   if (Object.keys(duplicate_lyr_msg).length > 0) {
     ds_kml.close();
-    for(var key in duplicate_lyr_msg) {
+    for (const key in duplicate_lyr_msg) {
       msg += ' ' + key + ' (' + duplicate_lyr_msg[key] + ')';
     }
     return 'Duplicate layer names:' + msg;