mongoose 6.9.2 → 6.9.3

package/lib/helpers/query/castUpdate.js

@@ -195,6 +195,7 @@ function walkUpdatePath(schema, obj, op, options, context, filter, pref) {
     if (
       schema.discriminatorMapping != null &&
       discriminatorKey === schema.options.discriminatorKey &&
+      schema.discriminatorMapping.value !== obj[key] &&
       !options.overwriteDiscriminatorKey
     ) {
       if (strictMode === 'throw') {

package/lib/model.js

@@ -63,6 +63,7 @@ const prepareDiscriminatorPipeline = require('./helpers/aggregate/prepareDiscrim
 const pushNestedArrayPaths = require('./helpers/model/pushNestedArrayPaths');
 const removeDeselectedForeignField = require('./helpers/populate/removeDeselectedForeignField');
 const setDottedPath = require('./helpers/path/setDottedPath');
+const STATES = require('./connectionstate');
 const util = require('util');
 const utils = require('./utils');
 
@@ -283,8 +284,10 @@ Model.prototype.$__handleSave = function(options, callback) {
   if ('checkKeys' in options) {
     saveOptions.checkKeys = options.checkKeys;
   }
-  if (!saveOptions.hasOwnProperty('session')) {
-    saveOptions.session = this.$session();
+
+  const session = this.$session();
+  if (!saveOptions.hasOwnProperty('session') && session != null) {
+    saveOptions.session = session;
   }
 
   if (this.$isNew) {
@@ -1350,17 +1353,30 @@ Model.init = function init(callback) {
   }
 
   const Promise = PromiseProvider.get();
-  const autoIndex = utils.getOption('autoIndex',
-    this.schema.options, this.db.config, this.db.base.options);
-  const autoCreate = utils.getOption('autoCreate',
-    this.schema.options, this.db.config, this.db.base.options);
-
-  const _ensureIndexes = autoIndex ?
-    cb => this.ensureIndexes({ _automatic: true }, cb) :
-    cb => cb();
-  const _createCollection = autoCreate ?
-    cb => this.createCollection({}, cb) :
-    cb => cb();
+
+  const model = this;
+  const _ensureIndexes = function(cb) {
+    const autoIndex = utils.getOption('autoIndex',
+      model.schema.options, model.db.config, model.db.base.options);
+    if (autoIndex) model.ensureIndexes({ _automatic: true }, cb);
+    else cb();
+  };
+  const _createCollection = function(cb) {
+    const conn = model.db;
+
+    if ((conn.readyState === STATES.connecting || conn.readyState === STATES.disconnected) && conn._shouldBufferCommands()) {
+      conn._queue.push({ fn: _createCollection, ctx: conn, args: [cb] });
+    } else {
+      try {
+        const autoCreate = utils.getOption('autoCreate',
+          model.schema.options, model.db.config, model.db.base.options);
+        if (autoCreate) model.createCollection({}, cb);
+        else cb();
+      } catch (err) {
+        return cb(err);
+      }
+    }
+  };
 
   this.$init = new Promise((resolve, reject) => {
     _createCollection(error => {

package/lib/query.js

@@ -1876,6 +1876,12 @@ Query.prototype.setUpdate = function(val) {
  */
 
 Query.prototype._fieldsForExec = function() {
+  if (this._fields == null) {
+    return null;
+  }
+  if (Object.keys(this._fields).length === 0) {
+    return null;
+  }
   return utils.clone(this._fields);
 };
 
@@ -1996,6 +2002,12 @@ Query.prototype._optionsForExec = function(model) {
       delete options.wtimeout;
     }
   }
+
+  const projection = this._fieldsForExec();
+  if (projection != null) {
+    options.projection = projection;
+  }
+
   return options;
 };
 
@@ -2306,7 +2318,6 @@ Query.prototype._find = wrapThunk(function(callback) {
   };
 
   const options = this._optionsForExec();
-  options.projection = this._fieldsForExec();
   const filter = this._conditions;
 
   this._collection.collection.find(filter, options, (err, cursor) => {
@@ -2525,8 +2536,10 @@ Query.prototype._findOne = wrapThunk(function(callback) {
   applyGlobalMaxTimeMS(this.options, this.model);
   applyGlobalDiskUse(this.options, this.model);
 
-  // don't pass in the conditions because we already merged them in
-  Query.base.findOne.call(this, {}, (err, doc) => {
+  const conds = this._conditions;
+  const options = this._optionsForExec();
+
+  this._collection.findOne(conds, options, (err, doc) => {
     if (err) {
       callback(err);
       return null;
@@ -4038,10 +4051,12 @@ Query.prototype._findAndModify = function(type, callback) {
   }
 
   this._applyPaths();
-
   if (this._fields) {
-    fields = utils.clone(this._fields);
-    opts.projection = this._castFields(fields);
+    this._fields = this._castFields(this._fields);
+    fields = this._fieldsForExec();
+    if (fields != null) {
+      opts.projection = fields;
+    }
     if (opts.projection instanceof Error) {
       return callback(opts.projection);
     }
@@ -5469,14 +5484,12 @@ Query.prototype._applyPaths = function applyPaths() {
 Query.prototype.cursor = function cursor(opts) {
   this._applyPaths();
   this._fields = this._castFields(this._fields);
-  this.setOptions({ projection: this._fieldsForExec() });
+
   if (opts) {
     this.setOptions(opts);
   }
 
-  const options = Object.assign({}, this._optionsForExec(), {
-    projection: this.projection()
-  });
+  const options = this._optionsForExec();
   try {
     this.cast(this.model);
   } catch (err) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.9.2",
+  "version": "6.9.3",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -32,8 +32,8 @@
     "@babel/preset-env": "7.20.2",
     "@typescript-eslint/eslint-plugin": "5.50.0",
     "@typescript-eslint/parser": "5.50.0",
-    "acquit": "1.2.1",
-    "acquit-ignore": "0.2.0",
+    "acquit": "1.3.0",
+    "acquit-ignore": "0.2.1",
     "acquit-require": "0.1.1",
     "assert-browserify": "2.0.0",
     "axios": "1.1.3",
@@ -79,7 +79,7 @@
     "docs:checkout:gh-pages": "git checkout gh-pages",
     "docs:checkout:legacy": "git checkout 5.x",
     "docs:generate": "node ./scripts/website.js",
-    "docs:generate:search": "node docs/search.js",
+    "docs:generate:search": "node ./scripts/generateSearch.js",
     "docs:merge:stable": "git merge master",
     "docs:merge:legacy": "git merge 5.x",
     "docs:test": "npm run docs:generate && npm run docs:generate:search",

package/scripts/generateSearch.js

@@ -0,0 +1,158 @@
+'use strict';
+
+const config = require('../.config');
+const cheerio = require('cheerio');
+const filemap = require('../docs/source');
+const fs = require('fs');
+const pug = require('pug');
+const mongoose = require('../');
+let { version } = require('../package.json');
+
+const { marked: markdown } = require('marked');
+const highlight = require('highlight.js');
+markdown.setOptions({
+  highlight: function(code) {
+    return highlight.highlight(code, { language: 'JavaScript' }).value;
+  }
+});
+
+mongoose.set('strictQuery', false);
+
+// 5.13.5 -> 5.x, 6.8.2 -> 6.x, etc.
+version = version.slice(0, version.indexOf('.')) + '.x';
+
+const contentSchema = new mongoose.Schema({
+  title: { type: String, required: true },
+  body: { type: String, required: true },
+  url: { type: String, required: true },
+  version: { type: String, required: true, default: version }
+});
+contentSchema.index({ title: 'text', body: 'text' });
+const Content = mongoose.model('Content', contentSchema, 'Content');
+
+const contents = [];
+
+for (const [filename, file] of Object.entries(filemap)) {
+  if (file.api) {
+    // API docs are special, raw content is in the `docs` property
+    for (const _class of file.docs) {
+      for (const prop of _class.props) {
+        const content = new Content({
+          title: `API: ${prop.string}`,
+          body: prop.description,
+          url: `api/${_class.fileName}.html#${prop.anchorId}`
+        });
+        const err = content.validateSync();
+        if (err != null) {
+          console.error(content);
+          throw err;
+        }
+        contents.push(content);
+      }
+    }
+  } else if (file.markdown) {
+    let text = fs.readFileSync(filename, 'utf8');
+    text = markdown.parse(text);
+
+    const content = new Content({
+      title: file.title,
+      body: text,
+      url: filename.replace('.md', '.html').replace(/^docs/, '')
+    });
+
+    content.validateSync();
+
+    const $ = cheerio.load(text);
+
+    contents.push(content);
+
+    // Break up individual h3's into separate content for more fine grained search
+    $('h3').each((index, el) => {
+      el = $(el);
+      const title = el.text();
+      const html = el.nextUntil('h3').html();
+      const content = new Content({
+        title: `${file.title}: ${title}`,
+        body: html,
+        url: `${filename.replace('.md', '.html').replace(/^docs/, '')}#${el.prop('id')}`
+      });
+
+      content.validateSync();
+      contents.push(content);
+    });
+  } else if (file.guide) {
+    let text = fs.readFileSync(filename, 'utf8');
+    text = text.substr(text.indexOf('block content') + 'block content\n'.length);
+    text = pug.render(`div\n${text}`, { filters: { markdown }, filename });
+
+    const content = new Content({
+      title: file.title,
+      body: text,
+      url: filename.replace('.pug', '.html').replace(/^docs/, '')
+    });
+
+    content.validateSync();
+
+    const $ = cheerio.load(text);
+
+    contents.push(content);
+
+    // Break up individual h3's into separate content for more fine grained search
+    $('h3').each((index, el) => {
+      el = $(el);
+      const title = el.text();
+      const html = el.nextUntil('h3').html();
+      const content = new Content({
+        title: `${file.title}: ${title}`,
+        body: html,
+        url: `${filename.replace('.pug', '.html').replace(/^docs/, '')}#${el.prop('id')}`
+      });
+
+      content.validateSync();
+      contents.push(content);
+    });
+  }
+}
+
+run().catch(async error => {
+  console.error(error.stack);
+
+  // ensure the script exists in case of error
+  await mongoose.disconnect();
+});
+
+async function run() {
+  if (!config || !config.uri) {
+    console.error('No Config or config.URI given, please create a .config.js file with those values');
+    process.exit(-1);
+  }
+
+  await mongoose.connect(config.uri, { dbName: 'mongoose' });
+
+  // wait for the index to be created
+  await Content.init();
+
+  await Content.deleteMany({ version });
+  for (const content of contents) {
+    if (version === '6.x') {
+      let url = content.url.startsWith('/') ? content.url : `/${content.url}`;
+      if (!url.startsWith('/docs')) {
+        url = '/docs' + url;
+      }
+      content.url = url;
+    } else {
+      const url = content.url.startsWith('/') ? content.url : `/${content.url}`;
+      content.url = `/docs/${version}/docs${url}`;
+    }
+    await content.save();
+  }
+
+  const results = await Content.
+    find({ $text: { $search: 'validate' }, version }, { score: { $meta: 'textScore' } }).
+    sort({ score: { $meta: 'textScore' } }).
+    limit(10);
+
+  console.log(results.map(res => res.url));
+
+  process.exit(0);
+}

package/types/index.d.ts

@@ -129,12 +129,14 @@ declare module 'mongoose' {
     ? IfAny<U, T & { _id: Types.ObjectId }, T & Required<{ _id: U }>>
     : T & { _id: Types.ObjectId };
 
-  export type HydratedDocument<DocType, TMethodsAndOverrides = {}, TVirtuals = {}> = DocType extends Document ? Require_id<DocType> : (Document<unknown, any, DocType> & Require_id<DocType> & TVirtuals & TMethodsAndOverrides);
+  export type HydratedDocument<DocType, TMethodsAndOverrides = {}, TVirtuals = {}> = DocType extends Document ?
+    Require_id<DocType> :
+    Document<unknown, any, DocType> & MergeType<Require_id<DocType>, TVirtuals & TMethodsAndOverrides>;
 
   export type HydratedDocumentFromSchema<TSchema extends Schema> = HydratedDocument<
   InferSchemaType<TSchema>,
-  ObtainSchemaGeneric<TSchema, 'TQueryHelpers'>,
-  ObtainSchemaGeneric<TSchema, 'TInstanceMethods'>
+  ObtainSchemaGeneric<TSchema, 'TInstanceMethods'>,
+  ObtainSchemaGeneric<TSchema, 'TVirtuals'>
   >;
 
   export interface TagSet {