🤖 Merge PR #69633 [mongoose-delete] Update SoftDeteleModel with missi…

…ng arguments from the mongoose.Model to work with model methods by @facularrauri

types/mongoose-delete/index.d.ts

@@ -16,8 +16,22 @@ declare namespace MongooseDelete {
         | "updateOne"
         | "updateMany"
         | "aggregate";
-    interface SoftDeleteModel<T extends Omit<mongoose.Document, "delete">, QueryHelpers = {}>
-        extends mongoose.Model<T, QueryHelpers>
+    interface SoftDeleteModel<
+        T extends Omit<mongoose.Document, "delete">,
+        QueryHelpers = {},
+        TInstanceMethods = {},
+        TVirtuals = {},
+        THydratedDocumentType = mongoose.HydratedDocument<T, TVirtuals & TInstanceMethods, QueryHelpers>,
+        TSchema = any,
+    > extends
+        mongoose.Model<
+            T,
+            QueryHelpers,
+            TInstanceMethods,
+            TVirtuals,
+            THydratedDocumentType,
+            TSchema
+        >
     {
         /** Count only deleted documents */
         countDocumentsDeleted: this["countDocuments"];

types/mongoose-delete/mongoose-delete-tests.ts

@@ -4,6 +4,17 @@ import MongooseDelete = require("mongoose-delete");
 interface PetDocument extends MongooseDelete.SoftDeleteDocument {
     name: string;
 }
+
+// Custom methods
+interface PetMethods {
+    checkName(name: string): boolean;
+}
+
+// Custom Static methods
+interface PetModel extends MongooseDelete.SoftDeleteModel<PetDocument, {}, PetMethods> {
+    getNames(): string[];
+}
+
 const PetSchema = new mongoose.Schema<PetDocument>({
     name: String,
 });
@@ -42,6 +53,8 @@ const Pet = mongoose.model<PetDocument, MongooseDelete.SoftDeleteModel<PetDocume
 
 const Pet2 = mongoose.model("Pet", PetSchema) as MongooseDelete.SoftDeleteModel<PetDocument>;
 
+const Pet3 = mongoose.model<PetDocument, PetModel>("Pet", PetSchema);
+
 const fluffy = new Pet({ name: "Fluffy" });
 
 fluffy.delete(() => {});
@@ -102,3 +115,6 @@ Pet.updateManyDeleted({ age: 10 }, { name: "Fluffy" });
 Pet.updateManyWithDeleted({ age: 10 }, { name: "Fluffy" });
 Pet.aggregateDeleted([{ $match: { age: 10 } }]);
 Pet.aggregateWithDeleted([{ $match: { age: 10 } }]);
+
+// $ExpectType string[]
+Pet3.getNames();