mongoose 6.0.4 → 6.0.8

package/lib/model.js

@@ -323,7 +323,6 @@ Model.prototype.$__handleSave = function(options, callback) {
       }
 
       _applyCustomWhere(this, where);
-
       this[modelCollectionSymbol].updateOne(where, delta[1], saveOptions, (err, ret) => {
         if (err) {
           this.$__undoReset();
@@ -1674,7 +1673,7 @@ function _ensureIndexes(model, options, callback) {
 
   for (const index of indexes) {
     if (isDefaultIdIndex(index)) {
-      console.warn('mongoose: Cannot specify a custom index on `_id` for ' +
+      utils.warn('mongoose: Cannot specify a custom index on `_id` for ' +
         'model name "' + model.modelName + '", ' +
         'MongoDB does not allow overwriting the default `_id` index. See ' +
         'http://bit.ly/mongodb-id-index');
@@ -1877,6 +1876,7 @@ Model.translateAliases = function translateAliases(fields) {
         // Alias found,
         translated.push(alias);
       } else {
+        alias = name;
         // Alias not found, so treat as un-aliased key
         translated.push(name);
       }
@@ -1942,6 +1942,8 @@ Model.translateAliases = function translateAliases(fields) {
  * To remove just the first document that matches `conditions`, set the `single`
  * option to true.
  *
+ * This method is deprecated. See [Deprecation Warnings](../deprecations.html#remove) for details.
+ *
  * ####Example:
  *
  *     const res = await Character.remove({ name: 'Eddard Stark' });
@@ -1953,6 +1955,7 @@ Model.translateAliases = function translateAliases(fields) {
  * are involved. Because no Mongoose documents are involved, Mongoose does
  * not execute [document middleware](/docs/middleware.html#types-of-middleware).
  *
+ * @deprecated
  * @param {Object} conditions
  * @param {Object} [options]
  * @param {Session} [options.session=null] the [session](https://docs.mongodb.com/manual/reference/server-sessions/) associated with this operation.
@@ -3063,7 +3066,7 @@ Model.create = function create(doc, options, callback) {
         !this.schema.path('session')) {
       // Probably means the user is running into the common mistake of trying
       // to use a spread to specify options, see gh-7535
-      console.warn('WARNING: to pass a `session` to `Model.create()` in ' +
+      utils.warn('WARNING: to pass a `session` to `Model.create()` in ' +
         'Mongoose, you **must** pass an array as the first argument. See: ' +
         'https://mongoosejs.com/docs/api.html#model_Model.create');
     }
@@ -3752,6 +3755,8 @@ Model.hydrate = function(obj, projection) {
  *
  * - `update()`
  *
+ * This method is deprecated. See [Deprecation Warnings](../deprecations.html#update) for details.
+ *
  * ####Examples:
  *
  *     MyModel.update({ age: { $gt: 18 } }, { oldEnough: true }, fn);
@@ -3799,6 +3804,7 @@ Model.hydrate = function(obj, projection) {
  *
  * Be careful to not use an existing model instance for the update clause (this won't work and can cause weird behavior like infinite loops). Also, ensure that the update clause does not have an _id property, which causes Mongo to return a "Mod on _id not allowed" error.
  *
+ * @deprecated
  * @see strict http://mongoosejs.com/docs/guide.html#strict
  * @see response http://docs.mongodb.org/v2.6/reference/command/update/#output
  * @param {Object} filter
@@ -4777,6 +4783,8 @@ Model.compile = function compile(name, schema, collectionName, connection, base)
   model[modelSymbol] = true;
   model.events = new EventEmitter();
 
+  schema._preCompile();
+
   model.prototype.$__setSchema(schema);
 
   const _userProvidedOptions = schema._userProvidedOptions || {};

package/lib/schema/SubdocumentPath.js

@@ -82,6 +82,8 @@ function _createConstructor(schema, baseClass) {
     }
   };
 
+  schema._preCompile();
+
   const proto = baseClass != null ? baseClass.prototype : Subdocument.prototype;
   _embedded.prototype = Object.create(proto);
   _embedded.prototype.$__setSchema(schema);

package/lib/schema/documentarray.js

@@ -117,6 +117,8 @@ function _createConstructor(schema, options, baseClass) {
     this.$session(this.ownerDocument().$session());
   }
 
+  schema._preCompile();
+
   const proto = baseClass != null ? baseClass.prototype : Subdocument.prototype;
   EmbeddedDocument.prototype = Object.create(proto);
   EmbeddedDocument.prototype.$__setSchema(schema);

package/lib/schema/number.js

@@ -315,12 +315,19 @@ SchemaNumber.prototype.enum = function(values, message) {
 
 
   if (!Array.isArray(values)) {
-    if (utils.isObject(values)) {
-      values = utils.object.vals(values);
-    } else {
+    const isObjectSyntax = utils.isPOJO(values) && values.values != null;
+    if (isObjectSyntax) {
+      message = values.message;
+      values = values.values;
+    } else if (typeof values === 'number') {
       values = Array.prototype.slice.call(arguments);
+      message = null;
     }
-    message = MongooseError.messages.Number.enum;
+
+    if (utils.isPOJO(values)) {
+      values = Object.values(values);
+    }
+    message = message || MongooseError.messages.Number.enum;
   }
 
   message = message == null ? MongooseError.messages.Number.enum : message;

package/lib/schema/objectid.js

@@ -27,11 +27,10 @@ function ObjectId(key, options) {
   const isKeyHexStr = typeof key === 'string' && key.length === 24 && /^[a-f0-9]+$/i.test(key);
   const suppressWarning = options && options.suppressWarning;
   if ((isKeyHexStr || typeof key === 'undefined') && !suppressWarning) {
-    console.warn('mongoose: To create a new ObjectId please try ' +
+    utils.warn('mongoose: To create a new ObjectId please try ' +
       '`Mongoose.Types.ObjectId` instead of using ' +
       '`Mongoose.Schema.ObjectId`. Set the `suppressWarning` option if ' +
       'you\'re trying to create a hex char path in your schema.');
-    console.trace();
   }
   SchemaType.call(this, key, options, 'ObjectID');
 }

package/lib/schema.js

@@ -15,6 +15,7 @@ const addAutoId = require('./helpers/schema/addAutoId');
 const get = require('./helpers/get');
 const getConstructorName = require('./helpers/getConstructorName');
 const getIndexes = require('./helpers/schema/getIndexes');
+const idGetter = require('./helpers/schema/idGetter');
 const merge = require('./helpers/schema/merge');
 const mpath = require('mpath');
 const readPref = require('./driver').get().ReadPreference;
@@ -641,7 +642,7 @@ Schema.prototype.path = function(path, obj) {
       'You are allowed to use it, but use at your own risk. ' +
       'To disable this warning pass `supressReservedKeysWarning` as a schema option.';
 
-    console.warn(errorMessage);
+    utils.warn(errorMessage);
   }
 
   if (typeof obj === 'object' && utils.hasUserDefinedProperty(obj, 'ref')) {
@@ -2041,9 +2042,13 @@ Schema.prototype._getSchema = function(path) {
             }
           }
         } else if (foundschema.$isSchemaMap) {
-          if (p + 1 >= parts.length) {
+          if (p >= parts.length) {
             return foundschema;
           }
+          // Any path in the map will be an instance of the map's embedded schematype
+          if (p + 1 >= parts.length) {
+            return foundschema.$__schemaType;
+          }
           const ret = search(parts.slice(p + 1), foundschema.$__schemaType.schema);
           return ret;
         }
@@ -2135,6 +2140,15 @@ function isArrayFilter(piece) {
   return piece.startsWith('$[') && piece.endsWith(']');
 }
 
+/*!
+ * Called by `compile()` _right before_ compiling. Good for making any changes to
+ * the schema that should respect options set by plugins, like `id`
+ */
+
+Schema.prototype._preCompile = function _preCompile() {
+  idGetter(this);
+};
+
 /*!
  * Module exports.
  */

package/lib/schematype.js

@@ -386,6 +386,11 @@ SchemaType.prototype.unique = function(bool) {
     throw new Error('Path "' + this.path + '" may not have `index` set to ' +
       'false and `unique` set to true');
   }
+
+  if (!this.options.hasOwnProperty('index') && bool === false) {
+    return this;
+  }
+
   if (this._index == null || this._index === true) {
     this._index = {};
   } else if (typeof this._index === 'string') {
@@ -417,6 +422,10 @@ SchemaType.prototype.text = function(bool) {
       'false and `text` set to true');
   }
 
+  if (!this.options.hasOwnProperty('index') && bool === false) {
+    return this;
+  }
+
   if (this._index === null || this._index === undefined ||
     typeof this._index === 'boolean') {
     this._index = {};
@@ -450,6 +459,10 @@ SchemaType.prototype.sparse = function(bool) {
       'false and `sparse` set to true');
   }
 
+  if (!this.options.hasOwnProperty('index') && bool === false) {
+    return this;
+  }
+
   if (this._index == null || typeof this._index === 'boolean') {
     this._index = {};
   } else if (typeof this._index === 'string') {
@@ -1384,8 +1397,9 @@ SchemaType._isRef = function(self, value, doc, init) {
     // - this populated with adhoc model and no ref was set in schema OR
     // - setting / pushing values after population
     const path = doc.$__fullPath(self.path, true);
+
     const owner = doc.ownerDocument ? doc.ownerDocument() : doc;
-    ref = owner.$populated(path) || doc.$populated(self.path);
+    ref = (path != null && owner.$populated(path)) || doc.$populated(self.path);
   }
 
   if (ref) {

package/lib/types/ArraySubdocument.js

@@ -31,29 +31,29 @@ function ArraySubdocument(obj, parentArr, skipId, fields, index) {
     this[documentArrayParent] = undefined;
   }
   this.$setIndex(index);
-  this.$isDocumentArrayElement = true;
   this.$__parent = this[documentArrayParent];
 
-  // Document.call(this, obj, fields, skipId);
   Subdocument.call(this, obj, fields, this[documentArrayParent], void 0, { isNew: true });
-  this.$isSingleNested = false;
-
-  const _this = this;
-  this.$on('isNew', function(val) {
-    _this.isNew = val;
-  });
-
-  _this.$on('save', function() {
-    _this.constructor.emit('save', _this);
-  });
 }
 
 /*!
- * Inherit from Document
+ * Inherit from Subdocument
  */
 ArraySubdocument.prototype = Object.create(Subdocument.prototype);
 ArraySubdocument.prototype.constructor = ArraySubdocument;
 
+Object.defineProperty(ArraySubdocument.prototype, '$isSingleNested', {
+  configurable: false,
+  writable: false,
+  value: false
+});
+
+Object.defineProperty(ArraySubdocument.prototype, '$isDocumentArrayElement', {
+  configurable: false,
+  writable: false,
+  value: true
+});
+
 for (const i in EventEmitter.prototype) {
   ArraySubdocument[i] = EventEmitter.prototype[i];
 }

package/lib/types/array/index.js

@@ -35,7 +35,7 @@ function MongooseArray(values, path, doc, schematype) {
     [arrayAtomicsSymbol]: {},
     [arrayAtomicsBackupSymbol]: void 0,
     [arrayPathSymbol]: path,
-    [arraySchemaSymbol]: void 0,
+    [arraySchemaSymbol]: schematype,
     [arrayParentSymbol]: void 0,
     isMongooseArray: true,
     isMongooseArrayProxy: true,

package/lib/types/map.js

@@ -135,7 +135,7 @@ class MongooseMap extends Map {
       const ret = {};
       const keys = this.keys();
       for (const key of keys) {
-        ret[key] = clone(this.get(key));
+        ret[key] = clone(this.get(key), options);
       }
       return ret;
     }

package/lib/types/objectid.js

@@ -29,7 +29,8 @@ Object.defineProperty(ObjectId.prototype, '_id', {
  * Convenience `valueOf()` to allow comparing ObjectIds using double equals re: gh-7299
  */
 
-if (ObjectId.prototype.valueOf === void 0) {
+
+if (!ObjectId.prototype.hasOwnProperty('valueOf')) {
   ObjectId.prototype.valueOf = function objectIdValueOf() {
     return this.toString();
   };

package/lib/types/subdocument.js

@@ -5,6 +5,7 @@ const immediate = require('../helpers/immediate');
 const internalToObjectOptions = require('../options').internalToObjectOptions;
 const promiseOrCallback = require('../helpers/promiseOrCallback');
 const util = require('util');
+const utils = require('../utils');
 
 module.exports = Subdocument;
 
@@ -16,7 +17,6 @@ module.exports = Subdocument;
  */
 
 function Subdocument(value, fields, parent, skipId, options) {
-  this.$isSingleNested = true;
   if (parent != null) {
     // If setting a nested path, should copy isNew from parent re: gh-7048
     const parentOptions = { isNew: parent.isNew, defaults: parent.$__.$options.defaults };
@@ -32,6 +32,12 @@ function Subdocument(value, fields, parent, skipId, options) {
 
 Subdocument.prototype = Object.create(Document.prototype);
 
+Object.defineProperty(Subdocument.prototype, '$isSingleNested', {
+  configurable: false,
+  writable: false,
+  value: true
+});
+
 /*!
  * ignore
  */
@@ -60,7 +66,7 @@ Subdocument.prototype.save = function(options, fn) {
   options = options || {};
 
   if (!options.suppressWarning) {
-    console.warn('mongoose: calling `save()` on a subdoc does **not** save ' +
+    utils.warn('mongoose: calling `save()` on a subdoc does **not** save ' +
       'the document to MongoDB, it only runs save middleware. ' +
       'Use `subdoc.save({ suppressWarning: true })` to hide this warning ' +
       'if you\'re sure this behavior is right for your app.');

package/lib/utils.js

@@ -950,4 +950,12 @@ exports.errorToPOJO = function errorToPOJO(error) {
     ret[properyName] = error[properyName];
   }
   return ret;
+};
+
+/*!
+ * ignore
+ */
+
+exports.warn = function warn(message) {
+  return process.emitWarning(message, { code: 'MONGOOSE' });
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.0.4",
+  "version": "6.0.8",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -73,7 +73,7 @@
     "build-browser": "node build-browser.js",
     "prepublishOnly": "npm run build-browser",
     "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",
+    "release-legacy": "git pull origin 5.x && git push origin 5.x --tags && npm publish --tag legacy",
     "test": "mocha --exit ./test/*.test.js ./test/typescript/main.test.js",
     "tdd": "mocha ./test/*.test.js ./test/typescript/main.test.js --inspect --watch --recursive --watch-files ./**/*.js",
     "test-cov": "nyc --reporter=html --reporter=text npm test"
@@ -104,24 +104,26 @@
     "extends": [
       "eslint:recommended"
     ],
-    "overrides": [{
-      "files": [
-        "**/*.{ts,tsx}"
-      ],
-      "extends": [
-        "plugin:@typescript-eslint/eslint-recommended",
-        "plugin:@typescript-eslint/recommended"
-      ],
-      "plugins": [
-        "@typescript-eslint"
-      ],
-      "rules": {
-        "@typescript-eslint/no-explicit-any": "off",
-        "@typescript-eslint/ban-types": "off",
-        "@typescript-eslint/no-unused-vars": "off",
-        "@typescript-eslint/explicit-module-boundary-types": "off"
+    "overrides": [
+      {
+        "files": [
+          "**/*.{ts,tsx}"
+        ],
+        "extends": [
+          "plugin:@typescript-eslint/eslint-recommended",
+          "plugin:@typescript-eslint/recommended"
+        ],
+        "plugins": [
+          "@typescript-eslint"
+        ],
+        "rules": {
+          "@typescript-eslint/no-explicit-any": "off",
+          "@typescript-eslint/ban-types": "off",
+          "@typescript-eslint/no-unused-vars": "off",
+          "@typescript-eslint/explicit-module-boundary-types": "off"
+        }
       }
-    }],
+    ],
     "plugins": [
       "mocha-no-only"
     ],
@@ -245,4 +247,4 @@
     "type": "opencollective",
     "url": "https://opencollective.com/mongoose"
   }
-}
+}

package/tools/repl.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const co = require('co');
 run().catch(error => {
   console.error(error);
   process.exit(-1);