From b8a4d43d975aed366d8d10a312c9a8dec8dce1b0 Mon Sep 17 00:00:00 2001
From: Carlos Ingles <hello@carlosingles.com>
Date: Fri, 18 Nov 2022 16:53:29 +1100
Subject: [PATCH 1/3] feat: move TVirtuals to check if EnforcedVirtuals were
 supplied

- enables virtual types on all model methods
---
 test/types/virtuals.test.ts | 8 ++++++++
 types/models.d.ts           | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/types/virtuals.test.ts b/test/types/virtuals.test.ts
index a5b07f54419..e2a59f989ea 100644
--- a/test/types/virtuals.test.ts
+++ b/test/types/virtuals.test.ts
@@ -118,5 +118,13 @@ function autoTypedVirtuals() {
   const doc = new TestModel();
   expectType<string>(doc.domain);
 
+  TestModel.findOne({}).then((doc) => {
+    if (doc) {
+      expectType<string>(doc.domain);
+      const json = doc.toJSON();
+      expectType<string>(json.domain);
+    }
+  });
+
   expectType<FlatRecord<AutoTypedSchemaType & VirtualsType >>({} as InferredDocType);
 }
diff --git a/types/models.d.ts b/types/models.d.ts
index de5dad33b91..e4894f72eda 100644
--- a/types/models.d.ts
+++ b/types/models.d.ts
@@ -124,13 +124,13 @@ declare module 'mongoose' {
   interface RemoveOptions extends SessionOption, Omit<mongodb.DeleteOptions, 'session'> {}
 
   const Model: Model<any>;
-  interface Model<T, TQueryHelpers = {}, TMethodsAndOverrides = {}, TVirtuals = {}, TSchema = any> extends
+  interface Model<T, TQueryHelpers = {}, TMethodsAndOverrides = {}, EnforcedVirtuals = {}, TSchema = any,
+    TVirtuals extends IfEquals<EnforcedVirtuals, {}, ObtainSchemaGeneric<TSchema, 'TVirtuals'>, EnforcedVirtuals> = IfEquals<EnforcedVirtuals, {}, ObtainSchemaGeneric<TSchema, 'TVirtuals'>, EnforcedVirtuals>> extends
     NodeJS.EventEmitter,
     AcceptsDiscriminator,
     IndexManager,
     SessionStarter {
-    new <DocType = T>(doc?: DocType, fields?: any | null, options?: boolean | AnyObject): HydratedDocument<T, TMethodsAndOverrides,
-    IfEquals<TVirtuals, {}, ObtainSchemaGeneric<TSchema, 'TVirtuals'>, TVirtuals>> & ObtainSchemaGeneric<TSchema, 'TStaticMethods'>;
+    new <DocType = T>(doc?: DocType, fields?: any | null, options?: boolean | AnyObject): HydratedDocument<T, TMethodsAndOverrides, TVirtuals> & ObtainSchemaGeneric<TSchema, 'TStaticMethods'>;
 
     aggregate<R = any>(pipeline?: PipelineStage[], options?: mongodb.AggregateOptions, callback?: Callback<R[]>): Aggregate<Array<R>>;
     aggregate<R = any>(pipeline: PipelineStage[], callback?: Callback<R[]>): Aggregate<Array<R>>;

From 8f17b8fb1fd8f88444ed1a72eb8cf857b746338d Mon Sep 17 00:00:00 2001
From: Carlos Ingles <hello@carlosingles.com>
Date: Fri, 18 Nov 2022 16:53:46 +1100
Subject: [PATCH 2/3] feat: add virtuals to InferSchemaType generic

---
 test/types/virtuals.test.ts | 5 +++++
 types/inferschematype.d.ts  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/types/virtuals.test.ts b/test/types/virtuals.test.ts
index e2a59f989ea..62f2083c8c5 100644
--- a/test/types/virtuals.test.ts
+++ b/test/types/virtuals.test.ts
@@ -126,5 +126,10 @@ function autoTypedVirtuals() {
     }
   });
 
+  type TestDoc = InferSchemaType<typeof testSchema>;
+
+  const testDoc = { email: 'some email' } as TestDoc;
+  expectType<string>(testDoc.domain);
+
   expectType<FlatRecord<AutoTypedSchemaType & VirtualsType >>({} as InferredDocType);
 }
diff --git a/types/inferschematype.d.ts b/types/inferschematype.d.ts
index e8c345fc707..9b7b98f6c54 100644
--- a/types/inferschematype.d.ts
+++ b/types/inferschematype.d.ts
@@ -38,7 +38,7 @@ declare module 'mongoose' {
    * // result
    * type UserType = {userName?: string}
    */
-  type InferSchemaType<TSchema> = IfAny<TSchema, any, ObtainSchemaGeneric<TSchema, 'DocType'>>;
+  type InferSchemaType<TSchema> = IfAny<TSchema, any, ObtainSchemaGeneric<TSchema, 'DocType'> & ObtainSchemaGeneric<TSchema, 'TVirtuals'>>;
 
   /**
    * @summary Obtains schema Generic type by using generic alias.

From a2df1182bf1c0dfd9c3b9a5c075887382f33bc03 Mon Sep 17 00:00:00 2001
From: Carlos Ingles <hello@carlosingles.com>
Date: Sat, 19 Nov 2022 07:04:24 +1100
Subject: [PATCH 3/3] fix(test): change test to check for lack of virtuals

- virtuals themselves do not have virtuals available
---
 test/types/virtuals.test.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/types/virtuals.test.ts b/test/types/virtuals.test.ts
index 62f2083c8c5..1465b31e31b 100644
--- a/test/types/virtuals.test.ts
+++ b/test/types/virtuals.test.ts
@@ -89,7 +89,7 @@ function gh11543() {
 
 function autoTypedVirtuals() {
   type AutoTypedSchemaType = InferSchemaType<typeof testSchema>;
-  type VirtualsType = { domain: string };
+  type SchemaWithoutVirtual = Omit<AutoTypedSchemaType, 'domain'>;
   type InferredDocType = FlatRecord<AutoTypedSchemaType & ObtainSchemaGeneric<typeof testSchema, 'TVirtuals'>>;
 
   const testSchema = new Schema({
@@ -101,11 +101,11 @@ function autoTypedVirtuals() {
     virtuals: {
       domain: {
         get() {
-          expectType<Document<any, any, { email: string }> & AutoTypedSchemaType>(this);
+          expectType<Document<any, any, { email: string }>>(this);
           return this.email.slice(this.email.indexOf('@') + 1);
         },
         set() {
-          expectType<Document<any, any, AutoTypedSchemaType> & AutoTypedSchemaType>(this);
+          expectType<Document<any, any, SchemaWithoutVirtual>>(this);
         },
         options: {}
       }
@@ -131,5 +131,5 @@ function autoTypedVirtuals() {
   const testDoc = { email: 'some email' } as TestDoc;
   expectType<string>(testDoc.domain);
 
-  expectType<FlatRecord<AutoTypedSchemaType & VirtualsType >>({} as InferredDocType);
+  expectType<FlatRecord<AutoTypedSchemaType>>({} as InferredDocType);
 }