From a6eb9c4e2e67dae0d2ed02f357463f79822dcfbf Mon Sep 17 00:00:00 2001
From: Valentin Agachi <github-com@agachi.name>
Date: Thu, 18 Nov 2021 09:28:47 +0100
Subject: [PATCH] fix: remove WithId from find filter type

---
 src/collection.ts                                     | 6 +++---
 test/types/community/collection/filterQuery.test-d.ts | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/collection.ts b/src/collection.ts
index 598af08d3b6..7aae0901c3a 100644
--- a/src/collection.ts
+++ b/src/collection.ts
@@ -730,9 +730,9 @@ export class Collection<TSchema extends Document = Document> {
    * @param filter - The filter predicate. If unspecified, then all documents in the collection will match the predicate
    */
   find(): FindCursor<WithId<TSchema>>;
-  find(filter: Filter<WithId<TSchema>>, options?: FindOptions): FindCursor<WithId<TSchema>>;
-  find<T>(filter: Filter<WithId<TSchema>>, options?: FindOptions): FindCursor<T>;
-  find(filter?: Filter<WithId<TSchema>>, options?: FindOptions): FindCursor<WithId<TSchema>> {
+  find(filter: Filter<TSchema>, options?: FindOptions): FindCursor<WithId<TSchema>>;
+  find<T>(filter: Filter<TSchema>, options?: FindOptions): FindCursor<T>;
+  find(filter?: Filter<TSchema>, options?: FindOptions): FindCursor<WithId<TSchema>> {
     if (arguments.length > 2) {
       throw new MongoInvalidArgumentError(
         'Method "collection.find()" accepts at most two arguments'
diff --git a/test/types/community/collection/filterQuery.test-d.ts b/test/types/community/collection/filterQuery.test-d.ts
index 95fd1035c43..f02b9967cf7 100644
--- a/test/types/community/collection/filterQuery.test-d.ts
+++ b/test/types/community/collection/filterQuery.test-d.ts
@@ -210,7 +210,7 @@ await collectionT.find({ $where: 'function() { return true }' }).toArray();
 await collectionT
   .find({
     $where: function () {
-      expectType<WithId<PetModel>>(this);
+      expectType<PetModel>(this);
       return this.name === 'MrMeow';
     }
   })