WIP: experiment with more intelligent path encoding

WIP: improve encodeUriSegment function

Author: jeffbcross

src/Angular.js

@@ -1150,11 +1150,40 @@ function toKeyValue(obj) {
  *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
  *                     / "*" / "+" / "," / ";" / "="
  */
-function encodeUriSegment(val) {
-  return encodeUriQuery(val, true).
-             replace(/%26/gi, '&').
-             replace(/%3D/gi, '=').
-             replace(/%2B/gi, '+');
+var subDelimsExp = /[\!\$'\(\)\*\+,;\=@:]/g;
+var encodedExp = /%[A-Z0-9]{2}/ig;
+function encodeUriSegment(segment) {
+  var match, segments, newSegment, matchIndex, encoded, endIndex;
+  if ((match = segment.match(encodedExp)) || (match = segment.match(subDelimsExp))) {
+    newSegment = '';
+    while (encoded = match.shift()) {
+      matchIndex = segment.indexOf(encoded);
+      if (matchIndex === 0) {
+        newSegment += encoded;
+      }
+      else {
+        var sub = segment.substring(0, matchIndex);
+        newSegment += encodeUriSegment(sub);
+        newSegment += encoded;
+      }
+
+      endIndex = match[0]?segment.indexOf(match[0]):null;
+      if (endIndex) {
+        newSegment += segment.substring(matchIndex + encoded.length, endIndex);
+      }
+      else {
+        newSegment += segment.substring(matchIndex + encoded.length);
+      }
+
+    }
+
+    segment = newSegment;
+  }
+  else {
+    segment = encodeURIComponent(segment);
+  }
+
+  return segment;
 }
 
 

test/AngularSpec.js

@@ -663,7 +663,7 @@ describe('angular', function() {
 
       //encode '/', ';' and ' ''
       expect(encodeUriSegment('/; /;')).
-        toEqual('%2F%3B%20%2F%3B');
+        toEqual('%2F;%20%2F;');
     });
   });
 

test/ng/locationSpec.js

@@ -1,7 +1,7 @@
 /* global LocationHashbangUrl: false, LocationHtml5Url: false */
 'use strict';
 
-describe('$location', function() {
+ddescribe('$location', function() {
   var url;
 
   beforeEach(module(provideLog));
@@ -264,6 +264,7 @@ describe('$location', function() {
       );
     });
 
+
     it('should prepend path with basePath', function() {
       url = new LocationHtml5Url('http://server/base/');
       url.$$parse('http://server/base/abc?a');
@@ -307,12 +308,21 @@ describe('$location', function() {
       });
 
 
-      it('should not encode !$:@', function() {
-        url.path('/!$:@');
+      it('should honor path delimiters and preserve encoded delimiters', function() {
+        url.path('/foo;ba%2Br/baz%3Bfoo/bar');
+        url.hash('');
+        url.search('');
+        expect(url.path()).toBe('/foo;ba%2Br/baz%3Bfoo/bar');
+        expect(url.absUrl()).toBe('http://www.domain.com:9877/foo;ba%2Br/baz%3Bfoo/bar');
+      })
+
+
+      it('should not encode !$:@;', function() {
+        url.path('/!$:@;');
         url.search('');
         url.hash('!$:@');
 
-        expect(url.absUrl()).toBe('http://www.domain.com:9877/!$:@#!$:@');
+        expect(url.absUrl()).toBe('http://www.domain.com:9877/!$:@;#!$:@');
       });