Skip to content

Commit eaa38a8

Browse files
committed
Issue #60 Components name rules should not return error if the prefix is undefined
1 parent 9870eb4 commit eaa38a8

12 files changed

+40
-4
lines changed

rules/ng_controller_name.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ module.exports = function(context) {
99
'CallExpression': function(node) {
1010

1111
var prefix = context.options[0];
12+
13+
if(prefix === undefined) {
14+
return;
15+
}
16+
1217
var callee = node.callee;
1318
if (callee.type === 'MemberExpression' && callee.property.name === 'controller') {
1419
var name = node.arguments[0].value;

rules/ng_di.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = function(context) {
2020
var callee = node.callee;
2121

2222
if (callee.type === 'MemberExpression' && angularObjectList.indexOf(callee.property.name) >= 0) {
23-
23+
2424
if(syntax === 'function' && (!utils.isFunctionType(node.arguments[1]) && !utils.isIdentifierType(node.arguments[1]))){
2525
report(node, syntax);
2626
}

rules/ng_directive_name.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ module.exports = function(context) {
99
'CallExpression': function(node) {
1010

1111
var prefix = context.options[0];
12+
if(prefix === undefined) {
13+
return;
14+
}
15+
1216
var callee = node.callee;
1317
if (callee.type === 'MemberExpression' && callee.property.name === 'directive') {
1418
var name = node.arguments[0].value;

rules/ng_filter_name.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ module.exports = function(context) {
99
'CallExpression': function(node) {
1010

1111
var prefix = context.options[0];
12+
if(prefix === undefined) {
13+
return;
14+
}
15+
1216
var callee = node.callee;
1317
if (callee.type === 'MemberExpression' && callee.property.name === 'filter') {
1418
var name = node.arguments[0].value;

rules/ng_module_name.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ module.exports = function(context) {
1212
'CallExpression': function(node) {
1313

1414
var prefix = context.options[0];
15+
if(prefix === undefined) {
16+
return;
17+
}
18+
1519
var callee = node.callee;
1620
if (callee.type === 'MemberExpression' && callee.property.name === 'module' && isArray(node.arguments[1])) {
1721
var name = node.arguments[0].value;

rules/ng_no_digest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = function(context) {
55
return {
66

77
'CallExpression': function(node) {
8-
if(node.callee.type ==='MemberExpression' && node.callee.property.type === 'Identifier' && node.callee.property.name === '$digest'){
8+
if(node.callee.type === 'MemberExpression' && node.callee.property.type === 'Identifier' && node.callee.property.name === '$digest'){
99
context.report(node, 'Instead of using the $destroy method, you should prefer $apply()', {});
1010
}
1111
}

rules/ng_service_name.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ module.exports = function(context) {
99
'CallExpression': function(node) {
1010

1111
var prefix = context.options[0];
12+
if(prefix === undefined) {
13+
return;
14+
}
15+
1216
var callee = node.callee;
1317
if (callee.type === 'MemberExpression' &&
1418
(callee.property.name === 'provider' || callee.property.name === 'service' || callee.property.name === 'factory' || callee.property.name === 'constant' || callee.property.name === 'value')) {

test/ng_controller_name.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ eslintTester.addRuleTest('rules/ng_controller_name', {
1717
}, {
1818
code: 'angular.controller("eslintController", function(){});',
1919
args: [1, /^eslint/]
20+
}, {
21+
code: 'angular.controller("eslintController", function(){});',
22+
args: [1, undefined]
2023
}],
2124
invalid: [
2225
{

test/ng_directive_name.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ eslintTester.addRuleTest('rules/ng_directive_name', {
1717
}, {
1818
code: 'angular.directive("eslintDirective", function(){});',
1919
args: [1, /^eslint/]
20+
}, {
21+
code: 'angular.directive("eslintDirective", function(){});',
22+
args: [1, undefined]
2023
}],
2124
invalid: [
2225
{

test/ng_filter_name.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ eslintTester.addRuleTest('rules/ng_filter_name', {
1717
}, {
1818
code: 'angular.filter("eslintFilter", function(){});',
1919
args: [1, /^eslint/]
20+
}, {
21+
code: 'angular.filter("eslintFilter", function(){});',
22+
args: [1, undefined]
2023
}],
2124
invalid: [
2225
{

0 commit comments

Comments
 (0)