Revert revision 33053

third_party/pkg/angular/lib/tools/source_metadata_extractor.dart

 library angular.source_metadata_extractor ;
 
 import 'package:analyzer/src/generated/ast.dart';
 
 import 'package:angular/tools/source_crawler.dart';
 import 'package:angular/tools/common.dart';
+import 'package:angular/utils.dart';
 
 const String _COMPONENT = '-component';
 const String _DIRECTIVE = '-directive';
 String _ATTR_DIRECTIVE = '-attr' + _DIRECTIVE;
 RegExp _ATTR_SELECTOR_REGEXP = new RegExp(r'\[([^\]]+)\]');
 const List<String> _specs = const ['=>!', '=>', '<=>', '@', '&'];
 const Map<String, String> _attrAnnotationsToSpec = const {
   'NgAttr': '@',
   'NgOneWay': '=>',
   'NgOneWayOneTime': '=>!',
   'NgTwoWay': '<=>',
   'NgCallback': '&'
 };
 
 class SourceMetadataExtractor {
+  SourceCrawler sourceCrawler;
   DirectiveMetadataCollectingVisitor metadataVisitor;
 
-  SourceMetadataExtractor([ this.metadataVisitor ]) {
+  SourceMetadataExtractor(this.sourceCrawler, [ this.metadataVisitor ]) {
     if (metadataVisitor == null) {
       metadataVisitor = new DirectiveMetadataCollectingVisitor();
     }
   }
 
-  List<DirectiveInfo> gatherDirectiveInfo(root, SourceCrawler sourceCrawler) {
+  List<DirectiveInfo> gatherDirectiveInfo(root) {
     sourceCrawler.crawl(root, metadataVisitor);
 
     List<DirectiveInfo> directives = <DirectiveInfo>[];
     metadataVisitor.metadata.forEach((DirectiveMetadata meta) {
       DirectiveInfo dirInfo = new DirectiveInfo();
       dirInfo.selector = meta.selector;
       dirInfo.template = meta.template;
       meta.attributeMappings.forEach((attrName, mappingSpec) {
         var spec = _specs
             .firstWhere((specPrefix) => mappingSpec.startsWith(specPrefix),
                 orElse: () => throw '$mappingSpec no matching spec');
         if (spec != '@') {
-          dirInfo.expressionAttrs.add(attrName);
+          dirInfo.expressionAttrs.add(snakecase(attrName));
         }
         if (mappingSpec.length == 1) { // Shorthand. Remove.
           // TODO(pavelgj): Figure out if short-hand LHS should be expanded
           // and added to the expressions list.
           if (attrName != '.') {
-            dirInfo.expressions.add(attrName);
+            dirInfo.expressions.add(_maybeCamelCase(attrName));
           }
         } else {
           mappingSpec = mappingSpec.substring(spec.length);
           if (mappingSpec.startsWith('.')) {
             mappingSpec = mappingSpec.substring(1);
           }
           dirInfo.expressions.add(mappingSpec);
         }
       });
 
       meta.exportExpressionAttrs.forEach((attr) {
+        attr = snakecase(attr);
         if (!dirInfo.expressionAttrs.contains(attr)) {
           dirInfo.expressionAttrs.add(attr);
         }
       });
 
       meta.exportExpressions.forEach((expr) {
         if (!dirInfo.expressions.contains(expr)) {
           dirInfo.expressions.add(expr);
         }
       });
 
 
       // No explicit selector specified on the directive, compute one.
-      var className = meta.className;
+      var className = snakecase(meta.className);
       if (dirInfo.selector == null) {
         if (meta.type == COMPONENT) {
           if (className.endsWith(_COMPONENT)) {
             dirInfo.selector = className.
                 substring(0, className.length - _COMPONENT.length);
           } else {
             throw "Directive name '$className' must end with $_DIRECTIVE, "
             "$_ATTR_DIRECTIVE, $_COMPONENT or have a \$selector field.";
           }
         } else {
           if (className.endsWith(_ATTR_DIRECTIVE)) {
             var attrName = className.
                 substring(0, className.length - _ATTR_DIRECTIVE.length);
             dirInfo.selector = '[$attrName]';
           } else if (className.endsWith(_DIRECTIVE)) {
             dirInfo.selector = className.
                 substring(0, className.length - _DIRECTIVE.length);
           } else {
-            throw "Directive name '$className' must have a \$selector field.";
+            throw "Directive name '$className' must end with $_DIRECTIVE, "
+            "$_ATTR_DIRECTIVE, $_COMPONENT or have a \$selector field.";
           }
         }
       }
       var reprocessedAttrs = <String>[];
       dirInfo.expressionAttrs.forEach((String attr) {
         if (attr == '.') {
           var matches = _ATTR_SELECTOR_REGEXP.allMatches(dirInfo.selector);
           if (matches.length > 0) {
             reprocessedAttrs.add(matches.last.group(1));
           }
         } else {
           reprocessedAttrs.add(attr);
         }
       });
       dirInfo.expressionAttrs = reprocessedAttrs;
       directives.add(dirInfo);
 
     });
 
     return directives;
   }
 }
 
+String _maybeCamelCase(String s) => (s.indexOf('-') > -1) ? camelcase(s) : s;
+
 class DirectiveMetadataCollectingVisitor {
   List<DirectiveMetadata> metadata = <DirectiveMetadata>[];
 
   call(CompilationUnit cu) {
     cu.declarations.forEach((CompilationUnitMember declaration) {
       // We only care about classes.
       if (declaration is! ClassDeclaration) return;
       ClassDeclaration clazz = declaration;
       // Check class annotations for presense of NgComponent/NgDirective.
       DirectiveMetadata meta;
@@ skipping 75 matching lines @@
   }
   return res;
 }
 
 StringLiteral assertString(Expression key) {
   if (key is! StringLiteral) {
     throw 'must be a string literal: ${key.runtimeType}';
   }
   return key;
 }