From 8070848da5f0259daf40bbd57b971fc7daa22486 Mon Sep 17 00:00:00 2001
From: Federico Caselli <CaselIT@users.noreply.github.com>
Date: Mon, 9 Apr 2018 22:25:43 +0200
Subject: [PATCH] Fixed generic type bug in Collection.find (#24857)

---
 types/mongodb/index.d.ts       | 4 ++--
 types/mongodb/mongodb-tests.ts | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 335d7e0187..8b5a637ebd 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -509,9 +509,9 @@ export interface Collection<TSchema = Default> {
     dropIndexes(callback?: MongoCallback<any>): void;
     dropIndexes(options: {session?: ClientSession, maxTimeMS?: number}, callback: MongoCallback<any>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#find */
-    find<T = TSchema>(query?: FilterQuery<T>): Cursor<T>;
+    find<T = TSchema>(query?: FilterQuery<TSchema>): Cursor<T>;
     /** @deprecated */
-    find<T = TSchema>(query: FilterQuery<T>, options?: FindOneOptions): Cursor<T>;
+    find<T = TSchema>(query: FilterQuery<TSchema>, options?: FindOneOptions): Cursor<T>;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOne */
     findOne<T = TSchema>(filter: FilterQuery<TSchema>, callback: MongoCallback<T | null>): void;
     findOne<T = TSchema>(filter: FilterQuery<TSchema>, options?: FindOneOptions): Promise<T | null>;
diff --git a/types/mongodb/mongodb-tests.ts b/types/mongodb/mongodb-tests.ts
index 434f71dc91..270379989a 100644
--- a/types/mongodb/mongodb-tests.ts
+++ b/types/mongodb/mongodb-tests.ts
@@ -113,5 +113,7 @@ MongoClient.connect('mongodb://127.0.0.1:27017/test', options, function (err: mo
                 $and: [{ $gt: 0, $lt: 100 }]
             }
         });
+
+        const res: mongodb.Cursor<TestCollection> = testCollection.find({ _id: 123 });
     }
 })