mongodb 3.2.5 → 3.3.0-beta2

package/HISTORY.md

@@ -2,16 +2,6 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-<a name="3.2.5"></a>
-## [3.2.5](https://github.com/mongodb/node-mongodb-native/compare/v3.2.4...v3.2.5) (2019-05-17)
-
-
-### Bug Fixes
-
-* **core:** updating core to 3.2.5 ([a2766c1](https://github.com/mongodb/node-mongodb-native/commit/a2766c1))
-
-
-
 <a name="3.2.4"></a>
 ## [3.2.4](https://github.com/mongodb/node-mongodb-native/compare/v3.2.2...v3.2.4) (2019-05-08)
 

package/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 // Core module
-const core = require('mongodb-core');
+const core = require('./lib/core');
 const Instrumentation = require('./lib/apm');
 
 // Set up the connect function
@@ -19,7 +19,7 @@ connect.Collection = require('./lib/collection');
 connect.Server = require('./lib/topologies/server');
 connect.ReplSet = require('./lib/topologies/replset');
 connect.Mongos = require('./lib/topologies/mongos');
-connect.ReadPreference = require('mongodb-core').ReadPreference;
+connect.ReadPreference = core.ReadPreference;
 connect.GridStore = require('./lib/gridfs/grid_store');
 connect.Chunk = require('./lib/gridfs/chunk');
 connect.Logger = core.Logger;
@@ -28,8 +28,8 @@ connect.CommandCursor = require('./lib/command_cursor');
 connect.Cursor = require('./lib/cursor');
 connect.GridFSBucket = require('./lib/gridfs-stream');
 // Exported to be used in tests not to be used anywhere else
-connect.CoreServer = require('mongodb-core').Server;
-connect.CoreConnection = require('mongodb-core').Connection;
+connect.CoreServer = core.Server;
+connect.CoreConnection = core.Connection;
 
 // BSON types exported
 connect.Binary = core.BSON.Binary;

package/lib/admin.js

@@ -1,14 +1,13 @@
 'use strict';
 
-const executeOperation = require('./utils').executeOperation;
 const applyWriteConcern = require('./utils').applyWriteConcern;
 
-const addUser = require('./operations/db_ops').addUser;
-const executeDbAdminCommand = require('./operations/db_ops').executeDbAdminCommand;
-const removeUser = require('./operations/db_ops').removeUser;
-const replSetGetStatus = require('./operations/admin_ops').replSetGetStatus;
-const serverStatus = require('./operations/admin_ops').serverStatus;
-const validateCollection = require('./operations/admin_ops').validateCollection;
+const AddUserOperation = require('./operations/add_user');
+const ExecuteDbAdminCommandOperation = require('./operations/execute_db_admin_command');
+const RemoveUserOperation = require('./operations/remove_user');
+const ValidateCollectionOperation = require('./operations/validate_collection');
+
+const executeOperation = require('./operations/execute_operation');
 
 /**
  * @fileOverview The **Admin** class is an internal class that allows convenient access to
@@ -75,12 +74,9 @@ Admin.prototype.command = function(command, options, callback) {
   callback = typeof args[args.length - 1] === 'function' ? args.pop() : undefined;
   options = args.length ? args.shift() : {};
 
-  return executeOperation(this.s.db.s.topology, executeDbAdminCommand.bind(this.s.db), [
-    this.s.db,
-    command,
-    options,
-    callback
-  ]);
+  const commandOperation = new ExecuteDbAdminCommandOperation(this.s.db, command, options);
+
+  return executeOperation(this.s.db.s.topology, commandOperation, callback);
 };
 
 /**
@@ -97,12 +93,10 @@ Admin.prototype.buildInfo = function(options, callback) {
   options = options || {};
 
   const cmd = { buildinfo: 1 };
-  return executeOperation(this.s.db.s.topology, executeDbAdminCommand.bind(this.s.db), [
-    this.s.db,
-    cmd,
-    options,
-    callback
-  ]);
+
+  const buildInfoOperation = new ExecuteDbAdminCommandOperation(this.s.db, cmd, options);
+
+  return executeOperation(this.s.db.s.topology, buildInfoOperation, callback);
 };
 
 /**
@@ -119,12 +113,10 @@ Admin.prototype.serverInfo = function(options, callback) {
   options = options || {};
 
   const cmd = { buildinfo: 1 };
-  return executeOperation(this.s.db.s.topology, executeDbAdminCommand.bind(this.s.db), [
-    this.s.db,
-    cmd,
-    options,
-    callback
-  ]);
+
+  const serverInfoOperation = new ExecuteDbAdminCommandOperation(this.s.db, cmd, options);
+
+  return executeOperation(this.s.db.s.topology, serverInfoOperation, callback);
 };
 
 /**
@@ -139,7 +131,13 @@ Admin.prototype.serverStatus = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.db.s.topology, serverStatus, [this, options, callback]);
+  const serverStatusOperation = new ExecuteDbAdminCommandOperation(
+    this.s.db,
+    { serverStatus: 1 },
+    options
+  );
+
+  return executeOperation(this.s.db.s.topology, serverStatusOperation, callback);
 };
 
 /**
@@ -155,12 +153,10 @@ Admin.prototype.ping = function(options, callback) {
   options = options || {};
 
   const cmd = { ping: 1 };
-  return executeOperation(this.s.db.s.topology, executeDbAdminCommand.bind(this.s.db), [
-    this.s.db,
-    cmd,
-    options,
-    callback
-  ]);
+
+  const pingOperation = new ExecuteDbAdminCommandOperation(this.s.db, cmd, options);
+
+  return executeOperation(this.s.db.s.topology, pingOperation, callback);
 };
 
 /**
@@ -183,6 +179,12 @@ Admin.prototype.addUser = function(username, password, options, callback) {
   const args = Array.prototype.slice.call(arguments, 2);
   callback = typeof args[args.length - 1] === 'function' ? args.pop() : undefined;
 
+  // Special case where there is no password ($external users)
+  if (typeof username === 'string' && password != null && typeof password === 'object') {
+    options = password;
+    password = null;
+  }
+
   options = args.length ? args.shift() : {};
   options = Object.assign({}, options);
   // Get the options
@@ -190,13 +192,9 @@ Admin.prototype.addUser = function(username, password, options, callback) {
   // Set the db name to admin
   options.dbName = 'admin';
 
-  return executeOperation(this.s.db.s.topology, addUser, [
-    this.s.db,
-    username,
-    password,
-    options,
-    callback
-  ]);
+  const addUserOperation = new AddUserOperation(this.s.db, username, password, options);
+
+  return executeOperation(this.s.db.s.topology, addUserOperation, callback);
 };
 
 /**
@@ -223,12 +221,9 @@ Admin.prototype.removeUser = function(username, options, callback) {
   // Set the db name
   options.dbName = 'admin';
 
-  return executeOperation(this.s.db.s.topology, removeUser, [
-    this.s.db,
-    username,
-    options,
-    callback
-  ]);
+  const removeUserOperation = new RemoveUserOperation(this.s.db, username, options);
+
+  return executeOperation(this.s.db.s.topology, removeUserOperation, callback);
 };
 
 /**
@@ -244,12 +239,13 @@ Admin.prototype.validateCollection = function(collectionName, options, callback)
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.db.s.topology, validateCollection, [
+  const validateCollectionOperation = new ValidateCollectionOperation(
     this,
     collectionName,
-    options,
-    callback
-  ]);
+    options
+  );
+
+  return executeOperation(this.s.db.s.topology, validateCollectionOperation, callback);
 };
 
 /**
@@ -267,12 +263,10 @@ Admin.prototype.listDatabases = function(options, callback) {
 
   const cmd = { listDatabases: 1 };
   if (options.nameOnly) cmd.nameOnly = Number(cmd.nameOnly);
-  return executeOperation(this.s.db.s.topology, executeDbAdminCommand.bind(this.s.db), [
-    this.s.db,
-    cmd,
-    options,
-    callback
-  ]);
+
+  const listDatabasesOperation = new ExecuteDbAdminCommandOperation(this.s.db, cmd, options);
+
+  return executeOperation(this.s.db.s.topology, listDatabasesOperation, callback);
 };
 
 /**
@@ -287,7 +281,13 @@ Admin.prototype.replSetGetStatus = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  return executeOperation(this.s.db.s.topology, replSetGetStatus, [this, options, callback]);
+  const replSetGetStatusOperation = new ExecuteDbAdminCommandOperation(
+    this.s.db,
+    { replSetGetStatus: 1 },
+    options
+  );
+
+  return executeOperation(this.s.db.s.topology, replSetGetStatusOperation, callback);
 };
 
 module.exports = Admin;

package/lib/aggregation_cursor.js

@@ -1,11 +1,12 @@
 'use strict';
 
 const inherits = require('util').inherits;
-const MongoError = require('mongodb-core').MongoError;
+const MongoError = require('./core').MongoError;
 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
@@ -55,10 +56,12 @@ const SUPPORTS = require('./utils').SUPPORTS;
  * @fires AggregationCursor#readable
  * @return {AggregationCursor} an AggregationCursor instance.
  */
-var AggregationCursor = function(bson, ns, cmd, options, topology, topologyOptions) {
+var AggregationCursor = function(topology, ns, cmd, options) {
   CoreCursor.apply(this, Array.prototype.slice.call(arguments, 0));
   var state = AggregationCursor.INIT;
   var streamOptions = {};
+  const bson = topology.s.bson;
+  const topologyOptions = topology.s.options;
 
   // MaxTimeMS
   var maxTimeMS = null;
@@ -80,7 +83,8 @@ var AggregationCursor = function(bson, ns, cmd, options, topology, topologyOptio
     // BSON
     bson: bson,
     // Namespace
-    ns: ns,
+    // TODO: switch to raw namespace object later
+    namespace: MongoDBNamespace.fromString(ns),
     // Command
     cmd: cmd,
     // Options

package/lib/bulk/common.js

@@ -1,15 +1,15 @@
 'use strict';
 
-const Long = require('mongodb-core').BSON.Long;
-const MongoError = require('mongodb-core').MongoError;
-const ObjectID = require('mongodb-core').BSON.ObjectID;
-const BSON = require('mongodb-core').BSON;
-const MongoWriteConcernError = require('mongodb-core').MongoWriteConcernError;
+const Long = require('../core').BSON.Long;
+const MongoError = require('../core').MongoError;
+const ObjectID = require('../core').BSON.ObjectID;
+const BSON = require('../core').BSON;
+const MongoWriteConcernError = require('../core').MongoWriteConcernError;
 const toError = require('../utils').toError;
 const handleCallback = require('../utils').handleCallback;
 const applyRetryableWrites = require('../utils').applyRetryableWrites;
 const applyWriteConcern = require('../utils').applyWriteConcern;
-const executeOperation = require('../utils').executeOperation;
+const executeLegacyOperation = require('../utils').executeLegacyOperation;
 const isPromiseLike = require('../utils').isPromiseLike;
 
 // Error codes
@@ -708,7 +708,7 @@ class BulkOperationBase {
     options = options == null ? {} : options;
     // TODO Bring from driver information in isMaster
     // Get the namespace for the write operations
-    const namespace = collection.collectionName;
+    const namespace = collection.s.namespace;
     // Used to mark operation as executed
     const executed = false;
 
@@ -1007,7 +1007,7 @@ class BulkOperationBase {
     options = ret.options;
     callback = ret.callback;
 
-    return executeOperation(this.s.topology, executeCommands, [this, options, callback]);
+    return executeLegacyOperation(this.s.topology, executeCommands, [this, options, callback]);
   }
 
   /**
@@ -1069,21 +1069,21 @@ class BulkOperationBase {
     try {
       if (config.batch.batchType === INSERT) {
         this.s.topology.insert(
-          this.s.collection.namespace,
+          this.s.namespace,
           config.batch.operations,
           finalOptions,
           config.resultHandler
         );
       } else if (config.batch.batchType === UPDATE) {
         this.s.topology.update(
-          this.s.collection.namespace,
+          this.s.namespace,
           config.batch.operations,
           finalOptions,
           config.resultHandler
         );
       } else if (config.batch.batchType === REMOVE) {
         this.s.topology.remove(
-          this.s.collection.namespace,
+          this.s.namespace,
           config.batch.operations,
           finalOptions,
           config.resultHandler
@@ -1115,11 +1115,15 @@ class BulkOperationBase {
         return true;
       }
 
+      const msg = this.s.bulkResult.writeErrors[0].errmsg
+        ? this.s.bulkResult.writeErrors[0].errmsg
+        : 'write operation failed';
+
       handleCallback(
         callback,
         new BulkWriteError(
           toError({
-            message: 'write operation failed',
+            message: msg,
             code: this.s.bulkResult.writeErrors[0].code,
             writeErrors: this.s.bulkResult.writeErrors
           }),
@@ -1153,5 +1157,6 @@ module.exports = {
   bson,
   INSERT: INSERT,
   UPDATE: UPDATE,
-  REMOVE: REMOVE
+  REMOVE: REMOVE,
+  BulkWriteError
 };