mongoose 6.6.4 → 6.6.6

package/lib/cast.js

@@ -264,12 +264,7 @@ module.exports = function cast(schema, obj, options, context) {
         }
 
         const strict = 'strict' in options ? options.strict : schema.options.strict;
-        const strictQuery = 'strictQuery' in options ?
-          options.strictQuery :
-          'strict' in options ?
-            options.strict :
-            'strict' in schema._userProvidedOptions ? schema._userProvidedOptions.strict :
-              schema.options.strictQuery;
+        const strictQuery = getStrictQuery(options, schema._userProvidedOptions, schema.options);
         if (options.upsert && strict) {
           if (strict === 'throw') {
             throw new StrictModeError(path);
@@ -378,3 +373,19 @@ function _cast(val, numbertype, context) {
     }
   }
 }
+
+function getStrictQuery(queryOptions, schemaUserProvidedOptions, schemaOptions) {
+  if ('strictQuery' in queryOptions) {
+    return queryOptions.strictQuery;
+  }
+  if ('strict' in queryOptions) {
+    return queryOptions.strict;
+  }
+  if ('strictQuery' in schemaUserProvidedOptions) {
+    return schemaUserProvidedOptions.strictQuery;
+  }
+  if ('strict' in schemaUserProvidedOptions) {
+    return schemaUserProvidedOptions.strict;
+  }
+  return schemaOptions.strictQuery;
+}

package/lib/connection.js

@@ -1534,6 +1534,17 @@ Connection.prototype.syncIndexes = async function syncIndexes(options = {}) {
  *
  * Returns a new connection object, with the new db.
  *
+ * #### Example:
+ *
+ *     // Connect to `initialdb` first
+ *     const conn = await mongoose.createConnection('mongodb://localhost:27017/initialdb').asPromise();
+ *
+ *     // Creates an un-cached connection to `mydb`
+ *     const db = conn.useDb('mydb');
+ *     // Creates a cached connection to `mydb2`. All calls to `conn.useDb('mydb2', { useCache: true })` will return the same
+ *     // connection instance as opposed to creating a new connection instance
+ *     const db2 = conn.useDb('mydb2', { useCache: true });
+ *
  * @method useDb
  * @memberOf Connection
  * @param {String} name The database name

package/lib/helpers/aggregate/prepareDiscriminatorPipeline.js

@@ -12,7 +12,9 @@ module.exports = function prepareDiscriminatorPipeline(pipeline, schema, prefix)
     // If the first pipeline stage is a match and it doesn't specify a `__t`
     // key, add the discriminator key to it. This allows for potential
     // aggregation query optimizations not to be disturbed by this feature.
-    if (originalPipeline[0] != null && originalPipeline[0].$match && !originalPipeline[0].$match[filterKey]) {
+    if (originalPipeline[0] != null &&
+        originalPipeline[0].$match &&
+        (originalPipeline[0].$match[filterKey] === undefined || originalPipeline[0].$match[filterKey] === discriminatorValue)) {
       originalPipeline[0].$match[filterKey] = discriminatorValue;
       // `originalPipeline` is a ref, so there's no need for
       // aggregate._pipeline = originalPipeline

package/lib/helpers/printJestWarning.js

@@ -9,7 +9,7 @@ if (typeof jest !== 'undefined' && typeof window !== 'undefined') {
     'https://mongoosejs.com/docs/jest.html');
 }
 
-if (typeof jest !== 'undefined' && process.nextTick.toString().indexOf('nextTick') === -1) {
+if (typeof jest !== 'undefined' && setTimeout.clock != null && typeof setTimeout.clock.Date === 'function') {
   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: ' +

package/lib/helpers/query/castUpdate.js

@@ -196,10 +196,15 @@ function walkUpdatePath(schema, obj, op, options, context, filter, pref) {
       }
     }
 
-    if (schema.discriminatorMapping != null && key === schema.options.discriminatorKey && !options.overwriteDiscriminatorKey) {
+    const discriminatorKey = (prefix ? prefix + key : key);
+    if (
+      schema.discriminatorMapping != null &&
+      discriminatorKey === schema.options.discriminatorKey &&
+      !options.overwriteDiscriminatorKey
+    ) {
       if (strictMode === 'throw') {
-        const err = new Error('Can\'t modify discriminator key "' + key + '" on discriminator model');
-        aggregatedError = _appendError(err, context, key, aggregatedError);
+        const err = new Error('Can\'t modify discriminator key "' + discriminatorKey + '" on discriminator model');
+        aggregatedError = _appendError(err, context, discriminatorKey, aggregatedError);
         continue;
       } else if (strictMode) {
         delete obj[key];

package/lib/schema/SubdocumentPath.js

@@ -172,6 +172,7 @@ SubdocumentPath.prototype.cast = function(val, doc, init, priorVal, options) {
   options = Object.assign({}, options, { priorDoc: priorVal });
   if (init) {
     subdoc = new Constructor(void 0, selected, doc, false, { defaults: false });
+    delete subdoc.$__.defaults;
     subdoc.$init(val);
     applyDefaults(subdoc, selected);
   } else {

package/lib/schema/documentarray.js

@@ -130,12 +130,12 @@ function _createConstructor(schema, options, baseClass) {
   Subdocument || (Subdocument = require('../types/ArraySubdocument'));
 
   // compile an embedded document for this schema
-  function EmbeddedDocument(_value, parentArray) {
+  function EmbeddedDocument() {
     Subdocument.apply(this, arguments);
-    if (parentArray == null || parentArray.getArrayParent() == null) {
+    if (this.__parentArray == null || this.__parentArray.getArrayParent() == null) {
       return;
     }
-    this.$session(parentArray.getArrayParent().$session());
+    this.$session(this.__parentArray.getArrayParent().$session());
   }
 
   schema._preCompile();

package/lib/types/DocumentArray/index.js

@@ -57,7 +57,7 @@ function MongooseDocumentArray(values, path, doc) {
   // to make more proof against unusual node environments
   if (doc && doc instanceof Document) {
     internals[arrayParentSymbol] = doc;
-    internals[arraySchemaSymbol] = doc.schema.path(path);
+    internals[arraySchemaSymbol] = doc.$__schema.path(path);
 
     // `schema.path()` doesn't drill into nested arrays properly yet, see
     // gh-6398, gh-6602. This is a workaround because nested arrays are

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.6.4",
+  "version": "6.6.6",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

package/types/expressions.d.ts

@@ -1127,6 +1127,16 @@ declare module 'mongoose' {
          * An expression that resolves to a boolean value used to determine if an element should be included in the output array. The expression references each element of the input array individually with the variable name specified in as.
          */
         cond: BooleanExpression;
+        /**
+         * A number expression that restricts the number of matching array elements that $filter returns. You cannot specify a limit less than 1. The matching array elements are returned in the order they appear in the input array.
+         *
+         * If the specified limit is greater than the number of matching array elements, $filter returns all matching array elements.
+         * If the limit is null, $filter returns all matching array elements.
+         *
+         * @version 5.2
+         * @see https://www.mongodb.com/docs/manual/reference/operator/aggregation/filter/#using-the-limit-field
+         */
+        limit?: NumberExpression;
       }
     }
 

package/types/index.d.ts

@@ -208,7 +208,7 @@ declare module 'mongoose' {
     /** Returns a copy of this schema */
     clone<T = this>(): T;
 
-    discriminator<DisSchema = Schema>(name: string, schema: DisSchema): DiscriminatorSchema<DocType, M, TInstanceMethods, TQueryHelpers, TVirtuals, TStaticMethods, DisSchema>;
+    discriminator<DisSchema = Schema>(name: string, schema: DisSchema): this;
 
     /** Returns a new schema that has the picked `paths` from this schema. */
     pick<T = this>(paths: string[], options?: SchemaOptions): T;

package/types/middlewares.d.ts

@@ -1,7 +1,7 @@
 declare module 'mongoose' {
 
   type MongooseDocumentMiddleware = 'validate' | 'save' | 'remove' | 'updateOne' | 'deleteOne' | 'init';
-  type MongooseQueryMiddleware = 'count' | 'deleteMany' | 'deleteOne' | 'distinct' | 'find' | 'findOne' | 'findOneAndDelete' | 'findOneAndRemove' | 'findOneAndReplace' | 'findOneAndUpdate' | 'remove' | 'replaceOne' | 'update' | 'updateOne' | 'updateMany';
+  type MongooseQueryMiddleware = 'count' | 'estimatedDocumentCount' | 'countDocuments' | 'deleteMany' | 'deleteOne' | 'distinct' | 'find' | 'findOne' | 'findOneAndDelete' | 'findOneAndRemove' | 'findOneAndReplace' | 'findOneAndUpdate' | 'remove' | 'replaceOne' | 'update' | 'updateOne' | 'updateMany';
 
   type MiddlewareOptions = { document?: boolean, query?: boolean };
   type SchemaPreOptions = MiddlewareOptions;

package/types/pipelinestage.d.ts

@@ -8,6 +8,7 @@ declare module 'mongoose' {
     | PipelineStage.BucketAuto
     | PipelineStage.CollStats
     | PipelineStage.Count
+    | PipelineStage.Densify
     | PipelineStage.Facet
     | PipelineStage.GeoNear
     | PipelineStage.GraphLookup
@@ -201,7 +202,7 @@ declare module 'mongoose' {
 
     export interface ReplaceWith {
       /** [`$replaceWith` reference](https://docs.mongodb.com/manual/reference/operator/aggregation/replaceWith/) */
-      $replaceWith: ObjectExpressionOperator;
+      $replaceWith: ObjectExpressionOperator | { [field: string]: Expression };
     }
 
     export interface Sample {