Refactor UnpackedIntersection type & some tests related to populate FN

Automattic · Mar 27, 2022 · f286273 · f286273
1 parent 4315ff5
commit f286273
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/test/types/populate.test.ts b/test/types/populate.test.ts
@@ -170,12 +170,14 @@ function gh11503() {
   const User = model<User>('friends', userSchema);
 
   User.findOne({}).populate('friends').then(user => {
-    expectType<Types.ObjectId | undefined>(user?.friends[0]);
+    if (!user) return;
+    expectType<Types.ObjectId>(user?.friends[0]);
     expectError(user?.friends[0].blocked);
     expectError(user?.friends.map(friend => friend.blocked));
   });
 
-  User.findOne({}).populate<{friends: Friend[]}>('friends').then(user => {
+  User.findOne({}).populate<{ friends: Friend[] }>('friends').then(user => {
+    if (!user) return;
     expectAssignable<Friend>(user?.friends[0]);
     expectType<boolean>(user?.friends[0].blocked);
     const firstFriendBlockedValue = user?.friends.map(friend => friend)[0];
@@ -220,6 +222,9 @@ async function _11532() {
   const populateResult = await populateQuery;
   const leanResult = await populateQuery.lean();
 
+  if (!populateResult) return;
   expectType<string>(populateResult.child.name);
+
+  if (!leanResult) return;
   expectType<string>(leanResult.child.name);
 }
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -1469,7 +1469,7 @@ declare module 'mongoose' {
 
   type QueryWithHelpers<ResultType, DocType, THelpers = {}, RawDocType = DocType> = Query<ResultType, DocType, THelpers, RawDocType> & THelpers;
 
-  type UnpackedIntersection<T, U> = T extends (infer A)[]
+  type UnpackedIntersection<T, U> = T extends null ? null : T extends (infer A)[]
     ? (Omit<A, keyof U> & U)[]
     : keyof U extends never
     ? T