mongoose 6.1.7 → 6.2.0

package/lib/query.js

@@ -34,7 +34,6 @@ const sanitizeFilter = require('./helpers/query/sanitizeFilter');
 const sanitizeProjection = require('./helpers/query/sanitizeProjection');
 const selectPopulatedFields = require('./helpers/query/selectPopulatedFields');
 const setDefaultsOnInsert = require('./helpers/setDefaultsOnInsert');
-const slice = require('sliced');
 const updateValidators = require('./helpers/updateValidators');
 const util = require('util');
 const utils = require('./utils');
@@ -379,14 +378,14 @@ Query.prototype.slice = function() {
     if ('number' === typeof arguments[0]) {
       this._ensurePath('slice');
       path = this._path;
-      val = slice(arguments);
+      val = [arguments[0], arguments[1]];
     } else {
       path = arguments[0];
       val = arguments[1];
     }
   } else if (arguments.length === 3) {
     path = arguments[0];
-    val = slice(arguments, 1);
+    val = [arguments[1], arguments[2]];
   }
 
   const p = {};
@@ -680,10 +679,10 @@ Query.prototype.mod = function() {
     path = this._path;
   } else if (arguments.length === 2 && !Array.isArray(arguments[1])) {
     this._ensurePath('mod');
-    val = slice(arguments);
+    val = [arguments[0], arguments[1]];
     path = this._path;
   } else if (arguments.length === 3) {
-    val = slice(arguments, 1);
+    val = [arguments[1], arguments[2]];
     path = arguments[0];
   } else {
     val = arguments[1];
@@ -5058,18 +5057,19 @@ Query.prototype.cast = function(model, obj) {
     model = getDiscriminatorByValue(model.discriminators, obj[discriminatorKey]) || model;
   }
 
+  const opts = { upsert: this.options && this.options.upsert };
+  if (this.options) {
+    if ('strict' in this.options) {
+      opts.strict = this.options.strict;
+      opts.strictQuery = opts.strict;
+    }
+    if ('strictQuery' in this.options) {
+      opts.strictQuery = this.options.strictQuery;
+    }
+  }
+
   try {
-    return cast(model.schema, obj, {
-      upsert: this.options && this.options.upsert,
-      strict: (this.options && 'strict' in this.options) ?
-        this.options.strict :
-        get(model, 'schema.options.strict', null),
-      strictQuery: (this.options && 'strictQuery' in this.options) ?
-        this.options.strictQuery :
-        (this.options && 'strict' in this.options) ?
-          this.options.strict :
-          get(model, 'schema.options.strictQuery', null)
-    }, this);
+    return cast(model.schema, obj, opts, this);
   } catch (err) {
     // CastError, assign model
     if (typeof err.setModel === 'function') {

package/lib/schema/SubdocumentPath.js

@@ -168,7 +168,7 @@ SubdocumentPath.prototype.cast = function(val, doc, init, priorVal, options) {
   const path = this.path;
   const selected = Object.keys(parentSelected).reduce((obj, key) => {
     if (key.startsWith(path + '.')) {
-      obj[key.substr(path.length + 1)] = parentSelected[key];
+      obj[key.substring(path.length + 1)] = parentSelected[key];
     }
     return obj;
   }, {});

package/lib/schema/array.js

@@ -344,7 +344,7 @@ SchemaArray.prototype.cast = function(value, doc, init, prev, options) {
       // Special case: if this index is on the parent of what looks like
       // GeoJSON, skip setting the default to empty array re: #1668, #3233
       const arrayGeojsonPath = this.path.endsWith('.coordinates') ?
-        this.path.substr(0, this.path.lastIndexOf('.')) : null;
+        this.path.substring(0, this.path.lastIndexOf('.')) : null;
       if (arrayGeojsonPath != null) {
         for (i = 0, l = indexes.length; i < l; ++i) {
           const pathIndex = indexes[i][0][arrayGeojsonPath];

package/lib/schema/documentarray.js

@@ -546,7 +546,7 @@ function scopePaths(array, fields, init) {
         continue;
       }
       if (sub.startsWith('$.')) {
-        sub = sub.substr(2);
+        sub = sub.substring(2);
       }
       hasKeys || (hasKeys = true);
       selected[sub] = fields[key];

package/lib/schema.js

@@ -31,6 +31,8 @@ const documentHooks = require('./helpers/model/applyHooks').middlewareFunctions;
 const hookNames = queryHooks.concat(documentHooks).
   reduce((s, hook) => s.add(hook), new Set());
 
+const isPOJO = utils.isPOJO;
+
 let id = 0;
 
 /**
@@ -73,6 +75,7 @@ let id = 0;
  * - [selectPopulatedPaths](/docs/guide.html#selectPopulatedPaths): boolean - defaults to `true`
  * - [skipVersioning](/docs/guide.html#skipVersioning): object - paths to exclude from versioning
  * - [timestamps](/docs/guide.html#timestamps): object or boolean - defaults to `false`. If true, Mongoose adds `createdAt` and `updatedAt` properties to your schema and manages those properties for you.
+ * - [pluginTags](/docs/guide.html#pluginTags): array of strings - defaults to `undefined`. If set and plugin called with `tags` option, will only apply that plugin to schemas with a matching tag.
  *
  * ####Options for Nested Schemas:
  * - `excludeIndexes`: bool - defaults to `false`. If `true`, skip building indexes on this schema's paths.
@@ -502,64 +505,66 @@ Schema.prototype.add = function add(obj, prefix) {
   }
 
   const keys = Object.keys(obj);
+  const typeKey = this.options.typeKey;
 
   for (const key of keys) {
     const fullPath = prefix + key;
+    const val = obj[key];
 
-    if (obj[key] == null) {
+    if (val == null) {
       throw new TypeError('Invalid value for schema path `' + fullPath +
-        '`, got value "' + obj[key] + '"');
+        '`, got value "' + val + '"');
     }
     // Retain `_id: false` but don't set it as a path, re: gh-8274.
-    if (key === '_id' && obj[key] === false) {
+    if (key === '_id' && val === false) {
       continue;
     }
-    if (obj[key] instanceof VirtualType || get(obj[key], 'constructor.name', null) === 'VirtualType') {
-      this.virtual(obj[key]);
+    if (val instanceof VirtualType || get(val, 'constructor.name', null) === 'VirtualType') {
+      this.virtual(val);
       continue;
     }
 
-    if (Array.isArray(obj[key]) && obj[key].length === 1 && obj[key][0] == null) {
+    if (Array.isArray(val) && val.length === 1 && val[0] == null) {
       throw new TypeError('Invalid value for schema Array path `' + fullPath +
-        '`, got value "' + obj[key][0] + '"');
+        '`, got value "' + val[0] + '"');
     }
 
-    if (!(utils.isPOJO(obj[key]) || obj[key] instanceof SchemaTypeOptions)) {
+    if (!(isPOJO(val) || val instanceof SchemaTypeOptions)) {
       // Special-case: Non-options definitely a path so leaf at this node
       // Examples: Schema instances, SchemaType instances
       if (prefix) {
-        this.nested[prefix.substr(0, prefix.length - 1)] = true;
+        this.nested[prefix.substring(0, prefix.length - 1)] = true;
       }
-      this.path(prefix + key, obj[key]);
-    } else if (Object.keys(obj[key]).length < 1) {
+      this.path(prefix + key, val);
+    } else if (Object.keys(val).length < 1) {
       // Special-case: {} always interpreted as Mixed path so leaf at this node
       if (prefix) {
-        this.nested[prefix.substr(0, prefix.length - 1)] = true;
+        this.nested[prefix.substring(0, prefix.length - 1)] = true;
       }
-      this.path(fullPath, obj[key]); // mixed type
-    } else if (!obj[key][this.options.typeKey] || (this.options.typeKey === 'type' && !(obj[key].type instanceof Function) && obj[key].type.type)) {
+      this.path(fullPath, val); // mixed type
+    } else if (!val[typeKey] || (typeKey === 'type' && isPOJO(val.type) && val.type.type)) {
       // Special-case: POJO with no bona-fide type key - interpret as tree of deep paths so recurse
       // nested object `{ last: { name: String } }`. Avoid functions with `.type` re: #10807 because
       // NestJS sometimes adds `Date.type`.
       this.nested[fullPath] = true;
-      this.add(obj[key], fullPath + '.');
+      this.add(val, fullPath + '.');
     } else {
       // There IS a bona-fide type key that may also be a POJO
-      const _typeDef = obj[key][this.options.typeKey];
-      if (utils.isPOJO(_typeDef) && Object.keys(_typeDef).length > 0) {
+      const _typeDef = val[typeKey];
+      if (isPOJO(_typeDef) && Object.keys(_typeDef).length > 0) {
         // If a POJO is the value of a type key, make it a subdocument
         if (prefix) {
-          this.nested[prefix.substr(0, prefix.length - 1)] = true;
+          this.nested[prefix.substring(0, prefix.length - 1)] = true;
         }
         const _schema = new Schema(_typeDef);
-        const schemaWrappedPath = Object.assign({}, obj[key], { type: _schema });
+        const schemaWrappedPath = Object.assign({}, val, { type: _schema });
         this.path(prefix + key, schemaWrappedPath);
       } else {
         // Either the type is non-POJO or we interpret it as Mixed anyway
         if (prefix) {
-          this.nested[prefix.substr(0, prefix.length - 1)] = true;
+          this.nested[prefix.substring(0, prefix.length - 1)] = true;
         }
-        this.path(prefix + key, obj[key]);
+        this.path(prefix + key, val);
       }
     }
   }

package/lib/schematype.js

@@ -128,6 +128,51 @@ function SchemaType(path, options, instance) {
 
 SchemaType.prototype.OptionsConstructor = SchemaTypeOptions;
 
+/**
+ * The path to this SchemaType in a Schema.
+ *
+ * ####Example:
+ *     const schema = new Schema({ name: String });
+ *     schema.path('name').path; // 'name'
+ *
+ * @property path
+ * @api public
+ * @memberOf SchemaType
+ */
+
+SchemaType.prototype.path;
+
+/**
+ * The validators that Mongoose should run to validate properties at this SchemaType's path.
+ *
+ * ####Example:
+ *     const schema = new Schema({ name: { type: String, required: true } });
+ *     schema.path('name').validators.length; // 1, the `required` validator
+ *
+ * @property validators
+ * @api public
+ * @memberOf SchemaType
+ */
+
+SchemaType.prototype.validators;
+
+/**
+ * True if this SchemaType has a required validator. False otherwise.
+ *
+ * ####Example:
+ *     const schema = new Schema({ name: { type: String, required: true } });
+ *     schema.path('name').isRequired; // true
+ *
+ *     schema.path('name').required(false);
+ *     schema.path('name').isRequired; // false
+ *
+ * @property isRequired
+ * @api public
+ * @memberOf SchemaType
+ */
+
+SchemaType.prototype.validators;
+
 /*!
  * ignore
  */
@@ -326,7 +371,7 @@ SchemaType.prototype.default = function(val) {
     this.defaultValue = val;
     return this.defaultValue;
   } else if (arguments.length > 1) {
-    this.defaultValue = utils.args(arguments);
+    this.defaultValue = [...arguments];
   }
   return this.defaultValue;
 };

package/lib/statemachine.js

@@ -5,7 +5,7 @@
 
 'use strict';
 
-const utils = require('./utils');
+const utils = require('./utils'); // eslint-disable-line no-unused-vars
 
 /*!
  * StateMachine represents a minimal `interface` for the
@@ -32,7 +32,7 @@ const StateMachine = module.exports = exports = function StateMachine() {
  */
 
 StateMachine.ctor = function() {
-  const states = utils.args(arguments);
+  const states = [...arguments];
 
   const ctor = function() {
     StateMachine.apply(this, arguments);
@@ -122,9 +122,8 @@ StateMachine.prototype.some = function some() {
 
 StateMachine.prototype._iter = function _iter(iterMethod) {
   return function() {
-    const numArgs = arguments.length;
-    let states = utils.args(arguments, 0, numArgs - 1);
-    const callback = arguments[numArgs - 1];
+    let states = [...arguments];
+    const callback = states.pop();
 
     if (!states.length) states = this.stateNames;
 

package/lib/utils.js

@@ -6,7 +6,6 @@
 
 const ms = require('ms');
 const mpath = require('mpath');
-const sliced = require('sliced');
 const Decimal = require('./types/decimal128');
 const ObjectId = require('./types/objectid');
 const PopulateOptions = require('./options/PopulateOptions');
@@ -81,7 +80,11 @@ exports.deepEqual = function deepEqual(a, b) {
     return a.source === b.source &&
         a.ignoreCase === b.ignoreCase &&
         a.multiline === b.multiline &&
-        a.global === b.global;
+        a.global === b.global &&
+        a.dotAll === b.dotAll &&
+        a.unicode === b.unicode &&
+        a.sticky === b.sticky &&
+        a.hasIndices === b.hasIndices;
   }
 
   if (a == null || b == null) {
@@ -236,16 +239,6 @@ exports.options = function(defaults, options) {
   return options;
 };
 
-/*!
- * Generates a random string
- *
- * @api private
- */
-
-exports.random = function() {
-  return Math.random().toString().substr(3);
-};
-
 /*!
  * Merges `from` into `to` without overwriting existing properties.
  *
@@ -441,13 +434,6 @@ exports.hasKey = function hasKey(obj, key) {
   return false;
 };
 
-/*!
- * A faster Array.prototype.slice.call(arguments) alternative
- * @api private
- */
-
-exports.args = sliced;
-
 /*!
  * process.nextTick helper.
  *
@@ -502,13 +488,9 @@ exports.expires = function expires(object) {
     return;
   }
 
-  let when;
-  if (typeof object.expires !== 'string') {
-    when = object.expires;
-  } else {
-    when = Math.round(ms(object.expires) / 1000);
-  }
-  object.expireAfterSeconds = when;
+  object.expireAfterSeconds = (typeof object.expires !== 'string')
+    ? object.expires
+    : Math.round(ms(object.expires) / 1000);
   delete object.expires;
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.1.7",
+  "version": "6.2.0",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -19,16 +19,14 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@types/node": "< 17.0.6",
     "bson": "^4.2.2",
     "kareem": "2.3.3",
-    "mongodb": "4.2.2",
+    "mongodb": "4.3.1",
     "mpath": "0.8.4",
-    "mquery": "4.0.0",
+    "mquery": "4.0.2",
     "ms": "2.1.2",
     "regexp-clone": "1.0.0",
-    "sift": "13.5.2",
-    "sliced": "1.0.1"
+    "sift": "13.5.2"
   },
   "devDependencies": {
     "@babel/core": "7.10.5",
@@ -41,27 +39,26 @@
     "babel-loader": "8.1.0",
     "benchmark": "2.1.4",
     "bluebird": "3.7.2",
-    "chalk": "4.1.2",
     "cheerio": "1.0.0-rc.5",
     "dox": "0.3.1",
     "eslint": "8.5.0",
     "eslint-plugin-mocha-no-only": "1.1.0",
     "highlight.js": "9.18.3",
+    "js-yaml": "4.1.0",
     "lodash.isequal": "4.5.0",
     "lodash.isequalwith": "4.4.0",
     "marked": "2.1.3",
     "mkdirp": "0.5.5",
-    "mocha": "9.1.3",
+    "mocha": "9.2.0",
     "moment": "2.x",
-    "object-sizeof": "1.3.0",
+    "mongodb-memory-server": "^8.2.0",
+    "nyc": "^15.1.0",
     "pug": "3.0.2",
     "q": "1.5.1",
     "rimraf": "2.6.3",
-    "semver": "5.5.0",
     "serve-handler": "6.1.3",
     "typescript": "4.5.3",
-    "uuid": "2.0.3",
-    "uuid-parse": "1.0.0",
+    "uuid": "8.3.2",
     "webpack": "4.44.1"
   },
   "directories": {
@@ -73,9 +70,10 @@
     "prepublishOnly": "npm run build-browser",
     "release": "git pull && git push origin master --tags && npm publish",
     "release-legacy": "git pull origin 5.x && git push origin 5.x --tags && npm publish --tag legacy",
+    "mongo": "node ./tools/repl.js",
     "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"
+    "test-coverage": "nyc --reporter=html --reporter=text npm test"
   },
   "main": "./index.js",
   "types": "./index.d.ts",
@@ -147,8 +145,8 @@
       "no-whitespace-before-property": "error",
       "no-buffer-constructor": "warn",
       "no-console": "off",
-      "no-multi-spaces": "error",
       "no-constant-condition": "off",
+      "no-multi-spaces": "error",
       "func-call-spacing": "error",
       "no-trailing-spaces": "error",
       "no-undef": "error",
@@ -242,6 +240,11 @@
       ]
     }
   },
+  "config": {
+    "mongodbMemoryServer": {
+      "disablePostinstall": true
+    }
+  },
   "funding": {
     "type": "opencollective",
     "url": "https://opencollective.com/mongoose"

package/tools/repl.js

@@ -6,31 +6,29 @@ run().catch(error => {
 });
 
 async function run () {
-  const ReplSet = require('mongodb-topology-manager').ReplSet;
+  const ReplSet = require('mongodb-memory-server').MongoMemoryReplSet;
 
   // Create new instance
-  const topology = new ReplSet('mongod', [{
-    // mongod process options
-    options: {
-      bind_ip: 'localhost', port: 31000, dbpath: `/data/db/31000`
-    }
-  }, {
-    // mongod process options
-    options: {
-      bind_ip: 'localhost', port: 31001, dbpath: `/data/db/31001`
-    }
-  }, {
-    // Type of node
-    arbiterOnly: true,
-    // mongod process options
-    options: {
-      bind_ip: 'localhost', port: 31002, dbpath: `/data/db/31002`
-    }
-  }], {
-    replSet: 'rs'
+  const replSet = new ReplSet({
+    binary: {
+      version: process.argv[3]
+    },
+    instanceOpts: [
+      // Set the expiry job in MongoDB to run every second
+      { 
+        port: 27017,
+        args: ["--setParameter", "ttlMonitorSleepSecs=1"] },
+    ],
+    dbName: 'mongoose_test',
+    replSet: {
+      name: "rs0",
+      count: 2,
+      storageEngine: "wiredTiger",
+    },
   });
 
-  await topology.start();
-
-  console.log('done');
+  await replSet.start();
+  await replSet.waitUntilRunning();
+  console.log("MongoDB-ReplicaSet is now running.")
+  console.log(replSet.getUri("mongoose_test"));
 }