Handle partial path token matches/compiles

Author: blakeembrey

Readme.md

@@ -57,11 +57,9 @@ re.exec('/test/route')
 
 **Please note:** Named parameters must be made up of "word characters" (`[A-Za-z0-9_]`).
 
-Path segments are defined by "prefix" characters (`.` or `/`). If a prefix is used, and the parameter is followed by the same prefix character or end of the path, it is considered a segment and the prefix is part of the match. This behavior is apparent when using optional parameters.
-
 ```js
-var re = pathToRegexp('/:prefix(apple-)?icon-:res(\\d+).png', keys)
-// keys = [{ name: 'prefix', prefix: '', ... }, { name: 'res', prefix: '', ... }]
+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']

index.d.ts

@@ -41,6 +41,7 @@ declare namespace pathToRegexp {
  prefix: string;
  delimiter: string;
  optional: boolean;
+ partial: boolean;
  repeat: boolean;
  pattern: string;
  }
@@ -54,4 +55,4 @@ declare namespace pathToRegexp {
  export type PathFunction = (data?: Object, options?: PathFunctionOptions) => string;
 }
 
-export = pathToRegexp;
+export = pathToRegexp;

index.js

@@ -61,18 +61,13 @@ function parse (str) {
  var modifier = res[6]
  var asterisk = res[7]
 
- // Only use the prefix when followed by another path segment.
- if (prefix != null && next != null && next !== prefix) {
- path += prefix
- prefix = null
- }
-
  // Push the current path onto the tokens.
  if (path) {
  tokens.push(path)
  path = ''
  }
 
+ var partial = prefix != null && next != null && next !== prefix
  var repeat = modifier === '+' || modifier === '*'
  var optional = modifier === '?' || modifier === '*'
  var delimiter = res[2] || '/'
@@ -84,6 +79,7 @@ function parse (str) {
  delimiter: delimiter,
  optional: optional,
  repeat: repeat,
+ partial: partial,
  pattern: escapeGroup(pattern)
  })
  }
@@ -157,6 +153,11 @@ function tokensToFunction (tokens) {
 
  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')
@@ -262,6 +263,7 @@ function regexpToRegexp (path, keys) {
  prefix: null,
  delimiter: null,
  optional: false,
+ partial: false,
  repeat: false,
  pattern: null
  })
@@ -344,10 +346,10 @@ function tokensToRegExp (tokens, options) {
  }
 
  if (token.optional) {
- if (prefix) {
+ if (!token.partial) {
  capture = '(?:' + prefix + '(' + capture + '))?'
  } else {
- capture = '(' + capture + ')?'
+ capture = prefix + '(' + capture + ')?'
  }
  } else {
  capture = prefix + '(' + capture + ')'