refactor(types): make array and documentarray both inherit from CoreM…

…ongooseArray class Re: #7700
Automattic · May 11, 2019 · 3e52363 · 3e52363
1 parent 0dc8564
commit 3e52363
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/lib/types/array.js b/lib/types/array.js
@@ -4,6 +4,7 @@
 
 'use strict';
 
+const CoreMongooseArray = require('./core_array');
 const EmbeddedDocument = require('./embedded');
 const Document = require('../document');
 const ObjectId = require('./objectid');
@@ -35,7 +36,13 @@ const isMongooseObject = utils.isMongooseObject;
  */
 
 function MongooseArray(values, path, doc) {
-  const arr = [].concat(values);
+  // TODO: replace this with `new CoreMongooseArray().concat()` when we remove
+  // support for node 4.x and 5.x, see https://i.imgur.com/UAAHk4S.png
+  const arr = new CoreMongooseArray();
+
+  if (Array.isArray(values)) {
+    values.forEach(v => { arr.push(v); });
+  }
 
   const keysMA = Object.keys(MongooseArray.mixin);
   const numKeys = keysMA.length;
@@ -44,7 +51,6 @@ function MongooseArray(values, path, doc) {
   }
 
   arr[arrayPathSymbol] = path;
-  arr.isMongooseArray = true;
   arr.validators = [];
   arr[arrayAtomicsSymbol] = {};
   arr[arraySchemaSymbol] = void 0;

diff --git a/lib/types/core_array.js b/lib/types/core_array.js
@@ -0,0 +1,15 @@
+'use strict';
+
+/*!
+ * ignore
+ */
+
+class CoreMongooseArray extends Array {
+  get isMongooseArray() {
+    return true;
+  }
+
+  remove() {}
+}
+
+module.exports = CoreMongooseArray;
diff --git a/lib/types/documentarray.js b/lib/types/documentarray.js
@@ -4,6 +4,7 @@
  * Module dependencies.
  */
 
+const CoreMongooseArray = require('./core_array');
 const Document = require('../document');
 const MongooseArray = require('./array');
 const ObjectId = require('./objectid');
@@ -19,18 +20,6 @@ const arrayPathSymbol = require('../helpers/symbols').arrayPathSymbol;
 const arraySchemaSymbol = require('../helpers/symbols').arraySchemaSymbol;
 const documentArrayParent = require('../helpers/symbols').documentArrayParent;
 
-/*!
- * ignore
- */
-
-class CoreMongooseArray extends Array {
-  get isMongooseArray() {
-    return true;
-  }
-
-  remove() {}
-}
-
 /**
  * DocumentArray constructor
  *