mongodb 3.2.5 → 3.3.0-beta2

package/lib/collection.js

@@ -3,63 +3,71 @@
 const deprecate = require('util').deprecate;
 const deprecateOptions = require('./utils').deprecateOptions;
 const checkCollectionName = require('./utils').checkCollectionName;
-const ObjectID = require('mongodb-core').BSON.ObjectID;
-const MongoError = require('mongodb-core').MongoError;
+const ObjectID = require('./core').BSON.ObjectID;
+const MongoError = require('./core').MongoError;
 const toError = require('./utils').toError;
-const normalizeHintField = require('./utils').normalizeHintField;
 const handleCallback = require('./utils').handleCallback;
+const normalizeHintField = require('./utils').normalizeHintField;
 const decorateCommand = require('./utils').decorateCommand;
 const decorateWithCollation = require('./utils').decorateWithCollation;
 const decorateWithReadConcern = require('./utils').decorateWithReadConcern;
 const formattedOrderClause = require('./utils').formattedOrderClause;
-const ReadPreference = require('mongodb-core').ReadPreference;
-const CommandCursor = require('./command_cursor');
+const ReadPreference = require('./core').ReadPreference;
 const unordered = require('./bulk/unordered');
 const ordered = require('./bulk/ordered');
 const ChangeStream = require('./change_stream');
-const executeOperation = require('./utils').executeOperation;
+const executeLegacyOperation = require('./utils').executeLegacyOperation;
 const resolveReadPreference = require('./utils').resolveReadPreference;
+const WriteConcern = require('./write_concern');
+const ReadConcern = require('./read_concern');
+const MongoDBNamespace = require('./utils').MongoDBNamespace;
 
 // Operations
 const aggregate = require('./operations/aggregate').aggregate;
-const bulkWrite = require('./operations/collection_ops').bulkWrite;
 const checkForAtomicOperators = require('./operations/collection_ops').checkForAtomicOperators;
 const count = require('./operations/collection_ops').count;
-const countDocuments = require('./operations/collection_ops').countDocuments;
-const createIndex = require('./operations/collection_ops').createIndex;
-const createIndexes = require('./operations/collection_ops').createIndexes;
-const deleteMany = require('./operations/collection_ops').deleteMany;
-const deleteOne = require('./operations/collection_ops').deleteOne;
-const distinct = require('./operations/collection_ops').distinct;
-const dropIndex = require('./operations/collection_ops').dropIndex;
-const dropIndexes = require('./operations/collection_ops').dropIndexes;
 const ensureIndex = require('./operations/collection_ops').ensureIndex;
 const findAndModify = require('./operations/collection_ops').findAndModify;
 const findAndRemove = require('./operations/collection_ops').findAndRemove;
-const findOne = require('./operations/collection_ops').findOne;
-const findOneAndDelete = require('./operations/collection_ops').findOneAndDelete;
-const findOneAndReplace = require('./operations/collection_ops').findOneAndReplace;
-const findOneAndUpdate = require('./operations/collection_ops').findOneAndUpdate;
-const geoHaystackSearch = require('./operations/collection_ops').geoHaystackSearch;
 const group = require('./operations/collection_ops').group;
-const indexes = require('./operations/collection_ops').indexes;
-const indexExists = require('./operations/collection_ops').indexExists;
-const indexInformation = require('./operations/collection_ops').indexInformation;
-const insertMany = require('./operations/collection_ops').insertMany;
-const insertOne = require('./operations/collection_ops').insertOne;
-const isCapped = require('./operations/collection_ops').isCapped;
-const mapReduce = require('./operations/collection_ops').mapReduce;
-const optionsOp = require('./operations/collection_ops').optionsOp;
 const parallelCollectionScan = require('./operations/collection_ops').parallelCollectionScan;
-const reIndex = require('./operations/collection_ops').reIndex;
 const removeDocuments = require('./operations/collection_ops').removeDocuments;
-const rename = require('./operations/collection_ops').rename;
-const replaceOne = require('./operations/collection_ops').replaceOne;
 const save = require('./operations/collection_ops').save;
-const stats = require('./operations/collection_ops').stats;
 const updateDocuments = require('./operations/collection_ops').updateDocuments;
-const updateMany = require('./operations/collection_ops').updateMany;
-const updateOne = require('./operations/collection_ops').updateOne;
+
+const BulkWriteOperation = require('./operations/bulk_write');
+const CountDocumentsOperation = require('./operations/count_documents');
+const CreateIndexOperation = require('./operations/create_index');
+const CreateIndexesOperation = require('./operations/create_indexes');
+const DeleteManyOperation = require('./operations/delete_many');
+const DeleteOneOperation = require('./operations/delete_one');
+const DistinctOperation = require('./operations/distinct');
+const DropCollectionOperation = require('./operations/drop').DropCollectionOperation;
+const DropIndexOperation = require('./operations/drop_index');
+const DropIndexesOperation = require('./operations/drop_indexes');
+const EstimatedDocumentCountOperation = require('./operations/estimated_document_count');
+const FindOneOperation = require('./operations/find_one');
+const FindOneAndDeleteOperation = require('./operations/find_one_and_delete');
+const FindOneAndReplaceOperation = require('./operations/find_one_and_replace');
+const FindOneAndUpdateOperation = require('./operations/find_one_and_update');
+const GeoHaystackSearchOperation = require('./operations/geo_haystack_search');
+const IndexesOperation = require('./operations/indexes');
+const IndexExistsOperation = require('./operations/index_exists');
+const IndexInformationOperation = require('./operations/index_information');
+const InsertManyOperation = require('./operations/insert_many');
+const InsertOneOperation = require('./operations/insert_one');
+const IsCappedOperation = require('./operations/is_capped');
+const ListIndexesOperation = require('./operations/list_indexes');
+const MapReduceOperation = require('./operations/map_reduce');
+const OptionsOperation = require('./operations/options_operation');
+const RenameOperation = require('./operations/rename');
+const ReIndexOperation = require('./operations/re_index');
+const ReplaceOneOperation = require('./operations/replace_one');
+const StatsOperation = require('./operations/stats');
+const UpdateManyOperation = require('./operations/update_many');
+const UpdateOneOperation = require('./operations/update_one');
+
+const executeOperation = require('./operations/execute_operation');
 
 /**
  * @fileOverview The **Collection** class is an internal class that embodies a MongoDB collection
@@ -121,20 +129,13 @@ function Collection(db, topology, dbName, name, pkFactory, options) {
     options == null || options.promoteBuffers == null
       ? db.s.options.promoteBuffers
       : options.promoteBuffers;
-  let readPreference = null;
   const collectionHint = null;
-  const namespace = `${dbName}.${name}`;
+
+  const namespace = new MongoDBNamespace(dbName, name);
 
   // Get the promiseLibrary
   const promiseLibrary = options.promiseLibrary || Promise;
 
-  // Assign the right collection level readPreference
-  if (options && options.readPreference) {
-    readPreference = options.readPreference;
-  } else if (db.options.readPreference) {
-    readPreference = db.options.readPreference;
-  }
-
   // Set custom primary key factory if provided
   pkFactory = pkFactory == null ? ObjectID : pkFactory;
 
@@ -146,14 +147,12 @@ function Collection(db, topology, dbName, name, pkFactory, options) {
     db: db,
     // Topology
     topology: topology,
-    // dbName
-    dbName: dbName,
     // Options
     options: options,
     // Namespace
     namespace: namespace,
     // Read preference
-    readPreference: readPreference,
+    readPreference: ReadPreference.fromOptions(options),
     // SlaveOK
     slaveOk: slaveOk,
     // Serialize functions
@@ -170,58 +169,64 @@ function Collection(db, topology, dbName, name, pkFactory, options) {
     internalHint: internalHint,
     // collectionHint
     collectionHint: collectionHint,
-    // Name
-    name: name,
     // Promise library
     promiseLibrary: promiseLibrary,
     // Read Concern
-    readConcern: options.readConcern,
+    readConcern: ReadConcern.fromOptions(options),
     // Write Concern
-    writeConcern: options.writeConcern
+    writeConcern: WriteConcern.fromOptions(options)
   };
 }
 
 Object.defineProperty(Collection.prototype, 'dbName', {
   enumerable: true,
   get: function() {
-    return this.s.dbName;
+    return this.s.namespace.db;
   }
 });
 
 Object.defineProperty(Collection.prototype, 'collectionName', {
   enumerable: true,
   get: function() {
-    return this.s.name;
+    return this.s.namespace.collection;
   }
 });
 
 Object.defineProperty(Collection.prototype, 'namespace', {
   enumerable: true,
   get: function() {
-    return this.s.namespace;
+    return this.s.namespace.toString();
   }
 });
 
 Object.defineProperty(Collection.prototype, 'readConcern', {
   enumerable: true,
   get: function() {
-    return this.s.readConcern || { level: 'local' };
+    if (this.s.readConcern == null) {
+      return this.s.db.readConcern;
+    }
+    return this.s.readConcern;
   }
 });
 
-Object.defineProperty(Collection.prototype, 'writeConcern', {
+Object.defineProperty(Collection.prototype, 'readPreference', {
   enumerable: true,
   get: function() {
-    let ops = {};
-    if (this.s.writeConcern) {
-      return this.s.writeConcern;
+    if (this.s.readPreference == null) {
+      return this.s.db.readPreference;
     }
 
-    if (this.s.options.w != null) ops.w = this.s.options.w;
-    if (this.s.options.j != null) ops.j = this.s.options.j;
-    if (this.s.options.fsync != null) ops.fsync = this.s.options.fsync;
-    if (this.s.options.wtimeout != null) ops.wtimeout = this.s.options.wtimeout;
-    return ops;
+    return this.s.readPreference;
+  }
+});
+
+Object.defineProperty(Collection.prototype, 'writeConcern', {
+  enumerable: true,
+  get: function() {
+    if (this.s.writeConcern == null) {
+      return this.s.db.writeConcern;
+    }
+    return this.s.writeConcern;
   }
 });
 
@@ -356,10 +361,7 @@ Collection.prototype.find = deprecateOptions(
     newOptions.slaveOk = options.slaveOk != null ? options.slaveOk : this.s.db.slaveOk;
 
     // Add read preference if needed
-    newOptions.readPreference = resolveReadPreference(newOptions, {
-      db: this.s.db,
-      collection: this
-    });
+    newOptions.readPreference = resolveReadPreference(this, newOptions);
 
     // Set slave ok to true if read preference different from primary
     if (
@@ -376,7 +378,7 @@ Collection.prototype.find = deprecateOptions(
 
     // Build the find command
     const findCommand = {
-      find: this.s.namespace,
+      find: this.s.namespace.toString(),
       limit: newOptions.limit,
       skip: newOptions.skip,
       query: selector
@@ -426,7 +428,8 @@ Collection.prototype.find = deprecateOptions(
       throw err;
     }
 
-    const cursor = this.s.topology.cursor(this.s.namespace, findCommand, newOptions);
+    // TODO: pass object cursor
+    const cursor = this.s.topology.cursor(this.s.namespace.toString(), findCommand, newOptions);
 
     return typeof callback === 'function' ? handleCallback(callback, null, cursor) : cursor;
   }
@@ -460,7 +463,9 @@ Collection.prototype.insertOne = function(doc, options, callback) {
     options.ignoreUndefined = this.s.options.ignoreUndefined;
   }
 
-  return executeOperation(this.s.topology, insertOne, [this, doc, options, callback]);
+  const insertOneOperation = new InsertOneOperation(this, doc, options);
+
+  return executeOperation(this.s.topology, insertOneOperation, callback);
 };
 
 /**
@@ -486,7 +491,9 @@ Collection.prototype.insertMany = function(docs, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options ? Object.assign({}, options) : { ordered: true };
 
-  return executeOperation(this.s.topology, insertMany, [this, docs, options, callback]);
+  const insertManyOperation = new InsertManyOperation(this, docs, options);
+
+  return executeOperation(this.s.topology, insertManyOperation, callback);
 };
 
 /**
@@ -519,6 +526,8 @@ Collection.prototype.insertMany = function(docs, options, callback) {
  *
  *  { updateMany: { filter: {a:2}, update: {$set: {a:2}}, upsert:true } }
  *
+ *  { updateMany: { filter: {}, update: {$set: {"a.$[i].x": 5}}, arrayFilters: [{ "i.x": 5 }]} }
+ *
  *  { deleteOne: { filter: {c:1} } }
  *
  *  { deleteMany: { filter: {c:1} } }
@@ -532,6 +541,7 @@ Collection.prototype.insertMany = function(docs, options, callback) {
  * @method
  * @param {object[]} operations Bulk operations to perform.
  * @param {object} [options] Optional settings.
+ * @param {object[]} [options.arrayFilters] Determines which array elements to modify for update operation in MongoDB 3.6 or higher.
  * @param {(number|string)} [options.w] The write concern.
  * @param {number} [options.wtimeout] The write concern timeout.
  * @param {boolean} [options.j=false] Specify a journal write concern.
@@ -550,7 +560,9 @@ Collection.prototype.bulkWrite = function(operations, options, callback) {
     throw MongoError.create({ message: 'operations must be an array of documents', driver: true });
   }
 
-  return executeOperation(this.s.topology, bulkWrite, [this, operations, options, callback]);
+  const bulkWriteOperation = new BulkWriteOperation(this, operations, options);
+
+  return executeOperation(this.s.topology, bulkWriteOperation, callback);
 };
 
 /**
@@ -691,7 +703,9 @@ Collection.prototype.updateOne = function(filter, update, options, callback) {
     options.ignoreUndefined = this.s.options.ignoreUndefined;
   }
 
-  return executeOperation(this.s.topology, updateOne, [this, filter, update, options, callback]);
+  const updateOneOperation = new UpdateOneOperation(this, filter, update, options);
+
+  return executeOperation(this.s.topology, updateOneOperation, callback);
 };
 
 /**
@@ -719,7 +733,9 @@ Collection.prototype.replaceOne = function(filter, doc, options, callback) {
     options.ignoreUndefined = this.s.options.ignoreUndefined;
   }
 
-  return executeOperation(this.s.topology, replaceOne, [this, filter, doc, options, callback]);
+  const replaceOneOperation = new ReplaceOneOperation(this, filter, doc, options);
+
+  return executeOperation(this.s.topology, replaceOneOperation, callback);
 };
 
 /**
@@ -755,7 +771,9 @@ Collection.prototype.updateMany = function(filter, update, options, callback) {
     options.ignoreUndefined = this.s.options.ignoreUndefined;
   }
 
-  return executeOperation(this.s.topology, updateMany, [this, filter, update, options, callback]);
+  const updateManyOperation = new UpdateManyOperation(this, filter, update, options);
+
+  return executeOperation(this.s.topology, updateManyOperation, callback);
 };
 
 /**
@@ -788,7 +806,7 @@ Collection.prototype.update = deprecate(function(selector, update, options, call
     options.ignoreUndefined = this.s.options.ignoreUndefined;
   }
 
-  return executeOperation(this.s.topology, updateDocuments, [
+  return executeLegacyOperation(this.s.topology, updateDocuments, [
     this,
     selector,
     update,
@@ -835,7 +853,9 @@ Collection.prototype.deleteOne = function(filter, options, callback) {
     options.ignoreUndefined = this.s.options.ignoreUndefined;
   }
 
-  return executeOperation(this.s.topology, deleteOne, [this, filter, options, callback]);
+  const deleteOneOperation = new DeleteOneOperation(this, filter, options);
+
+  return executeOperation(this.s.topology, deleteOneOperation, callback);
 };
 
 Collection.prototype.removeOne = Collection.prototype.deleteOne;
@@ -862,7 +882,9 @@ Collection.prototype.deleteMany = function(filter, options, callback) {
     options.ignoreUndefined = this.s.options.ignoreUndefined;
   }
 
-  return executeOperation(this.s.topology, deleteMany, [this, filter, options, callback]);
+  const deleteManyOperation = new DeleteManyOperation(this, filter, options);
+
+  return executeOperation(this.s.topology, deleteManyOperation, callback);
 };
 
 Collection.prototype.removeMany = Collection.prototype.deleteMany;
@@ -891,7 +913,12 @@ Collection.prototype.remove = deprecate(function(selector, options, callback) {
     options.ignoreUndefined = this.s.options.ignoreUndefined;
   }
 
-  return executeOperation(this.s.topology, removeDocuments, [this, selector, options, callback]);
+  return executeLegacyOperation(this.s.topology, removeDocuments, [
+    this,
+    selector,
+    options,
+    callback
+  ]);
 }, 'collection.remove is deprecated. Use deleteOne, deleteMany, or bulkWrite instead.');
 
 /**
@@ -918,7 +945,7 @@ Collection.prototype.save = deprecate(function(doc, options, callback) {
     options.ignoreUndefined = this.s.options.ignoreUndefined;
   }
 
-  return executeOperation(this.s.topology, save, [this, doc, options, callback]);
+  return executeLegacyOperation(this.s.topology, save, [this, doc, options, callback]);
 }, 'collection.save is deprecated. Use insertOne, insertMany, updateOne, or updateMany instead.');
 
 /**
@@ -986,7 +1013,9 @@ Collection.prototype.findOne = deprecateOptions(
     query = query || {};
     options = options || {};
 
-    return executeOperation(this.s.topology, findOne, [this, query, options, callback]);
+    const findOneOperation = new FindOneOperation(this, query, options);
+
+    return executeOperation(this.s.topology, findOneOperation, callback);
   }
 );
 
@@ -1012,7 +1041,9 @@ Collection.prototype.rename = function(newName, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = Object.assign({}, options, { readPreference: ReadPreference.PRIMARY });
 
-  return executeOperation(this.s.topology, rename, [this, newName, options, callback]);
+  const renameOperation = new RenameOperation(this, newName, options);
+
+  return executeOperation(this.s.topology, renameOperation, callback);
 };
 
 /**
@@ -1020,6 +1051,10 @@ Collection.prototype.rename = function(newName, options, callback) {
  *
  * @method
  * @param {object} [options] Optional settings.
+ * @param {WriteConcern} [options.writeConcern] A full WriteConcern object
+ * @param {(number|string)} [options.w] The write concern
+ * @param {number} [options.wtimeout] The write concern timeout
+ * @param {boolean} [options.j] The journal write concern
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Collection~resultCallback} [callback] The results callback
  * @return {Promise} returns Promise if no callback passed
@@ -1028,11 +1063,13 @@ Collection.prototype.drop = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, this.s.db.dropCollection.bind(this.s.db), [
-    this.s.name,
-    options,
-    callback
-  ]);
+  const dropCollectionOperation = new DropCollectionOperation(
+    this.s.db,
+    this.collectionName,
+    options
+  );
+
+  return executeOperation(this.s.topology, dropCollectionOperation, callback);
 };
 
 /**
@@ -1048,7 +1085,9 @@ Collection.prototype.options = function(opts, callback) {
   if (typeof opts === 'function') (callback = opts), (opts = {});
   opts = opts || {};
 
-  return executeOperation(this.s.topology, optionsOp, [this, opts, callback]);
+  const optionsOperation = new OptionsOperation(this, opts);
+
+  return executeOperation(this.s.topology, optionsOperation, callback);
 };
 
 /**
@@ -1064,7 +1103,9 @@ Collection.prototype.isCapped = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, isCapped, [this, options, callback]);
+  const isCappedOperation = new IsCappedOperation(this, options);
+
+  return executeOperation(this.s.topology, isCappedOperation, callback);
 };
 
 /**
@@ -1094,7 +1135,14 @@ Collection.prototype.createIndex = function(fieldOrSpec, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, createIndex, [this, fieldOrSpec, options, callback]);
+  const createIndexOperation = new CreateIndexOperation(
+    this.s.db,
+    this.collectionName,
+    fieldOrSpec,
+    options
+  );
+
+  return executeOperation(this.s.topology, createIndexOperation, callback);
 };
 
 /**
@@ -1114,7 +1162,9 @@ Collection.prototype.createIndexes = function(indexSpecs, options, callback) {
   options = options ? Object.assign({}, options) : {};
   if (typeof options.maxTimeMS !== 'number') delete options.maxTimeMS;
 
-  return executeOperation(this.s.topology, createIndexes, [this, indexSpecs, options, callback]);
+  const createIndexesOperation = new CreateIndexesOperation(this, indexSpecs, options);
+
+  return executeOperation(this.s.topology, createIndexesOperation, callback);
 };
 
 /**
@@ -1138,7 +1188,9 @@ Collection.prototype.dropIndex = function(indexName, options, callback) {
   // Run only against primary
   options.readPreference = ReadPreference.PRIMARY;
 
-  return executeOperation(this.s.topology, dropIndex, [this, indexName, options, callback]);
+  const dropIndexOperation = new DropIndexOperation(this, indexName, options);
+
+  return executeOperation(this.s.topology, dropIndexOperation, callback);
 };
 
 /**
@@ -1156,7 +1208,9 @@ Collection.prototype.dropIndexes = function(options, callback) {
 
   if (typeof options.maxTimeMS !== 'number') delete options.maxTimeMS;
 
-  return executeOperation(this.s.topology, dropIndexes, [this, options, callback]);
+  const dropIndexesOperation = new DropIndexesOperation(this, options);
+
+  return executeOperation(this.s.topology, dropIndexesOperation, callback);
 };
 
 /**
@@ -1184,7 +1238,9 @@ Collection.prototype.reIndex = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, reIndex, [this, options, callback]);
+  const reIndexOperation = new ReIndexOperation(this, options);
+
+  return executeOperation(this.s.topology, reIndexOperation, callback);
 };
 
 /**
@@ -1198,45 +1254,9 @@ Collection.prototype.reIndex = function(options, callback) {
  * @return {CommandCursor}
  */
 Collection.prototype.listIndexes = function(options) {
-  options = options || {};
-  // Clone the options
-  options = Object.assign({}, options);
-  // Determine the read preference in the options.
-  options.readPreference = resolveReadPreference(options, { db: this.s.db, collection: this });
-  // Set the CommandCursor constructor
-  options.cursorFactory = CommandCursor;
-  // Set the promiseLibrary
-  options.promiseLibrary = this.s.promiseLibrary;
+  const listIndexesOperation = new ListIndexesOperation(this, options);
 
-  if (!this.s.topology.capabilities()) {
-    throw new MongoError('cannot connect to server');
-  }
-
-  // Cursor options
-  let cursor = options.batchSize ? { batchSize: options.batchSize } : {};
-
-  // We have a list collections command
-  if (this.s.topology.capabilities().hasListIndexesCommand) {
-    // Build the command
-    const command = { listIndexes: this.s.name, cursor: cursor };
-    // Execute the cursor
-    cursor = this.s.topology.cursor(`${this.s.dbName}.$cmd`, command, options);
-    // Do we have a readPreference, apply it
-    if (options.readPreference) cursor.setReadPreference(options.readPreference);
-    // Return the cursor
-    return cursor;
-  }
-
-  // Get the namespace
-  const ns = `${this.s.dbName}.system.indexes`;
-  // Get the query
-  cursor = this.s.topology.cursor(ns, { find: ns, query: { ns: this.s.namespace } }, options);
-  // Do we have a readPreference, apply it
-  if (options.readPreference) cursor.setReadPreference(options.readPreference);
-  // Set the passed in batch size if one was provided
-  if (options.batchSize) cursor = cursor.batchSize(options.batchSize);
-  // Return the cursor
-  return cursor;
+  return listIndexesOperation.execute();
 };
 
 /**
@@ -1266,7 +1286,12 @@ Collection.prototype.ensureIndex = deprecate(function(fieldOrSpec, options, call
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, ensureIndex, [this, fieldOrSpec, options, callback]);
+  return executeLegacyOperation(this.s.topology, ensureIndex, [
+    this,
+    fieldOrSpec,
+    options,
+    callback
+  ]);
 }, 'collection.ensureIndex is deprecated. Use createIndexes instead.');
 
 /**
@@ -1282,7 +1307,9 @@ Collection.prototype.indexExists = function(indexes, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, indexExists, [this, indexes, options, callback]);
+  const indexExistsOperation = new IndexExistsOperation(this, indexes, options);
+
+  return executeOperation(this.s.topology, indexExistsOperation, callback);
 };
 
 /**
@@ -1299,7 +1326,13 @@ Collection.prototype.indexInformation = function(options, callback) {
   callback = typeof args[args.length - 1] === 'function' ? args.pop() : undefined;
   options = args.length ? args.shift() || {} : {};
 
-  return executeOperation(this.s.topology, indexInformation, [this, options, callback]);
+  const indexInformationOperation = new IndexInformationOperation(
+    this.s.db,
+    this.collectionName,
+    options
+  );
+
+  return executeOperation(this.s.topology, indexInformationOperation, callback);
 };
 
 /**
@@ -1330,7 +1363,7 @@ Collection.prototype.count = deprecate(function(query, options, callback) {
   query = args.length ? args.shift() || {} : {};
   options = args.length ? args.shift() || {} : {};
 
-  return executeOperation(this.s.topology, count, [this, query, options, callback]);
+  return executeLegacyOperation(this.s.topology, count, [this, query, options, callback]);
 }, 'collection.count is deprecated, and will be removed in a future version.' +
   ' Use collection.countDocuments or collection.estimatedDocumentCount instead');
 
@@ -1347,12 +1380,14 @@ Collection.prototype.estimatedDocumentCount = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, count, [this, null, options, callback]);
+  const estimatedDocumentCountOperation = new EstimatedDocumentCountOperation(this, options);
+
+  return executeOperation(this.s.topology, estimatedDocumentCountOperation, callback);
 };
 
 /**
  * Gets the number of documents matching the filter.
- *
+ * For a fast count of the total documents in a collection see {@link Collection#estimatedDocumentCount estimatedDocumentCount}.
  * **Note**: When migrating from {@link Collection#count count} to {@link Collection#countDocuments countDocuments}
  * the following query operators must be replaced:
  *
@@ -1388,7 +1423,9 @@ Collection.prototype.countDocuments = function(query, options, callback) {
   query = args.length ? args.shift() || {} : {};
   options = args.length ? args.shift() || {} : {};
 
-  return executeOperation(this.s.topology, countDocuments, [this, query, options, callback]);
+  const countDocumentsOperation = new CountDocumentsOperation(this, query, options);
+
+  return executeOperation(this.s.topology, countDocumentsOperation, callback);
 };
 
 /**
@@ -1409,13 +1446,9 @@ Collection.prototype.distinct = function(key, query, options, callback) {
   const queryOption = args.length ? args.shift() || {} : {};
   const optionsOption = args.length ? args.shift() || {} : {};
 
-  return executeOperation(this.s.topology, distinct, [
-    this,
-    key,
-    queryOption,
-    optionsOption,
-    callback
-  ]);
+  const distinctOperation = new DistinctOperation(this, key, queryOption, optionsOption);
+
+  return executeOperation(this.s.topology, distinctOperation, callback);
 };
 
 /**
@@ -1430,7 +1463,9 @@ Collection.prototype.indexes = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.topology, indexes, [this, options, callback]);
+  const indexesOperation = new IndexesOperation(this, options);
+
+  return executeOperation(this.s.topology, indexesOperation, callback);
 };
 
 /**
@@ -1448,7 +1483,9 @@ Collection.prototype.stats = function(options, callback) {
   callback = typeof args[args.length - 1] === 'function' ? args.pop() : undefined;
   options = args.length ? args.shift() || {} : {};
 
-  return executeOperation(this.s.topology, stats, [this, options, callback]);
+  const statsOperation = new StatsOperation(this, options);
+
+  return executeOperation(this.s.topology, statsOperation, callback);
 };
 
 /**
@@ -1486,7 +1523,9 @@ Collection.prototype.findOneAndDelete = function(filter, options, callback) {
   if (filter == null || typeof filter !== 'object')
     throw toError('filter parameter must be an object');
 
-  return executeOperation(this.s.topology, findOneAndDelete, [this, filter, options, callback]);
+  const findOneAndDeleteOperation = new FindOneAndDeleteOperation(this, filter, options);
+
+  return executeOperation(this.s.topology, findOneAndDeleteOperation, callback);
 };
 
 /**
@@ -1515,13 +1554,14 @@ Collection.prototype.findOneAndReplace = function(filter, replacement, options,
   if (replacement == null || typeof replacement !== 'object')
     throw toError('replacement parameter must be an object');
 
-  return executeOperation(this.s.topology, findOneAndReplace, [
+  const findOneAndReplaceOperation = new FindOneAndReplaceOperation(
     this,
     filter,
     replacement,
-    options,
-    callback
-  ]);
+    options
+  );
+
+  return executeOperation(this.s.topology, findOneAndReplaceOperation, callback);
 };
 
 /**
@@ -1557,13 +1597,9 @@ Collection.prototype.findOneAndUpdate = function(filter, update, options, callba
     return this.s.promiseLibrary.reject(err);
   }
 
-  return executeOperation(this.s.topology, findOneAndUpdate, [
-    this,
-    filter,
-    update,
-    options,
-    callback
-  ]);
+  const findOneAndUpdateOperation = new FindOneAndUpdateOperation(this, filter, update, options);
+
+  return executeOperation(this.s.topology, findOneAndUpdateOperation, callback);
 };
 
 /**
@@ -1610,7 +1646,7 @@ function _findAndModify(query, sort, doc, options, callback) {
   // Force read preference primary
   options.readPreference = ReadPreference.PRIMARY;
 
-  return executeOperation(this.s.topology, findAndModify, [
+  return executeLegacyOperation(this.s.topology, findAndModify, [
     this,
     query,
     sort,
@@ -1640,7 +1676,13 @@ Collection.prototype.findAndRemove = deprecate(function(query, sort, options, ca
   sort = args.length ? args.shift() || [] : [];
   options = args.length ? args.shift() || {} : {};
 
-  return executeOperation(this.s.topology, findAndRemove, [this, query, sort, options, callback]);
+  return executeLegacyOperation(this.s.topology, findAndRemove, [
+    this,
+    query,
+    sort,
+    options,
+    callback
+  ]);
 }, 'collection.findAndRemove is deprecated. Use findOneAndDelete instead.');
 
 /**
@@ -1761,7 +1803,7 @@ Collection.prototype.parallelCollectionScan = deprecate(function(options, callba
 
   options = Object.assign({}, options);
   // Ensure we have the right read preference inheritance
-  options.readPreference = resolveReadPreference(options, { db: this.s.db, collection: this });
+  options.readPreference = resolveReadPreference(this, options);
 
   // Add a promiseLibrary
   options.promiseLibrary = this.s.promiseLibrary;
@@ -1770,9 +1812,12 @@ Collection.prototype.parallelCollectionScan = deprecate(function(options, callba
     options.session = undefined;
   }
 
-  return executeOperation(this.s.topology, parallelCollectionScan, [this, options, callback], {
-    skipSessions: true
-  });
+  return executeLegacyOperation(
+    this.s.topology,
+    parallelCollectionScan,
+    [this, options, callback],
+    { skipSessions: true }
+  );
 }, 'parallelCollectionScan is deprecated in MongoDB v4.1');
 
 /**
@@ -1795,7 +1840,9 @@ Collection.prototype.geoHaystackSearch = function(x, y, options, callback) {
   callback = typeof args[args.length - 1] === 'function' ? args.pop() : undefined;
   options = args.length ? args.shift() || {} : {};
 
-  return executeOperation(this.s.topology, geoHaystackSearch, [this, x, y, options, callback]);
+  const geoHaystackSearchOperation = new GeoHaystackSearchOperation(this, x, y, options);
+
+  return executeOperation(this.s.topology, geoHaystackSearchOperation, callback);
 };
 
 /**
@@ -1858,7 +1905,7 @@ Collection.prototype.group = deprecate(function(
   // Set up the command as default
   command = command == null ? true : command;
 
-  return executeOperation(this.s.topology, group, [
+  return executeLegacyOperation(this.s.topology, group, [
     this,
     keys,
     condition,
@@ -1915,8 +1962,9 @@ Collection.prototype.mapReduce = function(map, reduce, options, callback) {
   if ('function' === typeof options.finalize) {
     options.finalize = options.finalize.toString();
   }
+  const mapReduceOperation = new MapReduceOperation(this, map, reduce, options);
 
-  return executeOperation(this.s.topology, mapReduce, [this, map, reduce, options, callback]);
+  return executeOperation(this.s.topology, mapReduceOperation, callback);
 };
 
 /**