fixes and closes #150

Author: RobinBuschmann

lib/interfaces/ICountOptions.ts

@@ -0,0 +1,33 @@
+import {AnyWhereOptions, LoggingOptions, SearchPathOptions} from 'sequelize';
+import {IIncludeOptions} from './IIncludeOptions';
+import {Model} from '../models/Model';
+
+export interface ICountOptions extends LoggingOptions, SearchPathOptions {
+
+  /**
+   * A hash of search attributes.
+   */
+  where?: AnyWhereOptions | string[];
+
+  /**
+   * Include options. See `find` for details
+   */
+  include?: Array<typeof Model | IIncludeOptions>;
+
+  /**
+   * Apply COUNT(DISTINCT(col))
+   */
+  distinct?: boolean;
+
+  /**
+   * Used in conjustion with `group`
+   */
+  attributes?: Array<string | [string, string]>;
+
+  /**
+   * For creating complex counts. Will return multiple rows as needed.
+   *
+   * TODO: Check?
+   */
+  group?: Object;
+}

lib/models/Model.d.ts

@@ -8,13 +8,14 @@ import {
   AggregateOptions, InstanceIncrementDecrementOptions, DropOptions,
   InstanceUpdateOptions, InstanceDestroyOptions, InstanceRestoreOptions,
   SchemaOptions, GetTableNameOptions, AddScopeOptions, ScopeOptions,
-  WhereOptions, CountOptions, ValidationError, DefineAttributes
+  WhereOptions, ValidationError, DefineAttributes
 } from 'sequelize';
 import {IAssociationActionOptions} from "../interfaces/IAssociationActionOptions";
 import {IBuildOptions} from "../interfaces/IBuildOptions";
 import {ICreateOptions} from "../interfaces/ICreateOptions";
 import {IFindOrInitializeOptions} from "../interfaces/IFindOrInitializeOptions";
 import {IFindCreateFindOptions} from "../interfaces/IFindCreateFindOptions";
+import {ICountOptions} from '../interfaces/ICountOptions';
 
 /* tslint:disable:member-ordering */
 /* tslint:disable:array-type */
@@ -232,7 +233,7 @@ export declare class Model<T> extends Hooks {
    *
    * If you provide an `include` option, the number of matching associations will be counted instead.
    */
-  static count(options?: CountOptions): Promise<number>;
+  static count(options?: ICountOptions): Promise<number>;
 
   /**
    * Find all the rows matching your query, within a specified offset / limit, and get the total number of