Strip bindings before calling Uri.parse

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';
 
@@ skipping 399 matching lines @@
     }
 
     if (!output.hasEdits) return code;
 
     // TODO(sigmund): emit source maps when barback supports it (see
     // dartbug.com/12340)
     return (output.commit()..build(file.url)).text;
   }
 
   String _newUrl(String href, Span span) {
-    // Uri.parse blows up on invalid characters (like {{). Encoding the uri
-    // allows it to be parsed, which does the correct thing in the general case.
-    // This uri not used to build the new uri, so it never needs to be decoded.
-    var uri = Uri.parse(Uri.encodeFull(href));
+    // Take all bindings out of the path and replace with [BINDING_PLACEHOLDER]
+    // so [Uri.parse] will not fail.
+    var bindingMatches = BINDING_REGEX.allMatches(href).map((m) => m.group(0));
+    href = href.replaceAll(BINDING_REGEX, BINDING_PLACEHOLDER);
+
+    var uri = Uri.parse(href);
     if (uri.isAbsolute) return href;
     if (!uri.scheme.isEmpty) return href;
     if (!uri.host.isEmpty) return href;
     if (uri.path.isEmpty) return href;  // Implies standalone ? or # in URI.
     if (path.isAbsolute(href)) return href;
 
     var id = uriToAssetId(sourceId, href, transform.logger, span);
     if (id == null) return href;
     var primaryId = transform.primaryInput.id;
 
-    if (id.path.startsWith('lib/')) {
-      return '${topLevelPath}packages/${id.package}/${id.path.substring(4)}';
+    // Put the original bindings back into the path now that we have parsed it.
+    var newPath = id.path;
+    for (var bindingMatch in bindingMatches) {
+      newPath = newPath.replaceFirst(BINDING_PLACEHOLDER, bindingMatch);
     }
 
-    if (id.path.startsWith('asset/')) {
-      return '${topLevelPath}assets/${id.package}/${id.path.substring(6)}';
+    if (newPath.startsWith('lib/')) {
+      return '${topLevelPath}packages/${id.package}/${newPath.substring(4)}';
+    }
+
+    if (newPath.startsWith('asset/')) {
+      return '${topLevelPath}assets/${id.package}/${newPath.substring(6)}';
     }
 
     if (primaryId.package != id.package) {
       // Techincally we shouldn't get there
       transform.logger.error("don't know how to include $id from $primaryId",
           span: span);
       return href;
     }
 
     var builder = path.url;
-    return builder.relative(builder.join('/', id.path),
+    return builder.relative(builder.join('/', newPath),
         from: builder.join('/', builder.dirname(primaryId.path)));
   }
 }
 
 /// HTML attributes that expect a URL value.
 /// <http://dev.w3.org/html5/spec/section-index.html#attributes-1>
 ///
 /// Every one of these attributes is a URL in every context where it is used in
 /// the DOM. The comments show every DOM element where an attribute can be used.
 const _urlAttributes = const [
   'action',     // in form
   'background', // in body
   'cite',       // in blockquote, del, ins, q
   'data',       // in object
   '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
 ];
 
 /// When inlining <link rel="stylesheet"> tags copy over all attributes to the
 /// style tag except these ones.
 const IGNORED_LINKED_STYLE_ATTRS =
     const ['charset', 'href', 'href-lang', 'rel', 'rev'];
 
-/// Global RegExp objects for validating generated library names.
+/// Global RegExp objects.
 final INVALID_LIB_CHARS_REGEX = new RegExp('[^a-z0-9_]');
 final NUM_REGEX = new RegExp('[0-9]');
+final BINDING_REGEX = new RegExp(r'({{.*}})');
+
+/// Placeholder for bindings in urls for [Uri.parse].
+final BINDING_PLACEHOLDER = '%BINDING%';
 
 _getSpan(SourceFile file, AstNode node) => file.span(node.offset, node.end);