From 68418d85bce146da3eff40f1adfaf0f1677e9212 Mon Sep 17 00:00:00 2001 From: Valeri Karpov Date: Wed, 9 Oct 2024 14:06:47 -0400 Subject: [PATCH 1/2] types: re-export DeleteResult and UpdateResult from MongoDB Node.js driver Fix #14946 --- test/types/models.test.ts | 6 +++--- types/models.d.ts | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/types/models.test.ts b/test/types/models.test.ts index a99f6ffa02..2575ad3133 100644 --- a/test/types/models.test.ts +++ b/test/types/models.test.ts @@ -14,8 +14,8 @@ import mongoose, { UpdateWriteOpResult, AggregateOptions, WithLevel1NestedPaths, - NestedPaths, - InferSchemaType + InferSchemaType, + DeleteResult } from 'mongoose'; import { expectAssignable, expectError, expectType } from 'tsd'; import { AutoTypedSchemaType, autoTypedSchema } from './schema.test'; @@ -514,7 +514,7 @@ function gh12100() { function modelRemoveOptions() { const cmodel = model('Test', new Schema()); - cmodel.deleteOne({}, {}); + const res: DeleteResult = await cmodel.deleteOne({}, {}); } async function gh12286() { diff --git a/types/models.d.ts b/types/models.d.ts index 0a5e6e3a58..36a09cbb1c 100644 --- a/types/models.d.ts +++ b/types/models.d.ts @@ -72,6 +72,8 @@ declare module 'mongoose' { }; type UpdateWriteOpResult = mongodb.UpdateResult; + export type UpdateResult = mongodb.UpdateResult; + export type DeleteResult = mongodb.DeleteResult; interface MapReduceOptions { map: Function | string; From 081d9ea8902d2c9ffa4b067c7802caf0a6fc5c23 Mon Sep 17 00:00:00 2001 From: Valeri Karpov Date: Sat, 12 Oct 2024 21:51:28 -0400 Subject: [PATCH 2/2] Update types/models.d.ts Co-authored-by: hasezoey --- types/models.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/types/models.d.ts b/types/models.d.ts index 36a09cbb1c..84fc412ba0 100644 --- a/types/models.d.ts +++ b/types/models.d.ts @@ -72,8 +72,8 @@ declare module 'mongoose' { }; type UpdateWriteOpResult = mongodb.UpdateResult; - export type UpdateResult = mongodb.UpdateResult; - export type DeleteResult = mongodb.DeleteResult; + type UpdateResult = mongodb.UpdateResult; + type DeleteResult = mongodb.DeleteResult; interface MapReduceOptions { map: Function | string;