path-to-regexp 1.7.0 → 1.9.0

package/Readme.md

@@ -82,7 +82,7 @@ re.exec('/test')
 //=> ['/test', 'test', undefined]
 
 re.exec('/test/route')
-//=> ['/test', 'test', 'route']
+//=> ['/test/route', 'test', 'route']
 ```
 
 ##### Zero or more

package/index.d.ts

@@ -33,6 +33,13 @@ declare namespace pathToRegexp {
     delimiter?: string;
   }
 
+  export interface TokensToFunctionOptions {
+    /**
+     * When `true` the regexp will be case sensitive. (default: `false`)
+     */
+    sensitive?: boolean;
+  }
+
   /**
    * Parse an Express-style path into an array of tokens.
    */
@@ -41,12 +48,12 @@ declare namespace pathToRegexp {
   /**
    * Transforming an Express-style path into a valid path.
    */
-  export function compile (path: string, options?: ParseOptions): PathFunction;
+  export function compile (path: string, options?: ParseOptions & TokensToFunctionOptions): PathFunction;
 
   /**
    * Transform an array of tokens into a path generator function.
    */
-  export function tokensToFunction (tokens: Token[]): PathFunction;
+  export function tokensToFunction (tokens: Token[], options?: TokensToFunctionOptions): PathFunction;
 
   /**
    * Transform an array of tokens into a matching regular expression.

package/index.js

@@ -72,8 +72,9 @@ function parse (str, options) {
     var partial = prefix != null && next != null && next !== prefix
     var repeat = modifier === '+' || modifier === '*'
     var optional = modifier === '?' || modifier === '*'
-    var delimiter = res[2] || defaultDelimiter
+    var delimiter = prefix || defaultDelimiter
     var pattern = capture || group
+    var prevText = prefix || (typeof tokens[tokens.length - 1] === 'string' ? tokens[tokens.length - 1] : '')
 
     tokens.push({
       name: name || key++,
@@ -83,7 +84,7 @@ function parse (str, options) {
       repeat: repeat,
       partial: partial,
       asterisk: !!asterisk,
-      pattern: pattern ? escapeGroup(pattern) : (asterisk ? '.*' : '[^' + escapeString(delimiter) + ']+?')
+      pattern: pattern ? escapeGroup(pattern) : (asterisk ? '.*' : restrictBacktrack(delimiter, prevText))
     })
   }
 
@@ -100,6 +101,14 @@ function parse (str, options) {
   return tokens
 }
 
+function restrictBacktrack(delimiter, prevText) {
+  if (!prevText || prevText.indexOf(delimiter) > -1) {
+    return '[^' + escapeString(delimiter) + ']+?'
+  }
+
+  return escapeString(prevText) + '|(?:(?!' + escapeString(prevText) + ')[^' + escapeString(delimiter) + '])+?'
+}
+
 /**
  * Compile a string to a template function for the path.
  *
@@ -108,7 +117,7 @@ function parse (str, options) {
  * @return {!function(Object=, Object=)}
  */
 function compile (str, options) {
-  return tokensToFunction(parse(str, options))
+  return tokensToFunction(parse(str, options), options)
 }
 
 /**
@@ -138,14 +147,14 @@ function encodeAsterisk (str) {
 /**
  * Expose a method for transforming tokens into the path function.
  */
-function tokensToFunction (tokens) {
+function tokensToFunction (tokens, options) {
   // 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 + ')$')
+      matches[i] = new RegExp('^(?:' + tokens[i].pattern + ')$', flags(options))
     }
   }
 
@@ -258,7 +267,7 @@ function attachKeys (re, keys) {
  * @return {string}
  */
 function flags (options) {
-  return options.sensitive ? '' : 'i'
+  return options && options.sensitive ? '' : 'i'
 }
 
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "path-to-regexp",
   "description": "Express style path to RegExp utility",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "main": "index.js",
   "typings": "index.d.ts",
   "files": [
@@ -11,10 +11,9 @@
   ],
   "scripts": {
     "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"
+    "test-spec": "mocha -R spec --bail test.js",
+    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- -R spec test.js",
+    "test": "npm run test-cov"
   },
   "keywords": [
     "express",
@@ -38,8 +37,7 @@
     "mocha": "~2.2.4",
     "standard": "~3.7.3",
     "ts-node": "^0.5.5",
-    "typescript": "^1.8.7",
-    "typings": "^1.0.4"
+    "typescript": "^1.8.7"
   },
   "dependencies": {
     "isarray": "0.0.1"

package/History.md

@@ -1,153 +0,0 @@
-1.6.0 / 2016-10-03
-==================
-
-  * Populate `RegExp.keys` when using the `tokensToRegExp` method (making it consistent with the main export)
-  * Allow a `delimiter` option to be passed in with `parse`
-  * Updated TypeScript definition with `Keys` and `Options` updated
-
-1.5.3 / 2016-06-15
-==================
-
-  * Add `\\` to the ignore character group to avoid backtracking on mismatched parens
-
-1.5.2 / 2016-06-15
-==================
-
-  * Escape `\\` in string segments of regexp
-
-1.5.1 / 2016-06-08
-==================
-
-  * Add `index.d.ts` to NPM package
-
-1.5.0 / 2016-05-20
-==================
-
-  * Handle partial token segments (better)
-  * Allow compile to handle asterisk token segments
-
-1.4.0 / 2016-05-18
-==================
-
-  * Handle RegExp unions in path matching groups
-
-1.3.0 / 2016-05-08
-==================
-
-  * Clarify README language and named parameter token support
-  * Support advanced Closure Compiler with type annotations
-  * Add pretty paths options to compiled function output
-  * Add TypeScript definition to project
-  * Improved prefix handling with non-complete segment parameters (E.g. `/:foo?-bar`)
-
-1.2.1 / 2015-08-17
-==================
-
-  * Encode values before validation with path compilation function
-  * More examples of using compilation in README
-
-1.2.0 / 2015-05-20
-==================
-
-  * Add support for matching an asterisk (`*`) as an unnamed match everything group (`(.*)`)
-
-1.1.1 / 2015-05-11
-==================
-
-  * Expose methods for working with path tokens
-
-1.1.0 / 2015-05-09
-==================
-
-  * Expose the parser implementation to consumers
-  * Implement a compiler function to generate valid strings
-  * Huge refactor of tests to be more DRY and cover new parse and compile functions
-  * Use chai in tests
-  * Add .editorconfig
-
-1.0.3 / 2015-01-17
-==================
-
-  * Optimised function runtime
-  * Added `files` to `package.json`
-
-1.0.2 / 2014-12-17
-==================
-
-  * Use `Array.isArray` shim
-  * Remove ES5 incompatible code
-  * Fixed repository path
-  * Added new readme badges
-
-1.0.1 / 2014-08-27
-==================
-
-  * Ensure installation works correctly on 0.8
-
-1.0.0 / 2014-08-17
-==================
-
-  * No more API changes
-
-0.2.5 / 2014-08-07
-==================
-
-  * Allow keys parameter to be omitted
-
-0.2.4 / 2014-08-02
-==================
-
-  * Code coverage badge
-  * Updated readme
-  * Attach keys to the generated regexp
-
-0.2.3 / 2014-07-09
-==================
-
-  * Add MIT license
-
-0.2.2 / 2014-07-06
-==================
-
-  * A passed in trailing slash in non-strict mode will become optional
-  * In non-end mode, the optional trailing slash will only match at the end
-
-0.2.1 / 2014-06-11
-==================
-
-  * Fixed a major capturing group regexp regression
-
-0.2.0 / 2014-06-09
-==================
-
-  * Improved support for arrays
-  * Improved support for regexps
-  * Better support for non-ending strict mode matches with a trailing slash
-  * Travis CI support
-  * Block using regexp special characters in the path
-  * Removed support for the asterisk to match all
-  * New support for parameter suffixes - `*`, `+` and `?`
-  * Updated readme
-  * Provide delimiter information with keys array
-
-0.1.2 / 2014-03-10
-==================
-
-  * Move testing dependencies to `devDependencies`
-
-0.1.1 / 2014-03-10
-==================
-
-  * Match entire substring with `options.end`
-  * Properly handle ending and non-ending matches
-
-0.1.0 / 2014-03-06
-==================
-
-  * Add `options.end`
-
-0.0.2 / 2013-02-10
-==================
-
-  * Update to match current express
-  * Add .license property to component.json