Merge pull request #5 from mgechev/input-output-directive

Input output directive

Author: mgechev

src/inputPropertyDirectiveRule.ts

@@ -6,8 +6,9 @@ import {decoratorValidator} from './util/decoratorValidator';
 const FAILURE_STRING = 'In the class "%s", the directive input property "%s" should not be renamed.' +
     'Please, consider the following use "@Input() %s: string"';
 
-const renameInputCondition = (name, arg)=> {
-    return (name === 'Input' && arg);
+const renameInputCondition = (name, arg, element)=> {
+    let memberName = element.name.text;
+    return (name === 'Input' && arg && memberName != arg.text);
 };
 
 export class Rule extends ClassParameterRule {

src/outputPropertyDirectiveRule.ts

@@ -6,8 +6,9 @@ import {decoratorValidator} from './util/decoratorValidator';
 const FAILURE_STRING = 'In the class "%s", the directive output property "%s" should not be renamed.' +
     'Please, consider the following use "@Output() %s = new EventEmitter();"';
 
-const renameOutputCondition = (name, arg)=> {
-    return (name === 'Output' && arg);
+const renameOutputCondition = (name, arg, element)=> {
+    let memberName = element.name.text;
+    return (name === 'Output' && arg && memberName !== arg.text);
 };
 
 export class Rule extends ClassParameterRule {

src/util/decoratorValidator.ts

@@ -8,7 +8,7 @@ export const decoratorValidator = (condition)=> {
                 let name = expr.text;
                 let args = baseExpr.arguments || [];
                 let arg = args[0];
-                if (condition(name, arg)) {
+                if (condition(name, arg,element)) {
                     isValid = false;
                 }
             })

test/inputPropertyDirectiveRule.spec.ts

@@ -30,4 +30,13 @@ describe('input-property-directive', () => {
             assertSuccess('input-property-directive', source);
         });
     });
+    describe('valid directive input property', () => {
+        it('should succeed, when a directive input property rename is the same as the name of the property', () => {
+            let source = `
+            class ButtonComponent {
+              @Input('label') label: string;
+            }`;
+            assertSuccess('input-property-directive', source);
+        });
+    });
 });

test/outputPropertyDirectiveRule.spec.ts

@@ -21,7 +21,7 @@ describe('output-property-directive', () => {
             });
         });
     });
-    describe('valid directive input property', () => {
+    describe('valid directive output property', () => {
         it('should succeed, when a directive output property is properly used', () => {
             let source = `
             class ButtonComponent {
@@ -30,4 +30,13 @@ describe('output-property-directive', () => {
             assertSuccess('output-property-directive', source);
         });
     });
+    describe('valid directive output property', () => {
+        it('should succeed, when a directive output property rename is the same as the property name', () => {
+            let source = `
+            class ButtonComponent {
+               @Output('change') change = new EventEmitter<any>();
+            }`;
+            assertSuccess('output-property-directive', source);
+        });
+    });
 });