Merge branch 'vkarpov15/mquery-v6' into vkarpov15/remove-old-methods

Author: vkarpov15

lib/mquery.js

@@ -7,7 +7,6 @@
 const assert = require('assert');
 const util = require('util');
 const utils = require('./utils');
-const debug = require('debug')('mquery');
 
 /**
  * Query constructor used for building queries.
@@ -1857,8 +1856,6 @@ Query.prototype._find = async function _find() {
     options.fields = this._fieldsForExec();
   }
 
-  debug('_find', this._collection.collectionName, conds, options);
-
   return this._collection.find(conds, options);
 };
 
@@ -1893,7 +1890,6 @@ Query.prototype.cursor = function cursor(criteria) {
     options.fields = this._fieldsForExec();
   }
 
-  debug('findCursor', this._collection.collectionName, conds, options);
   return this._collection.findCursor(conds, options);
 };
 
@@ -1937,8 +1933,6 @@ Query.prototype._findOne = async function _findOne() {
     options.fields = this._fieldsForExec();
   }
 
-  debug('findOne', this._collection.collectionName, conds, options);
-
   return this._collection.findOne(conds, options);
 };
 
@@ -2011,11 +2005,8 @@ Query.prototype.estimatedDocumentCount = function() {
  * @returns the results
  */
 Query.prototype._estimatedDocumentCount = async function _estimatedDocumentCount() {
-  const conds = this._conditions,
-      options = this._optionsForExec();
-
-  debug('estimatedDocumentCount', this._collection.collectionName, conds, options);
-
+  const conds = this._conditions;
+  const options = this._optionsForExec();
   return this._collection.estimatedDocumentCount(conds, options);
 };
 
@@ -2070,8 +2061,6 @@ Query.prototype._distinct = async function _distinct() {
   const conds = this._conditions,
       options = this._optionsForExec();
 
-  debug('distinct', this._collection.collectionName, conds, options);
-
   return this._collection.distinct(this._distinctDoc, conds, options);
 };
 
@@ -2216,8 +2205,6 @@ async function _updateExec(query, op) {
   const criteria = query._conditions;
   const doc = query._updateForExec();
 
-  debug('update', query._collection.collectionName, criteria, doc, options);
-
   return query._collection[op](criteria, doc, options);
 }
 
@@ -2253,8 +2240,6 @@ Query.prototype._deleteOne = async function() {
 
   const conds = this._conditions;
 
-  debug('deleteOne', this._collection.collectionName, conds, options);
-
   return this._collection.deleteOne(conds, options);
 };
 
@@ -2291,8 +2276,6 @@ Query.prototype._deleteMany = async function() {
 
   const conds = this._conditions;
 
-  debug('deleteOne', this._collection.collectionName, conds, options);
-
   return this._collection.deleteMany(conds, options);
 };
 
@@ -2499,8 +2482,6 @@ Query.prototype.cursor = function() {
     options.fields = this._fieldsForExec();
   }
 
-  debug('cursor', this._collection.collectionName, conds, options);
-
   return this._collection.findCursor(conds, options);
 };
 

package.json

@@ -15,13 +15,10 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "dependencies": {
-    "debug": "4.x"
-  },
   "devDependencies": {
     "eslint": "8.x",
     "eslint-plugin-mocha-no-only": "1.1.1",
-    "mocha": "9.x",
+    "mocha": "11.x",
     "mongodb": "6.x"
   },
   "bugs": {

test/index.js

@@ -2014,7 +2014,7 @@ describe('mquery', function() {
         await col.insertOne({ name: name });
         const m = mquery({ name: name }).collection(col);
         name = '1 arg';
-        const n = m.updateOne({ $set: { name: name } }).setOptions({ returnDocument: 'after' });
+        const n = m.updateOne({ $set: { name: name } }).setOptions({ returnDocument: 'after', includeResultMetadata: true });
         const res = await n.findOneAndUpdate();
         assert.ok(res);
         assert.equal(res.name, name);
@@ -2036,8 +2036,8 @@ describe('mquery', function() {
       });
       it('update + exec', async() => {
         const m = mquery().collection(col).where({ name: name });
-        const res = await m.findOneAndUpdate({}, { $inc: { age: 10 } }, { returnDocument: 'after' });
-        assert.equal(res.age, 10);
+        const res = await m.findOneAndUpdate({}, { $inc: { age: 10 } }, { returnDocument: 'after', includeResultMetadata: true });
+        assert.equal(10, res.value.age);
       });
     });
     describe('with 3 args', function() {
@@ -2050,19 +2050,17 @@ describe('mquery', function() {
       });
       it('conditions + update + exec', async() => {
         const m = mquery().collection(col);
-        const res = await m.findOneAndUpdate({ name: name }, { works: true }, { returnDocument: 'after' });
-        assert.ok(res);
-        assert.equal(res.name, name);
-        assert.ok(res.works);
+        const res = await m.findOneAndUpdate({ name: name }, { works: true }, { returnDocument: 'after', includeResultMetadata: true });
+        assert.ok(res.value);
+        assert.equal(name, res.value.name);
+        assert.ok(true === res.value.works);
       });
-    });
-    describe('with 4 args', function() {
-      it('conditions + update + options + exec', async() => {
+      it('empty options', async() => {
         const m = mquery().collection(col);
         const res = await m.findOneAndUpdate({ name: name }, { works: false }, {});
         assert.ok(res);
-        assert.equal(res.name, name);
-        assert.ok(res.works);
+        assert.equal(name, res.name);
+        assert.ok(true === res.works);
       });
     });
   });
@@ -2094,12 +2092,12 @@ describe('mquery', function() {
           assert.deepEqual(n._conditions, { name: name });
         });
       });
-      it('that is a function', async() => {
+      it('executes', async() => {
         await col.insertOne({ name: name });
         const m = mquery({ name: name }).collection(col);
-        const res = await m.findOneAndDelete();
+        const res = await m.findOneAndRemove();
         assert.ok(res);
-        assert.equal(res.name, name);
+        assert.equal(name, res.name);
       });
     });
     describe('with 2 args', function() {
@@ -2119,25 +2117,23 @@ describe('mquery', function() {
       it('conditions + exec', async() => {
         await col.insertOne({ name: name });
         const m = mquery().collection(col);
-        const res = await m.findOneAndDelete({ name: name });
-        assert.equal(res.name, name);
+        const res = await m.findOneAndRemove({ name: name });
+        assert.equal(name, res.name);
       });
       it('query + exec', async() => {
         await col.insertOne({ name: name });
         const n = mquery({ name: name });
         const m = mquery().collection(col);
-        const res = await m.findOneAndDelete(n);
-        assert.equal(res.name, name);
+        const res = await m.findOneAndRemove(n);
+        assert.equal(name, res.name);
       });
-    });
-    describe('with 3 args', function() {
       it('conditions + options + exec', async() => {
         name = 'findOneAndDelete + conds + options + cb';
         await col.insertMany([{ name: name }, { name: 'a' }]);
         const m = mquery().collection(col);
-        const res = await m.findOneAndDelete({ name: name }, { sort: { name: 1 } });
-        assert.ok(res);
-        assert.equal(res.name, name);
+        const res = await m.findOneAndRemove({ name: name }, { sort: { name: 1 }, includeResultMetadata: true });
+        assert.ok(res.value);
+        assert.equal(name, res.value.name);
       });
     });
   });
@@ -2291,7 +2287,7 @@ describe('mquery', function() {
     describe('findOneAndUpdate', function() {
       it('with exec', async() => {
         const m = mquery().collection(col);
-        m.findOneAndUpdate({ name: 'exec', age: 1 }, { $set: { name: 'findOneAndUpdate' } }, { returnDocument: 'after' });
+        m.findOneAndUpdate({ name: 'exec', age: 1 }, { $set: { name: 'findOneAndUpdate' } }, { returnDocument: 'after', includeResultMetadata: true });
         const res = await m.exec();
         assert.equal(res.name, 'findOneAndUpdate');
       });
@@ -2302,10 +2298,10 @@ describe('mquery', function() {
         const m = mquery().collection(col);
         m.findOneAndDelete({ name: 'exec', age: 2 });
         const res = await m.exec();
-        assert.equal(res.name, 'exec');
-        assert.equal(res.age, 2);
-        const num = await mquery().collection(col).countDocuments({ name: 'exec' });
-        assert.equal(num, 1);
+        assert.equal('exec', res.name);
+        assert.equal(2, res.age);
+        const num = await mquery().collection(col).count({ name: 'exec' });
+        assert.equal(1, num);
       });
     });
   });