Merge pull request #51 from chrisinajar/0.1.x

Add "index" field to keys to account for extra wildcard groups

Author: blakeembrey

index.js

@@ -25,6 +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) {
@@ -45,23 +47,38 @@ function pathtoRegexp(path, keys, options) {
   path = ('^' + path + (strict ? '' : path[path.length - 1] === '/' ? '?' : '/?'))
     .replace(/\/\(/g, '/(?:')
     .replace(/([\/\.])/g, '\\$1')
-    .replace(/(\\\/)?(\\\.)?:(\w+)(\(.*?\))?(\*)?(\?)?/g, function (match, slash, format, key, capture, star, optional) {
+    .replace(/(\\\/)?(\\\.)?:(\w+)(\(.*?\))?(\*)?(\?)?/g, function (match, slash, format, key, capture, star, optional, offset) {
       slash = slash || '';
       format = format || '';
       capture = capture || '([^\\/' + format + ']+?)';
       optional = optional || '';
 
-      keys.push({ name: key, optional: !!optional });
+      keys.push({
+        name: key,
+        optional: !!optional,
+        index: index++,
+        _offset: offset + extraOffset
+      });
 
-      return ''
+      var result = ''
         + (optional ? '' : slash)
         + '(?:'
         + format + (optional ? slash : '') + capture
         + (star ? '((?:[\\/' + format + '].+?)?)' : '')
         + ')'
         + optional;
+      extraOffset += result.length - match.length;
+
+      return result;
     })
-    .replace(/\*/g, '(.*)');
+    .replace(/\*/g, function(star, index) {
+      keys.forEach(function(key) {
+        if (index < key._offset) {
+          key.index++;
+        }
+      });
+      return '(.*)';
+    });
 
   // If the path is non-ending, match until the end or a slash.
   path += (end ? '$' : (path[path.length - 1] === '/' ? '' : '(?=\\/|$)'));

test.js

@@ -46,6 +46,90 @@ describe('path-to-regexp', function () {
       assert.ok(!m);
     });
 
+    it('should match wildcards', function () {
+      var params = [];
+      var m = pathToRegExp('/*', params).exec('/pathname');
+
+      assert.equal(params.length, 0);
+
+      assert.equal(m.length, 2);
+      assert.equal(m[0], '/pathname');
+      assert.equal(m[1], 'pathname');
+    });
+
+    it('should match wildcards without leading /', function () {
+      var params = [];
+      var m = pathToRegExp('*', params).exec('/pathname');
+
+      assert.equal(params.length, 0);
+
+      assert.equal(m.length, 2);
+      assert.equal(m[0], '/pathname');
+      assert.equal(m[1], '/pathname');
+    });
+
+    it('should match wildcards with express params', function () {
+      var params = [];
+      var m = pathToRegExp('/:test/*', params).exec('/pathone/pathtwo');
+
+      assert.equal(params.length, 1);
+      assert.equal(params[0].name, 'test');
+      assert.equal(params[0].optional, false);
+      assert.equal(params[0].index, 0);
+
+      assert.equal(m.length, 3);
+      assert.equal(m[0], '/pathone/pathtwo');
+      assert.equal(m[1], 'pathone');
+      assert.equal(m[2], 'pathtwo');
+    });
+
+    it('should match wildcards with express params (reverse order)', function () {
+      var params = [];
+      var m = pathToRegExp('/*/:test', params).exec('/pathone/pathtwo');
+
+      assert.equal(params.length, 1);
+      assert.equal(params[0].name, 'test');
+      assert.equal(params[0].optional, false);
+      assert.equal(params[0].index, 1);
+
+      assert.equal(m.length, 3);
+      assert.equal(m[0], '/pathone/pathtwo');
+      assert.equal(m[1], 'pathone');
+      assert.equal(m[2], 'pathtwo');
+    });
+
+    it('should match wildcards with express params (reverse order, no leading /)', function () {
+      var params = [];
+      var m = pathToRegExp('*/:test', params).exec('/pathone/pathtwo');
+
+      assert.equal(params.length, 1);
+      assert.equal(params[0].name, 'test');
+      assert.equal(params[0].optional, false);
+      assert.equal(params[0].index, 1);
+
+      assert.equal(m.length, 3);
+      assert.equal(m[0], '/pathone/pathtwo');
+      assert.equal(m[1], '/pathone');
+      assert.equal(m[2], 'pathtwo');
+    });
+
+    it('should have proper indexes when using multiple wildcards', function () {
+      var params = [];
+      var m = pathToRegExp('*/:test/*/:foo/*/:bar/*', params).exec('/a/b/c/d/e/f/g');
+
+      assert.equal(params.length, 3);
+      assert.equal(params[0].name, 'test');
+      assert.equal(params[0].optional, false);
+      assert.equal(params[0].index, 1);
+
+      assert.equal(params[1].name, 'foo');
+      assert.equal(params[1].index, 3);
+
+      assert.equal(params[2].name, 'bar');
+      assert.equal(params[2].index, 5);
+
+    });
+
     it('should do strict matches with trailing slashes', function () {
       var params = [];
       var re = pathToRegExp('/:test/', params, { strict: true });