Merge pull request #15138 from IchirokuXVI/fix-ref-manual-populate

Fix document not applying manual populate when using a function in schema.options.ref
Automattic · Jan 4, 2025 · 5dcca7e · 5dcca7e
2 parents 56909d0 + 305997a
commit 5dcca7e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/document.js b/lib/document.js
@@ -55,6 +55,7 @@ const documentIsModified = require('./helpers/symbols').documentIsModified;
 const documentModifiedPaths = require('./helpers/symbols').documentModifiedPaths;
 const documentSchemaSymbol = require('./helpers/symbols').documentSchemaSymbol;
 const getSymbol = require('./helpers/symbols').getSymbol;
+const modelSymbol = require('./helpers/symbols').modelSymbol;
 const populateModelSymbol = require('./helpers/symbols').populateModelSymbol;
 const scopeSymbol = require('./helpers/symbols').scopeSymbol;
 const schemaMixedSymbol = require('./schema/symbols').schemaMixedSymbol;
@@ -1386,7 +1387,9 @@ Document.prototype.$set = function $set(path, val, type, options) {
       const model = val.constructor;
 
       // Check ref
-      const ref = schema.options.ref;
+      const refOpt = typeof schema.options.ref === 'function' && !schema.options.ref[modelSymbol] ? schema.options.ref.call(this, this) : schema.options.ref;
+
+      const ref = refOpt?.modelName || refOpt;
       if (ref != null && (ref === model.modelName || ref === model.baseModelName)) {
         return true;
       }