refactor(discriminator): don't rely on model when getting discrimin…

…ator by value Re: #10130
Automattic · Apr 28, 2021 · 06c6a8b · 06c6a8b
1 parent c1cedd8
commit 06c6a8b
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/lib/helpers/discriminator/getConstructor.js b/lib/helpers/discriminator/getConstructor.js
@@ -14,7 +14,7 @@ module.exports = function getConstructor(Constructor, value) {
  if (Constructor.discriminators[value[discriminatorKey]]) {
  Constructor = Constructor.discriminators[value[discriminatorKey]];
  } else {
- const constructorByValue = getDiscriminatorByValue(Constructor, value[discriminatorKey]);
+ const constructorByValue = getDiscriminatorByValue(Constructor.discriminators, value[discriminatorKey]);
  if (constructorByValue) {
  Constructor = constructorByValue;
  }

diff --git a/lib/helpers/discriminator/getDiscriminatorByValue.js b/lib/helpers/discriminator/getDiscriminatorByValue.js
@@ -9,12 +9,12 @@ const areDiscriminatorValuesEqual = require('./areDiscriminatorValuesEqual');
 * @param {string} value
 */
 
-module.exports = function getDiscriminatorByValue(model, value) {
- if (!model.discriminators) {
+module.exports = function getDiscriminatorByValue(discriminators, value) {
+ if (discriminators == null) {
  return null;
  }
- for (const name in model.discriminators) {
- const it = model.discriminators[name];
+ for (const name of Object.keys(discriminators)) {
+ const it = discriminators[name];
  if (
  it.schema &&
  it.schema.discriminatorMapping &&

diff --git a/lib/helpers/model/castBulkWrite.js b/lib/helpers/model/castBulkWrite.js
@@ -218,7 +218,7 @@ function _addDiscriminatorToObject(schema, obj) {
 function decideModelByObject(model, object) {
  const discriminatorKey = model.schema.options.discriminatorKey;
  if (object != null && object.hasOwnProperty(discriminatorKey)) {
- model = getDiscriminatorByValue(model, object[discriminatorKey]) || model;
+ model = getDiscriminatorByValue(model.discriminators, object[discriminatorKey]) || model;
  }
  return model;
 }
diff --git a/lib/helpers/populate/getModelsMapForPopulate.js b/lib/helpers/populate/getModelsMapForPopulate.js
@@ -409,7 +409,7 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
  if (!schema && discriminatorKey && (discriminatorValue = utils.getValue(discriminatorKey, doc))) {
  // `modelNameForFind` is the discriminator value, so we might need
  // find the discriminated model name
- const discriminatorModel = getDiscriminatorByValue(model, discriminatorValue) || model;
+ const discriminatorModel = getDiscriminatorByValue(model.discriminators, discriminatorValue) || model;
  if (discriminatorModel != null) {
  modelForCurrentDoc = discriminatorModel;
  } else {

diff --git a/lib/helpers/query/getEmbeddedDiscriminatorPath.js b/lib/helpers/query/getEmbeddedDiscriminatorPath.js
@@ -69,7 +69,7 @@ module.exports = function getEmbeddedDiscriminatorPath(schema, update, filter, p
  continue;
  }
 
- const discriminatorSchema = getDiscriminatorByValue(schematype.caster, discriminatorKey).schema;
+ const discriminatorSchema = getDiscriminatorByValue(schematype.caster.discriminators, discriminatorKey).schema;
 
  const rest = parts.slice(i + 1).join('.');
  schematype = discriminatorSchema.path(rest);

diff --git a/lib/model.js b/lib/model.js
@@ -3051,7 +3051,7 @@ Model.create = function create(doc, options, callback) {
  args.forEach(doc => {
  toExecute.push(callback => {
  const Model = this.discriminators && doc[discriminatorKey] != null ?
- this.discriminators[doc[discriminatorKey]] || getDiscriminatorByValue(this, doc[discriminatorKey]) :
+ this.discriminators[doc[discriminatorKey]] || getDiscriminatorByValue(this.discriminators, doc[discriminatorKey]) :
  this;
  if (Model == null) {
  throw new MongooseError(`Discriminator "${doc[discriminatorKey]}" not ` +
@@ -4688,7 +4688,7 @@ Model.compile = function compile(name, schema, collectionName, connection, base)
 
  // If discriminator key is set, use the discriminator instead (gh-7586)
  const Discriminator = model.discriminators[doc[discriminatorKey]] ||
- getDiscriminatorByValue(model, doc[discriminatorKey]);
+ getDiscriminatorByValue(model.discriminators, doc[discriminatorKey]);
  if (Discriminator != null) {
  return new Discriminator(doc, fields, skipId);
  }

diff --git a/lib/query.js b/lib/query.js
@@ -4651,7 +4651,7 @@ Query.prototype._castUpdate = function _castUpdate(obj, overwrite) {
  typeof filter[schema.options.discriminatorKey] !== 'object' &&
  schema.discriminators != null) {
  const discriminatorValue = filter[schema.options.discriminatorKey];
- const byValue = getDiscriminatorByValue(this.model, discriminatorValue);
+ const byValue = getDiscriminatorByValue(this.model.discriminators, discriminatorValue);
  schema = schema.discriminators[discriminatorValue] ||
  (byValue && byValue.schema) ||
  schema;
@@ -4869,7 +4869,7 @@ Query.prototype.cast = function(model, obj) {
  const discriminatorKey = model.schema.options.discriminatorKey;
  if (obj != null &&
  obj.hasOwnProperty(discriminatorKey)) {
- model = getDiscriminatorByValue(model, obj[discriminatorKey]) || model;
+ model = getDiscriminatorByValue(model.discriminators, obj[discriminatorKey]) || model;
  }
 
  try {

diff --git a/lib/queryhelpers.js b/lib/queryhelpers.js
@@ -97,7 +97,7 @@ exports.createModel = function createModel(model, doc, fields, userProvidedField
 
  const value = doc[key];
  if (key && value && model.discriminators) {
- const discriminator = model.discriminators[value] || getDiscriminatorByValue(model, value);
+ const discriminator = model.discriminators[value] || getDiscriminatorByValue(model.discriminators, value);
  if (discriminator) {
  const _fields = clone(userProvidedFields);
  exports.applyPaths(_fields, discriminator.schema);

diff --git a/lib/schema/array.js b/lib/schema/array.js
@@ -471,7 +471,7 @@ SchemaArray.prototype.castForQuery = function($conditional, value) {
  Constructor.discriminators[val[Constructor.schema.options.discriminatorKey]]) {
  Constructor = Constructor.discriminators[val[Constructor.schema.options.discriminatorKey]];
  } else {
- const constructorByValue = getDiscriminatorByValue(Constructor, val[Constructor.schema.options.discriminatorKey]);
+ const constructorByValue = getDiscriminatorByValue(Constructor.discriminators, val[Constructor.schema.options.discriminatorKey]);
  if (constructorByValue) {
  Constructor = constructorByValue;
  }

diff --git a/lib/types/documentarray.js b/lib/types/documentarray.js
@@ -96,7 +96,7 @@ class CoreDocumentArray extends CoreMongooseArray {
  Constructor.discriminators[value[Constructor.schema.options.discriminatorKey]]) {
  Constructor = Constructor.discriminators[value[Constructor.schema.options.discriminatorKey]];
  } else {
- const constructorByValue = getDiscriminatorByValue(Constructor, value[Constructor.schema.options.discriminatorKey]);
+ const constructorByValue = getDiscriminatorByValue(Constructor.discriminators, value[Constructor.schema.options.discriminatorKey]);
  if (constructorByValue) {
  Constructor = constructorByValue;
  }
@@ -289,7 +289,7 @@ class CoreDocumentArray extends CoreMongooseArray {
  Constructor.discriminators[obj[Constructor.schema.options.discriminatorKey]]) {
  Constructor = Constructor.discriminators[obj[Constructor.schema.options.discriminatorKey]];
  } else {
- const constructorByValue = getDiscriminatorByValue(Constructor, obj[Constructor.schema.options.discriminatorKey]);
+ const constructorByValue = getDiscriminatorByValue(Constructor.discriminators, obj[Constructor.schema.options.discriminatorKey]);
  if (constructorByValue) {
  Constructor = constructorByValue;
  }