Skip to content

fix(document): avoid unnecessary clone() in applyGetters() that was triggering additional getters #14844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 3, 2024
Merged

fix(document): avoid unnecessary clone() in applyGetters() that was triggering additional getters #14844

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f87c811
fix(document): avoid unnecessary clone() in `applyGetters()` that was…
vkarpov15 Aug 29, 2024
6356c5b
test: add test case for #14840
vkarpov15 Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(document): avoid unnecessary clone() in applyGetters() that was… 
… triggering additional getters

Fix #14840
Fix #14835
Re: #14724
  • Loading branch information
@vkarpov15
vkarpov15 committed Aug 29, 2024
commit f87c8110a1b0e2ada22e74a01e46b6f912e3424d
14 changes: 7 additions & 7 deletions lib/document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3856,7 +3856,6 @@ Document.prototype.$toObject = function(options, json) {
// Parent options should only bubble down for subdocuments, not populated docs
options._parentOptions = this.$isSubdocument ? options : null;

options._skipSingleNestedGetters = false;
// remember the root transform function
// to save it from being overwritten by sub-transform functions
// const originalTransform = options.transform;
Expand All @@ -3870,13 +3869,13 @@ Document.prototype.$toObject = function(options, json) {
ret = clone(this._doc, options) || {};
}

options._skipSingleNestedGetters = true;
const getters = options._calledWithOptions.getters
?? options.getters
?? defaultOptions.getters
?? false;

if (getters) {
applyGetters(this, ret, options);
applyGetters(this, ret);

if (options.minimize) {
ret = minimize(ret) || {};
Expand Down Expand Up @@ -4187,12 +4186,11 @@ function applyVirtuals(self, json, options, toObjectOptions) {
*
* @param {Document} self
* @param {Object} json
* @param {Object} [options]
* @return {Object} `json`
* @api private
*/

function applyGetters(self, json, options) {
function applyGetters(self, json) {
const schema = self.$__schema;
const paths = Object.keys(schema.paths);
let i = paths.length;
Expand Down Expand Up @@ -4228,8 +4226,10 @@ function applyGetters(self, json, options) {
if (branch != null && typeof branch !== 'object') {
break;
} else if (ii === last) {
const val = self.$get(path);
branch[part] = clone(val, options);
branch[part] = schema.paths[path].applyGetters(
branch[part],
self
);
if (Array.isArray(branch[part]) && schema.paths[path].$embeddedSchemaType) {
for (let i = 0; i < branch[part].length; ++i) {
branch[part][i] = schema.paths[path].$embeddedSchemaType.applyGetters(
Expand Down
5 changes: 0 additions & 5 deletions lib/helpers/clone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ function clone(obj, options, isArrayChild) {

if (isMongooseObject(obj)) {
if (options) {
// Single nested subdocs should apply getters later in `applyGetters()`
// when calling `toObject()`. See gh-7442, gh-8295
if (options._skipSingleNestedGetters && obj.$isSingleNested) {
options._calledWithOptions = Object.assign({}, options._calledWithOptions || {}, { getters: false });
}
if (options.retainDocuments && obj.$__ != null) {
const clonedDoc = obj.$clone();
if (obj.__index != null) {
Expand Down