OSSForks/express
1
0
Fork 0
mirror of https://github.com/zebrajr/express.git synced 2026-01-15 12:15:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(deps)!: router@^2.0.0 (#5885)

Browse Source
This commit is contained in:
Wes Todd
2024-09-09 17:50:11 -05:00
committed by GitHub
parent 4d713d2b76
commit 0264908903
7 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/downloads/index.js
View File

@@ -23,8 +23,8 @@ app.get('/', function(req, res){
// /files/* is accessed via req.params[0] // /files/* is accessed via req.params[0]
// but here we name it :file // but here we name it :file
app.get('/files/:file+', function (req, res, next) { app.get('/files/*file', function (req, res, next) {
res.download(req.params.file, { root: FILES_DIR }, function (err) { res.download(req.params.file.join('/'), { root: FILES_DIR }, function (err) {
if (!err) return; // file sent if (!err) return; // file sent
if (err.status !== 404) return next(err); // non-404 error if (err.status !== 404) return next(err); // non-404 error
// file for download not found // file for download not found

2
examples/resource/index.js
View File

@@ -12,7 +12,7 @@ var app = module.exports = express();
app.resource = function(path, obj) { app.resource = function(path, obj) {
this.get(path, obj.index); this.get(path, obj.index);
this.get(path + '/:a..:b.:format?', function(req, res){ this.get(path + '/:a..:b{.:format}', function(req, res){
var a = parseInt(req.params.a, 10); var a = parseInt(req.params.a, 10);
var b = parseInt(req.params.b, 10); var b = parseInt(req.params.b, 10);
var format = req.params.format; var format = req.params.format;

2
examples/route-separation/index.js
View File

@@ -38,7 +38,7 @@ app.get('/', site.index);
// User // User
app.get('/users', user.list); app.get('/users', user.list);
app.all('/user/:id/:op?', user.load); app.all('/user/:id{/:op}', user.load);
app.get('/user/:id', user.view); app.get('/user/:id', user.view);
app.get('/user/:id/view', user.view); app.get('/user/:id/view', user.view);
app.get('/user/:id/edit', user.edit); app.get('/user/:id/edit', user.edit);

2
package.json
View File

@@ -51,7 +51,7 @@
"proxy-addr": "~2.0.7", "proxy-addr": "~2.0.7",
"qs": "6.13.0", "qs": "6.13.0",
"range-parser": "~1.2.1", "range-parser": "~1.2.1",
"router": "2.0.0-beta.2", "router": "^2.0.0",
"safe-buffer": "5.2.1", "safe-buffer": "5.2.1",
"send": "^1.0.0", "send": "^1.0.0",
"serve-static": "^2.0.0", "serve-static": "^2.0.0",

2
test/app.all.js
View File

@@ -26,7 +26,7 @@ describe('app.all()', function(){
var app = express() var app = express()
, n = 0; , n = 0;
app.all('/*', function(req, res, next){ app.all('/*splat', function(req, res, next){
if (n++) return done(new Error('DELETE called several times')); if (n++) return done(new Error('DELETE called several times'));
next(); next();
}); });

54
test/app.router.js
View File

@@ -316,12 +316,12 @@ describe('app.router', function(){
var app = express(); var app = express();
var router = new express.Router({ mergeParams: true }); var router = new express.Router({ mergeParams: true });
router.get('/(.*).(.*)', function (req, res) { router.get(/^\/(.*)\.(.*)/, function (req, res) {
var keys = Object.keys(req.params).sort(); var keys = Object.keys(req.params).sort();
res.send(keys.map(function(k){ return [k, req.params[k]] })); res.send(keys.map(function(k){ return [k, req.params[k]] }));
}); });
app.use('/user/id:(\\d+)', router); app.use(/^\/user\/id:(\d+)/, router);
request(app) request(app)
.get('/user/id:10/profile.json') .get('/user/id:10/profile.json')
@@ -332,12 +332,12 @@ describe('app.router', function(){
var app = express(); var app = express();
var router = new express.Router({ mergeParams: true }); var router = new express.Router({ mergeParams: true });
router.get('/(.*)', function (req, res) { router.get(/\/(.*)/, function (req, res) {
var keys = Object.keys(req.params).sort(); var keys = Object.keys(req.params).sort();
res.send(keys.map(function(k){ return [k, req.params[k]] })); res.send(keys.map(function(k){ return [k, req.params[k]] }));
}); });
app.use('/user/id:(\\d+)/name:(\\w+)', router); app.use(/^\/user\/id:(\d+)\/name:(\w+)/, router);
request(app) request(app)
.get('/user/id:10/name:tj/profile') .get('/user/id:10/name:tj/profile')
@@ -348,12 +348,12 @@ describe('app.router', function(){
var app = express(); var app = express();
var router = new express.Router({ mergeParams: true }); var router = new express.Router({ mergeParams: true });
router.get('/name:(\\w+)', function(req, res){ router.get(/\/name:(\w+)/, function(req, res){
var keys = Object.keys(req.params).sort(); var keys = Object.keys(req.params).sort();
res.send(keys.map(function(k){ return [k, req.params[k]] })); res.send(keys.map(function(k){ return [k, req.params[k]] }));
}); });
app.use('/user/id:(\\d+)', router); app.use(/\/user\/id:(\d+)/, router);
request(app) request(app)
.get('/user/id:10/name:tj') .get('/user/id:10/name:tj')
@@ -383,11 +383,11 @@ describe('app.router', function(){
var app = express(); var app = express();
var router = new express.Router({ mergeParams: true }); var router = new express.Router({ mergeParams: true });
router.get('/user:(\\w+)/*', function (req, res, next) { router.get(/\/user:(\w+)\//, function (req, res, next) {
next(); next();
}); });
app.use('/user/id:(\\d+)', function (req, res, next) { app.use(/\/user\/id:(\d+)/, function (req, res, next) {
router(req, res, function (err) { router(req, res, function (err) {
var keys = Object.keys(req.params).sort(); var keys = Object.keys(req.params).sort();
res.send(keys.map(function(k){ return [k, req.params[k]] })); res.send(keys.map(function(k){ return [k, req.params[k]] }));
@@ -610,8 +610,8 @@ describe('app.router', function(){
var app = express(); var app = express();
var cb = after(2, done); var cb = after(2, done);
app.get('/user(s?)/:user/:op', function(req, res){ app.get('/user{s}/:user/:op', function(req, res){
res.end(req.params.op + 'ing ' + req.params.user + (req.params[0] ? ' (old)' : '')); res.end(req.params.op + 'ing ' + req.params.user + (req.url.startsWith('/users') ? ' (old)' : ''));
}); });
request(app) request(app)
@@ -657,7 +657,7 @@ describe('app.router', function(){
it('should denote an optional capture group', function(done){ it('should denote an optional capture group', function(done){
var app = express(); var app = express();
app.get('/user/:user/:op?', function(req, res){ app.get('/user/:user{/:op}', function(req, res){
var op = req.params.op || 'view'; var op = req.params.op || 'view';
res.end(op + 'ing ' + req.params.user); res.end(op + 'ing ' + req.params.user);
}); });
@@ -670,7 +670,7 @@ describe('app.router', function(){
it('should populate the capture group', function(done){ it('should populate the capture group', function(done){
var app = express(); var app = express();
app.get('/user/:user/:op?', function(req, res){ app.get('/user/:user{/:op}', function(req, res){
var op = req.params.op || 'view'; var op = req.params.op || 'view';
res.end(op + 'ing ' + req.params.user); res.end(op + 'ing ' + req.params.user);
}); });
@@ -685,8 +685,8 @@ describe('app.router', function(){
it('should match one segment', function (done) { it('should match one segment', function (done) {
var app = express() var app = express()
app.get('/user/:user*', function (req, res) { app.get('/user/*user', function (req, res) {
res.end(req.params.user) res.end(req.params.user[0])
}) })
request(app) request(app)
@@ -697,8 +697,8 @@ describe('app.router', function(){
it('should match many segments', function (done) { it('should match many segments', function (done) {
var app = express() var app = express()
app.get('/user/:user*', function (req, res) { app.get('/user/*user', function (req, res) {
res.end(req.params.user) res.end(req.params.user.join('/'))
}) })
request(app) request(app)
@@ -709,7 +709,7 @@ describe('app.router', function(){
it('should match zero segments', function (done) { it('should match zero segments', function (done) {
var app = express() var app = express()
app.get('/user/:user*', function (req, res) { app.get('/user{/*user}', function (req, res) {
res.end(req.params.user) res.end(req.params.user)
}) })
@@ -723,8 +723,8 @@ describe('app.router', function(){
it('should match one segment', function (done) { it('should match one segment', function (done) {
var app = express() var app = express()
app.get('/user/:user+', function (req, res) { app.get('/user/*user', function (req, res) {
res.end(req.params.user) res.end(req.params.user[0])
}) })
request(app) request(app)
@@ -735,8 +735,8 @@ describe('app.router', function(){
it('should match many segments', function (done) { it('should match many segments', function (done) {
var app = express() var app = express()
app.get('/user/:user+', function (req, res) { app.get('/user/*user', function (req, res) {
res.end(req.params.user) res.end(req.params.user.join('/'))
}) })
request(app) request(app)
@@ -747,7 +747,7 @@ describe('app.router', function(){
it('should not match zero segments', function (done) { it('should not match zero segments', function (done) {
var app = express() var app = express()
app.get('/user/:user+', function (req, res) { app.get('/user/*user', function (req, res) {
res.end(req.params.user) res.end(req.params.user)
}) })
@@ -781,7 +781,7 @@ describe('app.router', function(){
var app = express(); var app = express();
var cb = after(2, done) var cb = after(2, done)
app.get('/:name.:format?', function(req, res){ app.get('/:name{.:format}', function(req, res){
res.end(req.params.name + ' as ' + (req.params.format || 'html')); res.end(req.params.name + ' as ' + (req.params.format || 'html'));
}); });
@@ -800,7 +800,7 @@ describe('app.router', function(){
var app = express() var app = express()
, calls = []; , calls = [];
app.get('/foo/:bar?', function(req, res, next){ app.get('/foo{/:bar}', function(req, res, next){
calls.push('/foo/:bar?'); calls.push('/foo/:bar?');
next(); next();
}); });
@@ -885,7 +885,7 @@ describe('app.router', function(){
var app = express() var app = express()
, calls = []; , calls = [];
app.get('/foo/:bar?', function(req, res, next){ app.get('/foo{/:bar}', function(req, res, next){
calls.push('/foo/:bar?'); calls.push('/foo/:bar?');
next(); next();
}); });
@@ -1096,7 +1096,7 @@ describe('app.router', function(){
var app = express(); var app = express();
var path = []; var path = [];
app.get('/:path+', function (req, res, next) { app.get('/*path', function (req, res, next) {
path.push(0); path.push(0);
next(); next();
}); });
@@ -1116,7 +1116,7 @@ describe('app.router', function(){
next(); next();
}); });
app.get('/(.*)', function (req, res, next) { app.get('/*splat', function (req, res, next) {
path.push(4); path.push(4);
next(); next();
}); });

4
test/req.route.js
View File

@@ -8,7 +8,7 @@ describe('req', function(){
it('should be the executed Route', function(done){ it('should be the executed Route', function(done){
var app = express(); var app = express();
app.get('/user/:id/:op?', function(req, res, next){ app.get('/user/:id{/:op}', function(req, res, next){
res.header('path-1', req.route.path) res.header('path-1', req.route.path)
next(); next();
}); });
@@ -20,7 +20,7 @@ describe('req', function(){
request(app) request(app)
.get('/user/12/edit') .get('/user/12/edit')
.expect('path-1', '/user/:id/:op?') .expect('path-1', '/user/:id{/:op}')
.expect('path-2', '/user/:id/edit') .expect('path-2', '/user/:id/edit')
.expect(200, done) .expect(200, done)
}) })