combine script extractor and import inliner

pkg/polymer/lib/src/build/script_compactor.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /// Transfomer that combines multiple dart script tags into a single one.
 library polymer.src.build.script_compactor;
 
 import 'dart:async';
 import 'dart:convert';
 
 import 'package:analyzer/src/generated/ast.dart';
-import 'package:analyzer/src/generated/error.dart';
-import 'package:analyzer/src/generated/parser.dart';
-import 'package:analyzer/src/generated/scanner.dart';
 import 'package:barback/barback.dart';
 import 'package:path/path.dart' as path;
 import 'package:source_maps/span.dart' show SourceFile;
 
-import 'code_extractor.dart'; // import just for documentation.
+import 'import_inliner.dart' show ImportInliner; // just for docs.
 import 'common.dart';
 
 /// Combines Dart script tags into a single script tag, and creates a new Dart
 /// file that calls the main function of each of the original script tags.
 ///
 /// This transformer assumes that all script tags point to external files. To
 /// support script tags with inlined code, use this transformer after running
-/// [InlineCodeExtractor] on an earlier phase.
+/// [ImportInliner] on an earlier phase.
 ///
 /// Internally, this transformer will convert each script tag into an import
 /// statement to a library, and then uses `initPolymer` (see polymer.dart)  to
 /// process `@initMethod` and `@CustomTag` annotations in those libraries.
 class ScriptCompactor extends Transformer with PolymerTransformer {
   final TransformOptions options;
 
   ScriptCompactor(this.options);
 
   /// Only run on entry point .html files.
@@ skipping 84 matching lines @@
   }
 
   /// Computes the initializers of [dartLibrary]. That is, a closure that calls
   /// Polymer.register for each @CustomTag, and any public top-level methods
   /// labeled with @initMethod.
   Future<List<_Initializer>> _initializersOf(
       AssetId dartLibrary, Transform transform, TransformLogger logger) {
     var initializers = [];
     return transform.readInputAsString(dartLibrary).then((code) {
       var file = new SourceFile.text(_simpleUriForSource(dartLibrary), code);
-      var unit = _parseCompilationUnit(code);
+      var unit = parseCompilationUnit(code);
 
       return Future.forEach(unit.directives, (directive) {
         // Include anything from parts.
         if (directive is PartDirective) {
           var targetId = resolve(dartLibrary, directive.uri.stringValue,
               logger, _getSpan(file, directive));
           return _initializersOf(targetId, transform, logger)
               .then(initializers.addAll);
         }
 
@@ skipping 74 matching lines @@
     var name = function.name.name;
     if (name.startsWith('_')) {
       logger.error('@initMethod is no longer supported on private '
         'functions: $name', span: _getSpan(file, function.name));
       return;
     }
     initializers.add(new _InitMethodInitializer(name));
   }
 }
 
-/// Parse [code] using analyzer.
-CompilationUnit _parseCompilationUnit(String code) {
-  var errorListener = new _ErrorCollector();
-  var reader = new CharSequenceReader(code);
-  var scanner = new Scanner(null, reader, errorListener);
-  var token = scanner.tokenize();
-  var parser = new Parser(null, errorListener);
-  return parser.parseCompilationUnit(token);
-}
-
-class _ErrorCollector extends AnalysisErrorListener {
-  final errors = <AnalysisError>[];
-  onError(error) => errors.add(error);
-}
-
 // TODO(sigmund): consider support for importing annotations with prefixes.
 bool _isInitMethodAnnotation(Annotation node) =>
     node.name.name == 'initMethod' && node.constructorName == null &&
     node.arguments == null;
 bool _isCustomTagAnnotation(Annotation node) => node.name.name == 'CustomTag';
 
 abstract class _Initializer {
   String get symbolName;
   String asCode(String prefix);
 }
@@ skipping 16 matching lines @@
       "() => Polymer.register('$tagName', $prefix.$typeName)";
 }
 
 _getSpan(SourceFile file, ASTNode node) => file.span(node.offset, node.end);
 
 const MAIN_HEADER = """
 library app_bootstrap;
 
 import 'package:polymer/polymer.dart';
 """;