Merge branch 'master' into infer-bigint

Author: lukashroch

src/model/table/table-options.ts

@@ -1,6 +1,6 @@
-import {ModelOptions} from "sequelize";
+import {Model, ModelOptions} from "sequelize";
 
-export interface TableOptions extends ModelOptions {
+export interface TableOptions<M extends Model = Model> extends ModelOptions<M> {
   modelName?: string;
 
   /**

src/model/table/table.ts

@@ -2,7 +2,7 @@ import {TableOptions} from "./table-options";
 import {Model} from "../model/model";
 import {setModelName, addOptions} from "../shared/model-service";
 
-export function Table(options: TableOptions): Function;
+export function Table<M extends Model = Model>(options: TableOptions<M>): Function;
 export function Table(target: Function): void;
 export function Table(arg: any): void | Function {
 

test/types/model.spec.ts

@@ -10,3 +10,16 @@ export class User extends Model {
   @Column(DataType.ARRAY(DataType.STRING))
   myCol: string[];
 }
+
+@Table<Post>({
+  hooks: {
+    beforeUpdate: (instance) => {
+      // without generic random will result in error
+      instance.random = 4;
+    },
+  },
+})
+export class Post extends Model {
+  @Column(DataType.INTEGER)
+  random: number;
+}