fix(document): apply getters on array elements when calling `toObject…

…({ getters: true })` Re: #9889
Automattic · Feb 12, 2021 · b301374 · b301374
1 parent 1e9eda3
commit b301374
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/lib/schema/array.js b/lib/schema/array.js
@@ -261,12 +261,19 @@ SchemaArray.prototype.enum = function() {
  */
 
 SchemaArray.prototype.applyGetters = function(value, scope) {
-  if (this.caster.options && this.caster.options.ref) {
+  if (scope != null && scope.populated(this.path)) {
     // means the object id was populated
     return value;
   }
 
-  return SchemaType.prototype.applyGetters.call(this, value, scope);
+  const ret = SchemaType.prototype.applyGetters.call(this, value, scope);
+  if (Array.isArray(ret)) {
+    const len = ret.length;
+    for (let i = 0; i < len; ++i) {
+      ret[i] = this.caster.applyGetters(ret[i], scope);
+    }
+  }
+  return ret;
 };
 
 SchemaArray.prototype._applySetters = function(value, scope, init, priorVal) {

diff --git a/lib/schema/documentarray.js b/lib/schema/documentarray.js
@@ -479,6 +479,14 @@ DocumentArrayPath.prototype.clone = function() {
   return schematype;
 };
 
+/*!
+ * ignore
+ */
+
+DocumentArrayPath.prototype.applyGetters = function(value, scope) {
+  return SchemaType.prototype.applyGetters.call(this, value, scope);
+};
+
 /*!
  * Scopes paths selected in a query to this array.
  * Necessary for proper default application of subdocument values.