Merge branch '8.0' into vkarpov15/gh-12748

Author: vkarpov15

.eslintrc.js

@@ -13,7 +13,8 @@ module.exports = {
     '*.min.js',
     '**/docs/js/native.js',
     '!.*',
-    'node_modules'
+    'node_modules',
+    '.git'
   ],
   overrides: [
     {

CHANGELOG.md

@@ -1,3 +1,22 @@
+7.5.3 / 2023-09-25
+==================
+ * fix(document): handle MongoDB Long when casting BigInts #13869 #13791
+ * fix(model): make bulkSave() persist changes that happen in pre('save') middleware #13885 #13799
+ * fix: handle casting $elemMatch underneath $not underneath another $elemMatch #13893 #13880
+ * fix(model): make bulkWrite casting respect global setDefaultsOnInsert #13870 #13823
+ * fix(document): handle default values for discriminator key with embedded discriminators #13891 #13835
+ * fix: account for null values when assigning isNew property within document array #13883
+ * types: avoid "interface can only extend object types with statically known members" error in TypeScript 4 #13871
+ * docs(deprecations): fix typo in includeResultMetadata deprecation docs #13884 #13844
+ * docs: fix pre element overflow in home page #13868 [ghoshRitesh12](https://github.com/ghoshRitesh12)
+
+7.5.2 / 2023-09-15
+==================
+ * fix(schema): handle number discriminator keys when using Schema.prototype.discriminator() #13858 #13788
+ * fix: ignore `id` property when calling `set()` with both `id` and `_id` specified to avoid `id` setter overwriting #13762
+ * types: pass correct document type to required and default function #13851 #13797
+ * docs(model): add examples of using diffIndexes() to syncIndexes()and diffIndexes() api docs #13850 #13771
+
 7.5.1 / 2023-09-11
 ==================
  * fix: set default value for _update when no update object is provided and versionKey is set to false #13795 #13783 [MohOraby](https://github.com/MohOraby)

docs/css/style.css

@@ -46,6 +46,7 @@ pre {
   background: #eee;
   padding: 5px;
   border-radius: 3px;
+  overflow-x: auto;
 }
 code {
   color: #333;

docs/deprecations.md

@@ -9,7 +9,7 @@ cause any problems for your application. Please [report any issues on GitHub](ht
 
 To fix all deprecation warnings, follow the below steps:
 
-* Replace `rawResult: true` with `includeResultMetadata: false` in `findOneAndUpdate()`, `findOneAndReplace()`, `findOneAndDelete()` calls.
+* Replace `rawResult: true` with `includeResultMetadata: true` in `findOneAndUpdate()`, `findOneAndReplace()`, `findOneAndDelete()` calls.
 
 Read below for more a more detailed description of each deprecation warning.
 

docs/source/api.js

@@ -15,9 +15,9 @@ const files = [
   'lib/document.js',
   'lib/model.js',
   'lib/query.js',
-  'lib/cursor/QueryCursor.js',
+  'lib/cursor/queryCursor.js',
   'lib/aggregate.js',
-  'lib/cursor/AggregationCursor.js',
+  'lib/cursor/aggregationCursor.js',
   'lib/schemaType.js',
   'lib/virtualType.js',
   'lib/error/index.js',
@@ -29,16 +29,16 @@ const files = [
   'lib/schema/number.js',
   'lib/schema/objectId.js',
   'lib/schema/string.js',
-  'lib/options/SchemaTypeOptions.js',
-  'lib/options/SchemaArrayOptions.js',
-  'lib/options/SchemaBufferOptions.js',
-  'lib/options/SchemaDateOptions.js',
-  'lib/options/SchemaNumberOptions.js',
-  'lib/options/SchemaObjectIdOptions.js',
-  'lib/options/SchemaStringOptions.js',
-  'lib/types/DocumentArray/methods/index.js',
+  'lib/options/schemaTypeOptions.js',
+  'lib/options/schemaArrayOptions.js',
+  'lib/options/schemaBufferOptions.js',
+  'lib/options/schemaDateOptions.js',
+  'lib/options/schemaNumberOptions.js',
+  'lib/options/schemaObjectIdOptions.js',
+  'lib/options/schemaStringOptions.js',
+  'lib/types/documentArray/methods/index.js',
   'lib/types/subdocument.js',
-  'lib/types/ArraySubdocument.js',
+  'lib/types/arraySubdocument.js',
   'lib/types/buffer.js',
   'lib/types/decimal128.js',
   'lib/types/map.js',

lib/aggregate.js

@@ -4,7 +4,7 @@
  * Module dependencies
  */
 
-const AggregationCursor = require('./cursor/AggregationCursor');
+const AggregationCursor = require('./cursor/aggregationCursor');
 const MongooseError = require('./error/mongooseError');
 const Query = require('./query');
 const { applyGlobalMaxTimeMS, applyGlobalDiskUse } = require('./helpers/query/applyGlobalOption');

lib/cast.js

@@ -309,8 +309,21 @@ module.exports = function cast(schema, obj, options, context) {
           while (k--) {
             $cond = ks[k];
             nested = val[$cond];
-
-            if ($cond === '$not') {
+            if ($cond === '$elemMatch') {
+              if (nested && schematype != null && schematype.schema != null) {
+                cast(schematype.schema, nested, options, context);
+              } else if (nested && schematype != null && schematype.$isMongooseArray) {
+                if (utils.isPOJO(nested) && nested.$not != null) {
+                  cast(schema, nested, options, context);
+                } else {
+                  val[$cond] = schematype.castForQuery(
+                    $cond,
+                    nested,
+                    context
+                  );
+                }
+              }
+            } else if ($cond === '$not') {
               if (nested && schematype) {
                 _keys = Object.keys(nested);
                 if (_keys.length && isOperator(_keys[0])) {
@@ -337,6 +350,7 @@ module.exports = function cast(schema, obj, options, context) {
                 context
               );
             }
+
           }
         }
       } else if (Array.isArray(val) && ['Buffer', 'Array'].indexOf(schematype.instance) === -1) {

lib/cast/bigint.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const assert = require('assert');
+const { Long } = require('bson');
 
 /**
  * Given a value, cast it to a BigInt, or throw an `Error` if the value
@@ -23,6 +24,10 @@ module.exports = function castBigInt(val) {
     return val;
   }
 
+  if (val instanceof Long) {
+    return val.toBigInt();
+  }
+
   if (typeof val === 'string' || typeof val === 'number') {
     return BigInt(val);
   }

lib/connection.js

@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 
-const ChangeStream = require('./cursor/ChangeStream');
+const ChangeStream = require('./cursor/changeStream');
 const EventEmitter = require('events').EventEmitter;
 const Schema = require('./schema');
 const STATES = require('./connectionState');