Merge pull request #458 from Gillespie59/development

2.0.0

Author: EmmanuelDemey

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-angular",
-  "version": "1.6.4",
+  "version": "2.0.0",
   "description": "ESLint rules for AngularJS projects",
   "main": "index.js",
   "scripts": {

rules/no-services.js

@@ -13,7 +13,7 @@
  */
 'use strict';
 
-var utils = require('./utils/utils');
+const utils = require('./utils/utils');
 
 module.exports = {
     meta: {
@@ -24,10 +24,10 @@ module.exports = {
         }]
     },
     create: function(context) {
-        var angularObjectList = ['controller', 'filter', 'directive'];
-        var badServices;
-        var map;
-        var message = 'REST API calls should be implemented in a specific service';
+        let angularObjectList = ['controller', 'filter', 'directive'];
+        let badServices = [];
+        let map;
+        let message = 'REST API calls should be implemented in a specific service';
 
         function isArray(item) {
             return Object.prototype.toString.call(item) === '[object Array]';
@@ -38,7 +38,7 @@ module.exports = {
         }
 
         if (context.options[0] === undefined) {
-            badServices = ['$http', '$resource', 'Restangular', '$q', '$filter'];
+            badServices = ['/\$http/', '/\$resource/', 'Restangular', '/\$q/', '/\$filter/'];
         }
 
         if (isArray(context.options[0])) {
@@ -51,8 +51,9 @@ module.exports = {
 
         if (isObject(context.options[0])) {
             map = context.options[0];
-            var result = [];
-            var prop;
+
+            let result = [];
+            let prop;
 
             for (prop in map) {
                 if (map.hasOwnProperty(prop)) {
@@ -65,15 +66,15 @@ module.exports = {
 
         function isSetBedService(serviceName, angularObjectName) {
             if (map) {
-                return map[angularObjectName].indexOf(serviceName) >= 0;
+                return map[angularObjectName].find(object => utils.convertPrefixToRegex(object).test(serviceName));
             }
-            return badServices.indexOf(serviceName) >= 0;
+            return badServices.find(object => utils.convertPrefixToRegex(object).test(serviceName));
         }
 
         return {
 
             CallExpression: function(node) {
-                var callee = node.callee;
+                let callee = node.callee;
 
                 if (utils.isAngularComponent(node) && callee.type === 'MemberExpression' && angularObjectList.indexOf(callee.property.name) >= 0) {
                     if (utils.isFunctionType(node.arguments[1])) {

test/directive-restrict.js

@@ -26,6 +26,15 @@ eslintTester.run('directive-restrict', rule, {
         'app.directive("", function() {return {restrict:"E"}})',
         // Allowed with custom restrict
         {
+            code: `app.directive("snapContainer", [
+                "$injector", "$rootScope", "$rootElement", "$timeout", "ibRoutePathSaver",
+                function($injector, $rootScope, $rootElement, $timeout, ibRoutePathSaver) {
+                    return {
+                        restrict:   "A"
+                    }
+                }])`,
+            options: [{restrict: 'A'}]
+        }, {
             code: 'app.directive("", function() {return {restrict:"A"}})',
             options: [{restrict: 'A'}]
         }, {

test/no-services.js

@@ -16,10 +16,11 @@ var eslintTester = new RuleTester();
 
 var angularObjectList = ['controller', 'filter', 'directive'];
 var defaultBadService = ['$http', '$resource', 'Restangular', '$q', '$filter'];
+var defaultBadServiceExcaped = [/\$http/, /\$resource/, 'Restangular', /\$q/, /\$filter/];
 var mapAngularObjectToBarServices = {
-    controller: defaultBadService,
-    filter: defaultBadService,
-    directive: defaultBadService
+    controller: defaultBadServiceExcaped,
+    filter: defaultBadServiceExcaped,
+    directive: defaultBadServiceExcaped
 };
 var valid = [];
 var invalid = [];
@@ -39,11 +40,11 @@ angularObjectList.forEach(function(object) {
     defaultBadService.forEach(function(badService) {
         invalid.push({
             code: 'app.' + object + '("name", function(' + badService + ') {});',
-            options: [defaultBadService],
+            options: [defaultBadServiceExcaped],
             errors: [{message: 'REST API calls should be implemented in a specific service (' + badService + ' in ' + object + ')'}]
         }, {
             code: 'app.' + object + '("name", ["' + badService + '", function(' + badService + ') {}]);',
-            options: [defaultBadService],
+            options: [defaultBadServiceExcaped],
             errors: [{message: 'REST API calls should be implemented in a specific service (' + badService + ' in ' + object + ')'}]
         });
     });
@@ -61,11 +62,11 @@ angularObjectList.forEach(function(object) {
     defaultBadService.forEach(function(badService) {
         invalid.push({
             code: 'app.' + object + '("name", function(' + badService + ') {});',
-            options: [defaultBadService, [object]],
+            options: [defaultBadServiceExcaped, [object]],
             errors: [{message: 'REST API calls should be implemented in a specific service (' + badService + ' in ' + object + ')'}]
         }, {
             code: 'app.' + object + '("name", ["' + badService + '", function(' + badService + ') {}]);',
-            options: [defaultBadService, [object]],
+            options: [defaultBadServiceExcaped, [object]],
             errors: [{message: 'REST API calls should be implemented in a specific service (' + badService + ' in ' + object + ')'}]
         });
     });