path-to-regexp 1.8.0 → 2.2.1

package/History.md

@@ -1,3 +1,26 @@
+2.2.0 / 2018-03-06
+==================
+
+  * Pass `token` as second argument to `encode` option (e.g. `encode(value, token)`)
+
+2.1.0 / 2017-10-20
+==================
+
+  * Handle non-ending paths where the final character is a delimiter
+    * E.g. `/foo/` before required either `/foo/` or `/foo//` to match in non-ending mode
+
+2.0.0 / 2017-08-23
+==================
+
+  * New option! Ability to set `endsWith` to match paths like `/test?query=string` up to the query string
+  * New option! Set `delimiters` for specific characters to be treated as parameter prefixes (e.g. `/:test`)
+  * Remove `isarray` dependency
+  * Explicitly handle trailing delimiters instead of trimming them (e.g. `/test/` is now treated as `/test/` instead of `/test` when matching)
+  * Remove overloaded `keys` argument that accepted `options`
+  * Remove `keys` list attached to the `RegExp` output
+  * Remove asterisk functionality (it's a real pain to properly encode)
+  * Change `tokensToFunction` (e.g. `compile`) to accept an `encode` function for pretty encoding (e.g. pass your own implementation)
+
 1.7.0 / 2016-11-08
 ==================
 

package/Readme.md

@@ -1,6 +1,6 @@
 # Path-to-RegExp
 
-> Turn an Express-style path string such as `/user/:name` into a regular expression.
+> Turn a path string such as `/user/:name` into a regular expression.
 
 [![NPM version][npm-image]][npm-url]
 [![Build status][travis-image]][travis-url]
@@ -20,18 +20,21 @@ npm install path-to-regexp --save
 ```javascript
 var pathToRegexp = require('path-to-regexp')
 
-// pathToRegexp(path, keys, options)
+// pathToRegexp(path, keys?, options?)
 // pathToRegexp.parse(path)
 // pathToRegexp.compile(path)
 ```
 
-- **path** An Express-style string, an array of strings, or a regular expression.
+- **path** A string, array of strings, or a regular expression.
 - **keys** An array to be populated with the keys found in the path.
 - **options**
   - **sensitive** When `true` the route will be case sensitive. (default: `false`)
   - **strict** When `false` the trailing slash is optional. (default: `false`)
   - **end** When `false` the path will match at the beginning. (default: `true`)
-  - **delimiter** Set the default delimiter for repeat parameters. (default: `'/'`)
+  - Advanced options (use for non-pathname strings, e.g. host names):
+    - **delimiter** The default delimiter for segments. (default: `'/'`)
+    - **endsWith** Optional character, or list of characters, to treat as "end" characters.
+    - **delimiters** List of characters to consider delimiters when parsing. (default: `'./'`)
 
 ```javascript
 var keys = []
@@ -40,42 +43,34 @@ var re = pathToRegexp('/foo/:bar', keys)
 // keys = [{ name: 'bar', prefix: '/', delimiter: '/', optional: false, repeat: false, pattern: '[^\\/]+?' }]
 ```
 
-**Please note:** The `RegExp` returned by `path-to-regexp` is intended for use with pathnames or hostnames. It can not handle the query strings or fragments of a URL.
+**Please note:** The `RegExp` returned by `path-to-regexp` is intended for ordered data (e.g. pathnames, hostnames). It does not handle arbitrary data (e.g. query strings, URL fragments, JSON, etc).
 
 ### Parameters
 
-The path string can be used to define parameters and populate the keys.
+The path argument is used to define parameters and populate the list of keys.
 
 #### Named Parameters
 
 Named parameters are defined by prefixing a colon to the parameter name (`:foo`). By default, the parameter will match until the following path segment.
 
 ```js
-var re = pathToRegexp('/:foo/:bar', keys)
+var re = pathToRegexp('/:foo/:bar')
 // keys = [{ name: 'foo', prefix: '/', ... }, { name: 'bar', prefix: '/', ... }]
 
 re.exec('/test/route')
 //=> ['/test/route', 'test', 'route']
 ```
 
-**Please note:** Named parameters must be made up of "word characters" (`[A-Za-z0-9_]`).
+**Please note:** Parameter names must be made up of "word characters" (`[A-Za-z0-9_]`).
 
-```js
-var re = pathToRegexp('/(apple-)?icon-:res(\\d+).png', keys)
-// keys = [{ name: 0, prefix: '/', ... }, { name: 'res', prefix: '', ... }]
-
-re.exec('/icon-76.png')
-//=> ['/icon-76.png', undefined, '76']
-```
-
-#### Modified Parameters
+#### Parameter Modifiers
 
 ##### Optional
 
-Parameters can be suffixed with a question mark (`?`) to make the parameter optional. This will also make the prefix optional.
+Parameters can be suffixed with a question mark (`?`) to make the parameter optional.
 
 ```js
-var re = pathToRegexp('/:foo/:bar?', keys)
+var re = pathToRegexp('/:foo/:bar?')
 // keys = [{ name: 'foo', ... }, { name: 'bar', delimiter: '/', optional: true, repeat: false }]
 
 re.exec('/test')
@@ -85,12 +80,14 @@ re.exec('/test/route')
 //=> ['/test', 'test', 'route']
 ```
 
+**Tip:** If the parameter is the _only_ value in the segment, the prefix is also optional.
+
 ##### Zero or more
 
 Parameters can be suffixed with an asterisk (`*`) to denote a zero or more parameter matches. The prefix is taken into account for each match.
 
 ```js
-var re = pathToRegexp('/:foo*', keys)
+var re = pathToRegexp('/:foo*')
 // keys = [{ name: 'foo', delimiter: '/', optional: true, repeat: true }]
 
 re.exec('/')
@@ -105,7 +102,7 @@ re.exec('/bar/baz')
 Parameters can be suffixed with a plus sign (`+`) to denote a one or more parameter matches. The prefix is taken into account for each match.
 
 ```js
-var re = pathToRegexp('/:foo+', keys)
+var re = pathToRegexp('/:foo+')
 // keys = [{ name: 'foo', delimiter: '/', optional: false, repeat: true }]
 
 re.exec('/')
@@ -115,18 +112,18 @@ re.exec('/bar/baz')
 //=> ['/bar/baz', 'bar/baz']
 ```
 
-#### Custom Match Parameters
+#### Custom Matching Parameters
 
-All parameters can be provided a custom regexp, which overrides the default (`[^\/]+`).
+All parameters can be provided a custom regexp, which overrides the default match (`[^\/]+`). For example, you can match digits in the path:
 
 ```js
-var re = pathToRegexp('/:foo(\\d+)', keys)
+var re = pathToRegexp('/icon-:foo(\\d+).png')
 // keys = [{ name: 'foo', ... }]
 
-re.exec('/123')
-//=> ['/123', '123']
+re.exec('/icon-123.png')
+//=> ['/icon-123.png', '123']
 
-re.exec('/abc')
+re.exec('/icon-abc.png')
 //=> null
 ```
 
@@ -137,25 +134,13 @@ re.exec('/abc')
 It is possible to write an unnamed parameter that only consists of a matching group. It works the same as a named parameter, except it will be numerically indexed.
 
 ```js
-var re = pathToRegexp('/:foo/(.*)', keys)
+var re = pathToRegexp('/:foo/(.*)')
 // keys = [{ name: 'foo', ... }, { name: 0, ... }]
 
 re.exec('/test/route')
 //=> ['/test/route', 'test', 'route']
 ```
 
-#### Asterisk
-
-An asterisk can be used for matching everything. It is equivalent to an unnamed matching group of `(.*)`.
-
-```js
-var re = pathToRegexp('/foo/*', keys)
-// keys = [{ name: '0', ... }]
-
-re.exec('/foo/bar/baz')
-//=> ['/foo/bar/baz', 'bar/baz']
-```
-
 ### Parse
 
 The parse function is exposed via `pathToRegexp.parse`. This will return an array of strings and keys.
@@ -173,11 +158,11 @@ console.log(tokens[2])
 //=> { name: 0, prefix: '/', delimiter: '/', optional: false, repeat: false, pattern: '.*' }
 ```
 
-**Note:** This method only works with Express-style strings.
+**Note:** This method only works with strings.
 
 ### Compile ("Reverse" Path-To-RegExp)
 
-Path-To-RegExp exposes a compile function for transforming an Express-style path into a valid path.
+Path-To-RegExp exposes a compile function for transforming a string into a valid path.
 
 ```js
 var toPath = pathToRegexp.compile('/user/:id')
@@ -186,8 +171,8 @@ toPath({ id: 123 }) //=> "/user/123"
 toPath({ id: 'café' }) //=> "/user/caf%C3%A9"
 toPath({ id: '/' }) //=> "/user/%2F"
 
-toPath({ id: ':' }) //=> "/user/%3A"
-toPath({ id: ':' }, { pretty: true }) //=> "/user/:"
+toPath({ id: ':/' }) //=> "/user/%3A%2F"
+toPath({ id: ':/' }, { encode: (value, token) => value }) //=> "/user/:/"
 
 var toPathRepeated = pathToRegexp.compile('/:segment+')
 
@@ -207,7 +192,7 @@ toPathRegexp({ id: 'abc' }) //=> Throws `TypeError`.
 
 Path-To-RegExp exposes the two functions used internally that accept an array of tokens.
 
-* `pathToRegexp.tokensToRegExp(tokens, options)` Transform an array of tokens into a matching regular expression.
+* `pathToRegexp.tokensToRegExp(tokens, keys?, options?)` Transform an array of tokens into a matching regular expression.
 * `pathToRegexp.tokensToFunction(tokens)` Transform an array of tokens into a path generator function.
 
 #### Token Information
@@ -219,17 +204,15 @@ Path-To-RegExp exposes the two functions used internally that accept an array of
 * `repeat` Indicates the token is repeated (`boolean`)
 * `partial` Indicates this token is a partial path segment (`boolean`)
 * `pattern` The RegExp used to match this token (`string`)
-* `asterisk` Indicates the token is an `*` match (`boolean`)
 
 ## Compatibility with Express <= 4.x
 
 Path-To-RegExp breaks compatibility with Express <= `4.x`:
 
-* No longer a direct conversion to a RegExp with sugar on top - it's a path matcher with named and unnamed matching groups
-  * It's unlikely you previously abused this feature, it's rare and you could always use a RegExp instead
-* All matching RegExp special characters can be used in a matching group. E.g. `/:user(.*)`
-  * Other RegExp features are not support - no nested matching groups, non-capturing groups or look aheads
+* RegExp special characters can only be used in a parameter
+  * Express.js 4.x used all `RegExp` special characters regardless of position - this considered a bug
 * Parameters have suffixes that augment meaning - `*`, `+` and `?`. E.g. `/:user*`
+* No wildcard asterisk (`*`) - use parameters instead (`(.*)`)
 
 ## TypeScript
 

package/index.d.ts

@@ -1,12 +1,6 @@
-declare function pathToRegexp (path: pathToRegexp.Path, options?: pathToRegexp.RegExpOptions & pathToRegexp.ParseOptions): pathToRegexp.PathRegExp;
-declare function pathToRegexp (path: pathToRegexp.Path, keys?: pathToRegexp.Key[], options?: pathToRegexp.RegExpOptions & pathToRegexp.ParseOptions): pathToRegexp.PathRegExp;
+declare function pathToRegexp (path: pathToRegexp.Path, keys?: pathToRegexp.Key[], options?: pathToRegexp.RegExpOptions & pathToRegexp.ParseOptions): RegExp;
 
 declare namespace pathToRegexp {
-  export interface PathRegExp extends RegExp {
-    // An array to be populated with the keys found in the path.
-    keys: Key[];
-  }
-
   export interface RegExpOptions {
     /**
      * When `true` the route will be case sensitive. (default: `false`)
@@ -24,6 +18,10 @@ declare namespace pathToRegexp {
      * Sets the final character for non-ending optimistic matches. (default: `/`)
      */
     delimiter?: string;
+    /**
+     * List of characters that can also be "end" characters.
+     */
+    endsWith?: string | string[];
   }
 
   export interface ParseOptions {
@@ -31,13 +29,10 @@ declare namespace pathToRegexp {
      * Set the default delimiter for repeat parameters. (default: `'/'`)
      */
     delimiter?: string;
-  }
-
-  export interface TokensToFunctionOptions {
     /**
-     * When `true` the regexp will be case sensitive. (default: `false`)
+     * List of valid delimiter characters. (default: `'./'`)
      */
-    sensitive?: boolean;
+    delimiters?: string | string[];
   }
 
   /**
@@ -48,18 +43,17 @@ declare namespace pathToRegexp {
   /**
    * Transforming an Express-style path into a valid path.
    */
-  export function compile (path: string, options?: ParseOptions & TokensToFunctionOptions): PathFunction;
+  export function compile (path: string, options?: ParseOptions): PathFunction;
 
   /**
    * Transform an array of tokens into a path generator function.
    */
-  export function tokensToFunction (tokens: Token[], options?: TokensToFunctionOptions): PathFunction;
+  export function tokensToFunction (tokens: Token[]): PathFunction;
 
   /**
    * Transform an array of tokens into a matching regular expression.
    */
-  export function tokensToRegExp (tokens: Token[], options?: RegExpOptions): PathRegExp;
-  export function tokensToRegExp (tokens: Token[], keys?: Key[], options?: RegExpOptions): PathRegExp;
+  export function tokensToRegExp (tokens: Token[], keys?: Key[], options?: RegExpOptions): RegExp;
 
   export interface Key {
     name: string | number;
@@ -69,11 +63,13 @@ declare namespace pathToRegexp {
     repeat: boolean;
     pattern: string;
     partial: boolean;
-    asterisk: boolean;
   }
 
   interface PathFunctionOptions {
-    pretty?: boolean;
+    /**
+     * Function for encoding input strings for output.
+     */
+    encode?: (value: string, token: Key) => string;
   }
 
   export type Token = string | Key;

package/index.js

@@ -1,5 +1,3 @@
-var isarray = require('isarray')
-
 /**
  * Expose `pathToRegexp`.
  */
@@ -9,6 +7,12 @@ module.exports.compile = compile
 module.exports.tokensToFunction = tokensToFunction
 module.exports.tokensToRegExp = tokensToRegExp
 
+/**
+ * Default configs.
+ */
+var DEFAULT_DELIMITER = '/'
+var DEFAULT_DELIMITERS = './'
+
 /**
  * The main path matching regexp utility.
  *
@@ -21,10 +25,9 @@ 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, "?", undefined]
-  // "/route(\\d+)"  => [undefined, undefined, undefined, "\d+", undefined, undefined]
-  // "/*"            => ["/", undefined, undefined, undefined, undefined, "*"]
-  '([\\/.])?(?:(?:\\:(\\w+)(?:\\(((?:\\\\.|[^\\\\()])+)\\))?|\\(((?:\\\\.|[^\\\\()])+)\\))([+*?])?|(\\*))'
+  // "/:test(\\d+)?" => ["/", "test", "\d+", undefined, "?"]
+  // "/route(\\d+)"  => [undefined, undefined, undefined, "\d+", undefined]
+  '(?:\\:(\\w+)(?:\\(((?:\\\\.|[^\\\\()])+)\\))?|\\(((?:\\\\.|[^\\\\()])+)\\))([+*?])?'
 ].join('|'), 'g')
 
 /**
@@ -39,10 +42,12 @@ function parse (str, options) {
   var key = 0
   var index = 0
   var path = ''
-  var defaultDelimiter = options && options.delimiter || '/'
+  var defaultDelimiter = (options && options.delimiter) || DEFAULT_DELIMITER
+  var delimiters = (options && options.delimiters) || DEFAULT_DELIMITERS
+  var pathEscaped = false
   var res
 
-  while ((res = PATH_REGEXP.exec(str)) != null) {
+  while ((res = PATH_REGEXP.exec(str)) !== null) {
     var m = res[0]
     var escaped = res[1]
     var offset = res.index
@@ -52,49 +57,53 @@ function parse (str, options) {
     // Ignore already escaped sequences.
     if (escaped) {
       path += escaped[1]
+      pathEscaped = true
       continue
     }
 
+    var prev = ''
     var next = str[index]
-    var prefix = res[2]
-    var name = res[3]
-    var capture = res[4]
-    var group = res[5]
-    var modifier = res[6]
-    var asterisk = res[7]
+    var name = res[2]
+    var capture = res[3]
+    var group = res[4]
+    var modifier = res[5]
+
+    if (!pathEscaped && path.length) {
+      var k = path.length - 1
+
+      if (delimiters.indexOf(path[k]) > -1) {
+        prev = path[k]
+        path = path.slice(0, k)
+      }
+    }
 
     // Push the current path onto the tokens.
     if (path) {
       tokens.push(path)
       path = ''
+      pathEscaped = false
     }
 
-    var partial = prefix != null && next != null && next !== prefix
+    var partial = prev !== '' && next !== undefined && next !== prev
     var repeat = modifier === '+' || modifier === '*'
     var optional = modifier === '?' || modifier === '*'
-    var delimiter = res[2] || defaultDelimiter
+    var delimiter = prev || defaultDelimiter
     var pattern = capture || group
 
     tokens.push({
       name: name || key++,
-      prefix: prefix || '',
+      prefix: prev,
       delimiter: delimiter,
       optional: optional,
       repeat: repeat,
       partial: partial,
-      asterisk: !!asterisk,
-      pattern: pattern ? escapeGroup(pattern) : (asterisk ? '.*' : '[^' + escapeString(delimiter) + ']+?')
+      pattern: pattern ? escapeGroup(pattern) : '[^' + escapeString(delimiter) + ']+?'
     })
   }
 
-  // Match any characters still remaining.
-  if (index < str.length) {
-    path += str.substr(index)
-  }
-
-  // If the path exists, push it onto the end.
-  if (path) {
-    tokens.push(path)
+  // Push any remaining characters.
+  if (path || index < str.length) {
+    tokens.push(path + str.substr(index))
   }
 
   return tokens
@@ -108,96 +117,54 @@ function parse (str, options) {
  * @return {!function(Object=, Object=)}
  */
 function compile (str, options) {
-  return tokensToFunction(parse(str, options), options)
-}
-
-/**
- * Prettier encoding of URI path segments.
- *
- * @param  {string}
- * @return {string}
- */
-function encodeURIComponentPretty (str) {
-  return encodeURI(str).replace(/[\/?#]/g, function (c) {
-    return '%' + c.charCodeAt(0).toString(16).toUpperCase()
-  })
-}
-
-/**
- * Encode the asterisk parameter. Similar to `pretty`, but allows slashes.
- *
- * @param  {string}
- * @return {string}
- */
-function encodeAsterisk (str) {
-  return encodeURI(str).replace(/[?#]/g, function (c) {
-    return '%' + c.charCodeAt(0).toString(16).toUpperCase()
-  })
+  return tokensToFunction(parse(str, options))
 }
 
 /**
  * Expose a method for transforming tokens into the path function.
  */
-function tokensToFunction (tokens, options) {
+function tokensToFunction (tokens) {
   // Compile all the tokens into regexps.
   var matches = new Array(tokens.length)
 
   // Compile all the patterns before compilation.
   for (var i = 0; i < tokens.length; i++) {
     if (typeof tokens[i] === 'object') {
-      matches[i] = new RegExp('^(?:' + tokens[i].pattern + ')$', flags(options))
+      matches[i] = new RegExp('^(?:' + tokens[i].pattern + ')$')
     }
   }
 
-  return function (obj, opts) {
+  return function (data, options) {
     var path = ''
-    var data = obj || {}
-    var options = opts || {}
-    var encode = options.pretty ? encodeURIComponentPretty : encodeURIComponent
+    var encode = (options && options.encode) || encodeURIComponent
 
     for (var i = 0; i < tokens.length; i++) {
       var token = tokens[i]
 
       if (typeof token === 'string') {
         path += token
-
         continue
       }
 
-      var value = data[token.name]
+      var value = data ? data[token.name] : undefined
       var segment
 
-      if (value == null) {
-        if (token.optional) {
-          // Prepend partial segment prefixes.
-          if (token.partial) {
-            path += token.prefix
-          }
-
-          continue
-        } else {
-          throw new TypeError('Expected "' + token.name + '" to be defined')
-        }
-      }
-
-      if (isarray(value)) {
+      if (Array.isArray(value)) {
         if (!token.repeat) {
-          throw new TypeError('Expected "' + token.name + '" to not repeat, but received `' + JSON.stringify(value) + '`')
+          throw new TypeError('Expected "' + token.name + '" to not repeat, but got array')
         }
 
         if (value.length === 0) {
-          if (token.optional) {
-            continue
-          } else {
-            throw new TypeError('Expected "' + token.name + '" to not be empty')
-          }
+          if (token.optional) continue
+
+          throw new TypeError('Expected "' + token.name + '" to not be empty')
         }
 
         for (var j = 0; j < value.length; j++) {
-          segment = encode(value[j])
+          segment = encode(value[j], token)
 
           if (!matches[i].test(segment)) {
-            throw new TypeError('Expected all "' + token.name + '" to match "' + token.pattern + '", but received `' + JSON.stringify(segment) + '`')
+            throw new TypeError('Expected all "' + token.name + '" to match "' + token.pattern + '"')
           }
 
           path += (j === 0 ? token.prefix : token.delimiter) + segment
@@ -206,13 +173,25 @@ function tokensToFunction (tokens, options) {
         continue
       }
 
-      segment = token.asterisk ? encodeAsterisk(value) : encode(value)
+      if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+        segment = encode(String(value), token)
 
-      if (!matches[i].test(segment)) {
-        throw new TypeError('Expected "' + token.name + '" to match "' + token.pattern + '", but received "' + segment + '"')
+        if (!matches[i].test(segment)) {
+          throw new TypeError('Expected "' + token.name + '" to match "' + token.pattern + '", but got "' + segment + '"')
+        }
+
+        path += token.prefix + segment
+        continue
+      }
+
+      if (token.optional) {
+        // Prepend partial segment prefixes.
+        if (token.partial) path += token.prefix
+
+        continue
       }
 
-      path += token.prefix + segment
+      throw new TypeError('Expected "' + token.name + '" to be ' + (token.repeat ? 'an array' : 'a string'))
     }
 
     return path
@@ -226,7 +205,7 @@ function tokensToFunction (tokens, options) {
  * @return {string}
  */
 function escapeString (str) {
-  return str.replace(/([.+*?=^!:${}()[\]|\/\\])/g, '\\$1')
+  return str.replace(/([.+*?=^!:${}()[\]|/\\])/g, '\\$1')
 }
 
 /**
@@ -236,19 +215,7 @@ function escapeString (str) {
  * @return {string}
  */
 function escapeGroup (group) {
-  return group.replace(/([=!:$\/()])/g, '\\$1')
-}
-
-/**
- * Attach the keys as a property of the regexp.
- *
- * @param  {!RegExp} re
- * @param  {Array}   keys
- * @return {!RegExp}
- */
-function attachKeys (re, keys) {
-  re.keys = keys
-  return re
+  return group.replace(/([=!:$/()])/g, '\\$1')
 }
 
 /**
@@ -265,10 +232,12 @@ function flags (options) {
  * Pull out keys from a regexp.
  *
  * @param  {!RegExp} path
- * @param  {!Array}  keys
+ * @param  {Array=}  keys
  * @return {!RegExp}
  */
 function regexpToRegexp (path, keys) {
+  if (!keys) return path
+
   // Use a negative lookahead to match only capturing groups.
   var groups = path.source.match(/\((?!\?)/g)
 
@@ -281,21 +250,20 @@ function regexpToRegexp (path, keys) {
         optional: false,
         repeat: false,
         partial: false,
-        asterisk: false,
         pattern: null
       })
     }
   }
 
-  return attachKeys(path, keys)
+  return path
 }
 
 /**
  * Transform an array into a regexp.
  *
  * @param  {!Array}  path
- * @param  {Array}   keys
- * @param  {!Object} options
+ * @param  {Array=}  keys
+ * @param  {Object=} options
  * @return {!RegExp}
  */
 function arrayToRegexp (path, keys, options) {
@@ -305,17 +273,15 @@ function arrayToRegexp (path, keys, options) {
     parts.push(pathToRegexp(path[i], keys, options).source)
   }
 
-  var regexp = new RegExp('(?:' + parts.join('|') + ')', flags(options))
-
-  return attachKeys(regexp, keys)
+  return new RegExp('(?:' + parts.join('|') + ')', flags(options))
 }
 
 /**
  * Create a path regexp from string input.
  *
  * @param  {string}  path
- * @param  {!Array}  keys
- * @param  {!Object} options
+ * @param  {Array=}  keys
+ * @param  {Object=} options
  * @return {!RegExp}
  */
 function stringToRegexp (path, keys, options) {
@@ -325,22 +291,21 @@ function stringToRegexp (path, keys, options) {
 /**
  * Expose a function for taking tokens and returning a RegExp.
  *
- * @param  {!Array}          tokens
- * @param  {(Array|Object)=} keys
- * @param  {Object=}         options
+ * @param  {!Array}  tokens
+ * @param  {Array=}  keys
+ * @param  {Object=} options
  * @return {!RegExp}
  */
 function tokensToRegExp (tokens, keys, options) {
-  if (!isarray(keys)) {
-    options = /** @type {!Object} */ (keys || options)
-    keys = []
-  }
-
   options = options || {}
 
   var strict = options.strict
   var end = options.end !== false
+  var delimiter = escapeString(options.delimiter || DEFAULT_DELIMITER)
+  var delimiters = options.delimiters || DEFAULT_DELIMITERS
+  var endsWith = [].concat(options.endsWith || []).map(escapeString).concat('$').join('|')
   var route = ''
+  var isEndDelimited = tokens.length === 0
 
   // Iterate over the tokens and create our regexp string.
   for (var i = 0; i < tokens.length; i++) {
@@ -348,50 +313,37 @@ function tokensToRegExp (tokens, keys, options) {
 
     if (typeof token === 'string') {
       route += escapeString(token)
+      isEndDelimited = i === tokens.length - 1 && delimiters.indexOf(token[token.length - 1]) > -1
     } else {
       var prefix = escapeString(token.prefix)
-      var capture = '(?:' + token.pattern + ')'
+      var capture = token.repeat
+        ? '(?:' + token.pattern + ')(?:' + prefix + '(?:' + token.pattern + '))*'
+        : token.pattern
 
-      keys.push(token)
-
-      if (token.repeat) {
-        capture += '(?:' + prefix + capture + ')*'
-      }
+      if (keys) keys.push(token)
 
       if (token.optional) {
-        if (!token.partial) {
-          capture = '(?:' + prefix + '(' + capture + '))?'
+        if (token.partial) {
+          route += prefix + '(' + capture + ')?'
         } else {
-          capture = prefix + '(' + capture + ')?'
+          route += '(?:' + prefix + '(' + capture + '))?'
         }
       } else {
-        capture = prefix + '(' + capture + ')'
+        route += prefix + '(' + capture + ')'
       }
-
-      route += capture
     }
   }
 
-  var delimiter = escapeString(options.delimiter || '/')
-  var endsWithDelimiter = route.slice(-delimiter.length) === delimiter
-
-  // In non-strict mode we allow a slash at the end of match. If the path to
-  // match already ends with a slash, we remove it for consistency. The slash
-  // is valid at the end of a path match, not in the middle. This is important
-  // in non-ending mode, where "/test/" shouldn't match "/test//route".
-  if (!strict) {
-    route = (endsWithDelimiter ? route.slice(0, -delimiter.length) : route) + '(?:' + delimiter + '(?=$))?'
-  }
-
   if (end) {
-    route += '$'
+    if (!strict) route += '(?:' + delimiter + ')?'
+
+    route += endsWith === '$' ? '$' : '(?=' + endsWith + ')'
   } else {
-    // In non-ending mode, we need the capturing groups to match as much as
-    // possible by using a positive lookahead to the end or next path segment.
-    route += strict && endsWithDelimiter ? '' : '(?=' + delimiter + '|$)'
+    if (!strict) route += '(?:' + delimiter + '(?=' + endsWith + '))?'
+    if (!isEndDelimited) route += '(?=' + delimiter + '|' + endsWith + ')'
   }
 
-  return attachKeys(new RegExp('^' + route, flags(options)), keys)
+  return new RegExp('^' + route, flags(options))
 }
 
 /**
@@ -402,25 +354,18 @@ function tokensToRegExp (tokens, keys, options) {
  * contain `[{ name: 'id', delimiter: '/', optional: false, repeat: false }]`.
  *
  * @param  {(string|RegExp|Array)} path
- * @param  {(Array|Object)=}       keys
+ * @param  {Array=}                keys
  * @param  {Object=}               options
  * @return {!RegExp}
  */
 function pathToRegexp (path, keys, options) {
-  if (!isarray(keys)) {
-    options = /** @type {!Object} */ (keys || options)
-    keys = []
-  }
-
-  options = options || {}
-
   if (path instanceof RegExp) {
-    return regexpToRegexp(path, /** @type {!Array} */ (keys))
+    return regexpToRegexp(path, keys)
   }
 
-  if (isarray(path)) {
-    return arrayToRegexp(/** @type {!Array} */ (path), /** @type {!Array} */ (keys), options)
+  if (Array.isArray(path)) {
+    return arrayToRegexp(/** @type {!Array} */ (path), keys, options)
   }
 
-  return stringToRegexp(/** @type {string} */ (path), /** @type {!Array} */ (keys), options)
+  return stringToRegexp(/** @type {string} */ (path), keys, options)
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "path-to-regexp",
   "description": "Express style path to RegExp utility",
-  "version": "1.8.0",
+  "version": "2.2.1",
   "main": "index.js",
   "typings": "index.d.ts",
   "files": [
@@ -13,7 +13,6 @@
     "lint": "standard",
     "test-spec": "mocha --require ts-node/register -R spec --bail test.ts",
     "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --require ts-node/register -R spec test.ts",
-    "prepublish": "typings install",
     "test": "npm run lint && npm run test-cov"
   },
   "keywords": [
@@ -33,15 +32,14 @@
     "url": "https://github.com/pillarjs/path-to-regexp.git"
   },
   "devDependencies": {
-    "chai": "^2.3.0",
-    "istanbul": "~0.3.0",
-    "mocha": "~2.2.4",
-    "standard": "~3.7.3",
-    "ts-node": "^0.5.5",
-    "typescript": "^1.8.7",
-    "typings": "^1.0.4"
-  },
-  "dependencies": {
-    "isarray": "0.0.1"
+    "@types/chai": "^4.0.4",
+    "@types/mocha": "^2.2.42",
+    "@types/node": "^8.0.24",
+    "chai": "^4.1.1",
+    "istanbul": "^0.4.5",
+    "mocha": "^3.5.0",
+    "standard": "^10.0.3",
+    "ts-node": "^3.3.0",
+    "typescript": "^2.4.2"
   }
 }