Replace bootstrap logic with 'boot.js', use 'component/dart' mime-type and add

pkg/polymer/lib/src/build/import_inliner.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 inlines polymer-element definitions from html imports.
 library polymer.src.build.import_inliner;
 
 import 'dart:async';
 import 'dart:convert';
 
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:barback/barback.dart';
 import 'package:code_transformers/assets.dart';
 import 'package:path/path.dart' as path;
 import 'package:html5lib/dom.dart' show
     Document, DocumentFragment, Element, Node;
 import 'package:html5lib/dom_parsing.dart' show TreeVisitor;
 import 'package:source_maps/refactor.dart' show TextEditTransaction;
 import 'package:source_maps/span.dart';
 
 import 'common.dart';
 
 class _HtmlInliner extends PolymerTransformer {

[Jennifer Messerly, 2014/04/04 19:39:50]

do you mind adding a TODO here, that this transformer should move to
web_components? since it's not really a Polymer feature to inline HTML Imports.

[Siggi Cherem (dart-lang), 2014/04/04 21:09:11]

Sure thing. I created a bug too: dartbug.com/18037

   final TransformOptions options;
   final Transform transform;
   final TransformLogger logger;
   final AssetId docId;
   final seen = new Set<AssetId>();
   final scriptIds = <AssetId>[];
 
   /// The number of extracted inline Dart scripts. Used as a counter to give
   /// unique-ish filenames.
   int inlineScriptCounter = 0;
 
   _HtmlInliner(this.options, Transform transform)
       : transform = transform,
         logger = transform.logger,
         docId = transform.primaryInput.id;
 
   Future apply() {
     seen.add(docId);
 
     Document document;
     bool changed;
 
     return readPrimaryAsHtml(transform).then((doc) {
       document = doc;
       // Add the main script's ID, or null if none is present.
       // This will be used by ScriptCompactor.
       changed = _extractScripts(document, docId);
       return _visitImports(document);
     }).then((importsFound) {
-      changed = changed || importsFound;
+      bool scriptsRemoved = _removeScripts(document);
+      changed = changed || importsFound || scriptsRemoved;
 
       var output = transform.primaryInput;
       if (changed) output = new Asset.fromString(docId, document.outerHtml);
       transform.addOutput(output);
 
       // We produce a secondary asset with extra information for later phases.
       transform.addOutput(new Asset.fromString(
           docId.addExtension('.scriptUrls'),
           JSON.encode(scriptIds, toEncodable: (id) => id.serialize())));
     });
@@ skipping 49 matching lines @@
   // Should we do the same? Alternatively could we inline head into head and
   // body into body and avoid this whole thing?
   void _moveHeadToBody(Document doc) {
     var insertionPoint = doc.body.firstChild;
     for (var node in doc.head.nodes.toList(growable: false)) {
       if (node is! Element) continue;
       var tag = node.localName;
       var type = node.attributes['type'];
       var rel = node.attributes['rel'];
       if (tag == 'style' || tag == 'script' &&
-            (type == null || type == TYPE_JS || type == TYPE_DART) ||
+            (type == null || type == TYPE_JS || type == TYPE_DART_APP ||
+             type == TYPE_DART_COMPONENT) ||
           tag == 'link' && (rel == 'stylesheet' || rel == 'import')) {
         // Move the node into the body, where its contents will be placed.
         doc.body.insertBefore(node, insertionPoint);
       }
     }
   }
 
   /// Loads an asset identified by [id], visits its imports and collects its
   /// html imports. Then inlines it into the main document.
   Future _inlineImport(AssetId id, Element link) {
     return readAsHtml(id, transform).then((doc) {
       new _UrlNormalizer(transform, id).visit(doc);
       return _visitImports(doc).then((_) {
         _extractScripts(doc, id);
-        _removeScripts(doc);
 
         // TODO(jmesserly): figure out how this is working in vulcanizer.
         // Do they produce a <body> tag with a <head> and <body> inside?
         var imported = new DocumentFragment();
         imported.nodes..addAll(doc.head.nodes)..addAll(doc.body.nodes);
         link.replaceWith(imported);
       });
     });
   }
 
   Future _inlineStylesheet(AssetId id, Element link) {
     return transform.readInputAsString(id).then((css) {
       css = new _UrlNormalizer(transform, id).visitCss(css);
       link.replaceWith(new Element.tag('style')..text = css);
     });
   }
 
-  /// Remove scripts from HTML imports, and remember their [AssetId]s for later
+  /// Remove "component/dart" scripts and remember their [AssetId]s for later
   /// use.
   ///
   /// Dartium only allows a single script tag per page, so we can't inline
   /// the script tags. Instead we remove them entirely.
-  void _removeScripts(Document doc) {
+  bool _removeScripts(Document doc) {
+    bool changed = false;
     for (var script in doc.querySelectorAll('script')) {
-      if (script.attributes['type'] == TYPE_DART) {
+      if (script.attributes['type'] == TYPE_DART_COMPONENT) {
+        changed = true;
         script.remove();
         var src = script.attributes['src'];
         scriptIds.add(uriToAssetId(docId, src, logger, script.sourceSpan));
-
-        // only the first script needs to be added.
-        // others are already removed by _extractScripts
-        return;
       }
     }
+    return changed;
   }
 
   /// Split inline scripts into their own files. We need to do this for dart2js
   /// to be able to compile them.
   ///
   /// This also validates that there weren't any duplicate scripts.
   bool _extractScripts(Document doc, AssetId sourceId) {
     bool changed = false;
     bool first = true;
     for (var script in doc.querySelectorAll('script')) {
-      if (script.attributes['type'] != TYPE_DART) continue;
+      var type = script.attributes['type'];
+      if (type != TYPE_DART_COMPONENT && type != TYPE_DART_APP) continue;
 
       // only one Dart script per document is supported in Dartium.
-      if (!first) {
-        // Remove the script. It's invalid to have more than one in Dartium.
-        script.remove();
-        changed = true;
-
-        // TODO(jmesserly): remove this when we are running linter.
-        logger.warning('more than one Dart script per HTML '
-            'document is not supported. Script will be ignored.',
-            span: script.sourceSpan);
-        continue;
+      if (type == TYPE_DART_APP) {
+        if (!first) logger.warning(COMPONENT_WARNING, span: script.sourceSpan);
+        first = false;
       }
 
-      first = false;
-
       var src = script.attributes['src'];
       if (src != null) continue;
 
       final filename = path.url.basename(docId.path);
       final count = inlineScriptCounter++;
       var code = script.text;
       // TODO(sigmund): ensure this path is unique (dartbug.com/12618).
       script.attributes['src'] = src = '$filename.$count.dart';
       script.text = '';
       changed = true;
 
       var newId = docId.addExtension('.$count.dart');
       // TODO(jmesserly): consolidate this check with our other parsing of the
       // Dart code, so we only parse it once.
       if (!_hasLibraryDirective(code)) {
         // Inject a library tag with an appropriate library name.
 
         // Transform AssetId into a package name. For example:
         //   myPkgName|lib/foo/bar.html -> myPkgName.foo.bar_html
         //   myPkgName|web/foo/bar.html -> myPkgName.web.foo.bar_html
         // This should roughly match the recommended library name conventions.
         var libName = '${path.withoutExtension(sourceId.path)}_'
             '${path.extension(sourceId.path).substring(1)}';
         if (libName.startsWith('lib/')) libName = libName.substring(4);
         libName = libName.replaceAll('/', '.').replaceAll('-', '_');
-        libName = '${sourceId.package}.$libName';
+        libName = '${sourceId.package}.${libName}_$count';
 
         code = "library $libName;\n$code";
       }
       transform.addOutput(new Asset.fromString(newId, code));
     }
     return changed;
   }
 }
 
 /// Parse [code] and determine whether it has a library directive.
@@ skipping 15 matching lines @@
   ImportInliner(this.options);
 
   /// Only run on entry point .html files.
   Future<bool> isPrimary(Asset input) =>
       new Future.value(options.isHtmlEntryPoint(input.id));
 
   Future apply(Transform transform) =>
       new _HtmlInliner(options, transform).apply();
 }
 
-const TYPE_DART = 'application/dart';
+const TYPE_DART_APP = 'application/dart';
+const TYPE_DART_COMPONENT = 'component/dart';
 const TYPE_JS = 'text/javascript';
 
 /// Internally adjusts urls in the html that we are about to inline.
 class _UrlNormalizer extends TreeVisitor {
   final Transform transform;
 
   /// Asset where the original content (and original url) was found.
   final AssetId sourceId;
 
   _UrlNormalizer(this.transform, this.sourceId);
 
   visitElement(Element node) {
     node.attributes.forEach((name, value) {
       if (_urlAttributes.contains(name)) {
         if (value != '' && !value.trim().startsWith('{{')) {
           node.attributes[name] = _newUrl(value, node.sourceSpan);
         }
       }
     });
     if (node.localName == 'style') {
       node.text = visitCss(node.text);
-    } else if (node.localName == 'script' &&
-        node.attributes['type'] == TYPE_DART) {
+    } else if (node.localName == 'script') {
+      var type = node.attributes['type'];
       // TODO(jmesserly): we might need to visit JS too to handle ES Harmony
       // modules.
-      node.text = visitInlineDart(node.text);
+      if (type == TYPE_DART_APP || type == TYPE_DART_COMPONENT) {
+        node.text = visitInlineDart(node.text);
+      }
     }
     super.visitElement(node);
   }
 
   static final _URL = new RegExp(r'url\(([^)]*)\)', multiLine: true);
   static final _QUOTE = new RegExp('["\']', multiLine: true);
 
   /// Visit the CSS text and replace any relative URLs so we can inline it.
   // Ported from:
   // https://github.com/Polymer/vulcanize/blob/c14f63696797cda18dc3d372b78aa3378acc691f/lib/vulcan.js#L149
@@ skipping 86 matching lines @@
   'formaction', // in button, input
   'href',       // in a, area, link, base, command
   'icon',       // in command
   'manifest',   // in html
   'poster',     // in video
   'src',        // in audio, embed, iframe, img, input, script, source, track,
                 //    video
 ];
 
 _getSpan(SourceFile file, AstNode node) => file.span(node.offset, node.end);
+
+const COMPONENT_WARNING =
+    'More than one Dart script per HTML document is not supported, but in the '
+    'near future Dartium will execute each tag as a separate isolate. If this '
+    'code is meant to load definitions that are part of the same application '
+    'you should switch it to use the "component/dart" mime-type instead.';