Skip to content

updated model associations methods to reflect sequelize v6 model #888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theoludwig merged 2 commits into from
Jan 24, 2021
Merged

updated model associations methods to reflect sequelize v6 model #888

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b650cbc
updated model associations methods to reflect sequelize v6 model sign…
lukashroch Jan 20, 2021
995624a
Merge branch 'master' into model-methods-types-fix
theoludwig Jan 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/model/model/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ export abstract class Model<TModelAttributes extends {} = any, TCreationAttribut
/**
* Adds relation between specified instances and source instance
*/
$add<R extends Model<R>>(propertyKey: string, instances: R | R[] | string[] | string | number[] | number, options?: AssociationActionOptions): Promise<unknown> {
$add<R extends Model>(propertyKey: string, instances: R | R[] | string[] | string | number[] | number, options?: AssociationActionOptions): Promise<unknown> {
return this['add' + capitalize(propertyKey)](instances, options);
}

/**
* Sets relation between specified instances and source instance
* (replaces old relations)
*/
$set<R extends Model<R>>(propertyKey: keyof this, instances: R | R[] | string[] | string | number[] | number, options?: AssociationActionOptions): Promise<unknown> {
$set<R extends Model>(propertyKey: keyof this, instances: R | R[] | string[] | string | number[] | number, options?: AssociationActionOptions): Promise<unknown> {
return this['set' + capitalize(propertyKey as string)](instances, options);
}

Expand All @@ -65,28 +65,28 @@ export abstract class Model<TModelAttributes extends {} = any, TCreationAttribut
/**
* Counts related instances (specified by propertyKey) of source instance
*/
$count<R extends Model<R>>(propertyKey: string, options?: AssociationCountOptions): Promise<number> {
$count<R extends Model>(propertyKey: string, options?: AssociationCountOptions): Promise<number> {
return this['count' + capitalize(propertyKey)](options);
}

/**
* Creates instances and relate them to source instance
*/
$create<R extends Model<R>>(propertyKey: string, values: any, options?: AssociationCreateOptions): Promise<R> {
$create<R extends Model>(propertyKey: string, values: any, options?: AssociationCreateOptions): Promise<R> {
return this['create' + capitalize(propertyKey)](values, options);
}

/**
* Checks if specified instances is related to source instance
*/
$has<R extends Model<R>>(propertyKey: string, instances: R | R[] | string[] | string | number[] | number, options?: AssociationGetOptions): Promise<boolean> {
$has<R extends Model>(propertyKey: string, instances: R | R[] | string[] | string | number[] | number, options?: AssociationGetOptions): Promise<boolean> {
return this['has' + capitalize(propertyKey)](instances, options);
}

/**
* Removes specified instances from source instance
*/
$remove<R extends Model<R>>(propertyKey: string, instances: R | R[] | string[] | string | number[] | number, options?: any): Promise<any> {
$remove<R extends Model>(propertyKey: string, instances: R | R[] | string[] | string | number[] | number, options?: any): Promise<any> {
return this['remove' + capitalize(propertyKey)](instances, options);
}

Expand Down