fix(populate): add selectPopulatedPaths option to opt out of auto-add…

…ing `populate()`-ed fields to `select()`

Fix #6546

lib/index.js

@@ -93,6 +93,7 @@ Mongoose.prototype.STATES = STATES;
  * - 'applyPluginsToDiscriminators': false by default. Set to true to apply global plugins to discriminator schemas. This typically isn't necessary because plugins are applied to the base schema and discriminators copy all middleware, methods, statics, and properties from the base schema.
  * - 'objectIdGetter': true by default. Mongoose adds a getter to MongoDB ObjectId's called `_id` that returns `this` for convenience with populate. Set this to false to remove the getter.
  * - 'runValidators': false by default. Set to true to enable [update validators](/docs/validation.html#update-validators) for all validators by default.
+ * - 'selectPopulatedPaths': true by default. Set to false to opt out of Mongoose adding all fields that you `populate()` to your `select()`. The schema-level option `selectPopulatedPaths` overwrites this one.
  *
  * @param {String} key
  * @param {String|Function|Boolean} value

lib/query.js

@@ -3931,7 +3931,19 @@ Query.prototype._castFields = function _castFields(fields) {
 Query.prototype._applyPaths = function applyPaths() {
   this._fields = this._fields || {};
   helpers.applyPaths(this._fields, this.model.schema);
-  selectPopulatedFields(this);
+
+  let _selectPopulatedPaths = true;
+
+  if ('selectPopulatedPaths' in this.model.base.options) {
+    _selectPopulatedPaths = this.model.base.options.selectPopulatedPaths;
+  }
+  if ('selectPopulatedPaths' in this.model.schema.options) {
+    _selectPopulatedPaths = this.model.schema.options.selectPopulatedPaths;
+  }
+
+  if (_selectPopulatedPaths) {
+    selectPopulatedFields(this);
+  }
 };
 
 /**

lib/schema.js

@@ -49,6 +49,7 @@ let MongooseTypes;
  * - [validateBeforeSave](/docs/guide.html#validateBeforeSave) - bool - defaults to `true`
  * - [versionKey](/docs/guide.html#versionKey): string - defaults to "__v"
  * - [collation](/docs/guide.html#collation): object - defaults to null (which means use no collation)
+ * - [selectPopulatedPaths](/docs/guide.html#selectPopulatedPaths): boolean - defaults to `true`
  *
  * ####Note:
  *