fix(model.d): fix findAndCountAll.count type (#13736)

zorji · sdepold · web-flow · commit b7b472e7a0a5 · 2021-12-17T09:11:05.000+01:00
* fix(model.d): fix findAndCountAll.count type

`findAndCountAll` should only return `count` as an array when the `group` option is provided.

This means in that case, `options` is no longer optional because when `options` is not provided, it's never a group count.
I also rearrange `findAndCountAll` order to ensure the single count overload is applied first.

* refactor(model): add fix type for findAllAndCount

* refactor(model): tidy up type with SetRequired

Co-authored-by: Sascha Depold &lt;sdepold@users.noreply.github.com&gt;
diff --git a/types/lib/model.d.ts b/types/lib/model.d.ts
@@ -9,6 +9,7 @@ import { Sequelize, SyncOptions } from './sequelize';
 import { LOCK, Transaction } from './transaction';
 import { Col, Fn, Literal, Where } from './utils';
 import Op = require('./operators');
+import { SetRequired } from '../type-helpers/set-required'
 
 export interface Logging {
   /**
@@ -1955,12 +1956,12 @@ export abstract class Model<TModelAttributes extends {} = any, TCreationAttribut
    */
   public static findAndCountAll<M extends Model>(
     this: ModelStatic<M>,
-    options?: FindAndCountOptions<M['_attributes']> & { group: GroupOption }
-  ): Promise<{ rows: M[]; count: number[] }>;
+    options?: Omit<FindAndCountOptions<M['_attributes']>, 'group'>
+  ): Promise<{ rows: M[]; count: number }>;
   public static findAndCountAll<M extends Model>(
     this: ModelStatic<M>,
-    options?: FindAndCountOptions<M['_attributes']>
-  ): Promise<{ rows: M[]; count: number }>;
+    options: SetRequired<FindAndCountOptions<M['_attributes']>, 'group'>
+  ): Promise<{ rows: M[]; count: number[] }>;
 
   /**
    * Find the maximum value of field
