From 73156b5a960efcfa325ccb41a3663e59f8fd45b8 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 21 Jun 2022 22:07:40 -0400
Subject: [PATCH] Revert "fix(types): set middleware function param based on
 query function name for query post hooks"

This reverts commit 35f6be98392923daaf2df35b1719453943520a4b.
---
 test/types/middleware.test.ts |  3 ++-
 types/index.d.ts              |  5 -----
 types/query.d.ts              | 12 ++++++------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/test/types/middleware.test.ts b/test/types/middleware.test.ts
index d36ff0972d..46c44d390e 100644
--- a/test/types/middleware.test.ts
+++ b/test/types/middleware.test.ts
@@ -92,7 +92,8 @@ schema.pre<Model<ITest>>('insertMany', function(next, docs: Array<ITest>) {
   next();
 });
 
-schema.post<Query<ITest, ITest>>('findOneAndDelete', function(res: ITest, next) {
+schema.post<Query<ITest, ITest>>('findOneAndDelete', function(res, next) {
+  expectType<ITest>(res);
   next();
 });
 
diff --git a/types/index.d.ts b/types/index.d.ts
index 380e697260..ecb57befd9 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -244,11 +244,6 @@ declare module 'mongoose' {
     /** Defines a post hook for the model. */
     post<T = HydratedDocument<DocType, TInstanceMethods>>(method: MongooseDocumentMiddleware | MongooseDocumentMiddleware[] | RegExp, fn: PostMiddlewareFunction<T, T>): this;
     post<T = HydratedDocument<DocType, TInstanceMethods>>(method: MongooseDocumentMiddleware | MongooseDocumentMiddleware[] | RegExp, options: SchemaPostOptions, fn: PostMiddlewareFunction<T, T>): this;
-    post<T extends Query<any, any>>(method: 'findOneAndUpdate' | 'findOneAndRemove' | 'findOneAndDelete', fn: PostMiddlewareFunction<T, HydratedDocument<EnforcedDocType, TInstanceMethods> | ModifyResult<HydratedDocument<EnforcedDocType, TInstanceMethods>> | null> | EnforcedDocType | ModifyResult<EnforcedDocType | null> | null): this;
-    post<T extends Query<any, any>>(method: 'findOne', fn: PostMiddlewareFunction<T, HydratedDocument<EnforcedDocType, TInstanceMethods> | EnforcedDocType | null>): this;
-    post<T extends Query<any, any>>(method: 'find', fn: PostMiddlewareFunction<T, HydratedDocument<EnforcedDocType, TInstanceMethods>[] | EnforcedDocType[]>): this;
-    post<T extends Query<any, any>>(method: 'update' | 'updateOne' | 'updateMany', fn: PostMiddlewareFunction<T, UpdateWriteOpResult>): this;
-    post<T extends Query<any, any>>(method: 'remove' | 'deleteOne' | 'deleteMany', fn: PostMiddlewareFunction<T, mongodb.DeleteResult>): this;
     post<T extends Query<any, any>>(method: MongooseQueryMiddleware | MongooseQueryMiddleware[] | string | RegExp, fn: PostMiddlewareFunction<T, QueryResultType<T>>): this;
     post<T extends Query<any, any>>(method: MongooseQueryMiddleware | MongooseQueryMiddleware[] | string | RegExp, options: SchemaPostOptions, fn: PostMiddlewareFunction<T, QueryResultType<T>>): this;
     post<T extends Aggregate<any>>(method: 'aggregate' | RegExp, fn: PostMiddlewareFunction<T, Array<AggregateExtract<T>>>): this;
diff --git a/types/query.d.ts b/types/query.d.ts
index 3b61ce6d24..fbb7f50483 100644
--- a/types/query.d.ts
+++ b/types/query.d.ts
@@ -249,18 +249,18 @@ declare module 'mongoose' {
      * remove, except it deletes _every_ document that matches `filter` in the
      * collection, regardless of the value of `single`.
      */
-    deleteMany(filter?: FilterQuery<DocType>, options?: QueryOptions<DocType>, callback?: Callback): QueryWithHelpers<mongodb.DeleteResult, DocType, THelpers, RawDocType>;
-    deleteMany(filter: FilterQuery<DocType>, callback: Callback): QueryWithHelpers<mongodb.DeleteResult, DocType, THelpers, RawDocType>;
-    deleteMany(callback: Callback): QueryWithHelpers<mongodb.DeleteResult, DocType, THelpers, RawDocType>;
+    deleteMany(filter?: FilterQuery<DocType>, options?: QueryOptions<DocType>, callback?: Callback): QueryWithHelpers<any, DocType, THelpers, RawDocType>;
+    deleteMany(filter: FilterQuery<DocType>, callback: Callback): QueryWithHelpers<any, DocType, THelpers, RawDocType>;
+    deleteMany(callback: Callback): QueryWithHelpers<any, DocType, THelpers, RawDocType>;
 
     /**
      * Declare and/or execute this query as a `deleteOne()` operation. Works like
      * remove, except it deletes at most one document regardless of the `single`
      * option.
      */
-    deleteOne(filter?: FilterQuery<DocType>, options?: QueryOptions<DocType>, callback?: Callback): QueryWithHelpers<mongodb.DeleteResult, DocType, THelpers, RawDocType>;
-    deleteOne(filter: FilterQuery<DocType>, callback: Callback): QueryWithHelpers<mongodb.DeleteResult, DocType, THelpers, RawDocType>;
-    deleteOne(callback: Callback): QueryWithHelpers<mongodb.DeleteResult, DocType, THelpers, RawDocType>;
+    deleteOne(filter?: FilterQuery<DocType>, options?: QueryOptions<DocType>, callback?: Callback): QueryWithHelpers<any, DocType, THelpers, RawDocType>;
+    deleteOne(filter: FilterQuery<DocType>, callback: Callback): QueryWithHelpers<any, DocType, THelpers, RawDocType>;
+    deleteOne(callback: Callback): QueryWithHelpers<any, DocType, THelpers, RawDocType>;
 
     /** Creates a `distinct` query: returns the distinct values of the given `field` that match `filter`. */
     distinct<ReturnType = any>(field: string, filter?: FilterQuery<DocType>, callback?: Callback<number>): QueryWithHelpers<Array<ReturnType>, DocType, THelpers, RawDocType>;