Skip to content

public / sequelize

Go to a project

不要怂，就是干，撸起袖子干！

Commit 65a9e1ea by Alexander Mochalin Committed by GitHub
Options

fix(types): add Association into OrderItem type (#12332)

1 parent 1b867291
Inline Side-by-side
Showing with 9 additions and 9 deletions
types/lib/model.d.ts
...@@ -451,7 +451,7 @@ export interface IncludeOptions extends Filterable, Projectable, Paranoid { ...@@ -451,7 +451,7 @@ export interface IncludeOptions extends Filterable, Projectable, Paranoid {
subQuery?: boolean; subQuery?: boolean;
} }
type OrderItemModel = typeof Model | { model: typeof Model; as: string } | string type OrderItemAssociation = Association | typeof Model | { model: typeof Model; as: string } | string
type OrderItemColumn = string | Col | Fn | Literal type OrderItemColumn = string | Col | Fn | Literal
export type OrderItem = export type OrderItem =
| string | string
...@@ -459,14 +459,14 @@ export type OrderItem = ...@@ -459,14 +459,14 @@ export type OrderItem =
| Col | Col
| Literal | Literal
| [OrderItemColumn, string] | [OrderItemColumn, string]
| [OrderItemModel, OrderItemColumn] | [OrderItemAssociation, OrderItemColumn]
| [OrderItemModel, OrderItemColumn, string] | [OrderItemAssociation, OrderItemColumn, string]
| [OrderItemModel, OrderItemModel, OrderItemColumn] | [OrderItemAssociation, OrderItemAssociation, OrderItemColumn]
| [OrderItemModel, OrderItemModel, OrderItemColumn, string] | [OrderItemAssociation, OrderItemAssociation, OrderItemColumn, string]
| [OrderItemModel, OrderItemModel, OrderItemModel, OrderItemColumn] | [OrderItemAssociation, OrderItemAssociation, OrderItemAssociation, OrderItemColumn]
| [OrderItemModel, OrderItemModel, OrderItemModel, OrderItemColumn, string] | [OrderItemAssociation, OrderItemAssociation, OrderItemAssociation, OrderItemColumn, string]
| [OrderItemModel, OrderItemModel, OrderItemModel, OrderItemModel, OrderItemColumn] | [OrderItemAssociation, OrderItemAssociation, OrderItemAssociation, OrderItemAssociation, OrderItemColumn]
| [OrderItemModel, OrderItemModel, OrderItemModel, OrderItemModel, OrderItemColumn, string] | [OrderItemAssociation, OrderItemAssociation, OrderItemAssociation, OrderItemAssociation, OrderItemColumn, string]
export type Order = string | Fn | Col | Literal | OrderItem[]; export type Order = string | Fn | Col | Literal | OrderItem[];
/** /**
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!