fix(virtualtype): always get populated virtual value before running g…

…etters, better fix for #9343
Automattic · Nov 7, 2020 · e0c7006 · e0c7006
1 parent abb2e74
commit e0c7006
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 31 deletions.
diff --git a/lib/schema.js b/lib/schema.js
@@ -1717,40 +1717,31 @@ Schema.prototype.virtual = function(name, options) {
 
     const virtual = this.virtual(name);
     virtual.options = options;
-    process.nextTick(() => {
-      virtual.
-        get(function(_v) {
-          if (this.$$populatedVirtuals &&
-            this.$$populatedVirtuals.hasOwnProperty(name)) {
-            return this.$$populatedVirtuals[name];
-          }
-          if (_v == null) return undefined;
-          return _v;
-        }).
-        set(function(_v) {
-          if (!this.$$populatedVirtuals) {
-            this.$$populatedVirtuals = {};
-          }
 
-          if (options.justOne || options.count) {
-            this.$$populatedVirtuals[name] = Array.isArray(_v) ?
-              _v[0] :
-              _v;
+    virtual.
+      set(function(_v) {
+        if (!this.$$populatedVirtuals) {
+          this.$$populatedVirtuals = {};
+        }
 
-            if (typeof this.$$populatedVirtuals[name] !== 'object') {
-              this.$$populatedVirtuals[name] = options.count ? _v : null;
-            }
-          } else {
-            this.$$populatedVirtuals[name] = Array.isArray(_v) ?
-              _v :
-              _v == null ? [] : [_v];
-
-            this.$$populatedVirtuals[name] = this.$$populatedVirtuals[name].filter(function(doc) {
-              return doc && typeof doc === 'object';
-            });
+        if (options.justOne || options.count) {
+          this.$$populatedVirtuals[name] = Array.isArray(_v) ?
+            _v[0] :
+            _v;
+
+          if (typeof this.$$populatedVirtuals[name] !== 'object') {
+            this.$$populatedVirtuals[name] = options.count ? _v : null;
           }
-        });
-    });
+        } else {
+          this.$$populatedVirtuals[name] = Array.isArray(_v) ?
+            _v :
+            _v == null ? [] : [_v];
+
+          this.$$populatedVirtuals[name] = this.$$populatedVirtuals[name].filter(function(doc) {
+            return doc && typeof doc === 'object';
+          });
+        }
+      });
 
     if (typeof options.get === 'function') {
       virtual.get(options.get);

diff --git a/lib/virtualtype.js b/lib/virtualtype.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const utils = require('./utils');
+
 /**
  * VirtualType constructor
  *
@@ -137,6 +139,12 @@ VirtualType.prototype.set = function(fn) {
  */
 
 VirtualType.prototype.applyGetters = function(value, doc) {
+  if (utils.hasUserDefinedProperty(this.options, ['ref', 'refPath']) &&
+      doc.$$populatedVirtuals &&
+      doc.$$populatedVirtuals.hasOwnProperty(this.path)) {
+    value = doc.$$populatedVirtuals[this.path];
+  }
+
   let v = value;
   for (let l = this.getters.length - 1; l >= 0; l--) {
     v = this.getters[l].call(doc, v, this, doc);