backported

Automattic · Jul 20, 2023 · 1b09cb1 · 1b09cb1
1 parent 20b030e
commit 1b09cb1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/lib/drivers/node-mongodb-native/collection.js b/lib/drivers/node-mongodb-native/collection.js
@@ -198,8 +198,14 @@ function iter(i) {
 
     if (debug) {
       if (typeof debug === 'function') {
+        let argsToAdd = null;
+        if (typeof args[args.length - 1] == 'function') {
+          argsToAdd = args.slice(0, args.length - 1);
+        } else {
+          argsToAdd = args;
+        }
         debug.apply(_this,
-          [_this.name, i].concat(args.slice(0, args.length - 1)));
+          [_this.name, i].concat(argsToAdd));
       } else if (debug instanceof stream.Writable) {
         this.$printToStream(_this.name, i, args, debug);
       } else {

diff --git a/test/index.test.js b/test/index.test.js
@@ -91,6 +91,19 @@ describe('mongoose module:', function() {
     await mongoose.disconnect();
   });
 
+  it('should collect the args correctly gh-13364', async function() {
+    const util = require('util');
+    const mongoose = new Mongoose();
+    const conn = await mongoose.connect(start.uri);
+    let actual = '';
+    mongoose.set('debug', (collectionName, methodName, ...methodArgs) => {
+      actual = `${collectionName}.${methodName}(${util.inspect(methodArgs).slice(2, -2)})`;
+    });
+    const user = conn.connection.collection('User');
+    await user.findOne({ key: 'value' });
+    assert.equal('User.findOne({ key: \'value\' })', actual);
+  });
+
   it('{g,s}etting options', function() {
     const mongoose = new Mongoose();