handle all matching group indexes

Author: blakeembrey

index.js

@@ -25,8 +25,8 @@ function pathtoRegexp(path, keys, options) {
   var strict = options.strict;
   var end = options.end !== false;
   var flags = options.sensitive ? '' : 'i';
-  var index = 0;
   var extraOffset = 0;
+
   keys = keys || [];
 
   if (path instanceof RegExp) {
@@ -56,7 +56,7 @@ function pathtoRegexp(path, keys, options) {
       keys.push({
         name: key,
         optional: !!optional,
-        index: index++,
+        index: 0,
         _offset: offset + extraOffset
       });
 
@@ -67,19 +67,33 @@ function pathtoRegexp(path, keys, options) {
         + (star ? '((?:[\\/' + format + '].+?)?)' : '')
         + ')'
         + optional;
+
       extraOffset += result.length - match.length;
 
       return result;
     })
-    .replace(/\*/g, function(star, index) {
-      keys.forEach(function(key) {
-        if (index < key._offset) {
-          key.index++;
-        }
-      });
+    .replace(/\*/g, function (star, index) {
+      var len = keys.length
+
+      while (len-- && keys[len]._offset > index) {
+        keys[len]._offset += 3;
+      }
+
       return '(.*)';
     });
 
+  // This is a workaround for handling *all* matching group positioning.
+  var re = /\((?!\?)/g;
+  var m;
+
+  while (m = re.exec(path)) {
+    var len = keys.length;
+
+    while (len-- && keys[len]._offset > m.index) {
+      keys[len].index++;
+    }
+  }
+
   // If the path is non-ending, match until the end or a slash.
   path += (end ? '$' : (path[path.length - 1] === '/' ? '' : '(?=\\/|$)'));
 

test.js

@@ -128,6 +128,34 @@ describe('path-to-regexp', function () {
       assert.equal(params[2].name, 'bar');
       assert.equal(params[2].index, 5);
 
+      assert.equal(m.length, 8);
+      assert.equal(m[0], '/a/b/c/d/e/f/g');
+      assert.equal(m[1], '/a');
+      assert.equal(m[2], 'b');
+      assert.equal(m[3], 'c');
+      assert.equal(m[4], 'd');
+      assert.equal(m[5], 'e');
+      assert.equal(m[6], 'f');
+      assert.equal(m[7], 'g');
+    });
+
+    it('should have proper indexes with matching groups', function () {
+      var params = [];
+      var m = pathToRegExp('/:foo((\\d)+)/:bar', params).exec('/123/abc');
+
+      assert.equal(params.length, 2);
+      assert.equal(params[0].name, 'foo');
+      assert.equal(params[0].optional, false);
+      assert.equal(params[0].index, 0);
+      assert.equal(params[1].name, 'bar');
+      assert.equal(params[1].optional, false);
+      assert.equal(params[1].index, 2);
+
+      assert.equal(m.length, 4);
+      assert.equal(m[0], '/123/abc');
+      assert.equal(m[1], '3');
+      assert.equal(m[2], '3');
+      assert.equal(m[3], 'abc');
     });
 
     it('should do strict matches with trailing slashes', function () {