fix(schema): support setting schema path to an instance of SchemaType…

…Options Fix #8292
Automattic · Nov 6, 2019 · d02ebd2 · d02ebd2
1 parent 081f2ec
commit d02ebd2
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 44 deletions.
diff --git a/lib/options/SchemaArrayOptions.js b/lib/options/SchemaArrayOptions.js
@@ -17,12 +17,7 @@ const SchemaTypeOptions = require('./SchemaTypeOptions');
 
 class SchemaArrayOptions extends SchemaTypeOptions {}
 
-const opts = {
-  enumerable: true,
-  configurable: true,
-  writable: true,
-  value: null
-};
+const opts = require('./propertyOptions');
 
 /**
  * If this is an array of strings, an array of allowed values for this path.

diff --git a/lib/options/SchemaBufferOptions.js b/lib/options/SchemaBufferOptions.js
@@ -17,12 +17,7 @@ const SchemaTypeOptions = require('./SchemaTypeOptions');
 
 class SchemaBufferOptions extends SchemaTypeOptions {}
 
-const opts = {
-  enumerable: true,
-  configurable: true,
-  writable: true,
-  value: null
-};
+const opts = require('./propertyOptions');
 
 /**
  * Set the default subtype for this buffer.

diff --git a/lib/options/SchemaDateOptions.js b/lib/options/SchemaDateOptions.js
@@ -17,12 +17,7 @@ const SchemaTypeOptions = require('./SchemaTypeOptions');
 
 class SchemaDateOptions extends SchemaTypeOptions {}
 
-const opts = {
-  enumerable: true,
-  configurable: true,
-  writable: true,
-  value: null
-};
+const opts = require('./propertyOptions');
 
 /**
  * If set, Mongoose adds a validator that checks that this path is after the

diff --git a/lib/options/SchemaNumberOptions.js b/lib/options/SchemaNumberOptions.js
@@ -17,12 +17,7 @@ const SchemaTypeOptions = require('./SchemaTypeOptions');
 
 class SchemaNumberOptions extends SchemaTypeOptions {}
 
-const opts = {
-  enumerable: true,
-  configurable: true,
-  writable: true,
-  value: null
-};
+const opts = require('./propertyOptions');
 
 /**
  * If set, Mongoose adds a validator that checks that this path is at least the

diff --git a/lib/options/SchemaObjectIdOptions.js b/lib/options/SchemaObjectIdOptions.js
@@ -17,12 +17,7 @@ const SchemaTypeOptions = require('./SchemaTypeOptions');
 
 class SchemaObjectIdOptions extends SchemaTypeOptions {}
 
-const opts = {
-  enumerable: true,
-  configurable: true,
-  writable: true,
-  value: null
-};
+const opts = require('./propertyOptions');
 
 /**
  * If truthy, uses Mongoose's default built-in ObjectId path.

diff --git a/lib/options/SchemaStringOptions.js b/lib/options/SchemaStringOptions.js
@@ -17,12 +17,7 @@ const SchemaTypeOptions = require('./SchemaTypeOptions');
 
 class SchemaStringOptions extends SchemaTypeOptions {}
 
-const opts = {
-  enumerable: true,
-  configurable: true,
-  writable: true,
-  value: null
-};
+const opts = require('./propertyOptions');
 
 /**
  * Array of allowed values for this path

diff --git a/lib/options/SchemaTypeOptions.js b/lib/options/SchemaTypeOptions.js
@@ -23,12 +23,7 @@ class SchemaTypeOptions {
   }
 }
 
-const opts = {
-  enumerable: true,
-  configurable: true,
-  writable: true,
-  value: null
-};
+const opts = require('./propertyOptions');
 
 /**
  * The type to cast this path to.

diff --git a/lib/options/propertyOptions.js b/lib/options/propertyOptions.js
@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = Object.freeze({
+  enumerable: true,
+  configurable: true,
+  writable: true,
+  value: void 0
+});
diff --git a/lib/schema.js b/lib/schema.js
@@ -7,6 +7,7 @@
 const EventEmitter = require('events').EventEmitter;
 const Kareem = require('kareem');
 const SchemaType = require('./schematype');
+const SchemaTypeOptions = require('./options/SchemaTypeOptions');
 const VirtualType = require('./virtualtype');
 const applyTimestampsToChildren = require('./helpers/update/applyTimestampsToChildren');
 const applyTimestampsToUpdate = require('./helpers/update/applyTimestampsToUpdate');
@@ -426,7 +427,7 @@ Schema.prototype.add = function add(obj, prefix) {
         '`, got value "' + obj[key][0] + '"');
     }
 
-    if (utils.isPOJO(obj[key]) &&
+    if ((utils.isPOJO(obj[key]) || obj[key] instanceof SchemaTypeOptions) &&
         (!obj[key][this.options.typeKey] || (this.options.typeKey === 'type' && obj[key].type.type))) {
       if (Object.keys(obj[key]).length) {
         // nested object { last: { name: String }}
@@ -795,7 +796,7 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
   // copy of SchemaTypes re: gh-7158 gh-6933
   const MongooseTypes = this.base != null ? this.base.Schema.Types : Schema.Types;
 
-  if (obj.constructor) {
+  if (!utils.isPOJO(obj) && !(obj instanceof SchemaTypeOptions)) {
     const constructorName = utils.getFunctionName(obj.constructor);
     if (constructorName !== 'Object') {
       const oldObj = obj;