deps: [email protected]

closes #42

Author: wesleytodd

HISTORY.md

@@ -3,6 +3,17 @@
 
   * deps: [email protected]
   * deps: parseurl@~1.3.3
+  * deps: [email protected]
+    - Add new `?`, `*`, and `+` parameter modifiers
+    - Matching group expressions are only RegExp syntax.
+      `(*)` is no longer valid and must be written as `(.*)`, for example.
+    - Named matching groups no longer available by position in `req.params`.
+      `/:foo(.*)` only captures as `req.params.foo` and not available as
+      `req.parmas[0]`.
+    - Regular expressions can only be used in a matching group.
+      `/\\d+` is no longer valid and must be written as `/(\\d+)`.
+    - Special `*` path segment behavior removed.
+      `/foo/*/bar` will match a literal `*` as the middle segment.
   * deps: [email protected]
 
 2.0.0-alpha.1 / 2018-07-27

lib/layer.js

@@ -21,6 +21,7 @@ var debug = require('debug')('router:layer')
  */
 
 var hasOwnProperty = Object.prototype.hasOwnProperty
+var TRAILING_SLASH_REGEXP = /\/+$/
 
 /**
  * Expose `Layer`.
@@ -37,13 +38,13 @@ function Layer(path, options, fn) {
   var opts = options || {}
 
   this.handle = fn
+  this.keys = []
   this.name = fn.name || '<anonymous>'
   this.params = undefined
   this.path = undefined
-  this.regexp = pathRegexp(path, this.keys = [], opts)
+  this.regexp = pathRegexp((opts.strict ? path : loosen(path)), this.keys, opts)
 
   // set fast path flags
-  this.regexp.fast_star = path === '*'
   this.regexp.fast_slash = path === '/' && opts.end === false
 }
 
@@ -132,13 +133,6 @@ Layer.prototype.match = function match(path) {
       return true
     }
 
-    // fast path for * (everything matched in a param)
-    if (this.regexp.fast_star) {
-      this.params = {'0': decode_param(path)}
-      this.path = path
-      return true
-    }
-
     // match the path
     match = this.regexp.exec(path)
   }
@@ -208,3 +202,16 @@ function isPromise (val) {
     typeof val === 'object' &&
     typeof val.then === 'function'
 }
+
+/**
+ * Loosens the given path for path-to-regexp matching.
+ */
+function loosen (path) {
+  if (path instanceof RegExp) {
+    return path
+  }
+
+  return Array.isArray(path)
+    ? path.map(function (p) { return loosen(p) })
+    : String(path).replace(TRAILING_SLASH_REGEXP, '')
+}

package.json

@@ -13,7 +13,7 @@
     "debug": "3.1.0",
     "methods": "~1.1.2",
     "parseurl": "~1.3.3",
-    "path-to-regexp": "0.1.7",
+    "path-to-regexp": "3.2.0",
     "setprototypeof": "1.2.0",
     "utils-merge": "1.0.1"
   },

test/req.params.js

@@ -137,7 +137,7 @@ describe('req.params', function () {
           })
         })
 
-        router.get('/*', hitParams(1))
+        router.get('/(.*)', hitParams(1))
 
         request(server)
           .get('/buzz')
@@ -156,7 +156,7 @@ describe('req.params', function () {
           })
         })
 
-        router.get('/*', hitParams(1))
+        router.get('/(.*)', hitParams(1))
 
         request(server)
           .get('/bar')

test/route.js

@@ -655,18 +655,18 @@ describe('Router', function () {
         it('should work following a partial capture group', function (done) {
           var cb = after(2, done)
           var router = new Router()
-          var route = router.route('/user(s)?/:user/:op')
+          var route = router.route('/user(s?)/:user/:op')
           var server = createServer(router)
 
           route.all(sendParams)
 
           request(server)
             .get('/user/tj/edit')
-            .expect(200, {'user': 'tj', 'op': 'edit'}, cb)
+            .expect(200, { 0: '', user: 'tj', op: 'edit' }, cb)
 
           request(server)
             .get('/users/tj/edit')
-            .expect(200, {'0': 's', 'user': 'tj', 'op': 'edit'}, cb)
+            .expect(200, { 0: 's', user: 'tj', op: 'edit' }, cb)
         })
 
         it('should work inside literal paranthesis', function (done) {
@@ -699,132 +699,127 @@ describe('Router', function () {
         })
       })
 
-      describe('using "*"', function () {
-        it('should capture everything', function (done) {
+      describe('using ":name?"', function () {
+        it('should name an optional parameter', function (done) {
+          var cb = after(2, done)
           var router = new Router()
-          var route = router.route('*')
+          var route = router.route('/:foo?')
           var server = createServer(router)
 
           route.all(sendParams)
 
           request(server)
-            .get('/foo/bar/baz')
-            .expect(200, {'0': '/foo/bar/baz'}, done)
-        })
-
-        it('should decode the capture', function (done) {
-          var router = new Router()
-          var route = router.route('*')
-          var server = createServer(router)
-
-          route.all(sendParams)
+            .get('/bar')
+            .expect(200, { foo: 'bar' }, cb)
 
           request(server)
-            .get('/foo/%20/baz')
-            .expect(200, {'0': '/foo/ /baz'}, done)
+            .get('/')
+            .expect(200, {}, cb)
         })
 
-        it('should capture everything with pre- and post-fixes', function (done) {
+        it('should work in any segment', function (done) {
+          var cb = after(2, done)
           var router = new Router()
-          var route = router.route('/foo/*/bar')
+          var route = router.route('/user/:foo?/delete')
           var server = createServer(router)
 
           route.all(sendParams)
 
           request(server)
-            .get('/foo/1/2/3/bar')
-            .expect(200, {'0': '1/2/3'}, done)
+            .get('/user/bar/delete')
+            .expect(200, { foo: 'bar' }, cb)
+
+          request(server)
+            .get('/user/delete')
+            .expect(200, {}, cb)
         })
+      })
 
-        it('should capture greedly', function (done) {
+      describe('using ":name*"', function () {
+        it('should name a zero-or-more repeated parameter', function (done) {
+          var cb = after(3, done)
           var router = new Router()
-          var route = router.route('/foo/*/bar')
+          var route = router.route('/:foo*')
           var server = createServer(router)
 
           route.all(sendParams)
 
           request(server)
-            .get('/foo/bar/bar/bar')
-            .expect(200, {'0': 'bar/bar'}, done)
-        })
-
-        it('should be an optional capture', function (done) {
-          var router = new Router()
-          var route = router.route('/foo*')
-          var server = createServer(router)
+            .get('/')
+            .expect(200, {}, cb)
 
-          route.all(sendParams)
+          request(server)
+            .get('/bar')
+            .expect(200, { foo: 'bar' }, cb)
 
           request(server)
-            .get('/foo')
-            .expect(200, {'0': ''}, done)
+            .get('/fizz/buzz')
+            .expect(200, { foo: 'fizz/buzz' }, cb)
         })
 
-        it('should require preceeding /', function (done) {
-          var cb = after(2, done)
+        it('should work in any segment', function (done) {
+          var cb = after(3, done)
           var router = new Router()
-          var route = router.route('/foo/*')
+          var route = router.route('/user/:foo*/delete')
           var server = createServer(router)
 
           route.all(sendParams)
 
           request(server)
-            .get('/foo')
-            .expect(404, cb)
+            .get('/user/delete')
+            .expect(200, {}, cb)
+
+          request(server)
+            .get('/user/bar/delete')
+            .expect(200, { foo: 'bar' }, cb)
 
           request(server)
-            .get('/foo/')
-            .expect(200, cb)
+            .get('/user/fizz/buzz/delete')
+            .expect(200, { foo: 'fizz/buzz' }, cb)
         })
+      })
 
-        it('should work in a named parameter', function (done) {
-          var cb = after(2, done)
+      describe('using ":name+"', function () {
+        it('should name a one-or-more repeated parameter', function (done) {
+          var cb = after(3, done)
           var router = new Router()
-          var route = router.route('/:foo(*)')
+          var route = router.route('/:foo+')
           var server = createServer(router)
 
           route.all(sendParams)
 
           request(server)
-            .get('/bar')
-            .expect(200, {'0': 'bar', 'foo': 'bar'}, cb)
+            .get('/')
+            .expect(404, cb)
 
           request(server)
-            .get('/fizz/buzz')
-            .expect(200, {'0': 'fizz/buzz', 'foo': 'fizz/buzz'}, cb)
-        })
-
-        it('should work before a named parameter', function (done) {
-          var router = new Router()
-          var route = router.route('/*/user/:id')
-          var server = createServer(router)
-
-          route.all(sendParams)
+            .get('/bar')
+            .expect(200, { foo: 'bar' }, cb)
 
           request(server)
-            .get('/poke/user/42')
-            .expect(200, {'0': 'poke', 'id': '42'}, done)
+            .get('/fizz/buzz')
+            .expect(200, { foo: 'fizz/buzz' }, cb)
         })
 
-        it('should work within arrays', function (done) {
+        it('should work in any segment', function (done) {
           var cb = after(3, done)
           var router = new Router()
-          var route = router.route(['/user/:id', '/foo/*', '/:action'])
+          var route = router.route('/user/:foo+/delete')
           var server = createServer(router)
 
           route.all(sendParams)
 
           request(server)
-            .get('/user/42')
-            .expect(200, {'id': '42'}, cb)
+            .get('/user/delete')
+            .expect(404, cb)
 
           request(server)
-            .get('/foo/bar')
-            .expect(200, {'0': 'bar'}, cb)
+            .get('/user/bar/delete')
+            .expect(200, { foo: 'bar' }, cb)
 
           request(server)
-            .get('/poke')
-            .expect(200, {'action': 'poke'}, cb)
+            .get('/user/fizz/buzz/delete')
+            .expect(200, { foo: 'fizz/buzz' }, cb)
         })
       })
     })