mongoose 5.2.3 → 5.2.7

package/lib/types/map.js

@@ -90,6 +90,10 @@ class MongooseMap extends Map {
     return new Map(this);
   }
 
+  toObject() {
+    return new Map(this);
+  }
+
   toJSON() {
     let ret = {};
     const keys = this.keys();

package/lib/types/objectid.js

@@ -8,7 +8,7 @@
  * @constructor ObjectId
  */
 
-var ObjectId = require('../drivers').ObjectId;
+var ObjectId = require('../driver').get().ObjectId;
 
 /*!
  * Getter for convenience with populate, see gh-6115

package/lib/types/subdocument.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var Document = require('../document');
+var immediate = require('../helpers/immediate');
 var internalToObjectOptions = require('../options').internalToObjectOptions;
 var utils = require('../utils');
 
@@ -68,7 +69,7 @@ Subdocument.prototype.save = function(options, fn) {
  */
 
 Subdocument.prototype.$__save = function(fn) {
-  return utils.immediate(() => fn(null, this));
+  return immediate(() => fn(null, this));
 };
 
 Subdocument.prototype.$isValid = function(path) {

package/lib/utils.js

@@ -8,6 +8,7 @@ const Decimal = require('./types/decimal128');
 const ObjectId = require('./types/objectid');
 const PromiseProvider = require('./promise_provider');
 const cloneRegExp = require('regexp-clone');
+const get = require('lodash.get');
 const sliced = require('sliced');
 const mpath = require('mpath');
 const ms = require('ms');
@@ -59,8 +60,8 @@ exports.deepEqual = function deepEqual(a, b) {
     return a.getTime() === b.getTime();
   }
 
-  if ((a instanceof ObjectId && b instanceof ObjectId) ||
-      (a instanceof Decimal && b instanceof Decimal)) {
+  if ((isBsonType(a, 'ObjectID') && isBsonType(b, 'ObjectID')) ||
+      (isBsonType(a, 'Decimal128') && isBsonType(b, 'Decimal128'))) {
     return a.toString() === b.toString();
   }
 
@@ -137,6 +138,14 @@ exports.deepEqual = function deepEqual(a, b) {
   return true;
 };
 
+/*!
+ * Get the bson type, if it exists
+ */
+
+function isBsonType(obj, typename) {
+  return get(obj, '_bsontype', void 0) === typename;
+}
+
 /*!
  * Get the last element of an array
  */
@@ -194,7 +203,7 @@ exports.clone = function clone(obj, options) {
   if (obj instanceof ObjectId) {
     return new ObjectId(obj.id);
   }
-  if (obj instanceof Decimal) {
+  if (isBsonType(obj, 'Decimal128')) {
     if (options && options.flattenDecimals) {
       return obj.toJSON();
     }
@@ -417,7 +426,7 @@ exports.isObject = function(arg) {
  */
 
 exports.isPOJO = function(arg) {
-  return arg != null && typeof arg === 'object';
+  return get(arg, 'constructor.name') === 'Object';
 };
 
 /*!
@@ -473,7 +482,10 @@ exports.isMongooseObject = function(v) {
     return false;
   }
 
-  return v.$__ != null || v.isMongooseArray || v.isMongooseBuffer;
+  return v.$__ != null || // Document
+    v.isMongooseArray || // Array or Document Array
+    v.isMongooseBuffer || // Buffer
+    v.$isMongooseMap; // Map
 };
 var isMongooseObject = exports.isMongooseObject;
 
@@ -878,17 +890,6 @@ exports.each = function(arr, fn) {
   }
 };
 
-/*!
- * Centralize this so we can more easily work around issues with people
- * stubbing out `process.nextTick()` in tests using sinon:
- * https://github.com/sinonjs/lolex#automatically-incrementing-mocked-time
- * See gh-6074
- */
-
-exports.immediate = function immediate(cb) {
-  return process.nextTick(cb);
-};
-
 /*!
  * ignore
  */

package/migrating_to_5.md

@@ -134,7 +134,7 @@ const cursorWithOptions = MyModel.
 
 Due to changes in the MongoDB driver, connection strings must be URI encoded.
 
-If they are not, connections may fail with an illegeal character message.
+If they are not, connections may fail with an illegal character message.
 
 #### Passwords which contain certain characters
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "5.2.3",
+  "version": "5.2.7",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -27,7 +27,7 @@
     "mongodb-core": "3.1.0",
     "mongoose-legacy-pluralize": "1.0.2",
     "mpath": "0.4.1",
-    "mquery": "3.0.0",
+    "mquery": "3.1.2",
     "ms": "2.0.0",
     "regexp-clone": "0.0.1",
     "sliced": "1.0.1"
@@ -41,7 +41,7 @@
     "bluebird": "3.5.0",
     "co": "4.6.0",
     "dox": "0.3.1",
-    "eslint": "4.14.0",
+    "eslint": "5.3.0",
     "highlight.js": "9.1.0",
     "jade": "1.11.0",
     "lodash": "4.17.5",
@@ -54,19 +54,17 @@
     "nyc": "11.8.0",
     "power-assert": "1.4.1",
     "q": "1.5.1",
-    "rimraf": "2.6.2",
     "semver": "5.5.0",
     "tbd": "0.6.4",
     "uuid": "2.0.3",
     "uuid-parse": "1.0.0",
-    "webpack": "4.12.0",
+    "webpack": "4.16.4",
     "validator": "5.4.0"
   },
   "directories": {
     "lib": "./lib/mongoose"
   },
   "scripts": {
-    "fix-lint": "eslint . --fix",
     "lint": "eslint . --quiet",
     "release": "git pull && git push origin master --tags && npm publish",
     "release-legacy": "git pull origin 4.x && git push origin 4.x --tags && npm publish --tag legacy",

package/tools/checkNodeVersion.js

@@ -0,0 +1,7 @@
+const version = process.version;
+const semver = require('semver');
+
+// Gnarly but this helps us avoid running eslint on node v4.
+if (!semver.satisfies(version, process.argv[2])) {
+  throw new Error(`${version} does not satisfy "${process.argv[2]}"`);
+}

package/tools/sharded.js

@@ -13,7 +13,7 @@ co(function*() {
 
   yield topology.addShard([{
     options: {
-      bind_ip: 'localhost', port: 31000, dbpath: `/data/db/31000`
+      bind_ip: 'localhost', port: 31000, dbpath: `/data/db/31000`, shardsvr: null
     }
   }], { replSet: 'rs1' });
 
@@ -29,9 +29,12 @@ co(function*() {
     binary: 'mongos'
   });
 
+  console.log('Start...');
   // Start up topology
   yield topology.start();
 
+  console.log('Started');
+
   // Shard db
   yield topology.enableSharding('test');
 

package/website.js

@@ -25,7 +25,8 @@ const tests = [
   ...acquit.parse(fs.readFileSync('./test/webpack.test.js').toString()),
   ...acquit.parse(fs.readFileSync('./test/geojson.test.js').toString()),
   ...acquit.parse(fs.readFileSync('./test/docs/transactions.test.js').toString()),
-  ...acquit.parse(fs.readFileSync('./test/schema.alias.test.js').toString())
+  ...acquit.parse(fs.readFileSync('./test/schema.alias.test.js').toString()),
+  ...acquit.parse(fs.readFileSync('./test/model.middleware.test.js').toString())
 ];
 
 function getVersion() {

package/lib/drivers/index.js

@@ -1,20 +0,0 @@
-/*!
- * ignore
- */
-
-var driver;
-
-if (typeof window === 'undefined') {
-  driver = require('./node-mongodb-native');
-  if (global.MONGOOSE_DRIVER_PATH) {
-    driver = require(global.MONGOOSE_DRIVER_PATH);
-  }
-} else {
-  driver = require('./browser');
-}
-
-/*!
- * ignore
- */
-
-module.exports = driver;

package/lib/drivers/index.web.js

@@ -1,5 +0,0 @@
-/*!
- * ignore
- */
-
-module.exports = require('./browser');