Merge pull request #15825 from Mishra-coder/fix-issue-15798

fix(types): handle versionKey in ApplySchemaOptions

Author: vkarpov15

test/types/schema.test.ts

@@ -2086,3 +2086,11 @@ function gh15751() {
   const doc = new TestModel();
   expectType<Types.ObjectId>(doc.myId);
 }
+
+function gh15798() {
+  const schema1 = new Schema({ name: String }, { statics: { testMe() { } }, versionKey: false });
+  model("M1", schema1).testMe();
+
+  const schema2 = new Schema({ name: String }, { statics: { testMe() { } }, timestamps: true });
+  model("M2", schema2).testMe();
+}

types/inferschematype.d.ts

@@ -114,7 +114,7 @@ declare module 'mongoose' {
 
   type ResolveSchemaOptions<T> = MergeType<DefaultSchemaOptions, T>;
 
-  type ApplySchemaOptions<T, O = DefaultSchemaOptions> = ResolveTimestamps<T, O>;
+  type ApplySchemaOptions<T, O = DefaultSchemaOptions> = Default__v<ResolveTimestamps<T, O>, O>;
 
   type DefaultTimestampProps = {
     createdAt: NativeDate;