lint: fix object key spacing

dougwilson · dougwilson · commit 54615730c60b · 2017-01-19T21:16:15.000-05:00
diff --git a/.eslintrc b/.eslintrc
@@ -7,6 +7,7 @@
     "consistent-return": 2,
     "eqeqeq": [2, "allow-null"],
     "indent": [2, 2, { "VariableDeclarator": 2, "SwitchCase": 1 }],
+    "key-spacing": [2, { "align": { "beforeColon": true, "afterColon": true, "on": "colon" } }],
     "new-parens": 2,
     "no-cond-assign": 2,
     "no-constant-condition": 2,
diff --git a/lib/protocol/Auth.js b/lib/protocol/Auth.js
@@ -71,10 +71,10 @@ Auth.hashPassword = function(password) {
 
 Auth.randomInit = function(seed1, seed2) {
   return {
-    max_value: 0x3FFFFFFF,
-    max_value_dbl: 0x3FFFFFFF,
-    seed1: seed1 % 0x3FFFFFFF,
-    seed2: seed2 % 0x3FFFFFFF
+    max_value     : 0x3FFFFFFF,
+    max_value_dbl : 0x3FFFFFFF,
+    seed1         : seed1 % 0x3FFFFFFF,
+    seed2         : seed2 % 0x3FFFFFFF
   };
 };
 
diff --git a/lib/protocol/packets/RowDataPacket.js b/lib/protocol/packets/RowDataPacket.js
@@ -8,15 +8,15 @@ function RowDataPacket() {
 }
 
 Object.defineProperty(RowDataPacket.prototype, 'parse', {
-  configurable: true,
-  enumerable: false,
-  value: parse
+  configurable : true,
+  enumerable   : false,
+  value        : parse
 });
 
 Object.defineProperty(RowDataPacket.prototype, '_typeCast', {
-  configurable: true,
-  enumerable: false,
-  value: typeCast
+  configurable : true,
+  enumerable   : false,
+  value        : typeCast
 });
 
 function parse(parser, fieldPackets, typeCast, nestTables, connection) {
diff --git a/lib/protocol/sequences/Handshake.js b/lib/protocol/sequences/Handshake.js
@@ -72,11 +72,11 @@ Handshake.prototype._sendCredentials = function() {
     maxPacketSize : this._config.maxPacketSize,
     charsetNumber : this._config.charsetNumber,
     user          : this._config.user,
+    database      : this._config.database,
+    protocol41    : packet.protocol41,
     scrambleBuff  : (packet.protocol41)
                      ? Auth.token(this._config.password, packet.scrambleBuff())
-                     : Auth.scramble323(packet.scrambleBuff(), this._config.password),
-    database      : this._config.database,
-    protocol41    : packet.protocol41
+                     : Auth.scramble323(packet.scrambleBuff(), this._config.password)
   }));
 };
 
@@ -95,7 +95,7 @@ Handshake.prototype['UseOldPasswordPacket'] = function() {
   }
 
   this.emit('packet', new Packets.OldPasswordPacket({
-    scrambleBuff : Auth.scramble323(this._handshakeInitializationPacket.scrambleBuff(), this._config.password)
+    scrambleBuff: Auth.scramble323(this._handshakeInitializationPacket.scrambleBuff(), this._config.password)
   }));
 };
 
diff --git a/lib/protocol/sequences/Query.js b/lib/protocol/sequences/Query.js
@@ -150,9 +150,9 @@ Query.prototype['RowDataPacket'] = function(packet, parser, connection) {
 Query.prototype._sendLocalDataFile = function(path) {
   var self = this;
   var localStream = fs.createReadStream(path, {
-    'flag': 'r',
-    'encoding': null,
-    'autoClose': true
+    flag      : 'r',
+    encoding  : null,
+    autoClose : true
   });
 
   this.on('pause', function () {
diff --git a/test/FakeServer.js b/test/FakeServer.js
@@ -85,8 +85,8 @@ FakeConnection.prototype.handshake = function(options) {
 
 FakeConnection.prototype.deny = function(message, errno) {
   this._sendPacket(new Packets.ErrorPacket({
-    message: message,
-    errno: errno
+    message : message,
+    errno   : errno
   }));
 };
 
@@ -97,8 +97,8 @@ FakeConnection.prototype._sendAuthResponse = function(packet, expected) {
     this._sendPacket(new Packets.OkPacket());
   } else {
     this._sendPacket(new Packets.ErrorPacket({
-      message: 'expected ' + expected.toString('hex') + ' got ' + got.toString('hex'),
-      errno: Errors.ER_ACCESS_DENIED_ERROR
+      message : 'expected ' + expected.toString('hex') + ' got ' + got.toString('hex'),
+      errno   : Errors.ER_ACCESS_DENIED_ERROR
     }));
   }
 
@@ -317,14 +317,14 @@ FakeConnection.prototype._parsePacket = function(header) {
       }
 
       this._clientAuthenticationPacket = new Packets.ClientAuthenticationPacket({
-        clientFlags  : this._clientAuthenticationPacket.clientFlags,
-        filler       : this._clientAuthenticationPacket.filler,
-        maxPacketSize: this._clientAuthenticationPacket.maxPacketSize,
-        protocol41   : this._clientAuthenticationPacket.protocol41,
-        charsetNumber: packet.charsetNumber,
-        database     : packet.database,
-        scrambleBuff : packet.scrambleBuff,
-        user         : packet.user
+        clientFlags   : this._clientAuthenticationPacket.clientFlags,
+        filler        : this._clientAuthenticationPacket.filler,
+        maxPacketSize : this._clientAuthenticationPacket.maxPacketSize,
+        protocol41    : this._clientAuthenticationPacket.protocol41,
+        charsetNumber : packet.charsetNumber,
+        database      : packet.database,
+        scrambleBuff  : packet.scrambleBuff,
+        user          : packet.user
       });
       this._sendPacket(new Packets.OkPacket());
       this._parser.resetPacketNumber();
diff --git a/test/integration/connection/test-timezones.js b/test/integration/connection/test-timezones.js
@@ -101,9 +101,9 @@ function testNextDate(connection) {
   connection.query('INSERT INTO ?? SET ?', [table, {day: day, timezone: timezone, dt: dt, pre_idx: pre_idx}], assert.ifError);
 
   var options = {
-    sql: 'SELECT * FROM ?? WHERE timezone = ? AND day = ? AND pre_idx = ?',
-    values: [table, timezone, day, pre_idx],
-    typeCast: function (field, next) {
+    sql      : 'SELECT * FROM ?? WHERE timezone = ? AND day = ? AND pre_idx = ?',
+    values   : [table, timezone, day, pre_idx],
+    typeCast : function (field, next) {
       if (field.type !== 'DATETIME') {
         return next();
       }
diff --git a/test/integration/connection/test-transaction-commit.js b/test/integration/connection/test-transaction-commit.js
@@ -20,8 +20,8 @@ common.getTestConnection(function (err, connection) {
     assert.ifError(err);
 
     var row = {
-      id: 1,
-      title: 'Test row'
+      id    : 1,
+      title : 'Test row'
     };
 
     connection.query('INSERT INTO ?? SET ?', [table, row], function (err) {
diff --git a/test/integration/connection/test-transaction-rollback.js b/test/integration/connection/test-transaction-rollback.js
@@ -20,8 +20,8 @@ common.getTestConnection(function (err, connection) {
     assert.ifError(err);
 
     var row = {
-      id: 1,
-      title: 'Test row'
+      id    : 1,
+      title : 'Test row'
     };
 
     connection.query('INSERT INTO ?? SET ?', [table, row], function (err) {
diff --git a/test/integration/connection/test-type-casting.js b/test/integration/connection/test-type-casting.js
@@ -37,23 +37,16 @@ var tests = [
   {type: 'mediumtext', insert: 'Hello World'},
   {type: 'longtext', insert: 'Hello World'},
   {type: 'text', insert: 'Hello World'},
-  {type: 'point', insertRaw: 'POINT(1.2,-3.4)', expect: {x:1.2, y:-3.4}, deep: true},
-  {type: 'point', insertRaw: (function() {
-    var buffer = new Buffer(21);
-    buffer.writeUInt8(1, 0);
-    buffer.writeUInt32LE(1, 1);
-    buffer.writeDoubleLE(-5.6, 5);
-    buffer.writeDoubleLE(10.23, 13);
-    return 'GeomFromWKB(X\'' + buffer.toString('hex') + '\')';
-  })(), expect: {x:-5.6, y:10.23}, deep: true},
+  {type: 'point', insertRaw: 'POINT(1.2,-3.4)', expect: {x: 1.2, y: -3.4}, deep: true},
+  {type: 'point', insertRaw: 'GeomFromWKB(X\'010100000066666666666616c0f6285c8fc2752440\')', expect: {x: -5.6, y: 10.23}, deep: true},
   {type: 'point', insertRaw: '', insert: null, expect: null},
-  {type: 'linestring', insertRaw: 'LINESTRING(POINT(1.2,-3.4),POINT(-5.6,10.23),POINT(0.2,0.7))', expect: [{x:1.2, y:-3.4}, {x:-5.6, y:10.23}, {x:0.2, y:0.7}], deep: true},
-  {type: 'polygon', insertRaw: "GeomFromText('POLYGON((0 0,10 0,10 10,0 10,0 0),(5 5,7 5,7 7,5 7, 5 5))')", expect: [[{x:0,y:0},{x:10,y:0},{x:10,y:10},{x:0,y:10},{x:0,y:0}],[{x:5,y:5},{x:7,y:5},{x:7,y:7},{x:5,y:7},{x:5,y:5}]], deep: true},
-  {type: 'geometry', insertRaw: 'POINT(1.2,-3.4)', expect: {x:1.2, y:-3.4}, deep: true},
-  {type: 'multipoint', insertRaw: "GeomFromText('MULTIPOINT(0 0, 20 20, 60 60)')", expect: [{x:0, y:0}, {x:20, y:20}, {x:60, y:60}], deep: true},
-  {type: 'multilinestring', insertRaw: "GeomFromText('MULTILINESTRING((10 10, 20 20), (15 15, 30 15))')", expect: [[{x:10,y:10},{x:20,y:20}],[{x:15,y:15},{x:30,y:15}]], deep: true},
-  {type: 'multipolygon', insertRaw: "GeomFromText('MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0)),((5 5,7 5,7 7,5 7, 5 5)))')", expect: [[[{x:0,y:0},{x:10,y:0},{x:10,y:10},{x:0,y:10},{x:0,y:0}]],[[{x:5,y:5},{x:7,y:5},{x:7,y:7},{x:5,y:7},{x:5,y:5}]]], deep: true},
-  {type: 'geometrycollection', insertRaw: "GeomFromText('GEOMETRYCOLLECTION(POINT(10 10), POINT(30 30), LINESTRING(15 15, 20 20))')", expect: [{x:10,y:10},{x:30,y:30},[{x:15,y:15},{x:20,y:20}]], deep: true}
+  {type: 'linestring', insertRaw: 'LINESTRING(POINT(1.2,-3.4),POINT(-5.6,10.23),POINT(0.2,0.7))', expect: [{x: 1.2, y: -3.4}, {x: -5.6, y: 10.23}, {x: 0.2, y: 0.7}], deep: true},
+  {type: 'polygon', insertRaw: "GeomFromText('POLYGON((0 0,10 0,10 10,0 10,0 0),(5 5,7 5,7 7,5 7, 5 5))')", expect: [[{x: 0,y: 0}, {x: 10, y: 0}, {x: 10, y: 10}, {x: 0, y: 10}, {x: 0, y: 0}], [{x: 5, y: 5}, {x: 7, y: 5}, {x: 7, y: 7}, {x: 5, y: 7}, {x: 5, y: 5}]], deep: true},
+  {type: 'geometry', insertRaw: 'POINT(1.2,-3.4)', expect: {x: 1.2, y: -3.4}, deep: true},
+  {type: 'multipoint', insertRaw: "GeomFromText('MULTIPOINT(0 0, 20 20, 60 60)')", expect: [{x: 0, y: 0}, {x: 20, y: 20}, {x: 60, y: 60}], deep: true},
+  {type: 'multilinestring', insertRaw: "GeomFromText('MULTILINESTRING((10 10, 20 20), (15 15, 30 15))')", expect: [[{x: 10, y: 10}, {x: 20, y: 20}], [{x: 15, y: 15}, {x: 30, y: 15}]], deep: true},
+  {type: 'multipolygon', insertRaw: "GeomFromText('MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0)),((5 5,7 5,7 7,5 7, 5 5)))')", expect: [[[{x: 0,y: 0}, {x: 10, y: 0}, {x: 10, y: 10}, {x: 0, y: 10}, {x: 0, y: 0}]], [[{x: 5, y: 5}, {x: 7, y: 5}, {x: 7, y: 7}, {x: 5, y: 7}, {x: 5, y: 5}]]], deep: true},
+  {type: 'geometrycollection', insertRaw: "GeomFromText('GEOMETRYCOLLECTION(POINT(10 10), POINT(30 30), LINESTRING(15 15, 20 20))')", expect: [{x: 10, y: 10}, {x: 30, y: 30}, [{x: 15, y: 15}, {x: 20,y: 20}]], deep: true}
 ];
 
 var table = 'type_casting';
diff --git a/test/integration/connection/test-zerofill-results.js b/test/integration/connection/test-zerofill-results.js
@@ -20,8 +20,8 @@ common.getTestConnection(function (err, connection) {
 
   for (var i = 0; i < test_numbers.length; i++) {
     connection.query('INSERT INTO ?? SET ?', [table, {
-      id: (i + 1),
-      num: (test_numbers[i] !== null ? parseInt(test_numbers[i], 10) : null)
+      id  : (i + 1),
+      num : (test_numbers[i] !== null ? parseInt(test_numbers[i], 10) : null)
     }], assert.ifError);
   }
 
diff --git a/test/unit/connection/test-change-user.js b/test/unit/connection/test-change-user.js
@@ -1,8 +1,8 @@
 var assert     = require('assert');
 var common     = require('../../common');
 var connection = common.createConnection({
-  port: common.fakeServerPort,
-  user: 'user_1'
+  port : common.fakeServerPort,
+  user : 'user_1'
 });
 
 var server = common.createFakeServer();
diff --git a/test/unit/connection/test-connection-ssl.js b/test/unit/connection/test-connection-ssl.js
@@ -3,7 +3,7 @@ var common     = require('../../common');
 var connection = common.createConnection({
   port : common.fakeServerPort,
   ssl  : {
-    ca : common.getSSLConfig().ca
+    ca: common.getSSLConfig().ca
   }
 });
 
diff --git a/test/unit/connection/test-connection-thread-id.js b/test/unit/connection/test-connection-thread-id.js
@@ -22,6 +22,6 @@ server.listen(common.fakeServerPort, function(err) {
 
 server.on('connection', function(incomingConnection) {
   incomingConnection.handshake({
-    threadId : 42
+    threadId: 42
   });
 });
diff --git a/test/unit/connection/test-date-type-cast.js b/test/unit/connection/test-date-type-cast.js
@@ -29,7 +29,7 @@ server.listen(common.fakeServerPort, function (err) {
   var conn2 = common.createConnection({
     dateStrings : true,
     port        : common.fakeServerPort,
-    timezone : 'Z'
+    timezone    : 'Z'
   });
   conn2.query('SELECT value FROM date_rows', function (err, rows) {
     assert.ifError(err);
diff --git a/test/unit/connection/test-datetime-type-cast.js b/test/unit/connection/test-datetime-type-cast.js
@@ -74,8 +74,8 @@ server.listen(common.fakeServerPort, function (err) {
 
   var conn4 = common.createConnection({
     dateStrings : ['DATETIME', 'TIMESTAMP'],
-    port     : common.fakeServerPort,
-    timezone : 'Z'
+    port        : common.fakeServerPort,
+    timezone    : 'Z'
   });
   conn4.query('SELECT value FROM datetime_rows', function (err, rows) {
     assert.ifError(err);
diff --git a/test/unit/pool/test-change-user-config.js b/test/unit/pool/test-change-user-config.js
@@ -1,8 +1,8 @@
 var assert = require('assert');
 var common = require('../../common');
 var pool   = common.createPool({
-  user: 'user_1',
-  port: common.fakeServerPort
+  user : 'user_1',
+  port : common.fakeServerPort
 });
 
 var server = common.createFakeServer();
