misc test fixes

Author: baileympearson

src/bulk/common.ts

@@ -12,7 +12,6 @@ import {
 } from '../error';
 import type { Filter, OneOrMore, OptionalId, UpdateFilter, WithoutId } from '../mongo_types';
 import type { CollationOptions, CommandOperationOptions } from '../operations/command';
-import { maybeAddIdToDocuments } from '../operations/common_functions';
 import { DeleteOperation, type DeleteStatement, makeDeleteStatement } from '../operations/delete';
 import { executeOperation } from '../operations/execute_operation';
 import { InsertOperation } from '../operations/insert';
@@ -21,6 +20,7 @@ import { makeUpdateStatement, UpdateOperation, type UpdateStatement } from '../o
 import type { Server } from '../sdam/server';
 import type { Topology } from '../sdam/topology';
 import type { ClientSession } from '../sessions';
+import { maybeAddIdToDocuments } from '../utils';
 import {
   applyRetryableWrites,
   type Callback,

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,16 @@ 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,
+  IndexDirection,
+  IndexInformationOptions,
+  IndexSpecification,
+  ListIndexesOptions
 } from './operations/indexes';
+import { CreateIndexesOperation, DropIndexOperation } from './operations/indexes';
 import {
   InsertManyOperation,
   type InsertManyResult,
@@ -575,15 +571,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];
   }
 
   /**
@@ -623,8 +621,8 @@ export class Collection<TSchema extends Document = Document> {
   ): Promise<string[]> {
     return executeOperation(
       this.client,
-      new CreateIndexesOperation(
-        this as TODO_NODE_3286,
+      CreateIndexesOperation.fromIndexDescriptionArray(
+        this,
         this.collectionName,
         indexSpecs,
         resolveOptions(this, { ...options, maxTimeMS: undefined })
@@ -684,10 +682,13 @@ export class Collection<TSchema extends Document = Document> {
     indexes: string | string[],
     options?: IndexInformationOptions
   ): Promise<boolean> {
-    return executeOperation(
-      this.client,
-      new IndexExistsOperation(this as TODO_NODE_3286, indexes, resolveOptions(this, options))
+    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));
   }
 
   /**
@@ -696,10 +697,7 @@ 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))
-    );
+    return this.indexes({ ...options, full: options?.full ?? false });
   }
 
   /**
@@ -804,10 +802,19 @@ 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))
-    );
+    const indexes = await this.listIndexes(options).toArray();
+    const full = options?.full ?? true;
+    if (full) {
+      return indexes;
+    }
+
+    const object: Record<
+      string,
+      Array<[name: string, direction: IndexDirection]>
+    > = Object.fromEntries(indexes.map(({ name, key }) => [name, Object.entries(key)]));
+
+    // @ts-expect-error TODO(NODE-6029): fix return type of `indexes()` and `indexInformation()`
+    return object;
   }
 
   /**

src/db.ts

@@ -11,7 +11,6 @@ import type { MongoClient, PkFactory } from './mongo_client';
 import type { TODO_NODE_3286 } from './mongo_types';
 import type { AggregateOptions } from './operations/aggregate';
 import { CollectionsOperation } from './operations/collections';
-import type { IndexInformationOptions } from './operations/common_functions';
 import {
   CreateCollectionOperation,
   type CreateCollectionOptions
@@ -24,9 +23,9 @@ import {
 } from './operations/drop';
 import { executeOperation } from './operations/execute_operation';
 import {
+  CreateIndexesOperation,
   type CreateIndexesOptions,
-  CreateIndexOperation,
-  IndexInformationOperation,
+  type IndexInformationOptions,
   type IndexSpecification
 } from './operations/indexes';
 import type { CollectionInfo, ListCollectionsOptions } from './operations/list_collections';
@@ -426,10 +425,11 @@ export class Db {
     indexSpec: IndexSpecification,
     options?: CreateIndexesOptions
   ): Promise<string> {
-    return executeOperation(
+    const indexes = await executeOperation(
       this.client,
-      new CreateIndexOperation(this, name, indexSpec, resolveOptions(this, options))
+      CreateIndexesOperation.fromIndexSpecification(this, name, indexSpec, options)
     );
+    return indexes[0];
   }
 
   /**
@@ -480,10 +480,7 @@ export class Db {
    * @param options - Optional settings for the command
    */
   async indexInformation(name: string, options?: IndexInformationOptions): Promise<Document> {
-    return executeOperation(
-      this.client,
-      new IndexInformationOperation(this, name, resolveOptions(this, options))
-    );
+    return this.collection(name).indexInformation(resolveOptions(this, options));
   }
 
   /**

src/index.ts

@@ -447,7 +447,6 @@ export type {
   CommandOperationOptions,
   OperationParent
 } from './operations/command';
-export type { IndexInformationOptions } from './operations/common_functions';
 export type { CountOptions } from './operations/count';
 export type { CountDocumentsOptions } from './operations/count_documents';
 export type {
@@ -466,6 +465,7 @@ export type {
   FindOneAndReplaceOptions,
   FindOneAndUpdateOptions
 } from './operations/find_and_modify';
+export type { IndexInformationOptions } from './operations/indexes';
 export type {
   CreateIndexesOptions,
   DropIndexesOptions,

src/operations/common_functions.ts

@@ -10,7 +10,7 @@ import type { PkFactory } from '../mongo_client';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
 import { CommandOperation, type CommandOperationOptions } from './command';
-import { CreateIndexOperation } from './indexes';
+import { CreateIndexesOperation } from './indexes';
 import { Aspect, defineAspects } from './operation';
 
 const ILLEGAL_COMMAND_FIELDS = new Set([
@@ -167,7 +167,12 @@ export class CreateCollectionOperation extends CommandOperation<Collection> {
 
     if (encryptedFields) {
       // Create the required index for queryable encryption support.
-      const createIndexOp = new CreateIndexOperation(db, name, { __safeContent__: 1 }, {});
+      const createIndexOp = CreateIndexesOperation.fromIndexSpecification(
+        db,
+        name,
+        { __safeContent__: 1 },
+        {}
+      );
       await createIndexOp.execute(server, session);
     }