ObjectExpression Rules: take into account shorthand syntax.

None of the rules were currently aware of `var a = { b };`. This updates any
rule that concerned itself with object keys, values, or the colon between.

Fixes #772
Closes gh-992

Author: mikesherov

lib/rules/disallow-space-after-object-keys.js

@@ -28,10 +28,6 @@ module.exports = function() {};
 module.exports.prototype = {
 
     configure: function(disallow) {
-        assert(
-            typeof disallow === 'boolean',
-            this.getOptionName() + ' option requires boolean value'
-        );
         assert(
             disallow === true,
             this.getOptionName() + ' option requires true value or should be removed'
@@ -43,9 +39,12 @@ module.exports.prototype = {
     },
 
     check: function(file, errors) {
-        var tokens = file.getTokens();
         file.iterateNodesByType('ObjectExpression', function(node) {
             node.properties.forEach(function(property) {
+                if (property.shorthand) {
+                    return;
+                }
+
                 var token = file.getFirstNodeToken(property.key);
                 errors.assert.noWhitespaceBetween({
                     token: token,

lib/rules/disallow-space-before-object-values.js

@@ -41,6 +41,10 @@ module.exports.prototype = {
     check: function(file, errors) {
         file.iterateNodesByType('ObjectExpression', function(node) {
             node.properties.forEach(function(property) {
+                if (property.shorthand) {
+                    return;
+                }
+
                 var keyToken = file.getFirstNodeToken(property.key);
                 var colon = file.findNextToken(keyToken, 'Punctuator', ':');
 

lib/rules/require-aligned-object-values.js

@@ -67,6 +67,10 @@ module.exports.prototype = {
 
             var maxKeyEndPos = 0;
             var skip = node.properties.some(function(property, index) {
+                if (property.shorthand) {
+                    return true;
+                }
+
                 maxKeyEndPos = Math.max(maxKeyEndPos, property.key.loc.end.column);
 
                 if (mode === 'ignoreFunction' && property.value.type === 'FunctionExpression') {

lib/rules/require-quoted-keys-in-objects.js

@@ -32,16 +32,10 @@ module.exports = function() { };
 module.exports.prototype = {
 
     configure: function(requireQuotedKeysInObjects) {
-        assert(
-            typeof requireQuotedKeysInObjects === 'boolean',
-            this.getOptionName() + ' option requires boolean value'
-        );
         assert(
             requireQuotedKeysInObjects === true,
             this.getOptionName() + ' option requires true value or should be removed'
         );
-
-        this._mode = requireQuotedKeysInObjects;
     },
 
     getOptionName: function() {
@@ -51,6 +45,10 @@ module.exports.prototype = {
     check: function(file, errors) {
         file.iterateNodesByType('ObjectExpression', function(node) {
             node.properties.forEach(function(prop) {
+                if (prop.shorthand) {
+                    return;
+                }
+
                 var key = prop.key;
                 if (!(typeof key.value === 'string' && key.type === 'Literal')) {
                     errors.add('Object key without surrounding quotes', prop.loc.start);

lib/rules/require-space-after-object-keys.js

@@ -28,10 +28,6 @@ module.exports = function() {};
 module.exports.prototype = {
 
     configure: function(requireSpaceAfterObjectKeys) {
-        assert(
-            typeof requireSpaceAfterObjectKeys === 'boolean',
-            this.getOptionName() + ' option requires boolean value'
-        );
         assert(
             requireSpaceAfterObjectKeys === true,
             this.getOptionName() + ' option requires true value or should be removed'
@@ -43,9 +39,12 @@ module.exports.prototype = {
     },
 
     check: function(file, errors) {
-        var tokens = file.getTokens();
         file.iterateNodesByType('ObjectExpression', function(node) {
             node.properties.forEach(function(property) {
+                if (property.shorthand) {
+                    return;
+                }
+
                 var token = file.getFirstNodeToken(property.key);
                 errors.assert.whitespaceBetween({
                     token: token,

lib/rules/require-space-before-object-values.js

@@ -39,9 +39,12 @@ module.exports.prototype = {
     },
 
     check: function(file, errors) {
-        var tokens = file.getTokens();
         file.iterateNodesByType('ObjectExpression', function(node) {
             node.properties.forEach(function(property) {
+                if (property.shorthand) {
+                    return;
+                }
+
                 var keyToken = file.getFirstNodeToken(property.key);
                 var colon = file.findNextToken(keyToken, 'Punctuator', ':');
 

test/rules/disallow-space-after-object-keys.js

@@ -28,4 +28,15 @@ describe('rules/disallow-space-after-object-keys', function() {
     it('should not report without space after keys', function() {
         assert(checker.checkString('var x = { a: 1, bcd: 2 };').isEmpty());
     });
+
+    it('should not report shorthand object properties', function() {
+        checker.configure({ esnext: true });
+        assert(checker.checkString('var x = { a, b };').isEmpty());
+        assert(checker.checkString('var x = {a, b};').isEmpty());
+    });
+
+    it('should report mixed shorthand and normal object propertis', function() {
+        checker.configure({ esnext: true });
+        assert.equal(checker.checkString('var x = { a : 1, b };').getErrorCount(), 1);
+    });
 });

test/rules/disallow-space-before-object-values.js

@@ -41,4 +41,14 @@ describe('rules/disallow-space-before-object-values', function() {
         assert(checker.checkString('var x = { a:1, bcd :2 };').isEmpty());
     });
 
+    it('should not report shorthand object properties', function() {
+        checker.configure({ esnext: true });
+        assert(checker.checkString('var x = { a, b };').isEmpty());
+        assert(checker.checkString('var x = {a, b};').isEmpty());
+    });
+
+    it('should report mixed shorthand and normal object propertis', function() {
+        checker.configure({ esnext: true });
+        assert.equal(checker.checkString('var x = { a : 1, b };').getErrorCount(), 1);
+    });
 });

test/rules/require-aligned-object-values.js

@@ -33,6 +33,19 @@ describe('rules/require-aligned-object-values', function() {
             );
         });
 
+        it('should not report shorthand properties', function() {
+            checker.configure({ esnext: true });
+            assert(
+                checker.checkString(
+                    'var x = {\n' +
+                        'bcd : 2,\n' +
+                        'a,\n' +
+                        'efg : 2\n' +
+                    '};'
+                ).isEmpty()
+            );
+        });
+
         it('should report invalid alignment', function() {
             assert(
                 checker.checkString(

test/rules/require-quoted-keys-in-objects.js

@@ -3,6 +3,7 @@ var assert = require('assert');
 
 describe('rules/require-quoted-keys-in-objects', function() {
     var checker;
+
     beforeEach(function() {
         checker = new Checker();
         checker.registerDefaultRules();
@@ -61,4 +62,9 @@ describe('rules/require-quoted-keys-in-objects', function() {
         assert(error.line === 1);
         assert(error.column === 10);
     });
+
+    it('should not report shorthand object properties', function() {
+        checker.configure({ esnext: true });
+        assert(checker.checkString('var x = { a, b };').isEmpty());
+    });
 });