Merge pull request #4 from remojansen/master

Upgraded dependencies
inversify · Dec 6, 2016 · 221c513 · 221c513
2 parents 63aeb61 + aaba3dd
commit 221c513
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 29 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -12,4 +12,6 @@
         "dts": true,
         "coverage": true
     }
+,
+"typescript.tsdk": "./node_modules/typescript/lib"
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "inversify-vanillajs-helpers",
-  "version": "1.0.0",
+  "version": "2.0.0-beta.1",
   "description": "Some helper for the development of InversifyJS applications with VanillaJS",
   "main": "lib/index.js",
   "jsnext:main": "es/index.js",
@@ -9,7 +9,7 @@
     "test": "test"
   },
   "dependencies": {
-    "inversify": "^3.0.0-beta.1"
+    "inversify": "^3.0.0-rc.1"
   },
   "devDependencies": {
     "@types/chai": "^3.4.33",
@@ -18,13 +18,13 @@
     "gulp": "^3.9.1",
     "gulp-istanbul": "^1.1.1",
     "gulp-mocha": "^3.0.1",
-    "gulp-tslint": "^6.1.1",
+    "gulp-tslint": "^7.0.0",
     "gulp-typescript": "^3.0.1",
     "mocha": "^3.0.2",
     "publish-please": "^2.2.0",
     "reflect-metadata": "^0.1.8",
     "run-sequence": "^1.2.2",
-    "tslint": "^3.15.1",
+    "tslint": "^4.0.1",
     "typescript": "^2.1.1"
   },
   "scripts": {

diff --git a/src/annotate.ts b/src/annotate.ts
@@ -62,4 +62,4 @@ function annotate<T>(
 
 }
 
-export default annotate;
+export { annotate };
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,4 @@
-import annotate from "./annotate";
+import { annotate } from "./annotate";
 import * as interfaces from "./interfaces";
 import { interfaces as inversifyInterfaces } from "inversify";
 import {

diff --git a/src/register.ts b/src/register.ts
@@ -1,6 +1,6 @@
 import { interfaces } from "inversify";
 import * as helperInterfaces from "./interfaces";
-import annotate from "./annotate";
+import { annotate } from "./annotate";
 
 function register(container: interfaces.Container) {
     return <T>(

diff --git a/test/constraints.test.ts b/test/constraints.test.ts
@@ -669,6 +669,8 @@ describe("Register helper constraints", () => {
 
     it("Should allow to apply constraints to registerProvider", () => {
 
+        type WeaponProvider = () => Promise<Weapon>;
+
         interface Weapon {
             name: string;
         }
@@ -689,15 +691,15 @@ describe("Register helper constraints", () => {
 
         class Ninja {
 
-            public katana: Weapon;
-            public shuriken: Weapon;
-            public katanaProvider: interfaces.Provider<Weapon>;
-            public shurikenProvider: interfaces.Provider<Weapon>;
+            public katana: Weapon | null;
+            public shuriken: Weapon | null;
+            public katanaProvider: WeaponProvider;
+            public shurikenProvider: WeaponProvider;
             private _health: number;
 
             public constructor(
-                katanaProvider: interfaces.Provider<Weapon>,
-                shurikenProvider: interfaces.Provider<Weapon>
+                katanaProvider: WeaponProvider,
+                shurikenProvider: WeaponProvider
             ) {
                 this._health = 100;
                 this.katana = null;
@@ -733,10 +735,12 @@ describe("Register helper constraints", () => {
                     });
                 };
             },
-            (b: interfaces.BindingWhenOnSyntax<interfaces.Provider<Weapon>>) => { b.whenTargetTagged("throwable", false); }
+            (b: interfaces.BindingWhenOnSyntax<interfaces.Provider<Weapon>>) => {
+                b.whenTargetTagged("throwable", false);
+            }
         );
 
-        registerProvider<interfaces.Provider<Shuriken>, Weapon>(
+        registerProvider<WeaponProvider, Weapon>(
             "Provider<Shuriken>",
             (context) => {
                 return () => {
@@ -746,7 +750,7 @@ describe("Register helper constraints", () => {
                     });
                 };
             },
-            (b: interfaces.BindingWhenOnSyntax<interfaces.Provider<Weapon>>) => { b.whenTargetTagged("throwable", true); }
+            (b: interfaces.BindingWhenOnSyntax<WeaponProvider>) => { b.whenTargetTagged("throwable", true); }
         );
 
         register<Ninja>(

diff --git a/test/decorators.test.ts b/test/decorators.test.ts
@@ -62,6 +62,9 @@ describe("Register helper as a decorator", () => {
         }
 
         let ninja = container.get<Ninja>(TYPE.Warrior);
+        expect(ninja instanceof Ninja).to.eql(true);
+        expect(ninja.primaryWeapon instanceof Katana).to.eql(true);
+        expect(ninja.secondaryWeapon instanceof Shuriken).to.eql(true);
         expect(ninja.primaryWeapon.name).to.eql("Katana");
         expect(ninja.secondaryWeapon.name).to.eql("Shuriken");
 

diff --git a/test/register.test.ts b/test/register.test.ts
@@ -414,17 +414,20 @@ describe("Register Helper", () => {
             }
         }
 
+        type KatanaProvider = () => Promise<Katana>;
+        type ShurikenProvider = () => Promise<Katana>;
+
         class Ninja {
 
-            public katana: Katana;
-            public shuriken: Shuriken;
-            public katanaProvider: interfaces.Provider<Katana>;
-            public shurikenProvider: interfaces.Provider<Shuriken>;
+            public katana: Katana | null;
+            public shuriken: Shuriken | null;
+            public katanaProvider: KatanaProvider;
+            public shurikenProvider: ShurikenProvider;
             private _health: number;
 
             public constructor(
-                katanaProvider: interfaces.Provider<Katana>,
-                shurikenProvider: interfaces.Provider<Shuriken>
+                katanaProvider: KatanaProvider,
+                shurikenProvider: ShurikenProvider
             ) {
                 this._health = 100;
                 this.katana = null;
@@ -449,7 +452,7 @@ describe("Register Helper", () => {
         register<Katana>("Katana")(Katana);
         register<Shuriken>("Shuriken")(Shuriken);
 
-        registerProvider<interfaces.Provider<Katana>, Katana>("Provider<Katana>", (context) => {
+        registerProvider<KatanaProvider, Katana>("Provider<Katana>", (context) => {
             return () => {
                 return new Promise<Katana>((resolve) => {
                     let katana = context.container.get<Katana>("Katana");
@@ -458,7 +461,7 @@ describe("Register Helper", () => {
             };
         });
 
-        registerProvider<interfaces.Provider<Shuriken>, Shuriken>("Provider<Shuriken>", (context) => {
+        registerProvider<ShurikenProvider, Shuriken>("Provider<Shuriken>", (context) => {
             return () => {
                 return new Promise<Shuriken>((resolve) => {
                     let katana = context.container.get<Shuriken>("Shuriken");

diff --git a/tsconfig.json b/tsconfig.json
@@ -12,6 +12,9 @@
         "removeComments": true,
         "preserveConstEnums": true,
         "suppressImplicitAnyIndexErrors": false,
-        "noResolve": false
+        "noResolve": false,
+        "noUnusedParameters": false,
+        "noUnusedLocals": true,
+        "strictNullChecks": true
     }
 }
diff --git a/tslint.json b/tslint.json
@@ -1,3 +1,4 @@
+
 {
   "rules": {
     "class-name": true,
@@ -7,7 +8,6 @@
     "forin": true,
     "indent": [true, "spaces"],
     "label-position": true,
-    "label-undefined": true,
     "max-line-length": [true, 140],
     "member-access": true,
     "member-ordering": [true,
@@ -26,7 +26,6 @@
     ],
     "no-construct": true,
     "no-debugger": true,
-    "no-duplicate-key": true,
     "no-duplicate-variable": true,
     "no-empty": true,
     "no-eval": true,
@@ -36,8 +35,6 @@
     "no-switch-case-fall-through": false,
     "no-trailing-whitespace": true,
     "no-unused-expression": true,
-    "no-unused-variable": true,
-    "no-unreachable": true,
     "no-use-before-declare": true,
     "no-var-keyword": true,
     "object-literal-sort-keys": true,