From b88d2a4c5ffe05f53efcc7a7c5ada5a46eac8519 Mon Sep 17 00:00:00 2001 From: Sergey Zelenov Date: Tue, 28 Oct 2025 10:15:16 +0100 Subject: [PATCH 1/3] feat(NODE-7247): clarify #rewrapManyDataKey() parameter types --- package.json | 2 +- src/client-side-encryption/client_encryption.ts | 2 +- test/types/client-side-encryption.test-d.ts | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 55e3aecef9..70c152c27b 100644 --- a/package.json +++ b/package.json @@ -137,7 +137,7 @@ "check:eslint": "npm run build:dts && ESLINT_USE_FLAT_CONFIG=false eslint -v && ESLINT_USE_FLAT_CONFIG=false eslint --max-warnings=0 --ext '.js,.ts' src test", "check:tsd": "tsd --version && tsd", "check:dependencies": "mocha test/action/dependency.test.ts", - "check:dts": "node ./node_modules/typescript/bin/tsc --target es2015 --module node16 --noEmit mongodb.d.ts && tsd", + "check:dts": "node ./node_modules/typescript/bin/tsc --target es2023 --module commonjs --noEmit mongodb.d.ts && tsd", "check:search-indexes": "nyc mocha --config test/mocha_mongodb.js test/manual/search-index-management.prose.test.ts", "check:test": "mocha --config test/mocha_mongodb.js test/integration", "check:unit": "nyc mocha test/unit", diff --git a/src/client-side-encryption/client_encryption.ts b/src/client-side-encryption/client_encryption.ts index 2494a1941b..6303eba4ba 100644 --- a/src/client-side-encryption/client_encryption.ts +++ b/src/client-side-encryption/client_encryption.ts @@ -285,7 +285,7 @@ export class ClientEncryption { */ async rewrapManyDataKey( filter: Filter, - options: ClientEncryptionRewrapManyDataKeyProviderOptions + options?: ClientEncryptionRewrapManyDataKeyProviderOptions ): Promise<{ bulkWriteResult?: BulkWriteResult }> { let keyEncryptionKeyBson = undefined; if (options) { diff --git a/test/types/client-side-encryption.test-d.ts b/test/types/client-side-encryption.test-d.ts index 0845276b43..a858dc1fa7 100644 --- a/test/types/client-side-encryption.test-d.ts +++ b/test/types/client-side-encryption.test-d.ts @@ -4,6 +4,7 @@ import type { AutoEncryptionOptions, AWSEncryptionKeyOptions, AzureEncryptionKeyOptions, + BulkWriteResult, ClientEncryption, ClientEncryptionEncryptOptions, GCPEncryptionKeyOptions, @@ -157,3 +158,13 @@ expectAssignable({ } }); } + +{ + const clientEncryption: ClientEncryption = null as never; + expectType>( + clientEncryption.rewrapManyDataKey({}) + ); + expectType>( + clientEncryption.rewrapManyDataKey({}, { provider: 'aws' }) + ); +} From 2cea9907006f0999b48a25292322db1eaf3fd44b Mon Sep 17 00:00:00 2001 From: Sergey Zelenov Date: Wed, 29 Oct 2025 10:27:32 +0100 Subject: [PATCH 2/3] address PR feedback --- drivers-evergreen-tools | 2 +- test/types/client-side-encryption.test-d.ts | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers-evergreen-tools b/drivers-evergreen-tools index f8ab2a54f7..1dcbfe4054 160000 --- a/drivers-evergreen-tools +++ b/drivers-evergreen-tools @@ -1 +1 @@ -Subproject commit f8ab2a54f774cab1e92bcf222949181baf8b2f1c +Subproject commit 1dcbfe4054590022e93df4e059545eef95af2782 diff --git a/test/types/client-side-encryption.test-d.ts b/test/types/client-side-encryption.test-d.ts index a858dc1fa7..925af0c69c 100644 --- a/test/types/client-side-encryption.test-d.ts +++ b/test/types/client-side-encryption.test-d.ts @@ -4,7 +4,6 @@ import type { AutoEncryptionOptions, AWSEncryptionKeyOptions, AzureEncryptionKeyOptions, - BulkWriteResult, ClientEncryption, ClientEncryptionEncryptOptions, GCPEncryptionKeyOptions, @@ -159,12 +158,8 @@ expectAssignable({ }); } +declare const clientEncryption: ClientEncryption; { - const clientEncryption: ClientEncryption = null as never; - expectType>( - clientEncryption.rewrapManyDataKey({}) - ); - expectType>( - clientEncryption.rewrapManyDataKey({}, { provider: 'aws' }) - ); + await clientEncryption.rewrapManyDataKey({}); + await clientEncryption.rewrapManyDataKey({}, { provider: 'aws' }); } From d3aaf90cd562920d019e6e546dabd20ae8c84440 Mon Sep 17 00:00:00 2001 From: Sergey Zelenov Date: Wed, 29 Oct 2025 20:17:00 +0100 Subject: [PATCH 3/3] rollback unintentional evegreen-tools update --- drivers-evergreen-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers-evergreen-tools b/drivers-evergreen-tools index 1dcbfe4054..f8ab2a54f7 160000 --- a/drivers-evergreen-tools +++ b/drivers-evergreen-tools @@ -1 +1 @@ -Subproject commit 1dcbfe4054590022e93df4e059545eef95af2782 +Subproject commit f8ab2a54f774cab1e92bcf222949181baf8b2f1c