Merge pull request #15750 from Automattic/vkarpov15/gh-15693

types: correct Model.schema type and fix unknown check for this param type in schema.methods

Author: vkarpov15

test/types/models.test.ts

@@ -1061,3 +1061,31 @@ async function gh16526() {
   const insertManyResult = await Tank.insertMany([{ name: 'test' }], { lean: true, rawResult: true });
   expectType<number>(insertManyResult.insertedCount);
 }
+
+async function gh15693() {
+  interface IUser {
+    name: string;
+  }
+
+  interface UserMethods {
+    printName(this: IUser): void;
+    getName(): string;
+  }
+
+  const schema = new Schema<IUser, Model<IUser>, UserMethods>({ name: { type: String, required: true } });
+  schema.method('printName', function printName(this: IUser) {
+    expectError(this.isModified('name'));
+    expectError(this.doesNotExist());
+    expectType<string>(this.name);
+    console.log(this.name);
+  });
+  schema.method('getName', function getName() {
+    expectType<boolean>(this.isModified('name'));
+    return this.name;
+  });
+  const User = model('user', schema);
+
+  const leanInst = await User.findOne({}).lean().orFail();
+  User.schema.methods.printName.apply(leanInst);
+
+}

types/models.d.ts

@@ -1016,7 +1016,7 @@ declare module 'mongoose' {
     recompileSchema(): void;
 
     /** Schema the model uses. */
-    schema: Schema<TRawDocType>;
+    schema: TSchema;
 
     /** Creates a `updateMany` query: updates all documents that match `filter` with `update`. */
     updateMany(

types/utility.d.ts

@@ -2,7 +2,7 @@ declare module 'mongoose' {
   type IfAny<IFTYPE, THENTYPE, ELSETYPE = IFTYPE> = 0 extends 1 & IFTYPE
     ? THENTYPE
     : ELSETYPE;
-  type IfUnknown<IFTYPE, THENTYPE> = unknown extends IFTYPE ? THENTYPE : IFTYPE;
+  type IsUnknown<T> = unknown extends T ? true : false;
 
   type IsNotNever<T> = [T] extends [never] ? false : true;
   type IsAny<T> = 0 extends 1 & T ? true : false;
@@ -155,7 +155,7 @@ declare module 'mongoose' {
    */
   type AddThisParameter<T, D> = {
     [K in keyof T]: T[K] extends (...args: infer A) => infer R
-      ? ThisParameter<T[K], unknown> extends unknown
+      ? IsUnknown<ThisParameter<T[K], unknown>> extends true
         ? (this: D, ...args: A) => R
         : T[K]
       : T[K];