Merge branch 'master' into 5.2

Author: vkarpov15

History.md

@@ -1,3 +1,11 @@
+5.1.8 / 2018-07-02
+==================
+ * fix: don't throw TypeError if calling save() after original save() failed with push() #6638 [evanhenke](https://github.com/evanhenke)
+ * fix(query): add explain() helper and don't hydrate explain output #6625
+ * docs(query): fix `setOptions()` lists #6624
+ * docs: add geojson docs #6607
+ * fix: bump mongodb -> 3.0.11 to avoid cyclic dependency error with retryWrites #6109
+
 5.1.7 / 2018-06-26
 ==================
  * docs: add npm badge to readme #6623 [VFedyk](https://github.com/VFedyk)

lib/types/documentarray.js

@@ -248,7 +248,11 @@ MongooseDocumentArray.mixin = {
 
   toObject: function(options) {
     return this.map(function(doc) {
-      return doc && doc.toObject(options) || null;
+      try {
+        return doc.toObject(options);
+      } catch (e) {
+        return doc || null;
+      }
     });
   },
 

package.json

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

test/model.test.js

@@ -3729,6 +3729,38 @@ describe('Model', function() {
         done();
       });
     });
+
+    it('no TypeError when attempting to save more than once after using atomics', function(done) {
+      const M = db.model('M', new Schema({
+        test: {type: 'string', unique: true},
+        elements: [{
+          el: {type: 'string', required: true}
+        }]
+      }));
+      const a = new M({
+        test: 'a',
+        elements: [{el: 'b'}]
+      });
+      const b = new M({
+        test: 'b',
+        elements: [{el: 'c'}]
+      });
+      a.save(function() {
+        b.save(function() {
+          b.elements.push({el: 'd'});
+          b.test = 'a';
+          b.save(function(error,res) {
+            assert.strictEqual(!error,false);
+            assert.strictEqual(res,undefined);
+            b.save(function(error,res) {
+              assert.strictEqual(!error,false);
+              assert.strictEqual(res,undefined);
+              done();
+            });
+          });
+        });
+      });
+    });
   });