Populate RegExp.keys from tokensToRegExp (#93)

Author: blakeembrey

index.js

@@ -316,27 +316,23 @@ function arrayToRegexp (path, keys, options) {
  * @return {!RegExp}
  */
 function stringToRegexp (path, keys, options) {
-  var tokens = parse(path)
-  var re = tokensToRegExp(tokens, options)
-
-  // Attach keys back to the regexp.
-  for (var i = 0; i < tokens.length; i++) {
-    if (typeof tokens[i] !== 'string') {
-      keys.push(tokens[i])
-    }
-  }
-
-  return attachKeys(re, keys)
+  return tokensToRegExp(parse(path), keys, options)
 }
 
 /**
  * Expose a function for taking tokens and returning a RegExp.
  *
- * @param  {!Array}  tokens
- * @param  {Object=} options
+ * @param  {!Array}          tokens
+ * @param  {(Array|Object)=} keys
+ * @param  {Object=}         options
  * @return {!RegExp}
  */
-function tokensToRegExp (tokens, options) {
+function tokensToRegExp (tokens, keys, options) {
+  if (!isarray(keys)) {
+    options = /** @type {!Object} */ (keys || options)
+    keys = []
+  }
+
   options = options || {}
 
   var strict = options.strict
@@ -355,6 +351,8 @@ function tokensToRegExp (tokens, options) {
       var prefix = escapeString(token.prefix)
       var capture = '(?:' + token.pattern + ')'
 
+      keys.push(token)
+
       if (token.repeat) {
         capture += '(?:' + prefix + capture + ')*'
       }
@@ -389,7 +387,7 @@ function tokensToRegExp (tokens, options) {
     route += strict && endsWithSlash ? '' : '(?=\\/|$)'
   }
 
-  return new RegExp('^' + route, flags(options))
+  return attachKeys(new RegExp('^' + route, flags(options)), keys)
 }
 
 /**
@@ -405,15 +403,13 @@ function tokensToRegExp (tokens, options) {
  * @return {!RegExp}
  */
 function pathToRegexp (path, keys, options) {
-  keys = keys || []
-
   if (!isarray(keys)) {
-    options = /** @type {!Object} */ (keys)
+    options = /** @type {!Object} */ (keys || options)
     keys = []
-  } else if (!options) {
-    options = {}
   }
 
+  options = options || {}
+
   if (path instanceof RegExp) {
     return regexpToRegexp(path, /** @type {!Array} */ (keys))
   }

test.ts

@@ -2156,6 +2156,23 @@ describe('path-to-regexp', function () {
   }
 
   describe('arguments', function () {
+    it('should work without different call combinations', function () {
+      pathToRegexp('/test')
+      pathToRegexp('/test', [])
+      pathToRegexp('/test', {})
+      pathToRegexp('/test', [], {})
+
+      pathToRegexp(/^\/test/)
+      pathToRegexp(/^\/test/, [])
+      pathToRegexp(/^\/test/, {})
+      pathToRegexp(/^\/test/, [], {})
+
+      pathToRegexp(['/a', '/b'])
+      pathToRegexp(['/a', '/b'], [])
+      pathToRegexp(['/a', '/b'], {})
+      pathToRegexp(['/a', '/b'], [], {})
+    })
+
     it('should accept an array of keys as the second argument', function () {
       var keys = []
       var re = pathToRegexp(TEST_PATH, keys, { end: false })