support arrow functions

Author: Andrew Schmadel

CHANGES.md

@@ -1,5 +1,8 @@
 # babel-plugin-angularjs-annotate changelog
 
+## v0.3.0 2016-07-25
+ * Add support for ES6 arrow functions
+
 ## v0.2.0 2016-06-21
  * Add support for ES6 class annotations
  * Add support for exported ES6 classes and functions

README.md

@@ -35,7 +35,40 @@ See [ng-annotate](https://github.com/olov/ng-annotate)'s documentation and the [
 
 ### ES6 Annotations
 
-This plugin can annotate some ES6 classes that are not supported by ng-annotate:
+This plugin can annotate some ES6 classes and arrow functions that are not supported by ng-annotate:
+
+#### Implicit arrow function annotation
+
+Arrow functions may be annotated anywhere that a "regular" function expression may be used. 
+
+**NOTE:** There are places where you _shouldn't_ use arrow functions in an Angular application.  Inside of an arrow function, the value of `this` is inherited from the lexical scope enclosing the function.  For this reason, arrow functions should not be used to declare Angular services or providers.  
+
+_If you choose to ignore this warning, we'll add the annotations to your services and providers anyway, but your application probably won't work.  Future releases may treat this condition as an error._
+
+```js
+angular.module("MyMod").controller("MyCtrl", ($scope, $timeout) => {});
+```
+
+Becomes:
+
+```js
+angular.module("MyMod").controller("MyCtrl", ["$scope", "$timeout", ($scope, $timeout) => {}]);
+```
+
+#### Explicit arrow function annotation
+
+Arrow functions may also be explicitly marked for annotation.
+
+```js
+var x = /* @ngInject */ ($scope) => {};
+```
+
+Becomes:
+
+```js
+var x = /* @ngInject */ ($scope) => {};
+x.$inject = ["$scope"]
+```
 
 #### Implicit Class Annotation
 

babel-ng-annotate.js

@@ -97,6 +97,11 @@ module.exports = function() {
           ngInject.inspectFunction(path, ctx);
         }
       },
+      ArrowFunctionExpression: {
+        enter(path) {
+          ngInject.inspectFunction(path, ctx);
+        }
+      },
       FunctionDeclaration: {
         enter(path) {
           ngInject.inspectFunction(path, ctx);

ng-annotate-main.js

@@ -639,7 +639,7 @@ function followReference(path) {
         // {type: "VariableDeclarator", id: {type: "Identifier", name: "foo"}, init: ..}
         return bound;
     } else if (kind === "hoisted") {
-        assert(t.isFunctionDeclaration(bound) || t.isFunctionExpression(bound));
+        assert(t.isFunctionDeclaration(bound) || isFunctionExpressionOrArrow(bound));
         // FunctionDeclaration is the common case, i.e.
         // function foo(a, b) {}
 
@@ -775,7 +775,7 @@ function jumpOverIife(path) {
         console.warn("Not a path");
     }
 
-    if (!(t.isCallExpression(node) && t.isFunctionExpression(node.callee))) {
+    if (!(t.isCallExpression(node) && isFunctionExpressionOrArrow(node.callee))) {
         return path;
     }
 
@@ -799,8 +799,12 @@ function addModuleContextIndependentSuspect(target, ctx) {
     ctx.suspects.push(target);
 }
 
+function isFunctionExpressionOrArrow(node) {
+    return t.isFunctionExpression(node) || t.isArrowFunctionExpression(node);
+}
+
 function isFunctionExpressionWithArgs(node) {
-    return t.isFunctionExpression(node) && node.params.length >= 1;
+    return isFunctionExpressionOrArrow(node) && node.params.length >= 1;
 }
 function isFunctionDeclarationWithArgs(node) {
     return t.isFunctionDeclaration(node) && node.params.length >= 1;

nginject.js

@@ -171,7 +171,7 @@ function inspectObjectExpression(path, ctx) {
     addSuspect(path, ctx, !annotateEverything);
   } else {
     path.get("properties")
-    .filter(prop => t.isFunctionExpression(prop.node.value))
+    .filter(prop => isFunctionExpressionOrArrow(prop.node.value))
     .forEach(prop => inspectComment(prop, ctx));
   }
 
@@ -203,7 +203,7 @@ function matchPrologueDirectives(prologueDirectives, path) {
 
 function inspectAssignment(path, ctx){
   const node = path.node;
-  if(!t.isFunctionExpression(node.right)){
+  if(!isFunctionExpressionOrArrow(node.right)){
     return;
   }
 
@@ -221,7 +221,7 @@ function inspectAssignment(path, ctx){
 
 function inspectDeclarator(path, ctx){
   const node = path.node;
-  if(!t.isFunctionExpression(node.init)){
+  if(!isFunctionExpressionOrArrow(node.init)){
     return;
   }
 
@@ -352,7 +352,7 @@ function nestedObjectValues(path, res) {
 
     path.get("properties").forEach(function(prop) {
         const v = prop.get("value");
-        if (t.isFunctionExpression(v) || t.isArrayExpression(v)) {
+        if (isFunctionExpressionOrArrow(v) || t.isArrayExpression(v)) {
             res.push(v);
         } else if (t.isObjectExpression(v)) {
             nestedObjectValues(v, res);
@@ -369,7 +369,7 @@ function isAnnotatedArray(node) {
     const elements = node.elements;
 
     // last should be a function expression
-    if (elements.length === 0 || !t.isFunctionExpression(last(elements))) {
+    if (elements.length === 0 || !isFunctionExpressionOrArrow(last(elements))) {
         return false;
     }
 
@@ -383,3 +383,7 @@ function isAnnotatedArray(node) {
 
     return true;
 }
+
+function isFunctionExpressionOrArrow(node) {
+    return t.isFunctionExpression(node) || t.isArrowFunctionExpression(node);
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-angularjs-annotate",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Babel plugin to add angularjs dependency injection annotations",
   "main": "babel-ng-annotate.js",
   "repository": {