Merge branch 'master' into Automatticgh-13151

lpizzinidev · Mar 10, 2023 · 44aa53f · 44aa53f
2 parents e7633de + c04e329
commit 44aa53f
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 4 deletions.
diff --git a/test/types/queries.test.ts b/test/types/queries.test.ts
@@ -11,7 +11,10 @@ import {
   FilterQuery,
   UpdateQuery,
   ApplyBasicQueryCasting,
-  QuerySelector
+  QuerySelector,
+  InferSchemaType,
+  ProjectionFields,
+  QueryOptions
 } from 'mongoose';
 import { ObjectId } from 'mongodb';
 import { expectError, expectType } from 'tsd';
@@ -433,3 +436,42 @@ async function gh11602(): Promise<void> {
     returnDocument: 'not-before-or-after'
   }));
 }
+
+async function gh13142() {
+  const BlogSchema = new Schema({ title: String });
+
+  type Blog = InferSchemaType<typeof BlogSchema>;
+
+  const BlogModel = model<Blog>('Blog', BlogSchema);
+  class BlogRepository {
+    private readonly blogModel: Model<Blog>;
+
+    constructor() {
+      this.blogModel = BlogModel;
+    }
+
+    findOne<
+      Projection extends ProjectionFields<Blog>,
+      Options extends QueryOptions<Blog>
+    >(
+      filter: FilterQuery<Blog>,
+      projection: Projection,
+      options: Options
+    ): Promise<
+        Options['lean'] extends true
+          ? Pick<Blog, Extract<keyof Projection, keyof Blog>> | null
+          : HydratedDocument<Pick<Blog, Extract<keyof Projection, keyof Blog>>> | null
+    > {
+      return this.blogModel.findOne(filter, projection, options);
+    }
+  }
+
+  const blogRepository = new BlogRepository();
+  const blog = await blogRepository.findOne(
+    { title: 'test' },
+    { content: 1 },
+    { lean: true }
+  );
+  if (!blog) return;
+  expectType<Pick<Blog, Extract<keyof { content: 1 }, keyof Blog>>>(blog);
+}
diff --git a/test/types/querycursor.test.ts b/test/types/querycursor.test.ts
@@ -13,3 +13,10 @@ Test.find().cursor().
     expectType<string | undefined>(doc.name);
   }).
   then(() => console.log('Done!'));
+
+Test.find().cursor().
+  eachAsync(async(doc: ITest, i) => {
+    expectType<Types.ObjectId>(doc._id);
+    expectType<number>(i);
+  }).
+  then(() => console.log('Done!'));
diff --git a/types/cursor.d.ts b/types/cursor.d.ts
@@ -38,8 +38,8 @@ declare module 'mongoose' {
      * will wait for the promise to resolve before iterating on to the next one.
      * Returns a promise that resolves when done.
      */
-    eachAsync(fn: (doc: DocType[]) => any, options: EachAsyncOptions & { batchSize: number }): Promise<void>;
-    eachAsync(fn: (doc: DocType) => any, options?: EachAsyncOptions): Promise<void>;
+    eachAsync(fn: (doc: DocType[], i: number) => any, options: EachAsyncOptions & { batchSize: number }): Promise<void>;
+    eachAsync(fn: (doc: DocType, i: number) => any, options?: EachAsyncOptions): Promise<void>;
 
     /**
      * Registers a transform function which subsequently maps documents retrieved

diff --git a/types/query.d.ts b/types/query.d.ts
@@ -109,7 +109,7 @@ declare module 'mongoose' {
     /**
      * If truthy, mongoose will return the document as a plain JavaScript object rather than a mongoose document.
      */
-    lean?: boolean | any;
+    lean?: boolean | Record<string, any>;
     limit?: number;
     maxTimeMS?: number;
     multi?: boolean;