fix(discriminator): allow numeric discriminator keys for embedded dis…

…criminators Fix #7808
Automattic · May 22, 2019 · ec01f4f · ec01f4f
1 parent e91fca1
commit ec01f4f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/lib/helpers/model/discriminator.js b/lib/helpers/model/discriminator.js
@@ -114,7 +114,9 @@ module.exports = function discriminator(model, name, schema, tiedValue, applyPlu
       },
       $skipDiscriminatorCheck: true
     };
-    obj[key][schema.options.typeKey] = String;
+    obj[key][schema.options.typeKey] = existingPath ?
+      existingPath.instance :
+      String;
     schema.add(obj);
     schema.discriminatorMapping = {key: key, value: value, isRoot: false};
 

diff --git a/lib/schema/documentarray.js b/lib/schema/documentarray.js
@@ -419,7 +419,7 @@ function getConstructor(docArray, subdoc) {
   const schema = Constructor.schema;
   const discriminatorKey = schema.options.discriminatorKey;
   const discriminatorValue = subdoc[discriminatorKey];
-  if (Constructor.discriminators && typeof discriminatorValue === 'string') {
+  if (Constructor.discriminators && discriminatorValue != null) {
     if (Constructor.discriminators[discriminatorValue]) {
       Constructor = Constructor.discriminators[discriminatorValue];
     } else {

diff --git a/lib/schema/embedded.js b/lib/schema/embedded.js
@@ -153,7 +153,7 @@ Embedded.prototype.cast = function(val, doc, init, priorVal) {
   const discriminatorKey = Constructor.schema.options.discriminatorKey;
   if (val != null &&
       Constructor.discriminators &&
-      typeof val[discriminatorKey] === 'string') {
+      val[discriminatorKey] != null) {
     if (Constructor.discriminators[val[discriminatorKey]]) {
       Constructor = Constructor.discriminators[val[discriminatorKey]];
     } else {
@@ -220,7 +220,7 @@ Embedded.prototype.castForQuery = function($conditional, val) {
   const discriminatorKey = Constructor.schema.options.discriminatorKey;
   if (val != null &&
       Constructor.discriminators &&
-      typeof val[discriminatorKey] === 'string') {
+      val[discriminatorKey] != null) {
     if (Constructor.discriminators[val[discriminatorKey]]) {
       Constructor = Constructor.discriminators[val[discriminatorKey]];
     } else {
@@ -254,7 +254,7 @@ Embedded.prototype.doValidate = function(value, fn, scope, options) {
   const discriminatorKey = Constructor.schema.options.discriminatorKey;
   if (value != null &&
       Constructor.discriminators &&
-      typeof value[discriminatorKey] === 'string') {
+      value[discriminatorKey] != null) {
     if (Constructor.discriminators[value[discriminatorKey]]) {
       Constructor = Constructor.discriminators[value[discriminatorKey]];
     } else {