mongoose 6.3.9 → 6.4.2

package/lib/query.js

@@ -27,6 +27,7 @@ const immediate = require('./helpers/immediate');
 const isExclusive = require('./helpers/projection/isExclusive');
 const isInclusive = require('./helpers/projection/isInclusive');
 const isSubpath = require('./helpers/projection/isSubpath');
+const mpath = require('mpath');
 const mquery = require('mquery');
 const parseProjection = require('./helpers/projection/parseProjection');
 const removeUnusedArrayFilters = require('./helpers/update/removeUnusedArrayFilters');
@@ -2196,7 +2197,6 @@ function _castArrayFilters(query) {
  * @api private
  */
 Query.prototype._find = wrapThunk(function(callback) {
-
   this._castConditions();
 
   if (this.error() != null) {
@@ -2220,7 +2220,8 @@ Query.prototype._find = wrapThunk(function(callback) {
   // Separate options to pass down to `completeMany()` in case we need to
   // set a session on the document
   const completeManyOptions = Object.assign({}, {
-    session: this && this.options && this.options.session || null
+    session: this && this.options && this.options.session || null,
+    lean: mongooseOptions.lean || null
   });
 
   const cb = (err, docs) => {
@@ -2244,7 +2245,9 @@ Query.prototype._find = wrapThunk(function(callback) {
         });
       }
       return mongooseOptions.lean ?
-        callback(null, docs) :
+      // call _completeManyLean here?
+        _completeManyLean(_this.model.schema, docs, null, completeManyOptions, callback) :
+        // callback(null, docs) :
         completeMany(_this.model, docs, fields, userProvidedFields, completeManyOptions, callback);
     }
 
@@ -2418,6 +2421,9 @@ Query.prototype._completeOne = function(doc, res, callback) {
   const mongooseOptions = this._mongooseOptions;
   // `rawResult`
   const options = this.options;
+  if (!options.lean && mongooseOptions.lean) {
+    options.lean = mongooseOptions.lean;
+  }
 
   if (options.explain) {
     return callback(null, doc);
@@ -2431,7 +2437,7 @@ Query.prototype._completeOne = function(doc, res, callback) {
       }
     }
     return mongooseOptions.lean ?
-      _completeOneLean(doc, res, options, callback) :
+      _completeOneLean(model.schema, doc, null, res, options, callback) :
       completeOne(model, doc, res, options, projection, userProvidedFields,
         null, callback);
   }
@@ -2442,7 +2448,7 @@ Query.prototype._completeOne = function(doc, res, callback) {
       if (err != null) {
         return callback(err);
       }
-      _completeOneLean(doc, res, options, callback);
+      _completeOneLean(model.schema, doc, null, res, options, callback);
     });
   }
 
@@ -4009,13 +4015,62 @@ Query.prototype._findAndModify = function(type, callback) {
  * ignore
  */
 
-function _completeOneLean(doc, res, opts, callback) {
+function _completeOneLean(schema, doc, path, res, opts, callback) {
+  if (opts.lean && opts.lean.transform) {
+    for (let i = 0; i < schema.childSchemas.length; i++) {
+      const childPath = path ? path + '.' + schema.childSchemas[i].model.path : schema.childSchemas[i].model.path;
+      const _schema = schema.childSchemas[i].schema;
+      const obj = mpath.get(childPath, doc);
+      if (obj == null) {
+        continue;
+      }
+      if (Array.isArray(obj)) {
+        for (let i = 0; i < obj.length; i++) {
+          opts.lean.transform(obj[i]);
+        }
+      } else {
+        opts.lean.transform(obj);
+      }
+      _completeOneLean(_schema, obj, childPath, res, opts);
+    }
+    if (callback) {
+      return callback(null, doc);
+    } else {
+      return;
+    }
+  }
   if (opts.rawResult) {
     return callback(null, res);
   }
   return callback(null, doc);
 }
 
+/*!
+ * ignore
+ */
+
+function _completeManyLean(schema, docs, path, opts, callback) {
+  if (opts.lean && opts.lean.transform) {
+    for (let i = 0; i < schema.childSchemas.length; i++) {
+      const childPath = path ? path + '.' + schema.childSchemas[i].model.path : schema.childSchemas[i].model.path;
+      const _schema = schema.childSchemas[i].schema;
+      let doc = mpath.get(childPath, docs);
+      if (doc == null) {
+        continue;
+      }
+      doc = doc.flat();
+      for (let i = 0; i < doc.length; i++) {
+        opts.lean.transform(doc[i]);
+      }
+      _completeManyLean(_schema, doc, childPath, opts);
+    }
+  }
+
+  if (!callback) {
+    return;
+  }
+  return callback(null, docs);
+}
 /*!
  * Override mquery.prototype._mergeUpdate to handle mongoose objects in
  * updates.

package/lib/queryhelpers.js

@@ -209,6 +209,11 @@ exports.applyPaths = function applyPaths(fields, schema) {
       // user didn't specify fields, implies returning all fields.
       // only need to apply excluded fields and delete any plus paths
       for (const fieldName of excluded) {
+        if (fields[fieldName] != null) {
+          // Skip applying default projections to fields with non-defining
+          // projections, like `$slice`
+          continue;
+        }
         fields[fieldName] = 0;
       }
       break;

package/lib/schema/array.js

@@ -212,7 +212,7 @@ SchemaArray.checkRequired = SchemaType.checkRequired;
  */
 
 SchemaArray.prototype.checkRequired = function checkRequired(value, doc) {
-  if (SchemaType._isRef(this, value, doc, true)) {
+  if (typeof value === 'object' && SchemaType._isRef(this, value, doc, true)) {
     return !!value;
   }
 

package/lib/schema/date.js

@@ -195,8 +195,8 @@ SchemaDate.checkRequired = SchemaType.checkRequired;
  */
 
 SchemaDate.prototype.checkRequired = function(value, doc) {
-  if (SchemaType._isRef(this, value, doc, true)) {
-    return !!value;
+  if (typeof value === 'object' && SchemaType._isRef(this, value, doc, true)) {
+    return value != null;
   }
 
   // `require('util').inherits()` does **not** copy static properties, and

package/lib/schema/documentarray.js

@@ -10,6 +10,7 @@ const EventEmitter = require('events').EventEmitter;
 const SchemaDocumentArrayOptions =
   require('../options/SchemaDocumentArrayOptions');
 const SchemaType = require('../schematype');
+const SubdocumentPath = require('./SubdocumentPath');
 const discriminator = require('../helpers/model/discriminator');
 const handleIdOption = require('../helpers/schema/handleIdOption');
 const handleSpreadDoc = require('../helpers/document/handleSpreadDoc');
@@ -75,6 +76,15 @@ function DocumentArrayPath(key, schema, options, schemaOptions) {
   this.$embeddedSchemaType.cast = function(value, doc, init) {
     return parentSchemaType.cast(value, doc, init)[0];
   };
+  this.$embeddedSchemaType.doValidate = function(value, fn, scope, options) {
+    const Constructor = getConstructor(this.caster, value);
+
+    if (value && !(value instanceof Constructor)) {
+      value = new Constructor(value, scope, null, null, options && options.index != null ? options.index : null);
+    }
+
+    return SubdocumentPath.prototype.doValidate.call(this, value, fn, scope, options);
+  };
   this.$embeddedSchemaType.$isMongooseDocumentArrayElement = true;
   this.$embeddedSchemaType.caster = this.Constructor;
   this.$embeddedSchemaType.schema = this.schema;

package/lib/schema/number.js

@@ -164,8 +164,8 @@ SchemaNumber.checkRequired = SchemaType.checkRequired;
  */
 
 SchemaNumber.prototype.checkRequired = function checkRequired(value, doc) {
-  if (SchemaType._isRef(this, value, doc, true)) {
-    return !!value;
+  if (typeof value === 'object' && SchemaType._isRef(this, value, doc, true)) {
+    return value != null;
   }
 
   // `require('util').inherits()` does **not** copy static properties, and

package/lib/schema/string.js

@@ -561,8 +561,8 @@ SchemaString.prototype.match = function match(regExp, message) {
  */
 
 SchemaString.prototype.checkRequired = function checkRequired(value, doc) {
-  if (SchemaType._isRef(this, value, doc, true)) {
-    return !!value;
+  if (typeof value === 'object' && SchemaType._isRef(this, value, doc, true)) {
+    return value != null;
   }
 
   // `require('util').inherits()` does **not** copy static properties, and

package/lib/schema/symbols.js

@@ -2,4 +2,4 @@
 
 exports.schemaMixedSymbol = Symbol.for('mongoose:schema_mixed');
 
-exports.builtInMiddleware = Symbol.for('mongoose:built-in-middleware');
+exports.builtInMiddleware = Symbol.for('mongoose:built-in-middleware');

package/lib/schema.js

@@ -107,11 +107,11 @@ function Schema(obj, options) {
   this.inherits = {};
   this.callQueue = [];
   this._indexes = [];
-  this.methods = {};
+  this.methods = (options && options.methods) || {};
   this.methodOptions = {};
-  this.statics = {};
+  this.statics = (options && options.statics) || {};
   this.tree = {};
-  this.query = {};
+  this.query = (options && options.query) || {};
   this.childSchemas = [];
   this.plugins = [];
   // For internal debugging. Do not use this to try to save a schema in MDB.
@@ -477,7 +477,7 @@ Schema.prototype.defaultOptions = function(options) {
  * Inherit a Schema by applying a discriminator on an existing Schema.
  *
  *
- * ####Example:
+ * #### Example:
  *
  *     const options = { discriminatorKey: 'kind' };
  *
@@ -648,7 +648,7 @@ Schema.prototype.add = function add(obj, prefix) {
  * removeIndex only removes indexes from your schema object. Does **not** affect the indexes
  * in MongoDB.
  *
- * ####Example:
+ * #### Example:
  *
  *     const ToySchema = new Schema({ name: String, color: String, price: Number });
  *
@@ -701,7 +701,7 @@ Schema.prototype.removeIndex = function removeIndex(index) {
  * clearIndexes only removes indexes from your schema object. Does **not** affect the indexes
  * in MongoDB.
  *
- * ####Example:
+ * #### Example:
  *
  *     const ToySchema = new Schema({ name: String, color: String, price: Number });
  *     ToySchema.index({ name: 1 });
@@ -766,7 +766,6 @@ reserved['prototype'] =
 // EventEmitter
 reserved.emit =
 reserved.listeners =
-reserved.on =
 reserved.removeListener =
 
 // document properties and functions

package/lib/statemachine.js

@@ -95,6 +95,19 @@ StateMachine.prototype.clear = function clear(state) {
   }
 };
 
+/*!
+ * ignore
+ */
+
+StateMachine.prototype.clearPath = function clearPath(path) {
+  const state = this.paths[path];
+  if (!state) {
+    return;
+  }
+  delete this.paths[path];
+  delete this.states[state][path];
+};
+
 /*!
  * Checks to see if at least one path is in the states passed in via `arguments`
  * e.g., this.some('required', 'inited')

package/lib/types/DocumentArray/methods/index.js

@@ -376,4 +376,4 @@ function _updateParentPopulated(arr) {
 
     parent.$__.populated[path].value = arr.map(val => val.$populated(remnant));
   }
-}
+}

package/lib/utils.js

@@ -935,6 +935,9 @@ exports.getOption = function(name) {
   const sources = Array.prototype.slice.call(arguments, 1);
 
   for (const source of sources) {
+    if (source == null) {
+      continue;
+    }
     if (source[name] != null) {
       return source[name];
     }

package/lib/validoptions.js

@@ -15,6 +15,7 @@ const VALID_OPTIONS = Object.freeze([
   'bufferTimeoutMS',
   'cloneSchemas',
   'debug',
+  'timestamps.createdAt.immutable',
   'maxTimeMS',
   'objectIdGetter',
   'overwriteModels',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.3.9",
+  "version": "6.4.2",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "dependencies": {
     "bson": "^4.6.2",
-    "kareem": "2.3.5",
-    "mongodb": "4.5.0",
+    "kareem": "2.4.1",
+    "mongodb": "4.7.0",
     "mpath": "0.9.0",
     "mquery": "4.0.3",
     "ms": "2.1.3",

package/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "strict": true,
     "strictNullChecks": true,
     "paths": {
       "mongoose" : ["./types/index.d.ts"]

package/types/collection.d.ts

@@ -43,4 +43,4 @@ declare module 'mongoose' {
     getIndexes(): ReturnType<mongodb.Collection<T>['indexInformation']>;
   }
   let Collection: Collection;
-}
+}

package/types/connection.d.ts

@@ -66,6 +66,11 @@ declare module 'mongoose' {
     close(callback: CallbackWithoutResult): void;
     close(force?: boolean): Promise<void>;
 
+    /** Closes and destroys the connection. Connection once destroyed cannot be reopened */
+    destroy(force: boolean, callback: CallbackWithoutResult): void;
+    destroy(callback: CallbackWithoutResult): void;
+    destroy(force?: boolean): Promise<void>;
+
     /** Retrieves a collection, creating it if not cached. */
     collection<T extends AnyObject = AnyObject>(name: string, options?: mongodb.CreateCollectionOptions): Collection<T>;
 

package/types/document.d.ts

@@ -4,6 +4,12 @@ declare module 'mongoose' {
   /** A list of paths to skip. If set, Mongoose will validate every modified path that is not in this list. */
   type pathsToSkip = string[] | string;
 
+  interface DocumentSetOptions {
+    merge?: boolean;
+
+    [key: string]: any;
+  }
+
   /**
    * Generic types for Document:
    * *  T - the type of _id
@@ -19,6 +25,9 @@ declare module 'mongoose' {
     /** This documents __v. */
     __v?: any;
 
+    /** Assert that a given path or paths is populated. Throws an error if not populated. */
+    $assertPopulated<Paths = {}>(paths: string | string[]): Omit<this, keyof Paths> & Paths;
+
     /* Get all subdocs (by bfs) */
     $getAllSubdocs(): Document[];
 
@@ -71,8 +80,8 @@ declare module 'mongoose' {
     $session(session?: ClientSession | null): ClientSession | null;
 
     /** Alias for `set()`, used internally to avoid conflicts */
-    $set(path: string, val: any, type: any, options?: any): this;
-    $set(path: string, val: any, options?: any): this;
+    $set(path: string, val: any, type: any, options?: DocumentSetOptions): this;
+    $set(path: string, val: any, options?: DocumentSetOptions): this;
     $set(value: any): this;
 
     /** Set this property to add additional query filters when Mongoose saves this document and `isNew` is false. */
@@ -191,10 +200,10 @@ declare module 'mongoose' {
     $parent(): Document | undefined;
 
     /** Populates document references. */
-    populate<Paths = {}>(path: string | PopulateOptions | (string | PopulateOptions)[]): Promise<this & Paths>;
-    populate<Paths = {}>(path: string | PopulateOptions | (string | PopulateOptions)[], callback: Callback<this & Paths>): void;
-    populate<Paths = {}>(path: string, select?: string | AnyObject, model?: Model<unknown>, match?: AnyObject, options?: PopulateOptions): Promise<this & Paths>;
-    populate<Paths = {}>(path: string, select?: string | AnyObject, model?: Model<unknown>, match?: AnyObject, options?: PopulateOptions, callback?: Callback<this & Paths>): void;
+    populate<Paths = {}>(path: string | PopulateOptions | (string | PopulateOptions)[]): Promise<MergeType<this, Paths>>;
+    populate<Paths = {}>(path: string | PopulateOptions | (string | PopulateOptions)[], callback: Callback<MergeType<this, Paths>>): void;
+    populate<Paths = {}>(path: string, select?: string | AnyObject, model?: Model<any>, match?: AnyObject, options?: PopulateOptions): Promise<MergeType<this, Paths>>;
+    populate<Paths = {}>(path: string, select?: string | AnyObject, model?: Model<any>, match?: AnyObject, options?: PopulateOptions, callback?: Callback<MergeType<this, Paths>>): void;
 
     /** Gets _id(s) used during population of the given `path`. If the path was not populated, returns `undefined`. */
     populated(path: string): any;