Updates tslint and fixes linter issues

package.json

@@ -6,7 +6,7 @@
     "build": "tsc",
     "test": "mocha",
     "cover": "nyc mocha",
-    "lint": "tslint .",
+    "lint": "tslint -c tslint.json --project tsconfig.json",
     "prepublishOnly": "npm run build"
   },
   "repository": {
@@ -66,12 +66,13 @@
     "source-map-support": "0.4.14",
     "sqlite3": "4.0.4",
     "ts-node": "7.0.1",
-    "tslint": "4.3.1",
+    "tslint": "5.14.0",
     "typescript": "3.3.3",
     "uuid-validate": "0.0.2"
   },
   "peerDependencies": {
-    "reflect-metadata": "*"
+    "reflect-metadata": "*",
+    "sequelize": "^5.1.0"
   },
   "engines": {
     "node": ">=0.8.15"

src/hooks/bulk/after/after-bulk-create.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterBulkCreate(target: any, propertyName: string): void;
 export function AfterBulkCreate(options: HookOptions): Function;
-export function AfterBulkCreate(...args: any[]): void|Function {
+export function AfterBulkCreate(...args: any[]): void | Function {
   return implementHookDecorator('afterBulkCreate', args);
 }

src/hooks/bulk/after/after-bulk-destroy.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterBulkDestroy(target: any, propertyName: string): void;
 export function AfterBulkDestroy(options: HookOptions): Function;
-export function AfterBulkDestroy(...args: any[]): void|Function {
+export function AfterBulkDestroy(...args: any[]): void | Function {
   return implementHookDecorator('afterBulkDestroy', args);
 }

src/hooks/bulk/after/after-bulk-restore.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterBulkRestore(target: any, propertyName: string): void;
 export function AfterBulkRestore(options: HookOptions): Function;
-export function AfterBulkRestore(...args: any[]): void|Function {
+export function AfterBulkRestore(...args: any[]): void | Function {
   return implementHookDecorator('afterBulkRestore' as any, args);
 }

src/hooks/bulk/after/after-bulk-sync.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterBulkSync(target: any, propertyName: string): void;
 export function AfterBulkSync(options: HookOptions): Function;
-export function AfterBulkSync(...args: any[]): void|Function {
+export function AfterBulkSync(...args: any[]): void | Function {
   return implementHookDecorator('afterBulkSync', args);
 }

src/hooks/bulk/after/after-bulk-update.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterBulkUpdate(target: any, propertyName: string): void;
 export function AfterBulkUpdate(options: HookOptions): Function;
-export function AfterBulkUpdate(...args: any[]): void|Function {
+export function AfterBulkUpdate(...args: any[]): void | Function {
   return implementHookDecorator('afterBulkUpdate', args);
 }

src/hooks/bulk/before/before-bulk-create.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeBulkCreate(target: any, propertyName: string): void;
 export function BeforeBulkCreate(options: HookOptions): Function;
-export function BeforeBulkCreate(...args: any[]): void|Function {
+export function BeforeBulkCreate(...args: any[]): void | Function {
   return implementHookDecorator('beforeBulkCreate', args);
 }

src/hooks/bulk/before/before-bulk-destroy.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeBulkDestroy(target: any, propertyName: string): void;
 export function BeforeBulkDestroy(options: HookOptions): Function;
-export function BeforeBulkDestroy(...args: any[]): void|Function {
+export function BeforeBulkDestroy(...args: any[]): void | Function {
   return implementHookDecorator('beforeBulkDestroy', args);
 }

src/hooks/bulk/before/before-bulk-restore.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeBulkRestore(target: any, propertyName: string): void;
 export function BeforeBulkRestore(options: HookOptions): Function;
-export function BeforeBulkRestore(...args: any[]): void|Function {
+export function BeforeBulkRestore(...args: any[]): void | Function {
   return implementHookDecorator('beforeBulkRestore' as any, args);
 }

src/hooks/bulk/before/before-bulk-sync.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeBulkSync(target: any, propertyName: string): void;
 export function BeforeBulkSync(options: HookOptions): Function;
-export function BeforeBulkSync(...args: any[]): void|Function {
+export function BeforeBulkSync(...args: any[]): void | Function {
   return implementHookDecorator('beforeBulkSync', args);
 }

src/hooks/bulk/before/before-bulk-update.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeBulkUpdate(target: any, propertyName: string): void;
 export function BeforeBulkUpdate(options: HookOptions): Function;
-export function BeforeBulkUpdate(...args: any[]): void|Function {
+export function BeforeBulkUpdate(...args: any[]): void | Function {
   return implementHookDecorator('beforeBulkUpdate', args);
 }

src/hooks/shared/validation-failed.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "./hooks-service";
 
 export function ValidationFailed(target: any, propertyName: string): void;
 export function ValidationFailed(options: HookOptions): Function;
-export function ValidationFailed(...args: any[]): void|Function {
+export function ValidationFailed(...args: any[]): void | Function {
   return implementHookDecorator('validationFailed' as any, args);
 }

src/hooks/single/after/after-connect.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterConnect(target: any, propertyName: string): void;
 export function AfterConnect(options: HookOptions): Function;
-export function AfterConnect(...args: any[]): void|Function {
+export function AfterConnect(...args: any[]): void | Function {
   return implementHookDecorator('afterConnect', args);
 }

src/hooks/single/after/after-create.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterCreate(target: any, propertyName: string): void;
 export function AfterCreate(options: HookOptions): Function;
-export function AfterCreate(...args: any[]): void|Function {
+export function AfterCreate(...args: any[]): void | Function {
   return implementHookDecorator('afterCreate', args);
 }

src/hooks/single/after/after-define.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterDefine(target: any, propertyName: string): void;
 export function AfterDefine(options: HookOptions): Function;
-export function AfterDefine(...args: any[]): void|Function {
+export function AfterDefine(...args: any[]): void | Function {
   return implementHookDecorator('afterDefine', args);
 }

src/hooks/single/after/after-destroy.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterDestroy(target: any, propertyName: string): void;
 export function AfterDestroy(options: HookOptions): Function;
-export function AfterDestroy(...args: any[]): void|Function {
+export function AfterDestroy(...args: any[]): void | Function {
   return implementHookDecorator('afterDestroy', args);
 }

src/hooks/single/after/after-find.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterFind(target: any, propertyName: string): void;
 export function AfterFind(options: HookOptions): Function;
-export function AfterFind(...args: any[]): void|Function {
+export function AfterFind(...args: any[]): void | Function {
   return implementHookDecorator('afterFind', args);
 }

src/hooks/single/after/after-init.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterInit(target: any, propertyName: string): void;
 export function AfterInit(options: HookOptions): Function;
-export function AfterInit(...args: any[]): void|Function {
+export function AfterInit(...args: any[]): void | Function {
   return implementHookDecorator('afterInit', args);
 }

src/hooks/single/after/after-restore.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterRestore(target: any, propertyName: string): void;
 export function AfterRestore(options: HookOptions): Function;
-export function AfterRestore(...args: any[]): void|Function {
+export function AfterRestore(...args: any[]): void | Function {
   return implementHookDecorator('afterRestore' as any, args);
 }

src/hooks/single/after/after-save.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterSave(target: any, propertyName: string): void;
 export function AfterSave(options: HookOptions): Function;
-export function AfterSave(...args: any[]): void|Function {
+export function AfterSave(...args: any[]): void | Function {
   return implementHookDecorator('afterSave' as any, args);
 }

src/hooks/single/after/after-sync.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterSync(target: any, propertyName: string): void;
 export function AfterSync(options: HookOptions): Function;
-export function AfterSync(...args: any[]): void|Function {
+export function AfterSync(...args: any[]): void | Function {
   return implementHookDecorator('afterSync', args);
 }

src/hooks/single/after/after-update.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterUpdate(target: any, propertyName: string): void;
 export function AfterUpdate(options: HookOptions): Function;
-export function AfterUpdate(...args: any[]): void|Function {
+export function AfterUpdate(...args: any[]): void | Function {
   return implementHookDecorator('afterUpdate', args);
 }

src/hooks/single/after/after-upsert.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterUpsert(target: any, propertyName: string): void;
 export function AfterUpsert(options: HookOptions): Function;
-export function AfterUpsert(...args: any[]): void|Function {
+export function AfterUpsert(...args: any[]): void | Function {
   return implementHookDecorator('afterUpsert' as any, args);
 }

src/hooks/single/after/after-validate.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function AfterValidate(target: any, propertyName: string): void;
 export function AfterValidate(options: HookOptions): Function;
-export function AfterValidate(...args: any[]): void|Function {
+export function AfterValidate(...args: any[]): void | Function {
   return implementHookDecorator('afterValidate', args);
 }

src/hooks/single/before/before-connect.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeConnect(target: any, propertyName: string): void;
 export function BeforeConnect(options: HookOptions): Function;
-export function BeforeConnect(...args: any[]): void|Function {
+export function BeforeConnect(...args: any[]): void | Function {
   return implementHookDecorator('beforeConnect', args);
 }

src/hooks/single/before/before-count.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeCount(target: any, propertyName: string): void;
 export function BeforeCount(options: HookOptions): Function;
-export function BeforeCount(...args: any[]): void|Function {
+export function BeforeCount(...args: any[]): void | Function {
   return implementHookDecorator('beforeCount', args);
 }

src/hooks/single/before/before-create.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeCreate(target: any, propertyName: string): void;
 export function BeforeCreate(options: HookOptions): Function;
-export function BeforeCreate(...args: any[]): void|Function {
+export function BeforeCreate(...args: any[]): void | Function {
   return implementHookDecorator('beforeCreate', args);
 }

src/hooks/single/before/before-define.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeDefine(target: any, propertyName: string): void;
 export function BeforeDefine(options: HookOptions): Function;
-export function BeforeDefine(...args: any[]): void|Function {
+export function BeforeDefine(...args: any[]): void | Function {
   return implementHookDecorator('beforeDefine', args);
 }

src/hooks/single/before/before-destroy.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeDestroy(target: any, propertyName: string): void;
 export function BeforeDestroy(options: HookOptions): Function;
-export function BeforeDestroy(...args: any[]): void|Function {
+export function BeforeDestroy(...args: any[]): void | Function {
   return implementHookDecorator('beforeDestroy', args);
 }

src/hooks/single/before/before-find-after-expand-include-all.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeFindAfterExpandIncludeAll(target: any, propertyName: string): void;
 export function BeforeFindAfterExpandIncludeAll(options: HookOptions): Function;
-export function BeforeFindAfterExpandIncludeAll(...args: any[]): void|Function {
+export function BeforeFindAfterExpandIncludeAll(...args: any[]): void | Function {
   return implementHookDecorator('beforeFindAfterExpandIncludeAll', args);
 }

src/hooks/single/before/before-find-after-options.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeFindAfterOptions(target: any, propertyName: string): void;
 export function BeforeFindAfterOptions(options: HookOptions): Function;
-export function BeforeFindAfterOptions(...args: any[]): void|Function {
+export function BeforeFindAfterOptions(...args: any[]): void | Function {
   return implementHookDecorator('beforeFindAfterOptions', args);
 }

src/hooks/single/before/before-find.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeFind(target: any, propertyName: string): void;
 export function BeforeFind(options: HookOptions): Function;
-export function BeforeFind(...args: any[]): void|Function {
+export function BeforeFind(...args: any[]): void | Function {
   return implementHookDecorator('beforeFind', args);
 }

src/hooks/single/before/before-init.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeInit(target: any, propertyName: string): void;
 export function BeforeInit(options: HookOptions): Function;
-export function BeforeInit(...args: any[]): void|Function {
+export function BeforeInit(...args: any[]): void | Function {
   return implementHookDecorator('beforeInit', args);
 }

src/hooks/single/before/before-restore.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeRestore(target: any, propertyName: string): void;
 export function BeforeRestore(options: HookOptions): Function;
-export function BeforeRestore(...args: any[]): void|Function {
+export function BeforeRestore(...args: any[]): void | Function {
   return implementHookDecorator('beforeRestore' as any, args);
 }

src/hooks/single/before/before-save.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeSave(target: any, propertyName: string): void;
 export function BeforeSave(options: HookOptions): Function;
-export function BeforeSave(...args: any[]): void|Function {
+export function BeforeSave(...args: any[]): void | Function {
   return implementHookDecorator('beforeSave' as any, args);
 }

src/hooks/single/before/before-sync.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeSync(target: any, propertyName: string): void;
 export function BeforeSync(options: HookOptions): Function;
-export function BeforeSync(...args: any[]): void|Function {
+export function BeforeSync(...args: any[]): void | Function {
   return implementHookDecorator('beforeSync', args);
 }

src/hooks/single/before/before-update.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeUpdate(target: any, propertyName: string): void;
 export function BeforeUpdate(options: HookOptions): Function;
-export function BeforeUpdate(...args: any[]): void|Function {
+export function BeforeUpdate(...args: any[]): void | Function {
   return implementHookDecorator('beforeUpdate', args);
 }

src/hooks/single/before/before-upsert.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeUpsert(target: any, propertyName: string): void;
 export function BeforeUpsert(options: HookOptions): Function;
-export function BeforeUpsert(...args: any[]): void|Function {
+export function BeforeUpsert(...args: any[]): void | Function {
   return implementHookDecorator('beforeUpsert' as any, args);
 }

src/hooks/single/before/before-validate.ts

@@ -3,6 +3,6 @@ import {implementHookDecorator} from "../../shared/hooks-service";
 
 export function BeforeValidate(target: any, propertyName: string): void;
 export function BeforeValidate(options: HookOptions): Function;
-export function BeforeValidate(...args: any[]): void|Function {
+export function BeforeValidate(...args: any[]): void | Function {
   return implementHookDecorator('beforeValidate', args);
 }

src/model/column/column-options/allow-null.ts

@@ -5,7 +5,7 @@ import {addAttributeOptions} from '../attribute-service';
  */
 export function AllowNull(target: any, propertyName: string): void;
 export function AllowNull(allowNull: boolean): Function;
-export function AllowNull(...args: any[]): void|Function {
+export function AllowNull(...args: any[]): void | Function {
 
   if (args.length === 1) {
 

src/model/column/column-options/unique.ts

@@ -15,8 +15,8 @@ export function Unique(target: Object, propertyName: string): void;
 export function Unique(...args: any[]): void | Function {
   if (args.length === 1) {
     const [options] = args;
-    return (target, propertyName) => {
-      annotate(target, propertyName, options);
+    return (_target, _propertyName) => {
+      annotate(_target, _propertyName, options);
     };
   }
   const [target, propertyName] = args;

src/model/column/column.ts

@@ -40,7 +40,7 @@ function annotate(target: any,
     };
   } else {
 
-    options = Object.assign({}, optionsOrDataType as ModelAttributeColumnOptions);
+    options = {...(optionsOrDataType as ModelAttributeColumnOptions)};
 
     if (!options.type) {
       options.type = getSequelizeTypeByDesignType(target, propertyName);