fix(finnish): Guard against spread properties.

cartant · Jan 30, 2018 · 6c6695b · 6c6695b
1 parent d348f88
commit 6c6695b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/fixtures/finnish-with-$/fixture.ts b/fixtures/finnish-with-$/fixture.ts
@@ -4,8 +4,8 @@ import "rxjs/add/observable/of";
 const someObservable$ = Observable.of(0);
 
 const someEmptyObject = {};
-const someObject = { someKey$: someObservable$ };
-const { ...someEmptyObject, someKey$ } = someObject;
+const someObject = { ...someEmptyObject, someKey$: someObservable$ };
+const { someKey$ } = someObject;
 const { someKey$: someRenamedKey$ } = someObject;
 
 const someArray = [someObservable$];

diff --git a/fixtures/finnish-without-$/fixture.ts b/fixtures/finnish-without-$/fixture.ts
@@ -4,8 +4,8 @@ import "rxjs/add/observable/of";
 const someObservable = Observable.of(0);
 
 const someEmptyObject = {};
-const someObject = { someKey: someObservable };
-const { ...someEmptyObject, someKey } = someObject;
+const someObject = { ...someEmptyObject, someKey: someObservable };
+const { someKey } = someObject;
 const { someKey: someRenamedKey } = someObject;
 
 const someArray = [someObservable];

diff --git a/fixtures/no-finnish-with-$/fixture.ts b/fixtures/no-finnish-with-$/fixture.ts
@@ -4,8 +4,8 @@ import "rxjs/add/observable/of";
 const someObservable$ = Observable.of(0);
 
 const someEmptyObject = {};
-const someObject = { someKey$: someObservable$ };
-const { ...someEmptyObject, someKey$ } = someObject;
+const someObject = { ...someEmptyObject, someKey$: someObservable$ };
+const { someKey$ } = someObject;
 const { someKey$: someRenamedKey$ } = someObject;
 
 const someArray = [someObservable$];

diff --git a/fixtures/no-finnish-without-$/fixture.ts b/fixtures/no-finnish-without-$/fixture.ts
@@ -4,8 +4,8 @@ import "rxjs/add/observable/of";
 const someObservable = Observable.of(0);
 
 const someEmptyObject = {};
-const someObject = { someKey: someObservable };
-const { ...someEmptyObject, someKey } = someObject;
+const someObject = { ...someEmptyObject, someKey: someObservable };
+const { someKey } = someObject;
 const { someKey: someRenamedKey } = someObject;
 
 const someArray = [someObservable];

diff --git a/source/rules/rxjsFinnishRule.ts b/source/rules/rxjsFinnishRule.ts
@@ -62,7 +62,7 @@ class Walker extends Lint.ProgramAwareRuleWalker {
     protected visitObjectLiteralExpression(node: ts.ObjectLiteralExpression): void {
 
         node.properties.forEach(property => {
-            if (property.name.kind !== ts.SyntaxKind.ComputedPropertyName) {
+            if (property.name && (property.name.kind !== ts.SyntaxKind.ComputedPropertyName)) {
                 this.validateNode(property);
             }
         });

diff --git a/source/rules/rxjsNoFinnishRule.ts b/source/rules/rxjsNoFinnishRule.ts
@@ -64,7 +64,7 @@ class Walker extends Lint.ProgramAwareRuleWalker {
     protected visitObjectLiteralExpression(node: ts.ObjectLiteralExpression): void {
 
         node.properties.forEach(property => {
-            if (property.name.kind !== ts.SyntaxKind.ComputedPropertyName) {
+            if (property.name && (property.name.kind !== ts.SyntaxKind.ComputedPropertyName)) {
                 this.validateNode(property);
             }
         });