Fix typeof Model errors throughout by using typeof Model generics

src/associations/belongs-to-many/belongs-to-many-association.ts

@@ -1,4 +1,4 @@
-import {BelongsToManyOptions as OriginBelongsToManyOptions, Model, ThroughOptions} from "sequelize";
+import {BelongsToManyOptions as OriginBelongsToManyOptions, ThroughOptions} from "sequelize";
 
 import {BaseAssociation} from '../shared/base-association';
 import {BelongsToManyOptions} from './belongs-to-many-options';
@@ -8,19 +8,20 @@ import {ModelClassGetter} from "../../model/shared/model-class-getter";
 import {Association} from "../shared/association";
 import {Sequelize} from "../../sequelize/sequelize/sequelize";
 import {UnionAssociationOptions} from "../shared/union-association-options";
+import {ModelType} from "../../model/model/model";
 
-export class BelongsToManyAssociation extends BaseAssociation {
+export class BelongsToManyAssociation<TCreationAttributes, TModelAttributes> extends BaseAssociation<TCreationAttributes, TModelAttributes> {
 
-  constructor(associatedClassGetter: ModelClassGetter,
-              protected options: BelongsToManyOptions) {
+  constructor(associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>,
+              protected options: BelongsToManyOptions<TCreationAttributes, TModelAttributes>) {
     super(associatedClassGetter, options);
   }
 
   getAssociation(): Association {
     return Association.BelongsToMany;
   }
 
-  getSequelizeOptions(model: typeof Model,
+  getSequelizeOptions(model: ModelType<TCreationAttributes, TModelAttributes>,
                       sequelize: Sequelize): UnionAssociationOptions {
     const options: OriginBelongsToManyOptions = {...this.options as any};
     const associatedClass = this.getAssociatedClass();

src/associations/belongs-to-many/belongs-to-many-options.ts

@@ -3,8 +3,8 @@ import {ModelClassGetter} from "../../model/shared/model-class-getter";
 import {ThroughOptions} from "../through/through-options";
 
 
-export type BelongsToManyOptions = {
+export type BelongsToManyOptions<TCreationAttributes, TModelAttributes> = {
   [K in keyof OriginBelongsToManyOptions]: K extends 'through'
-    ? ModelClassGetter | string | ThroughOptions
+    ? ModelClassGetter<TCreationAttributes, TModelAttributes> | string | ThroughOptions<TCreationAttributes, TModelAttributes>
     : OriginBelongsToManyOptions[K]
 };

src/associations/belongs-to-many/belongs-to-many.ts

@@ -3,19 +3,19 @@ import {BelongsToManyAssociation} from './belongs-to-many-association';
 import {ModelClassGetter} from "../../model/shared/model-class-getter";
 import {addAssociation} from "../shared/association-service";
 
-export function BelongsToMany(associatedClassGetter: ModelClassGetter,
-                              through: ModelClassGetter | string,
+export function BelongsToMany<TCreationAttributes, TModelAttributes>(associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>,
+                              through: ModelClassGetter<TCreationAttributes, TModelAttributes> | string,
                               foreignKey?: string,
                               otherKey?: string): Function;
-export function BelongsToMany(associatedClassGetter: ModelClassGetter,
-                              options: BelongsToManyOptions): Function;
-export function BelongsToMany(associatedClassGetter: ModelClassGetter,
-                              throughOrOptions: ModelClassGetter | string | BelongsToManyOptions,
+export function BelongsToMany<TCreationAttributes, TModelAttributes>(associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>,
+                              options: BelongsToManyOptions<TCreationAttributes, TModelAttributes>): Function;
+export function BelongsToMany<TCreationAttributes, TModelAttributes>(associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>,
+                              throughOrOptions: ModelClassGetter<TCreationAttributes, TModelAttributes> | string | BelongsToManyOptions<TCreationAttributes, TModelAttributes>,
                               foreignKey?: string,
                               otherKey?: string): Function {
 
   return (target: any, propertyName: string) => {
-    let options: Partial<BelongsToManyOptions> = {foreignKey, otherKey};
+    let options: Partial<BelongsToManyOptions<TCreationAttributes, TModelAttributes>> = {foreignKey, otherKey};
 
     if (typeof throughOrOptions === 'string' ||
       typeof throughOrOptions === 'function') {
@@ -28,7 +28,7 @@ export function BelongsToMany(associatedClassGetter: ModelClassGetter,
 
     addAssociation(target, new BelongsToManyAssociation(
       associatedClassGetter,
-      options as BelongsToManyOptions,
+      options as BelongsToManyOptions<TCreationAttributes, TModelAttributes>,
       )
     );
   };

src/associations/belongs-to/belongs-to-association.ts

@@ -4,12 +4,12 @@ import {BaseAssociation} from '../shared/base-association';
 import {getForeignKeyOptions} from "../foreign-key/foreign-key-service";
 import {ModelClassGetter} from "../../model/shared/model-class-getter";
 import {Association} from "../shared/association";
-import {Model} from "../../model/model/model";
+import {ModelType} from "../../model/model/model";
 import {UnionAssociationOptions} from "../shared/union-association-options";
 
-export class BelongsToAssociation extends BaseAssociation {
+export class BelongsToAssociation<TCreationAttributes, TModelAttributes> extends BaseAssociation<TCreationAttributes, TModelAttributes> {
 
-  constructor(associatedClassGetter: ModelClassGetter,
+  constructor(associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>,
               protected options: BelongsToOptions) {
     super(associatedClassGetter, options);
   }
@@ -18,7 +18,7 @@ export class BelongsToAssociation extends BaseAssociation {
     return Association.BelongsTo;
   }
 
-  getSequelizeOptions(model: typeof Model): UnionAssociationOptions {
+  getSequelizeOptions(model: ModelType<TCreationAttributes, TModelAttributes>): UnionAssociationOptions {
     const associatedClass = this.getAssociatedClass();
     const foreignKey = getForeignKeyOptions(associatedClass, model, this.options.foreignKey);
 

src/associations/belongs-to/belongs-to.ts

@@ -4,11 +4,11 @@ import {BelongsToAssociation} from './belongs-to-association';
 import {ModelClassGetter} from "../../model/shared/model-class-getter";
 import {addAssociation, getPreparedAssociationOptions} from "../shared/association-service";
 
-export function BelongsTo(associatedClassGetter: ModelClassGetter, foreignKey?: string): Function;
+export function BelongsTo<TCreationAttributes, TModelAttributes>(associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>, foreignKey?: string): Function;
 
-export function BelongsTo(associatedClassGetter: ModelClassGetter, options?: BelongsToOptions): Function;
+export function BelongsTo<TCreationAttributes, TModelAttributes>(associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>, options?: BelongsToOptions): Function;
 
-export function BelongsTo(associatedClassGetter: ModelClassGetter, optionsOrForeignKey?: string | BelongsToOptions): Function {
+export function BelongsTo<TCreationAttributes, TModelAttributes>(associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>, optionsOrForeignKey?: string | BelongsToOptions): Function {
 
   return (target: any, propertyName: string) => {
     const options: BelongsToOptions = getPreparedAssociationOptions(optionsOrForeignKey);

src/associations/foreign-key/foreign-key-meta.ts

@@ -1,7 +1,7 @@
 import {ModelClassGetter} from "../../model/shared/model-class-getter";
 
-export interface ForeignKeyMeta {
+export interface ForeignKeyMeta<TCreationAttributes, TModelAttributes> {
 
-  relatedClassGetter: ModelClassGetter;
+  relatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>;
   foreignKey: string;
 }

src/associations/foreign-key/foreign-key-service.ts

@@ -1,12 +1,13 @@
-import {ForeignKeyOptions, Model} from "sequelize";
+import {ForeignKeyOptions} from "sequelize";
 
 import {ForeignKeyMeta} from './foreign-key-meta';
 import {ModelClassGetter} from "../../model/shared/model-class-getter";
+import {ModelType} from "../../model/model/model";
 
 const FOREIGN_KEYS_KEY = 'sequelize:foreignKeys';
 
-export function getForeignKeyOptions(relatedClass: typeof Model,
-                                     classWithForeignKey?: typeof Model,
+export function getForeignKeyOptions<TCreationAttributes, TModelAttributes>(relatedClass: ModelType<TCreationAttributes, TModelAttributes>,
+                                     classWithForeignKey?: ModelType<TCreationAttributes, TModelAttributes>,
                                      foreignKey?: string | ForeignKeyOptions): ForeignKeyOptions {
   let foreignKeyOptions: ForeignKeyOptions = {};
 
@@ -36,8 +37,8 @@ export function getForeignKeyOptions(relatedClass: typeof Model,
 /**
  * Adds foreign key meta data for specified class
  */
-export function addForeignKey(target: any,
-                              relatedClassGetter: ModelClassGetter,
+export function addForeignKey<TCreationAttributes, TModelAttributes>(target: any,
+                              relatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>,
                               foreignKey: string): void {
   let foreignKeys = getForeignKeys(target);
   if (!foreignKeys) {
@@ -53,7 +54,7 @@ export function addForeignKey(target: any,
 /**
  * Returns foreign key meta data from specified class
  */
-export function getForeignKeys(target: any): ForeignKeyMeta[] | undefined {
+export function getForeignKeys<TCreationAttributes, TModelAttributes>(target: any): ForeignKeyMeta<TCreationAttributes, TModelAttributes>[] | undefined {
   const foreignKeys = Reflect.getMetadata(FOREIGN_KEYS_KEY, target);
   if (foreignKeys) {
     return [...foreignKeys];

src/associations/foreign-key/foreign-key.ts

@@ -1,7 +1,7 @@
 import {addForeignKey} from "./foreign-key-service";
 import {ModelClassGetter} from "../../model/shared/model-class-getter";
 
-export function ForeignKey(relatedClassGetter: ModelClassGetter): Function {
+export function ForeignKey<TCreationAttributes, TModelAttributes>(relatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>): Function {
   return (target: any, propertyName: string) => {
     addForeignKey(target, relatedClassGetter, propertyName);
   };

src/associations/has/has-association.ts

@@ -1,14 +1,15 @@
-import {HasManyOptions, HasOneOptions, Model} from 'sequelize';
+import {HasManyOptions, HasOneOptions} from 'sequelize';
 
 import {BaseAssociation} from '../shared/base-association';
 import {getForeignKeyOptions} from "../foreign-key/foreign-key-service";
 import {ModelClassGetter} from "../../model/shared/model-class-getter";
 import {Association} from "../shared/association";
 import {UnionAssociationOptions} from "../shared/union-association-options";
+import {ModelType} from '../../model/model/model';
 
-export class HasAssociation extends BaseAssociation {
+export class HasAssociation<TCreationAttributes, TModelAttributes> extends BaseAssociation<TCreationAttributes, TModelAttributes> {
 
-  constructor(associatedClassGetter: ModelClassGetter,
+  constructor(associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>,
               protected options: HasManyOptions | HasOneOptions,
               private association: Association) {
     super(associatedClassGetter, options);
@@ -18,7 +19,7 @@ export class HasAssociation extends BaseAssociation {
     return this.association;
   }
 
-  getSequelizeOptions(model: typeof Model): UnionAssociationOptions {
+  getSequelizeOptions(model: ModelType<TCreationAttributes, TModelAttributes>): UnionAssociationOptions {
     const options = {...this.options};
     const associatedClass = this.getAssociatedClass();
 

src/associations/has/has-many.ts

@@ -5,11 +5,11 @@ import {ModelClassGetter} from "../../model/shared/model-class-getter";
 import {addAssociation, getPreparedAssociationOptions} from "../shared/association-service";
 import {Association} from "../shared/association";
 
-export function HasMany(associatedClassGetter: ModelClassGetter, foreignKey?: string): Function;
+export function HasMany<TCreationAttributes, TModelAttributes>(associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>, foreignKey?: string): Function;
 
-export function HasMany(associatedClassGetter: ModelClassGetter, options?: HasManyOptions): Function;
+export function HasMany<TCreationAttributes, TModelAttributes>(associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>, options?: HasManyOptions): Function;
 
-export function HasMany(associatedClassGetter: ModelClassGetter, optionsOrForeignKey?: string | HasManyOptions): Function {
+export function HasMany<TCreationAttributes, TModelAttributes>(associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>, optionsOrForeignKey?: string | HasManyOptions): Function {
 
   return (target: any, propertyName: string) => {
     const options: HasManyOptions = getPreparedAssociationOptions(optionsOrForeignKey);

src/associations/has/has-one.ts

@@ -5,11 +5,11 @@ import {ModelClassGetter} from "../../model/shared/model-class-getter";
 import {addAssociation, getPreparedAssociationOptions} from "../shared/association-service";
 import {Association} from "../shared/association";
 
-export function HasOne(associatedClassGetter: ModelClassGetter, foreignKey?: string): Function;
+export function HasOne<TCreationAttributes, TModelAttributes>(associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>, foreignKey?: string): Function;
 
-export function HasOne(associatedClassGetter: ModelClassGetter, options?: HasOneOptions): Function;
+export function HasOne<TCreationAttributes, TModelAttributes>(associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>, options?: HasOneOptions): Function;
 
-export function HasOne(associatedClassGetter: ModelClassGetter, optionsOrForeignKey?: string | HasOneOptions): Function {
+export function HasOne<TCreationAttributes, TModelAttributes>(associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>, optionsOrForeignKey?: string | HasOneOptions): Function {
 
   return (target: any, propertyName: string) => {
     const options: HasOneOptions = getPreparedAssociationOptions(optionsOrForeignKey);

src/associations/shared/association-service.ts

@@ -27,8 +27,8 @@ export function getPreparedAssociationOptions(optionsOrForeignKey?: string | Non
 /**
  * Stores association meta data for specified class
  */
-export function addAssociation(target: any,
-                               association: BaseAssociation) {
+export function addAssociation<TCreationAttributes, TModelAttributes>(target: any,
+                               association: BaseAssociation<TCreationAttributes, TModelAttributes>) {
 
   let associations = getAssociations(target);
 
@@ -42,20 +42,20 @@ export function addAssociation(target: any,
 /**
  * Returns association meta data from specified class
  */
-export function getAssociations(target: any): BaseAssociation[] | undefined {
+export function getAssociations<TCreationAttributes, TModelAttributes>(target: any): BaseAssociation<TCreationAttributes, TModelAttributes>[] | undefined {
   const associations = Reflect.getMetadata(ASSOCIATIONS_KEY, target);
   if (associations) {
     return [...associations];
   }
 }
 
-export function setAssociations(target: any, associations: BaseAssociation[]) {
+export function setAssociations<TCreationAttributes, TModelAttributes>(target: any, associations: BaseAssociation<TCreationAttributes, TModelAttributes>[]) {
   Reflect.defineMetadata(ASSOCIATIONS_KEY, associations, target);
 }
 
-export function getAssociationsByRelation(target: any,
-                                          relatedClass: any): BaseAssociation[] {
-  const associations = getAssociations(target);
+export function getAssociationsByRelation<TCreationAttributes, TModelAttributes>(target: any,
+                                          relatedClass: any): BaseAssociation<TCreationAttributes, TModelAttributes>[] {
+  const associations = getAssociations<TCreationAttributes, TModelAttributes>(target);
   return (associations || []).filter(association => {
     const _relatedClass = association.getAssociatedClass();
     return (

src/associations/shared/base-association.ts

@@ -1,20 +1,20 @@
 import {UnionAssociationOptions} from './union-association-options';
 import {Association} from './association';
 import {ModelClassGetter} from "../../model/shared/model-class-getter";
-import {Model} from "../../model/model/model";
+import {ModelType} from "../../model/model/model";
 import {Sequelize} from "../../sequelize/sequelize/sequelize";
 
-export abstract class BaseAssociation {
+export abstract class BaseAssociation<TCreationAttributes, TModelAttributes> {
 
-  constructor(private associatedClassGetter: ModelClassGetter,
+  constructor(private associatedClassGetter: ModelClassGetter<TCreationAttributes, TModelAttributes>,
               protected options: UnionAssociationOptions) {
   }
 
   abstract getAssociation(): Association;
-  abstract getSequelizeOptions(model: typeof Model,
+  abstract getSequelizeOptions(model: ModelType<TCreationAttributes, TModelAttributes>,
                                sequelize: Sequelize): UnionAssociationOptions;
 
-  getAssociatedClass(): typeof Model {
+  getAssociatedClass(): ModelType<TCreationAttributes, TModelAttributes> {
     return this.associatedClassGetter();
   }
 

src/associations/through/through-options.ts

@@ -1,8 +1,8 @@
 import {ThroughOptions as OriginThroughOptions} from 'sequelize';
 import {ModelClassGetter} from "../../model/shared/model-class-getter";
 
-export type ThroughOptions = {
+export type ThroughOptions<TCreationAttributes, TModelAttributes> = {
   [K in keyof OriginThroughOptions]: K extends 'model'
-    ? ModelClassGetter | string
+    ? ModelClassGetter<TCreationAttributes, TModelAttributes> | string
     : OriginThroughOptions[K]
 };

src/model/model/model.ts

@@ -8,8 +8,8 @@ import {AssociationCountOptions} from "./association/association-count-options";
 import {AssociationActionOptions} from "./association/association-action-options";
 import {AssociationCreateOptions} from "./association/association-create-options";
 
-export type ModelType = typeof Model;
-export type ModelCtor<M extends Model = Model> = (new () => M) & ModelType;
+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 $GetType<T> = NonNullable<T> extends any[] ? NonNullable<T> : (NonNullable<T> | null);
 

src/model/shared/model-class-getter.ts

@@ -1,3 +1,3 @@
-import {Model} from "../model/model";
+import {ModelType} from "../model/model";
 
-export type ModelClassGetter = (returns?: void) => typeof Model;
+export type ModelClassGetter<TCreationAttributes, TModelAttributes> = (returns?: void) => ModelType<TCreationAttributes, TModelAttributes>;

src/scopes/default-scope.ts

@@ -11,12 +11,12 @@ export function DefaultScope(scopeGetter: DefaultScopeGetter): Function;
  * Decorator for defining default Model scope
  * @deprecated
  */
-export function DefaultScope(scope: ScopeFindOptions): Function;
+export function DefaultScope<TCreationAttributes, TModelAttributes>(scope: ScopeFindOptions<TCreationAttributes, TModelAttributes>): Function;
 
 /**
  * Decorator for defining default Model scope
  */
-export function DefaultScope(scopeOrSsopeGetter: ScopeFindOptions | DefaultScopeGetter): Function {
+export function DefaultScope<TCreationAttributes, TModelAttributes>(scopeOrSsopeGetter: ScopeFindOptions<TCreationAttributes, TModelAttributes> | DefaultScopeGetter): Function {
   return (target: any) => {
     if (typeof scopeOrSsopeGetter === 'function') {
       addScopeOptionsGetter(target.prototype, {getDefaultScope: scopeOrSsopeGetter});