address code review comments

Automattic · Jan 13, 2024 · 6c21fcc · 6c21fcc
1 parent 6c6fb8b
commit 6c21fcc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/lib/connection.js b/lib/connection.js
@@ -615,10 +615,6 @@ Connection.prototype.dropCollection = async function dropCollection(collection)
  */
 
 Connection.prototype.listCollections = async function listCollections() {
-  if (arguments.length >= 2 && typeof arguments[1] === 'function') {
-    throw new MongooseError('Connection.prototype.dropCollection() no longer accepts a callback');
-  }
-
   if ((this.readyState === STATES.connecting || this.readyState === STATES.disconnected) && this._shouldBufferCommands()) {
     await new Promise(resolve => {
       this._queue.push({ fn: resolve });

diff --git a/test/connection.test.js b/test/connection.test.js
@@ -94,7 +94,7 @@ describe('connections:', function() {
       }));
       await Model.init();
 
-      const res = await conn.db.listCollections().toArray();
+      const res = await conn.listCollections();
       assert.ok(!res.map(c => c.name).includes('gh8814_Conn'));
       await conn.close();
     });
@@ -185,23 +185,24 @@ describe('connections:', function() {
         size: 1024
       });
 
-      const collections = await conn.db.listCollections().toArray();
+      const collections = await conn.listCollections();
 
       const names = collections.map(function(c) { return c.name; });
       assert.ok(names.indexOf('gh5712') !== -1);
       assert.ok(collections[names.indexOf('gh5712')].options.capped);
       await conn.createCollection('gh5712_0');
-      const collectionsAfterCreation = await conn.db.listCollections().toArray();
+      const collectionsAfterCreation = await conn.listCollections();
       const newCollectionsNames = collectionsAfterCreation.map(function(c) { return c.name; });
       assert.ok(newCollectionsNames.indexOf('gh5712') !== -1);
     });
 
     it('listCollections()', async function() {
       await conn.dropDatabase();
       await conn.createCollection('test1176');
+      await conn.createCollection('test94112');
 
       const collections = await conn.listCollections();
-      assert.deepStrictEqual(collections.map(coll => coll.name), ['test1176']);
+      assert.deepStrictEqual(collections.map(coll => coll.name).sort(), ['test1176', 'test94112']);
     });
   });
 

diff --git a/test/types/connection.test.ts b/test/types/connection.test.ts
@@ -70,6 +70,10 @@ expectType<Connection>(conn.useDb('test', {}));
 expectType<Connection>(conn.useDb('test', { noListener: true }));
 expectType<Connection>(conn.useDb('test', { useCache: true }));
 
+expectType<Promise<string[]>>(
+  conn.listCollections().then(collections => collections.map(coll => coll.name))
+);
+
 export function autoTypedModelConnection() {
   const AutoTypedSchema = autoTypedSchema();
   const AutoTypedModel = connection.model('AutoTypeModelConnection', AutoTypedSchema);

diff --git a/types/connection.d.ts b/types/connection.d.ts
@@ -125,7 +125,7 @@ declare module 'mongoose' {
      * Helper for MongoDB Node driver's `listCollections()`.
      * Returns an array of collection names.
      */
-    listCollections(collection: string): Promise<Pick<mongodb.CollectionInfo, 'name' | 'type'>[]>;
+    listCollections(): Promise<Pick<mongodb.CollectionInfo, 'name' | 'type'>[]>;
 
     /**
      * A [POJO](https://masteringjs.io/tutorials/fundamentals/pojo) containing