Merge branch 'master' into gh-pages

Author: Andrew Schmadel

CHANGES.md

@@ -1,5 +1,14 @@
 # babel-plugin-angularjs-annotate changelog
 
+## v0.5.0 2016-08-04
+ * bugfix: follow references in component definition objects (#7)
+ * bugfix: remove superfluous dependency on `babel`
+ * New Feature: Add annotations to injectable `template` and `templateUrl` component properties
+ * New Feature: Adds a very simple REPL (see the `gh-pages` branch).
+
+## v0.4.0 2016-07-25
+ * New option: Disable implicit matching (only annotate functions marked up with `/* @ngInject */` or `'ngInject'`)
+
 ## v0.3.0 2016-07-25
  * Add support for ES6 arrow functions
 

README.md

@@ -48,6 +48,8 @@ To pass this option to the plugin, [add it to your Babel configuration](https://
 
 See [ng-annotate](https://github.com/olov/ng-annotate)'s documentation and the [test sources](tests/) for details about the patterns that can be automatically detected by ng-annotate and this plugin, as well as information about how to explicitly mark functions and classes for annotation. 
 
+[Try it out in your browser](http://schmod.github.io/babel-plugin-angularjs-annotate/).
+
 ### ES6 Annotations
 
 This plugin can annotate some ES6 classes and arrow functions that are not supported by ng-annotate:

ng-annotate-main.js

@@ -390,12 +390,8 @@ function matchRegular(path, ctx) {
         args.length === 2 && t.isLiteral(args[0]) && is.string(args[0].value) && argPaths[1]);
 
     if (method.name === "component") {
-        const controllers = target.get("properties").filter(prop => prop.node.key.name == "controller");
-        if(controllers.length === 1) {
-            target = controllers[0].get("value");
-        } else {
-            return false;
-        }
+        target.node.$chained = chainedRegular;
+        return matchComponent(target);
     }
 
     if (target) {
@@ -453,6 +449,34 @@ function matchResolve(props) {
     return [];
 }
 
+function matchComponent(path){
+    let chained = path.node.$chained;
+    if(t.isIdentifier(path)) {
+        path = followReference(path);
+        if(t.isVariableDeclarator(path)){
+            path = path.get('init');
+        }
+    }
+    if(t.isObjectExpression(path)){
+        path.node.chained = chained;
+        const props = path.get("properties");
+
+        const ctrl = matchProp("controller", props);
+        const tmpl =  matchProp("template", props);
+        const tmplUrl =  matchProp("templateUrl", props);
+
+        let res = [];
+        ctrl && res.push(ctrl);
+        tmpl && res.push(tmpl);
+        tmplUrl && res.push(tmplUrl);
+
+        res.forEach(t => t.node.$chained = chained);
+        return res;
+    } else {
+        return false;
+    }
+}
+
 function renamedString(ctx, originalString) {
     if (ctx.rename) {
         return ctx.rename.get(originalString) || originalString;

package.json

@@ -1,14 +1,13 @@
 {
   "name": "babel-plugin-angularjs-annotate",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Babel plugin to add angularjs dependency injection annotations",
   "main": "babel-ng-annotate.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/schmod/babel-plugin-angularjs-annotate"
   },
   "dependencies": {
-    "babel": "^6.5.1",
     "babel-plugin-transform-es2015-function-name": "^6.9.0",
     "simple-is": "~0.2.0"
   },

tests/references.js

@@ -180,6 +180,35 @@ module.exports = {
             });
         }
       }
+    },
+    {
+        name: "chained component controller",
+        implicit: true,
+        input: function() {
+            var tmplProvider = function(bar){};
+            var testFeedback = {
+                controller: testFeedbackController,
+                template: tmplProvider
+            };
+            function testFeedbackController(foo) {}
+
+            angular.module("test.feedback.pkg", [])
+                .component("testFeedback", testFeedback);
+        },
+        expected: function() {
+            testFeedbackController.$inject = ["foo"];
+            var tmplProvider = function(bar){};
+            tmplProvider.$inject = ["bar"];
+            var testFeedback = {
+                controller: testFeedbackController,
+                template: tmplProvider
+            };
+            function testFeedbackController(foo) {
+            }
+
+            angular.module("test.feedback.pkg", [])
+                .component("testFeedback", testFeedback);
+        }
     }
   ]
 }

tests/simple.js

@@ -563,6 +563,32 @@ module.exports = {
       })();
       angular.module("MyMod").controller("MyCtrl", myCtrl10);
     }
+  },
+  {
+    name: "injectable component templates/controller/templateurl",
+    implicit: true,
+    input: function(){
+      angular.module("mod").component("cmp", {
+        controller: function(a){},
+        template: function(b){},
+        templateUrl: function(c){},
+      }).component("cmp2", {
+        controller: "myCtrl",
+        template: "tmpl",
+        templateUrl: "template.html"
+      });
+    },
+    expected: function(){
+      angular.module("mod").component("cmp", {
+        controller: ["a", function(a){}],
+        template: ["b", function(b){}],
+        templateUrl: ["c", function(c){}],
+      }).component("cmp2", {
+        controller: "myCtrl",
+        template: "tmpl",
+        templateUrl: "template.html"
+      });
+    }
   }
  ]
 };