Skip to content
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

fix(query): apply translateAliases before casting to avoid strictMode error when using aliases #14562

Merged
merged 1 commit into from
May 6, 2024
Merged

fix(query): apply translateAliases before casting to avoid strictMode error when using aliases #14562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 14 additions & 15 deletions lib/query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2222,6 +2222,7 @@ function _castArrayFilters(query) {
* @api private
*/
Query.prototype._find = async function _find() {
this._applyTranslateAliases();
this._castConditions();

if (this.error() != null) {
Expand All @@ -2244,8 +2245,6 @@ Query.prototype._find = async function _find() {

const options = this._optionsForExec();

this._applyTranslateAliases(options);

const filter = this._conditions;
const fields = options.projection;

Expand Down Expand Up @@ -2510,6 +2509,7 @@ Query.prototype._completeMany = async function _completeMany(docs, fields, userP
*/

Query.prototype._findOne = async function _findOne() {
this._applyTranslateAliases();
this._castConditions();

if (this.error()) {
Expand All @@ -2522,8 +2522,6 @@ Query.prototype._findOne = async function _findOne() {

const options = this._optionsForExec();

this._applyTranslateAliases(options);

// don't pass in the conditions because we already merged them in
const doc = await this.mongooseCollection.findOne(this._conditions, options);
return new Promise((resolve, reject) => {
Expand Down Expand Up @@ -2604,6 +2602,8 @@ Query.prototype.findOne = function(conditions, projection, options) {
*/

Query.prototype._countDocuments = async function _countDocuments() {
this._applyTranslateAliases();

try {
this.cast(this.model);
} catch (err) {
Expand All @@ -2619,8 +2619,6 @@ Query.prototype._countDocuments = async function _countDocuments() {

const options = this._optionsForExec();

this._applyTranslateAliases(options);

const conds = this._conditions;

return this.mongooseCollection.countDocuments(conds, options);
Expand All @@ -2631,7 +2629,7 @@ Query.prototype._countDocuments = async function _countDocuments() {
* on the following query properties: filter, projection, update, distinct.
*/

Query.prototype._applyTranslateAliases = function _applyTranslateAliases(options) {
Query.prototype._applyTranslateAliases = function _applyTranslateAliases() {
let applyTranslateAliases = false;
if ('translateAliases' in this._mongooseOptions) {
applyTranslateAliases = this._mongooseOptions.translateAliases;
Expand All @@ -2646,7 +2644,7 @@ Query.prototype._applyTranslateAliases = function _applyTranslateAliases(options

if (this.model?.schema?.aliases && Object.keys(this.model.schema.aliases).length > 0) {
this.model.translateAliases(this._conditions, true);
this.model.translateAliases(options.projection, true);
this.model.translateAliases(this._fields, true);
this.model.translateAliases(this._update, true);
if (this._distinct != null && this.model.schema.aliases[this._distinct] != null) {
this._distinct = this.model.schema.aliases[this._distinct];
Expand Down Expand Up @@ -2777,6 +2775,7 @@ Query.prototype.countDocuments = function(conditions, options) {
*/

Query.prototype.__distinct = async function __distinct() {
this._applyTranslateAliases();
this._castConditions();

if (this.error()) {
Expand All @@ -2787,7 +2786,6 @@ Query.prototype.__distinct = async function __distinct() {
applyGlobalDiskUse(this.options, this.model.db.options, this.model.base.options);

const options = this._optionsForExec();
this._applyTranslateAliases(options);

return this.mongooseCollection.
distinct(this._distinct, this._conditions, options);
Expand Down Expand Up @@ -3006,14 +3004,14 @@ Query.prototype.deleteOne = function deleteOne(filter, options) {
*/

Query.prototype._deleteOne = async function _deleteOne() {
this._applyTranslateAliases();
this._castConditions();

if (this.error() != null) {
throw this.error();
}

const options = this._optionsForExec();
this._applyTranslateAliases(options);

return this.mongooseCollection.deleteOne(this._conditions, options);
};
Expand Down Expand Up @@ -3080,14 +3078,14 @@ Query.prototype.deleteMany = function(filter, options) {
*/

Query.prototype._deleteMany = async function _deleteMany() {
this._applyTranslateAliases();
this._castConditions();

if (this.error() != null) {
throw this.error();
}

const options = this._optionsForExec();
this._applyTranslateAliases(options);

return this.mongooseCollection.deleteMany(this._conditions, options);
};
Expand Down Expand Up @@ -3277,6 +3275,7 @@ Query.prototype.findOneAndUpdate = function(filter, doc, options) {
*/

Query.prototype._findOneAndUpdate = async function _findOneAndUpdate() {
this._applyTranslateAliases();
this._castConditions();

_castArrayFilters(this);
Expand All @@ -3293,7 +3292,6 @@ Query.prototype._findOneAndUpdate = async function _findOneAndUpdate() {
}
const options = this._optionsForExec(this.model);
convertNewToReturnDocument(options);
this._applyTranslateAliases(options);

this._update = this._castUpdate(this._update);

Expand Down Expand Up @@ -3418,6 +3416,7 @@ Query.prototype.findOneAndDelete = function(filter, options) {
* @api private
*/
Query.prototype._findOneAndDelete = async function _findOneAndDelete() {
this._applyTranslateAliases();
this._castConditions();

if (this.error() != null) {
Expand All @@ -3428,7 +3427,6 @@ Query.prototype._findOneAndDelete = async function _findOneAndDelete() {

const filter = this._conditions;
const options = this._optionsForExec(this.model);
this._applyTranslateAliases(options);

let res = await this.mongooseCollection.findOneAndDelete(filter, options);
for (const fn of this._transforms) {
Expand Down Expand Up @@ -3542,6 +3540,7 @@ Query.prototype.findOneAndReplace = function(filter, replacement, options) {
* @api private
*/
Query.prototype._findOneAndReplace = async function _findOneAndReplace() {
this._applyTranslateAliases();
this._castConditions();
if (this.error() != null) {
throw this.error();
Expand All @@ -3554,7 +3553,6 @@ Query.prototype._findOneAndReplace = async function _findOneAndReplace() {

const filter = this._conditions;
const options = this._optionsForExec();
this._applyTranslateAliases(options);
convertNewToReturnDocument(options);

const includeResultMetadata = this.options.includeResultMetadata;
Expand Down Expand Up @@ -3749,6 +3747,8 @@ Query.prototype._mergeUpdate = function(doc) {
*/

async function _updateThunk(op) {
this._applyTranslateAliases();

this._castConditions();

_castArrayFilters(this);
Expand All @@ -3759,7 +3759,6 @@ async function _updateThunk(op) {

const castedQuery = this._conditions;
const options = this._optionsForExec(this.model);
this._applyTranslateAliases(options);

this._update = clone(this._update, options);
const isOverwriting = op === 'replaceOne';
Expand Down
22 changes: 22 additions & 0 deletions test/query.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3718,6 +3718,28 @@ describe('Query', function() {
}, /Provided object has both field "n" and its alias "name"/);
});

it('translateAliases applies before casting (gh-14521) (gh-7511)', async function() {
const testSchema = new Schema({
name: {
type: String,
alias: 'n'
},
age: {
type: Number
}
});
const Test = db.model('Test', testSchema);

const doc = await Test.findOneAndUpdate(
{ n: 14521 },
{ age: 7511 },
{ translateAliases: true, upsert: true, returnDocument: 'after' }
);

assert.strictEqual(doc.name, '14521');
assert.strictEqual(doc.age, 7511);
});

it('schema level translateAliases option (gh-7511)', async function() {
const testSchema = new Schema({
name: {
Expand Down
Loading