fix: remove unsupported use cases

Author: alenakhineika

packages/service-provider-core/src/writable.ts

@@ -24,6 +24,7 @@ import type {
   DbOptions,
   OrderedBulkOperation,
   UnorderedBulkOperation,
+  SearchIndexDescription,
 } from './all-transport-types';
 import type { ServiceProviderRunCommandCursor } from './cursors';
 
@@ -312,7 +313,7 @@ export default interface Writable {
    *
    * @param {String} database - The db name.
    * @param {String} collection - The collection name.
-   * @param {Object[]} indexSpecs the spec of the indexes to be created.
+   * @param {Object[]} descriptions the spec of the indexes to be created.
    * @param {Object} options - The command options.
    * @param {DbOptions} dbOptions - The database options
    * @return {Promise}
@@ -385,12 +386,7 @@ export default interface Writable {
   createSearchIndexes(
     database: string,
     collection: string,
-    // TODO(MONGOSH-1471): use SearchIndexDescription[] once available
-    specs: {
-      name: string;
-      type?: 'search' | 'vectorSearch';
-      definition: Document;
-    }[],
+    descriptions: SearchIndexDescription[],
     dbOptions?: DbOptions
   ): Promise<string[]>;
 

packages/shell-api/src/collection.spec.ts

@@ -2633,30 +2633,6 @@ describe('Collection', function () {
         serviceProvider.createSearchIndexes.resolves(['index_1']);
       });
 
-      context('without anything', function () {
-        it('calls serviceProvider.createIndexes', async function () {
-          await collection.createSearchIndex();
-
-          expect(serviceProvider.createSearchIndexes).to.have.been.calledWith(
-            'db1',
-            'coll1',
-            [{ name: 'default', definition: {} }]
-          );
-        });
-      });
-
-      context('with name', function () {
-        it('calls serviceProvider.createIndexes', async function () {
-          await collection.createSearchIndex('my-index');
-
-          expect(serviceProvider.createSearchIndexes).to.have.been.calledWith(
-            'db1',
-            'coll1',
-            [{ name: 'my-index', definition: {} }]
-          );
-        });
-      });
-
       context('with definition options', function () {
         it('calls serviceProvider.createIndexes', async function () {
           await collection.createSearchIndex({ mappings: { dynamic: true } });

packages/shell-api/src/collection.ts

@@ -2386,21 +2386,19 @@ export default class Collection extends ShellApiWithMongoClass {
   }
 
   async createSearchIndex(
-    name?: string,
-    definition?: SearchIndexDefinition
+    name: string,
+    definition: SearchIndexDefinition
   ): Promise<string>;
   async createSearchIndex(
-    name?: string,
-    type?: 'search' | 'vectorSearch',
-    definition?: SearchIndexDefinition
+    name: string,
+    type: 'search' | 'vectorSearch',
+    definition: SearchIndexDefinition
   ): Promise<string>;
   async createSearchIndex(
-    definition?: SearchIndexDefinition,
+    definition: SearchIndexDefinition,
     type?: 'search' | 'vectorSearch'
   ): Promise<string>;
-  async createSearchIndex(
-    description?: SearchIndexDescription
-  ): Promise<string>;
+  async createSearchIndex(description: SearchIndexDescription): Promise<string>;
   @serverVersions(['6.0.0', ServerVersions.latest])
   @returnsPromise
   @apiVersions([])
@@ -2409,62 +2407,55 @@ export default class Collection extends ShellApiWithMongoClass {
     typeOrOptions?: 'search' | 'vectorSearch' | SearchIndexDefinition,
     definition?: SearchIndexDefinition
   ): Promise<string> {
-    let indexName: string | undefined;
-    let indexType: string | undefined;
-
-    if (typeof typeOrOptions === 'object' && typeOrOptions !== null) {
-      definition = typeOrOptions;
-    } else {
-      indexType = typeOrOptions;
-    }
+    let indexDescription: SearchIndexDescription;
 
     if (
       typeof nameOrOptions === 'object' &&
       nameOrOptions !== null &&
       nameOrOptions.definition
     ) {
-      indexName = nameOrOptions.name;
-      indexType = nameOrOptions.type;
-      definition = nameOrOptions.definition;
-    } else if (typeof nameOrOptions === 'object' && nameOrOptions !== null) {
-      definition = nameOrOptions;
+      indexDescription = nameOrOptions as SearchIndexDescription;
     } else {
-      indexName = nameOrOptions;
+      let indexName: string | undefined;
+      let indexType: 'search' | 'vectorSearch' | undefined;
+
+      if (typeof typeOrOptions === 'object' && typeOrOptions !== null) {
+        definition = typeOrOptions;
+      } else {
+        indexType = typeOrOptions;
+      }
+
+      if (typeof nameOrOptions === 'object' && nameOrOptions !== null) {
+        definition = nameOrOptions;
+      } else {
+        indexName = nameOrOptions;
+      }
+
+      indexDescription = {
+        name: indexName ?? 'default',
+        // Omitting type when it is 'search' for compat with older servers
+        ...(indexType &&
+          indexType !== 'search' && {
+            type: indexType as 'search' | 'vectorSearch',
+          }),
+        definition: { ...definition },
+      };
     }
 
-    this._emitCollectionApiCall('createSearchIndex', {
-      indexName,
-      indexType,
-      definition,
-    });
+    this._emitCollectionApiCall('createSearchIndex', indexDescription);
     const results = await this._mongo._serviceProvider.createSearchIndexes(
       this._database._name,
       this._name,
-      [
-        {
-          name: indexName ?? 'default',
-          // Omitting type when it is 'search' for compat with older servers
-          ...(indexType &&
-            indexType !== 'search' && {
-              type: indexType as 'search' | 'vectorSearch',
-            }),
-          definition: { ...definition },
-        },
-      ]
+      [indexDescription]
     );
     return results[0];
   }
 
   @serverVersions(['6.0.0', ServerVersions.latest])
   @returnsPromise
   @apiVersions([])
-  // TODO(MONGOSH-1471): use SearchIndexDescription once available
   async createSearchIndexes(
-    specs: {
-      name: string;
-      type?: 'search' | 'vectorSearch';
-      definition: Document;
-    }[]
+    specs: SearchIndexDescription[]
   ): Promise<string[]> {
     this._emitCollectionApiCall('createSearchIndexes', { specs });
     return await this._mongo._serviceProvider.createSearchIndexes(