mongoose 6.8.2 → 6.8.3

package/lib/helpers/populate/assignRawDocsToIdStructure.js

@@ -6,6 +6,8 @@ const utils = require('../../utils');
 
 module.exports = assignRawDocsToIdStructure;
 
+const kHasArray = Symbol('assignRawDocsToIdStructure.hasArray');
+
 /**
  * Assign `vals` returned by mongo query to the `rawIds`
  * structure returned from utils.getVals() honoring
@@ -43,7 +45,16 @@ function assignRawDocsToIdStructure(rawIds, resultDocs, resultOrder, options, re
 
   let i = 0;
   const len = rawIds.length;
-  const hasResultArrays = Object.values(resultOrder).find(o => Array.isArray(o));
+
+  if (sorting && recursed && options[kHasArray] === undefined) {
+    options[kHasArray] = false;
+    for (const key in resultOrder) {
+      if (Array.isArray(resultOrder[key])) {
+        options[kHasArray] = true;
+        break;
+      }
+    }
+  }
 
   for (i = 0; i < len; ++i) {
     id = rawIds[i];
@@ -55,7 +66,7 @@ function assignRawDocsToIdStructure(rawIds, resultDocs, resultOrder, options, re
       continue;
     }
 
-    if (id === null && !sorting) {
+    if (id === null && sorting === false) {
       // keep nulls for findOne unless sorting, which always
       // removes them (backward compat)
       newOrder.push(id);
@@ -79,7 +90,7 @@ function assignRawDocsToIdStructure(rawIds, resultDocs, resultOrder, options, re
       if (doc) {
         if (sorting) {
           const _resultOrder = resultOrder[sid];
-          if (hasResultArrays) {
+          if (options[kHasArray]) {
             // If result arrays, rely on the MongoDB server response for ordering
             newOrder.push(doc);
           } else {

package/lib/model.js

@@ -3411,7 +3411,8 @@ Model.$__insertMany = function(arr, options, callback) {
   }
 
   const validationErrors = [];
-  const toExecute = arr.map(doc =>
+  const validationErrorsToOriginalOrder = new Map();
+  const toExecute = arr.map((doc, index) =>
     callback => {
       if (!(doc instanceof _this)) {
         try {
@@ -3437,6 +3438,7 @@ Model.$__insertMany = function(arr, options, callback) {
           // failed. It's up to the next function to filter out all failed models
           if (ordered === false) {
             validationErrors.push(error);
+            validationErrorsToOriginalOrder.set(error, index);
             return callback(null, null);
           }
           return callback(error);
@@ -3450,14 +3452,38 @@ Model.$__insertMany = function(arr, options, callback) {
       callback(error, null);
       return;
     }
+
+    const originalDocIndex = new Map();
+    const validDocIndexToOriginalIndex = new Map();
+    for (let i = 0; i < docs.length; ++i) {
+      originalDocIndex.set(docs[i], i);
+    }
+
     // We filter all failed pre-validations by removing nulls
     const docAttributes = docs.filter(function(doc) {
       return doc != null;
     });
+    for (let i = 0; i < docAttributes.length; ++i) {
+      validDocIndexToOriginalIndex.set(i, originalDocIndex.get(docAttributes[i]));
+    }
+
+    // Make sure validation errors are in the same order as the
+    // original documents, so if both doc1 and doc2 both fail validation,
+    // `Model.insertMany([doc1, doc2])` will always have doc1's validation
+    // error before doc2's. Re: gh-12791.
+    if (validationErrors.length > 0) {
+      validationErrors.sort((err1, err2) => {
+        return validationErrorsToOriginalOrder.get(err1) - validationErrorsToOriginalOrder.get(err2);
+      });
+    }
+
     // Quickly escape while there aren't any valid docAttributes
     if (docAttributes.length === 0) {
       if (rawResult) {
         const res = {
+          acknowledged: true,
+          insertedCount: 0,
+          insertedIds: {},
           mongoose: {
             validationErrors: validationErrors
           }
@@ -3490,6 +3516,13 @@ Model.$__insertMany = function(arr, options, callback) {
         // `insertedDocs` is a Mongoose-specific property
         const erroredIndexes = new Set((error && error.writeErrors || []).map(err => err.index));
 
+        for (let i = 0; i < error.writeErrors.length; ++i) {
+          error.writeErrors[i] = {
+            ...error.writeErrors[i],
+            index: validDocIndexToOriginalIndex.get(error.writeErrors[i].index)
+          };
+        }
+
         let firstErroredIndex = -1;
         error.insertedDocs = docAttributes.
           filter((doc, i) => {
@@ -3513,6 +3546,12 @@ Model.$__insertMany = function(arr, options, callback) {
             return doc;
           });
 
+        if (rawResult && ordered === false) {
+          error.mongoose = {
+            validationErrors: validationErrors
+          };
+        }
+
         callback(error, null);
         return;
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.8.2",
+  "version": "6.8.3",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -20,7 +20,7 @@
   "license": "MIT",
   "dependencies": {
     "bson": "^4.7.0",
-    "kareem": "2.5.0",
+    "kareem": "2.5.1",
     "mongodb": "4.12.1",
     "mpath": "0.9.0",
     "mquery": "4.0.3",
@@ -28,10 +28,10 @@
     "sift": "16.0.1"
   },
   "devDependencies": {
-    "@babel/core": "7.20.5",
+    "@babel/core": "7.20.7",
     "@babel/preset-env": "7.20.2",
-    "@typescript-eslint/eslint-plugin": "5.45.0",
-    "@typescript-eslint/parser": "5.45.0",
+    "@typescript-eslint/eslint-plugin": "5.47.1",
+    "@typescript-eslint/parser": "5.47.1",
     "acquit": "1.2.1",
     "acquit-ignore": "0.2.0",
     "acquit-require": "0.1.1",
@@ -44,22 +44,22 @@
     "cheerio": "1.0.0-rc.12",
     "crypto-browserify": "3.12.0",
     "dox": "1.0.0",
-    "eslint": "8.28.0",
+    "eslint": "8.31.0",
     "eslint-plugin-mocha-no-only": "1.1.1",
     "express": "^4.18.1",
     "highlight.js": "11.7.0",
     "lodash.isequal": "4.5.0",
     "lodash.isequalwith": "4.4.0",
-    "marked": "4.2.3",
+    "marked": "4.2.5",
     "mkdirp": "^1.0.4",
-    "mocha": "10.1.0",
+    "mocha": "10.2.0",
     "moment": "2.x",
-    "mongodb-memory-server": "8.10.1",
+    "mongodb-memory-server": "8.10.2",
     "ncp": "^2.0.0",
     "nyc": "15.1.0",
     "pug": "3.0.2",
     "q": "1.5.1",
-    "sinon": "15.0.0",
+    "sinon": "15.0.1",
     "stream-browserify": "3.0.0",
     "tsd": "0.25.0",
     "typescript": "4.9.4",

package/types/aggregate.d.ts

@@ -166,6 +166,11 @@ declare module 'mongoose' {
      */
     model(model: Model<any>): this;
 
+    /**
+     * Returns the current model bound to this aggregate object
+     */
+    model(): Model<any>;
+
     /**
      * Append a new $near operator to this aggregation pipeline
      * @param arg $near operator contents

package/types/index.d.ts

@@ -353,7 +353,7 @@ declare module 'mongoose' {
     statics: { [F in keyof TStaticMethods]: TStaticMethods[F] } & { [name: string]: (this: M, ...args: any[]) => any };
 
     /** Creates a virtual type with the given name. */
-    virtual<T = HydratedDocument<DocType, TInstanceMethods>>(
+    virtual<T = HydratedDocument<DocType, TInstanceMethods, TVirtuals>>(
       name: keyof TVirtuals | string,
       options?: VirtualTypeOptions<T, DocType>
     ): VirtualType<T>;

package/types/inferschematype.d.ts

@@ -60,12 +60,18 @@ declare module 'mongoose' {
      }[alias]
      : unknown;
 
-  type ResolveSchemaOptions<T> = Omit<MergeType<DefaultSchemaOptions, T>, 'statics' | 'methods' | 'query' | 'virtuals'>;
+  // Without Omit, this gives us a "Type parameter 'TSchemaOptions' has a circular constraint."
+  type ResolveSchemaOptions<T> = Omit<MergeType<DefaultSchemaOptions, T>, 'fakepropertyname'>;
 
   type ApplySchemaOptions<T, O = DefaultSchemaOptions> = ResolveTimestamps<T, O>;
 
   type ResolveTimestamps<T, O> = O extends { timestamps: true }
-    ? { createdAt: NativeDate; updatedAt: NativeDate; } & T
+    // For some reason, TypeScript sets all the document properties to unknown
+    // if we use methods, statics, or virtuals. So avoid inferring timestamps
+    // if any of these are set for now. See gh-12807
+    ? O extends { methods: any } | { statics: any } | { virtuals: any }
+      ? T
+      : { createdAt: NativeDate; updatedAt: NativeDate; } & T
     : T;
 }
 
@@ -162,7 +168,7 @@ type ObtainDocumentPathType<PathValueType, TypeKey extends string = DefaultTypeK
  * @param {T} T A generic refers to string path enums.
  * @returns Path enum values type as literal strings or string.
  */
-type PathEnumOrString<T extends SchemaTypeOptions<string>['enum']> = T extends (infer E)[] ? E : T extends { values: any } ? PathEnumOrString<T['values']> : string;
+type PathEnumOrString<T extends SchemaTypeOptions<string>['enum']> = T extends ReadonlyArray<infer E> ? E : T extends { values: any } ? PathEnumOrString<T['values']> : string;
 
 /**
  * @summary Resolve path type by returning the corresponding type.