Make DocumentArray#map return a regular JS array

Automattic · Nov 18, 2019 · ba2c353 · ba2c353
1 parent e01c247
commit ba2c353
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/lib/types/documentarray.js b/lib/types/documentarray.js
@@ -181,11 +181,7 @@ class CoreDocumentArray extends CoreMongooseArray {
   }
 
   map() {
-    const arr = super.map.apply(this,arguments);
-
-    arr[arrayParentSymbol] = this[arrayParentSymbol];
-    arr[arrayPathSymbol] = this[arrayPathSymbol];
-
+    const arr = [].concat(Array.prototype.map.apply(this,arguments));
     return arr;
   }
 
@@ -337,7 +333,7 @@ if (util.inspect.custom) {
 
 function _updateParentPopulated(arr) {
   const parent = arr[arrayParentSymbol];
-  if (parent.$__.populated == null) return;
+  if (!parent || parent.$__.populated == null) return;
 
   const populatedPaths = Object.keys(parent.$__.populated).
     filter(p => p.startsWith(arr[arrayPathSymbol] + '.'));

diff --git a/test/types.documentarray.test.js b/test/types.documentarray.test.js
@@ -576,13 +576,14 @@ describe('types.documentarray', function() {
       assert.equal(doc.docs.length, 2);
     });
 
-    it('map() copies parent and path ()', function() {
+    it('map() works and does not return a mongoose array', function() {
       const personSchema = new Schema({ friends: [{ name: { type: String } }]});
       const Person = mongoose.model('gh8317-map', personSchema);
 
       const person = new Person({ friends: [{ name: 'Hafez' }] });
 
       const friendsNames = person.friends.map(friend => friend.name);
+      assert.deepEqual(friendsNames.constructor, Array);
 
       friendsNames.push('Sam');