use path-to-regexp

Author: jonathanong

lib/router/layer.js

@@ -1,5 +1,6 @@
-var utils = require('../utils')
-  , debug = require('debug')('express:router:layer')
+var utils = require('../utils');
+var pathRegexp = require('path-to-regexp');
+var debug = require('debug')('express:router:layer');
 
 function Layer(path, options, fn) {
   if (!(this instanceof Layer)) {
@@ -10,11 +11,7 @@ function Layer(path, options, fn) {
   options = options || {};
   this.path = path;
   this.params = {};
-  this.regexp = utils.pathRegexp(path
-    , this.keys = []
-    , options.sensitive
-    , options.strict
-    , options.end);
+  this.regexp = pathRegexp(path, this.keys = [], options);
   this.handle = fn;
 }
 

lib/utils.js

@@ -119,46 +119,6 @@ function acceptParams(str, index) {
   return ret;
 }
 
-/**
- * Normalize the given path string,
- * returning a regular expression.
- *
- * An empty array should be passed,
- * which will contain the placeholder
- * key names. For example "/user/:id" will
- * then contain ["id"].
- *
- * @param  {String|RegExp|Array} path
- * @param  {Array} keys
- * @param  {Boolean} sensitive
- * @param  {Boolean} strict
- * @param  {Boolean} end (whether to append $ to regex)
- * @return {RegExp}
- * @api private
- */
-
-exports.pathRegexp = function(path, keys, sensitive, strict, end) {
-  if (toString.call(path) == '[object RegExp]') return path;
-  if (Array.isArray(path)) path = '(' + path.join('|') + ')';
-  path = path
-    .concat(strict ? '' : '/?')
-    .replace(/\/\(/g, '(?:/')
-    .replace(/(\/)?(\.)?:(\w+)(?:(\(.*?\)))?(\?)?(\*)?/g, function(_, slash, format, key, capture, optional, star){
-      keys.push({ name: key, optional: !! optional });
-      slash = slash || '';
-      return ''
-        + (optional ? '' : slash)
-        + '(?:'
-        + (optional ? slash : '')
-        + (format || '') + (capture || (format && '([^/.]+?)' || '([^/]+?)')) + ')'
-        + (optional || '')
-        + (star ? '(/*)?' : '');
-    })
-    .replace(/([\/.])/g, '\\$1')
-    .replace(/\*/g, '(.*)');
-  return new RegExp('^' + path + ((end) ? '$' : ''), sensitive ? '' : 'i');
-}
-
 /**
  * Parse the `req` url with memoization.
  *

package.json

@@ -36,6 +36,7 @@
     "escape-html": "1.0.1",
     "qs": "0.6.6",
     "serve-static": "1.0.1",
+    "path-to-regexp": "0.1.0",
     "debug": ">= 0.7.3 < 1"
   },
   "devDependencies": {