types: make PipelineStage generic to fix QueryFilter incompatibility

Author: JavaScriptBach

types/models.d.ts

@@ -303,8 +303,8 @@ declare module 'mongoose' {
     SessionStarter {
     new <DocType = Partial<TRawDocType>>(doc?: DocType, fields?: any | null, options?: AnyObject): THydratedDocumentType;
 
-    aggregate<R = any>(pipeline?: PipelineStage[], options?: AggregateOptions): Aggregate<Array<R>>;
-    aggregate<R = any>(pipeline: PipelineStage[]): Aggregate<Array<R>>;
+    aggregate<R = any>(pipeline?: PipelineStage<TRawDocType>[], options?: AggregateOptions): Aggregate<Array<R>>;
+    aggregate<R = any>(pipeline: PipelineStage<TRawDocType>[]): Aggregate<Array<R>>;
 
     /** Base Mongoose instance the model uses. */
     base: Mongoose;

types/pipelinestage.d.ts

@@ -2,7 +2,7 @@ declare module 'mongoose' {
   /**
      * [Stages reference](https://www.mongodb.com/docs/manual/reference/operator/aggregation-pipeline/#aggregation-pipeline-stages)
      */
-  export type PipelineStage =
+  export type PipelineStage<TSchema = any> =
     | PipelineStage.AddFields
     | PipelineStage.Bucket
     | PipelineStage.BucketAuto
@@ -19,7 +19,7 @@ declare module 'mongoose' {
     | PipelineStage.Limit
     | PipelineStage.ListSessions
     | PipelineStage.Lookup
-    | PipelineStage.Match
+    | PipelineStage.Match<TSchema>
     | PipelineStage.Merge
     | PipelineStage.Out
     | PipelineStage.PlanCacheStats
@@ -114,7 +114,7 @@ declare module 'mongoose' {
       $facet: Record<string, FacetPipelineStage[]>;
     }
 
-    export type FacetPipelineStage = Exclude<PipelineStage, PipelineStage.CollStats | PipelineStage.Facet | PipelineStage.GeoNear | PipelineStage.IndexStats | PipelineStage.Out | PipelineStage.Merge | PipelineStage.PlanCacheStats>;
+    export type FacetPipelineStage<TSchema=any> = Exclude<PipelineStage<TSchema>, PipelineStage.CollStats | PipelineStage.Facet | PipelineStage.GeoNear | PipelineStage.IndexStats | PipelineStage.Out | PipelineStage.Merge | PipelineStage.PlanCacheStats>;
 
     export interface GeoNear {
       /** [`$geoNear` reference](https://www.mongodb.com/docs/manual/reference/operator/aggregation/geoNear/) */
@@ -182,9 +182,9 @@ declare module 'mongoose' {
       }
     }
 
-    export interface Match {
+    export interface Match<TSchema = any> {
       /** [`$match` reference](https://www.mongodb.com/docs/manual/reference/operator/aggregation/match/) */
-      $match: QueryFilter<any>;
+      $match: QueryFilter<TSchema>;
     }
 
     export interface Merge {