mongoose 6.0.7 → 6.0.8

package/index.d.ts

@@ -1538,10 +1538,10 @@ declare module 'mongoose' {
     type?:
       T extends string | number | boolean | NativeDate | Function ? SchemaDefinitionWithBuiltInClass<T> :
       T extends object[] ? (AnyArray<Schema<any>> | AnyArray<SchemaDefinition<Unpacked<T>>>) :
-      T extends string[] ? AnyArray<SchemaDefinitionWithBuiltInClass<string>> :
-      T extends number[] ? AnyArray<SchemaDefinitionWithBuiltInClass<number>> :
-      T extends boolean[] ? AnyArray<SchemaDefinitionWithBuiltInClass<boolean>> :
-      T extends Function[] ? AnyArray<SchemaDefinitionWithBuiltInClass<Function>> :
+      T extends string[] ? AnyArray<SchemaDefinitionWithBuiltInClass<string>> | AnyArray<SchemaTypeOptions<string>> :
+      T extends number[] ? AnyArray<SchemaDefinitionWithBuiltInClass<number>> | AnyArray<SchemaTypeOptions<number>> :
+      T extends boolean[] ? AnyArray<SchemaDefinitionWithBuiltInClass<boolean>> | AnyArray<SchemaTypeOptions<boolean>> :
+      T extends Function[] ? AnyArray<SchemaDefinitionWithBuiltInClass<Function>> | AnyArray<SchemaTypeOptions<Unpacked<T>>> :
       T | typeof SchemaType | Schema<any, any, any> | SchemaDefinition<T>;
 
     /** Defines a virtual with the given name that gets/sets this path. */
@@ -2606,6 +2606,7 @@ declare module 'mongoose' {
   type __UpdateDefProperty<T> =
     0 extends (1 & T) ? T : // any
     T extends unknown[] ? LeanArray<T> : // Array
+    T extends Types.Subdocument ? Omit<LeanDocument<T>, '$isSingleNested' | 'ownerDocument' | 'parent'> :
     T extends Document ? LeanDocument<T> : // Subdocument
     [Extract<T, mongodb.ObjectId>] extends [never] ? T :
     T | string;
@@ -2623,7 +2624,14 @@ declare module 'mongoose' {
         : _AllowStringsForIds<T[K]>
       : T[K] | string;
     };
-  export type DocumentDefinition<T> = _AllowStringsForIds<LeanDocument<T>>;
+  export type DocumentDefinition<T> = {
+    [K in keyof Omit<T, Exclude<keyof Document, '_id' | 'id' | '__v'>>]:
+      [Extract<T[K], mongodb.ObjectId>] extends [never]
+      ? T[K] extends TreatAsPrimitives
+        ? T[K]
+        : LeanDocumentElement<T[K]>
+      : T[K] | string;
+    };
 
   type actualPrimitives = string | boolean | number | bigint | symbol | null | undefined;
   type TreatAsPrimitives = actualPrimitives |
@@ -2632,6 +2640,7 @@ declare module 'mongoose' {
   type LeanType<T> =
     0 extends (1 & T) ? T : // any
     T extends TreatAsPrimitives ? T : // primitives
+    T extends Types.Subdocument ? Omit<LeanDocument<T>, '$isSingleNested' | 'ownerDocument' | 'parent'> : // subdocs
     LeanDocument<T>; // Documents and everything else
 
   type LeanArray<T extends unknown[]> = T extends unknown[][] ? LeanArray<T[number]>[] : LeanType<T[number]>[];

package/lib/error/objectExpected.js

@@ -18,7 +18,7 @@ class ObjectExpectedError extends MongooseError {
   constructor(path, val) {
     const typeDescription = Array.isArray(val) ? 'array' : 'primitive value';
     super('Tried to set nested object field `' + path +
-      `\` to ${typeDescription} \`` + val + '` and strict mode is set to throw.');
+      `\` to ${typeDescription} \`` + val + '`');
     this.path = path;
   }
 }

package/lib/helpers/model/applyMethods.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const get = require('../get');
+const utils = require('../../utils');
 
 /*!
  * Register methods for this model
@@ -30,7 +31,7 @@ module.exports = function applyMethods(model, schema) {
     }
     if (schema.reserved[method] &&
         !get(schema, `methodOptions.${method}.suppressWarning`, false)) {
-      console.warn(`mongoose: the method name "${method}" is used by mongoose ` +
+      utils.warn(`mongoose: the method name "${method}" is used by mongoose ` +
         'internally, overwriting it may cause bugs. If you\'re sure you know ' +
         'what you\'re doing, you can suppress this error by using ' +
         `\`schema.method('${method}', fn, { suppressWarning: true })\`.`);

package/lib/helpers/printJestWarning.js

@@ -1,14 +1,16 @@
 'use strict';
 
+const utils = require('../utils');
+
 if (typeof jest !== 'undefined' && typeof window !== 'undefined') {
-  console.warn('Mongoose: looks like you\'re trying to test a Mongoose app ' +
+  utils.warn('Mongoose: looks like you\'re trying to test a Mongoose app ' +
     'with Jest\'s default jsdom test environment. Please make sure you read ' +
     'Mongoose\'s docs on configuring Jest to test Node.js apps: ' +
     'http://mongoosejs.com/docs/jest.html');
 }
 
 if (typeof jest !== 'undefined' && process.nextTick.toString().indexOf('nextTick') === -1) {
-  console.warn('Mongoose: looks like you\'re trying to test a Mongoose app ' +
+  utils.warn('Mongoose: looks like you\'re trying to test a Mongoose app ' +
     'with Jest\'s mock timers enabled. Please make sure you read ' +
     'Mongoose\'s docs on configuring Jest to test Node.js apps: ' +
     'http://mongoosejs.com/docs/jest.html');

package/lib/helpers/timestamps/setupTimestamps.js

@@ -31,7 +31,7 @@ module.exports = function setupTimestamps(schema, timestamps) {
   }
 
   if (createdAt && !schema.paths[createdAt]) {
-    schemaAdditions[createdAt] = { type: Date, immutable: true };
+    schemaAdditions[createdAt] = { [schema.options.typeKey || 'type']: Date, immutable: true };
   }
   schema.add(schemaAdditions);
 

package/lib/model.js

@@ -1673,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');
@@ -1876,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);
       }
@@ -3065,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');
     }

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

@@ -642,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')) {
@@ -2042,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;
         }

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') {

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;
 
@@ -65,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.7",
+  "version": "6.0.8",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",