Merge pull request #482 from Gillespie59/development

2.5.0

Author: EmmanuelDemey

package.json

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

rules/di.js

@@ -27,6 +27,9 @@ module.exports = {
             properties: {
                 matchNames: {
                     type: 'boolean'
+                },
+                stripUnderscores: {
+                    type: 'boolean'
                 }
             }
         }]
@@ -36,6 +39,7 @@ module.exports = {
 
         var extra = context.options[1] || {};
         var matchNames = extra.matchNames !== false;
+        var stripUnderscores = extra.stripUnderscores === true;
 
         function report(node) {
             context.report(node, 'You should use the {{syntax}} syntax for DI', {
@@ -53,6 +57,12 @@ module.exports = {
             }
         }
 
+        function normalizeParameter(param) {
+            return param.replace(/^_(.+)_$/, function(match, p1) {
+                return p1;
+            });
+        }
+
         function checkDi(callee, fn) {
             if (!fn) {
                 return;
@@ -67,7 +77,13 @@ module.exports = {
 
                     if (matchNames) {
                         var invalidArray = fn.params.filter(function(e, i) {
-                            return e.name !== fn.parent.elements[i].value;
+                            var name = e.name;
+
+                            if (stripUnderscores) {
+                                name = normalizeParameter(name);
+                            }
+
+                            return name !== fn.parent.elements[i].value;
                         });
                         if (invalidArray.length > 0) {
                             context.report(fn, 'You have an error in your DI configuration. Each items of the array should match exactly one function parameter', {});
@@ -100,7 +116,13 @@ module.exports = {
 
                         if (matchNames) {
                             var invalidInjectArray = fn.params.filter(function(e, i) {
-                                return e.name !== $injectArray.elements[i].value;
+                                var name = e.name;
+
+                                if (stripUnderscores) {
+                                    name = normalizeParameter(name);
+                                }
+
+                                return name !== $injectArray.elements[i].value;
                             });
                             if (invalidInjectArray.length > 0) {
                                 context.report(fn, 'You have an error in your DI configuration. Each items of the array should match exactly one function parameter', {});

test/di.js

@@ -35,6 +35,12 @@ angularObjectList.forEach(function(object) {
     }, {
         code: 'angular.module("myModule").' + object + '(["$log", function($l) {}]);',
         options: ['array', {matchNames: false}]
+    }, {
+        code: 'angular.module("myModule").' + object + '(["$log", function($log) {}]);',
+        options: ['array', {matchNames: true, stripUnderscores: false}]
+    }, {
+        code: 'angular.module("myModule").' + object + '(["$log", function(_$log_) {}]);',
+        options: ['array', {matchNames: true, stripUnderscores: true}]
     }, {
         code: 'angular.module("myModule").' + object + '(myFunction);function MyFunction() {}',
         options: ['function']
@@ -50,6 +56,9 @@ angularObjectList.forEach(function(object) {
     }, {
         code: 'angular.module("myModule").' + object + '(myFunction);myFunction["$inject"]=["slMathPi"];function myFunction(pi) {}',
         options: ['$inject', {matchNames: false}]
+    }, {
+        code: 'angular.module("myModule").' + object + '(myFunction);myFunction["$inject"]=["slMathPi"];function myFunction(_slMathPi_) {}',
+        options: ['$inject', {matchNames: true, stripUnderscores: true}]
     }, {
         code: 'myFunction.$inject=[];function myFunction() {} angular.module("myModule").' + object + '(myFunction);',
         options: ['$inject']
@@ -109,6 +118,10 @@ angularObjectList.forEach(function(object) {
         code: 'angular.module("myModule").' + object + '(["$urlRouteProvider", "$timeout", function($timeout, $urlRouteProvider){}])',
         options: ['array'],
         errors: [{message: 'You have an error in your DI configuration. Each items of the array should match exactly one function parameter'}]
+    }, {
+        code: 'angular.module("myModule").' + object + '(["$log", function(_$log_) {}]);',
+        options: ['array', {matchNames: true, stripUnderscores: false}],
+        errors: [{message: 'You have an error in your DI configuration. Each items of the array should match exactly one function parameter'}]
     });
 });