Merge pull request #5 from Odrin/dev

1.1.0

.travis.yml

@@ -3,7 +3,6 @@ node_js:
   - 6
 install:
   - npm install
-  - typings install
 script:
   - gulp
 cache:

CHANGELOG.md

@@ -1,4 +1,11 @@
-<a name="1.0.0"></a>
+# [1.1.0](https://github.com/Odrin/express-easy-rest/compare/1.0.0...1.1.0) (2016-10-24)
+
+### Bug Fixes
+* fixed type notation in cache.ts
+
+### Code Refactoring
+* typings replaced by @types npm package
+
 # [1.0.0](https://github.com/Odrin/express-easy-rest/compare/1.0.0...0.3.1) (2016-10-19)
 
 ### Code Refactoring
@@ -13,13 +20,11 @@
 * ControllerExceptionFilter and ActionExceptionFilter to handle exceptions
 * added model validation functionality - see ModelValidator, @Required(), @StringLength(), @Range(), @RegularExpression()
 
-<a name="0.3.2"></a>
 # [0.3.2](https://github.com/Odrin/express-easy-rest/compare/0.3.1...0.3.2) (2016-08-31)
 
 ### Code Refactoring
 * move express NPM dependencies to peerDependencies for better compatibility
 
-<a name="0.3.1"></a>
 # [0.3.1](https://github.com/Odrin/express-easy-rest/compare/0.3.0...0.3.1) (2016-08-30)
 
 ### Bug Fixes
@@ -29,7 +34,6 @@
 ### Code Refactoring
 * simple session example added
 
-<a name="0.3.0"></a>
 # [0.3.0](https://github.com/Odrin/express-easy-rest/compare/0.2.2...0.3.0) (2016-08-26)
 
 ### Bug Fixes
@@ -47,14 +51,12 @@
 * HttpContext and HttpActionContext added
 * Caching class added
 
-<a name="0.2.2"></a>
 # [0.2.2](https://github.com/Odrin/express-easy-rest/compare/0.2.0...0.2.2) (2016-08-22)
 
 ### Code Refactoring
 * fixed authorize decorator naming (authorize -> Authorize)
 * some fixes and refactoring in examples
 
-<a name="0.2.0"></a>
 # [0.2.0](https://github.com/Odrin/express-easy-rest/compare/0.1.0...0.2.0) (2016-08-19)
 
 ### Bug Fixes

README.md

@@ -36,7 +36,21 @@ express()
 ##Installation
 ```bash
 npm install express-easy-rest
-typings install node express express-serve-static-core serve-static mime
+```
+
+##Simple tsconfog.json
+```JavaScript
+{
+  "compilerOptions": {
+    "target": "ES6",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "./lib",
+    "noImplicitAny": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true
+  }
+}
 ```
 
 ##Examples

lib/easy-rest/api/api-controller.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="express" />
 import { IActionResult } from "./action-result/action-result";
 import { IPrincipal } from "../security/principal/principal";
 import { HttpActionContext } from "../http/http-action-context";

lib/easy-rest/api/controller-dispatcher.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="express" />
 import * as express from "express";
 import { IControllerConstructor } from "./api-controller";
 import { ApplicationInstance } from "../core/application-instance";

lib/easy-rest/api/data-binder.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="express" />
 import { Request } from "express";
 import { IParameterBindingOptions } from "../decorators/binding/parameter-binding-options";
 import { BindingType } from "../decorators/binding/binding-type";

lib/easy-rest/core/application-instance.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="express" />
 import * as express from "express";
 import { IAuthenticationProvider } from "../security/authentication/authentication-provider";
 import { AuthorizationFilter } from "../security/authorization/authorization-filter";

lib/easy-rest/exceptions/application-error.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 export declare abstract class ApplicationError extends Error {
     constructor(message?: string);
 }

lib/easy-rest/http/http-context.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="express" />
 import { Request, Response, NextFunction } from "express";
 import { IPrincipal } from "../security/principal/principal";
 import { Cache } from "../caching/cache";

lib/easy-rest/security/authentication/authentication-provider.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="express" />
 import { IPrincipal } from "../principal/principal";
 import { Request } from "express";
 import { Response } from "express";

lib/easy-rest/security/authentication/default-authentication-provider.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="express" />
 import { IPrincipal } from "../principal/principal";
 import { Request } from "express";
 import { Response } from "express";

lib/easy-rest/util/http-context-provider.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="express" />
 import { Request } from "express";
 import { HttpContext } from "../http/http-context";
 export declare class HttpContextProvider {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-easy-rest",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "express-easy-rest",
   "license": "MIT",
   "repository": {
@@ -30,6 +30,15 @@
     "body-parser": "1.x"
   },
   "dependencies": {
+    "@types/body-parser": "0.0.33",
+    "@types/express": "4.x.x",
+    "@types/express-serve-static-core": "4.x.x",
+    "@types/glob": "5.x.x",
+    "@types/jasmine": "2.x.x",
+    "@types/mime": "0.0.29",
+    "@types/node": "6.x.x",
+    "@types/reflect-metadata": "0.0.5",
+    "@types/serve-static": "1.x.x",
     "glob": "7.x",
     "reflect-metadata": "0.x"
   },
@@ -47,8 +56,7 @@
     "gulp-tslint": "3.x",
     "jasmine": "2.x",
     "tslint": "3.x",
-    "typescript": "2.x",
-    "typings": "1.x"
+    "typescript": "2.x"
   },
   "engines": {
     "node": ">=6.0.0"

src/easy-rest/caching/cache.ts

@@ -118,7 +118,7 @@ export class Cache {
    * @return {T} A reference to the cache entry that is identified by key, if the entry exists; otherwise, null.
    */
   get<T>(key: string): T | null {
-    let item: CacheItem<T> = this._map.get(key);
+    let item: CacheItem<T> | undefined = this._map.get(key);
 
     if (typeof (item) === 'undefined') {
       return null;

tsconfig.json

@@ -11,11 +11,5 @@
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "strictNullChecks": true
-  },
-  "exclude": [
-    "node_modules",
-    "lib",
-    "typings/globals",
-    "typings/modules"
-  ]
+  }
 }