Use delimiter in repeating match

Author: blakeembrey

index.js

@@ -25,8 +25,8 @@ var PATH_REGEXP = new RegExp([
   // Match Express-style parameters and un-named parameters with a prefix
   // and optional suffixes. Matches appear as:
   //
-  // "/:test(\\d+)?" => ["/", "test", "\d+", undefined, "?"]
-  // "/route(\\d+)"  => [undefined, undefined, undefined, "\d+", undefined]
+  // ":test(\\d+)?" => ["test", "\d+", undefined, "?"]
+  // "(\\d+)"  => [undefined, undefined, "\d+", undefined]
   '(?:\\:(\\w+)(?:\\(((?:\\\\.|[^\\\\()])+)\\))?|\\(((?:\\\\.|[^\\\\()])+)\\))([+*?])?'
 ].join('|'), 'g')
 
@@ -315,21 +315,20 @@ function tokensToRegExp (tokens, keys, options) {
       route += escapeString(token)
       isEndDelimited = i === tokens.length - 1 && delimiters.indexOf(token[token.length - 1]) > -1
     } else {
-      var prefix = escapeString(token.prefix)
       var capture = token.repeat
-        ? '(?:' + token.pattern + ')(?:' + prefix + '(?:' + token.pattern + '))*'
+        ? '(?:' + token.pattern + ')(?:' + escapeString(token.delimiter) + '(?:' + token.pattern + '))*'
         : token.pattern
 
       if (keys) keys.push(token)
 
       if (token.optional) {
         if (token.partial) {
-          route += prefix + '(' + capture + ')?'
+          route += escapeString(token.prefix) + '(' + capture + ')?'
         } else {
-          route += '(?:' + prefix + '(' + capture + '))?'
+          route += '(?:' + escapeString(token.prefix) + '(' + capture + '))?'
         }
       } else {
-        route += prefix + '(' + capture + ')'
+        route += escapeString(token.prefix) + '(' + capture + ')'
       }
     }
   }

test.ts

@@ -1077,6 +1077,33 @@ var TESTS: Test[] = [
       [{ test: 'route' }, 'route']
     ]
   ],
+  [
+    ':test+',
+    null,
+    [
+      {
+        name: 'test',
+        prefix: '',
+        delimiter: '/',
+        optional: false,
+        repeat: true,
+        partial: false,
+        pattern: '[^\\/]+?'
+      }
+    ],
+    [
+      ['route', ['route', 'route']],
+      ['/route', null],
+      ['', null],
+      ['foo/bar', ['foo/bar', 'foo/bar']]
+    ],
+    [
+      [{}, null],
+      [{ test: '' }, null],
+      [{ test: ['route'] }, 'route'],
+      [{ test: ['foo', 'bar'] }, 'foo/bar']
+    ]
+  ],
 
   /**
    * Formats.
@@ -2251,6 +2278,36 @@ var TESTS: Test[] = [
       [{ foo: 'foo', bar: 'bar' }, '$foo$bar'],
     ]
   ],
+  [
+    ':test+',
+    {
+      delimiter: ' ',
+      delimiters: ' '
+    },
+    [
+      {
+        name: 'test',
+        prefix: '',
+        delimiter: ' ',
+        optional: false,
+        repeat: true,
+        partial: false,
+        pattern: '[^ ]+?'
+      }
+    ],
+    [
+      ['hello', ['hello', 'hello']],
+      [' hello ', null],
+      ['', null],
+      ['hello world', ['hello world', 'hello world']]
+    ],
+    [
+      [{}, null],
+      [{ test: '' }, null],
+      [{ test: ['hello'] }, 'hello'],
+      [{ test: ['hello', 'world'] }, 'hello world']
+    ]
+  ],
 ]
 
 /**