Skip to content

Ng di order #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 23, 2015
Merged

Ng di order #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b36085
Don't error when checking for ng_di_order on non function declarations
remcohaszing Aug 22, 2015
353c84a
Report the function expression for ng_di_order
remcohaszing Aug 22, 2015
5587560
Also check di order in config and run functions
remcohaszing Aug 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions rules/ng_di_order.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,19 @@ module.exports = function(context) {
'provider',
'service'
];
var setupCalls = [
'config',
'run'
];

function checkOrder(node, fn) {
function checkOrder(fn) {
var args = fn.params.map(function(arg) {
return arg.name;
});
var sortedArgs = args.slice().sort();
sortedArgs.some(function(value, index) {
if(args.indexOf(value) !== index) {
context.report(node, 'Injected values should be sorted alphabetically');
context.report(fn, 'Injected values should be sorted alphabetically');
return true;
}
});
Expand All @@ -31,18 +35,22 @@ module.exports = function(context) {
'AssignmentExpression': function(node) {
// The $get function of a provider.
if(node.left.type === 'MemberExpression' && node.left.property.name === '$get') {
return checkOrder(node, node.right);
return checkOrder(node.right);
}
},

'CallExpression': function(node) {
// An Angular component definition.
if(utils.isAngularComponent(node) && node.callee.type === 'MemberExpression' && angularNamedObjectList.indexOf(node.callee.property.name) >= 0){
return checkOrder(node, node.arguments[1]);
if(utils.isAngularComponent(node) && node.callee.type === 'MemberExpression' && node.arguments[1].type === 'FunctionExpression' && angularNamedObjectList.indexOf(node.callee.property.name) >= 0){
return checkOrder(node.arguments[1]);
}
// Config and run functions.
if(node.callee.type === 'MemberExpression' && node.arguments.length > 0 && setupCalls.indexOf(node.callee.property.name) !== -1 && node.arguments[0].type === 'FunctionExpression') {
return checkOrder(node.arguments[0]);
}
// Injected values in unittests.
if(node.callee.type === 'Identifier' && node.callee.name === 'inject') {
return checkOrder(node, node.arguments[0]);
return checkOrder(node.arguments[0]);
}
}
};
Expand Down
9 changes: 9 additions & 0 deletions test/ng_di_order.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@ eslintTester.run('ng_di_order', rule, {
'app.controller("", function($http, $q){});',
'app.directive("", function($http, $q){});',
'app.factory("", function($http, $q){});',
'app.factory("", fsctoryName);',
'app.filter("", function($http, $q){});',
'app.provider("", function($http, $q){});',
'app.service("", function($http, $q){});',
'app.config(function($httpProvider, $routeProvider){});',
'app.run(function($http, $q){});',
'inject(function($http, $q){});',
'it(inject(function($http, $q){}));',
'this.$get = function($http, $q){};',
Expand All @@ -40,6 +43,12 @@ eslintTester.run('ng_di_order', rule, {
}, {
code: 'app.service("", function($q, $http){});',
errors: [{message: 'Injected values should be sorted alphabetically'}]
}, {
code: 'app.config(function($routeProvider, $httpProvider){});',
errors: [{message: 'Injected values should be sorted alphabetically'}]
}, {
code: 'app.run(function($q, $http){});',
errors: [{message: 'Injected values should be sorted alphabetically'}]
}, {
code: 'inject(function($q, $http){});',
errors: [{message: 'Injected values should be sorted alphabetically'}]
Expand Down