Skip to content
This repository has been archived by the owner on Mar 23, 2024. It is now read-only.

Commit

Permalink
disallowQuotedKeysInObjects: ignore spread properties
Browse files Browse the repository at this point in the history
Fixes #2249
  • Loading branch information
markelog committed May 13, 2016
1 parent 8441d6f commit 2390485
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 15 deletions.
40 changes: 26 additions & 14 deletions lib/rules/disallow-quoted-keys-in-objects.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,26 +69,38 @@ module.exports.prototype = {
file.iterateNodesByType('ObjectExpression', function(node) {
node.properties.forEach(function(prop) {
var key = prop.key;
if (key.type === 'StringLiteral' &&
typeof key.value === 'string' &&
KEY_NAME_RE.test(key.value)
) {
if (exceptReserved && reservedWords.check(key.value, file.getDialect(), true)) {
return;
}

errors.cast({
message: 'Extra quotes for key',
element: prop,
additional: prop
});

// Spread properties
if (!key) {
return;
}

if (key.type !== 'StringLiteral') {
return;
}

if (typeof key.value !== 'string') {
return;
}

if (!KEY_NAME_RE.test(key.value)) {
return;
}

if (exceptReserved && reservedWords.check(key.value, file.getDialect(), true)) {
return;
}

errors.cast({
message: 'Extra quotes for key',
element: prop
});
});
});
},

_fix: function(file, error) {
var node = error.additional;
var node = error.element;
var key = node.key.childElements[0];

var newKey = new cst.Token(key.type, key.getSourceCode().slice(1, -1));
Expand Down
6 changes: 5 additions & 1 deletion test/specs/rules/disallow-quoted-keys-in-objects.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var expect = require('chai').expect;
var Checker = require('../../../lib/checker');
var reportAndFix = require('../../lib/assertHelpers').reportAndFix;

describe('rules/disallow-quoted-keys-in-objects', function() {
describe.only('rules/disallow-quoted-keys-in-objects', function() {
var checker;

var config = { disallowQuotedKeysInObjects: true };
Expand Down Expand Up @@ -68,6 +68,10 @@ describe('rules/disallow-quoted-keys-in-objects', function() {
it('should check all keys in object', function() {
expect(checker.checkString('var x = { "a": 1, b: 2, "3": 3 }')).to.have.error.count.equal(2);
});

it('ignores spread properties', function() {
expect(checker.checkString('({ ...test })')).to.have.no.errors();
});
});

describe('with allExcept: ["reserved"]', function() {
Expand Down

0 comments on commit 2390485

Please sign in to comment.