Merge branch 'main' into gagik/report-individual-tests

Author: gagik

THIRD_PARTY_NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **mongosh**.
-This document was automatically generated on Thu Oct 17 2024.
+This document was automatically generated on Fri Oct 18 2024.
 
 ## List of dependencies
 

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

@@ -1165,26 +1165,27 @@ describe('Collection', function () {
       context(
         'when serviceProvider.dropIndexes rejects IndexNotFound',
         function () {
+          let expectedError: Error;
           beforeEach(function () {
-            const error = new Error('index not found with name [index_1]');
-            Object.assign(error, {
+            expectedError = new Error('index not found with name [index_1]');
+            Object.assign(expectedError, {
               ok: 0,
               errmsg: 'index not found with name [index_1]',
               code: 27,
               codeName: 'IndexNotFound',
-              name: 'MongoError',
+              name: 'MongoServerError',
             });
 
-            serviceProvider.runCommandWithCheck.rejects(error);
+            serviceProvider.runCommandWithCheck.rejects(expectedError);
           });
 
           it('returns the error as object', async function () {
-            expect(await collection.dropIndexes('index_1')).to.deep.equal({
-              ok: 0,
-              errmsg: 'index not found with name [index_1]',
-              code: 27,
-              codeName: 'IndexNotFound',
-            });
+            let caughtError: Error | undefined;
+            await collection
+              .dropIndexes('index_1')
+              .catch((err) => (caughtError = err));
+
+            expect(caughtError).to.deep.equal(expectedError);
           });
         }
       );

packages/shell-api/src/collection.ts

@@ -1335,15 +1335,6 @@ export default class Collection extends ShellApiWithMongoClass {
         return all.sort((a, b) => b.nIndexesWas - a.nIndexesWas)[0];
       }
 
-      if (error?.codeName === 'IndexNotFound') {
-        return {
-          ok: error.ok,
-          errmsg: error.errmsg,
-          code: error.code,
-          codeName: error.codeName,
-        };
-      }
-
       throw error;
     }
   }

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

@@ -400,6 +400,16 @@ describe('Database', function () {
         );
       });
 
+      it('supports a single aggregation stage', async function () {
+        await database.aggregate({ $piplelineStage: {} }, { options: true });
+
+        expect(serviceProvider.aggregateDb).to.have.been.calledWith(
+          database._name,
+          [{ $piplelineStage: {} }],
+          { options: true }
+        );
+      });
+
       it('calls serviceProvider.aggregateDb with explicit batchSize', async function () {
         await database.aggregate([{ $piplelineStage: {} }], {
           options: true,

packages/shell-api/src/database.ts

@@ -423,15 +423,20 @@ export default class Database extends ShellApiWithMongoClass {
   @returnType('AggregationCursor')
   @apiVersions([1])
   async aggregate(
-    pipeline: Document[],
+    pipelineOrSingleStage: Document | Document[],
     options?: Document
   ): Promise<AggregationCursor> {
     if ('background' in (options ?? {})) {
       await this._instanceState.printWarning(
         aggregateBackgroundOptionNotSupportedHelp
       );
     }
+    const pipeline: Document[] = Array.isArray(pipelineOrSingleStage)
+      ? pipelineOrSingleStage
+      : [pipelineOrSingleStage];
+
     assertArgsDefinedType([pipeline], [true], 'Database.aggregate');
+
     this._emitDatabaseApiCall('aggregate', { options, pipeline });
 
     const { aggOptions, dbOptions, explain } = adaptAggregateOptions(options);
@@ -1429,6 +1434,7 @@ export default class Database extends ShellApiWithMongoClass {
         CommonErrors.CommandFailed
       );
     }
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
     for (const cmdDescription of Object.values(result.commands) as Document[]) {
       if ('slaveOk' in cmdDescription) {
         cmdDescription.secondaryOk = cmdDescription.slaveOk;