closes #61 (fixes type declarations for attributes options)

Author: RobinBuschmann

lib/interfaces/IBaseIncludeOptions.ts

@@ -0,0 +1,36 @@
+import {WhereOptions, IncludeThroughOptions, FindOptionsAttributesArray} from 'sequelize';
+
+/**
+ * Complex include options
+ */
+export interface IBaseIncludeOptions {
+
+  /**
+   * The alias of the relation, in case the model you want to eagerly load is aliassed. For `hasOne` /
+   * `belongsTo`, this should be the singular name, and for `hasMany`, it should be the plural
+   */
+  as?: string;
+
+  /**
+   * Where clauses to apply to the child models. Note that this converts the eager load to an inner join,
+   * unless you explicitly set `required: false`
+   */
+  where?: WhereOptions;
+
+  /**
+   * A list of attributes to select from the child model
+   */
+  attributes?: FindOptionsAttributesArray | { include?: FindOptionsAttributesArray, exclude?: string[] };
+
+  /**
+   * If true, converts to an inner join, which means that the parent model will only be loaded if it has any
+   * matching children. True if `include.where` is set, false otherwise.
+   */
+  required?: boolean;
+
+  /**
+   * Through Options
+   */
+  through?: IncludeThroughOptions;
+
+}

lib/interfaces/IIncludeOptions.ts

@@ -1,50 +1,22 @@
-import {WhereOptions, IncludeThroughOptions} from 'sequelize';
 import {Model} from "../models/Model";
 import {IIncludeAssociation} from "./IIncludeAssociation";
+import {IBaseIncludeOptions} from "./IBaseIncludeOptions";
 
 /**
  * Complex include options
  */
-export interface IIncludeOptions {
+export interface IIncludeOptions extends IBaseIncludeOptions {
 
   /**
    * The model you want to eagerly load
    */
   model?: typeof Model;
 
-  /**
-   * The alias of the relation, in case the model you want to eagerly load is aliassed. For `hasOne` /
-   * `belongsTo`, this should be the singular name, and for `hasMany`, it should be the plural
-   */
-    as?: string;
-
   /**
    * The association you want to eagerly load. (This can be used instead of providing a model/as pair)
    */
   association?: IIncludeAssociation;
 
-  /**
-   * Where clauses to apply to the child models. Note that this converts the eager load to an inner join,
-   * unless you explicitly set `required: false`
-   */
-  where?: WhereOptions;
-
-  /**
-   * A list of attributes to select from the child model
-   */
-  attributes?: string[];
-
-  /**
-   * If true, converts to an inner join, which means that the parent model will only be loaded if it has any
-   * matching children. True if `include.where` is set, false otherwise.
-   */
-  required?: boolean;
-
-  /**
-   * Through Options
-   */
-  through?: IncludeThroughOptions;
-
   /**
    * Load further nested related models
    */

lib/interfaces/IScopeIncludeOptions.ts

@@ -1,50 +1,22 @@
-import {WhereOptions, IncludeThroughOptions} from 'sequelize';
 import {IScopeIncludeAssociation} from "./IScopeIncludeAssociation";
 import {ModelClassGetter} from "../types/ModelClassGetter";
+import {IBaseIncludeOptions} from "./IBaseIncludeOptions";
 
 /**
  * Complex include options
  */
-export interface IScopeIncludeOptions {
+export interface IScopeIncludeOptions extends IBaseIncludeOptions {
 
   /**
    * The model you want to eagerly load
    */
   model?: ModelClassGetter;
 
-  /**
-   * The alias of the relation, in case the model you want to eagerly load is aliassed. For `hasOne` /
-   * `belongsTo`, this should be the singular name, and for `hasMany`, it should be the plural
-   */
-    as?: string;
-
   /**
    * The association you want to eagerly load. (This can be used instead of providing a model/as pair)
    */
   association?: IScopeIncludeAssociation;
 
-  /**
-   * Where clauses to apply to the child models. Note that this converts the eager load to an inner join,
-   * unless you explicitly set `required: false`
-   */
-  where?: WhereOptions;
-
-  /**
-   * A list of attributes to select from the child model
-   */
-  attributes?: string[];
-
-  /**
-   * If true, converts to an inner join, which means that the parent model will only be loaded if it has any
-   * matching children. True if `include.where` is set, false otherwise.
-   */
-  required?: boolean;
-
-  /**
-   * Through Options
-   */
-  through?: IncludeThroughOptions;
-
   /**
    * Load further nested related models
    */