mongodb 3.0.6 → 3.0.7

package/CODE_OF_CONDUCT.md

@@ -0,0 +1,80 @@
+## Code of Conduct
+
+### Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age,
+body size, disability, ethnicity, gender identity and expression, level of
+experience, nationality, personal appearance, race, religion, or sexual
+identity and orientation.
+
+Please also take a moment to review [MongoDB's core values][mdb-core-values].
+
+### Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+### Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+### Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an
+appointed representative at an online or offline event. Representation of a
+project may be further defined and clarified by project maintainers.
+
+### Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team, or by
+[contacting GitHub][github-report-abuse]. All complaints will be reviewed
+and investigated and will result in a response that is deemed necessary and
+appropriate to the circumstances. The project team is obligated to maintain
+confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+### Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version [1.4][version].
+
+
+[github-report-abuse]: https://github.com/contact/report-abuse
+[homepage]: https://www.contributor-covenant.org/
+[mdb-core-values]: https://www.mongodb.com/company/
+[version]: https://www.contributor-covenant.org/version/1/4/

package/CONTRIBUTING.md

@@ -0,0 +1,29 @@
+# Contributing
+
+When contributing to this repository, please first discuss the change you wish
+to make via issue, pull request, or any other method with the owners of this
+repository before making a change.
+
+Please note we have a [code of conduct][code-of-conduct],
+please follow it in all your interactions with the project.
+
+## Commit messages
+
+Please follow the [Angular commit style][angular-commit-style].
+This helps the team automate [CHANGELOG.md][changelog] generation.
+
+## Pull Request Process
+
+1. Update the README.md or similar documentation with details of changes you
+   wish to make, if applicable. 
+2. Add any appropriate tests.
+3. Make your code or other changes.
+4. Review guidelines such as
+   [How to write the perfect pull request][github-perfect-pr], thanks!
+
+
+[angular-commit-style]: https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#commits
+[changelog]: CHANGELOG.md
+[code-of-conduct]: CODE_OF_CONDUCT.md
+[github-perfect-pr]: https://blog.github.com/2015-01-21-how-to-write-the-perfect-pull-request/
+[mdb-core-values]: https://www.mongodb.com/company/

package/HISTORY.md

@@ -1,3 +1,8 @@
+<a name="3.0.7"></a>
+## [3.0.7](https://github.com/mongodb/node-mongodb-native/compare/v3.0.6...v3.0.7) (2018-04-17)
+
+
+
 <a name="3.0.6"></a>
 ## [3.0.6](https://github.com/mongodb/node-mongodb-native/compare/v3.0.5...v3.0.6) (2018-04-09)
 

package/conf.json

@@ -49,7 +49,6 @@
       "outputSourceFiles" : true
     },
     "applicationName": "Node.js MongoDB Driver API",
-    "disqus": true,
     "googleAnalytics": "UA-29229787-1",
     "openGraph": {
       "title": "",

package/lib/admin.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var toError = require('./utils').toError,
-  Define = require('./metadata'),
-  shallowClone = require('./utils').shallowClone,
-  executeOperation = require('./utils').executeOperation;
+const toError = require('./utils').toError;
+const shallowClone = require('./utils').shallowClone;
+const executeOperation = require('./utils').executeOperation;
+const applyWriteConcern = require('./utils').applyWriteConcern;
 
 /**
  * @fileOverview The **Admin** class is an internal class that allows convenient access to
@@ -48,8 +48,6 @@ var Admin = function(db, topology, promiseLibrary) {
   };
 };
 
-var define = (Admin.define = new Define('Admin', Admin, false));
-
 /**
  * The callback format for results
  * @callback Admin~resultCallback
@@ -79,8 +77,6 @@ Admin.prototype.command = function(command, options, callback) {
   ]);
 };
 
-define.classMethod('command', { callback: true, promise: true });
-
 /**
  * Retrieve the server information for the current
  * instance of the db client
@@ -102,8 +98,6 @@ Admin.prototype.buildInfo = function(options, callback) {
   ]);
 };
 
-define.classMethod('buildInfo', { callback: true, promise: true });
-
 /**
  * Retrieve the server information for the current
  * instance of the db client
@@ -125,8 +119,6 @@ Admin.prototype.serverInfo = function(options, callback) {
   ]);
 };
 
-define.classMethod('serverInfo', { callback: true, promise: true });
-
 /**
  * Retrieve this db's server status.
  *
@@ -153,8 +145,6 @@ var serverStatus = function(self, options, callback) {
   });
 };
 
-define.classMethod('serverStatus', { callback: true, promise: true });
-
 /**
  * Ping the MongoDB server and retrieve results
  *
@@ -175,29 +165,6 @@ Admin.prototype.ping = function(options, callback) {
   ]);
 };
 
-define.classMethod('ping', { callback: true, promise: true });
-
-// Get write concern
-var writeConcern = function(options, db) {
-  options = shallowClone(options);
-
-  // If options already contain write concerns return it
-  if (options.w || options.wtimeout || options.j || options.fsync) {
-    return options;
-  }
-
-  // Set db write concern if available
-  if (db.writeConcern) {
-    if (options.w) options.w = db.writeConcern.w;
-    if (options.wtimeout) options.wtimeout = db.writeConcern.wtimeout;
-    if (options.j) options.j = db.writeConcern.j;
-    if (options.fsync) options.fsync = db.writeConcern.fsync;
-  }
-
-  // Return modified options
-  return options;
-};
-
 /**
  * Add a user to the database.
  * @method
@@ -222,7 +189,7 @@ Admin.prototype.addUser = function(username, password, options, callback) {
   options = args.length ? args.shift() : {};
   options = options || {};
   // Get the options
-  options = writeConcern(options, self.s.db);
+  options = applyWriteConcern(shallowClone(options), { db: self.s.db });
   // Set the db name to admin
   options.dbName = 'admin';
 
@@ -234,8 +201,6 @@ Admin.prototype.addUser = function(username, password, options, callback) {
   ]);
 };
 
-define.classMethod('addUser', { callback: true, promise: true });
-
 /**
  * Remove a user from a database
  * @method
@@ -257,7 +222,7 @@ Admin.prototype.removeUser = function(username, options, callback) {
   options = args.length ? args.shift() : {};
   options = options || {};
   // Get the options
-  options = writeConcern(options, self.s.db);
+  options = applyWriteConcern(shallowClone(options), { db: self.s.db });
   // Set the db name
   options.dbName = 'admin';
 
@@ -268,8 +233,6 @@ Admin.prototype.removeUser = function(username, options, callback) {
   ]);
 };
 
-define.classMethod('removeUser', { callback: true, promise: true });
-
 /**
  * Validate an existing collection
  *
@@ -317,8 +280,6 @@ var validateCollection = function(self, collectionName, options, callback) {
   });
 };
 
-define.classMethod('validateCollection', { callback: true, promise: true });
-
 /**
  * List the available databases
  *
@@ -341,8 +302,6 @@ Admin.prototype.listDatabases = function(options, callback) {
   ]);
 };
 
-define.classMethod('listDatabases', { callback: true, promise: true });
-
 /**
  * Get ReplicaSet status
  *
@@ -366,6 +325,4 @@ var replSetGetStatus = function(self, options, callback) {
   });
 };
 
-define.classMethod('replSetGetStatus', { callback: true, promise: true });
-
 module.exports = Admin;

package/lib/aggregation_cursor.js

@@ -1,10 +1,9 @@
 'use strict';
 
-var inherits = require('util').inherits,
-  MongoError = require('mongodb-core').MongoError,
-  Readable = require('stream').Readable,
-  Define = require('./metadata'),
-  CoreCursor = require('./cursor');
+const inherits = require('util').inherits;
+const MongoError = require('mongodb-core').MongoError;
+const Readable = require('stream').Readable;
+const CoreCursor = require('./cursor');
 
 /**
  * @fileOverview The **AggregationCursor** class is an internal class that embodies an aggregation cursor on MongoDB
@@ -131,8 +130,6 @@ for (var name in CoreCursor.prototype) {
   AggregationCursor.prototype[name] = CoreCursor.prototype[name];
 }
 
-var define = (AggregationCursor.define = new Define('AggregationCursor', AggregationCursor, true));
-
 /**
  * Set the batch size for the cursor.
  * @method
@@ -150,8 +147,6 @@ AggregationCursor.prototype.batchSize = function(value) {
   return this;
 };
 
-define.classMethod('batchSize', { callback: false, promise: false, returns: [AggregationCursor] });
-
 /**
  * Add a geoNear stage to the aggregation pipeline
  * @method
@@ -163,8 +158,6 @@ AggregationCursor.prototype.geoNear = function(document) {
   return this;
 };
 
-define.classMethod('geoNear', { callback: false, promise: false, returns: [AggregationCursor] });
-
 /**
  * Add a group stage to the aggregation pipeline
  * @method
@@ -176,8 +169,6 @@ AggregationCursor.prototype.group = function(document) {
   return this;
 };
 
-define.classMethod('group', { callback: false, promise: false, returns: [AggregationCursor] });
-
 /**
  * Add a limit stage to the aggregation pipeline
  * @method
@@ -189,8 +180,6 @@ AggregationCursor.prototype.limit = function(value) {
   return this;
 };
 
-define.classMethod('limit', { callback: false, promise: false, returns: [AggregationCursor] });
-
 /**
  * Add a match stage to the aggregation pipeline
  * @method
@@ -202,8 +191,6 @@ AggregationCursor.prototype.match = function(document) {
   return this;
 };
 
-define.classMethod('match', { callback: false, promise: false, returns: [AggregationCursor] });
-
 /**
  * Add a maxTimeMS stage to the aggregation pipeline
  * @method
@@ -217,8 +204,6 @@ AggregationCursor.prototype.maxTimeMS = function(value) {
   return this;
 };
 
-define.classMethod('maxTimeMS', { callback: false, promise: false, returns: [AggregationCursor] });
-
 /**
  * Add a out stage to the aggregation pipeline
  * @method
@@ -230,8 +215,6 @@ AggregationCursor.prototype.out = function(destination) {
   return this;
 };
 
-define.classMethod('out', { callback: false, promise: false, returns: [AggregationCursor] });
-
 /**
  * Add a project stage to the aggregation pipeline
  * @method
@@ -243,8 +226,6 @@ AggregationCursor.prototype.project = function(document) {
   return this;
 };
 
-define.classMethod('project', { callback: false, promise: false, returns: [AggregationCursor] });
-
 /**
  * Add a lookup stage to the aggregation pipeline
  * @method
@@ -256,8 +237,6 @@ AggregationCursor.prototype.lookup = function(document) {
   return this;
 };
 
-define.classMethod('lookup', { callback: false, promise: false, returns: [AggregationCursor] });
-
 /**
  * Add a redact stage to the aggregation pipeline
  * @method
@@ -269,8 +248,6 @@ AggregationCursor.prototype.redact = function(document) {
   return this;
 };
 
-define.classMethod('redact', { callback: false, promise: false, returns: [AggregationCursor] });
-
 /**
  * Add a skip stage to the aggregation pipeline
  * @method
@@ -282,8 +259,6 @@ AggregationCursor.prototype.skip = function(value) {
   return this;
 };
 
-define.classMethod('skip', { callback: false, promise: false, returns: [AggregationCursor] });
-
 /**
  * Add a sort stage to the aggregation pipeline
  * @method
@@ -295,8 +270,6 @@ AggregationCursor.prototype.sort = function(document) {
   return this;
 };
 
-define.classMethod('sort', { callback: false, promise: false, returns: [AggregationCursor] });
-
 /**
  * Add a unwind stage to the aggregation pipeline
  * @method
@@ -308,22 +281,8 @@ AggregationCursor.prototype.unwind = function(field) {
   return this;
 };
 
-define.classMethod('unwind', { callback: false, promise: false, returns: [AggregationCursor] });
-
 AggregationCursor.prototype.get = AggregationCursor.prototype.toArray;
 
-// Inherited methods
-define.classMethod('toArray', { callback: true, promise: true });
-define.classMethod('each', { callback: true, promise: false });
-define.classMethod('forEach', { callback: true, promise: false });
-define.classMethod('hasNext', { callback: true, promise: true });
-define.classMethod('next', { callback: true, promise: true });
-define.classMethod('close', { callback: true, promise: true });
-define.classMethod('isClosed', { callback: false, promise: false, returns: [Boolean] });
-define.classMethod('rewind', { callback: false, promise: false });
-define.classMethod('bufferedCount', { callback: false, promise: false, returns: [Number] });
-define.classMethod('readBufferedDocuments', { callback: false, promise: false, returns: [Array] });
-
 /**
  * Get the next available document from the cursor, returns null if no more documents are available.
  * @function AggregationCursor.prototype.next

package/lib/bulk/common.js

@@ -15,28 +15,6 @@ var INSERT = 1;
 var UPDATE = 2;
 var REMOVE = 3;
 
-// Get write concern
-var writeConcern = function(target, col, options) {
-  var writeConcern = {};
-
-  // Collection level write concern
-  if (col.writeConcern && col.writeConcern.w != null) writeConcern.w = col.writeConcern.w;
-  if (col.writeConcern && col.writeConcern.j != null) writeConcern.j = col.writeConcern.j;
-  if (col.writeConcern && col.writeConcern.fsync != null)
-    writeConcern.fsync = col.writeConcern.fsync;
-  if (col.writeConcern && col.writeConcern.wtimeout != null)
-    writeConcern.wtimeout = col.writeConcern.wtimeout;
-
-  // Options level write concern
-  if (options && options.w != null) writeConcern.w = options.w;
-  if (options && options.wtimeout != null) writeConcern.wtimeout = options.wtimeout;
-  if (options && options.j != null) writeConcern.j = options.j;
-  if (options && options.fsync != null) writeConcern.fsync = options.fsync;
-
-  // Return write concern
-  return writeConcern;
-};
-
 /**
  * Helper function to define properties
  * @ignore
@@ -455,7 +433,6 @@ exports.Batch = Batch;
 exports.LegacyOp = LegacyOp;
 exports.mergeBatchResults = mergeBatchResults;
 exports.cloneOptions = cloneOptions;
-exports.writeConcern = writeConcern;
 exports.INVALID_BSON_ERROR = INVALID_BSON_ERROR;
 exports.WRITE_CONCERN_ERROR = WRITE_CONCERN_ERROR;
 exports.MULTIPLE_ERROR = MULTIPLE_ERROR;

package/lib/bulk/ordered.js

@@ -1,18 +1,18 @@
 'use strict';
 
-var common = require('./common'),
-  utils = require('../utils'),
-  toError = require('../utils').toError,
-  handleCallback = require('../utils').handleCallback,
-  shallowClone = utils.shallowClone,
-  BulkWriteResult = common.BulkWriteResult,
-  ObjectID = require('mongodb-core').BSON.ObjectID,
-  Define = require('../metadata'),
-  BSON = require('mongodb-core').BSON,
-  Batch = common.Batch,
-  mergeBatchResults = common.mergeBatchResults,
-  executeOperation = require('../utils').executeOperation,
-  BulkWriteError = require('./common').BulkWriteError;
+const common = require('./common');
+const utils = require('../utils');
+const toError = require('../utils').toError;
+const handleCallback = require('../utils').handleCallback;
+const shallowClone = utils.shallowClone;
+const BulkWriteResult = common.BulkWriteResult;
+const ObjectID = require('mongodb-core').BSON.ObjectID;
+const BSON = require('mongodb-core').BSON;
+const Batch = common.Batch;
+const mergeBatchResults = common.mergeBatchResults;
+const executeOperation = utils.executeOperation;
+const BulkWriteError = require('./common').BulkWriteError;
+const applyWriteConcern = utils.applyWriteConcern;
 
 var bson = new BSON([
   BSON.Binary,
@@ -247,7 +247,8 @@ function OrderedBulkOperation(topology, collection, options) {
       : 1000;
 
   // Get the write concern
-  var writeConcern = common.writeConcern(shallowClone(options), collection, options);
+  var writeConcern = applyWriteConcern(shallowClone(options), { collection: collection }, options);
+  writeConcern = writeConcern.writeConcern;
 
   // Get the promiseLibrary
   var promiseLibrary = options.promiseLibrary || Promise;
@@ -309,12 +310,6 @@ function OrderedBulkOperation(topology, collection, options) {
   };
 }
 
-var define = (OrderedBulkOperation.define = new Define(
-  'OrderedBulkOperation',
-  OrderedBulkOperation,
-  false
-));
-
 OrderedBulkOperation.prototype.raw = function(op) {
   var key = Object.keys(op)[0];
 
@@ -602,8 +597,6 @@ OrderedBulkOperation.prototype.execute = function(_writeConcern, options, callba
   return executeOperation(this.s.topology, executeCommands, [this, options, callback]);
 };
 
-define.classMethod('execute', { callback: true, promise: false });
-
 /**
  * Returns an unordered batch object
  * @ignore

package/lib/bulk/unordered.js

@@ -1,18 +1,18 @@
 'use strict';
 
-var common = require('./common'),
-  utils = require('../utils'),
-  toError = require('../utils').toError,
-  handleCallback = require('../utils').handleCallback,
-  shallowClone = utils.shallowClone,
-  BulkWriteResult = common.BulkWriteResult,
-  ObjectID = require('mongodb-core').BSON.ObjectID,
-  BSON = require('mongodb-core').BSON,
-  Define = require('../metadata'),
-  Batch = common.Batch,
-  mergeBatchResults = common.mergeBatchResults,
-  executeOperation = require('../utils').executeOperation,
-  BulkWriteError = require('./common').BulkWriteError;
+const common = require('./common');
+const utils = require('../utils');
+const toError = require('../utils').toError;
+const handleCallback = require('../utils').handleCallback;
+const shallowClone = utils.shallowClone;
+const BulkWriteResult = common.BulkWriteResult;
+const ObjectID = require('mongodb-core').BSON.ObjectID;
+const BSON = require('mongodb-core').BSON;
+const Batch = common.Batch;
+const mergeBatchResults = common.mergeBatchResults;
+const executeOperation = utils.executeOperation;
+const BulkWriteError = require('./common').BulkWriteError;
+const applyWriteConcern = utils.applyWriteConcern;
 
 var bson = new BSON([
   BSON.Binary,
@@ -257,7 +257,8 @@ var UnorderedBulkOperation = function(topology, collection, options) {
       : 1000;
 
   // Get the write concern
-  var writeConcern = common.writeConcern(shallowClone(options), collection, options);
+  var writeConcern = applyWriteConcern(shallowClone(options), { collection: collection }, options);
+  writeConcern = writeConcern.writeConcern;
 
   // Get the promiseLibrary
   var promiseLibrary = options.promiseLibrary || Promise;
@@ -318,12 +319,6 @@ var UnorderedBulkOperation = function(topology, collection, options) {
   };
 };
 
-var define = (UnorderedBulkOperation.define = new Define(
-  'UnorderedBulkOperation',
-  UnorderedBulkOperation,
-  false
-));
-
 /**
  * Add a single insert document to the bulk operation
  *
@@ -616,8 +611,6 @@ UnorderedBulkOperation.prototype.execute = function(_writeConcern, options, call
   return executeOperation(this.s.topology, executeBatches, [this, options, callback]);
 };
 
-define.classMethod('execute', { callback: true, promise: false });
-
 /**
  * Returns an unordered batch object
  * @ignore