Consider rest operator in object literal in `object-literal-key-quote…

…s` rule (fix #1916) (#1917)
palantir · Dec 24, 2016 · 16e8d02 · 16e8d02
1 parent be73295
commit 16e8d02
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/rules/objectLiteralKeyQuotesRule.ts b/src/rules/objectLiteralKeyQuotesRule.ts
@@ -101,7 +101,7 @@ class ObjectLiteralKeyQuotesWalker extends Lint.RuleWalker {
                 }
                 break;
             case "consistent-as-needed":
-                if (properties.some(({ name }) => name.kind === ts.SyntaxKind.StringLiteral && propertyNeedsQuotes(name.text))) {
+                if (properties.some(({ name }) => name !== undefined && name.kind === ts.SyntaxKind.StringLiteral && propertyNeedsQuotes(name.text))) {
                     this.allMustHaveQuotes(properties);
                 } else {
                     this.noneMayHaveQuotes(properties, true);
@@ -116,15 +116,15 @@ class ObjectLiteralKeyQuotesWalker extends Lint.RuleWalker {
 
     private allMustHaveQuotes(properties: ts.ObjectLiteralElementLike[]) {
         for (const { name } of properties) {
-            if (name.kind !== ts.SyntaxKind.StringLiteral && name.kind !== ts.SyntaxKind.ComputedPropertyName) {
+            if (name !== undefined && name.kind !== ts.SyntaxKind.StringLiteral && name.kind !== ts.SyntaxKind.ComputedPropertyName) {
                 this.addFailureAtNode(name, Rule.UNQUOTED_PROPERTY(name.getText()));
             }
         }
     }
 
     private noneMayHaveQuotes(properties: ts.ObjectLiteralElementLike[], noneNeedQuotes?: boolean) {
         for (const { name } of properties) {
-            if (name.kind === ts.SyntaxKind.StringLiteral && (noneNeedQuotes || !propertyNeedsQuotes(name.text))) {
+            if (name !== undefined && name.kind === ts.SyntaxKind.StringLiteral && (noneNeedQuotes || !propertyNeedsQuotes(name.text))) {
                 this.addFailureAtNode(name, Rule.UNNEEDED_QUOTES(name.text));
             }
         }

diff --git a/test/rules/object-literal-key-quotes/as-needed/test.ts.lint b/test/rules/object-literal-key-quotes/as-needed/test.ts.lint
@@ -20,4 +20,5 @@ const o = {
   "true": 0, // failure
   ~~~~~~  [Unnecessarily quoted property 'true' found.]
   '': 'always quote the empty string',
+  ...{},
 };
diff --git a/test/rules/object-literal-key-quotes/consistent-as-needed/test.ts.lint b/test/rules/object-literal-key-quotes/consistent-as-needed/test.ts.lint
@@ -47,4 +47,7 @@ const u = {
     "egg": 2,
     ~~~~~     [Unnecessarily quoted property 'egg' found.]
   }
-};
+};
+const v = {
+    ...o,
+};