Skip to content

Commit

Permalink
Store matched routes in request
Browse files Browse the repository at this point in the history
  • Loading branch information
ajfranzoia authored and gabegorelick committed Jan 3, 2020
1 parent dfd856c commit 3151f57
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 11 deletions.
7 changes: 6 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,11 @@ Router.prototype.handle = function handle(req, res, callback) {
return next(layerError || err)
}

if (layer.path) {
req.matchedRoutes = req.matchedRoutes || []
req.matchedRoutes.push(layer.matchedPath.path)
}

if (route) {
return layer.handle_request(req, res, next)
}
Expand Down Expand Up @@ -347,7 +352,7 @@ Router.prototype.process_params = function process_params(layer, called, req, re
var params = this.params

// captured parameters from the layer, keys and values
var keys = layer.keys
var keys = layer.matchedPath && layer.matchedPath.keys

// fast track
if (!keys || keys.length === 0) {
Expand Down
41 changes: 31 additions & 10 deletions lib/layer.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,35 @@ var hasOwnProperty = Object.prototype.hasOwnProperty

module.exports = Layer

function Layer(path, options, fn) {
function Layer(paths, options, fn) {
if (!(this instanceof Layer)) {
return new Layer(path, options, fn)
return new Layer(paths, options, fn)
}

debug('new %o', path)
debug('new %o', paths)
var opts = options || {}

this.handle = fn
this.name = fn.name || '<anonymous>'
this.params = undefined
this.path = undefined
this.regexp = pathRegexp(path, this.keys = [], opts)
this.matchedPath = undefined

// set fast path flags
this.regexp.fast_star = path === '*'
this.regexp.fast_slash = path === '/' && opts.end === false
this.fastStar = paths === '*'
this.fastSlash = paths === '/' && opts.end === false

this.paths = !Array.isArray(paths) ? [paths] : paths
this.paths = this.paths.map(function (path) {
var keys = []
var pathObj = {
path: path,
keys: keys,
regexp: pathRegexp(path, keys, opts)
}

return pathObj
})
}

/**
Expand Down Expand Up @@ -107,24 +119,33 @@ Layer.prototype.handle_request = function handle(req, res, next) {

Layer.prototype.match = function match(path) {
var match
var checkPath

if (path != null) {
// fast path non-ending match for / (any path matches)
if (this.regexp.fast_slash) {
if (this.fastSlash) {
this.params = {}
this.path = ''
this.matchedPath = this.paths[0]
return true
}

// fast path for * (everything matched in a param)
if (this.regexp.fast_star) {
if (this.fastStar) {
this.params = {'0': decode_param(path)}
this.path = path
this.matchedPath = this.paths[0]
return true
}

// match the path
match = this.regexp.exec(path)
for (var i = 0; i < this.paths.length; i++) {
checkPath = this.paths[i]
if (match = checkPath.regexp.exec(path)) {
this.matchedPath = checkPath
break
}
}
}

if (!match) {
Expand All @@ -142,7 +163,7 @@ Layer.prototype.match = function match(path) {
var params = this.params

for (var i = 1; i < match.length; i++) {
var key = keys[i - 1]
var key = this.matchedPath.keys[i - 1]
var prop = key.name
var val = decode_param(match[i])

Expand Down
25 changes: 25 additions & 0 deletions test/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -1129,6 +1129,31 @@ describe('Router', function () {
.expect(200, 'saw GET /bar', done)
})
})

describe('req.matchedRoutes', function () {
it('should store matchedRoutes in request', function (done) {
var router = new Router()
var barRouter = new Router()
var bazRouter = new Router()
var server = createServer(router)
var matchedRoutes

router.use(['/foo/:id', '/foe'], barRouter)
barRouter.use(['/bar'], bazRouter)
bazRouter.get(['/bez', '/baz/:subId'], function (req, res, next) {
matchedRoutes = req.matchedRoutes
next()
})
router.use(saw)

request(server)
.get('/foo/10/bar/baz/30')
.expect(200, 'saw GET /foo/10/bar/baz/30', function (err, res) {
assert.deepEqual(matchedRoutes, ['/foo/:id', '/bar', '/baz/:subId'])
done(err)
})
})
})
})

function helloWorld(req, res) {
Expand Down

0 comments on commit 3151f57

Please sign in to comment.