Merge branch 'master' into vkarpov15/gh-15410

Author: vkarpov15

test/types/schema.test.ts

@@ -22,7 +22,8 @@ import {
   Query,
   model,
   ValidateOpts,
-  BufferToBinary
+  BufferToBinary,
+  CallbackWithoutResultAndOptionalError
 } from 'mongoose';
 import { Binary } from 'mongodb';
 import { IsPathRequired } from '../../types/inferschematype';
@@ -1778,6 +1779,22 @@ function gh15301() {
   });
 }
 
+function gh15412() {
+  const ScheduleEntrySchema = new Schema({
+    startDate: { type: Date, required: true },
+    endDate: { type: Date, required: false }
+  });
+  const ScheduleEntry = model('ScheduleEntry', ScheduleEntrySchema);
+
+  type ScheduleEntryDoc = ReturnType<typeof ScheduleEntry['hydrate']>
+
+  ScheduleEntrySchema.post('init', function(this: ScheduleEntryDoc, _res: any, next: CallbackWithoutResultAndOptionalError) {
+    expectType<Date>(this.startDate);
+    expectType<Date | null | undefined>(this.endDate);
+    next();
+  });
+}
+
 function defaultReturnsUndefined() {
   const schema = new Schema<{ arr: number[] }>({
     arr: {

types/index.d.ts

@@ -387,6 +387,8 @@ declare module 'mongoose' {
     post<T = THydratedDocumentType>(method: MongooseDistinctDocumentMiddleware|MongooseDistinctDocumentMiddleware[], fn: PostMiddlewareFunction<T, T>): this;
     post<T = THydratedDocumentType>(method: MongooseDistinctDocumentMiddleware|MongooseDistinctDocumentMiddleware[], options: SchemaPostOptions & SchemaPostOptions, fn: PostMiddlewareFunction<T, T>): this;
     post<T = THydratedDocumentType>(method: MongooseQueryOrDocumentMiddleware | MongooseQueryOrDocumentMiddleware[] | RegExp, options: SchemaPostOptions & { document: true, query: false }, fn: PostMiddlewareFunction<T, T>): this;
+    post<T = THydratedDocumentType>(method: 'init', fn: PostMiddlewareFunction<T, T>): this;
+
     // this = Query
     post<T = Query<any, any>>(method: MongooseRawResultQueryMiddleware|MongooseRawResultQueryMiddleware[], fn: PostMiddlewareFunction<T, null | QueryResultType<T> | ModifyResult<QueryResultType<T>>>): this;
     post<T = Query<any, any>>(method: MongooseDefaultQueryMiddleware|MongooseDefaultQueryMiddleware[], fn: PostMiddlewareFunction<T, QueryResultType<T>>): this;

types/types.d.ts

@@ -70,7 +70,7 @@ declare module 'mongoose' {
       create(obj: any): THydratedDocumentType;
 
       /** Searches array items for the first document with a matching _id. */
-      id(id: any): THydratedDocumentType | null;
+      id(id: ObjectId | string | number | Buffer): THydratedDocumentType | null;
 
       push(...args: (AnyKeys<T> & AnyObject)[]): number;