Merge branch 'feature/upgrade-versions' into develop

hirsch88 · hirsch88 · commit c070aa6f8f37 · 2017-07-11T20:23:23.000+02:00
diff --git a/package.json b/package.json
@@ -75,24 +75,23 @@
     "@types/helmet": "0.0.35",
     "@types/inquirer": "^0.0.35",
     "@types/jest": "^20.0.2",
-    "@types/jsonwebtoken": "^7.2.1",
+    "@types/jsonwebtoken": "^7.2.2",
     "@types/knex": "0.0.52",
-    "@types/lodash": "^4.14.67",
-    "@types/mkdirp": "^0.3.29",
+    "@types/lodash": "^4.14.68",
     "@types/morgan": "^1.7.32",
     "@types/pluralize": "^0.0.27",
     "@types/reflect-metadata": "0.0.5",
     "@types/request": "^0.0.45",
-    "@types/request-promise": "^4.1.35",
+    "@types/request-promise": "^4.1.36",
     "@types/serve-favicon": "^2.2.28",
     "@types/winston": "^2.3.3",
     "body-parser": "^1.17.2",
     "bookshelf": "^0.10.3",
     "bookshelf-camelcase": "^1.1.4",
-    "chalk": "^1.1.3",
+    "chalk": "^2.0.1",
     "class-validator": "^0.7.2",
-    "commander": "^2.10.0",
-    "compression": "^1.6.2",
+    "commander": "^2.11.0",
+    "compression": "^1.7.0",
     "copyfiles": "^1.2.0",
     "cors": "^2.8.1",
     "dotenv": "^4.0.0",
@@ -103,14 +102,12 @@
     "glob": "^7.1.2",
     "handlebars": "^4.0.10",
     "helmet": "^3.6.1",
-    "inquirer": "^3.1.1",
-    "inversify": "^4.1.1",
-    "inversify-express-utils": "^3.5.1",
-    "jest": "^20.0.3",
+    "inquirer": "^3.2.0",
+    "inversify": "^4.2.0",
+    "inversify-express-utils": "^4.0.0",
     "jsonwebtoken": "^7.4.1",
     "knex": "^0.12.0",
     "lodash": "^4.17.4",
-    "mkdirp": "^0.5.1",
     "morgan": "^1.7.0",
     "mysql": "^2.13.0",
     "nodemon": "^1.11.0",
@@ -119,16 +116,12 @@
     "reflect-metadata": "^0.1.10",
     "request": "^2.81.0",
     "request-promise": "^4.2.1",
-    "require-dir": "^0.3.2",
-    "rimraf": "^2.6.1",
-    "run-sequence": "^1.2.2",
     "serve-favicon": "^2.4.3",
-    "swagger-jsdoc": "^1.9.5",
-    "swagger-ui-express": "^2.0.0",
+    "swagger-jsdoc": "^1.9.6",
+    "swagger-ui-express": "^2.0.1",
     "trash-cli": "^1.4.0",
-    "ts-jest": "^20.0.6",
-    "ts-node": "^3.1.0",
-    "tslint": "^5.4.3",
+    "ts-node": "^3.2.0",
+    "tslint": "^5.5.0",
     "typescript": "^2.4.1",
     "winston": "^2.3.1"
   },
@@ -148,6 +141,8 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "cross-env": "^5.0.1"
+    "cross-env": "^5.0.1",
+    "jest": "^20.0.3",
+    "ts-jest": "^20.0.7"
   }
 }
diff --git a/src/api/controllers/UserController.ts b/src/api/controllers/UserController.ts
@@ -7,7 +7,7 @@
  */
 
 import { inject, named } from 'inversify';
-import { Controller, Get, Post, Put, Delete, RequestParam, RequestBody, Response, Request } from 'inversify-express-utils';
+import { controller, httpGet, httpPost, httpPut, httpDelete, response, request, requestBody, requestParam } from 'inversify-express-utils';
 import { app } from '../../app';
 import { Types, Targets } from '../../constants';
 import { UserService } from '../services/UserService';
@@ -17,42 +17,42 @@ const populateUser = app.IoC.getNamed<interfaces.Middleware>(Types.Middleware, T
 const authenticate = app.IoC.getNamed<interfaces.Middleware>(Types.Middleware, Targets.Middleware.AuthenticateMiddleware);
 
 
-@Controller('/users', authenticate.use)
+@controller('/users', authenticate.use)
 export class UserController {
 
     constructor( @inject(Types.Service) @named(Targets.Service.UserService) private userService: UserService) { }
 
-    @Get('/')
-    public async findAll( @Response() res: myExpress.Response): Promise<any> {
+    @httpGet('/')
+    public async findAll( @response() res: myExpress.Response): Promise<any> {
         const users = await this.userService.findAll();
         return res.found(users.toJSON());
     }
 
-    @Post('/')
-    public async create( @Response() res: myExpress.Response, @RequestBody() body: any): Promise<any> {
+    @httpPost('/')
+    public async create( @response() res: myExpress.Response, @requestBody() body: any): Promise<any> {
         const user = await this.userService.create(body);
         return res.created(user.toJSON());
     }
 
-    @Get('/me', populateUser.use)
-    public async findMe( @Request() req: myExpress.Request, @Response() res: myExpress.Response): Promise<any> {
+    @httpGet('/me', populateUser.use)
+    public async findMe( @request() req: myExpress.Request, @response() res: myExpress.Response): Promise<any> {
         return res.found(req.user);
     }
 
-    @Get('/:id')
-    public async findOne( @Response() res: myExpress.Response, @RequestParam('id') id: string): Promise<any> {
+    @httpGet('/:id')
+    public async findOne( @response() res: myExpress.Response, @requestParam('id') id: string): Promise<any> {
         const user = await this.userService.findOne(parseInt(id, 10));
         return res.found(user.toJSON());
     }
 
-    @Put('/:id')
-    public async update( @Response() res: myExpress.Response, @RequestParam('id') id: string, @RequestBody() body: any): Promise<any> {
+    @httpPut('/:id')
+    public async update( @response() res: myExpress.Response, @requestParam('id') id: string, @requestBody() body: any): Promise<any> {
         const user = await this.userService.update(parseInt(id, 10), body);
         return res.updated(user.toJSON());
     }
 
-    @Delete('/:id')
-    public async destroy( @Response() res: myExpress.Response, @RequestParam('id') id: string): Promise<any> {
+    @httpDelete('/:id')
+    public async destroy( @response() res: myExpress.Response, @requestParam('id') id: string): Promise<any> {
         await this.userService.destroy(parseInt(id, 10));
         return res.destroyed();
     }
diff --git a/src/api/services/UserService.ts b/src/api/services/UserService.ts
@@ -12,7 +12,7 @@ import { inject, named } from 'inversify';
 import { Types, Core, Targets } from '../../constants';
 import { Logger as LoggerType } from '../../core/Logger';
 import { EventEmitter } from '../../core/api/events';
-import { Validate, Request } from '../../core/api/Validate';
+import { validate, request } from '../../core/api/Validate';
 import { NotFoundException } from '../exceptions/NotFoundException';
 import { UserCreateRequest } from '../requests/user/UserCreateRequest';
 import { UserUpdateRequest } from '../requests/user/UserUpdateRequest';
@@ -77,8 +77,8 @@ export class UserService {
      * @param {*} data is the json body of the request
      * @returns {Promise<User>}
      */
-    @Validate()
-    public async create( @Request(UserCreateRequest) data: any): Promise<User> {
+    @validate()
+    public async create( @request(UserCreateRequest) data: any): Promise<User> {
         // If the request body was valid we will create the user
         const user = await this.userRepo.create(data);
         this.events.emit(UserCreatedListener.Event, user.toJSON());
@@ -93,8 +93,8 @@ export class UserService {
      * @param {*} newUser is the json body of the request
      * @returns {Promise<User>}
      */
-    @Validate()
-    public async update(id: number, @Request(UserUpdateRequest) newUser: any): Promise<User> {
+    @validate()
+    public async update(id: number, @request(UserUpdateRequest) newUser: any): Promise<User> {
         // Find or fail
         const user = await this.findOne(id);
         // Set new values
diff --git a/src/console/lib/utils.ts b/src/console/lib/utils.ts
@@ -40,15 +40,15 @@ export const buildFilePath = (targetPath: string, fileName: string, isTest = fal
 
 export const inputIsRequired = (value: any) => !!value;
 
-export const existsFile = async (path: string, stop: boolean = false, isTest = false) => {
+export const existsFile = async (filePath: string, stop: boolean = false, isTest = false) => {
     const prompt = inquirer.createPromptModule();
     return new Promise((resolve, reject) => {
-        fs.exists(path, async (exists) => {
+        fs.exists(filePath, async (exists) => {
 
             if (exists) {
-                let fileName = path.split('/src/')[1];
+                let fileName = filePath.split('/src/')[1];
                 if (isTest) {
-                    fileName = path.split('/test/')[1];
+                    fileName = filePath.split('/test/')[1];
                 }
                 const answer = await prompt([
                     {
diff --git a/src/console/templates/controller.hbs b/src/console/templates/controller.hbs
@@ -1,11 +1,11 @@
 {{#if isResourceTemplate}}
 import { inject, named } from 'inversify';
-import { Controller, Get, Post, Put, Delete, RequestParam, RequestBody, Response } from 'inversify-express-utils';
+import { controller, httpGet, httpPost, httpPut, httpDelete, response, request, requestBody, requestParam } from 'inversify-express-utils';
 import { Types, Targets } from '../../{{deepness}}constants';
 import { app } from '../../{{deepness}}app';
 import { {{name.capitalize}}Service } from '../{{deepness}}services/{{name.capitalize}}Service';
 {{else}}
-import { Controller } from 'inversify-express-utils';
+import { controller } from 'inversify-express-utils';
 import { app } from '../../{{deepness}}app';
 import { Types, Targets } from '../../{{deepness}}constants';
 {{/if}}
@@ -14,37 +14,37 @@ import { Types, Targets } from '../../{{deepness}}constants';
 const authenticate = app.IoC.getNamed<interfaces.Middleware>(Types.Middleware, Targets.Middleware.AuthenticateMiddleware);
 
 
-@Controller('/{{name.pluralize}}', authenticate.use)
+@controller('/{{name.pluralize}}', authenticate.use)
 export class {{name.capitalize}}Controller {
 
     {{#if isResourceTemplate}}constructor( @inject(Types.Service) @named(Targets.Service.{{name.capitalize}}Service) private {{name.camelCase}}Service: {{name.capitalize}}Service) { }
 
-    @Get('/')
-    public async findAll( @Response() res: myExpress.Response): Promise<any> {
+    @httpGet('/')
+    public async findAll( @response() res: myExpress.Response): Promise<any> {
         const {{name.camelCase}}s = await this.{{name.camelCase}}Service.findAll();
         return res.found({{name.camelCase}}s.toJSON());
     }
 
-    @Post('/')
-    public async create( @Response() res: myExpress.Response, @RequestBody() body: any): Promise<any> {
+    @httpPost('/')
+    public async create( @response() res: myExpress.Response, @requestBody() body: any): Promise<any> {
         const {{name.camelCase}} = await this.{{name.camelCase}}Service.create(body);
         return res.created({{name.camelCase}}.toJSON());
     }
 
-    @Get('/:id')
-    public async findOne( @Response() res: myExpress.Response, @RequestParam('id') id: string): Promise<any> {
+    @httpGet('/:id')
+    public async findOne( @response() res: myExpress.Response, @requestParam('id') id: string): Promise<any> {
         const {{name.camelCase}} = await this.{{name.camelCase}}Service.findOne(parseInt(id, 10));
         return res.found({{name.camelCase}}.toJSON());
     }
 
-    @Put('/:id')
-    public async update( @Response() res: myExpress.Response, @RequestParam('id') id: string, @RequestBody() body: any): Promise<any> {
+    @httpPut('/:id')
+    public async update( @response() res: myExpress.Response, @requestParam('id') id: string, @requestBody() body: any): Promise<any> {
         const {{name.camelCase}} = await this.{{name.camelCase}}Service.update(parseInt(id, 10), body);
         return res.updated({{name.camelCase}}.toJSON());
     }
 
-    @Delete('/:id')
-    public async destroy( @Response() res: myExpress.Response, @RequestParam('id') id: string): Promise<any> {
+    @httpDelete('/:id')
+    public async destroy( @response() res: myExpress.Response, @requestParam('id') id: string): Promise<any> {
         await this.{{name.camelCase}}Service.destroy(parseInt(id, 10));
         return res.destroyed();
     }{{/if}}
diff --git a/src/core/IoC.ts b/src/core/IoC.ts
@@ -13,7 +13,7 @@ import { Types, Core, Targets } from '../constants';
 import { events, EventEmitter } from './api/events';
 import { Logger } from './Logger';
 import { IocConfig } from '../config/IocConfig';
-import { getFolderwrapping } from './helpers/Path';
+import { getFolderWrapping } from './helpers/Path';
 
 
 export class IoC {
@@ -122,16 +122,16 @@ export class IoC {
             .whenTargetNamed(name);
     }
 
-    private bindFiles(path: string, target: any, callback: (name: any, value: any) => void): Promise<void> {
+    private bindFiles(filePath: string, target: any, callback: (name: any, value: any) => void): Promise<void> {
         return new Promise<void>((resolve) => {
-            this.getFiles(path, (files: string[]) => {
+            this.getFiles(filePath, (files: string[]) => {
                 files.forEach((file: any) => {
                     let fileExport;
                     let fileClass;
                     let fileTarget;
                     const isRecursive = file.name.indexOf('.') > 0;
                     try {
-                        fileExport = require(`${file.path}`);
+                        fileExport = require(`${file.filePath}`);
                     } catch (e) {
                         this.log.warn(e.message);
                         return;
@@ -185,32 +185,31 @@ export class IoC {
     }
 
     private getBasePath(): string {
-        const baseFolder = __dirname.indexOf(getFolderwrapping('src')) >= 0 ? getFolderwrapping('src') : getFolderwrapping('dist');
+        const baseFolder = __dirname.indexOf(getFolderWrapping('src')) >= 0 ? getFolderWrapping('src') : getFolderWrapping('dist');
         const baseRoot = __dirname.substring(0, __dirname.indexOf(baseFolder));
         return path.join(baseRoot, baseFolder, 'api');
     }
 
-    private getFiles(path: string, done: (files: any[]) => void): void {
-        const isTypeScript = __dirname.indexOf(getFolderwrapping('src')) >= 0;
+    private getFiles(filePath: string, done: (files: any[]) => void): void {
+        const isTypeScript = __dirname.indexOf(getFolderWrapping('src')) >= 0;
         if (!isTypeScript) {
-            path = path.replace('.ts', '.js');
+            filePath = filePath.replace('.ts', '.js');
         }
-        glob(this.getBasePath() + path, (err: any, files: string[]) => {
+        glob(this.getBasePath() + filePath, (err: any, files: string[]) => {
             if (err) {
-                this.log.warn(`Could not read the folder ${path}!`);
+                this.log.warn(`Could not read the folder ${filePath}!`);
                 return;
             }
             done(files.map((p: string) => this.parseFilePath(p)));
         });
     }
 
-    private parseFilePath(path: string): any {
-        const filePath = path.substring(this.getBasePath().length + 1);
-        const dir = filePath.split('/')[0];
-        const file = filePath.substr(dir.length + 1);
+    private parseFilePath(filePath: string): any {
+        const p = filePath.substring(this.getBasePath().length + 1);
+        const dir = p.split('/')[0];
+        const file = p.substr(dir.length + 1);
         const name = file.replace('/', '.').substring(0, file.length - 3);
         return {
-            path,
             filePath,
             dir,
             file,
diff --git a/src/core/Logger.ts b/src/core/Logger.ts
@@ -1,4 +1,4 @@
-import { getFolderwrapping, isWindows } from './helpers/Path';
+import { getFolderWrapping, isWindows } from './helpers/Path';
 
 /**
  * core.log.Log
@@ -35,8 +35,8 @@ export class Logger {
         const pathDelimiter = isWindows() ? '\\' : '/';
         if (path.indexOf(pathDelimiter) >= 0) {
             path = path.replace(process.cwd(), '');
-            path = path.replace(getFolderwrapping('src'), '');
-            path = path.replace(getFolderwrapping('dist'), '');
+            path = path.replace(getFolderWrapping('src'), '');
+            path = path.replace(getFolderWrapping('dist'), '');
             path = path.replace('.ts', '');
             path = path.replace('.js', '');
             path = path.replace(/\//g, ':');
diff --git a/src/core/SwaggerUI.ts b/src/core/SwaggerUI.ts
@@ -2,7 +2,7 @@ import * as express from 'express';
 import * as path from 'path';
 import * as swaggerUi from 'swagger-ui-express';
 import { Environment } from './helpers/Environment';
-import { getFolderwrapping } from './helpers/Path';
+import { getFolderWrapping } from './helpers/Path';
 
 
 export class SwaggerUI {
@@ -13,7 +13,7 @@ export class SwaggerUI {
 
     public setup(app: express.Application): void {
         if (Environment.isTruthy(process.env.SWAGGER_ENABLED)) {
-            const baseFolder = __dirname.indexOf(getFolderwrapping('src')) >= 0 ? getFolderwrapping('src') : getFolderwrapping('dist');
+            const baseFolder = __dirname.indexOf(getFolderWrapping('src')) >= 0 ? getFolderWrapping('src') : getFolderWrapping('dist');
             const basePath = __dirname.substring(0, __dirname.indexOf(baseFolder));
             const swaggerFile = require(path.join(basePath, process.env.SWAGGER_FILE));
             const packageJson = require(path.join(basePath, 'package.json'));
diff --git a/src/core/api/Validate.ts b/src/core/api/Validate.ts
@@ -24,10 +24,10 @@ interface RequestParameter {
  *
  * @param request
  */
-export const Request = (request: typeof RequestBody) => (target: object, propertyKey: string | symbol, parameterIndex: number): any => {
+export const request = (requestBody: typeof RequestBody) => (target: object, propertyKey: string | symbol, parameterIndex: number): any => {
     const existingRequestParameters: RequestParameter[] = Reflect.getOwnMetadata(requestMetadataKey, target, propertyKey) || [];
     existingRequestParameters.push({
-        request,
+        request: requestBody,
         index: parameterIndex
     });
     Reflect.defineMetadata(requestMetadataKey, existingRequestParameters, target, propertyKey);
@@ -40,14 +40,14 @@ export const Request = (request: typeof RequestBody) => (target: object, propert
  * @param propertyName
  * @param descriptor
  */
-export const Validate = () => (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<any>): any => {
+export const validate = () => (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<any>): any => {
     const method = descriptor.value;
     descriptor.value = async function(...args: any[]): Promise<any> {
         const requestParameters: RequestParameter[] = Reflect.getOwnMetadata(requestMetadataKey, target, propertyName);
         if (requestParameters.length > 0) {
             for (const requestParameter of requestParameters) {
-                const request = new requestParameter.request(args[requestParameter.index]);
-                await request.validate();
+                const requestBody = new requestParameter.request(args[requestParameter.index]);
+                await requestBody.validate();
             }
         }
         return method && method.apply(this, args);
diff --git a/src/core/api/extendExpressResponse.ts b/src/core/api/extendExpressResponse.ts
diff --git a/src/core/database/Factory.ts b/src/core/database/Factory.ts
diff --git a/src/core/helpers/Path.ts b/src/core/helpers/Path.ts
diff --git a/yarn.lock b/yarn.lock
