Add basic eslint configuration

tmcw · tmcw · commit 20337bc15cd7 · 2016-10-24T16:46:40.000-04:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,12 @@
+module.exports = {
+    "extends": "eslint:recommended",
+    "env": {
+        "node": true
+    },
+    "rules": {
+        "indent": ["error", 4],
+        "linebreak-style": ["error", "unix"],
+        "semi": ["error", "always"],
+        "no-cond-assign": ["error", "always"]
+    }
+}
diff --git a/lib/sqlite3.js b/lib/sqlite3.js
@@ -19,12 +19,12 @@ function normalizeMethod (fn) {
         }
         var statement = new Statement(this, sql, errBack);
         return fn.call(this, statement, args);
-    }
+    };
 }
 
 function inherits(target, source) {
-  for (var k in source.prototype)
-    target.prototype[k] = source.prototype[k];
+    for (var k in source.prototype)
+        target.prototype[k] = source.prototype[k];
 }
 
 sqlite3.cached = {
@@ -34,17 +34,18 @@ sqlite3.cached = {
             return new Database(file, a, b);
         }
 
+        var db;
         file = path.resolve(file);
+        function cb() { callback.call(db, null); }
 
         if (!sqlite3.cached.objects[file]) {
-            var db =sqlite3.cached.objects[file] = new Database(file, a, b);
+            db = sqlite3.cached.objects[file] = new Database(file, a, b);
         }
         else {
             // Make sure the callback is called.
-            var db = sqlite3.cached.objects[file];
+            db = sqlite3.cached.objects[file];
             var callback = (typeof a === 'number') ? b : a;
             if (typeof callback === 'function') {
-                function cb() { callback.call(db, null); }
                 if (db.open) process.nextTick(cb);
                 else db.once('open', cb);
             }
@@ -114,7 +115,7 @@ Statement.prototype.map = function() {
             } else {
                 var value = keys[1];
                 // Value is a plain value
-                for (var i = 0; i < rows.length; i++) {
+                for (i = 0; i < rows.length; i++) {
                     result[rows[i][key]] = rows[i][value];
                 }
             }
diff --git a/lib/trace.js b/lib/trace.js
@@ -1,5 +1,4 @@
 // Inspired by https://github.com/tlrobinson/long-stack-traces
-var EventEmitter = require('events').EventEmitter;
 var util = require('util');
 
 function extendTrace(object, property, pos) {
diff --git a/package.json b/package.json
@@ -1,64 +1,63 @@
 {
-    "name": "sqlite3",
-    "description": "Asynchronous, non-blocking SQLite3 bindings",
-    "version": "3.1.7",
-    "homepage": "http://github.com/mapbox/node-sqlite3",
-    "author": {
-        "name": "MapBox",
-        "url": "https://mapbox.com/"
-    },
-    "binary": {
-        "module_name" : "node_sqlite3",
-        "module_path" : "./lib/binding/{node_abi}-{platform}-{arch}",
-        "host"        : "https://mapbox-node-binary.s3.amazonaws.com",
-        "remote_path" : "./{name}/v{version}/{toolset}/",
-        "package_name": "{node_abi}-{platform}-{arch}.tar.gz"
-    },
-    "contributors": [
-        "Konstantin Käfer <mail@kkaefer.com>",
-        "Dane Springmeyer <dane@mapbox.com>",
-        "Will White <will@mapbox.com>",
-        "Orlando Vazquez <ovazquez@gmail.com>",
-        "Artem Kustikov <kustikoff@gmail.com>",
-        "Eric Fredricksen <efredricksen@gmail.com>",
-        "John Wright <mrjjwright@gmail.com>",
-        "Ryan Dahl <ry@tinyclouds.org>",
-        "Tom MacWright <tom@mapbox.com>",
-        "Carter Thaxton <carter.thaxton@gmail.com>",
-        "Audrius Kažukauskas <audrius@neutrino.lt>",
-        "Johannes Schauer <josch@pyneo.org>",
-        "Nathan Rajlich <nathan@tootallnate.net>",
-        "AJ ONeal <coolaj86@gmail.com>",
-        "Mithgol",
-        "Ben Noordhuis <ben@strongloop.com>"
-    ],
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/mapbox/node-sqlite3.git"
-    },
-    "dependencies": {
-        "nan": "~2.4.0",
-        "node-pre-gyp": "~0.6.31"
-    },
-    "bundledDependencies": [
-        "node-pre-gyp"
-    ],
-    "devDependencies": {
-        "mocha": "3.x",
-        "aws-sdk": "2.x"
-    },
-    "scripts": {
-        "prepublish":"npm ls",
-        "install": "node-pre-gyp install --fallback-to-build",
-        "pretest": "node test/support/createdb.js",
-        "test": "mocha -R spec --timeout 480000"
-    },
-    "license": "BSD-3-Clause",
-    "keywords": [
-        "sql",
-        "sqlite",
-        "sqlite3",
-        "database"
-    ],
-    "main": "./lib/sqlite3"
+  "name": "sqlite3",
+  "description": "Asynchronous, non-blocking SQLite3 bindings",
+  "version": "3.1.7",
+  "homepage": "http://github.com/mapbox/node-sqlite3",
+  "author": {
+    "name": "MapBox",
+    "url": "https://mapbox.com/"
+  },
+  "binary": {
+    "module_name": "node_sqlite3",
+    "module_path": "./lib/binding/{node_abi}-{platform}-{arch}",
+    "host": "https://mapbox-node-binary.s3.amazonaws.com",
+    "remote_path": "./{name}/v{version}/{toolset}/",
+    "package_name": "{node_abi}-{platform}-{arch}.tar.gz"
+  },
+  "contributors": [
+    "Konstantin Käfer <mail@kkaefer.com>",
+    "Dane Springmeyer <dane@mapbox.com>",
+    "Will White <will@mapbox.com>",
+    "Orlando Vazquez <ovazquez@gmail.com>",
+    "Artem Kustikov <kustikoff@gmail.com>",
+    "Eric Fredricksen <efredricksen@gmail.com>",
+    "John Wright <mrjjwright@gmail.com>",
+    "Ryan Dahl <ry@tinyclouds.org>",
+    "Tom MacWright <tom@mapbox.com>",
+    "Carter Thaxton <carter.thaxton@gmail.com>",
+    "Audrius Kažukauskas <audrius@neutrino.lt>",
+    "Johannes Schauer <josch@pyneo.org>",
+    "Nathan Rajlich <nathan@tootallnate.net>",
+    "AJ ONeal <coolaj86@gmail.com>",
+    "Mithgol",
+    "Ben Noordhuis <ben@strongloop.com>"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/mapbox/node-sqlite3.git"
+  },
+  "dependencies": {
+    "nan": "~2.3.3",
+    "node-pre-gyp": "~0.6.28"
+  },
+  "devDependencies": {
+    "aws-sdk": "2.x",
+    "eslint": "3.5.0",
+    "mocha": "2.x"
+  },
+  "scripts": {
+    "prepublish": "npm ls",
+    "preinstall": "npm install node-pre-gyp",
+    "install": "node-pre-gyp install --fallback-to-build",
+    "pretest": "node test/support/createdb.js",
+    "test": "eslint lib && mocha -R spec --timeout 480000"
+  },
+  "license": "BSD-3-Clause",
+  "keywords": [
+    "sql",
+    "sqlite",
+    "sqlite3",
+    "database"
+  ],
+  "main": "./lib/sqlite3"
 }

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,12 @@ function normalizeMethod (fn) {`
`19`	`19`	`}`
`20`	`20`	`var statement = new Statement(this, sql, errBack);`
`21`	`21`	`return fn.call(this, statement, args);`
`22`		`- }`
	`22`	`+ };`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`function inherits(target, source) {`
`26`		`- for (var k in source.prototype)`
`27`		`- target.prototype[k] = source.prototype[k];`
	`26`	`+ for (var k in source.prototype)`
	`27`	`+ target.prototype[k] = source.prototype[k];`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`sqlite3.cached = {`
`@@ -34,17 +34,18 @@ sqlite3.cached = {`
`34`	`34`	`return new Database(file, a, b);`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ var db;`
`37`	`38`	`file = path.resolve(file);`
	`39`	`+ function cb() { callback.call(db, null); }`
`38`	`40`
`39`	`41`	`if (!sqlite3.cached.objects[file]) {`
`40`		`- var db =sqlite3.cached.objects[file] = new Database(file, a, b);`
	`42`	`+ db = sqlite3.cached.objects[file] = new Database(file, a, b);`
`41`	`43`	`}`
`42`	`44`	`else {`
`43`	`45`	`// Make sure the callback is called.`
`44`		`- var db = sqlite3.cached.objects[file];`
	`46`	`+ db = sqlite3.cached.objects[file];`
`45`	`47`	`var callback = (typeof a === 'number') ? b : a;`
`46`	`48`	`if (typeof callback === 'function') {`
`47`		`- function cb() { callback.call(db, null); }`
`48`	`49`	`if (db.open) process.nextTick(cb);`
`49`	`50`	`else db.once('open', cb);`
`50`	`51`	`}`
`@@ -114,7 +115,7 @@ Statement.prototype.map = function() {`
`114`	`115`	`} else {`
`115`	`116`	`var value = keys[1];`
`116`	`117`	`// Value is a plain value`
`117`		`- for (var i = 0; i < rows.length; i++) {`
	`118`	`+ for (i = 0; i < rows.length; i++) {`
`118`	`119`	`result[rows[i][key]] = rows[i][value];`
`119`	`120`	`}`
`120`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// Inspired by https://github.com/tlrobinson/long-stack-traces`
`2`		`-var EventEmitter = require('events').EventEmitter;`
`3`	`2`	`var util = require('util');`
`4`	`3`
`5`	`4`	`function extendTrace(object, property, pos) {`