diff --git a/scripts/tsc-diagnostics-check.js b/scripts/tsc-diagnostics-check.js index f90e581afde..b00bcbb2438 100644 --- a/scripts/tsc-diagnostics-check.js +++ b/scripts/tsc-diagnostics-check.js @@ -3,7 +3,7 @@ const fs = require('fs'); const stdin = fs.readFileSync(0).toString('utf8'); -const maxInstantiations = isNaN(process.argv[2]) ? 110000 : parseInt(process.argv[2], 10); +const maxInstantiations = isNaN(process.argv[2]) ? 120000 : parseInt(process.argv[2], 10); console.log(stdin); diff --git a/test/types/document.test.ts b/test/types/document.test.ts index f5cdb52cf86..c9836501271 100644 --- a/test/types/document.test.ts +++ b/test/types/document.test.ts @@ -172,9 +172,7 @@ function gh11435() { const ItemSchema = new Schema({ name: String }); ItemSchema.pre('validate', function preValidate() { - if (!(this instanceof Query)) { - expectType>(this.$model('Item1')); - } + expectType>(this.$model('Item1')); }); } diff --git a/types/middlewares.d.ts b/types/middlewares.d.ts index 89c11a2f2a9..9288d6e3df5 100644 --- a/types/middlewares.d.ts +++ b/types/middlewares.d.ts @@ -1,8 +1,8 @@ declare module 'mongoose' { - type MongooseQueryAndDocumentMiddleware = 'updateOne' | 'deleteOne' | 'validate'; + type MongooseQueryAndDocumentMiddleware = 'updateOne' | 'deleteOne'; - type MongooseDistinctDocumentMiddleware = 'save' | 'init'; + type MongooseDistinctDocumentMiddleware = 'save' | 'init' | 'validate'; type MongooseDocumentMiddleware = MongooseDistinctDocumentMiddleware | MongooseQueryAndDocumentMiddleware; type MongooseDistinctQueryMiddleware = 'count' | 'estimatedDocumentCount' | 'countDocuments' | 'deleteMany' | 'distinct' | 'find' | 'findOne' | 'findOneAndDelete' | 'findOneAndRemove' | 'findOneAndReplace' | 'findOneAndUpdate' | 'replaceOne' | 'updateMany';