0.7.0

.gitignore

@@ -1,5 +1,4 @@
 build/
 node_modules/
-typings/
 coverage/
 npm-debug.log

doc/release-notes.md

@@ -1,5 +1,9 @@
 # Release notes
 
+**0.7.0** *[BREAKING CHANGES]*
+
+* 
+
 **0.6.10**
 
 * added integration with `class-transform-validator` for deserialization and auto validation request parameters

gulpfile.ts

@@ -1,5 +1,4 @@
-import "es6-shim";
-import {Gulpclass, Task, SequenceTask, MergedTask} from "gulpclass";
+import {Gulpclass, MergedTask, SequenceTask, Task} from "gulpclass";
 
 const gulp = require("gulp");
 const del = require("del");
@@ -158,7 +157,7 @@ export class Gulpfile {
      */
     @Task()
     coveragePre() {
-        return gulp.src(["./build/es5/src/**/*.js"])
+        return gulp.src(["./build/compiled/src/**/*.js"])
             .pipe(istanbul())
             .pipe(istanbul.hookRequire());
     }
@@ -169,10 +168,13 @@ export class Gulpfile {
     @Task("coveragePost", ["coveragePre"])
     coveragePost() {
         chai.should();
-        chai.use(require("sinon-chai"));
-        chai.use(require("chai-as-promised"));
+        // chai.use(require("sinon-chai"));
+        // chai.use(require("chai-as-promised"));
 
-        return gulp.src(["./build/es5/test/functional/**/*.js"])
+        return gulp.src([
+            "./build/compiled/test/functional/**/*.js",
+            "./build/compiled/test/issues/**/*.js",
+        ])
             .pipe(mocha())
             .pipe(istanbul.writeReports());
     }

package.json

@@ -27,57 +27,57 @@
     "controllers"
   ],
   "dependencies": {
-    "class-transformer": "~0.1.3",
-    "class-validator": "^0.6.8",
+    "class-transformer": "~0.1.6",
+    "class-validator": "^0.7.0",
     "cookie": "^0.3.1",
     "glob": "^7.0.5",
-    "reflect-metadata": "^0.1.3"
+    "reflect-metadata": "^0.1.10"
   },
   "devDependencies": {
-    "@types/chai": "^3.4.34",
-    "@types/chai-as-promised": "0.0.29",
-    "@types/express": "^4.0.34",
+    "@types/chai": "^3.4.35",
+    "@types/chai-as-promised": "0.0.30",
+    "@types/express": "^4.0.35",
     "@types/express-session": "0.0.32",
-    "@types/koa": "^2.0.37",
-    "@types/mocha": "^2.2.37",
-    "@types/node": "^7.0.0",
-    "@types/sinon": "^1.16.34",
-    "body-parser": "^1.15.2",
+    "@types/koa": "^2.0.39",
+    "@types/mocha": "^2.2.40",
+    "@types/node": "^7.0.12",
+    "@types/sinon": "^2.1.2",
+    "body-parser": "^1.17.1",
     "chai": "^3.4.1",
     "chai-as-promised": "^6.0.0",
     "chakram": "^1.4.0",
     "del": "^2.2.1",
-    "es6-shim": "^0.35.1",
-    "express": "^4.14.0",
-    "express-session": "^1.14.1",
+    "express": "^4.15.2",
+    "express-session": "^1.15.2",
     "gulp": "^3.9.1",
     "gulp-istanbul": "^1.0.0",
     "gulp-mocha": "^3.0.1",
     "gulp-replace": "^0.5.4",
-    "gulp-shell": "^0.5.0",
-    "gulp-sourcemaps": "^2.4.0",
-    "gulp-tslint": "^7.0.1",
-    "gulp-typescript": "^3.1.4",
-    "gulpclass": "^0.1.1",
+    "gulp-shell": "^0.6.3",
+    "gulp-sourcemaps": "^2.5.1",
+    "gulp-tslint": "^7.1.0",
+    "gulp-typescript": "^3.1.6",
+    "gulpclass": "^0.1.2",
     "handlebars": "^4.0.6",
     "koa": "^2.0.0",
-    "koa-bodyparser": "^3.1.0",
+    "koa-bodyparser": "^4.2.0",
     "koa-convert": "^1.2.0",
     "koa-multer": "^1.0.1",
-    "koa-router": "^7.0.1",
-    "koa-session": "^3.4.0",
-    "koa-views": "^5.2.0",
+    "koa-router": "^7.1.1",
+    "koa-session": "^5.0.0",
+    "koa-views": "^6.0.1",
     "mocha": "^3.0.0",
-    "multer": "^1.1.0",
+    "multer": "^1.3.0",
     "mustache-express": "^1.2.2",
-    "remap-istanbul": "^0.8.4",
-    "request": "^2.74.0",
-    "sinon": "^1.17.4",
-    "sinon-chai": "^2.8.0",
-    "tslint": "^4.3.1",
-    "tslint-stylish": "^2.1.0-beta",
+    "remap-istanbul": "^0.9.5",
+    "request": "^2.81.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.9.0",
+    "ts-node": "^3.0.2",
+    "tslint": "^5.0.0",
+    "tslint-stylish": "^2.1.0",
     "typedi": "^0.4.2",
-    "typescript": "^2.1.5"
+    "typescript": "^2.2.2"
   },
   "scripts": {
     "test": "gulp tests"

sample/sample1-simple-controller/UserController.ts

@@ -1,15 +1,19 @@
 import "reflect-metadata";
 import {Request} from "express";
-import {Controller} from "../../src/decorator/controllers";
-import {Get, Post, Put, Patch, Delete} from "../../src/decorator/methods";
-import {Req} from "../../src/decorator/params";
-import {JsonResponse} from "../../src/decorator/decorators";
+import {Controller} from "../../src/decorator/Controller";
+import {Get} from "../../src/decorator/Get";
+import {Req} from "../../src/index";
+import {Post} from "../../src/decorator/Post";
+import {Put} from "../../src/decorator/Put";
+import {Patch} from "../../src/decorator/Patch";
+import {Delete} from "../../src/decorator/Delete";
+import {ContentType} from "../../src/decorator/ContentType";
 
 @Controller()
 export class UserController {
 
     @Get("/users")
-    @JsonResponse()
+    @ContentType("application/json")
     getAll() {
         return [
             { id: 1, name: "First user!" },

sample/sample11-complete-sample-express/modules/blog/controllers/BlogController.ts

@@ -1,7 +1,11 @@
 import {Request} from "express";
-import {JsonController} from "../../../../../src/decorator/controllers";
-import {Get, Post, Put, Patch, Delete} from "../../../../../src/decorator/methods";
-import {Req} from "../../../../../src/decorator/params";
+import {JsonController} from "../../../../../src/decorator/JsonController";
+import {Get} from "../../../../../src/decorator/Get";
+import {Post} from "../../../../../src/decorator/Post";
+import {Req} from "../../../../../src/decorator/Req";
+import {Put} from "../../../../../src/decorator/Put";
+import {Patch} from "../../../../../src/decorator/Patch";
+import {Delete} from "../../../../../src/decorator/Delete";
 
 @JsonController()
 export class BlogController {

sample/sample11-complete-sample-express/modules/blog/middlewares/BlogErrorHandler.ts

@@ -1,8 +1,8 @@
-import {MiddlewareGlobalAfter} from "../../../../../src/decorator/decorators";
-import {ErrorMiddlewareInterface} from "../../../../../src/middleware/ErrorMiddlewareInterface";
+import {ExpressErrorMiddlewareInterface} from "../../../../../src/driver/express/ExpressErrorMiddlewareInterface";
+import {Middleware} from "../../../../../src/decorator/Middleware";
 
-@MiddlewareGlobalAfter()
-export class BlogErrorHandler implements ErrorMiddlewareInterface {
+@Middleware({ global: true, type: "after" })
+export class BlogErrorHandler implements ExpressErrorMiddlewareInterface {
 
     error(error: any, request: any, response: any, next?: Function): void {
         console.log("Error handled on blog handler: ", error);

sample/sample11-complete-sample-express/modules/blog/middlewares/BlogMiddleware.ts

@@ -1,8 +1,8 @@
-import {MiddlewareInterface} from "../../../../../src/middleware/MiddlewareInterface";
-import {Middleware} from "../../../../../src/decorator/decorators";
+import {ExpressMiddlewareInterface} from "../../../../../src/driver/express/ExpressMiddlewareInterface";
+import {Middleware} from "../../../../../src/decorator/Middleware";
 
 @Middleware()
-export class BlogMiddleware implements MiddlewareInterface {
+export class BlogMiddleware implements ExpressMiddlewareInterface {
 
     use(request: any, response: any, next?: Function): any {
         console.log("logging request from blog middleware...");

sample/sample11-complete-sample-express/modules/post/controllers/PostController.ts

@@ -1,7 +1,11 @@
 import {Request} from "express";
-import {JsonController} from "../../../../../src/decorator/controllers";
-import {Get, Post, Put, Patch, Delete} from "../../../../../src/decorator/methods";
-import {Req} from "../../../../../src/decorator/params";
+import {JsonController} from "../../../../../src/decorator/JsonController";
+import {Get} from "../../../../../src/decorator/Get";
+import {Post} from "../../../../../src/decorator/Post";
+import {Put} from "../../../../../src/decorator/Put";
+import {Req} from "../../../../../src/decorator/Req";
+import {Patch} from "../../../../../src/decorator/Patch";
+import {Delete} from "../../../../../src/decorator/Delete";
 
 @JsonController()
 export class PostController {

sample/sample11-complete-sample-express/modules/post/middlewares/PostErrorHandler.ts

@@ -1,8 +1,8 @@
-import {MiddlewareGlobalAfter} from "../../../../../src/decorator/decorators";
-import {ErrorMiddlewareInterface} from "../../../../../src/middleware/ErrorMiddlewareInterface";
+import {ExpressErrorMiddlewareInterface} from "../../../../../src/driver/express/ExpressErrorMiddlewareInterface";
+import {Middleware} from "../../../../../src/decorator/Middleware";
 
-@MiddlewareGlobalAfter()
-export class PostErrorHandler implements ErrorMiddlewareInterface {
+@Middleware({ global: true, type: "after" })
+export class PostErrorHandler implements ExpressErrorMiddlewareInterface {
 
     error(error: any, request: any, response: any, next?: Function): void {
         console.log("Error handled on post handler: ", error);

sample/sample11-complete-sample-express/modules/post/middlewares/PostMiddleware.ts

@@ -1,8 +1,8 @@
-import {MiddlewareInterface} from "../../../../../src/middleware/MiddlewareInterface";
-import {Middleware} from "../../../../../src/decorator/decorators";
+import {ExpressMiddlewareInterface} from "../../../../../src/driver/express/ExpressMiddlewareInterface";
+import {Middleware} from "../../../../../src/decorator/Middleware";
 
 @Middleware()
-export class PostMiddleware implements MiddlewareInterface {
+export class PostMiddleware implements ExpressMiddlewareInterface {
 
     use(request: any, response: any, next?: Function): any {
         console.log("logging request from post middleware...");

sample/sample11-complete-sample-express/modules/question/controllers/QuestionController.ts

@@ -1,7 +1,12 @@
 import {Request} from "express";
-import {JsonController} from "../../../../../src/decorator/controllers";
-import {Get, Post, Put, Patch, Delete} from "../../../../../src/decorator/methods";
-import {Req, Param} from "../../../../../src/decorator/params";
+import {JsonController} from "../../../../../src/decorator/JsonController";
+import {Get} from "../../../../../src/decorator/Get";
+import {Param} from "../../../../../src/decorator/Param";
+import {Post} from "../../../../../src/decorator/Post";
+import {Req} from "../../../../../src/decorator/Req";
+import {Put} from "../../../../../src/decorator/Put";
+import {Patch} from "../../../../../src/decorator/Patch";
+import {Delete} from "../../../../../src/decorator/Delete";
 
 @JsonController()
 export class QuestionController {

sample/sample11-complete-sample-express/modules/question/middlewares/QuestionErrorHandler.ts

@@ -1,8 +1,8 @@
-import {MiddlewareGlobalAfter} from "../../../../../src/decorator/decorators";
-import {ErrorMiddlewareInterface} from "../../../../../src/middleware/ErrorMiddlewareInterface";
+import {ExpressErrorMiddlewareInterface} from "../../../../../src/driver/express/ExpressErrorMiddlewareInterface";
+import {Middleware} from "../../../../../src/decorator/Middleware";
 
-@MiddlewareGlobalAfter()
-export class QuestionErrorHandler implements ErrorMiddlewareInterface {
+@Middleware({ global: true, type: "after" })
+export class QuestionErrorHandler implements ExpressErrorMiddlewareInterface {
 
     error(error: any, request: any, response: any, next?: Function): void {
         console.log("Error handled on question handler: ", error);

sample/sample11-complete-sample-express/modules/question/middlewares/QuestionMiddleware.ts

@@ -1,8 +1,8 @@
-import {MiddlewareInterface} from "../../../../../src/middleware/MiddlewareInterface";
-import {Middleware} from "../../../../../src/decorator/decorators";
+import {ExpressMiddlewareInterface} from "../../../../../src/driver/express/ExpressMiddlewareInterface";
+import {Middleware} from "../../../../../src/decorator/Middleware";
 
 @Middleware()
-export class QuestionMiddleware implements MiddlewareInterface {
+export class QuestionMiddleware implements ExpressMiddlewareInterface {
 
     use(request: any, response: any, next?: Function): any {
         console.log("logging request from question middleware...");

sample/sample12-session-support/UserController.ts

@@ -1,15 +1,21 @@
 import "reflect-metadata";
 import {Request} from "express";
-import {Controller} from "../../src/decorator/controllers";
-import {Get, Post, Put, Patch, Delete} from "../../src/decorator/methods";
-import {Session, Req, Param} from "../../src/decorator/params";
-import {JsonResponse} from "../../src/decorator/decorators";
+import {Controller} from "../../src/decorator/Controller";
+import {Get} from "../../src/decorator/Get";
+import {Req} from "../../src/index";
+import {Post} from "../../src/decorator/Post";
+import {Put} from "../../src/decorator/Put";
+import {Patch} from "../../src/decorator/Patch";
+import {Delete} from "../../src/decorator/Delete";
+import {Param} from "../../src/decorator/Param";
+import {Session} from "../../src/decorator/Session";
+import {ContentType} from "../../src/decorator/ContentType";
 
 @Controller()
 export class UserController {
 
     @Get("/users")
-    @JsonResponse()
+    @ContentType("application/json")
     getAll() {
         return [
             { id: 1, name: "First user!" },
@@ -18,7 +24,7 @@ export class UserController {
     }
 
     @Get("/users/:id")
-    @JsonResponse()
+    @ContentType("application/json")
     getOne(@Session("user") user: any) {
         return user;
     }

sample/sample13-koa-views-render/BlogController.ts

@@ -1,7 +1,7 @@
 import "reflect-metadata";
-import {Controller} from "../../src/decorator/controllers";
-import {Get, Post, Put, Patch, Delete} from "../../src/decorator/methods";
-import {Render} from "../../src/decorator/decorators";
+import {Controller} from "../../src/decorator/Controller";
+import {Get} from "../../src/decorator/Get";
+import {Render} from "../../src/decorator/Render";
 
 @Controller()
 export class UserController {

sample/sample14-custom-decorator/QuestionController.ts

@@ -0,0 +1,18 @@
+import "reflect-metadata";
+import {Get} from "../../src/decorator/Get";
+import {JsonController} from "../../src/decorator/JsonController";
+import {UserFromSession} from "./UserFromSession";
+import {User} from "./User";
+
+@JsonController()
+export class QuestionController {
+
+    @Get("/questions")
+    all(@UserFromSession({ required: true }) user: User) {
+        return [{
+            id: 1,
+            title: "Question created by " + user.firstName
+        }];
+    }
+
+}

sample/sample14-custom-decorator/User.ts

@@ -0,0 +1,13 @@
+export class User {
+
+    id: number;
+    firstName: string;
+    lastName: string;
+
+    constructor(id: number, firstName: string, lastName: string) {
+        this.id = id;
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
+}

sample/sample14-custom-decorator/UserFromSession.ts

@@ -0,0 +1,22 @@
+import {registerParamDecorator} from "../../src/index";
+import {User} from "./User";
+
+/**
+ * Simple decorator - re-implementation of CurrentUser decorator.
+ */
+export function UserFromSession(options?: { required?: boolean }) {
+    return function(object: Object, method: string, index: number) {
+        registerParamDecorator({
+            object: object,
+            method: method,
+            index: index,
+            required: options && options.required ? true : false,
+            value: actionProperties => {
+                // perform queries based on token from request headers
+                // const token = actionProperties.request.headers["authorization"];
+                // return database.findUserByToken(token);
+                return new User(1, "Johny", "Cage");
+            }
+        });
+    };
+}