mongodb 3.2.5 → 3.3.0-beta2

package/lib/utils.js

@@ -1,7 +1,8 @@
 'use strict';
 
-const MongoError = require('mongodb-core').MongoError;
-const ReadPreference = require('mongodb-core').ReadPreference;
+const MongoError = require('./core').MongoError;
+const ReadPreference = require('./core').ReadPreference;
+const WriteConcern = require('./write_concern');
 
 var shallowClone = function(obj) {
   var copy = {};
@@ -361,7 +362,7 @@ var mergeOptionsAndWriteConcern = function(targetOptions, sourceOptions, keys, m
  * @param {array} args Arguments to apply the provided operation
  * @param {object} [options] Options that modify the behavior of the method
  */
-const executeOperation = (topology, operation, args, options) => {
+const executeLegacyOperation = (topology, operation, args, options) => {
   if (topology == null) {
     throw new TypeError('This method requires a valid topology instance');
   }
@@ -422,7 +423,7 @@ const executeOperation = (topology, operation, args, options) => {
 
   // Return a Promise
   if (args[args.length - 1] != null) {
-    throw new TypeError('final argument to `executeOperation` must be a callback');
+    throw new TypeError('final argument to `executeLegacyOperation` must be a callback');
   }
 
   return new Promise(function(resolve, reject) {
@@ -474,26 +475,16 @@ function applyWriteConcern(target, sources, options) {
     return target;
   }
 
-  if (options.w != null || options.j != null || options.fsync != null) {
-    const writeConcern = {};
-    if (options.w != null) writeConcern.w = options.w;
-    if (options.wtimeout != null) writeConcern.wtimeout = options.wtimeout;
-    if (options.j != null) writeConcern.j = options.j;
-    if (options.fsync != null) writeConcern.fsync = options.fsync;
+  const writeConcern = WriteConcern.fromOptions(options);
+  if (writeConcern) {
     return Object.assign(target, { writeConcern });
   }
 
-  if (
-    coll &&
-    (coll.writeConcern.w != null || coll.writeConcern.j != null || coll.writeConcern.fsync != null)
-  ) {
+  if (coll && coll.writeConcern) {
     return Object.assign(target, { writeConcern: Object.assign({}, coll.writeConcern) });
   }
 
-  if (
-    db &&
-    (db.writeConcern.w != null || db.writeConcern.j != null || db.writeConcern.fsync != null)
-  ) {
+  if (db && db.writeConcern) {
     return Object.assign(target, { writeConcern: Object.assign({}, db.writeConcern) });
   }
 
@@ -505,56 +496,27 @@ function applyWriteConcern(target, sources, options) {
  * determine the read preference (if there is one), but will also ensure the returned value is a
  * properly constructed instance of `ReadPreference`.
  *
+ * @param {Collection|Db|MongoClient} parent The parent of the operation on which to determine the read
+ * preference, used for determining the inherited read preference.
  * @param {Object} options The options passed into the method, potentially containing a read preference
- * @param {Object} sources Sources from which we can inherit a read preference
  * @returns {(ReadPreference|null)} The resolved read preference
  */
-function resolveReadPreference(options, sources) {
+function resolveReadPreference(parent, options) {
   options = options || {};
-  sources = sources || {};
-
-  const db = sources.db;
-  const coll = sources.collection;
-  const defaultReadPreference = sources.default;
   const session = options.session;
 
+  const inheritedReadPreference = parent.readPreference;
+
   let readPreference;
   if (options.readPreference) {
-    readPreference = options.readPreference;
+    readPreference = ReadPreference.fromOptions(options);
   } else if (session && session.inTransaction() && session.transaction.options.readPreference) {
     // The transaction’s read preference MUST override all other user configurable read preferences.
     readPreference = session.transaction.options.readPreference;
+  } else if (inheritedReadPreference != null) {
+    readPreference = inheritedReadPreference;
   } else {
-    if (coll && coll.s.readPreference) {
-      readPreference = coll.s.readPreference;
-    } else if (db && db.s.readPreference) {
-      readPreference = db.s.readPreference;
-    } else if (defaultReadPreference) {
-      readPreference = defaultReadPreference;
-    }
-  }
-
-  // do we even have a read preference?
-  if (readPreference == null) {
-    return null;
-  }
-
-  // now attempt to convert the read preference if necessary
-  if (typeof readPreference === 'string') {
-    readPreference = new ReadPreference(readPreference);
-  } else if (
-    readPreference &&
-    !(readPreference instanceof ReadPreference) &&
-    typeof readPreference === 'object'
-  ) {
-    const mode = readPreference.mode || readPreference.preference;
-    if (mode && typeof mode === 'string') {
-      readPreference = new ReadPreference(mode, readPreference.tags, {
-        maxStalenessSeconds: readPreference.maxStalenessSeconds
-      });
-    }
-  } else if (!(readPreference instanceof ReadPreference)) {
-    throw new TypeError('Invalid read preference: ' + readPreference);
+    throw new Error('No readPreference was provided or inherited.');
   }
 
   return readPreference;
@@ -699,6 +661,30 @@ try {
   SUPPORTS.ASYNC_ITERATOR = false;
 }
 
+class MongoDBNamespace {
+  constructor(db, collection) {
+    this.db = db;
+    this.collection = collection;
+  }
+
+  toString() {
+    return this.collection ? `${this.db}.${this.collection}` : this.db;
+  }
+
+  withCollection(collection) {
+    return new MongoDBNamespace(this.db, collection);
+  }
+
+  static fromString(namespace) {
+    if (!namespace) {
+      throw new Error(`Cannot parse namespace from "${namespace}"`);
+    }
+
+    const index = namespace.indexOf('.');
+    return new MongoDBNamespace(namespace.substring(0, index), namespace.substring(index + 1));
+  }
+}
+
 module.exports = {
   filterOptions,
   mergeOptions,
@@ -717,13 +703,14 @@ module.exports = {
   MAX_JS_INT: Number.MAX_SAFE_INTEGER + 1,
   mergeOptionsAndWriteConcern,
   translateReadPreference,
-  executeOperation,
+  executeLegacyOperation,
   applyRetryableWrites,
   applyWriteConcern,
-  resolveReadPreference,
   isPromiseLike,
   decorateWithCollation,
   decorateWithReadConcern,
   deprecateOptions,
-  SUPPORTS
+  SUPPORTS,
+  MongoDBNamespace,
+  resolveReadPreference
 };

package/lib/write_concern.js

@@ -0,0 +1,66 @@
+'use strict';
+
+/**
+ * The **WriteConcern** class is a class that represents a MongoDB WriteConcern.
+ * @class
+ * @property {(number|string)} w The write concern
+ * @property {number} wtimeout The write concern timeout
+ * @property {boolean} j The journal write concern
+ * @property {boolean} fsync The file sync write concern
+ * @see https://docs.mongodb.com/manual/reference/write-concern/index.html
+ */
+class WriteConcern {
+  /**
+   * Constructs a WriteConcern from the write concern properties.
+   * @param {(number|string)} [w] The write concern
+   * @param {number} [wtimeout] The write concern timeout
+   * @param {boolean} [j] The journal write concern
+   * @param {boolean} [fsync] The file sync write concern
+   */
+  constructor(w, wtimeout, j, fsync) {
+    if (w != null) {
+      this.w = w;
+    }
+    if (wtimeout != null) {
+      this.wtimeout = wtimeout;
+    }
+    if (j != null) {
+      this.j = j;
+    }
+    if (fsync != null) {
+      this.fsync = fsync;
+    }
+  }
+
+  /**
+   * Construct a WriteConcern given an options object.
+   *
+   * @param {object} options The options object from which to extract the write concern.
+   * @return {WriteConcern}
+   */
+  static fromOptions(options) {
+    if (
+      options == null ||
+      (options.writeConcern == null &&
+        options.w == null &&
+        options.wtimeout == null &&
+        options.j == null &&
+        options.fsync == null)
+    ) {
+      return;
+    }
+
+    if (options.writeConcern) {
+      return new WriteConcern(
+        options.writeConcern.w,
+        options.writeConcern.wtimeout,
+        options.writeConcern.j,
+        options.writeConcern.fsync
+      );
+    }
+
+    return new WriteConcern(options.w, options.wtimeout, options.j, options.fsync);
+  }
+}
+
+module.exports = WriteConcern;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "3.2.5",
+  "version": "3.3.0-beta2",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "files": [
@@ -16,13 +16,20 @@
     "driver",
     "official"
   ],
+  "peerOptionalDependencies": {
+    "kerberos": "^1.0.0",
+    "mongodb-client-encryption": "^1.0.0",
+    "mongodb-extjson": "^2.1.2",
+    "snappy": "^6.1.1",
+    "bson-ext": "^2.0.0"
+  },
   "dependencies": {
-    "mongodb-core": "3.2.5",
+    "bson": "^1.1.1",
+    "require_optional": "^1.0.1",
     "safe-buffer": "^5.1.2"
   },
   "devDependencies": {
     "bluebird": "3.5.0",
-    "bson": "^1.0.4",
     "chai": "^4.1.1",
     "chai-subset": "^1.6.0",
     "co": "4.6.0",
@@ -40,8 +47,10 @@
     "semver": "^5.5.0",
     "sinon": "^4.3.0",
     "sinon-chai": "^3.2.0",
+    "snappy": "^6.1.2",
     "standard-version": "^4.4.0",
-    "worker-farm": "^1.5.0"
+    "worker-farm": "^1.5.0",
+    "wtfnode": "^0.8.0"
   },
   "license": "Apache-2.0",
   "engines": {
@@ -52,8 +61,8 @@
   },
   "scripts": {
     "atlas": "node ./test/atlas_connectivity_tests.js",
-    "test": "npm run lint && mongodb-test-runner -t 60000 test/unit test/functional",
-    "coverage": "istanbul cover mongodb-test-runner -- -t 60000  test/unit test/functional",
+    "test": "npm run lint && mongodb-test-runner -t 60000 test/core test/unit test/functional",
+    "coverage": "istanbul cover mongodb-test-runner -- -t 60000 test/core test/unit test/functional",
     "lint": "eslint lib test",
     "format": "prettier --print-width 100 --tab-width 2 --single-quote --write 'test/**/*.js' 'lib/**/*.js'",
     "bench": "node test/driverBench/",