mongodb 6.5.0 → 6.6.0-dev.20240504.sha.2609953

package/src/collection.ts

@@ -24,7 +24,6 @@ import type {
 } from './mongo_types';
 import type { AggregateOptions } from './operations/aggregate';
 import { BulkWriteOperation } from './operations/bulk_write';
-import type { IndexInformationOptions } from './operations/common_functions';
 import { CountOperation, type CountOptions } from './operations/count';
 import { CountDocumentsOperation, type CountDocumentsOptions } from './operations/count_documents';
 import {
@@ -49,19 +48,17 @@ import {
   FindOneAndUpdateOperation,
   type FindOneAndUpdateOptions
 } from './operations/find_and_modify';
-import {
-  CreateIndexesOperation,
-  type CreateIndexesOptions,
-  CreateIndexOperation,
-  type DropIndexesOptions,
-  DropIndexOperation,
-  type IndexDescription,
-  IndexesOperation,
-  IndexExistsOperation,
-  IndexInformationOperation,
-  type IndexSpecification,
-  type ListIndexesOptions
+import type {
+  CreateIndexesOptions,
+  DropIndexesOptions,
+  IndexDescription,
+  IndexDescriptionCompact,
+  IndexDescriptionInfo,
+  IndexInformationOptions,
+  IndexSpecification,
+  ListIndexesOptions
 } from './operations/indexes';
+import { CreateIndexesOperation, DropIndexOperation } from './operations/indexes';
 import {
   InsertManyOperation,
   type InsertManyResult,
@@ -110,6 +107,8 @@ export interface CollectionOptions extends BSONSerializeOptions, WriteConcernOpt
   readConcern?: ReadConcernLike;
   /** The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST). */
   readPreference?: ReadPreferenceLike;
+  /** @internal TODO(NODE-5688): make this public */
+  timeoutMS?: number;
 }
 
 /** @internal */
@@ -267,7 +266,7 @@ export class Collection<TSchema extends Document = Document> {
     doc: OptionalUnlessRequiredId<TSchema>,
     options?: InsertOneOptions
   ): Promise<InsertOneResult<TSchema>> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new InsertOneOperation(
         this as TODO_NODE_3286,
@@ -289,7 +288,7 @@ export class Collection<TSchema extends Document = Document> {
     docs: OptionalUnlessRequiredId<TSchema>[],
     options?: BulkWriteOptions
   ): Promise<InsertManyResult<TSchema>> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new InsertManyOperation(
         this as TODO_NODE_3286,
@@ -326,7 +325,7 @@ export class Collection<TSchema extends Document = Document> {
       throw new MongoInvalidArgumentError('Argument "operations" must be an array of documents');
     }
 
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new BulkWriteOperation(
         this as TODO_NODE_3286,
@@ -352,7 +351,7 @@ export class Collection<TSchema extends Document = Document> {
     update: UpdateFilter<TSchema> | Document[],
     options?: UpdateOptions
   ): Promise<UpdateResult<TSchema>> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new UpdateOneOperation(
         this as TODO_NODE_3286,
@@ -375,7 +374,7 @@ export class Collection<TSchema extends Document = Document> {
     replacement: WithoutId<TSchema>,
     options?: ReplaceOptions
   ): Promise<UpdateResult<TSchema> | Document> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new ReplaceOneOperation(
         this as TODO_NODE_3286,
@@ -402,7 +401,7 @@ export class Collection<TSchema extends Document = Document> {
     update: UpdateFilter<TSchema> | Document[],
     options?: UpdateOptions
   ): Promise<UpdateResult<TSchema>> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new UpdateManyOperation(
         this as TODO_NODE_3286,
@@ -423,7 +422,7 @@ export class Collection<TSchema extends Document = Document> {
     filter: Filter<TSchema> = {},
     options: DeleteOptions = {}
   ): Promise<DeleteResult> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new DeleteOneOperation(this as TODO_NODE_3286, filter, resolveOptions(this, options))
     );
@@ -439,7 +438,7 @@ export class Collection<TSchema extends Document = Document> {
     filter: Filter<TSchema> = {},
     options: DeleteOptions = {}
   ): Promise<DeleteResult> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new DeleteManyOperation(this as TODO_NODE_3286, filter, resolveOptions(this, options))
     );
@@ -456,7 +455,7 @@ export class Collection<TSchema extends Document = Document> {
    */
   async rename(newName: string, options?: RenameOptions): Promise<Collection> {
     // Intentionally, we do not inherit options from parent for this operation.
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new RenameOperation(this as TODO_NODE_3286, newName, {
         ...options,
@@ -471,7 +470,7 @@ export class Collection<TSchema extends Document = Document> {
    * @param options - Optional settings for the command
    */
   async drop(options?: DropCollectionOptions): Promise<boolean> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new DropCollectionOperation(this.s.db, this.collectionName, options)
     );
@@ -525,7 +524,7 @@ export class Collection<TSchema extends Document = Document> {
    * @param options - Optional settings for the command
    */
   async options(options?: OperationOptions): Promise<Document> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new OptionsOperation(this as TODO_NODE_3286, resolveOptions(this, options))
     );
@@ -537,7 +536,7 @@ export class Collection<TSchema extends Document = Document> {
    * @param options - Optional settings for the command
    */
   async isCapped(options?: OperationOptions): Promise<boolean> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new IsCappedOperation(this as TODO_NODE_3286, resolveOptions(this, options))
     );
@@ -575,15 +574,17 @@ export class Collection<TSchema extends Document = Document> {
     indexSpec: IndexSpecification,
     options?: CreateIndexesOptions
   ): Promise<string> {
-    return executeOperation(
+    const indexes = await executeOperation(
       this.client,
-      new CreateIndexOperation(
-        this as TODO_NODE_3286,
+      CreateIndexesOperation.fromIndexSpecification(
+        this,
         this.collectionName,
         indexSpec,
         resolveOptions(this, options)
       )
     );
+
+    return indexes[0];
   }
 
   /**
@@ -621,10 +622,10 @@ export class Collection<TSchema extends Document = Document> {
     indexSpecs: IndexDescription[],
     options?: CreateIndexesOptions
   ): Promise<string[]> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
-      new CreateIndexesOperation(
-        this as TODO_NODE_3286,
+      CreateIndexesOperation.fromIndexDescriptionArray(
+        this,
         this.collectionName,
         indexSpecs,
         resolveOptions(this, { ...options, maxTimeMS: undefined })
@@ -639,7 +640,7 @@ export class Collection<TSchema extends Document = Document> {
    * @param options - Optional settings for the command
    */
   async dropIndex(indexName: string, options?: DropIndexesOptions): Promise<Document> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new DropIndexOperation(this as TODO_NODE_3286, indexName, {
         ...resolveOptions(this, options),
@@ -680,14 +681,14 @@ export class Collection<TSchema extends Document = Document> {
    * @param indexes - One or more index names to check.
    * @param options - Optional settings for the command
    */
-  async indexExists(
-    indexes: string | string[],
-    options?: IndexInformationOptions
-  ): Promise<boolean> {
-    return executeOperation(
-      this.client,
-      new IndexExistsOperation(this as TODO_NODE_3286, indexes, resolveOptions(this, options))
+  async indexExists(indexes: string | string[], options?: ListIndexesOptions): Promise<boolean> {
+    const indexNames: string[] = Array.isArray(indexes) ? indexes : [indexes];
+    const allIndexes: Set<string> = new Set(
+      await this.listIndexes(options)
+        .map(({ name }) => name)
+        .toArray()
     );
+    return indexNames.every(name => allIndexes.has(name));
   }
 
   /**
@@ -695,11 +696,23 @@ export class Collection<TSchema extends Document = Document> {
    *
    * @param options - Optional settings for the command
    */
-  async indexInformation(options?: IndexInformationOptions): Promise<Document> {
-    return executeOperation(
-      this.client,
-      new IndexInformationOperation(this.s.db, this.collectionName, resolveOptions(this, options))
-    );
+  indexInformation(
+    options: IndexInformationOptions & { full: true }
+  ): Promise<IndexDescriptionInfo[]>;
+  indexInformation(
+    options: IndexInformationOptions & { full?: false }
+  ): Promise<IndexDescriptionCompact>;
+  indexInformation(
+    options: IndexInformationOptions
+  ): Promise<IndexDescriptionCompact | IndexDescriptionInfo[]>;
+  indexInformation(): Promise<IndexDescriptionCompact>;
+  async indexInformation(
+    options?: IndexInformationOptions
+  ): Promise<IndexDescriptionCompact | IndexDescriptionInfo[]> {
+    return await this.indexes({
+      ...options,
+      full: options?.full ?? false
+    });
   }
 
   /**
@@ -716,7 +729,7 @@ export class Collection<TSchema extends Document = Document> {
    * @param options - Optional settings for the command
    */
   async estimatedDocumentCount(options?: EstimatedDocumentCountOptions): Promise<number> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new EstimatedDocumentCountOperation(this as TODO_NODE_3286, resolveOptions(this, options))
     );
@@ -751,7 +764,7 @@ export class Collection<TSchema extends Document = Document> {
     filter: Filter<TSchema> = {},
     options: CountDocumentsOptions = {}
   ): Promise<number> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new CountDocumentsOperation(this as TODO_NODE_3286, filter, resolveOptions(this, options))
     );
@@ -787,7 +800,7 @@ export class Collection<TSchema extends Document = Document> {
     filter: Filter<TSchema> = {},
     options: DistinctOptions = {}
   ): Promise<any[]> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new DistinctOperation(
         this as TODO_NODE_3286,
@@ -803,11 +816,26 @@ export class Collection<TSchema extends Document = Document> {
    *
    * @param options - Optional settings for the command
    */
-  async indexes(options?: IndexInformationOptions): Promise<Document[]> {
-    return executeOperation(
-      this.client,
-      new IndexesOperation(this as TODO_NODE_3286, resolveOptions(this, options))
+  indexes(options: IndexInformationOptions & { full?: true }): Promise<IndexDescriptionInfo[]>;
+  indexes(options: IndexInformationOptions & { full: false }): Promise<IndexDescriptionCompact>;
+  indexes(
+    options: IndexInformationOptions
+  ): Promise<IndexDescriptionCompact | IndexDescriptionInfo[]>;
+  indexes(options?: ListIndexesOptions): Promise<IndexDescriptionInfo[]>;
+  async indexes(
+    options?: IndexInformationOptions
+  ): Promise<IndexDescriptionCompact | IndexDescriptionInfo[]> {
+    const indexes: IndexDescriptionInfo[] = await this.listIndexes(options).toArray();
+    const full = options?.full ?? true;
+    if (full) {
+      return indexes;
+    }
+
+    const object: IndexDescriptionCompact = Object.fromEntries(
+      indexes.map(({ name, key }) => [name, Object.entries(key)])
     );
+
+    return object;
   }
 
   /**
@@ -833,7 +861,7 @@ export class Collection<TSchema extends Document = Document> {
     filter: Filter<TSchema>,
     options?: FindOneAndDeleteOptions
   ): Promise<WithId<TSchema> | ModifyResult<TSchema> | null> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new FindOneAndDeleteOperation(
         this as TODO_NODE_3286,
@@ -874,7 +902,7 @@ export class Collection<TSchema extends Document = Document> {
     replacement: WithoutId<TSchema>,
     options?: FindOneAndReplaceOptions
   ): Promise<WithId<TSchema> | ModifyResult<TSchema> | null> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new FindOneAndReplaceOperation(
         this as TODO_NODE_3286,
@@ -916,7 +944,7 @@ export class Collection<TSchema extends Document = Document> {
     update: UpdateFilter<TSchema>,
     options?: FindOneAndUpdateOptions
   ): Promise<WithId<TSchema> | ModifyResult<TSchema> | null> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new FindOneAndUpdateOperation(
         this as TODO_NODE_3286,
@@ -1039,7 +1067,7 @@ export class Collection<TSchema extends Document = Document> {
    * @param options - Optional settings for the command
    */
   async count(filter: Filter<TSchema> = {}, options: CountOptions = {}): Promise<number> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new CountOperation(this.fullNamespace, filter, resolveOptions(this, options))
     );
@@ -1068,6 +1096,7 @@ export class Collection<TSchema extends Document = Document> {
   ): ListSearchIndexesCursor {
     options =
       typeof indexNameOrOptions === 'object' ? indexNameOrOptions : options == null ? {} : options;
+
     const indexName =
       indexNameOrOptions == null
         ? null
@@ -1101,7 +1130,7 @@ export class Collection<TSchema extends Document = Document> {
    * @returns
    */
   async createSearchIndexes(descriptions: SearchIndexDescription[]): Promise<string[]> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new CreateSearchIndexesOperation(this as TODO_NODE_3286, descriptions)
     );
@@ -1115,7 +1144,7 @@ export class Collection<TSchema extends Document = Document> {
    * @remarks Only available when used against a 7.0+ Atlas cluster.
    */
   async dropSearchIndex(name: string): Promise<void> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new DropSearchIndexOperation(this as TODO_NODE_3286, name)
     );
@@ -1130,7 +1159,7 @@ export class Collection<TSchema extends Document = Document> {
    * @remarks Only available when used against a 7.0+ Atlas cluster.
    */
   async updateSearchIndex(name: string, definition: Document): Promise<void> {
-    return executeOperation(
+    return await executeOperation(
       this.client,
       new UpdateSearchIndexOperation(this as TODO_NODE_3286, name, definition)
     );

package/src/connection_string.ts

@@ -40,7 +40,8 @@ import {
   isRecord,
   matchesParentDomain,
   parseInteger,
-  setDifference
+  setDifference,
+  squashError
 } from './utils';
 import { type W, WriteConcern } from './write_concern';
 
@@ -72,9 +73,8 @@ export async function resolveSRVRecord(options: MongoOptions): Promise<HostAddre
   // the SRV record is resolved before starting a second DNS query.
   const lookupAddress = options.srvHost;
   const txtResolutionPromise = dns.promises.resolveTxt(lookupAddress);
-  txtResolutionPromise.catch(() => {
-    /* rejections will be handled later */
-  });
+  // eslint-disable-next-line github/no-then
+  txtResolutionPromise.then(undefined, squashError); // rejections will be handled later
 
   // Resolve the SRV record and use the result as the list of hosts to connect to.
   const addresses = await dns.promises.resolveSrv(
@@ -552,9 +552,11 @@ export function parseOptions(
 
   mongoOptions.metadata = makeClientMetadata(mongoOptions);
 
-  mongoOptions.extendedMetadata = addContainerMetadata(mongoOptions.metadata).catch(() => {
-    /* rejections will be handled later */
-  });
+  // eslint-disable-next-line github/no-then
+  mongoOptions.extendedMetadata = addContainerMetadata(mongoOptions.metadata).then(
+    undefined,
+    squashError
+  ); // rejections will be handled later
 
   return mongoOptions;
 }