Merge branch 'master' into support-using-custom-multer-instance-in-register-routes

Author: Ahmed Hekal

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.3.0",
+  "version": "6.3.1",
   "npmClient": "yarn",
   "command": {
     "version": {

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsoa/cli",
   "description": "Build swagger-compliant REST APIs using TypeScript and Node",
-  "version": "6.3.0",
+  "version": "6.3.1",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
   "files": [

packages/cli/src/routeGeneration/templates/express.hbs

@@ -125,7 +125,6 @@ export function RegisterRoutes(app: Router) {
                 validatedArgs,
                 successStatus: {{successStatus}},
               });
-              next();
             } catch (err) {
                 return next(err);
             }

packages/tsoa/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tsoa",
   "description": "Build swagger-compliant REST APIs using TypeScript and Node",
-  "version": "6.3.0",
+  "version": "6.3.1",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
   "files": [
@@ -28,7 +28,7 @@
   "author": "Luke Autry <[email protected]> (http://www.lukeautry.com)",
   "license": "MIT",
   "dependencies": {
-    "@tsoa/cli": "^6.3.0",
+    "@tsoa/cli": "^6.3.1",
     "@tsoa/runtime": "^6.3.0"
   },
   "devDependencies": {

tests/fixtures/express/server.ts

@@ -36,21 +36,7 @@ app.use((req: any, res: any, next: any) => {
   req.stringValue = 'fancyStringForContext';
   next();
 });
-let postRouteMiddlwareCalled = false;
 RegisterRoutes(app);
-app.get('/reset-post-route-middleware-status', (req, res, next) => {
-  postRouteMiddlwareCalled = false;
-  res.json({ postRouteMiddlwareCalled }).send();
-  next();
-});
-app.get('/post-route-middleware-status', (req, res, next) => {
-  res.json({ postRouteMiddlwareCalled }).send();
-  next();
-});
-app.use((req, res, next) => {
-  postRouteMiddlwareCalled = true;
-  next();
-});
 
 // It's important that this come after the main routes are registered
 app.use((err: any, req: express.Request, res: express.Response, next: express.NextFunction) => {

tests/integration/express-server.spec.ts

@@ -24,22 +24,13 @@ import {
 const basePath = '/v1';
 
 describe('Express Server', () => {
-  it('can reset the post route middleware status', () => {
-    return verifyGetRequest('/reset-post-route-middleware-status', (_err, res) => {
-      expect(res.body.postRouteMiddlwareCalled).to.eq(false);
-    });
-  });
   it('can handle get request to root controller`s path', () => {
     return verifyGetRequest(basePath + '/', (_err, res) => {
       const model = res.body as TestModel;
       expect(model.id).to.equal(1);
     });
   });
-  it('can verify that post request middleware was called', () => {
-    return verifyGetRequest('/post-route-middleware-status', (_err, res) => {
-      expect(res.body.postRouteMiddlwareCalled).to.eq(true);
-    });
-  });
+
   it('can handle get request to root controller`s method path', () => {
     return verifyGetRequest(basePath + '/rootControllerMethodWithPath', (_err, res) => {
       const model = res.body as TestModel;

tests/package.json

@@ -2,7 +2,7 @@
   "name": "tsoa-tests",
   "private": true,
   "description": "Build swagger-compliant REST APIs using TypeScript and Node",
-  "version": "6.3.0",
+  "version": "6.3.1",
   "keywords": [
     "typescript",
     "openapi",

yarn.lock

@@ -1923,11 +1923,11 @@ brace-expansion@^2.0.1:
     balanced-match "^1.0.0"
 
 braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 [email protected]:
   version "1.3.1"
@@ -3095,10 +3095,10 @@ filelist@^1.0.4:
   dependencies:
     minimatch "^5.0.1"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"