Merge branch 'master' into 7.5

Automattic · Aug 29, 2023 · a92e8e8 · a92e8e8
2 parents d9a4bc4 + 84e79b9
commit a92e8e8
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 11 deletions.
diff --git a/test/types/schema.test.ts b/test/types/schema.test.ts
@@ -1177,3 +1177,9 @@ function gh13702() {
   const schema = new Schema({ name: String });
   expectType<[IndexDefinition, IndexOptions][]>(schema.indexes());
 }
+
+function gh13780() {
+  const schema = new Schema({ num: Schema.Types.BigInt });
+  type InferredType = InferSchemaType<typeof schema>;
+  expectType<bigint | undefined>(null as unknown as InferredType['num']);
+}
diff --git a/types/inferschematype.d.ts b/types/inferschematype.d.ts
@@ -215,14 +215,16 @@ type ResolvePathType<PathValueType, Options extends SchemaTypeOptions<PathValueT
                                   PathValueType extends 'decimal128' | 'Decimal128' | typeof Schema.Types.Decimal128 ? Types.Decimal128 :
                                     IfEquals<PathValueType, Schema.Types.Decimal128> extends true ? Types.Decimal128 :
                                       IfEquals<PathValueType, Types.Decimal128> extends true ? Types.Decimal128 :
-                                        PathValueType extends 'uuid' | 'UUID' | typeof Schema.Types.UUID ? Buffer :
-                                          IfEquals<PathValueType, Schema.Types.UUID> extends true ? Buffer :
-                                            PathValueType extends MapConstructor ? Map<string, ResolvePathType<Options['of']>> :
-                                              IfEquals<PathValueType, typeof Schema.Types.Map> extends true ? Map<string, ResolvePathType<Options['of']>> :
-                                                PathValueType extends ArrayConstructor ? any[] :
-                                                  PathValueType extends typeof Schema.Types.Mixed ? any:
-                                                    IfEquals<PathValueType, ObjectConstructor> extends true ? any:
-                                                      IfEquals<PathValueType, {}> extends true ? any:
-                                                        PathValueType extends typeof SchemaType ? PathValueType['prototype'] :
-                                                          PathValueType extends Record<string, any> ? ObtainDocumentType<PathValueType, any, { typeKey: TypeKey }> :
-                                                            unknown;
+                                        IfEquals<PathValueType, Schema.Types.BigInt> extends true ? bigint :
+                                          PathValueType extends 'bigint' | 'BigInt' | typeof Schema.Types.BigInt ? bigint :
+                                            PathValueType extends 'uuid' | 'UUID' | typeof Schema.Types.UUID ? Buffer :
+                                              IfEquals<PathValueType, Schema.Types.UUID> extends true ? Buffer :
+                                                PathValueType extends MapConstructor ? Map<string, ResolvePathType<Options['of']>> :
+                                                  IfEquals<PathValueType, typeof Schema.Types.Map> extends true ? Map<string, ResolvePathType<Options['of']>> :
+                                                    PathValueType extends ArrayConstructor ? any[] :
+                                                      PathValueType extends typeof Schema.Types.Mixed ? any:
+                                                        IfEquals<PathValueType, ObjectConstructor> extends true ? any:
+                                                          IfEquals<PathValueType, {}> extends true ? any:
+                                                            PathValueType extends typeof SchemaType ? PathValueType['prototype'] :
+                                                              PathValueType extends Record<string, any> ? ObtainDocumentType<PathValueType, any, { typeKey: TypeKey }> :
+                                                                unknown;
diff --git a/types/pipelinestage.d.ts b/types/pipelinestage.d.ts
@@ -28,6 +28,7 @@ declare module 'mongoose' {
     | PipelineStage.ReplaceWith
     | PipelineStage.Sample
     | PipelineStage.Search
+    | PipelineStage.SearchMeta
     | PipelineStage.Set
     | PipelineStage.SetWindowFields
     | PipelineStage.Skip
@@ -239,6 +240,20 @@ declare module 'mongoose' {
       }
     }
 
+    export interface SearchMeta {
+      /** [`$searchMeta` reference](https://www.mongodb.com/docs/atlas/atlas-search/query-syntax/#mongodb-pipeline-pipe.-searchMeta) */
+      $searchMeta: {
+        index?: string;
+        highlight?: {
+          /** [`highlightPath` reference](https://docs.atlas.mongodb.com/atlas-search/path-construction/#multiple-field-search) */
+          path: string | string[] | { value: string, multi: string };
+          maxCharsToExamine?: number;
+          maxNumPassages?: number;
+        };
+        [operator: string]: any;
+      }
+    }
+
     export interface Set {
       /** [`$set` reference](https://www.mongodb.com/docs/manual/reference/operator/aggregation/set/) */
       $set: Record<string, AnyExpression | any>

diff --git a/types/schematypes.d.ts b/types/schematypes.d.ts
@@ -311,6 +311,14 @@ declare module 'mongoose' {
         enum(vals: string[] | number[]): this;
       }
 
+      class BigInt extends SchemaType {
+        /** This schema type's name, to defend against minifiers that mangle function names. */
+        static schemaName: 'BigInt';
+
+        /** Default options for this SchemaType */
+        defaultOptions: Record<string, any>;
+      }
+
       class Boolean extends SchemaType {
         /** This schema type's name, to defend against minifiers that mangle function names. */
         static schemaName: 'Boolean';