Update gulp-tslint to the latest version 🚀 (#529)

* chore(package): update gulp-tslint to version 8.0.0 https://greenkeeper.io/ * Solve gulp-tslint upgrade issues * Solve gulp-tslint upgrade issues * Solve gulp-tslint upgrade issues
inversify · Apr 23, 2017 · 52596e0 · 52596e0
1 parent 93f83c2
commit 52596e0
Show file tree

Hide file tree

Showing 13 changed files with 101 additions and 100 deletions.
diff --git a/README.md b/README.md
@@ -171,8 +171,8 @@ class Ninja implements Warrior {
         this._shuriken = shuriken;
     }
 
-    public fight() { return this._katana.hit(); };
-    public sneak() { return this._shuriken.throw(); };
+    public fight() { return this._katana.hit(); }
+    public sneak() { return this._shuriken.throw(); }
 
 }
 
@@ -186,8 +186,8 @@ If you prefer it you can use property injection instead of constructor injection
 class Ninja implements Warrior {
     @inject(TYPES.Weapon) private _katana: Weapon;
     @inject(TYPES.ThrowableWeapon) private _shuriken: ThrowableWeapon;
-    public fight() { return this._katana.hit(); };
-    public sneak() { return this._shuriken.throw(); };
+    public fight() { return this._katana.hit(); }
+    public sneak() { return this._shuriken.throw(); }
 }
 ```
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -11,7 +11,8 @@ var gulp        = require("gulp"),
     browserify  = require("browserify"),
     source      = require("vinyl-source-stream"),
     buffer      = require("vinyl-buffer"),
-    tslint      = require("gulp-tslint"),
+    gulpTslint  = require("gulp-tslint"),
+    tslint      = require("tslint"),
     tsc         = require("gulp-typescript"),
     sourcemaps  = require("gulp-sourcemaps"),
     uglify      = require("gulp-uglify"),
@@ -42,14 +43,14 @@ gulp.task("clean", function() {
 //******************************************************************************
 gulp.task("lint", function() {
 
-    var config =  { formatter: "verbose", emitError: (process.env.CI) ? true : false };
+    var program = tslint.Linter.createProgram("./tsconfig.json");
 
     return gulp.src([
         "src/**/**.ts",
         "test/**/**.test.ts"
     ])
-    .pipe(tslint(config))
-    .pipe(tslint.report());
+    .pipe(gulpTslint({ program }))
+    .pipe(gulpTslint.report());
 
 });
 

diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     "gulp-mocha": "3.0.1",
     "gulp-rename": "^1.2.2",
     "gulp-sourcemaps": "^2.2.1",
-    "gulp-tslint": "^7.0.0",
+    "gulp-tslint": "^8.0.0",
     "gulp-typescript": "^3.0.0",
     "gulp-uglify": "^2.0.0",
     "harmonize": "^2.0.0",

diff --git a/src/container/lookup.ts b/src/container/lookup.ts
@@ -19,11 +19,11 @@ class Lookup<T extends interfaces.Clonable<T>> implements interfaces.Lookup<T> {
 
         if (serviceIdentifier === null || serviceIdentifier === undefined) {
             throw new Error(ERROR_MSGS.NULL_ARGUMENT);
-        };
+        }
 
         if (value === null || value === undefined) {
             throw new Error(ERROR_MSGS.NULL_ARGUMENT);
-        };
+        }
 
         let entry = this._map.get(serviceIdentifier);
         if (entry !== undefined) {
@@ -101,7 +101,7 @@ class Lookup<T extends interfaces.Clonable<T>> implements interfaces.Lookup<T> {
         this._map.forEach((value, key) => {
             func(key, value);
         });
-    };
+    }
 
 }
 

diff --git a/src/interfaces/interfaces.ts b/src/interfaces/interfaces.ts
@@ -39,6 +39,10 @@ namespace interfaces {
 
     export type ServiceIdentifier<T> = (string | symbol | Newable<T> | Abstract<T>);
 
+    export interface Clonable<T> {
+        clone(): T;
+    }
+
     export interface Binding<T> extends Clonable<Binding<T>> {
         guid: string;
         moduleId: string;
@@ -219,10 +223,6 @@ namespace interfaces {
         middleware: Next | null;
     }
 
-    export interface Clonable<T> {
-        clone(): T;
-    }
-
     export interface Lookup<T> extends Clonable<Lookup<T>> {
         add(serviceIdentifier: ServiceIdentifier<any>, value: T): void;
         getMap(): Map<interfaces.ServiceIdentifier<any>, T[]>;
@@ -234,31 +234,10 @@ namespace interfaces {
         traverse(func: (key: interfaces.ServiceIdentifier<any>, value: T[]) => void): void;
     }
 
-    export interface BindingInSyntax<T> {
-        inSingletonScope(): BindingWhenOnSyntax<T>;
-        inTransientScope(): BindingWhenOnSyntax<T>;
-    }
-
-    export interface BindingInWhenOnSyntax<T> extends BindingInSyntax<T>, BindingWhenOnSyntax<T> { }
-
     export interface BindingOnSyntax<T> {
         onActivation(fn: (context: Context, injectable: T) => T): BindingWhenSyntax<T>;
     }
 
-    export interface BindingToSyntax<T> {
-        to(constructor: { new (...args: any[]): T; }): BindingInWhenOnSyntax<T>;
-        toSelf(): BindingInWhenOnSyntax<T>;
-        toConstantValue(value: T): BindingWhenOnSyntax<T>;
-        toDynamicValue(func: (context: Context) => T): BindingInWhenOnSyntax<T>;
-        toConstructor<T2>(constructor: Newable<T2>): BindingWhenOnSyntax<T>;
-        toFactory<T2>(factory: FactoryCreator<T2>): BindingWhenOnSyntax<T>;
-        toFunction(func: T): BindingWhenOnSyntax<T>;
-        toAutoFactory<T2>(serviceIdentifier: ServiceIdentifier<T2>): BindingWhenOnSyntax<T>;
-        toProvider<T2>(provider: ProviderCreator<T2>): BindingWhenOnSyntax<T>;
-    }
-
-    export interface BindingWhenOnSyntax<T> extends BindingWhenSyntax<T>, BindingOnSyntax<T> { }
-
     export interface BindingWhenSyntax<T> {
         when(constraint: (request: Request) => boolean): BindingOnSyntax<T>;
         whenTargetNamed(name: string|number|symbol): BindingOnSyntax<T>;
@@ -277,6 +256,27 @@ namespace interfaces {
         whenNoAncestorMatches(constraint: (request: Request) => boolean): BindingOnSyntax<T>;
     }
 
+    export interface BindingWhenOnSyntax<T> extends BindingWhenSyntax<T>, BindingOnSyntax<T> { }
+
+    export interface BindingInSyntax<T> {
+        inSingletonScope(): BindingWhenOnSyntax<T>;
+        inTransientScope(): BindingWhenOnSyntax<T>;
+    }
+
+    export interface BindingInWhenOnSyntax<T> extends BindingInSyntax<T>, BindingWhenOnSyntax<T> { }
+
+    export interface BindingToSyntax<T> {
+        to(constructor: { new (...args: any[]): T; }): BindingInWhenOnSyntax<T>;
+        toSelf(): BindingInWhenOnSyntax<T>;
+        toConstantValue(value: T): BindingWhenOnSyntax<T>;
+        toDynamicValue(func: (context: Context) => T): BindingInWhenOnSyntax<T>;
+        toConstructor<T2>(constructor: Newable<T2>): BindingWhenOnSyntax<T>;
+        toFactory<T2>(factory: FactoryCreator<T2>): BindingWhenOnSyntax<T>;
+        toFunction(func: T): BindingWhenOnSyntax<T>;
+        toAutoFactory<T2>(serviceIdentifier: ServiceIdentifier<T2>): BindingWhenOnSyntax<T>;
+        toProvider<T2>(provider: ProviderCreator<T2>): BindingWhenOnSyntax<T>;
+    }
+
     export interface ConstraintFunction extends Function {
         metaData?: Metadata;
         (request: Request | null): boolean;

diff --git a/src/syntax/binding_to_syntax.ts b/src/syntax/binding_to_syntax.ts
@@ -56,7 +56,7 @@ class BindingToSyntax<T> implements interfaces.BindingToSyntax<T> {
 
     public toFunction(func: T): interfaces.BindingWhenOnSyntax<T> {
         // toFunction is an alias of toConstantValue
-        if (typeof func !== "function") { throw new Error(ERROR_MSGS.INVALID_FUNCTION_BINDING); };
+        if (typeof func !== "function") { throw new Error(ERROR_MSGS.INVALID_FUNCTION_BINDING); }
         let bindingWhenOnSyntax = this.toConstantValue(func);
         this._binding.type = BindingTypeEnum.Function;
         return bindingWhenOnSyntax;

diff --git a/test/annotation/inject.test.ts b/test/annotation/inject.test.ts
@@ -57,17 +57,17 @@ describe("@inject", () => {
     let m1: interfaces.Metadata = paramsMetadata["0"][0];
     expect(m1.key).to.be.eql(METADATA_KEY.INJECT_TAG);
     expect(m1.value).to.be.eql("Katana");
-    expect(paramsMetadata["0"][1]).to.be.undefined;
+    expect(paramsMetadata["0"][1]).to.eq(undefined);
 
     // assert metadata for second argument
     expect(paramsMetadata["1"]).to.be.instanceof(Array);
     let m2: interfaces.Metadata = paramsMetadata["1"][0];
     expect(m2.key).to.be.eql(METADATA_KEY.INJECT_TAG);
     expect(m2.value).to.be.eql("Shuriken");
-    expect(paramsMetadata["1"][1]).to.be.undefined;
+    expect(paramsMetadata["1"][1]).to.eq(undefined);
 
     // no more metadata should be available
-    expect(paramsMetadata["2"]).to.be.undefined;
+    expect(paramsMetadata["2"]).to.eq(undefined);
 
   });
 
@@ -119,17 +119,17 @@ describe("@inject", () => {
     let m1: interfaces.Metadata = paramsMetadata["0"][0];
     expect(m1.key).to.be.eql(METADATA_KEY.INJECT_TAG);
     expect(m1.value).to.be.eql("Katana");
-    expect(paramsMetadata["0"][1]).to.be.undefined;
+    expect(paramsMetadata["0"][1]).to.eq(undefined);
 
     // assert metadata for second argument
     expect(paramsMetadata["1"]).to.be.instanceof(Array);
     let m2: interfaces.Metadata = paramsMetadata["1"][0];
     expect(m2.key).to.be.eql(METADATA_KEY.INJECT_TAG);
     expect(m2.value).to.be.eql("Shurien");
-    expect(paramsMetadata["1"][1]).to.be.undefined;
+    expect(paramsMetadata["1"][1]).to.eq(undefined);
 
     // no more metadata should be available
-    expect(paramsMetadata["2"]).to.be.undefined;
+    expect(paramsMetadata["2"]).to.eq(undefined);
 
   });
 

diff --git a/test/annotation/injectable.test.ts b/test/annotation/injectable.test.ts
@@ -29,7 +29,7 @@ describe("@injectable", () => {
 
         expect(metadata[0]).to.be.eql(Katana);
         expect(metadata[1]).to.be.eql(Object);
-        expect(metadata[2]).to.be.undefined;
+        expect(metadata[2]).to.eq(undefined);
     });
 
     it("Should throw when applayed mutiple times", () => {

diff --git a/test/annotation/multi_inject.test.ts b/test/annotation/multi_inject.test.ts
@@ -51,10 +51,10 @@ describe("@multiInject", () => {
     let m1: interfaces.Metadata = paramsMetadata["0"][0];
     expect(m1.key).to.be.eql(METADATA_KEY.MULTI_INJECT_TAG);
     expect(m1.value).to.be.eql("Weapon");
-    expect(paramsMetadata["0"][1]).to.be.undefined;
+    expect(paramsMetadata["0"][1]).to.eq(undefined);
 
     // no more metadata should be available
-    expect(paramsMetadata["1"]).to.be.undefined;
+    expect(paramsMetadata["1"]).to.eq(undefined);
 
   });
 
@@ -105,10 +105,10 @@ describe("@multiInject", () => {
     let m1: interfaces.Metadata = paramsMetadata["0"][0];
     expect(m1.key).to.be.eql(METADATA_KEY.MULTI_INJECT_TAG);
     expect(m1.value).to.be.eql("Weapon");
-    expect(paramsMetadata["0"][1]).to.be.undefined;
+    expect(paramsMetadata["0"][1]).to.eq(undefined);
 
     // no more metadata should be available
-    expect(paramsMetadata["1"]).to.be.undefined;
+    expect(paramsMetadata["1"]).to.eq(undefined);
 
   });
 

diff --git a/test/annotation/named.test.ts b/test/annotation/named.test.ts
@@ -53,17 +53,17 @@ describe("@named", () => {
     let m1: interfaces.Metadata = paramsMetadata["0"][0];
     expect(m1.key).to.be.eql(METADATA_KEY.NAMED_TAG);
     expect(m1.value).to.be.eql("more_powerful");
-    expect(paramsMetadata["0"][1]).to.be.undefined;
+    expect(paramsMetadata["0"][1]).to.eq(undefined);
 
     // assert metadata for second argument
     expect(paramsMetadata["1"]).to.be.instanceof(Array);
     let m2: interfaces.Metadata = paramsMetadata["1"][0];
     expect(m2.key).to.be.eql(METADATA_KEY.NAMED_TAG);
     expect(m2.value).to.be.eql("less_powerful");
-    expect(paramsMetadata["1"][1]).to.be.undefined;
+    expect(paramsMetadata["1"][1]).to.eq(undefined);
 
     // no more metadata should be available
-    expect(paramsMetadata["2"]).to.be.undefined;
+    expect(paramsMetadata["2"]).to.eq(undefined);
 
   });
 
@@ -80,7 +80,7 @@ describe("@named", () => {
     let m1 = metadata.weapon[0];
     expect(m1.key).to.be.eql(METADATA_KEY.NAMED_TAG);
     expect(m1.value).to.be.eql("throwwable");
-    expect(metadata.weapon[1]).to.be.undefined;
+    expect(metadata.weapon[1]).to.eq(undefined);
 
   });
 
@@ -132,17 +132,17 @@ describe("@named", () => {
     let m1: interfaces.Metadata = paramsMetadata["0"][0];
     expect(m1.key).to.be.eql(METADATA_KEY.NAMED_TAG);
     expect(m1.value).to.be.eql("more_powerful");
-    expect(paramsMetadata["0"][1]).to.be.undefined;
+    expect(paramsMetadata["0"][1]).to.eq(undefined);
 
     // assert metadata for second argument
     expect(paramsMetadata["1"]).to.be.instanceof(Array);
     let m2: interfaces.Metadata = paramsMetadata["1"][0];
     expect(m2.key).to.be.eql(METADATA_KEY.NAMED_TAG);
     expect(m2.value).to.be.eql("less_powerful");
-    expect(paramsMetadata["1"][1]).to.be.undefined;
+    expect(paramsMetadata["1"][1]).eq(undefined);
 
     // no more metadata should be available
-    expect(paramsMetadata["2"]).to.be.undefined;
+    expect(paramsMetadata["2"]).to.eq(undefined);
 
   });
 

diff --git a/test/annotation/tagged.test.ts b/test/annotation/tagged.test.ts
@@ -69,7 +69,7 @@ describe("@Tagged", () => {
     expect(m1.value).to.be.eql(1);
 
     // argumnet at index 0 should only have one tag
-    expect(paramsMetadata["0"][1]).to.be.undefined;
+    expect(paramsMetadata["0"][1]).to.eq(undefined);
 
     // assert metadata for second argument
     expect(paramsMetadata["1"]).to.be.instanceof(Array);
@@ -78,10 +78,10 @@ describe("@Tagged", () => {
     expect(m2.value).to.be.eql(2);
 
     // argumnet at index 1 should only have one tag
-    expect(paramsMetadata["1"][1]).to.be.undefined;
+    expect(paramsMetadata["1"][1]).to.eq(undefined);
 
     // no more metadata should be available
-    expect(paramsMetadata["2"]).to.be.undefined;
+    expect(paramsMetadata["2"]).to.eq(undefined);
   });
 
   it("Should generate metadata for tagged properties", () => {
@@ -96,7 +96,7 @@ describe("@Tagged", () => {
     let m1 = metadata.weapon[0];
     expect(m1.key).to.be.eql("throwwable");
     expect(m1.value).to.be.eql(false);
-    expect(metadata.weapon[1]).to.be.undefined;
+    expect(metadata.weapon[1]).to.eq(undefined);
 
   });
 
@@ -132,7 +132,7 @@ describe("@Tagged", () => {
     expect(m22.value).to.be.eql(2);
 
     // no more metadata (argument at index > 1)
-    expect(paramsMetadata["2"]).to.be.undefined;
+    expect(paramsMetadata["2"]).to.eq(undefined);
 
   });
 
@@ -188,7 +188,7 @@ describe("@Tagged", () => {
     expect(m1.value).to.be.eql(1);
 
     // argumnet at index 0 should only have one tag
-    expect(paramsMetadata["0"][1]).to.be.undefined;
+    expect(paramsMetadata["0"][1]).to.eq(undefined);
 
     // assert metadata for second argument
     expect(paramsMetadata["1"]).to.be.instanceof(Array);
@@ -197,10 +197,10 @@ describe("@Tagged", () => {
     expect(m2.value).to.be.eql(2);
 
     // argumnet at index 1 should only have one tag
-    expect(paramsMetadata["1"][1]).to.be.undefined;
+    expect(paramsMetadata["1"][1]).to.eq(undefined);
 
     // no more metadata should be available
-    expect(paramsMetadata["2"]).to.be.undefined;
+    expect(paramsMetadata["2"]).to.eq(undefined);
 
   });
 

diff --git a/test/features/metadata_reader.test.ts b/test/features/metadata_reader.test.ts
@@ -127,8 +127,8 @@ describe("Custom Metadata Reader", () => {
                 this._shuriken = shuriken;
             }
 
-            public fight() { return this._katana.hit(); };
-            public sneak() { return this._shuriken.throw(); };
+            public fight() { return this._katana.hit(); }
+            public sneak() { return this._shuriken.throw(); }
 
         }
 
@@ -192,8 +192,8 @@ describe("Custom Metadata Reader", () => {
 
             private _katana: Katana;
             private _shuriken: Shuriken;
-            public fight() { return this._katana.hit(); };
-            public sneak() { return this._shuriken.throw(); };
+            public fight() { return this._katana.hit(); }
+            public sneak() { return this._shuriken.throw(); }
 
         }