Fix ModelCtor definition

src/model/model/model.ts

@@ -7,9 +7,10 @@ import {AssociationGetOptions} from "./association/association-get-options";
 import {AssociationCountOptions} from "./association/association-count-options";
 import {AssociationActionOptions} from "./association/association-action-options";
 import {AssociationCreateOptions} from "./association/association-create-options";
+import {Repository} from '../../sequelize/repository/repository';
 
 export type ModelType<TCreationAttributes, TModelAttributes> = new (values?: TCreationAttributes, options?: any) => Model<TModelAttributes, TCreationAttributes>;
-export type ModelCtor<M extends Model = Model> = (new () => M) & typeof Model;
+export type ModelCtor<M extends Model = Model> = Repository<M>;
 
 export type $GetType<T> = NonNullable<T> extends any[] ? NonNullable<T> : (NonNullable<T> | null);
 

src/sequelize/sequelize/sequelize.ts

@@ -110,7 +110,7 @@ export class Sequelize extends OriginSequelize {
   }
 
   private createRepositoryModel(modelClass: ModelCtor): ModelCtor {
-    return class extends modelClass<any> {
+    return class extends modelClass {
     };
   }
 

test/types/attributes.spec.ts

@@ -6,6 +6,8 @@ import {
   BelongsTo,
   BelongsToMany,
   ForeignKey,
+  PrimaryKey,
+  Sequelize,
 } from "../../src/index";
 import { Column } from "../../src/model/column/column";
 import { Model } from "../../src/model/model/model";
@@ -36,6 +38,7 @@ type PersonCreationAttributes = Optional<PersonAttributes, "id">;
 
 @Table
 export class Person extends Model<PersonAttributes, PersonCreationAttributes> {
+  @PrimaryKey
   @AutoIncrement
   @Column(DataType.INTEGER)
   id: number;
@@ -46,6 +49,7 @@ export class Person extends Model<PersonAttributes, PersonCreationAttributes> {
 
 @Table
 export class Pet extends Model {
+  @PrimaryKey
   @AutoIncrement
   @Column(DataType.INTEGER)
   petId: number;
@@ -71,3 +75,8 @@ export class Toy extends Model {
   @BelongsTo(() => Pet)
   pet: Pet;
 }
+
+function testTypes() {
+  // all models should be accepted
+  new Sequelize().addModels([Person, Pet, PetPerson]);
+}