Merge pull request #400 from Gillespie59/development

1.3.0
EmmanuelDemey · Jun 27, 2016 · 8b65dc1 · 8b65dc1
2 parents 2326c7f + 89b95f1
commit 8b65dc1
Show file tree

Hide file tree

Showing 10 changed files with 125 additions and 6 deletions.
diff --git a/docs/di-order.md b/docs/di-order.md
@@ -46,6 +46,24 @@ The following patterns are **not** considered problems with default config;
         // ...
     });
 
+The following patterns are **not** considered problems when configured `true` and `"case_sensitive"`:
+
+    /*eslint angular/di-order: [2,true,"case_sensitive"]*/
+
+    // valid
+    angular.module("").animation("", function(Authentication, analytics) {
+        // ...
+    });
+
+The following patterns are **not** considered problems when configured `true` and `"case_insensitive"`:
+
+    /*eslint angular/di-order: [2,true,"case_insensitive"]*/
+
+    // valid
+    angular.module("").animation("", function(analytics, Authentication) {
+        // ...
+    });
+
 The following patterns are considered problems when configured `true`:
 
     /*eslint angular/di-order: [2,true]*/

diff --git a/docs/file-name.md b/docs/file-name.md
@@ -37,6 +37,9 @@ The following patterns are **not** considered problems with default config;
     // valid with filename: src/app/awesomeModule/beautifulDirective.js
     app.directive('beautifulDirective', function() {});
 
+    // valid with filename: src/app/awesomeModule/beautifulComponent.js
+    app.component('beautifulComponent', {});
+
 The following patterns are considered problems when configured `{"typeSeparator":"dot"}`:
 
     /*eslint angular/file-name: [2,{"typeSeparator":"dot"}]*/
@@ -110,6 +113,16 @@ The following patterns are **not** considered problems when configured `{"typeSe
     // valid with filename: src/app/userUtils.service.js
     angular.factory('uiUserUtils', uiUserUtils)
 
+The following patterns are **not** considered problems when configured `{"typeSeparator":"dot","ignorePrefix":"ui."}`:
+
+    /*eslint angular/file-name: [2,{"typeSeparator":"dot","ignorePrefix":"ui."}]*/
+
+    // valid with filename: src/app/userUtils.service.js
+    angular.factory('ui.UserUtils', uiUserUtils)
+
+    // valid with filename: src/app/utils.module.js
+    angular.module('ui.utils', function(){})
+
 ## Version
 
 This rule was introduced in eslint-plugin-angular 0.7.0

diff --git a/examples/di-order.js b/examples/di-order.js
@@ -13,6 +13,16 @@ angular.module('myModule').factory('myService', function(CONFIG, URLs, authServi
     // ...
 });
 
+// example - valid: true, options: [true, "case_sensitive"]
+angular.module("").animation("", function(Authentication, analytics) {
+    // ...
+});
+
+// example - valid: true, options: [true, "case_insensitive"]
+angular.module("").animation("", function(analytics, Authentication) {
+    // ...
+});
+
 // example - valid: false, errorMessage: "Injected values should be sorted alphabetically"
 angular.module('myModule').factory('myService', function($q, $http) {
     // ...

diff --git a/examples/file-name.js b/examples/file-name.js
@@ -11,6 +11,9 @@ app.factory('myUtils', function() {});
 // example - valid: true, filename: "src/app/awesomeModule/beautifulDirective.js"
 app.directive('beautifulDirective', function() {});
 
+// example - valid: true, filename: "src/app/awesomeModule/beautifulComponent.js"
+app.component('beautifulComponent', {});
+
 // example - valid: false, filename: "src/app/filters.js", errorMessage: "Filename must be \"usefulFilter.js\""
 app.filter('usefulFilter', function() {});
 
@@ -51,3 +54,8 @@ app.directive('userProfileDirective', function() {});
 // example - valid: true, options: [{"typeSeparator":"dot", "ignorePrefix": "ui"}], filename: "src/app/userUtils.service.js"
 angular.factory('uiUserUtils', uiUserUtils)
 
+// example - valid: true, options: [{"typeSeparator":"dot", "ignorePrefix": "ui."}], filename: "src/app/userUtils.service.js"
+angular.factory('ui.UserUtils', uiUserUtils)
+
+// example - valid: true, options: [{"typeSeparator":"dot", "ignorePrefix": "ui."}], filename: "src/app/utils.module.js"
+angular.module('ui.utils', function(){})
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-angular",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "ESLint rules for AngularJS projects",
   "main": "index.js",
   "scripts": {

diff --git a/rules/di-order.js b/rules/di-order.js
@@ -11,20 +11,22 @@
 'use strict';
 
 var angularRule = require('./utils/angular-rule');
-
+var caseSensitive = 'case_sensitive';
 
 module.exports = angularRule(function(context) {
     var stripUnderscores = context.options[0] !== false;
+    var caseSensitiveOpt = (context.options[1] || caseSensitive) === caseSensitive;
 
     function checkOrder(callee, fn) {
         if (!fn || !fn.params) {
             return;
         }
         var args = fn.params.map(function(arg) {
+            var formattedArg = arg.name;
             if (stripUnderscores) {
-                return arg.name.replace(/^_(.+)_$/, '$1');
+                formattedArg = formattedArg.replace(/^_(.+)_$/, '$1');
             }
-            return arg.name;
+            return caseSensitiveOpt ? formattedArg : formattedArg.toLowerCase();
         });
         var sortedArgs = args.slice().sort();
         sortedArgs.some(function(value, index) {

diff --git a/rules/file-name.js b/rules/file-name.js
@@ -35,7 +35,8 @@ module.exports = (function() {
         factory: 'service',
         provider: 'service',
         value: 'service',
-        constant: 'constant'
+        constant: 'constant',
+        component: 'component'
     };
 
     var filenameUtil = {
@@ -57,7 +58,9 @@ module.exports = (function() {
             return name;
         },
         removePrefix: function(name, options) {
-            if (new RegExp('^' + options.ignorePrefix + '[A-Z]').test(name)) {
+            var regName = '^' + options.ignorePrefix.replace(/[\.]/g, '\\$&');
+            regName += options.ignorePrefix.indexOf('\.') === -1 ? '[A-Z]' : '[a-zA-z]';
+            if (new RegExp(regName).test(name)) {
                 return this.firstToLower(name.slice(options.ignorePrefix.length));
             }
             return name;

diff --git a/test/di-order.js b/test/di-order.js
@@ -41,9 +41,27 @@ eslintTester.run('di-order', rule, {
         {
             code: 'it(inject(function(_$httpBackend_, _$http_) {}));',
             options: [false]
+        },
+        {
+            code: 'angular.module("").animation("", function(Authentication, analytics) {});',
+            options: [true, 'case_sensitive']
+        },
+        {
+            code: 'angular.module("").animation("", function(analytics, Authentication) {});',
+            options: [true, 'case_insensitive']
         }
     ].concat(commonFalsePositives),
     invalid: [
+        {
+            code: 'angular.module("").animation("", function(Authentication, analytics) {});',
+            errors: [{message: 'Injected values should be sorted alphabetically'}],
+            options: [true, 'case_insensitive']
+        },
+        {
+            code: 'angular.module("").animation("", function(analytics, Authentication) {});',
+            errors: [{message: 'Injected values should be sorted alphabetically'}],
+            options: [true, 'case_sensitive']
+        },
         // animation
         {
             code: 'angular.module("").animation("", function($q, $http) {});',

diff --git a/test/file-name.js b/test/file-name.js
@@ -38,6 +38,10 @@ eslintTester.run('file-name', rule, {
         // basic directive
         filename: 'beautifulDirective.js',
         code: 'app.directive("beautifulDirective", function() {});'
+    }, {
+        // basic component
+        filename: 'beautifulComponent.js',
+        code: 'app.component("beautifulComponent", {});'
     }, {
         // typeSeparator dot with filter
         filename: 'src/app/myFilter.filter.js',
@@ -136,6 +140,33 @@ eslintTester.run('file-name', rule, {
             ignoreTypeSuffix: true,
             ignorePrefix: 'xp'
         }]
+    }, {
+        // ignorePrefix xp with regex
+        filename: 'src/app/asset.service.js',
+        code: 'angular.factory("xp.AssetService", xpAssetService)',
+        options: [{
+            typeSeparator: 'dot',
+            ignoreTypeSuffix: true,
+            ignorePrefix: 'xp.'
+        }]
+    }, {
+        // ignorePrefix xp in module name
+        filename: 'src/app/core.module.js',
+        code: 'angular.module("xp.core", function(){})',
+        options: [{
+            typeSeparator: 'dot',
+            ignoreTypeSuffix: true,
+            ignorePrefix: 'xp.'
+        }]
+    }, {
+        // ignorePrefix xp in main module name
+        filename: 'src/app/xp.module.js',
+        code: 'angular.module("xp", function(){})',
+        options: [{
+            typeSeparator: 'dot',
+            ignoreTypeSuffix: true,
+            ignorePrefix: 'xp.'
+        }]
     }, {
         // ignorePrefix st with typeSeparator dash
         filename: 'src/app/appUtils-service.js',
@@ -224,6 +255,16 @@ eslintTester.run('file-name', rule, {
             ignorePrefix: 'xp'
         }],
         errors: [{message: 'Filename must be "asset.service.js"'}]
+    }, {
+        // ignorePrefix xp.
+        filename: 'src/app/xpAsset.service.js',
+        code: 'angular.factory("xp.AssetService", xpAssetService)',
+        options: [{
+            typeSeparator: 'dot',
+            ignoreTypeSuffix: true,
+            ignorePrefix: 'xp.'
+        }],
+        errors: [{message: 'Filename must be "asset.service.js"'}]
     }, {
         // alphanumeric nameStyle dash and typeSeparator dash with service
         filename: 'src/app/app2utils-service.js',

diff --git a/test/no-private-call.js b/test/no-private-call.js
@@ -38,6 +38,12 @@ eslintTester.run('no-private-call', rule, {
             options: [{
                 allow: ['$$watchers']
             }]
+        },
+        {
+            code: 'node.$$treeLevel',
+            options: [{
+                allow: ['$$treeLevel']
+            }]
         }
 
     ].concat(commonFalsePositives),