lint errors

Author: gfwilliams

lib/apploader.js

@@ -1,18 +1,19 @@
 /* Node.js library with utilities to handle using the app loader from node.js */
+/*global exports,global,__dirname,require,Promise */
 
-var DEVICEID = "BANGLEJS2";
-var VERSION = "2v11";
-var MINIFY = true; // minify JSON?
-var BASE_DIR = __dirname + "/../..";
-var APPSDIR = BASE_DIR+"/apps/";
+let DEVICEID = "BANGLEJS2";
+let VERSION = "2v11";
+let MINIFY = true; // minify JSON?
+let BASE_DIR = __dirname + "/../..";
+let APPSDIR = BASE_DIR+"/apps/";
 
 //eval(require("fs").readFileSync(__dirname+"../core/js/utils.js"));
-var Espruino = require(__dirname + "/../../core/lib/espruinotools.js");
+let Espruino = require(__dirname + "/../../core/lib/espruinotools.js");
 //eval(require("fs").readFileSync(__dirname + "/../../core/lib/espruinotools.js").toString());
 //eval(require("fs").readFileSync(__dirname + "/../../core/js/utils.js").toString());
-var AppInfo = require(__dirname+"/../../core/js/appinfo.js");
+let AppInfo = require(__dirname+"/../../core/js/appinfo.js");
 
-var SETTINGS = {
+let SETTINGS = {
   pretokenise : true
 };
 global.Const = {
@@ -22,9 +23,10 @@ global.Const = {
   SINGLE_APP_ONLY : false,
 };
 
-var apps = [];
-var device = { id : DEVICEID, appsInstalled : [] };
-var language; // Object of translations
+let apps = [];
+// eslint-disable-next-line no-redeclare
+let device = { id : DEVICEID, appsInstalled : [] };
+let language; // Object of translations
 
 /* This resets the list of installed apps to an empty list.
   It can be used in case the device behind the apploader has changed
@@ -53,18 +55,18 @@ exports.init = function(options) {
   // Try loading from apps.json
   apps.length=0;
   try {
-    var appsStr = require("fs").readFileSync(BASE_DIR+"/apps.json");
-    var appList = JSON.parse(appsStr);
+    let appsStr = require("fs").readFileSync(BASE_DIR+"/apps.json");
+    let appList = JSON.parse(appsStr);
     appList.forEach(a => apps.push(a));
   } catch (e) {
     console.log("Couldn't load apps.json", e.toString());
   }
   // Load app metadata from each app
   if (!apps.length) {
     console.log("Loading apps/.../metadata.json");
-    var dirs = require("fs").readdirSync(APPSDIR, {withFileTypes: true});
+    let dirs = require("fs").readdirSync(APPSDIR, {withFileTypes: true});
     dirs.forEach(dir => {
-      var appsFile;
+      let appsFile;
       if (dir.name.startsWith("_example") || !dir.isDirectory())
         return;
       try {
@@ -85,14 +87,14 @@ exports.apps = apps;
 function fileGetter(url) {
   url = BASE_DIR+"/"+url;
   console.log("Loading "+url)
-  var data;
+  let data;
   if (MINIFY && url.endsWith(".json")) {
-    var f = url.slice(0,-5);
+    let f = url.slice(0,-5);
     console.log("MINIFYING JSON "+f);
-    var j = eval("("+require("fs").readFileSync(url).toString("binary")+")");
+    let j = eval("("+require("fs").readFileSync(url).toString("binary")+")");
     data = JSON.stringify(j); // FIXME we can do better for Espruino
   } else {
-    var blob = require("fs").readFileSync(url);
+    let blob = require("fs").readFileSync(url);
     if (url.endsWith(".js") || url.endsWith(".json"))
       data = blob.toString(); // allow JS/etc to be written in UTF-8
     else
@@ -102,14 +104,14 @@ function fileGetter(url) {
 }
 
 exports.getAppFiles = function(app) {
-  var allFiles = [];
-  var getFileOptions = {
+  let allFiles = [];
+  let getFileOptions = {
     fileGetter : fileGetter,
     settings : SETTINGS,
     device : { id : DEVICEID, version : VERSION },
     language : language
   };
-  var uploadOptions = {
+  let uploadOptions = {
     apps : apps,
     needsApp : app => {
       if (app.provides_modules) {

lib/customize.js

@@ -71,6 +71,7 @@ function sendCustomizedApp(app, options) {
 }
 
 let __id = 0, __idlookup = [];
+// eslint-disable-next-line no-redeclare
 const Puck = {
   eval : function(data,callback) {
     __id++;
@@ -94,6 +95,7 @@ const Puck = {
       this.handlers[id].forEach(cb => cb(data));
   }
 };
+// eslint-disable-next-line no-redeclare
 const UART = Puck;
 
 const Util = {
@@ -154,6 +156,7 @@ const Util = {
     Util.domModal.classList.remove("active");
   },
   saveFile : function saveFile(filename, mimeType, dataAsString) {
+    /*global Android*/
     if (typeof Android !== "undefined" && typeof Android.saveFile === 'function') {
       // Recent Gadgetbridge version that provides the saveFile interface
       Android.saveFile(filename, mimeType, btoa(dataAsString));
@@ -206,12 +209,10 @@ function atobSafe(input) {
   // This code was written by Tyler Akins and has been placed in the
   // public domain.  It would be nice if you left this header intact.
   // Base64 code from Tyler Akins -- http://rumkin.com
-  var keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
-
-  var output = '';
-  var chr1, chr2, chr3;
-  var enc1, enc2, enc3, enc4;
-  var i = 0;
+  let keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+  let output = '';
+  let chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+  let i = 0;
   // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
   input = input.replace(/[^A-Za-z0-9+/=]/g, '');
   do {

lib/emulator.js

@@ -1,19 +1,22 @@
 /* Node.js library with utilities to handle using the emulator from node.js */
+/*global exports,__dirname,Promise,require,Uint8Array,Uint32Array */
+/*global jsRXCallback:writable,jsUpdateGfx:writable,jsTransmitString,jsInit,jsIdle,jsStopIdle,jsGetGfxContents,flashMemory */
+/*global FLASH_SIZE,GFX_WIDTH,GFX_HEIGHT */
 
-var EMULATOR = "banglejs2";
-var DEVICEID = "BANGLEJS2";
+let EMULATOR = "banglejs2";
+let DEVICEID = "BANGLEJS2";
 
-var BASE_DIR = __dirname + "/../..";
-var DIR_IDE =  BASE_DIR + "/../EspruinoWebIDE";
+let BASE_DIR = __dirname + "/../..";
+let DIR_IDE =  BASE_DIR + "/../EspruinoWebIDE";
 
 /* we factory reset ONCE, get this, then we can use it to reset
 state quickly for each new app */
-var factoryFlashMemory;
+let factoryFlashMemory;
 
 // Log of messages from app
-var appLog = "";
-var lastOutputLine = "";
-var consoleOutputCallback;
+let appLog = "";
+let lastOutputLine = "";
+let consoleOutputCallback;
 
 function onConsoleOutput(txt) {
   appLog += txt + "\n";
@@ -98,25 +101,25 @@ exports.getLastLine = function() {
 
 // Gets the screenshot as RGBA Uint32Array
 exports.getScreenshot = function() {
-  var rgba = new Uint8Array(exports.GFX_WIDTH*exports.GFX_HEIGHT*4);
+  let rgba = new Uint8Array(exports.GFX_WIDTH*exports.GFX_HEIGHT*4);
   exports.getGfxContents(rgba);
-  var rgba32 = new Uint32Array(rgba.buffer);
+  let rgba32 = new Uint32Array(rgba.buffer);
   return rgba32;
 }
 
 // Write the screenshot to a file options={errorIfBlank}
 exports.writeScreenshot = function(imageFn, options) {
   options = options||{};
   return new Promise((resolve,reject) => {
-    var rgba32 = exports.getScreenshot();
+    let rgba32 = exports.getScreenshot();
 
     if (options.errorIfBlank) {
-      var firstPixel = rgba32[0];
-      var blankImage = rgba32.every(col=>col==firstPixel);
+      let firstPixel = rgba32[0];
+      let blankImage = rgba32.every(col=>col==firstPixel);
       if (blankImage) reject("Image is blank");
     }
 
-    var Jimp = require("jimp");
+    let Jimp = require("jimp");
     let image = new Jimp(exports.GFX_WIDTH, exports.GFX_HEIGHT, function (err, image) {
       if (err) throw err;
       let buffer = image.bitmap.data;

lib/interface.js

@@ -44,6 +44,7 @@ Util.showModal(title)                           // show a modal screen over ever
 Util.hideModal()                                // hide the modal from showModal
 */
 let __id = 0, __idlookup = [];
+// eslint-disable-next-line no-redeclare
 const Puck = {
   eval : function(data,callback) {
     __id++;
@@ -67,6 +68,7 @@ const Puck = {
       this.handlers[id].forEach(cb => cb(data));
   }
 };
+// eslint-disable-next-line no-redeclare
 const UART = Puck;
 
 const Util = {
@@ -127,6 +129,7 @@ const Util = {
     Util.domModal.classList.remove("active");
   },
   saveFile : function saveFile(filename, mimeType, dataAsString) {
+    /*global Android*/
     if (typeof Android !== "undefined" && typeof Android.saveFile === 'function') {
       // Recent Gadgetbridge version that provides the saveFile interface
       Android.saveFile(filename, mimeType, btoa(dataAsString));
@@ -179,12 +182,10 @@ function atobSafe(input) {
   // This code was written by Tyler Akins and has been placed in the
   // public domain.  It would be nice if you left this header intact.
   // Base64 code from Tyler Akins -- http://rumkin.com
-  var keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
-
-  var output = '';
-  var chr1, chr2, chr3;
-  var enc1, enc2, enc3, enc4;
-  var i = 0;
+  let keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+  let output = '';
+  let chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+  let i = 0;
   // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
   input = input.replace(/[^A-Za-z0-9+/=]/g, '');
   do {