From 6a39cdaf0007fef9aadaa06eb4e0187c58dc0779 Mon Sep 17 00:00:00 2001 From: bailey Date: Fri, 26 Sep 2025 13:56:36 -0600 Subject: [PATCH 1/2] remove support for enableMultipleCollInfo --- addon/mongocrypt.cc | 5 +---- src/index.ts | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/addon/mongocrypt.cc b/addon/mongocrypt.cc index 4d33a10..5997a9d 100644 --- a/addon/mongocrypt.cc +++ b/addon/mongocrypt.cc @@ -585,10 +585,7 @@ MongoCrypt::MongoCrypt(const CallbackInfo& info) : ObjectWrap(info) { mongocrypt_setopt_retry_kms(mongo_crypt(), true); - if (options.Get("enableMultipleCollinfo").ToBoolean()) { - /** TODO(NODE-6793): remove this option and have it always set in the next major */ - mongocrypt_setopt_enable_multiple_collinfo(mongo_crypt()); - } + mongocrypt_setopt_enable_multiple_collinfo(mongo_crypt()); // Initialize after all options are set. if (!mongocrypt_init(mongo_crypt())) { diff --git a/src/index.ts b/src/index.ts index e8752da..f23dd19 100644 --- a/src/index.ts +++ b/src/index.ts @@ -69,12 +69,10 @@ type MongoCryptConstructorOptions = { bypassQueryAnalysis?: boolean; /** Configure the time to expire the DEK from the cache. */ keyExpirationMS?: number; - /** TODO(NODE-6793): remove this option and have it always set in the next major */ - enableMultipleCollinfo?: boolean; }; export interface MongoCryptConstructor { - new (options: MongoCryptConstructorOptions): MongoCrypt; + new(options: MongoCryptConstructorOptions): MongoCrypt; libmongocryptVersion: string; } @@ -137,6 +135,6 @@ export const MongoCrypt: MongoCryptConstructor = class MongoCrypt extends mc.Mon /** exported for testing only. */ interface MongoCryptContextCtor { - new (): MongoCryptContext; + new(): MongoCryptContext; } export const MongoCryptContextCtor: MongoCryptContextCtor = mc.MongoCryptContextCtor; From de537521cf5d92df7f8950f9202e2a6d81daac61 Mon Sep 17 00:00:00 2001 From: bailey Date: Mon, 29 Sep 2025 08:50:39 -0600 Subject: [PATCH 2/2] fix lint --- src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index f23dd19..eeb6288 100644 --- a/src/index.ts +++ b/src/index.ts @@ -72,7 +72,7 @@ type MongoCryptConstructorOptions = { }; export interface MongoCryptConstructor { - new(options: MongoCryptConstructorOptions): MongoCrypt; + new (options: MongoCryptConstructorOptions): MongoCrypt; libmongocryptVersion: string; } @@ -135,6 +135,6 @@ export const MongoCrypt: MongoCryptConstructor = class MongoCrypt extends mc.Mon /** exported for testing only. */ interface MongoCryptContextCtor { - new(): MongoCryptContext; + new (): MongoCryptContext; } export const MongoCryptContextCtor: MongoCryptContextCtor = mc.MongoCryptContextCtor;