Merge pull request #500 from Gillespie59/development

3.0.1
EmmanuelDemey · Aug 16, 2017 · c0392fe · c0392fe
2 parents 0a74425 + c6f5a71
commit c0392fe
Show file tree

Hide file tree

Showing 69 changed files with 169 additions and 66 deletions.
diff --git a/README.md b/README.md
diff --git a/docs/README.md b/docs/README.md
@@ -0,0 +1,3 @@
+# Looking for the rule documentation?
+
+It’s over in [`docs/rules`](./rules).
diff --git a/docs/angularelement.md → docs/rules/angularelement.md b/docs/angularelement.md → docs/rules/angularelement.md
diff --git a/docs/avoid-scope-typos.md → docs/rules/avoid-scope-typos.md b/docs/avoid-scope-typos.md → docs/rules/avoid-scope-typos.md
diff --git a/docs/component-limit.md → docs/rules/component-limit.md b/docs/component-limit.md → docs/rules/component-limit.md
diff --git a/docs/component-name.md → docs/rules/component-name.md b/docs/component-name.md → docs/rules/component-name.md
diff --git a/docs/constant-name.md → docs/rules/constant-name.md b/docs/constant-name.md → docs/rules/constant-name.md
diff --git a/docs/controller-as-route.md → docs/rules/controller-as-route.md b/docs/controller-as-route.md → docs/rules/controller-as-route.md
diff --git a/docs/controller-as-vm.md → docs/rules/controller-as-vm.md b/docs/controller-as-vm.md → docs/rules/controller-as-vm.md
diff --git a/docs/controller-as.md → docs/rules/controller-as.md b/docs/controller-as.md → docs/rules/controller-as.md
diff --git a/docs/controller-name.md → docs/rules/controller-name.md b/docs/controller-name.md → docs/rules/controller-name.md
diff --git a/docs/deferred.md → docs/rules/deferred.md b/docs/deferred.md → docs/rules/deferred.md
diff --git a/docs/definedundefined.md → docs/rules/definedundefined.md b/docs/definedundefined.md → docs/rules/definedundefined.md
diff --git a/docs/di-order.md → docs/rules/di-order.md b/docs/di-order.md → docs/rules/di-order.md
diff --git a/docs/di-unused.md → docs/rules/di-unused.md b/docs/di-unused.md → docs/rules/di-unused.md
diff --git a/docs/di.md → docs/rules/di.md b/docs/di.md → docs/rules/di.md
diff --git a/docs/directive-name.md → docs/rules/directive-name.md b/docs/directive-name.md → docs/rules/directive-name.md
diff --git a/docs/directive-restrict.md → docs/rules/directive-restrict.md b/docs/directive-restrict.md → docs/rules/directive-restrict.md
diff --git a/docs/document-service.md → docs/rules/document-service.md b/docs/document-service.md → docs/rules/document-service.md
diff --git a/docs/dumb-inject.md → docs/rules/dumb-inject.md b/docs/dumb-inject.md → docs/rules/dumb-inject.md
diff --git a/docs/empty-controller.md → docs/rules/empty-controller.md b/docs/empty-controller.md → docs/rules/empty-controller.md
diff --git a/docs/factory-name.md → docs/rules/factory-name.md b/docs/factory-name.md → docs/rules/factory-name.md
diff --git a/docs/file-name.md → docs/rules/file-name.md b/docs/file-name.md → docs/rules/file-name.md
diff --git a/docs/filter-name.md → docs/rules/filter-name.md b/docs/filter-name.md → docs/rules/filter-name.md
diff --git a/docs/foreach.md → docs/rules/foreach.md b/docs/foreach.md → docs/rules/foreach.md
diff --git a/docs/function-type.md → docs/rules/function-type.md b/docs/function-type.md → docs/rules/function-type.md
diff --git a/docs/interval-service.md → docs/rules/interval-service.md b/docs/interval-service.md → docs/rules/interval-service.md
diff --git a/docs/json-functions.md → docs/rules/json-functions.md b/docs/json-functions.md → docs/rules/json-functions.md
diff --git a/docs/log.md → docs/rules/log.md b/docs/log.md → docs/rules/log.md
diff --git a/docs/module-dependency-order.md → docs/rules/module-dependency-order.md b/docs/module-dependency-order.md → docs/rules/module-dependency-order.md
diff --git a/docs/module-getter.md → docs/rules/module-getter.md b/docs/module-getter.md → docs/rules/module-getter.md
diff --git a/docs/module-name.md → docs/rules/module-name.md b/docs/module-name.md → docs/rules/module-name.md
diff --git a/docs/module-setter.md → docs/rules/module-setter.md b/docs/module-setter.md → docs/rules/module-setter.md
diff --git a/docs/no-angular-mock.md → docs/rules/no-angular-mock.md b/docs/no-angular-mock.md → docs/rules/no-angular-mock.md
diff --git a/docs/no-controller.md → docs/rules/no-controller.md b/docs/no-controller.md → docs/rules/no-controller.md
diff --git a/docs/no-cookiestore.md → docs/rules/no-cookiestore.md b/docs/no-cookiestore.md → docs/rules/no-cookiestore.md
diff --git a/docs/no-directive-replace.md → docs/rules/no-directive-replace.md b/docs/no-directive-replace.md → docs/rules/no-directive-replace.md
diff --git a/docs/no-http-callback.md → docs/rules/no-http-callback.md b/docs/no-http-callback.md → docs/rules/no-http-callback.md
diff --git a/docs/no-inline-template.md → docs/rules/no-inline-template.md b/docs/no-inline-template.md → docs/rules/no-inline-template.md
diff --git a/docs/no-jquery-angularelement.md → docs/rules/no-jquery-angularelement.md b/docs/no-jquery-angularelement.md → docs/rules/no-jquery-angularelement.md
diff --git a/docs/no-private-call.md → docs/rules/no-private-call.md b/docs/no-private-call.md → docs/rules/no-private-call.md
diff --git a/docs/no-run-logic.md → docs/rules/no-run-logic.md b/docs/no-run-logic.md → docs/rules/no-run-logic.md
diff --git a/docs/no-service-method.md → docs/rules/no-service-method.md b/docs/no-service-method.md → docs/rules/no-service-method.md
diff --git a/docs/no-services.md → docs/rules/no-services.md b/docs/no-services.md → docs/rules/no-services.md
diff --git a/docs/on-destroy.md → docs/rules/on-destroy.md b/docs/on-destroy.md → docs/rules/on-destroy.md
diff --git a/docs/on-watch.md → docs/rules/on-watch.md b/docs/on-watch.md → docs/rules/on-watch.md
diff --git a/docs/one-dependency-per-line.md → docs/rules/one-dependency-per-line.md b/docs/one-dependency-per-line.md → docs/rules/one-dependency-per-line.md
diff --git a/docs/prefer-component.md → docs/rules/prefer-component.md b/docs/prefer-component.md → docs/rules/prefer-component.md
diff --git a/docs/provider-name.md → docs/rules/provider-name.md b/docs/provider-name.md → docs/rules/provider-name.md
diff --git a/docs/rest-service.md → docs/rules/rest-service.md b/docs/rest-service.md → docs/rules/rest-service.md
diff --git a/docs/service-name.md → docs/rules/service-name.md b/docs/service-name.md → docs/rules/service-name.md
@@ -5,7 +5,10 @@
 All your services should have a name starting with the parameter you can define in your config object.
 The second parameter can be a Regexp wrapped in quotes.
 You can not prefix your services by "$" (reserved keyword for AngularJS services) ("service-name":  [2, "ng"])
-*
+
+If the oldBehavior is true (default value), this rule will check the name of all services defined with the different methods
+provided by the framework : provider, service, factory, ... If this parameter is false, only services defined with the
+service method will be checked.
 
 **Rule based on Angular 1.x**
 

diff --git a/docs/timeout-service.md → docs/rules/timeout-service.md b/docs/timeout-service.md → docs/rules/timeout-service.md
diff --git a/docs/typecheck-array.md → docs/rules/typecheck-array.md b/docs/typecheck-array.md → docs/rules/typecheck-array.md
diff --git a/docs/typecheck-date.md → docs/rules/typecheck-date.md b/docs/typecheck-date.md → docs/rules/typecheck-date.md
diff --git a/docs/typecheck-function.md → docs/rules/typecheck-function.md b/docs/typecheck-function.md → docs/rules/typecheck-function.md
diff --git a/docs/typecheck-number.md → docs/rules/typecheck-number.md b/docs/typecheck-number.md → docs/rules/typecheck-number.md
diff --git a/docs/typecheck-object.md → docs/rules/typecheck-object.md b/docs/typecheck-object.md → docs/rules/typecheck-object.md
diff --git a/docs/typecheck-string.md → docs/rules/typecheck-string.md b/docs/typecheck-string.md → docs/rules/typecheck-string.md
diff --git a/docs/value-name.md → docs/rules/value-name.md b/docs/value-name.md → docs/rules/value-name.md
diff --git a/docs/watchers-execution.md → docs/rules/watchers-execution.md b/docs/watchers-execution.md → docs/rules/watchers-execution.md
diff --git a/docs/window-service.md → docs/rules/window-service.md b/docs/window-service.md → docs/rules/window-service.md
diff --git a/gulpfile.js b/gulpfile.js
@@ -27,10 +27,10 @@ gulp.task('test', function(cb) {
 });
 
 
-gulp.task('docs', function(cb) {
+gulp.task('docs', function() {
     docs.updateReadme('README.md');
     docs.createDocFiles();
-    docs.testDocs(cb);
+    // docs.testDocs(cb);
 });
 
 gulp.task('default', ['quality', 'docs', 'test']);
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-angular",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "ESLint rules for AngularJS projects",
   "main": "index.js",
   "scripts": {

diff --git a/rules/avoid-scope-typos.js b/rules/avoid-scope-typos.js
@@ -13,13 +13,15 @@ const bad = ['new', 'watch', 'watchGroup', 'watchCollection',
     'digest', 'destroy', 'eval', 'evalAsync', 'apply',
     'applyAsync', 'on', 'emit', 'broadcast'];
 
+const scope = ['scope', '$scope', '$rootScope'];
+
 module.exports = {
     meta: {
         schema: [ ]
     },
     create: function(context) {
         function check(node, name) {
-            if (bad.indexOf(name) >= 0) {
+            if (bad.indexOf(name) >= 0 && scope.indexOf(node.parent.object.name) >= 0) {
                 context.report(node, `The ${name} method should be replaced by $${name}, or you should rename it in order to avoid confusions`, {});
             }
         }

diff --git a/rules/directive-restrict.js b/rules/directive-restrict.js
@@ -53,6 +53,24 @@ module.exports = {
                     return true;
                 }
             });
+
+            if (!directiveNode) {
+                // Try to find an ancestor function used as definition for one of the found directives
+                context.getAncestors().some(function(ancestor) {
+                    if (isFunctionDeclaration(ancestor)) {
+                        var fnName = ancestor.id.name;
+
+                        var correspondingDirective = foundDirectives.find(function(directive) {
+                            var directiveFnName = getDirectiveFunctionName(directive);
+                            return directiveFnName === fnName;
+                        });
+
+                        directiveNode = correspondingDirective;
+                        return true;
+                    }
+                });
+            }
+
             // The restrict property was not defined inside of a directive.
             if (!directiveNode) {
                 return;
@@ -71,6 +89,34 @@ module.exports = {
             checkedDirectives.push(directiveNode);
         }
 
+        function isFunctionDeclaration(node) {
+            return node.type === 'FunctionDeclaration';
+        }
+
+        function getDirectiveFunctionName(node) {
+            var directiveArg = node.arguments[1];
+
+            // Three ways of creating a directive function: function expression,
+            // variable name that references a function, and an array with a function
+            // as the last item
+            if (utils.isFunctionType(directiveArg)) {
+                return directiveArg.id.name;
+            }
+
+            if (utils.isArrayType(directiveArg)) {
+                directiveArg = directiveArg.elements[directiveArg.elements.length - 1];
+
+                if (utils.isIdentifierType(directiveArg)) {
+                    return directiveArg.name;
+                }
+                return directiveArg.id.name;
+            }
+
+            if (utils.isIdentifierType(directiveArg)) {
+                return directiveArg.name;
+            }
+        }
+
         return {
             CallExpression: function(node) {
                 if (utils.isAngularDirectiveDeclaration(node)) {

diff --git a/rules/service-name.js b/rules/service-name.js
@@ -4,7 +4,11 @@
  * All your services should have a name starting with the parameter you can define in your config object.
  * The second parameter can be a Regexp wrapped in quotes.
  * You can not prefix your services by "$" (reserved keyword for AngularJS services) ("service-name":  [2, "ng"])
- **
+ * 
+ * If the oldBehavior is true (default value), this rule will check the name of all services defined with the different methods
+ * provided by the framework : provider, service, factory, ... If this parameter is false, only services defined with the 
+ * service method will be checked. 
+ * 
  * @styleguideReference {johnpapa} `y125` Naming - Factory and Service Names
  * @version 0.1.0
  * @category naming

diff --git a/scripts/templates.js b/scripts/templates.js
@@ -5,7 +5,7 @@ var _ = require('lodash');
 
 var templates = {
     ruleSourcePath: _.template('rules/<%= ruleName %>.js'),
-    ruleDocumentationPath: _.template('docs/<%= ruleName %>.md'),
+    ruleDocumentationPath: _.template('docs/rules/<%= ruleName %>.md'),
     ruleExamplesPath: _.template('examples/<%= ruleName %>.js'),
     styleguide: _.template('[<%= name %> by <%= type %> - <%= description %>](<%= link %>)'),
     styleguideShort: _.template('[<%= name %>](<%= link %>)'),

diff --git a/test/avoid-scope-typos.js b/test/avoid-scope-typos.js
@@ -38,6 +38,11 @@ variables.forEach(function(variable) {
         });
     });
 });
+
+valid.push({
+    code: '$ionicPlatform.on("resume", "blabla")'
+});
+
 eslintTester.run('avoid-scope-typos', rule, {
     valid: valid.concat(commonFalsePositives),
     invalid

diff --git a/test/directive-restrict.js b/test/directive-restrict.js
@@ -40,6 +40,25 @@ eslintTester.run('directive-restrict', rule, {
         }, {
             code: 'app.directive("", function() {return {restrict:"E"}})',
             options: [{restrict: 'EA'}]
+        }, {
+            code: `app.directive("snapContainer", ['$scope', myDirective]);
+                function myDirective($scope) {
+                    return {
+                        restrict:   "A"
+                    }
+                }
+            `,
+            options: [{restrict: 'A'}]
+        }, {
+            code: `app.directive("snapContainer", myDirective);
+                /* @ngInject */
+                function myDirective($rootScope) {
+                    return {
+                        restrict:   "A"
+                    }
+                }
+            `,
+            options: [{restrict: 'A'}]
         },
         // Allowed with explicit restrict
         {
@@ -87,6 +106,27 @@ eslintTester.run('directive-restrict', rule, {
             code: 'app.directive("", function() {return {restrict:"E"}})',
             options: [{restrict: 'A'}],
             errors: [{message: 'Disallowed directive restriction. It must be one of A in that order'}]
+        }, {
+            code: `app.directive("snapContainer", ['$scope', myDirective]);
+                function myDirective($scope) {
+                    return {
+                        restrict:   "A"
+                    }
+                }
+            `,
+            options: [{restrict: 'E'}],
+            errors: [{message: 'Disallowed directive restriction. It must be one of E in that order'}]
+        }, {
+            code: `app.directive("snapContainer", myDirective);
+                /* @ngInject */
+                function myDirective($rootScope) {
+                    return {
+                        restrict:   "A"
+                    }
+                }
+            `,
+            options: [{restrict: 'E'}],
+            errors: [{message: 'Disallowed directive restriction. It must be one of E in that order'}]
         },
         // Disallowed with wrong order
         {