Reducing the amount of code we generate in the compiler: We still continue

lib/src/compiler.dart

 // Copyright (c) 2012, 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.
 
 library compiler;
 
 import 'dart:async';
 import 'dart:collection' show SplayTreeMap;
 import 'dart:json' as json;
 import 'package:analyzer_experimental/src/generated/ast.dart' show Directive, UriBasedDirective;
@@ skipping 536 matching lines @@
       }
     }
   }
 
   /** Emit the generated code corresponding to each input file. */
   void _emit() {
     for (var file in files) {
       if (file.isDart || file.isStyleSheet) continue;
       _time('Codegen', file.path, () {
         var fileInfo = info[file.path];
-        fixupHtmlCss(fileInfo, options, getCssPolyfillKind);
+        fixupHtmlCss(fileInfo, options);
         _emitComponents(fileInfo);
       });
     }
 
     var entryPoint = files[0];
     assert(info[entryPoint.path].isEntryPoint);
     _emitMainDart(entryPoint);
     _emitMainHtml(entryPoint);
 
     assert(_unqiueOutputs());
   }
 
   bool _unqiueOutputs() {
     var seen = new Set();
     for (var file in output) {
       if (seen.contains(file.path)) {
         throw new StateError('internal error: '
             'duplicate output file ${file.path}. Files were: $output');
       }
       seen.add(file.path);
     }
     return true;
   }
 
   /** Emit the main .dart file. */
   void _emitMainDart(SourceFile file) {
     var fileInfo = info[file.path];
-    var printer = new EntryPointEmitter(fileInfo, global)
-        .run(_pathMapper, _edits[fileInfo.userCode], options.rewriteUrls);
-    _emitFileAndSourceMaps(fileInfo, printer, fileInfo.dartCodeUrl);
+
+    var codeInfo = fileInfo.userCode;
+    if (codeInfo != null) {
+      var printer = new CodePrinter(0);
+      if (codeInfo.libraryName == null) {
+        printer.addLine('library ${fileInfo.libraryName};');
+      }
+      printer.add(codeInfo.code);
+      _emitFileAndSourceMaps(fileInfo, printer, fileInfo.dartCodeUrl);
+    }
   }
 
   // TODO(jmesserly): refactor this out of Compiler.
   /** Generate an html file with the (trimmed down) main html page. */
   void _emitMainHtml(SourceFile file) {
     var fileInfo = info[file.path];
 
     var bootstrapName = '${path.basename(file.path)}_bootstrap.dart';
     var bootstrapPath = path.join(path.dirname(file.path), bootstrapName);
     var bootstrapOutPath = _pathMapper.outputPath(bootstrapPath, '');
     var bootstrapOutName = path.basename(bootstrapOutPath);
-    output.add(new OutputFile(bootstrapOutPath, _bootstrapCode(
-          _pathMapper.importUrlFor(new FileInfo(
-              new UrlInfo('', bootstrapPath, null)), fileInfo))));
+    var bootstrapInfo = new FileInfo(new UrlInfo('', bootstrapPath, null));
+    var printer = generateBootstrapCode(bootstrapInfo, fileInfo, global,
+        _pathMapper, options);
+    printer.build(bootstrapOutPath);
+    output.add(new OutputFile(
+          bootstrapOutPath, printer.text, source: file.path));
 
     var document = file.document;
     var hasCss = _emitAllCss();
     transformMainHtml(document, fileInfo, _pathMapper, hasCss,
-        options.rewriteUrls, _messages);
+        options.rewriteUrls, _messages, global);
 
     document.body.nodes.add(parseFragment(
         '<script type="application/dart" src="$bootstrapOutName"></script>'));
 
     output.add(new OutputFile(_pathMapper.outputPath(file.path, '.html'),
         document.outerHtml, source: file.path));
   }
 
   // TODO(jmesserly): refactor this and other CSS related transforms out of
   // Compiler.
@@ skipping 54 matching lines @@
             if (buff.isEmpty) {
               buff.write(
                   '/* Auto-generated from components style tags. */\n'
                   '/* DO NOT EDIT. */\n\n');
             }
             buff.write(
                 '/* ==================================================== \n'
                 '   Component ${component.tagName} stylesheet \n'
                 '   ==================================================== */\n');
 
-            var polyType = getCssPolyfillKind(component);
+            var cssPolyfillKind = CssPolyfillKind.of(options, component);
             var tagName = component.tagName;
             if (!component.hasAuthorStyles) {
               if (_cssResetStyleSheet != null && !options.mangleCss) {
                 // If component doesn't have apply-author-styles then we need to
                 // reset the CSS the styles for the component (if css-reset file
                 // option was passed).
                 buff.write('\n/* Start CSS Reset */\n');
                 buff.write(emitComponentStyleSheet(_cssResetStyleSheet, tagName,
-                    polyType));
+                    cssPolyfillKind));
                 buff.write('/* End CSS Reset */\n\n');
               }
             }
-            buff.write(emitComponentStyleSheet(styleSheet, tagName, polyType));
+            buff.write(emitComponentStyleSheet(styleSheet, tagName,
+                  cssPolyfillKind));
             buff.write('\n\n');
           }
         }
       }
     }
 
     if (buff.isEmpty) return false;
 
     var cssPath = _pathMapper.outputPath(_mainPath, '.css', true);
     output.add(new OutputFile(cssPath, buff.toString()));
     return true;
   }
 
   /** Emits the Dart code for all components in [fileInfo]. */
   void _emitComponents(FileInfo fileInfo) {
     for (var component in fileInfo.declaredComponents) {
       // TODO(terry): Handle one stylesheet per component see fixupHtmlCss.
       if (component.styleSheets.length > 1 && options.processCss) {
         var span = component.externalFile != null
             ? component.externalFile.sourceSpan : null;
         _messages.warning(
             'Component has more than one stylesheet - first stylesheet used.',
             span);
       }
-      var polyType = getCssPolyfillKind(component);
-      var printer = new WebComponentEmitter(fileInfo, _messages, polyType)
+      var printer = new WebComponentEmitter(fileInfo, _messages,
+          CssPolyfillKind.of(options, component))
           .run(component, _pathMapper, _edits[component.userCode]);
       _emitFileAndSourceMaps(component, printer, component.externalFile);
     }
   }
 
-  /** Given a component and CompilerOptions compute the CSS polyfill to emit. */
-  CssPolyfillKind getCssPolyfillKind(ComponentInfo component) {
-    if (!useCssPolyfill(options, component)) return CssPolyfillKind.NO_POLYFILL;
-
-    if (options.mangleCss) return CssPolyfillKind.MANGLED_POLYFILL;
-
-    if (!component.hasAuthorStyles && !hasCssReset)
-      return CssPolyfillKind.MANGLED_POLYFILL;
-
-    return CssPolyfillKind.SCOPED_POLYFILL;
-  }
-
   /**
    * Emits a file that was created using [CodePrinter] and it's corresponding
    * source map file.
    */
   void _emitFileAndSourceMaps(
       LibraryInfo lib, CodePrinter printer, UrlInfo dartCodeUrl) {
     // Bail if we had an error generating the code for the file.
     if (printer == null) return;
 
     var libPath = _pathMapper.outputLibraryPath(lib);
@@ skipping 20 matching lines @@
     var filename = path.basename(filePath);
     for (int i = (60 - logMessage.length - filename.length); i > 0 ; i--) {
       message.write(' ');
     }
     message.write(filename);
     return time(message.toString(), callback,
         printTime: options.verbose || printTime);
   }
 }
 
-// TODO(terry): Replace with enum when supported.
-/** Enum for type of polyfills supported. */
-class CssPolyfillKind {
-  final index;
-  const CssPolyfillKind(this.index);
-
-  /** Emit CSS selectors as seen (no polyfill). */
-  static const NO_POLYFILL = const CssPolyfillKind(0);
-
-  /** Emit CSS selectors scoped to the "is" attribute of the component. */
-  static const SCOPED_POLYFILL = const CssPolyfillKind(1);
-
-  /** Emit CSS selectors mangled. */
-  static const MANGLED_POLYFILL = const CssPolyfillKind(2);
-}
-
-/**
- * The code that will be used to bootstrap the application, this is inlined in
- * the main.html.html output file.
- */
-String _bootstrapCode(String userMainImport) => """
-library bootstrap;
-
-import '$userMainImport' as userMain;
-
-main() {
-  userMain.main();
-  userMain.init_autogenerated();
-}
-""";