fix: align to breaking changes introduced by tslint

mgechev · Apr 23, 2017 · 49b1e80 · 49b1e80
1 parent ace2c48
commit 49b1e80
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 20 deletions.
diff --git a/src/componentClassSuffixRule.ts b/src/componentClassSuffixRule.ts
@@ -39,9 +39,7 @@ export class Rule extends Lint.Rules.AbstractRule {
           .fmap(controller => controller.name)
           .fmap(name => {
             const className = name.text;
-            if (suffixList.length > 0) {
-              suffixList = suffixList.slice(1, suffixList.length);
-            } else {
+            if (suffixList.length === 0) {
               suffixList = ['Component'];
             }
             if (!Rule.validate(className, suffixList)) {

diff --git a/src/directiveClassSuffixRule.ts b/src/directiveClassSuffixRule.ts
@@ -44,7 +44,7 @@ export class ClassMetadataWalker extends NgWalker {
   visitNgDirective(meta: DirectiveMetadata) {
     let name = meta.controller.name;
     let className:string = name.text;
-    const suffix = this.getOptions()[1] || 'Directive';
+    const suffix = this.getOptions()[0] || 'Directive';
     if (!Rule.validate(className, suffix)) {
       this.addFailure(
         this.createFailure(

diff --git a/src/pipeNamingRule.ts b/src/pipeNamingRule.ts
@@ -46,14 +46,17 @@ export class Rule extends Lint.Rules.AbstractRule {
   constructor(options: IOptions) {
     super(options);
 
-    const args = options.ruleArguments;
-    if (args[1] === 'camelCase') {
+    let args = options.ruleArguments;
+    if (!(args instanceof Array)) {
+      args = [args];
+    }
+    if (args[0] === 'camelCase') {
       this.validator = SelectorValidator.camelCase;
     }
-    if (args.length > 2) {
+    if (args.length > 1) {
       this.hasPrefix = true;
-      let prefixExpression: string = (args.slice(2) || []).join('|');
-      this.prefix = (args.slice(2) || []).join(',');
+      let prefixExpression: string = (args.slice(1) || []).join('|');
+      this.prefix = (args.slice(1) || []).join(',');
       this.prefixChecker = SelectorValidator.prefix(prefixExpression, 'camelCase');
     }
   }
@@ -86,7 +89,7 @@ export class ClassMetadataWalker extends NgWalker {
   private validateProperties(className:string, pipe:any) {
     let argument = this.extractArgument(pipe);
     if (argument.kind === SyntaxKind.current().ObjectLiteralExpression) {
-      argument.properties.filter(n=>n.name.text === 'name')
+      argument.properties.filter(n => n.name.text === 'name')
         .forEach(this.validateProperty.bind(this, className));
     }
   }

diff --git a/src/selectorNameBase.ts b/src/selectorNameBase.ts
@@ -18,9 +18,9 @@ export abstract class SelectorRule extends Lint.Rules.AbstractRule {
 
   constructor(options: IOptions) {
     super(options);
-    const args = options.ruleArguments;
+    const args = this.getOptions().ruleArguments;
 
-    let type: SelectorType[] = args[1] || ['element', 'attribute'];
+    let type: SelectorType[] = args[0] || ['element', 'attribute'];
     if (!(type instanceof Array)) {
       type = [type];
     }
@@ -33,13 +33,13 @@ export abstract class SelectorRule extends Lint.Rules.AbstractRule {
     }
     this.types = internal;
 
-    let prefix = args[2] || [];
+    let prefix = args[1] || [];
     if (!(prefix instanceof Array)) {
       prefix = [prefix];
     }
     this.prefixes = prefix;
 
-    let style = args[3];
+    let style = args[2];
     if (!(style instanceof Array)) {
       style = [style];
     }
@@ -120,10 +120,10 @@ export class SelectorValidatorWalker extends Lint.RuleWalker {
         .forEach(i => {
           const selectors: compiler.CssSelector[] = this.extractMainSelector(i);
           if (!this.rule.validateType(selectors)) {
-            let error = sprintf(this.rule.getTypeFailure(), className, this.rule.getOptions().ruleArguments[1]);
+            let error = sprintf(this.rule.getTypeFailure(), className, this.rule.getOptions().ruleArguments[0]);
             this.addFailure(this.createFailure(i.getStart(), i.getWidth(), error));
           } else if (!this.rule.validateStyle(selectors)) {
-            let name = this.rule.getOptions().ruleArguments[3];
+            let name = this.rule.getOptions().ruleArguments[2];
             if (name === 'kebab-case') {
               name += ' and include dash';
             }

diff --git a/test/pipeNamingRule.spec.ts b/test/pipeNamingRule.spec.ts
@@ -62,7 +62,7 @@ describe('pipe-naming', () => {
                 message:  'The name of the Pipe decorator of class Test should be named camelCase,' +
                 ' however its value is "foo-bar".',
                 source,
-                options:  'camelCase'
+                options: 'camelCase'
             });
         });
     });

diff --git a/test/testHelper.ts b/test/testHelper.ts
@@ -34,9 +34,7 @@ function lint(ruleName: string, source: string, options: any): tslint.LintResult
     rulesDirectory: []
   };
   if (!options) {
-    options = true;
-  } else {
-    options = [true].concat(options);
+    options = [];
   }
   const ops: Partial<tslint.IOptions> = { ruleName, ruleArguments: options, disabledIntervals: [] };
   configuration.rules.set(ruleName, ops);