- tighten eslint-rule "vars-on-top": "on" to prevent test-writers from haphazardly leaving var-statements all over test-code

Author: kaizhu256

.eslintrc.js

@@ -30,6 +30,8 @@ module.exports = {
     rules: {
         // reason - sqlite exposes functions with underscore-naming-convention
         camelcase: "off",
+        // reason - They make it easier to add new elements to arrays
+        // and parameters to functions, and make commit diffs clearer
         "comma-dangle": "off",
         // reason - string-notation needed to prevent closure-minifier
         // from mangling property-name
@@ -67,7 +69,6 @@ module.exports = {
         // single-quotes
         quotes: ["error", "double"],
         // reason - allow top-level "use-strict" in commonjs-modules
-        strict: ["error", "safe"],
-        "vars-on-top": "off"
+        strict: ["error", "safe"]
     }
 };

src/api.js

@@ -762,15 +762,20 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
     */
     Database.prototype["exec"] = function exec(sql, params) {
         var curresult;
+        var nextSqlPtr;
+        var pStmt;
+        var pzTail;
+        var results;
+        var stack;
         var stmt;
         if (!this.db) {
             throw "Database closed";
         }
-        var stack = stackSave();
+        stack = stackSave();
         try {
-            var nextSqlPtr = allocateUTF8OnStack(sql);
-            var pzTail = stackAlloc(4);
-            var results = [];
+            nextSqlPtr = allocateUTF8OnStack(sql);
+            pzTail = stackAlloc(4);
+            results = [];
             while (getValue(nextSqlPtr, "i8") !== NULL) {
                 setValue(apiTemp, 0, "i32");
                 setValue(pzTail, 0, "i32");
@@ -782,7 +787,7 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
                     pzTail
                 ));
                 // pointer to a statement, or null
-                var pStmt = getValue(apiTemp, "i32");
+                pStmt = getValue(apiTemp, "i32");
                 nextSqlPtr = getValue(pzTail, "i32");
                 // Empty statement
                 if (pStmt !== NULL) {
@@ -963,21 +968,27 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
     ) {
         var func_ptr;
         function wrapped_func(cx, argc, argv) {
+            var arg;
+            var args;
+            var blobptr;
+            var i;
+            var j;
             var result;
+            var value_ptr;
+            var value_type;
             function extract_blob(ptr) {
                 var size = sqlite3_value_bytes(ptr);
                 var blob_ptr = sqlite3_value_blob(ptr);
                 var blob_arg = new Uint8Array(size);
-                for (var j = 0; j < size; j += 1) {
+                for (j = 0; j < size; j += 1) {
                     blob_arg[j] = HEAP8[blob_ptr + j];
                 }
                 return blob_arg;
             }
-            var args = [];
-            for (var i = 0; i < argc; i += 1) {
-                var value_ptr = getValue(argv + (4 * i), "i32");
-                var value_type = sqlite3_value_type(value_ptr);
-                var arg;
+            args = [];
+            for (i = 0; i < argc; i += 1) {
+                value_ptr = getValue(argv + (4 * i), "i32");
+                value_type = sqlite3_value_type(value_ptr);
                 if (
                     value_type === SQLITE_INTEGER
                     || value_type === SQLITE_FLOAT
@@ -1010,7 +1021,7 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
                     if (result === null) {
                         sqlite3_result_null(cx);
                     } else if (result.length != null) {
-                        var blobptr = allocate(result, "i8", ALLOC_NORMAL);
+                        blobptr = allocate(result, "i8", ALLOC_NORMAL);
                         sqlite3_result_blob(cx, blobptr, result.length, -1);
                         _free(blobptr);
                     } else {

src/worker.js

@@ -5,15 +5,30 @@
 "use strict";
 
 var db;
+var sqlModuleReady;
 
 function onModuleReady(SQL) {
-    function createDb(data) {
+    var buff;
+    var data;
+    var result;
+    function createDb(data2) {
         if (db != null) db.close();
-        db = new SQL.Database(data);
+        db = new SQL.Database(data2);
         return db;
     }
-
-    var buff; var data; var result;
+    function callback(row) {
+        return postMessage({
+            id: data["id"],
+            row: row,
+            finished: false
+        });
+    }
+    function done() {
+        return postMessage({
+            id: data["id"],
+            finished: true
+        });
+    }
     data = this["data"];
     switch (data && data["action"]) {
         case "open":
@@ -38,19 +53,6 @@ function onModuleReady(SQL) {
             if (db === null) {
                 createDb();
             }
-            var callback = function callback(row) {
-                return postMessage({
-                    id: data["id"],
-                    row: row,
-                    finished: false
-                });
-            };
-            var done = function done() {
-                return postMessage({
-                    id: data["id"],
-                    finished: true
-                });
-            };
             return db.each(data["sql"], data["params"], callback, done);
         case "export":
             buff = db["export"]();
@@ -84,7 +86,7 @@ function onError(err) {
 
 if (typeof importScripts === "function") {
     db = null;
-    var sqlModuleReady = initSqlJs();
+    sqlModuleReady = initSqlJs();
     self.onmessage = function onmessage(event) {
         return sqlModuleReady
             .then(onModuleReady.bind(event))

test/all.js

@@ -1,19 +1,30 @@
 "use strict";
 
-var fs = require("fs");
+var fs;
+var sqlLibType;
+var sqlLibLoader;
+
+fs = require("fs");
+
+sqlLibType = process.argv[2];
+sqlLibLoader = require("./load_sql_lib");
 
 Error.stackTraceLimit = 200;
-var sqlLibType = process.argv[2];
-var sqlLibLoader = require("./load_sql_lib");
 
 sqlLibLoader(sqlLibType).then(function (sql) {
-    var files = fs.readdirSync(__dirname);
-    for (var i = 0; i < files.length; i += 1) {
-        var file = files[i];
-        var m = /^test_(.+)\.js$/.exec(file);
+    var file;
+    var files;
+    var i;
+    var m;
+    var name;
+    var testModule;
+    files = fs.readdirSync(__dirname);
+    for (i = 0; i < files.length; i += 1) {
+        file = files[i];
+        m = /^test_(.+)\.js$/.exec(file);
         if (m !== null) {
-            var name = m[1];
-            var testModule = require("./" + file);
+            name = m[1];
+            testModule = require("./" + file);
             if (testModule.test) {
                 exports["test " + name] = testModule.test.bind(null, sql);
             }

test/disabled_test_memory_leak_on_error.js

@@ -3,10 +3,14 @@
 "use strict";
 
 exports.test = function (sql, assert) {
-    var errors = 0; var
-        runs = 10000;
-    for (var i = 0; i < runs; i += 1) {
-        var db = new sql.Database();
+    var db;
+    var errors;
+    var i;
+    var runs;
+    errors = 0;
+    runs = 10000;
+    for (i = 0; i < runs; i += 1) {
+        db = new sql.Database();
         try {
             db.exec("CREATE TABLE cats (name TEXT NOT NULL, age INTEGER NULL)");
             db.exec("INSERT INTO cats (name, age) VALUES (NULL, 3)");
@@ -25,9 +29,7 @@ exports.test = function (sql, assert) {
 };
 
 if (module === require.main) {
-    var target_file = process.argv[2];
-    var sql_loader = require("./load_sql_lib");
-    sql_loader(target_file).then(function (sql) {
+    require("./load_sql_lib")(process.argv[2]).then(function (sql) {
         require("test").run({
             "test memory leak on error": function (assert) {
                 exports.test(sql, assert);

test/load_sql_lib.js

@@ -1,14 +1,17 @@
 "use strict";
 
 module.exports = function (sqlLibraryType) {
+    var begin;
+    var initSqlJs;
+    var sqlJsLib;
     // Use sql-wasm.js by default
-    var sqlJsLib = (
+    sqlJsLib = (
         sqlLibraryType
             ? "../dist/sql-" + sqlLibraryType + ".js"
             : "../dist/sql-wasm.js"
     );
-    var begin = new Date();
-    var initSqlJs = require(sqlJsLib);
+    begin = new Date();
+    initSqlJs = require(sqlJsLib);
     return initSqlJs().then(function (sql) {
         console.log(
             "Loaded and inited "

test/test_blob.js

@@ -1,30 +1,35 @@
 "use strict";
 
 exports.test = function (SQL, assert) {
-    var db = new SQL.Database();
+    var array;
+    var bigArray;
+    var db;
+    var i;
     var res;
     var stmt;
+
+    db = new SQL.Database();
     // Insert binary data. This is invalid UTF8 on purpose
     db.exec(
         "CREATE TABLE test (data); INSERT INTO test VALUES (x'6162ff'),(x'00')"
     );
 
     stmt = db.prepare("INSERT INTO test VALUES (?)");
-    var bigArray = new Uint8Array(1e6);
+    bigArray = new Uint8Array(1e6);
     bigArray[500] = 0x42;
     stmt.run([bigArray]);
 
     stmt = db.prepare("SELECT * FROM test ORDER BY length(data) DESC");
 
     stmt.step();
-    var array = stmt.get()[0];
+    array = stmt.get()[0];
     assert.equal(
         array.length,
         bigArray.length,
         "BLOB read from the database should be the same size"
         + " as the one that was inserted"
     );
-    for (var i = 0; i < array.length; i += 1) {
+    for (i = 0; i < array.length; i += 1) {
         // Avoid doing 1e6 assert, to not pollute the console
         if (array[i] !== bigArray[i]) {
             assert.fail(
@@ -57,9 +62,7 @@ exports.test = function (SQL, assert) {
 };
 
 if (module === require.main) {
-    var target_file = process.argv[2];
-    var sql_loader = require("./load_sql_lib");
-    sql_loader(target_file).then(function (sql) {
+    require("./load_sql_lib")(process.argv[2]).then(function (sql) {
         require("test").run({
             "test blob": function (assert) {
                 exports.test(sql, assert);

test/test_database.js

@@ -1,13 +1,19 @@
 "use strict";
 
 exports.test = function (SQL, assert, done) {
+    var binaryArray;
+    var count;
+    var db;
+    var expectedResult;
+    var finished;
     var result;
     var sqlstr;
     var testTimeoutId;
+
     assert.notEqual(SQL.Database, undefined, "Should export a Database object");
 
     // Create a database
-    var db = new SQL.Database();
+    db = new SQL.Database();
     assert.equal(
         Object.getPrototypeOf(db),
         SQL.Database.prototype,
@@ -24,7 +30,7 @@ exports.test = function (SQL, assert, done) {
     // Retrieving values
     sqlstr = "SELECT * FROM test;";
     result = db.exec(sqlstr);
-    var expectedResult = [{
+    expectedResult = [{
         columns: ["a", "b", "c", "d", "e"],
         values: [
             [null, 42, 4.2, "fourty two", new Uint8Array([0x42])]
@@ -34,32 +40,32 @@ exports.test = function (SQL, assert, done) {
 
 
     // Export the database to an Uint8Array containing the SQLite database file
-    var binaryArray = db.export();
+    binaryArray = db.export();
     assert.strictEqual(
         String.fromCharCode.apply(null, binaryArray.subarray(0, 6)),
         "SQLite",
         "The first 6 bytes of an SQLite database should form the word 'SQLite'"
     );
     db.close();
 
-    var db2 = new SQL.Database(binaryArray);
-    result = db2.exec("SELECT * FROM test");
+    db = new SQL.Database(binaryArray);
+    result = db.exec("SELECT * FROM test");
     assert.deepEqual(
         result,
         expectedResult,
         "Exporting and re-importing the database should lead"
         + " to the same database"
     );
-    db2.close();
+    db.close();
 
     db = new SQL.Database();
     assert.deepEqual(db.exec("SELECT * FROM sqlite_master"),
         [],
         "Newly created databases should be empty");
     // Testing db.each
     db.run("CREATE TABLE test (a,b); INSERT INTO test VALUES (1,'a'),(2,'b')");
-    var count = 0; var
-        finished = false;
+    count = 0;
+    finished = false;
     db.each("SELECT * FROM test ORDER BY a", function callback(row) {
         count += 1;
         if (count === 1) {
@@ -101,9 +107,7 @@ exports.test = function (SQL, assert, done) {
 };
 
 if (module === require.main) {
-    var target_file = process.argv[2];
-    var sql_loader = require("./load_sql_lib");
-    sql_loader(target_file).then(function (sql) {
+    require("./load_sql_lib")(process.argv[2]).then(function (sql) {
         require("test").run({
             "test database": function (assert, done) {
                 exports.test(sql, assert, done);