feat($compile): put custom annotations on DDO

petebacondarwin · petebacondarwin · commit f338e96ccc73 · 2016-04-04T20:07:31.000+01:00
Closes angular#14369 Closes angular#14279 Closes angular#14284
diff --git a/src/ng/compile.js b/src/ng/compile.js
@@ -1106,7 +1106,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
       }
 
       var template = (!options.template && !options.templateUrl ? '' : options.template);
-      return {
+      var ddo = {
         controller: controller,
         controllerAs: identifierForController(options.controller) || options.controllerAs || '$ctrl',
         template: makeInjectable(template),
@@ -1117,9 +1117,21 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
         restrict: 'E',
         require: options.require
       };
+
+      // Copy annotations (starting with $) over to the DDO
+      forEach(options, function(val, key) {
+        if (key.charAt(0) === '$') ddo[key] = val;
+      });
+
+      return ddo;
     }
 
-    // Copy any annotation properties (starting with $) over to the factory function
+    // TODO(pete) remove the following `forEach` before we release 1.6.0
+    // The component-router@0.2.0 looks for the annotations on the controller constructor
+    // Nothing in Angular looks for annotations on the factory function but we can't remove
+    // it from 1.5.x yet.
+
+    // Copy any annotation properties (starting with $) over to the factory and controller constructor functions
     // These could be used by libraries such as the new component router
     forEach(options, function(val, key) {
       if (key.charAt(0) === '$') {
diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js
@@ -10461,22 +10461,35 @@ describe('$compile', function() {
       }));
     });
 
-    it('should add additional annotations to the controller constructor', function() {
+    it('should expose additional annotations on the directive definition object', function() {
       var myModule = angular.module('my', []).component('myComponent', {
         $canActivate: 'canActivate',
         $routeConfig: 'routeConfig',
         $customAnnotation: 'XXX'
       });
       module('my');
       inject(function(myComponentDirective) {
-        expect(myComponentDirective[0].controller).toEqual(jasmine.objectContaining({
+        expect(myComponentDirective[0]).toEqual(jasmine.objectContaining({
           $canActivate: 'canActivate',
           $routeConfig: 'routeConfig',
           $customAnnotation: 'XXX'
         }));
       });
     });
 
+    it('should support custom annotations if the controller is named', function() {
+      var myModule = angular.module('my', []).component('myComponent', {
+        $customAnnotation: 'XXX',
+        controller: 'SomeNamedController'
+      });
+      module('my');
+      inject(function(myComponentDirective) {
+        expect(myComponentDirective[0]).toEqual(jasmine.objectContaining({
+          $customAnnotation: 'XXX'
+        }));
+      });
+    });
+
     it('should return ddo with reasonable defaults', function() {
       angular.module('my', []).component('myComponent', {});
       module('my');
