",
"keywords": [
"mongodb",
@@ -53,7 +53,7 @@
"lodash.isequal": "4.5.0",
"lodash.isequalwith": "4.4.0",
"markdownlint-cli2": "^0.13.0",
- "marked": "4.3.0",
+ "marked": "14.0.0",
"mkdirp": "^3.0.1",
"mocha": "10.7.0",
"moment": "2.30.1",
diff --git a/scripts/tsc-diagnostics-check.js b/scripts/tsc-diagnostics-check.js
index c23da8c1f55..a1c4408cb79 100644
--- a/scripts/tsc-diagnostics-check.js
+++ b/scripts/tsc-diagnostics-check.js
@@ -3,7 +3,7 @@
const fs = require('fs');
const stdin = fs.readFileSync(0).toString('utf8');
-const maxInstantiations = isNaN(process.argv[2]) ? 135000 : parseInt(process.argv[2], 10);
+const maxInstantiations = isNaN(process.argv[2]) ? 250000 : parseInt(process.argv[2], 10);
console.log(stdin);
diff --git a/scripts/website.js b/scripts/website.js
index 63779a7e7be..75317225791 100644
--- a/scripts/website.js
+++ b/scripts/website.js
@@ -10,11 +10,17 @@ const pug = require('pug');
const pkg = require('../package.json');
const transform = require('acquit-require');
const childProcess = require("child_process");
-require('./generateSearch');
+
// using "__dirname" and ".." to have a consistent CWD, this script should not be runnable, even when not being in the root of the project
// also a consistent root path so that it is easy to change later when the script should be moved
const cwd = path.resolve(__dirname, '..');
+// support custom heading ids
+// see https://www.markdownguide.org/extended-syntax/#heading-ids
+// Example:
+// # Some Header {#custom-id}
+const CustomIdRegex = /{#([a-zA-Z0-9_-]+)}(?: *)$/;
+
const isMain = require.main === module;
let jobs = [];
@@ -29,28 +35,39 @@ try {
require('acquit-ignore')();
-const { marked: markdown } = require('marked');
+const markdown = require('marked');
const highlight = require('highlight.js');
-const { promisify } = require("util");
+const { promisify } = require('util');
+
markdown.use({
- heading: function(text, level, raw, slugger) {
- const slug = slugger.slug(raw);
- return `
-
- ${text}
-
- \n`;
- }
-});
-markdown.setOptions({
- highlight: function(code, language) {
- if (!language) {
- language = 'javascript';
- }
- if (language === 'no-highlight') {
- return code;
+ renderer: {
+ heading: function({ tokens, depth }) {
+ let raw = this.parser.parseInline(tokens);
+ let slug;
+ const idMatch = CustomIdRegex.exec(raw);
+
+ // use custom header id if available, otherwise fallback to default slugger
+ if (idMatch) {
+ slug = idMatch[1];
+ raw = raw.replace(CustomIdRegex, '');
+ } else {
+ slug = createSlug(raw.trim());
+ }
+ return `
+
+ ${raw}
+
+ \n`;
+ },
+ code: function({ text, lang }) {
+ if (!lang || lang === 'acquit') {
+ lang = 'javascript';
+ }
+ if (lang === 'no-highlight') {
+ return text;
+ }
+ return `${highlight.highlight(text, { language: lang }).value}
`;
}
- return highlight.highlight(code, { language }).value;
}
});
@@ -590,6 +607,7 @@ if (isMain) {
(async function main() {
console.log(`Processing ~${files.length} files`);
+ require('./generateSearch');
await deleteAllHtmlFiles();
await pugifyAllFiles();
await copyAllRequiredFiles();
@@ -600,3 +618,12 @@ if (isMain) {
console.log('Done Processing');
})();
}
+
+// Modified from github-slugger
+function createSlug(value) {
+ if (typeof value !== 'string') {
+ return '';
+ }
+ value = value.toLowerCase();
+ return value.replace(/[^a-z0-9-_\s]/, '').replace(/ /g, '-');
+}
\ No newline at end of file
diff --git a/test/cast.test.js b/test/cast.test.js
index 8557a97eec4..9ee9fbca1ac 100644
--- a/test/cast.test.js
+++ b/test/cast.test.js
@@ -160,6 +160,33 @@ describe('cast: ', function() {
});
});
+ it('casts $comment (gh-14576)', function() {
+ const schema = new Schema({ name: String });
+
+ let res = cast(schema, {
+ $comment: 'test'
+ });
+ assert.deepStrictEqual(res, { $comment: 'test' });
+
+ res = cast(schema, {
+ $comment: 42
+ });
+ assert.deepStrictEqual(res, { $comment: '42' });
+
+ assert.throws(
+ () => cast(schema, {
+ $comment: { name: 'taco' }
+ }),
+ /\$comment/
+ );
+
+ const schema2 = new Schema({ $comment: Number });
+ res = cast(schema2, {
+ $comment: 42
+ });
+ assert.deepStrictEqual(res, { $comment: 42 });
+ });
+
it('avoids setting stripped out nested schema values to undefined (gh-11291)', function() {
const nested = new Schema({}, {
id: false,
diff --git a/test/model.discriminator.test.js b/test/model.discriminator.test.js
index 8e8d529e2df..a829211b236 100644
--- a/test/model.discriminator.test.js
+++ b/test/model.discriminator.test.js
@@ -620,6 +620,23 @@ describe('model', function() {
Person.discriminator('Parent2', parentSchema.clone());
});
+ it('clone() does not modify original schema `obj` (gh-14821)', function() {
+ const personSchema = new Schema({
+ name: String
+ }, { discriminatorKey: 'kind' });
+
+ const parentSchema = new Schema({
+ child: String
+ });
+
+ const Person = db.model('Person', personSchema);
+ const Parent = Person.discriminator('Parent', parentSchema.clone());
+
+ assert.ok(!Person.schema.obj.child);
+ assert.ok(!personSchema.obj.child);
+ assert.ok(Parent.schema.obj.child);
+ });
+
it('clone() allows reusing with different models (gh-5721)', async function() {
const schema = new mongoose.Schema({
name: String
diff --git a/test/model.populate.test.js b/test/model.populate.test.js
index bbdfadfe281..7f0fe844eb8 100644
--- a/test/model.populate.test.js
+++ b/test/model.populate.test.js
@@ -11049,6 +11049,41 @@ describe('model: populate:', function() {
assert.equal(pet2.owner.name, 'Alice');
});
+ it('avoids populating manually populated doc as getter value (gh-14827)', async function() {
+ const ownerSchema = new mongoose.Schema({
+ _id: {
+ type: 'ObjectId',
+ get(value) {
+ return value == null ? value : value.toString();
+ }
+ },
+ name: 'String'
+ });
+ const petSchema = new mongoose.Schema({
+ name: 'String',
+ owner: { type: 'ObjectId', ref: 'Owner' }
+ });
+
+ const Owner = db.model('Owner', ownerSchema);
+ const Pet = db.model('Pet', petSchema);
+
+ const _id = new mongoose.Types.ObjectId();
+ const owner = new Owner({ _id, name: 'Alice' });
+ const pet = new Pet({ name: 'Kitty', owner: owner });
+
+ await owner.save();
+
+ assert.equal(typeof pet._doc.owner.$__.wasPopulated.value, 'object');
+ await pet.populate('owner');
+ assert.equal(typeof pet._doc.owner.$__.wasPopulated.value, 'object');
+
+ await pet.save();
+
+
+ const fromDb = await Pet.findOne({ owner: _id }).lean().orFail();
+ assert.ok(fromDb.owner instanceof mongoose.Types.ObjectId);
+ });
+
it('makes sure that populate works correctly with duplicate foreignField with lean(); (gh-14794)', async function() {
const authorSchema = new mongoose.Schema({
group: String,
diff --git a/test/model.test.js b/test/model.test.js
index f2d88586e63..f6943d96fc7 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -4541,6 +4541,71 @@ describe('Model', function() {
assert.strictEqual(doc.name, 'test');
assert.deepStrictEqual(doc.ids, ['1', '2', '3']);
});
+
+ it('throwOnValidationError (gh-14572) (gh-13256)', async function() {
+ const schema = new Schema({
+ num: Number
+ });
+
+ const M = db.model('Test', schema);
+
+ const ops = [
+ {
+ insertOne: {
+ document: {
+ num: 'not a number'
+ }
+ }
+ }
+ ];
+
+ const err = await M.bulkWrite(
+ ops,
+ { ordered: false, throwOnValidationError: true }
+ ).then(() => null, err => err);
+ assert.ok(err);
+ assert.equal(err.name, 'MongooseBulkWriteError');
+ assert.equal(err.validationErrors[0].errors['num'].name, 'CastError');
+ });
+
+ it('bulkWrite should throw an error if there were operations that failed validation, ' +
+ 'but all operations that passed validation succeeded (gh-13256)', async function() {
+ const userSchema = new Schema({ age: { type: Number } });
+ const User = db.model('User', userSchema);
+
+ const createdUser = await User.create({ name: 'Test' });
+
+ const err = await User.bulkWrite([
+ {
+ updateOne: {
+ filter: { _id: createdUser._id },
+ update: { $set: { age: 'NaN' } },
+ upsert: true
+ }
+ },
+ {
+ updateOne: {
+ filter: { _id: createdUser._id },
+ update: { $set: { age: 13 } },
+ upsert: true
+ }
+ },
+ {
+ updateOne: {
+ filter: { _id: createdUser._id },
+ update: { $set: { age: 12 } },
+ upsert: true
+ }
+ }
+ ], { ordered: false, throwOnValidationError: true })
+ .then(() => null)
+ .catch(err => err);
+
+ assert.ok(err);
+ assert.equal(err.name, 'MongooseBulkWriteError');
+ assert.equal(err.validationErrors[0].path, 'age');
+ assert.equal(err.results[0].path, 'age');
+ });
});
it('deleteOne with cast error (gh-5323)', async function() {
@@ -7609,6 +7674,45 @@ describe('Model', function() {
assert.strictEqual(doc.__v, 0);
});
+
+ it('insertMany should throw an error if there were operations that failed validation, ' +
+ 'but all operations that passed validation succeeded (gh-13256)', async function() {
+ const userSchema = new Schema({
+ age: { type: Number }
+ });
+
+ const User = db.model('User', userSchema);
+
+ let err = await User.insertMany([
+ new User({ age: 12 }),
+ new User({ age: 12 }),
+ new User({ age: 'NaN' })
+ ], { ordered: false, throwOnValidationError: true })
+ .then(() => null)
+ .catch(err => err);
+
+ assert.ok(err);
+ assert.equal(err.name, 'MongooseBulkWriteError');
+ assert.equal(err.validationErrors[0].errors['age'].name, 'CastError');
+ assert.ok(err.results[2] instanceof Error);
+ assert.equal(err.results[2].errors['age'].name, 'CastError');
+
+ let docs = await User.find();
+ assert.deepStrictEqual(docs.map(doc => doc.age), [12, 12]);
+
+ err = await User.insertMany([
+ new User({ age: 'NaN' })
+ ], { ordered: false, throwOnValidationError: true })
+ .then(() => null)
+ .catch(err => err);
+
+ assert.ok(err);
+ assert.equal(err.name, 'MongooseBulkWriteError');
+ assert.equal(err.validationErrors[0].errors['age'].name, 'CastError');
+
+ docs = await User.find();
+ assert.deepStrictEqual(docs.map(doc => doc.age), [12, 12]);
+ });
});
diff --git a/test/query.test.js b/test/query.test.js
index 4f75d0f2fab..a3de50044e3 100644
--- a/test/query.test.js
+++ b/test/query.test.js
@@ -4324,4 +4324,19 @@ describe('Query', function() {
assert.deepStrictEqual(adultQuery, { age: { $gte: 18 } });
});
+
+ it('avoids mutating $or, $and elements when casting (gh-14610)', async function() {
+ const personSchema = new mongoose.Schema({
+ name: String,
+ age: Number
+ });
+ const Person = db.model('Person', personSchema);
+
+ const filter = [{ name: 'Me', age: '20' }, { name: 'You', age: '50' }];
+ await Person.find({ $or: filter });
+ assert.deepStrictEqual(filter, [{ name: 'Me', age: '20' }, { name: 'You', age: '50' }]);
+
+ await Person.find({ $and: filter });
+ assert.deepStrictEqual(filter, [{ name: 'Me', age: '20' }, { name: 'You', age: '50' }]);
+ });
});
diff --git a/test/types/create.test.ts b/test/types/create.test.ts
index c0a7b0e5630..618ce84a1cf 100644
--- a/test/types/create.test.ts
+++ b/test/types/create.test.ts
@@ -40,6 +40,19 @@ Test.create([{ name: 'test' }], { validateBeforeSave: true }).then(docs => {
expectType(docs[0].name);
});
+Test.create({}).then(doc => {
+ expectType(doc.name);
+});
+
+Test.create([{}]).then(docs => {
+ expectType(docs[0].name);
+});
+
+expectError(Test.create({}));
+
+Test.create({ name: 'test' });
+Test.create({ _id: new Types.ObjectId('0'.repeat(24)), name: 'test' });
+
Test.insertMany({ name: 'test' }, {}).then(docs => {
expectType(docs[0]._id);
expectType(docs[0].name);
diff --git a/test/types/schema.test.ts b/test/types/schema.test.ts
index c20dac10972..04828bc4f17 100644
--- a/test/types/schema.test.ts
+++ b/test/types/schema.test.ts
@@ -1607,3 +1607,30 @@ function gh13215() {
type SchemaType = InferSchemaType;
expectType({} as SchemaType);
}
+
+function gh14825() {
+ const schemaDefinition = {
+ userName: { type: String, required: true }
+ } as const;
+ const schemaOptions = {
+ typeKey: 'type' as const,
+ timestamps: {
+ createdAt: 'date',
+ updatedAt: false
+ }
+ };
+
+ type RawDocType = InferRawDocType<
+ typeof schemaDefinition,
+ typeof schemaOptions
+ >;
+ type User = {
+ userName: string;
+ };
+
+ expectAssignable({} as RawDocType);
+
+ const schema = new Schema(schemaDefinition, schemaOptions);
+ type SchemaType = InferSchemaType;
+ expectAssignable({} as SchemaType);
+}
diff --git a/test/types/subdocuments.test.ts b/test/types/subdocuments.test.ts
index 82204d0d293..14386816fe5 100644
--- a/test/types/subdocuments.test.ts
+++ b/test/types/subdocuments.test.ts
@@ -143,6 +143,9 @@ function gh14601() {
f3: [{ field1: 'test' }]
});
- const f2obj = item.f2.toObject();
- expectAssignable<{ _id: Types.ObjectId, field1: string }>(f2obj);
+ const obj = item.toObject();
+
+ const obj2 = item.f2.toObject();
+
+ expectAssignable<{ _id: Types.ObjectId, field1: string }>(obj2);
}
diff --git a/types/inferschematype.d.ts b/types/inferschematype.d.ts
index 2bb6abf8bbe..dbcb3ad851e 100644
--- a/types/inferschematype.d.ts
+++ b/types/inferschematype.d.ts
@@ -87,8 +87,8 @@ declare module 'mongoose' {
'createdAt' | 'updatedAt'
> as TimestampOptions[K] extends true
? K
- : TimestampOptions[K] extends string
- ? TimestampOptions[K]
+ : TimestampOptions[K] extends `${infer TimestampValue}`
+ ? TimestampValue
: never]: NativeDate;
} & T
: T
diff --git a/types/query.d.ts b/types/query.d.ts
index adbe3ae2975..572ec33e1df 100644
--- a/types/query.d.ts
+++ b/types/query.d.ts
@@ -435,7 +435,7 @@ declare module 'mongoose' {
): QueryWithHelpers;
findOne(
filter?: RootFilterQuery
- ): QueryWithHelpers;
+ ): QueryWithHelpers;
/** Creates a `findOneAndDelete` query: atomically finds the given document, deletes it, and returns the document as it was before deletion. */
findOneAndDelete(