path-to-regexp 0.1.6 → 0.1.8

package/Readme.md

@@ -2,7 +2,7 @@
 
 Turn an Express-style path string such as `/user/:name` into a regular expression.
 
-**Note:** This is a legacy branch. You should upgrade to `1.x`. If you find you are stuck on this version, your code will need to take into account the `index` property on the keys.
+**Note:** This is a legacy branch. You should upgrade to `1.x`.
 
 ## Usage
 

package/index.js

@@ -7,7 +7,7 @@ module.exports = pathtoRegexp;
 /**
  * Match matching groups in a regular expression.
  */
-var MATCHING_GROUP_REGEXP = /\((?!\?)/g;
+var MATCHING_GROUP_REGEXP = /\((?:\?<(.*?)>)?(?!\?)/g;
 
 /**
  * Normalize the given path string,
@@ -40,7 +40,7 @@ function pathtoRegexp(path, keys, options) {
   if (path instanceof RegExp) {
     while (m = MATCHING_GROUP_REGEXP.exec(path.source)) {
       keys.push({
-        name: name++,
+        name: m[1] || name++,
         optional: false,
         offset: m.index
       });
@@ -91,7 +91,7 @@ function pathtoRegexp(path, keys, options) {
       var len = keys.length
 
       while (len-- > keysOffset && keys[len].offset > index) {
-        keys[len].offset += 3;
+        keys[len].offset += 3; // Replacement length minus asterisk length.
       }
 
       return '(.*)';
@@ -99,6 +99,18 @@ function pathtoRegexp(path, keys, options) {
 
   // This is a workaround for handling unnamed matching groups.
   while (m = MATCHING_GROUP_REGEXP.exec(path)) {
+    var escapeCount = 0;
+    var index = m.index;
+
+    while (path.charAt(--index) === '\\') {
+      escapeCount++;
+    }
+
+    // It's possible to escape the bracket.
+    if (escapeCount % 2 === 1) {
+      continue;
+    }
+
     if (keysOffset + i === keys.length || keys[keysOffset + i].offset > m.index) {
       keys.splice(keysOffset + i, 0, {
         name: name++, // Unnamed matching groups must be consistently linear.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "path-to-regexp",
   "description": "Express style path to RegExp utility",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "files": [
     "index.js",
     "LICENSE"

package/History.md

@@ -1,26 +0,0 @@
-0.1.5 / 2015-05-08
-==================
-
-  * Add an index property for position in match result.
-
-0.1.4 / 2015-03-05
-==================
-
-  * Add license information
-
-0.1.3 / 2014-07-06
-==================
-
-  * Better array support
-  * Improved support for trailing slash in non-ending mode
-
-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