mongoose 7.5.3 → 7.6.0

package/lib/cast.js

@@ -68,7 +68,13 @@ module.exports = function cast(schema, obj, options, context) {
         if (val[k] == null || typeof val[k] !== 'object') {
           throw new CastError('Object', val[k], path + '.' + k);
         }
-        val[k] = cast(schema, val[k], options, context);
+        const discriminatorValue = val[k][schema.options.discriminatorKey];
+        if (discriminatorValue == null) {
+          val[k] = cast(schema, val[k], options, context);
+        } else {
+          const discriminatorSchema = getSchemaDiscriminatorByValue(context.schema, discriminatorValue);
+          val[k] = cast(discriminatorSchema ? discriminatorSchema : schema, val[k], options, context);
+        }
       }
     } else if (path === '$where') {
       type = typeof val;
@@ -303,7 +309,6 @@ module.exports = function cast(schema, obj, options, context) {
         } else {
           const ks = Object.keys(val);
           let $cond;
-
           let k = ks.length;
 
           while (k--) {

package/lib/cursor/QueryCursor.js

@@ -34,7 +34,7 @@ const util = require('util');
  * @api public
  */
 
-function QueryCursor(query, options) {
+function QueryCursor(query) {
   // set autoDestroy=true because on node 12 it's by default false
   // gh-10902 need autoDestroy to destroy correctly and emit 'close' event
   Readable.call(this, { autoDestroy: true, objectMode: true });
@@ -46,7 +46,7 @@ function QueryCursor(query, options) {
   this._mongooseOptions = {};
   this._transforms = [];
   this.model = model;
-  this.options = options || {};
+  this.options = {};
   model.hooks.execPre('find', query, (err) => {
     if (err != null) {
       if (err instanceof kareem.skipWrappedFunction) {
@@ -70,20 +70,18 @@ function QueryCursor(query, options) {
       this.listeners('error').length > 0 && this.emit('error', err);
       return;
     }
+    Object.assign(this.options, query._optionsForExec());
     this._transforms = this._transforms.concat(query._transforms.slice());
     if (this.options.transform) {
-      this._transforms.push(options.transform);
+      this._transforms.push(this.options.transform);
     }
     // Re: gh-8039, you need to set the `cursor.batchSize` option, top-level
     // `batchSize` option doesn't work.
     if (this.options.batchSize) {
-      this.options.cursor = options.cursor || {};
-      this.options.cursor.batchSize = options.batchSize;
-
       // Max out the number of documents we'll populate in parallel at 5000.
       this.options._populateBatchSize = Math.min(this.options.batchSize, 5000);
     }
-    Object.assign(this.options, query._optionsForExec());
+
     if (model.collection._shouldBufferCommands() && model.collection.buffer) {
       model.collection.queue.push([
         () => _getRawCursor(query, this)

package/lib/document.js

@@ -1060,10 +1060,6 @@ Document.prototype.$set = function $set(path, val, type, options) {
       [path, val] = [val, path];
     }
 
-    if ('_id' in path && 'id' in path) {
-      delete path.id;
-    }
-
     prefix = val ? val + '.' : '';
     keys = getKeysInSchemaOrder(this.$__schema, path);
 
@@ -1694,6 +1690,13 @@ Document.prototype.$__set = function(pathToMark, path, options, constructing, pa
     if (last) {
       if (obj instanceof Map) {
         obj.set(parts[i], val);
+      } else if (obj.$isSingleNested) {
+        if (!(parts[i] in obj)) {
+          obj[parts[i]] = val;
+          obj._doc[parts[i]] = val;
+        } else {
+          obj._doc[parts[i]] = val;
+        }
       } else {
         obj[parts[i]] = val;
       }
@@ -1705,7 +1708,7 @@ Document.prototype.$__set = function(pathToMark, path, options, constructing, pa
       } else if (value && value instanceof Embedded) {
         obj = value;
       } else if (value && !Array.isArray(value) && value.$isSingleNested) {
-        obj = value._doc;
+        obj = value;
       } else if (value && Array.isArray(value)) {
         obj = value;
       } else if (value == null) {
@@ -2650,7 +2653,7 @@ function _getPathsToValidate(doc, pathsToValidate, pathsToSkip) {
   const modifiedPaths = doc.modifiedPaths();
   for (const subdoc of subdocs) {
     if (subdoc.$basePath) {
-      const fullPathToSubdoc = subdoc.$__fullPathWithIndexes();
+      const fullPathToSubdoc = subdoc.$isSingleNested ? subdoc.$__pathRelativeToParent() : subdoc.$__fullPathWithIndexes();
 
       // Remove child paths for now, because we'll be validating the whole
       // subdoc.

package/lib/helpers/query/cast$expr.js

@@ -29,7 +29,6 @@ const arithmeticOperatorNumber = new Set([
   '$floor',
   '$ln',
   '$log10',
-  '$round',
   '$sqrt',
   '$sin',
   '$cos',
@@ -118,6 +117,13 @@ function _castExpression(val, schema, strictQuery) {
   if (val.$size) {
     val.$size = castNumberOperator(val.$size, schema, strictQuery);
   }
+  if (val.$round) {
+    const $round = val.$round;
+    if (!Array.isArray($round) || $round.length < 1 || $round.length > 2) {
+      throw new CastError('Array', $round, '$round');
+    }
+    val.$round = $round.map(v => castNumberOperator(v, schema, strictQuery));
+  }
 
   _omitUndefined(val);
 

package/lib/index.js

@@ -694,7 +694,9 @@ Mongoose.prototype._applyPlugins = function(schema, options) {
 
   options = options || {};
   options.applyPluginsToDiscriminators = _mongoose.options && _mongoose.options.applyPluginsToDiscriminators || false;
-  options.applyPluginsToChildSchemas = typeof (_mongoose.options && _mongoose.options.applyPluginsToDiscriminators) === 'boolean' ? _mongoose.options.applyPluginsToDiscriminators : true;
+  options.applyPluginsToChildSchemas = typeof (_mongoose.options && _mongoose.options.applyPluginsToChildSchemas) === 'boolean' ?
+    _mongoose.options.applyPluginsToChildSchemas :
+    true;
   applyPlugins(schema, _mongoose.plugins, options, '$globalPluginsApplied');
 };
 

package/lib/query.js

@@ -4889,7 +4889,6 @@ function _getPopulatedPaths(list, arr, prefix) {
 
 Query.prototype.cast = function(model, obj) {
   obj || (obj = this._conditions);
-
   model = model || this.model;
   const discriminatorKey = model.schema.options.discriminatorKey;
   if (obj != null &&
@@ -5043,15 +5042,13 @@ Query.prototype.cursor = function cursor(opts) {
     this.setOptions(opts);
   }
 
-  const options = this._optionsForExec();
-
   try {
     this.cast(this.model);
   } catch (err) {
-    return (new QueryCursor(this, options))._markError(err);
+    return (new QueryCursor(this))._markError(err);
   }
 
-  return new QueryCursor(this, options);
+  return new QueryCursor(this);
 };
 
 // the rest of these are basically to support older Mongoose syntax with mquery

package/lib/queryhelpers.js

@@ -199,6 +199,7 @@ exports.applyPaths = function applyPaths(fields, schema) {
       // projection if `name` has schema-level `select: true`.
       if ((!type || !type.selected) || exclude !== false) {
         fields[path] = 0;
+        exclude = true;
       } else if (type && type.selected && exclude === false) {
         // Make a note of minus paths that are overwriting paths that are
         // included by default.

package/lib/schematype.js

@@ -1215,7 +1215,6 @@ SchemaType.prototype.applySetters = function(value, scope, init, priorVal, optio
   if (v == null) {
     return this._castNullish(v);
   }
-
   // do not cast until all setters are applied #665
   v = this.cast(v, scope, init, priorVal, options);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "7.5.3",
+  "version": "7.6.0",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -21,16 +21,16 @@
   "dependencies": {
     "bson": "^5.4.0",
     "kareem": "2.5.1",
-    "mongodb": "5.8.1",
+    "mongodb": "5.9.0",
     "mpath": "0.9.0",
     "mquery": "5.0.0",
     "ms": "2.1.3",
     "sift": "16.0.1"
   },
   "devDependencies": {
-    "@babel/core": "7.22.11",
-    "@babel/preset-env": "7.22.14",
-    "@typescript-eslint/eslint-plugin": "5.61.0",
+    "@babel/core": "7.23.0",
+    "@babel/preset-env": "7.22.20",
+    "@typescript-eslint/eslint-plugin": "5.62.0",
     "@typescript-eslint/parser": "5.62.0",
     "acquit": "1.3.0",
     "acquit-ignore": "0.2.1",
@@ -46,7 +46,7 @@
     "crypto-browserify": "3.12.0",
     "dotenv": "16.3.1",
     "dox": "1.0.0",
-    "eslint": "8.48.0",
+    "eslint": "8.50.0",
     "eslint-plugin-markdown": "^3.0.0",
     "eslint-plugin-mocha-no-only": "1.1.1",
     "express": "^4.18.1",
@@ -54,7 +54,7 @@
     "highlight.js": "11.8.0",
     "lodash.isequal": "4.5.0",
     "lodash.isequalwith": "4.4.0",
-    "markdownlint-cli2": "^0.9.2",
+    "markdownlint-cli2": "^0.10.0",
     "marked": "4.3.0",
     "mkdirp": "^3.0.1",
     "mocha": "10.2.0",
@@ -64,11 +64,11 @@
     "nyc": "15.1.0",
     "pug": "3.0.2",
     "q": "1.5.1",
-    "sinon": "15.2.0",
+    "sinon": "16.0.0",
     "stream-browserify": "3.0.0",
     "tsd": "0.29.0",
     "typescript": "5.2.2",
-    "uuid": "9.0.0",
+    "uuid": "9.0.1",
     "webpack": "5.88.2"
   },
   "directories": {

package/scripts/generateSearch.js

@@ -132,6 +132,7 @@ async function run() {
   await Content.init();
 
   await Content.deleteMany({ version });
+  let count = 0;
   for (const content of contents) {
     if (version === '7.x') {
       let url = content.url.startsWith('/') ? content.url : `/${content.url}`;
@@ -143,6 +144,7 @@ async function run() {
       const url = content.url.startsWith('/') ? content.url : `/${content.url}`;
       content.url = `/docs/${version}/docs${url}`;
     }
+    console.log(`${++count} / ${contents.length}`);
     await content.save();
   }
 

package/types/models.d.ts

@@ -400,6 +400,10 @@ declare module 'mongoose' {
       doc: DocContents,
       options: InsertManyOptions
     ): Promise<Array<MergeType<THydratedDocumentType, Omit<DocContents, '_id'>>>>;
+    insertMany<DocContents = TRawDocType>(
+      docs: Array<DocContents | TRawDocType>,
+      options: InsertManyOptions
+    ): Promise<Array<MergeType<THydratedDocumentType, Omit<DocContents, '_id'>>>>;
     insertMany<DocContents = TRawDocType>(
       doc: DocContents
     ): Promise<