support object methods

fixes #16

Author: Andrew Schmadel

babel-ng-annotate.js

@@ -113,6 +113,11 @@ module.exports = function() {
           ngInject.inspectFunction(path, ctx);
         }
       },
+      ObjectMethod: {
+        enter(path) {
+          ngInject.inspectFunction(path, ctx);
+        }
+      },
       CallExpression: {
         enter(path) {
           ngInject.inspectCallExpression(path, ctx);

ng-annotate-main.js

@@ -433,7 +433,10 @@ function matchProp(name, props) {
 
         if ((t.isIdentifier(prop.key) && prop.key.name === name) ||
             (t.isLiteral(prop.key) && prop.key.value === name)) {
-            return (propOrPath.get && propOrPath.get("value")) || prop.value; // FunctionExpression or ArrayExpression
+              if(t.isObjectMethod(prop)){
+                return propOrPath;
+              }
+              return (propOrPath.get && propOrPath.get("value")) || prop.value; // FunctionExpression or ArrayExpression
         }
     }
     return null;
@@ -443,7 +446,10 @@ function matchResolve(props) {
     const resolveObject = matchProp("resolve", props);
     if (resolveObject && t.isObjectExpression(resolveObject)) {
         return resolveObject.get("properties").map(function(prop) {
-            return prop.get("value");
+            if(t.isObjectMethod(prop)){
+              return prop;
+            }
+             return prop.get("value");
         });
     }
     return [];
@@ -557,6 +563,21 @@ function judgeSuspects(ctx) {
             return;
         }
 
+        if(t.isObjectMethod(path) && target.params.length){
+          // Replace object method shorthand { foo(bar){} } with long-form { foo: function(bar){} } so we can annotate it
+          const func = t.functionExpression(null, target.params, target.body, target.generator, target.async);
+          func.returnType = target.returnType;
+
+          path.replaceWith(t.objectProperty(
+            target.key,
+            func,
+            target.computed
+          ));
+
+          path = path.get("value");
+          target = path.node;
+        }
+
         if (isFunctionExpressionWithArgs(target) && !t.isVariableDeclarator(path.parent)) {
             insertArray(ctx, path);
         } else if (isGenericProviderName(target)) {

tests/es6.js

@@ -151,6 +151,36 @@ module.exports = {
       svc.$inject = ['dep1'];
       svc.foo = 'bar';
     }
+  }, {
+    name: "object method",
+    explicit: true,
+    input: function() {
+      var foo = {
+        bar(baz){
+          'ngInject';
+        }
+      };
+    },
+    expected: function() {
+      var foo = {
+        bar: ['baz', function(baz) {
+          'ngInject';
+        }]
+      }
+    }
+  }, {
+    name: "implicit object method",
+    explicit: false,
+    input: function() {
+      angular.component('myComponent', {
+        controller(a){}
+      });
+    },
+    expected: function() {
+      angular.component('myComponent', {
+        controller: ['a', function(a){}]
+      });
+    }
   }
  ]
 };

tests/ui-router.js

@@ -11,6 +11,7 @@ module.exports = {
                 simpleObj: function() { a },
                 promiseObj: function($scope, $timeout) { b },
                 translations: "translations",
+                objMethod(a) { a }
             },
             params: {
                 simple: function($scope) {},
@@ -33,6 +34,11 @@ module.exports = {
                     templateProvider: function($scope) {},
                     controller: function($scope) {},
                 },
+                viewc: {
+                  dontAlterMe(arg) {},
+                  templateProvider($scope) {},
+                  controller($scope) {}
+                },
                 dontAlterMe: null,
             },
             controller: function($scope, simpleObj, promiseObj, translations) { c },
@@ -54,6 +60,7 @@ module.exports = {
                 simpleObj: function() { a },
                 promiseObj: ["$scope", "$timeout", function($scope, $timeout) { b }],
                 translations: "translations",
+                objMethod: ["a", function(a) { a }]
             },
             params: {
                 simple: ["$scope", function($scope) {}],
@@ -76,6 +83,11 @@ module.exports = {
                     templateProvider: ["$scope", function($scope) {}],
                     controller: ["$scope", function($scope) {}],
                 },
+                viewc: {
+                  dontAlterMe(arg) {},
+                  templateProvider: ["$scope", function($scope) {}],
+                  controller: ["$scope", function($scope) {}]
+                },
                 dontAlterMe: null,
             },
             controller: ["$scope", "simpleObj", "promiseObj", "translations", function($scope, simpleObj, promiseObj, translations) { c }],
@@ -233,4 +245,4 @@ module.exports = {
       }
     }
   ]
-}
+}