feat: remove "remove"

Author: hasezoey

README.md

@@ -52,7 +52,6 @@ require('mongodb').connect(uri, function (err, db) {
     - [find()](#find)
     - [findOne()](#findone)
     - [count()](#count)
-    - [remove()](#remove)
     - [update()](#update)
         - [the update document](#the-update-document)
         - [options](#options)
@@ -193,17 +192,6 @@ mquery().count(match, function (err, number){
 })
 ```
 
-### remove()
-
-Declares this query a _remove_ query. Optionally pass a match clause and / or callback. If a callback is passed the query is executed.
-
-```js
-mquery().remove()
-mquery().remove(match)
-mquery().remove(callback)
-mquery().remove(match, function (err){})
-```
-
 ### update()
 
 Declares this query an _update_ query. Optionally pass an update document, match clause, options or callback. If a callback is passed, the query is executed. To force execution without passing a callback, run `update(true)`.
@@ -910,7 +898,6 @@ This option is only valid for operations that write to the database:
 - `deleteMany()`
 - `findOneAndDelete()`
 - `findOneAndUpdate()`
-- `remove()`
 - `update()`
 - `updateOne()`
 - `updateMany()`
@@ -1103,7 +1090,6 @@ This option is only valid for operations that write to the database:
 - `deleteMany()`
 - `findOneAndDelete()`
 - `findOneAndUpdate()`
-- `remove()`
 - `update()`
 - `updateOne()`
 - `updateMany()`
@@ -1185,7 +1171,6 @@ This option is only valid for operations that write to the database:
 - `deleteMany()`
 - `findOneAndDelete()`
 - `findOneAndUpdate()`
-- `remove()`
 - `update()`
 - `updateOne()`
 - `updateMany()`

lib/collection/collection.js

@@ -11,7 +11,6 @@ const methods = [
   'updateMany',
   'updateOne',
   'replaceOne',
-  'remove',
   'count',
   'distinct',
   'findOneAndDelete',

lib/collection/node.js

@@ -90,13 +90,6 @@ class NodeCollection extends Collection {
     this.collection.deleteMany(match, options, cb);
   }
 
-  /**
-   * remove(match, options, function(err[, result])
-   */
-  remove(match, options, cb) {
-    this.collection.remove(match, options, cb);
-  }
-
   /**
    * findOneAndDelete(match, options, function(err[, result])
    */

lib/mquery.js

@@ -1557,7 +1557,6 @@ Query.prototype.hint = function() {
  * - `deleteMany()`
  * - `findOneAndDelete()`
  * - `findOneAndUpdate()`
- * - `remove()`
  * - `update()`
  * - `updateOne()`
  * - `updateMany()`
@@ -1752,7 +1751,6 @@ Query.prototype.tailable = function() {
  * - `deleteMany()`
  * - `findOneAndDelete()`
  * - `findOneAndUpdate()`
- * - `remove()`
  * - `update()`
  * - `updateOne()`
  * - `updateMany()`
@@ -1801,7 +1799,6 @@ Query.prototype.writeConcern = Query.prototype.w = function writeConcern(concern
  * - `deleteMany()`
  * - `findOneAndDelete()`
  * - `findOneAndUpdate()`
- * - `remove()`
  * - `update()`
  * - `updateOne()`
  * - `updateMany()`
@@ -2496,75 +2493,7 @@ function _update(query, op, criteria, doc, options, force, callback) {
 }
 
 /**
- * Declare and/or execute this query as a remove() operation.
- *
- * #### Example:
- *
- *     mquery(collection).remove({ artist: 'Anne Murray' }, callback)
- *
- * #### Note:
- *
- * The operation is only executed when a callback is passed. To force execution without a callback (which would be an unsafe write), we must first call remove() and then execute it by using the `exec()` method.
- *
- *     // not executed
- *     var query = mquery(collection).remove({ name: 'Anne Murray' })
- *
- *     // executed
- *     mquery(collection).remove({ name: 'Anne Murray' }, callback)
- *     mquery(collection).remove({ name: 'Anne Murray' }).remove(callback)
- *
- *     // executed without a callback (unsafe write)
- *     query.exec()
- *
- *     // summary
- *     query.remove(conds, fn); // executes
- *     query.remove(conds)
- *     query.remove(fn) // executes
- *     query.remove()
- *
- * @param {Object|Query} [criteria] mongodb selector
- * @param {Function} [callback]
- * @return {Query} this
- * @api public
- */
-
-Query.prototype.remove = function(criteria, callback) {
-  this.op = 'remove';
-  let force;
-
-  if ('function' === typeof criteria) {
-    callback = criteria;
-    criteria = undefined;
-  } else if (Query.canMerge(criteria)) {
-    this.merge(criteria);
-  } else if (true === criteria) {
-    force = criteria;
-    criteria = undefined;
-  }
-
-  if (!(force || callback))
-    return this;
-
-  const options = this._optionsForExec();
-  if (!callback) options.safe = false;
-
-  const conds = this._conditions;
-
-  debug('remove', this._collection.collectionName, conds, options);
-  callback = this._wrapCallback('remove', callback, {
-    conditions: conds,
-    options: options
-  });
-
-  this._collection.remove(conds, options, utils.tick(callback));
-
-  return this;
-};
-
-/**
- * Declare and/or execute this query as a `deleteOne()` operation. Behaves like
- * `remove()`, except for ignores the `justOne` option and always deletes at
- * most one document.
+ * Declare and/or execute this query as a `deleteOne()` operation.
  *
  * #### Example:
  *
@@ -2611,8 +2540,7 @@ Query.prototype.deleteOne = function(criteria, callback) {
 };
 
 /**
- * Declare and/or execute this query as a `deleteMany()` operation. Behaves like
- * `remove()`, except for ignores the `justOne` option and always deletes
+ * Declare and/or execute this query as a `deleteMany()` operation. Always deletes
  * _every_ document that matches `criteria`.
  *
  * #### Example:
@@ -2879,7 +2807,7 @@ Query.prototype.exec = function exec(op, callback) {
 
   assert.ok(this.op, 'Missing query type: (find, update, etc)');
 
-  if ('update' == this.op || 'remove' == this.op) {
+  if ('update' == this.op) {
     callback || (callback = true);
   }