path-to-regexp 2.0.0 → 2.1.0

package/History.md

@@ -1,3 +1,15 @@
+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/index.js

@@ -7,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.
  *
@@ -36,8 +42,8 @@ function parse (str, options) {
   var key = 0
   var index = 0
   var path = ''
-  var defaultDelimiter = (options && options.delimiter) || '/'
-  var delimiters = (options && options.delimiters) || './'
+  var defaultDelimiter = (options && options.delimiter) || DEFAULT_DELIMITER
+  var delimiters = (options && options.delimiters) || DEFAULT_DELIMITERS
   var pathEscaped = false
   var res
 
@@ -295,9 +301,11 @@ function tokensToRegExp (tokens, keys, options) {
 
   var strict = options.strict
   var end = options.end !== false
-  var delimiter = escapeString(options.delimiter || '/')
+  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 = false
 
   // Iterate over the tokens and create our regexp string.
   for (var i = 0; i < tokens.length; i++) {
@@ -305,41 +313,34 @@ 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
 
       if (keys) keys.push(token)
 
-      if (token.repeat) {
-        capture += '(?:' + prefix + capture + ')*'
-      }
-
       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
     }
   }
 
-  // In non-strict mode we allow a delimiter at the end of a match.
-  if (!strict) {
-    route += '(?:' + delimiter + '(?=' + endsWith + '))?'
-  }
-
   if (end) {
-    route += endsWith === '$' ? endsWith : '(?=' + endsWith + ')'
+    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 += '(?=' + delimiter + '|' + endsWith + ')'
+    if (!strict) route += '(?:' + delimiter + '(?=' + endsWith + '))?'
+    if (!isEndDelimited) route += '(?=' + delimiter + '|' + endsWith + ')'
   }
 
   return new RegExp('^' + route, flags(options))

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "path-to-regexp",
   "description": "Express style path to RegExp utility",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "main": "index.js",
   "typings": "index.d.ts",
   "files": [