fix(source_metadata_extractor): Extract config from controllers

fixes #1308

Previous to this commit, the configuration would only be extracted for
Decorators and Components

Author: vicb

lib/tools/common.dart

@@ -28,21 +28,16 @@ class DirectiveInfo {
   }
 }
 
-const String DIRECTIVE = 'DIRECTIVE';
-const String COMPONENT = 'COMPONENT';
-
 class DirectiveMetadata {
   String className;
-  String type; // DIRECTIVE/COMPONENT
   String selector;
   String template;
   Map<String, String> attributeMappings;
   List<String> exportExpressionAttrs;
   List<String> exportExpressions;
 
-  DirectiveMetadata([this.className, this.type, this.selector,
-                     this.attributeMappings, this.exportExpressionAttrs,
-                     this.exportExpressions]) {
+  DirectiveMetadata([this.className, this.selector, this.attributeMappings,
+                     this.exportExpressionAttrs, this.exportExpressions]) {
     if (attributeMappings == null) {
       attributeMappings = <String, String>{};
     }

lib/tools/source_metadata_extractor.dart

@@ -68,7 +68,6 @@ class SourceMetadataExtractor {
         }
       });
 
-
       // No explicit selector specified on the directive, compute one.
       var className = meta.className;
       if (dirInfo.selector == null) {
@@ -144,14 +143,11 @@ class DirectiveMetadataCollectingAstVisitor extends RecursiveAstVisitor {
       if (ann.arguments == null) return; // Ignore non-class annotations.
       // TODO(pavelj): this is not a safe check for the type of the
       // annotations, but good enough for now.
-      if (ann.name.name != 'Component'
-          && ann.name.name != 'Decorator') return;
-
-      bool isComponent = ann.name.name == 'Component';
+      if (ann.name.name != 'Component' &&
+          ann.name.name != 'Decorator' &&
+          ann.name.name != 'Controller') return;
 
-      var meta = new DirectiveMetadata()
-        ..className = clazz.name.name
-        ..type = isComponent ? COMPONENT : DIRECTIVE;
+      var meta = new DirectiveMetadata()..className = clazz.name.name;
       metadata.add(meta);
 
       ann.arguments.arguments.forEach((Expression arg) {

test/tools/source_metadata_extractor_spec.dart

@@ -13,7 +13,7 @@ void main() {
 
     it('should extract expressions and attribute names with expressions', () {
       var info = extractDirectiveInfo([
-          new DirectiveMetadata('FooComponent', COMPONENT, 'foo-component', {
+          new DirectiveMetadata('FooComponent', 'foo-component', {
               'barVal': '@bar',
               'baz-expr1': '<=>baz1',
               'baz-expr2': '=>baz2',
@@ -37,9 +37,7 @@ void main() {
 
     it('should build a component selector if one is not explicitly specified', () {
       var info = extractDirectiveInfo([
-          new DirectiveMetadata('MyFooComponent', COMPONENT, 'my-foo', {
-              'foo-expr': '=>fooExpr'
-          })
+          new DirectiveMetadata('MyFooComponent', 'my-foo', {'foo-expr': '=>fooExpr'})
       ]);
 
       expect(info, hasLength(1));
@@ -48,9 +46,7 @@ void main() {
 
     it('should build an element directive selector if one is not explicitly specified', () {
       var info = extractDirectiveInfo([
-          new DirectiveMetadata('MyFooDirective', DIRECTIVE, 'my-foo', {
-              'foo-expr': '=>fooExpr'
-          })
+          new DirectiveMetadata('MyFooDirective', 'my-foo', {'foo-expr': '=>fooExpr'})
       ]);
 
       expect(info, hasLength(1));
@@ -59,9 +55,7 @@ void main() {
 
     it('should build an attr directive selector if one is not explicitly specified', () {
       var info = extractDirectiveInfo([
-          new DirectiveMetadata('MyFooAttrDirective', '[my-foo]', '[my-foo]', {
-              'foo-expr': '=>fooExpr'
-          })
+          new DirectiveMetadata('MyFooAttrDirective', '[my-foo]', {'foo-expr': '=>fooExpr'})
       ]);
 
       expect(info, hasLength(1));
@@ -70,9 +64,7 @@ void main() {
 
     it('should figure out attribute name if dot(.) is used', () {
       var info = extractDirectiveInfo([
-          new DirectiveMetadata('MyFooAttrDirective', DIRECTIVE, '[my-foo]', {
-              '.': '=>fooExpr'
-          })
+          new DirectiveMetadata('MyFooAttrDirective', '[my-foo]', {'.': '=>fooExpr'})
       ]);
 
       expect(flattenList(info, (DirectiveInfo i) => i.expressionAttrs),
@@ -81,9 +73,7 @@ void main() {
 
     it('should figure out attribute name from selector if dot(.) is used', () {
       var info = extractDirectiveInfo([
-          new DirectiveMetadata('MyFooAttrDirective', DIRECTIVE, '[blah][foo]', {
-              '.': '=>fooExpr'
-          })
+          new DirectiveMetadata('MyFooAttrDirective', '[blah][foo]', {'.': '=>fooExpr'})
       ]);
 
       expect(flattenList(info, (DirectiveInfo i) => i.expressionAttrs),
@@ -92,9 +82,7 @@ void main() {
 
     it('should include exported expression attributes', () {
       var info = extractDirectiveInfo([
-          new DirectiveMetadata('MyFooAttrDirective', DIRECTIVE, '[blah][foo]', {
-              '.': '=>fooExpr'
-          }, ['baz'])
+          new DirectiveMetadata('MyFooAttrDirective', '[blah][foo]', {'.': '=>fooExpr'}, ['baz'])
       ]);
 
       expect(flattenList(info, (DirectiveInfo i) => i.expressionAttrs),
@@ -103,13 +91,12 @@ void main() {
 
     it('should include exported expressions', () {
       var info = extractDirectiveInfo([
-          new DirectiveMetadata('MyFooAttrDirective', DIRECTIVE, '[blah][foo]', {
-              '.': '=>fooExpr'
-          }, null, ['ctrl.baz'])
+          new DirectiveMetadata('MyFooAttrDirective', '[blah][foo]', {'.': '=>fooExpr'}, null,
+                                ['ctrl.baz'])
       ]);
 
       expect(flattenList(info, (DirectiveInfo i) => i.expressions),
-      equals(['fooExpr', 'ctrl.baz']));
+          equals(['fooExpr', 'ctrl.baz']));
     });
 
   });

test/tools/transformer/metadata_generator_spec.dart

@@ -285,6 +285,31 @@ main() {
           });
     });
 
+    it('should extract list arguments from Controllers', () {
+      return generates(phases,
+          inputs: {
+            'angular|lib/angular.dart': libAngular,
+            'a|web/main.dart': '''
+                import 'package:angular/angular.dart';
+
+                @Controller(exportExpressions: ['one', 'two'])
+                class Engine {}
+
+                main() {}
+                '''
+          },
+          imports: [
+            'import \'main.dart\' as import_0;',
+            'import \'package:angular/angular.dart\' as import_1;',
+          ],
+          classes: {
+            'import_0.Engine': [
+              "const import_1.Controller(exportExpressions: "
+                  "const ['one','two',])",
+            ]
+          });
+    });
+
     it('should extract primitive literals', () {
       return generates(phases,
           inputs: {
@@ -726,6 +751,11 @@ class Decorator extends Directive {
       super(map: map);
 }
 
+class Controller extends Directive {
+  const Decorator({selector, module, map, visibility, exportExpressions}) :
+      super(map: map);
+}
+
 class DummyAnnotation extends Directive {
   const DummyAnnotation(object);
 }