Merge pull request #14492 from Automattic/vkarpov15/gh-14457

fix(schema): deduplicate idGetter so creating multiple models with same schema doesn't result in multiple id getters
Automattic · Apr 4, 2024 · 131d13c · 131d13c
2 parents b11ed34 + 7e30a08
commit 131d13c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/schema.js b/lib/schema.js
@@ -1952,6 +1952,7 @@ Schema.prototype.plugin = function(fn, opts) {
       'got "' + (typeof fn) + '"');
   }
 
+
   if (opts && opts.deduplicate) {
     for (const plugin of this.plugins) {
       if (plugin.fn === fn) {
@@ -2755,7 +2756,7 @@ function isArrayFilter(piece) {
  */
 
 Schema.prototype._preCompile = function _preCompile() {
-  idGetter(this);
+  this.plugin(idGetter, { deduplicate: true });
 };
 
 /*!

diff --git a/test/schema.test.js b/test/schema.test.js
@@ -3172,6 +3172,13 @@ describe('schema', function() {
     const res = await Test.findOne({ _id: { $eq: doc._id, $type: 'objectId' } });
     assert.equal(res.name, 'Test Testerson');
   });
+  it('deduplicates idGetter (gh-14457)', function() {
+    const schema = new Schema({ name: String });
+    schema._preCompile();
+    assert.equal(schema.virtual('id').getters.length, 1);
+    schema._preCompile();
+    assert.equal(schema.virtual('id').getters.length, 1);
+  });
 
   it('handles recursive definitions in discriminators (gh-13978)', function() {
     const base = new Schema({