Split _uriEncode into JS and VM versions.

sdk/lib/core/uri.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.
 
 part of dart.core;
 
 /**
  * A parsed URI, such as a URL.
  *
  * **See also:**
@@ skipping 1224 matching lines @@
     bool isFile = (scheme == "file");
     bool ensureLeadingSlash = isFile || hasAuthority;
     if (path == null && pathSegments == null) return isFile ? "/" : "";
     if (path != null && pathSegments != null) {
       throw new ArgumentError('Both path and pathSegments specified');
     }
     var result;
     if (path != null) {
       result = _normalize(path, start, end, _pathCharOrSlashTable);
     } else {
-      result = pathSegments.map((s) => _uriEncode(_pathCharTable, s)).join("/");
+      result = pathSegments.map((s) =>
+          _uriEncode(_pathCharTable, s, UTF8, false)).join("/");
     }
     if (result.isEmpty) {
       if (isFile) return "/";
     } else if (ensureLeadingSlash && !result.startsWith('/')) {
       result = "/" + result;
     }
     result = _normalizePath(result, scheme, hasAuthority);
     return result;
   }
 
@@ skipping 689 matching lines @@
    * string.
    *
    * For encoding the query part consider using
    * [encodeQueryComponent].
    *
    * To avoid the need for explicitly encoding use the [pathSegments]
    * and [queryParameters] optional named arguments when constructing
    * a [Uri].
    */
   static String encodeComponent(String component) {
-    return _uriEncode(_unreserved2396Table, component);
+    return _uriEncode(_unreserved2396Table, component, UTF8, false);
   }
 
   /**
    * Encode the string [component] according to the HTML 4.01 rules
    * for encoding the posting of a HTML form as a query string
    * component.
    *
    * Encode the string [component] according to the HTML 4.01 rules
    * for encoding the posting of a HTML form as a query string
    * component.
@@ skipping 17 matching lines @@
    *
    * To avoid the need for explicitly encoding the query use the
    * [queryParameters] optional named arguments when constructing a
    * [Uri].
    *
    * See http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4.2 for more
    * details.
    */
   static String encodeQueryComponent(String component,
                                      {Encoding encoding: UTF8}) {
-    return _uriEncode(
-        _unreservedTable, component, encoding: encoding, spaceToPlus: true);
+    return _uriEncode(_unreservedTable, component, encoding, true);
   }
 
   /**
    * Decodes the percent-encoding in [encodedComponent].
    *
    * Note that decoding a URI component might change its meaning as
    * some of the decoded characters could be characters with are
    * delimiters for a given URI componene type. Always split a URI
    * component using the delimiters for the component before decoding
    * the individual parts.
@@ skipping 23 matching lines @@
   /**
    * Encode the string [uri] using percent-encoding to make it
    * safe for literal use as a full URI.
    *
    * All characters except uppercase and lowercase letters, digits and
    * the characters `!#$&'()*+,-./:;=?@_~` are percent-encoded. This
    * is the set of characters specified in in ECMA-262 version 5.1 for
    * the encodeURI function .
    */
   static String encodeFull(String uri) {
-    return _uriEncode(_encodeFullTable, uri);
+    return _uriEncode(_encodeFullTable, uri, UTF8, false);
   }
 
   /**
    * Decodes the percent-encoding in [uri].
    *
    * Note that decoding a full URI might change its meaning as some of
    * the decoded characters could be reserved characters. In most
    * cases an encoded URI should be parsed into components using
    * [Uri.parse] before decoding the separate components.
    */
@@ skipping 195 matching lines @@
   static const int _UPPER_CASE_F = 0x46;
   static const int _UPPER_CASE_Z = 0x5A;
   static const int _LEFT_BRACKET = 0x5B;
   static const int _BACKSLASH = 0x5C;
   static const int _RIGHT_BRACKET = 0x5D;
   static const int _LOWER_CASE_A = 0x61;
   static const int _LOWER_CASE_F = 0x66;
   static const int _LOWER_CASE_Z = 0x7A;
   static const int _BAR = 0x7C;
 
-  // Matches a String that _uriEncodes to itself regardless of the kind of
-  // component.  This corresponds to [_unreservedTable], i.e. characters that
-  // are not encoded by any encoding table.
-  static final RegExp _needsNoEncoding = new RegExp(r'^[\-\.0-9A-Z_a-z~]*$');
-
-  /**
-   * This is the internal implementation of JavaScript's encodeURI function.
-   * It encodes all characters in the string [text] except for those
-   * that appear in [canonicalTable], and returns the escaped string.
-   */
-  static String _uriEncode(List<int> canonicalTable,
-                           String text,
-                           {Encoding encoding: UTF8,
-                            bool spaceToPlus: false}) {
-    if (_needsNoEncoding.hasMatch(text)) return text;
-
-    byteToHex(byte, buffer) {
-      const String hex = '0123456789ABCDEF';
-      buffer.writeCharCode(hex.codeUnitAt(byte >> 4));
-      buffer.writeCharCode(hex.codeUnitAt(byte & 0x0f));
-    }
-
-    // Encode the string into bytes then generate an ASCII only string
-    // by percent encoding selected bytes.
-    StringBuffer result = new StringBuffer();
-    var bytes = encoding.encode(text);
-    for (int i = 0; i < bytes.length; i++) {
-      int byte = bytes[i];
-      if (byte < 128 &&
-          ((canonicalTable[byte >> 4] & (1 << (byte & 0x0f))) != 0)) {
-        result.writeCharCode(byte);
-      } else if (spaceToPlus && byte == _SPACE) {
-        result.writeCharCode(_PLUS);
-      } else {
-        result.writeCharCode(_PERCENT);
-        byteToHex(byte, result);
-      }
-    }
-    return result.toString();
-  }
+  external static String _uriEncode(List<int> canonicalTable,
+                                    String text,
+                                    Encoding encoding,
+                                    bool spaceToPlus);

[Lasse Reichstein Nielsen, 2015/11/04 10:15:53]

I made the parameters non-optional. That's what I generally do to all private
functions, leaving optional parameters only on public functions.
(I should fix _uriDecode as well).

 
   /**
    * Convert a byte (2 character hex sequence) in string [s] starting
    * at position [pos] to its ordinal value
    */
   static int _hexCharPairToByte(String s, int pos) {
     int byte = 0;
     for (int i = 0; i < 2; i++) {
       var charCode = s.codeUnitAt(pos + i);
       if (0x30 <= charCode && charCode <= 0x39) {
@@ skipping 307 matching lines @@
       0xafff,   // 0x30 - 0x3f  1111111111110101
                 //              @ABCDEFGHIJKLMNO
       0xffff,   // 0x40 - 0x4f  1111111111111111
                 //              PQRSTUVWXYZ    _
       0x87ff,   // 0x50 - 0x5f  1111111111100001
                 //               abcdefghijklmno
       0xfffe,   // 0x60 - 0x6f  0111111111111111
                 //              pqrstuvwxyz   ~
       0x47ff];  // 0x70 - 0x7f  1111111111100010
 }