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(document): allow calling push() with different $position arguments #14254

Merged
merged 2 commits into from
Jan 18, 2024
Merged

fix(document): allow calling push() with different $position arguments #14254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
195b46c
fix(document): allow calling `push()` with different `$position` argu…
vkarpov15 Jan 12, 2024
6bc42ce
test: add missing issue to test title
vkarpov15 Jan 12, 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
18 changes: 8 additions & 10 deletions lib/types/array/methods/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

const Document = require('../../../document');
const ArraySubdocument = require('../../ArraySubdocument');
const MongooseError = require('../../../error/mongooseError');
const cleanModifiedSubpaths = require('../../../helpers/document/cleanModifiedSubpaths');
const internalToObjectOptions = require('../../../options').internalToObjectOptions;
const mpath = require('mpath');
Expand Down Expand Up @@ -684,22 +683,21 @@ const methods = {

if ((atomics.$push && atomics.$push.$each && atomics.$push.$each.length || 0) !== 0 &&
atomics.$push.$position != atomic.$position) {
throw new MongooseError('Cannot call `Array#push()` multiple times ' +
'with different `$position`');
}
if (atomic.$position != null) {
[].splice.apply(arr, [atomic.$position, 0].concat(values));
ret = arr.length;
} else {
ret = [].push.apply(arr, values);
}

if (atomic.$position != null) {
this._registerAtomic('$set', this);
} else if (atomic.$position != null) {
[].splice.apply(arr, [atomic.$position, 0].concat(values));
ret = this.length;
} else {
ret = [].push.apply(arr, values);
}
} else {
if ((atomics.$push && atomics.$push.$each && atomics.$push.$each.length || 0) !== 0 &&
atomics.$push.$position != null) {
throw new MongooseError('Cannot call `Array#push()` multiple times ' +
'with different `$position`');
}
atomic = values;
ret = [].push.apply(arr, values);
}
Expand Down
15 changes: 8 additions & 7 deletions test/document.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8208,7 +8208,7 @@ describe('document', function() {
assert.deepEqual(Object.keys(err.errors), ['age']);
});

it('array push with $position (gh-4322)', async function() {
it('array push with $position (gh-14244) (gh-4322)', async function() {
const schema = Schema({
nums: [Number]
});
Expand All @@ -8232,12 +8232,13 @@ describe('document', function() {
$each: [0],
$position: 0
});
assert.throws(() => {
doc.nums.push({ $each: [5] });
}, /Cannot call.*multiple times/);
assert.throws(() => {
doc.nums.push(5);
}, /Cannot call.*multiple times/);
assert.deepStrictEqual(doc.nums.$__getAtomics(), [['$push', { $each: [0], $position: 0 }]]);

doc.nums.push({ $each: [5] });
assert.deepStrictEqual(doc.nums.$__getAtomics(), [['$set', [0, 1, 2, 3, 4, 5]]]);

doc.nums.push({ $each: [0.5], $position: 1 });
assert.deepStrictEqual(doc.nums.$__getAtomics(), [['$set', [0, 0.5, 1, 2, 3, 4, 5]]]);
});

it('setting a path to a single nested document should update the single nested doc parent (gh-8400)', function() {
Expand Down