Merge pull request #455 from Gillespie59/development

EmmanuelDemey · web-flow · commit 76c3c2357a48 · 2017-03-18T16:14:49.000+01:00
1.6.3
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
@@ -1,6 +1,9 @@
 env:
   node: true
 
+parserOptions:
+  ecmaVersion: 6
+
 rules:
   # http://eslint.org/docs/rules/#possible-errors
   comma-dangle:
diff --git a/docs/timeout-service.md b/docs/timeout-service.md
@@ -26,11 +26,11 @@ The following patterns are considered problems;
     window.setTimeout(function() {
         // ...
     }, 1000) // error: You should use the $timeout service instead of the default window.setTimeout method
-    
-    // invalid 
+
+    // invalid
     $window.setTimeout(function() {
         // ...
-    }, 1000) // error: You should use the $timeout service instead of the default window.setTimeout method    
+    }, 1000) // error: You should use the $timeout service instead of the default window.setTimeout method
 
 The following patterns are **not** considered problems;
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-angular",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "ESLint rules for AngularJS projects",
   "main": "index.js",
   "scripts": {
@@ -24,7 +24,7 @@
     "chai": "^3.5.0",
     "chai-spies": "^0.7.1",
     "coveralls": "^2.11.6",
-    "eslint": "^3.0.0",
+    "eslint": "^3.18.0",
     "espree": "^3.0.1",
     "gulp": "^3.9.1",
     "gulp-eslint": "^3.0.1",
diff --git a/rules/component-limit.js b/rules/component-limit.js
@@ -41,16 +41,16 @@ module.exports = {
         }
 
         return {
-            'angular:animation': checkLimit,
-            'angular:config': checkLimit,
-            'angular:controller': checkLimit,
-            'angular:directive': checkLimit,
-            'angular:factory': checkLimit,
-            'angular:filter': checkLimit,
-            'angular:provider': checkLimit,
-            'angular:run': checkLimit,
-            'angular:service': checkLimit,
-            'angular:component': checkLimit
+            'angular?animation': checkLimit,
+            'angular?config': checkLimit,
+            'angular?controller': checkLimit,
+            'angular?directive': checkLimit,
+            'angular?factory': checkLimit,
+            'angular?filter': checkLimit,
+            'angular?provider': checkLimit,
+            'angular?run': checkLimit,
+            'angular?service': checkLimit,
+            'angular?component': checkLimit
         };
     })
 };
diff --git a/rules/di-order.js b/rules/di-order.js
@@ -47,16 +47,16 @@ module.exports = {
         }
 
         return {
-            'angular:animation': checkOrder,
-            'angular:config': checkOrder,
-            'angular:controller': checkOrder,
-            'angular:directive': checkOrder,
-            'angular:factory': checkOrder,
-            'angular:filter': checkOrder,
-            'angular:inject': checkOrder,
-            'angular:run': checkOrder,
-            'angular:service': checkOrder,
-            'angular:provider': function(callee, providerFn, $get) {
+            'angular?animation': checkOrder,
+            'angular?config': checkOrder,
+            'angular?controller': checkOrder,
+            'angular?directive': checkOrder,
+            'angular?factory': checkOrder,
+            'angular?filter': checkOrder,
+            'angular?inject': checkOrder,
+            'angular?run': checkOrder,
+            'angular?service': checkOrder,
+            'angular?provider': function(callee, providerFn, $get) {
                 checkOrder(null, providerFn);
                 checkOrder(null, $get);
             }
diff --git a/rules/di-unused.js b/rules/di-unused.js
@@ -54,16 +54,16 @@ module.exports = {
         }
 
         return {
-            'angular:animation': reportUnusedVariables,
-            'angular:config': reportUnusedVariables,
-            'angular:controller': reportUnusedVariables,
-            'angular:directive': reportUnusedVariables,
-            'angular:factory': reportUnusedVariables,
-            'angular:filter': reportUnusedVariables,
-            'angular:inject': reportUnusedVariables,
-            'angular:run': reportUnusedVariables,
-            'angular:service': reportUnusedVariables,
-            'angular:provider': function(callee, providerFn, $get) {
+            'angular?animation': reportUnusedVariables,
+            'angular?config': reportUnusedVariables,
+            'angular?controller': reportUnusedVariables,
+            'angular?directive': reportUnusedVariables,
+            'angular?factory': reportUnusedVariables,
+            'angular?filter': reportUnusedVariables,
+            'angular?inject': reportUnusedVariables,
+            'angular?run': reportUnusedVariables,
+            'angular?service': reportUnusedVariables,
+            'angular?provider': function(callee, providerFn, $get) {
                 reportUnusedVariables(null, providerFn);
                 reportUnusedVariables(null, $get);
             },
diff --git a/rules/di.js b/rules/di.js
@@ -117,16 +117,16 @@ module.exports = {
         }
 
         return {
-            'angular:animation': checkDi,
-            'angular:config': checkDi,
-            'angular:controller': checkDi,
-            'angular:directive': checkDi,
-            'angular:factory': checkDi,
-            'angular:filter': checkDi,
-            'angular:inject': checkDi,
-            'angular:run': checkDi,
-            'angular:service': checkDi,
-            'angular:provider': function(callee, providerFn, $get) {
+            'angular?animation': checkDi,
+            'angular?config': checkDi,
+            'angular?controller': checkDi,
+            'angular?directive': checkDi,
+            'angular?factory': checkDi,
+            'angular?filter': checkDi,
+            'angular?inject': checkDi,
+            'angular?run': checkDi,
+            'angular?service': checkDi,
+            'angular?provider': function(callee, providerFn, $get) {
                 checkDi(null, providerFn);
                 checkDi(null, $get);
             },
diff --git a/rules/dumb-inject.js b/rules/dumb-inject.js
@@ -25,7 +25,7 @@ module.exports = {
         }
 
         return {
-            'angular:inject': function(callExpression, fn) {
+            'angular?inject': function(callExpression, fn) {
                 if (!fn) {
                     return;
                 }
diff --git a/rules/file-name.js b/rules/file-name.js
@@ -125,6 +125,9 @@ module.exports = {
                             return;
                         }
 
+                        if (!name) {
+                            return;
+                        }
                         expectedName = filenameUtil.createExpectedName(name, type, options);
 
                         if (expectedName !== filename) {
diff --git a/rules/no-directive-replace.js b/rules/no-directive-replace.js
@@ -44,7 +44,7 @@ module.exports = {
         }
 
         return {
-            'angular:directive': function(callExpressionNode, fnNode) {
+            'angular?directive': function(callExpressionNode, fnNode) {
                 if (!fnNode || !fnNode.body) {
                     return;
                 }
diff --git a/rules/no-run-logic.js b/rules/no-run-logic.js
@@ -33,7 +33,7 @@ module.exports = {
         }
 
         return {
-            'angular:run': function(callExpression, fn) {
+            'angular?run': function(callExpression, fn) {
                 if (!fn) {
                     return;
                 }
diff --git a/rules/prefer-component.js b/rules/prefer-component.js
@@ -31,7 +31,7 @@ module.exports = {
         }
 
         return {
-            'angular:directive': function(callExpressionNode, fnNode) {
+            'angular?directive': function(callExpressionNode, fnNode) {
                 if (!fnNode || !fnNode.body) {
                     return;
                 }
diff --git a/rules/utils/angular-rule.js b/rules/utils/angular-rule.js
@@ -29,17 +29,17 @@ var angularChainableNames = [
  * ```js
  * module.exports = angularRule(function(context) {
  *   return {
- *     'angular:animation': function(configCallee, configFn) {},
- *     'angular:component': function(componentCallee, componentObj) {},
- *     'angular:config': function(configCallee, configFn) {},
- *     'angular:controller': function(controllerCallee, controllerFn) {},
- *     'angular:directive': function(directiveCallee, directiveFn) {},
- *     'angular:factory': function(factoryCallee, factoryFn) {},
- *     'angular:filter': function(filterCallee, filterFn) {},
- *     'angular:inject': function(injectCallee, injectFn) {},  // inject() calls from angular-mocks
- *     'angular:run': function(runCallee, runFn) {},
- *     'angular:service': function(serviceCallee, serviceFn) {},
- *     'angular:provider': function(providerCallee, providerFn, provider$getFn) {}
+ *     'angular?animation': function(configCallee, configFn) {},
+ *     'angular?component': function(componentCallee, componentObj) {},
+ *     'angular?config': function(configCallee, configFn) {},
+ *     'angular?controller': function(controllerCallee, controllerFn) {},
+ *     'angular?directive': function(directiveCallee, directiveFn) {},
+ *     'angular?factory': function(factoryCallee, factoryFn) {},
+ *     'angular?filter': function(filterCallee, filterFn) {},
+ *     'angular?inject': function(injectCallee, injectFn) {},  // inject() calls from angular-mocks
+ *     'angular?run': function(runCallee, runFn) {},
+ *     'angular?service': function(serviceCallee, serviceFn) {},
+ *     'angular?provider': function(providerCallee, providerFn, provider$getFn) {}
  *   };
  * })
  * ```
@@ -227,13 +227,13 @@ function angularRule(ruleDefinition) {
     function callAngularRules(ruleObject, context) {
         angularComponents.forEach(function(component) {
             var name = component.callExpression.callee.property.name;
-            var fn = ruleObject['angular:' + name];
+            var fn = ruleObject['angular?' + name];
             if (!fn) {
                 return;
             }
             fn.apply(ruleObject, assembleArguments(component, context));
         });
-        var injectRule = ruleObject['angular:inject'];
+        var injectRule = ruleObject['angular?inject'];
         if (injectRule) {
             injectCalls.forEach(function(node) {
                 injectRule.call(ruleObject, node.CallExpression, node.fn);
diff --git a/rules/utils/false-values.js b/rules/utils/false-values.js
@@ -1,5 +1,6 @@
 'use strict';
 
 module.exports = {
-    config: ['jwtOptionsProvider', 'ngTableHelperProvider', '$ocLazyLoadProvider', '$route', '$localForageProvider']
+    config: [/Provider$/, /$route/],
+    run: [/mocha/, /Service$/]
 };
diff --git a/rules/utils/utils.js b/rules/utils/utils.js
@@ -1,5 +1,6 @@
 'use strict';
 var falseConfigValues = require('./false-values').config;
+var falseRunValues = require('./false-values').run;
 
 var scopeProperties = [
     '$id',
@@ -458,8 +459,7 @@ function isAngularRunSection(node) {
     return isMemberExpression(node.callee) &&
         node.callee.property.type === 'Identifier' &&
         node.callee.property.name === 'run' &&
-        (node.callee.object.type === 'Identifier' &&
-         node.callee.object.name !== 'mocha');
+        !falseRunValues.find(pattern => new RegExp(pattern).test(node.callee.object.name));
 }
 
 /**
@@ -488,7 +488,7 @@ function isAngularConfigSection(node) {
     return isMemberExpression(node.callee) &&
      node.callee.property.type === 'Identifier' &&
      node.callee.property.name === 'config' &&
-     falseConfigValues.indexOf(node.callee.object.name) < 0;
+     !falseConfigValues.find(pattern => new RegExp(pattern).test(node.callee.object.name));
 }
 
 /**
diff --git a/test/file-name.js b/test/file-name.js
@@ -15,6 +15,24 @@ var commonFalsePositives = require('./utils/commonFalsePositives');
 var eslintTester = new RuleTester();
 eslintTester.run('file-name', rule, {
     valid: [{
+        // basic module
+        filename: 'app.module.js',
+        options: [{
+            typeSeparator: 'dot',
+            ignoreTypeSuffix: true,
+            ignorePrefix: 'fs'
+        }],
+        code: `(function () {
+
+var mod = 'shared.sales';
+
+angular.module(mod + 'shared.sales.core.angular', ['ngCookies', 'ngRoute', 'ngLocale', 'ngResource', 'ngAnimate', 'ngSanitize', 'ngMessages', 'ngIOS9UIWebViewPatch']);
+
+angular.module(mod + 'shared.sales.thirdparty', ['tmh.dynamicLocale', 'gettext', 'ngMaterial', 'md.data.table', 'fixed.table.header', 'as.sortable', 'ngCsv', 'telemetry']);
+
+angular.module(mod, [mod + '.core.angular', mod + '.thirdparty']);
+})();`
+    }, {
         // basic module
         filename: 'myModule.js',
         code: 'angular.module("myModule", []);'
diff --git a/test/module-getter.js b/test/module-getter.js
@@ -23,6 +23,7 @@ eslintTester.run('module-getter', rule, {
         'angular.module("module").config(function(ngTableHelperProvider){' +
             'ngTableHelperProvider.config({count: 10}, {});' +
         '})',
+        'angular.module("module").controller("ctrl", function(ReportService) { ReportService.run();});',
         'angular.module("module").controller("TestCtrl", function() {});',
         'angular.module("module").factory("TestService", function() {});',
         'angular.module("module").service("TestService", function() {});',
diff --git a/test/typecheck-array.js b/test/typecheck-array.js
@@ -19,6 +19,7 @@ eslintTester.run('typecheck-array', rule, {
     ].concat(commonFalsePositives),
     invalid: [
         {code: 'Object.prototype.toString.call([]) === "[object Array]"', errors: [{message: 'You should use the angular.isArray method'}]},
+        {code: 'function name(){return variable === "[object Array]";}', errors: [{message: 'You should use the angular.isArray method'}]},
         {code: '"[object Array]" === Object.prototype.toString.call([])', errors: [{message: 'You should use the angular.isArray method'}]},
         {code: 'variable === "[object Array]"', errors: [{message: 'You should use the angular.isArray method'}]},
         {code: '"[object Array]" === variable', errors: [{message: 'You should use the angular.isArray method'}]},
diff --git a/test/typecheck-date.js b/test/typecheck-date.js
@@ -19,6 +19,7 @@ eslintTester.run('typecheck-date', rule, {
     ].concat(commonFalsePositives),
     invalid: [
         {code: 'Object.prototype.toString.call(variable) === "[object Date]"', errors: [{message: 'You should use the angular.isDate method'}]},
+        {code: 'function name(){return variable === "[object Date]";}', errors: [{message: 'You should use the angular.isDate method'}]},
         {code: '"[object Date]" === Object.prototype.toString.call(variable)', errors: [{message: 'You should use the angular.isDate method'}]},
         {code: 'variable === "[object Date]"', errors: [{message: 'You should use the angular.isDate method'}]},
         {code: '"[object Date]" === variable', errors: [{message: 'You should use the angular.isDate method'}]},
diff --git a/test/typecheck-function.js b/test/typecheck-function.js
@@ -19,6 +19,7 @@ eslintTester.run('typecheck-function', rule, {
     ].concat(commonFalsePositives),
     invalid: [
         {code: 'typeof variable === "function"', errors: [{message: 'You should use the angular.isFunction method'}]},
+        {code: 'function name(){return variable === "function";}', errors: [{message: 'You should use the angular.isFunction method'}]},
         {code: '"function" === typeof variable', errors: [{message: 'You should use the angular.isFunction method'}]},
         {code: 'variable === "function"', errors: [{message: 'You should use the angular.isFunction method'}]},
         {code: '"function" === variable', errors: [{message: 'You should use the angular.isFunction method'}]},
diff --git a/test/typecheck-number.js b/test/typecheck-number.js
@@ -19,6 +19,7 @@ eslintTester.run('typecheck-number', rule, {
     ].concat(commonFalsePositives),
     invalid: [
         {code: 'Object.prototype.toString.call(variable) === "[object Number]"', errors: [{message: 'You should use the angular.isNumber method'}]},
+        {code: 'function name(){return variable === "[object Number]";}', errors: [{message: 'You should use the angular.isNumber method'}]},
         {code: '"[object Number]" === Object.prototype.toString.call(variable)', errors: [{message: 'You should use the angular.isNumber method'}]},
         {code: 'variable === "[object Number]"', errors: [{message: 'You should use the angular.isNumber method'}]},
         {code: '"[object Number]" === variable', errors: [{message: 'You should use the angular.isNumber method'}]},
diff --git a/test/typecheck-object.js b/test/typecheck-object.js
@@ -19,6 +19,7 @@ eslintTester.run('typecheck-object', rule, {
     ].concat(commonFalsePositives),
     invalid: [
         {code: 'typeof variable === "object"', errors: [{message: 'You should use the angular.isObject method'}]},
+        {code: 'function name(){return variable === "object";}', errors: [{message: 'You should use the angular.isObject method'}]},
         {code: '"object" === typeof variable', errors: [{message: 'You should use the angular.isObject method'}]},
         {code: 'variable === "object"', errors: [{message: 'You should use the angular.isObject method'}]},
         {code: '"object" === variable', errors: [{message: 'You should use the angular.isObject method'}]},
diff --git a/test/typecheck-string.js b/test/typecheck-string.js
@@ -19,6 +19,7 @@ eslintTester.run('typecheck-string', rule, {
     ].concat(commonFalsePositives),
     invalid: [
         {code: 'Object.prototype.toString.call(variable) === "[object String]"', errors: [{message: 'You should use the angular.isString method'}]},
+        {code: 'function name(){return variable === "[object String]";}', errors: [{message: 'You should use the angular.isString method'}]},
         {code: '"[object String]" === Object.prototype.toString.call(variable)', errors: [{message: 'You should use the angular.isString method'}]},
         {code: 'variable === "[object String]"', errors: [{message: 'You should use the angular.isString method'}]},
         {code: '"[object String]" === variable', errors: [{message: 'You should use the angular.isString method'}]},

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ module.exports = {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`return {`
`28`		`- 'angular:inject': function(callExpression, fn) {`
	`28`	`+ 'angular?inject': function(callExpression, fn) {`
`29`	`29`	`if (!fn) {`
`30`	`30`	`return;`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,9 @@ module.exports = {`
`125`	`125`	`return;`
`126`	`126`	`}`
`127`	`127`
	`128`	`+ if (!name) {`
	`129`	`+ return;`
	`130`	`+ }`
`128`	`131`	`expectedName = filenameUtil.createExpectedName(name, type, options);`
`129`	`132`
`130`	`133`	`if (expectedName !== filename) {`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ module.exports = {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`return {`
`47`		`- 'angular:directive': function(callExpressionNode, fnNode) {`
	`47`	`+ 'angular?directive': function(callExpressionNode, fnNode) {`
`48`	`48`	`if (!fnNode \|\| !fnNode.body) {`
`49`	`49`	`return;`
`50`	`50`	`}`