Update to RC4

Author: kamil.mysliwiec

CHANGELOG.md

@@ -1,7 +1,12 @@
+## 1.0.0-RC4 (08.04.2017)
+
+- Support for @Post, @Get, @Delete, @Put, @All decorators
+- Added ability to pass data to middleware metatypes
+
 ## 1.0.0-BETA-1 (23.03.2017)
 
 - @Inject -> @Dependencies
-- @Inject decorator for custom constructor parameters,
+- @Inject decorator for custom constructor parameters
 - Custom providers support (useClass, useValue, useFactory)
 
 ## 1.0.0-ALPHA-23 (19.03.2017)

example/modules/users/auth.middleware.ts

@@ -5,7 +5,6 @@ import { NestMiddleware } from '../../../src/core/middlewares/interfaces/nest-mi
 
 @Middleware()
 export class AuthMiddleware implements NestMiddleware {
-
     constructor(private usersService: UsersService) {}
 
     resolve() {

example/modules/users/users.controller.ts

@@ -2,6 +2,7 @@ import { UsersService } from "./users.service";
 import { RequestMethod, Controller, RequestMapping } from "./../../../src/";
 import { ModuleRef } from '../../../src/core/injector/module-ref';
 import { UsersModule } from './users.module';
+import { Get, Post } from '../../../src/common/utils/request-mapping.decorator';
 
 @Controller({ path: 'users' })
 export class UsersController {
@@ -10,19 +11,19 @@ export class UsersController {
         private usersService: UsersService,
         private moduleRef: ModuleRef) {}
 
-    @RequestMapping()
+    @Get()
     async getAllUsers(req, res) {
         const users = await this.usersService.getAllUsers();
         res.status(200).json(users);
     }
 
-    @RequestMapping({ path: '/:id' })
+    @Get('/:id')
     async getUser(req, res) {
         const user = await this.usersService.getUser(req.params.id);
         res.status(200).json(user);
     }
 
-    @RequestMapping({ method: RequestMethod.POST })
+    @Post()
     async addUser(req, res) {
         const msg = await this.usersService.getUser(req.body.user);
         res.status(201).json(msg);

example/modules/users/users.module.ts

@@ -3,6 +3,11 @@ import { UsersController } from './users.controller';
 import { UsersService } from './users.service';
 import { AuthMiddleware } from './auth.middleware';
 import { MiddlewareBuilder } from '../../../src/core/middlewares/builder';
+import { ProvideValues } from '../../../src/common/utils/provide-values.util';
+
+const ProvideRoles = ProvideValues({
+    role: ['admin', 'user']
+});
 
 @Module({
     controllers: [ UsersController ],
@@ -17,8 +22,12 @@ export class UsersModule {
 
     configure(builder: MiddlewareBuilder) {
         builder.use({
-            middlewares: [ AuthMiddleware ],
-            forRoutes: [ UsersController ],
-        })
+            middlewares: [
+                ProvideRoles(AuthMiddleware)
+            ],
+            forRoutes: [ UsersController]
+        });
     }
 }
+
+

package.json

@@ -36,7 +36,6 @@
   "author": "Kamil Mysliwiec",
   "license": "ISC",
   "dependencies": {
-    "amqplib": "^0.5.1",
     "cli-color": "^1.1.0",
     "express": "^4.14.0",
     "json-socket": "^0.2.1",
@@ -51,7 +50,7 @@
     "@types/mocha": "^2.2.38",
     "@types/node": "^7.0.5",
     "@types/redis": "^0.12.36",
-    "@types/sinon": "^1.16.34",
+    "@types/sinon": "^1.16.36",
     "awesome-typescript-loader": "^3.0.0-beta.18",
     "chai": "^3.5.0",
     "concurrently": "^3.4.0",
@@ -63,7 +62,7 @@
     "mocha": "^3.2.0",
     "nodemon": "^1.11.0",
     "nyc": "^10.1.2",
-    "sinon": "^2.0.0-pre.2",
+    "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
     "ts-node": "^2.0.0"
   }

src/common/test/utils/provide-values.util.spec.ts

@@ -0,0 +1,18 @@
+import 'reflect-metadata';
+import { expect } from 'chai';
+import { ProvideValues } from '../../utils/provide-values.util';
+
+describe('ProvideValues', () => {
+    let type, data = { test: [ 1, 2, 3 ] };
+    class Test {}
+
+    beforeEach(() => {
+        type = ProvideValues(data)(Test);
+    });
+    it('should enrich prototype with given values', () => {
+        expect(type.prototype).to.contain(data);
+    });
+    it('should set name of metatype', () => {
+        expect(type.name).to.eq(Test.name + JSON.stringify(data));
+    });
+});

src/common/utils/index.ts

@@ -4,4 +4,5 @@ export * from './component.decorator';
 export * from './module.decorator';
 export * from './dependencies.decorator';
 export * from './inject.decorator';
-export { Component as Middleware } from './component.decorator';
+export { Component as Middleware } from './component.decorator';
+export * from './provide-values.util';

src/common/utils/provide-values.util.ts

@@ -0,0 +1,19 @@
+import 'reflect-metadata';
+
+interface Constructor<T> {
+    new(...args: any[]): T
+}
+
+export const ProvideValues = <T extends Constructor<{}>>(data) => {
+    return (metatype: T) => {
+        const type = class extends metatype {
+            constructor(...args) {
+                super(args);
+            }
+        };
+        const token = metatype.name + JSON.stringify(data);
+        Object.defineProperty(type, 'name', { value: token });
+        Object.assign(type.prototype, data);
+        return type;
+    }
+};

src/common/utils/request-mapping.decorator.ts

@@ -3,7 +3,11 @@ import { RequestMappingMetadata } from '../interfaces/request-mapping-metadata.i
 import { RequestMethod } from '../enums/request-method.enum';
 import { PATH_METADATA, METHOD_METADATA } from '../constants';
 
-const defaultMetadata = { [PATH_METADATA]: '/', [METHOD_METADATA]: RequestMethod.GET };
+const defaultMetadata = {
+    [PATH_METADATA]: '/',
+    [METHOD_METADATA]: RequestMethod.GET
+};
+
 export const RequestMapping = (metadata: RequestMappingMetadata = defaultMetadata): MethodDecorator => {
     const path = metadata[PATH_METADATA] || '/';
     const requestMethod = metadata[METHOD_METADATA] || RequestMethod.GET;
@@ -13,4 +17,18 @@ export const RequestMapping = (metadata: RequestMappingMetadata = defaultMetadat
         Reflect.defineMetadata(METHOD_METADATA, requestMethod, descriptor.value);
         return descriptor;
     }
-};
+};
+
+const createMappingDecorator = (method: RequestMethod) => (path?: string): MethodDecorator => {
+    return RequestMapping({
+        [PATH_METADATA]: path,
+        [METHOD_METADATA]: method
+    });
+};
+
+export const Post = createMappingDecorator(RequestMethod.POST);
+export const Get = createMappingDecorator(RequestMethod.GET);
+export const Delete = createMappingDecorator(RequestMethod.DELETE);
+export const Put = createMappingDecorator(RequestMethod.PUT);
+export const All = createMappingDecorator(RequestMethod.ALL);
+

src/core/helpers/messages.ts

@@ -7,7 +7,4 @@ export const getRouteMappedMessage =
     (path: string, method) => `Mapped {${path}, ${RequestMethod[method]}} route`;
 
 export const getControllerMappingMessage =
-    (name: string) => `${name}:`;
-
-export const getMiddlewareInitMessage =
-    (middleware: string, module: string) => `${middleware} injected into ${module}`;
+    (name: string) => `${name}:`;