From 5d24d0fed5d6d458f06f69feca595b8b46e3f958 Mon Sep 17 00:00:00 2001 From: hasezoey Date: Mon, 26 Sep 2022 12:15:29 +0200 Subject: [PATCH 1/3] style(clearValidating): add name to previously anonymous plugin function --- lib/plugins/clearValidating.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/plugins/clearValidating.js b/lib/plugins/clearValidating.js index cdd5f3f09ec..0be34ab58b9 100644 --- a/lib/plugins/clearValidating.js +++ b/lib/plugins/clearValidating.js @@ -4,7 +4,7 @@ * ignore */ -module.exports = function(schema) { +module.exports = function clearValidating(schema) { // `this.$__.validating` tracks whether there are multiple validations running // in parallel. We need to clear `this.$__.validating` before post hooks for gh-8597 const unshift = true; From 8b9b164740a39822cc48213c8cf28409391d2eb7 Mon Sep 17 00:00:00 2001 From: hasezoey Date: Mon, 26 Sep 2022 12:16:01 +0200 Subject: [PATCH 2/3] style(document): update adding query hooks to use functions instead of arrow --- lib/document.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/document.js b/lib/document.js index a70c956418d..5b9d3fcc5c7 100644 --- a/lib/document.js +++ b/lib/document.js @@ -851,11 +851,12 @@ Document.prototype.update = function update() { Document.prototype.updateOne = function updateOne(doc, options, callback) { const query = this.constructor.updateOne({ _id: this._id }, doc, options); - query.pre(cb => { - this.constructor._middleware.execPre('updateOne', this, [this], cb); + const self = this; + query.pre(function queryPreUpdateOne(cb) { + self.constructor._middleware.execPre('updateOne', self, [self], cb); }); - query.post(cb => { - this.constructor._middleware.execPost('updateOne', this, [this], {}, cb); + query.post(function queryPostUpdateOne(cb) { + self.constructor._middleware.execPost('updateOne', self, [self], {}, cb); }); if (this.$session() != null) { From f58a320a9a8da0c6b4acecbb6f5fc35b0f4f6dbf Mon Sep 17 00:00:00 2001 From: hasezoey Date: Mon, 26 Sep 2022 12:16:25 +0200 Subject: [PATCH 3/3] style: add names to previously anonymous hook functions --- lib/helpers/timestamps/setupTimestamps.js | 2 +- lib/plugins/clearValidating.js | 4 ++-- lib/plugins/removeSubdocs.js | 2 +- lib/plugins/saveSubdocs.js | 4 ++-- lib/plugins/sharding.js | 8 ++++---- lib/plugins/trackTransaction.js | 2 +- lib/schema.js | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/helpers/timestamps/setupTimestamps.js b/lib/helpers/timestamps/setupTimestamps.js index 06c57ea74f8..f8d7c42b513 100644 --- a/lib/helpers/timestamps/setupTimestamps.js +++ b/lib/helpers/timestamps/setupTimestamps.js @@ -39,7 +39,7 @@ module.exports = function setupTimestamps(schema, timestamps) { schema.add(schemaAdditions); - schema.pre('save', function(next) { + schema.pre('save', function timestampsPreSave(next) { const timestampOption = get(this, '$__.saveOptions.timestamps'); if (timestampOption === false) { return next(); diff --git a/lib/plugins/clearValidating.js b/lib/plugins/clearValidating.js index 0be34ab58b9..50264e33a6b 100644 --- a/lib/plugins/clearValidating.js +++ b/lib/plugins/clearValidating.js @@ -8,7 +8,7 @@ module.exports = function clearValidating(schema) { // `this.$__.validating` tracks whether there are multiple validations running // in parallel. We need to clear `this.$__.validating` before post hooks for gh-8597 const unshift = true; - schema.s.hooks.post('validate', false, function() { + schema.s.hooks.post('validate', false, function clearValidatingPostValidate() { if (this.$isSubdocument) { return; } @@ -16,7 +16,7 @@ module.exports = function clearValidating(schema) { this.$__.validating = null; }, unshift); - schema.s.hooks.post('validate', false, function(error, res, next) { + schema.s.hooks.post('validate', false, function clearValidatingPostValidateError(error, res, next) { if (this.$isSubdocument) { next(); return; diff --git a/lib/plugins/removeSubdocs.js b/lib/plugins/removeSubdocs.js index 57a6a211eec..e320f782a0e 100644 --- a/lib/plugins/removeSubdocs.js +++ b/lib/plugins/removeSubdocs.js @@ -8,7 +8,7 @@ const each = require('../helpers/each'); module.exports = function removeSubdocs(schema) { const unshift = true; - schema.s.hooks.pre('remove', false, function(next) { + schema.s.hooks.pre('remove', false, function removeSubDocsPreRemove(next) { if (this.$isSubdocument) { next(); return; diff --git a/lib/plugins/saveSubdocs.js b/lib/plugins/saveSubdocs.js index f6db61f4fa1..758acbbfe2e 100644 --- a/lib/plugins/saveSubdocs.js +++ b/lib/plugins/saveSubdocs.js @@ -8,7 +8,7 @@ const each = require('../helpers/each'); module.exports = function saveSubdocs(schema) { const unshift = true; - schema.s.hooks.pre('save', false, function(next) { + schema.s.hooks.pre('save', false, function saveSubdocsPreSave(next) { if (this.$isSubdocument) { next(); return; @@ -36,7 +36,7 @@ module.exports = function saveSubdocs(schema) { }); }, null, unshift); - schema.s.hooks.post('save', function(doc, next) { + schema.s.hooks.post('save', function saveSubdocsPostSave(doc, next) { if (this.$isSubdocument) { next(); return; diff --git a/lib/plugins/sharding.js b/lib/plugins/sharding.js index 020ec06c633..7d905f31c0f 100644 --- a/lib/plugins/sharding.js +++ b/lib/plugins/sharding.js @@ -8,19 +8,19 @@ const utils = require('../utils'); */ module.exports = function shardingPlugin(schema) { - schema.post('init', function() { + schema.post('init', function shardingPluginPostInit() { storeShard.call(this); return this; }); - schema.pre('save', function(next) { + schema.pre('save', function shardingPluginPreSave(next) { applyWhere.call(this); next(); }); - schema.pre('remove', function(next) { + schema.pre('remove', function shardingPluginPreRemove(next) { applyWhere.call(this); next(); }); - schema.post('save', function() { + schema.post('save', function shardingPluginPostSave() { storeShard.call(this); }); }; diff --git a/lib/plugins/trackTransaction.js b/lib/plugins/trackTransaction.js index a1726e8ca86..1a409a026eb 100644 --- a/lib/plugins/trackTransaction.js +++ b/lib/plugins/trackTransaction.js @@ -5,7 +5,7 @@ const sessionNewDocuments = require('../helpers/symbols').sessionNewDocuments; const utils = require('../utils'); module.exports = function trackTransaction(schema) { - schema.pre('save', function() { + schema.pre('save', function trackTransactionPreSave() { const session = this.$session(); if (session == null) { return; diff --git a/lib/schema.js b/lib/schema.js index b2837e6e8ea..c07d40bef1c 100644 --- a/lib/schema.js +++ b/lib/schema.js @@ -2013,7 +2013,7 @@ Schema.prototype.virtual = function(name, options) { throw new Error('Reference virtuals require `foreignField` option'); } - this.pre('init', function(obj) { + this.pre('init', function virtualPreInit(obj) { if (mpath.has(name, obj)) { const _v = mpath.get(name, obj); if (!this.$$populatedVirtuals) {