From a8670a76cd2746e8353504c100050b474d844f36 Mon Sep 17 00:00:00 2001
From: Aditi Khare <106987683+aditi-khare-mongoDB@users.noreply.github.com>
Date: Thu, 21 Mar 2024 16:24:30 -0400
Subject: [PATCH] fix(NODE-3681): Typescript error in
 Collection.findOneAndModify UpdateFilter $currentDate (#4047)

---
 src/mongo_types.ts                                | 2 +-
 test/types/community/collection/updateX.test-d.ts | 7 +++++++
 test/types/helper_types.test-d.ts                 | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/mongo_types.ts b/src/mongo_types.ts
index 1924b2afe2..0f878041e0 100644
--- a/src/mongo_types.ts
+++ b/src/mongo_types.ts
@@ -219,7 +219,7 @@ export type NotAcceptedFields<TSchema, FieldType> = {
 /** @public */
 export type OnlyFieldsOfType<TSchema, FieldType = any, AssignableType = FieldType> = IsAny<
   TSchema[keyof TSchema],
-  Record<string, FieldType>,
+  AssignableType extends FieldType ? Record<string, FieldType> : Record<string, AssignableType>,
   AcceptedFields<TSchema, FieldType, AssignableType> &
     NotAcceptedFields<TSchema, FieldType> &
     Record<string, AssignableType>
diff --git a/test/types/community/collection/updateX.test-d.ts b/test/types/community/collection/updateX.test-d.ts
index 5ea59cd525..c2fb170b74 100644
--- a/test/types/community/collection/updateX.test-d.ts
+++ b/test/types/community/collection/updateX.test-d.ts
@@ -60,6 +60,13 @@ expectAssignable<UpdateFilter<Document>>({ $inc: { anyKeyWhatsoever: 2 } });
 // But this no longer asserts anything about what the original keys map to
 expectNotType<UpdateFilter<Document>>({ $inc: { numberField: '2' } });
 
+expectAssignable<UpdateFilter<Document>>({
+  $currentDate: { anyKeyWhatsoever: { $type: 'timestamp' } }
+});
+expectAssignable<UpdateFilter<Document>>({ $currentDate: { anyKeyWhatsoever: { $type: 'date' } } });
+expectAssignable<UpdateFilter<Document>>({ $currentDate: { anyKeyWhatsoever: true } });
+expectNotType<UpdateFilter<Document>>({ $currentDate: { anyKeyWhatsoever: 'true' } });
+expectNotType<UpdateFilter<Document>>({ $currentDate: { anyKeyWhatsoever: { key2: true } } });
 // collection.updateX tests
 const client = new MongoClient('');
 const db = client.db('test');
diff --git a/test/types/helper_types.test-d.ts b/test/types/helper_types.test-d.ts
index f5df10de56..ce8fbfce0f 100644
--- a/test/types/helper_types.test-d.ts
+++ b/test/types/helper_types.test-d.ts
@@ -69,6 +69,9 @@ expectAssignable<OnlyFieldsOfType<{ a: number; b: string }, number>>({ a: 2 });
 expectAssignable<OnlyFieldsOfType<{ a: number; b: string }, string>>({ b: 'hello' });
 expectAssignable<OnlyFieldsOfType<{ a: number; b: string }, string, boolean>>({ b: true });
 
+// test the case in which AssignableType does not inherit from FieldType, and AssignableType is provided
+expectAssignable<OnlyFieldsOfType<any, string, boolean>>({ b: false });
+
 // test generic schema, essentially we expect nearly no safety here
 expectAssignable<OnlyFieldsOfType<Document, NumericType | undefined>>({ someKey: 2 });
 // We can still at least enforce the type that the keys map to