Merge branch 'master' into addTypesModelRemove

Author: AbdelrahmanHafez

.github/workflows/test.yml

@@ -41,17 +41,20 @@ jobs:
       matrix:
         node: [12, 14, 16, 18]
         os: [ubuntu-18.04, ubuntu-20.04]
+        mongodb: [4.0.2, 5.0.2, 6.0.0]
         include:
           - os: ubuntu-18.04
-            mongo-os: ubuntu1804
-            mongo: 4.0.2
+            mongodb-os: ubuntu1804
           - os: ubuntu-20.04
-            mongo-os: ubuntu2004
-            mongo: 5.0.2
+            mongodb-os: ubuntu2004
         exclude:
-          - os: ubuntu-18.04
+          - os: ubuntu-18.04 # exclude because nodejs 18 requires higher GLIBC
             node: 18
-    name: Node ${{ matrix.node }} MongoDB ${{ matrix.mongo }}
+          - os: ubuntu-18.04 # exclude because there are no builds for this ubuntu-mongodb version combination
+            mongodb: 6.0.0
+          - os: ubuntu-20.04 # exclude because there are no <4.4 mongodb builds for 2004
+            mongodb: 4.0.2
+    name: Node ${{ matrix.node }} MongoDB ${{ matrix.mongodb }} OS ${{ matrix.os }}
     steps:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
 
@@ -64,14 +67,14 @@ jobs:
 
       - name: Setup
         run: |
-          wget -q https://downloads.mongodb.org/linux/mongodb-linux-x86_64-${{ matrix.mongo-os }}-${{ matrix.mongo }}.tgz
-          tar xf mongodb-linux-x86_64-${{ matrix.mongo-os }}-${{ matrix.mongo }}.tgz
+          wget -q https://downloads.mongodb.org/linux/mongodb-linux-x86_64-${{ matrix.mongodb-os }}-${{ matrix.mongodb }}.tgz
+          tar xf mongodb-linux-x86_64-${{ matrix.mongodb-os }}-${{ matrix.mongodb }}.tgz
           mkdir -p ./data/db/27017 ./data/db/27000
           printf "\n--timeout 8000" >> ./test/mocha.opts
-          ./mongodb-linux-x86_64-${{ matrix.mongo-os }}-${{ matrix.mongo }}/bin/mongod --setParameter ttlMonitorSleepSecs=1 --fork --dbpath ./data/db/27017 --syslog --port 27017
+          ./mongodb-linux-x86_64-${{ matrix.mongodb-os }}-${{ matrix.mongodb }}/bin/mongod --setParameter ttlMonitorSleepSecs=1 --fork --dbpath ./data/db/27017 --syslog --port 27017
           sleep 2
           mongod --version
-          echo `pwd`/mongodb-linux-x86_64-${{ matrix.mongo-os }}-${{ matrix.mongo }}/bin >> $GITHUB_PATH
+          echo `pwd`/mongodb-linux-x86_64-${{ matrix.mongodb-os }}-${{ matrix.mongodb }}/bin >> $GITHUB_PATH
       - run: npm test
 
   test-replica-sets:

CHANGELOG.md

@@ -1,3 +1,8 @@
+5.13.15 / 2022-08-22
+====================
+ * fix: backport fix for CVE-2022-2564 #12281 [shubanker](https://github.com/shubanker)
+ * docs: fix broken link from findandmodify method deprecation #11366 [laissonsilveira](https://github.com/laissonsilveira)
+
 6.5.2 / 2022-08-09
 ==================
  * fix(aggregate): avoid throwing error when disconnecting with change stream open #12201 [ramos-ph](https://github.com/ramos-ph)

docs/documents.md

@@ -7,7 +7,7 @@ to documents as stored in MongoDB. Each document is an instance of its
 <ul class="toc">
   <li><a href="#documents-vs-models">Documents vs Models</a></li>
   <li><a href="#retrieving">Retrieving</a></li>
-  <li><a href="#updating-using-save">Updating Using <code>save()<code></a></li>
+  <li><a href="#updating-using-save">Updating Using <code>save()</code></a></li>
   <li><a href="#updating-using-queries">Updating Using Queries</a></li>
   <li><a href="#validating">Validating</a></li>
   <li><a href="#overwriting">Overwriting</a></li>

docs/geojson.md

@@ -6,10 +6,6 @@
   });
 </script>
 
-<div class="native-inline">
-  <a href="#native_link#"><span class="sponsor">Sponsor</span> #native_company# — #native_desc#</a>
-</div>
-
 [GeoJSON](http://geojson.org/) is a format for storing geographic points and
 polygons. [MongoDB has excellent support for geospatial queries](http://thecodebarbarian.com/80-20-guide-to-mongodb-geospatial-queries)
 on GeoJSON objects. Let's take a look at how you can use Mongoose to store
@@ -157,4 +153,4 @@ citySchema.index({ location: '2dsphere' });
 
 MongoDB's [`$near` query operator](https://docs.mongodb.com/v4.0/reference/operator/query/near/#op._S_near)
 and [`$geoNear` aggregation stage](https://docs.mongodb.com/manual/reference/operator/aggregation/geoNear/#pipe._S_geoNear)
-_require_ a 2dsphere index. 
+_require_ a 2dsphere index. 

docs/guide.md

@@ -147,8 +147,8 @@ const animalSchema = new Schema({ name: String, type: String },
 {
   // Assign a function to the "methods" object of our animalSchema through schema options.
   // By following this approach, there is no need to create a separate TS type to define the type of the instance functions.
-  methods:{
-    findSimilarTypes(cb){
+  methods: {
+    findSimilarTypes(cb) {
       return mongoose.model('Animal').find({ type: this.type }, cb);
     }
   }
@@ -192,8 +192,8 @@ const animalSchema = new Schema({ name: String, type: String },
 {
   // Assign a function to the "statics" object of our animalSchema through schema options.
   // By following this approach, there is no need to create a separate TS type to define the type of the statics functions. 
-  statics:{
-    findByName(name){
+  statics: {
+    findByName(name) {
       return this.find({ name: new RegExp(name, 'i') });
     }
   }
@@ -347,9 +347,9 @@ const personSchema = new Schema({
     first: String,
     last: String
   }
-},{
-  virtuals:{
-    fullName:{
+}, {
+  virtuals: {
+    fullName: {
       get() {
         return this.name.first + ' ' + this.name.last;
       }
@@ -386,9 +386,9 @@ const personSchema = new Schema({
     first: String,
     last: String
   }
-},{
-  virtuals:{
-    fullName:{
+}, {
+  virtuals: {
+    fullName: {
       get() {
         return this.name.first + ' ' + this.name.last;
       }
@@ -404,7 +404,7 @@ const personSchema = new Schema({
 personSchema.virtual('fullName').
   get(function() {
     return this.name.first + ' ' + this.name.last;
-    }).
+  }).
   set(function(v) {
     this.name.first = v.substr(0, v.indexOf(' '));
     this.name.last = v.substr(v.indexOf(' ') + 1);

docs/js/mobile-navbar-toggle.js

@@ -0,0 +1,46 @@
+// this js is for mobile, to toggle the navbar
+
+(function (window, document) {
+  const layout   = document.getElementById('layout'),
+        menu     = document.getElementById('menu'),
+        menuLink = document.getElementById('menuLink'),
+        content  = document.getElementById('content');
+
+  function toggleClass(element, className) {
+    const classes = element.className.split(/\s+/),
+          length = classes.length;
+
+    for(let i = 0; i < length; i++) {
+      if (classes[i] === className) {
+        classes.splice(i, 1);
+        break;
+      }
+    }
+    // The className is not found
+    if (length === classes.length) {
+        classes.push(className);
+    }
+
+    element.className = classes.join(' ');
+  }
+
+  function toggleAll(e) {
+    let active = 'active';
+
+    e.preventDefault();
+    toggleClass(layout, active);
+    toggleClass(menu, active);
+    toggleClass(menuLink, active);
+  }
+
+  menuLink.onclick = function (e) {
+    toggleAll(e);
+  };
+
+  content.onclick = function(e) {
+    if (menu.className.indexOf('active') !== -1) {
+      toggleAll(e);
+    }
+  };
+
+}(this, this.document));

docs/js/navbar-search.js

@@ -1,11 +1,11 @@
 document.getElementById('search-button-nav').onclick = function() {
   var q = document.getElementById('search-input-nav').value;
-  window.location.href = 'search.html?q=' + encodeURIComponent(q);
+  window.location.href = '/docs/search.html?q=' + encodeURIComponent(q);
 };
 
 var q = document.getElementById('search-input-nav').onkeyup = function(ev) {
   if (ev.keyCode === 13) {
     var q = document.getElementById('search-input-nav').value;
     window.location.href = '/docs/search.html?q=' + encodeURIComponent(q);
   }
-};
+};

docs/layout.pug

@@ -171,49 +171,4 @@ html(lang='en')
 
 
         script(type="text/javascript" src="/docs/js/navbar-search.js")
-        script(type="text/javascript").
-          (function (window, document) {
-            var layout   = document.getElementById('layout'),
-                menu     = document.getElementById('menu'),
-                menuLink = document.getElementById('menuLink'),
-                content  = document.getElementById('content');
-
-            function toggleClass(element, className) {
-                var classes = element.className.split(/\s+/),
-                    length = classes.length,
-                    i = 0;
-
-                for(; i < length; i++) {
-                  if (classes[i] === className) {
-                    classes.splice(i, 1);
-                    break;
-                  }
-                }
-                // The className is not found
-                if (length === classes.length) {
-                    classes.push(className);
-                }
-
-                element.className = classes.join(' ');
-            }
-
-            function toggleAll(e) {
-                var active = 'active';
-
-                e.preventDefault();
-                toggleClass(layout, active);
-                toggleClass(menu, active);
-                toggleClass(menuLink, active);
-            }
-
-            menuLink.onclick = function (e) {
-                toggleAll(e);
-            };
-
-            content.onclick = function(e) {
-                if (menu.className.indexOf('active') !== -1) {
-                    toggleAll(e);
-                }
-            };
-
-          }(this, this.document));
+        script(type="text/javascript" src="/docs/js/mobile-navbar-toggle.js")

docs/source/index.js

@@ -65,4 +65,4 @@ exports['docs/change-streams.md'] = { title: 'MongoDB Change Streams in NodeJS w
 
 for (const props of Object.values(exports)) {
   props.jobs = jobs;
-}
+}

lib/browserDocument.js

@@ -20,7 +20,7 @@ const isObject = require('./helpers/isObject');
  * @param {Object} schema
  * @param {Object} [fields] optional object containing the fields which were selected in the query returning this document and any populated paths data
  * @param {Boolean} [skipId] bool, should we auto create an ObjectId _id
- * @inherits NodeJS EventEmitter https://nodejs.org/api/events.html#events_class_events_eventemitter
+ * @inherits NodeJS EventEmitter https://nodejs.org/api/events.html#class-eventemitter
  * @event `init`: Emitted on a document after it has was retrieved from the db and fully hydrated by Mongoose.
  * @event `save`: Emitted when the document is successfully saved
  * @api private