refactor: use operation for all building on AggregationCursor

Author: mbroadst

lib/aggregation_cursor.js

@@ -6,7 +6,6 @@ const Readable = require('stream').Readable;
 const CoreCursor = require('./cursor');
 const deprecate = require('util').deprecate;
 const SUPPORTS = require('./utils').SUPPORTS;
-const MongoDBNamespace = require('./utils').MongoDBNamespace;
 
 /**
  * @fileOverview The **AggregationCursor** class is an internal class that embodies an aggregation cursor on MongoDB
@@ -56,7 +55,7 @@ const MongoDBNamespace = require('./utils').MongoDBNamespace;
  * @fires AggregationCursor#readable
  * @return {AggregationCursor} an AggregationCursor instance.
  */
-var AggregationCursor = function(topology, ns, cmd, options) {
+var AggregationCursor = function(topology, operation, options) {
   CoreCursor.apply(this, Array.prototype.slice.call(arguments, 0));
   var state = AggregationCursor.INIT;
   var streamOptions = {};
@@ -84,9 +83,7 @@ var AggregationCursor = function(topology, ns, cmd, options) {
     bson: bson,
     // Namespace
     // TODO: switch to raw namespace object later
-    namespace: MongoDBNamespace.fromString(ns),
-    // Command
-    cmd: cmd,
+    namespace: operation.ns,
     // Options
     options: options,
     // Topology
@@ -149,11 +146,15 @@ if (SUPPORTS.ASYNC_ITERATOR) {
  * @return {AggregationCursor}
  */
 AggregationCursor.prototype.batchSize = function(value) {
-  if (this.s.state === AggregationCursor.CLOSED || this.isDead())
+  if (this.s.state === AggregationCursor.CLOSED || this.isDead()) {
     throw MongoError.create({ message: 'Cursor is closed', driver: true });
-  if (typeof value !== 'number')
+  }
+
+  if (typeof value !== 'number') {
     throw MongoError.create({ message: 'batchSize requires an integer', driver: true });
-  if (this.s.cmd.cursor) this.s.cmd.cursor.batchSize = value;
+  }
+
+  this.operation.options.batchSize = value;
   this.setCursorBatchSize(value);
   return this;
 };
@@ -165,7 +166,7 @@ AggregationCursor.prototype.batchSize = function(value) {
  * @return {AggregationCursor}
  */
 AggregationCursor.prototype.geoNear = deprecate(function(document) {
-  this.s.cmd.pipeline.push({ $geoNear: document });
+  this.operation.pipeline.push({ $geoNear: document });
   return this;
 }, 'The `$geoNear` stage is deprecated in MongoDB 4.0, and removed in version 4.2.');
 
@@ -176,7 +177,7 @@ AggregationCursor.prototype.geoNear = deprecate(function(document) {
  * @return {AggregationCursor}
  */
 AggregationCursor.prototype.group = function(document) {
-  this.s.cmd.pipeline.push({ $group: document });
+  this.operation.pipeline.push({ $group: document });
   return this;
 };
 
@@ -187,7 +188,7 @@ AggregationCursor.prototype.group = function(document) {
  * @return {AggregationCursor}
  */
 AggregationCursor.prototype.limit = function(value) {
-  this.s.cmd.pipeline.push({ $limit: value });
+  this.operation.pipeline.push({ $limit: value });
   return this;
 };
 
@@ -198,7 +199,7 @@ AggregationCursor.prototype.limit = function(value) {
  * @return {AggregationCursor}
  */
 AggregationCursor.prototype.match = function(document) {
-  this.s.cmd.pipeline.push({ $match: document });
+  this.operation.pipeline.push({ $match: document });
   return this;
 };
 
@@ -209,9 +210,7 @@ AggregationCursor.prototype.match = function(document) {
  * @return {AggregationCursor}
  */
 AggregationCursor.prototype.maxTimeMS = function(value) {
-  if (this.s.topology.lastIsMaster().minWireVersion > 2) {
-    this.s.cmd.maxTimeMS = value;
-  }
+  this.operation.options.maxTimeMS = value;
   return this;
 };
 
@@ -222,7 +221,7 @@ AggregationCursor.prototype.maxTimeMS = function(value) {
  * @return {AggregationCursor}
  */
 AggregationCursor.prototype.out = function(destination) {
-  this.s.cmd.pipeline.push({ $out: destination });
+  this.operation.pipeline.push({ $out: destination });
   return this;
 };
 
@@ -233,7 +232,7 @@ AggregationCursor.prototype.out = function(destination) {
  * @return {AggregationCursor}
  */
 AggregationCursor.prototype.project = function(document) {
-  this.s.cmd.pipeline.push({ $project: document });
+  this.operation.pipeline.push({ $project: document });
   return this;
 };
 
@@ -244,7 +243,7 @@ AggregationCursor.prototype.project = function(document) {
  * @return {AggregationCursor}
  */
 AggregationCursor.prototype.lookup = function(document) {
-  this.s.cmd.pipeline.push({ $lookup: document });
+  this.operation.pipeline.push({ $lookup: document });
   return this;
 };
 
@@ -255,7 +254,7 @@ AggregationCursor.prototype.lookup = function(document) {
  * @return {AggregationCursor}
  */
 AggregationCursor.prototype.redact = function(document) {
-  this.s.cmd.pipeline.push({ $redact: document });
+  this.operation.pipeline.push({ $redact: document });
   return this;
 };
 
@@ -266,7 +265,7 @@ AggregationCursor.prototype.redact = function(document) {
  * @return {AggregationCursor}
  */
 AggregationCursor.prototype.skip = function(value) {
-  this.s.cmd.pipeline.push({ $skip: value });
+  this.operation.pipeline.push({ $skip: value });
   return this;
 };
 
@@ -277,7 +276,7 @@ AggregationCursor.prototype.skip = function(value) {
  * @return {AggregationCursor}
  */
 AggregationCursor.prototype.sort = function(document) {
-  this.s.cmd.pipeline.push({ $sort: document });
+  this.operation.pipeline.push({ $sort: document });
   return this;
 };
 
@@ -288,7 +287,7 @@ AggregationCursor.prototype.sort = function(document) {
  * @return {AggregationCursor}
  */
 AggregationCursor.prototype.unwind = function(field) {
-  this.s.cmd.pipeline.push({ $unwind: field });
+  this.operation.pipeline.push({ $unwind: field });
   return this;
 };