From 5e1ca2b9ef1971a6b08d9fb6d9277f20c61887f2 Mon Sep 17 00:00:00 2001
From: Thomas Puttkamer <tvp1981@gmx.de>
Date: Tue, 17 May 2016 05:39:07 +0200
Subject: [PATCH] fixing a Promise bug in  type definition (#9334)

* fixing a Promise bug in  type definition

* add Promise to Mongoose object
---
 mongoose/mongoose.d.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mongoose/mongoose.d.ts b/mongoose/mongoose.d.ts
index 00915d3473..a2aabc0128 100644
--- a/mongoose/mongoose.d.ts
+++ b/mongoose/mongoose.d.ts
@@ -40,6 +40,7 @@ declare module "mongoose" {
     mquery: any;
     version: string;
     connection: Connection;
+    Promise: any;
   }
 
   export interface Connection extends NodeJS.EventEmitter {
@@ -307,8 +308,8 @@ declare module "mongoose" {
     circle(area: Object): Query<T>;
     circle(path: string, area: Object): Query<T>;
     comment(val: any): Query<T>;
-    count(callback?: (err: any, count: number) => void): Query<T>;
-    count(criteria: Object, callback?: (err: any, count: number) => void): Query<T>;
+    count(callback?: (err: any, count: number) => void): Query<number>;
+    count(criteria: Object, callback?: (err: any, count: number) => void): Query<number>;
     distinct(callback?: (err: any, res: T) => void): Query<T>;
     distinct(field: string, callback?: (err: any, res: T) => void): Query<T>;
     distinct(criteria: Object, field: string, callback?: (err: any, res: T) => void): Query<T>;
@@ -481,7 +482,7 @@ declare module "mongoose" {
   export class Promise<T> {
     constructor(fn?: (err: any, result: T) => void);
 
-    then<U>(onFulFill: (result: T) => void, onReject?: (err: any) => void): Promise<U>;
+    then<U>(onFulFill: (result: T) => void | U | Promise<U>, onReject?: (err: any) => void | U | Promise<U>): Promise<U>;
     end(): void;
 
     fulfill(result: T): Promise<T>;