Skip to content

Commit

Permalink
Merge branch 'master' into vkarpov15/gh-12085
Browse files Browse the repository at this point in the history
  • Loading branch information
vkarpov15 committed Jul 20, 2022
2 parents a45cfb6 + 422f9da commit 92cb6fb
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 24 deletions.
4 changes: 2 additions & 2 deletions docs/migrating_to_6.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ mongoose.isValidObjectId(new User({ name: 'test' })); // true
// character hex strings.
mongoose.isObjectIdOrHexString(new mongoose.Types.ObjectId()); // true
mongoose.isObjectIdOrHexString('62261a65d66c6be0a63c051f'); // true
mongoose.isValidObjectId('0123456789ab'); // false
mongoose.isValidObjectId(6); // false
mongoose.isObjectIdOrHexString('0123456789ab'); // false
mongoose.isObjectIdOrHexString(6); // false
```

<h3 id="schema-defined-document-key-order"><a href="#schema-defined-document-key-order">Schema Defined Document Key Order</a></h3>
Expand Down
2 changes: 1 addition & 1 deletion lib/document.js
Original file line number Diff line number Diff line change
Expand Up @@ -1149,8 +1149,8 @@ Document.prototype.$set = function $set(path, val, type, options) {
}

if (utils.isNonBuiltinObject(valForKey) && pathtype === 'nested') {
$applyDefaultsToNested(path[key], prefix + key, this);
this.$set(prefix + key, path[key], constructing, Object.assign({}, options, { _skipMarkModified: true }));
$applyDefaultsToNested(this.$get(prefix + key), prefix + key, this);
continue;
} else if (strict) {
// Don't overwrite defaults with undefined keys (gh-3981) (gh-9039)
Expand Down
10 changes: 8 additions & 2 deletions lib/query.js
Original file line number Diff line number Diff line change
Expand Up @@ -4019,7 +4019,9 @@ Query.prototype._findAndModify = function(type, callback) {
*/

function _completeOneLean(schema, doc, path, res, opts, callback) {
if (opts.lean && opts.lean.transform) {
if (opts.lean && typeof opts.lean.transform === 'function') {
opts.lean.transform(doc);

for (let i = 0; i < schema.childSchemas.length; i++) {
const childPath = path ? path + '.' + schema.childSchemas[i].model.path : schema.childSchemas[i].model.path;
const _schema = schema.childSchemas[i].schema;
Expand Down Expand Up @@ -4053,7 +4055,11 @@ function _completeOneLean(schema, doc, path, res, opts, callback) {
*/

function _completeManyLean(schema, docs, path, opts, callback) {
if (opts.lean && opts.lean.transform) {
if (opts.lean && typeof opts.lean.transform === 'function') {
for (const doc of docs) {
opts.lean.transform(doc);
}

for (let i = 0; i < schema.childSchemas.length; i++) {
const childPath = path ? path + '.' + schema.childSchemas[i].model.path : schema.childSchemas[i].model.path;
const _schema = schema.childSchemas[i].schema;
Expand Down
8 changes: 5 additions & 3 deletions test/document.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8831,7 +8831,7 @@ describe('document', function() {
assert.ok(!user.updatedAt);
});

it('Sets default when passing undefined as value for a key in a nested subdoc (gh-9039)', async function() {
it('Sets default when passing undefined as value for a key in a nested subdoc (gh-12102) (gh-9039)', async function() {
const Test = db.model('Test', {
nested: {
prop: {
Expand All @@ -8841,9 +8841,11 @@ describe('document', function() {
}
});


const doc = await Test.create({ nested: { prop: undefined } });
const obj = { nested: { prop: undefined } };
const doc = await Test.create(obj);
assert.equal(doc.nested.prop, 'some default value');

assert.deepStrictEqual(obj, { nested: { prop: undefined } });
});

it('allows accessing $locals when initializing (gh-9098)', function() {
Expand Down
38 changes: 22 additions & 16 deletions test/query.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4006,22 +4006,28 @@ describe('Query', function() {
});
const Test = db.model('gh10423', testSchema);
await Test.create({ name: 'foo', foo: [{ sub: 'Test' }, { sub: 'Testerson' }], otherName: { nickName: 'Bar' } });
const result = await Test.find().lean({ transform: (doc) => {
delete doc._id;
return doc;
} });
assert(result[0]._id);
assert.equal(result[0].otherName._id, undefined);
assert.equal(result[0].foo[0]._id, undefined);
assert.equal(result[0].foo[1]._id, undefined);
const single = await Test.findOne().lean({ transform: (doc) => {
delete doc._id;
return doc;
} });
assert(single._id);
assert.equal(single.otherName._id, undefined);
assert.equal(single.foo[0]._id, undefined);
assert.equal(single.foo[0]._id, undefined);

const result = await Test.find().lean({
transform: (doc) => {
delete doc._id;
return doc;
}
});
assert.strictEqual(result[0]._id, undefined);
assert.strictEqual(result[0].otherName._id, undefined);
assert.strictEqual(result[0].foo[0]._id, undefined);
assert.strictEqual(result[0].foo[1]._id, undefined);

const single = await Test.findOne().lean({
transform: (doc) => {
delete doc._id;
return doc;
}
});
assert.strictEqual(single._id, undefined);
assert.strictEqual(single.otherName._id, undefined);
assert.strictEqual(single.foo[0]._id, undefined);
assert.strictEqual(single.foo[0]._id, undefined);
});

it('skips applying default projections over slice projections (gh-11940)', async function() {
Expand Down
13 changes: 13 additions & 0 deletions test/schema.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,19 @@ describe('schema', function() {

assert.equal(called, true);
});

it('options param (gh-12077)', function() {
const Tobi = new Schema();
let called = false;

Tobi.plugin(function(schema, opts) {
assert.equal(schema, Tobi);
assert.deepStrictEqual(opts, { answer: 42 });
called = true;
}, { answer: 42 });

assert.equal(called, true);
});
});

describe('options', function() {
Expand Down

0 comments on commit 92cb6fb

Please sign in to comment.