Merge pull request #5080 from zoellner/master

fix(query): handle $type for arrays
Automattic · Mar 19, 2017 · 74cdbdd · 74cdbdd
2 parents 249653b + 80b325c
commit 74cdbdd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/lib/schema/array.js b/lib/schema/array.js
@@ -3,6 +3,7 @@
  */
 
 var $exists = require('./operators/exists');
+var $type = require('./operators/type');
 var SchemaType = require('../schematype');
 var CastError = SchemaType.CastError;
 var Types = {
@@ -319,6 +320,7 @@ handle.$minDistance =
 handle.$maxDistance = castToNumber;
 
 handle.$exists = $exists;
+handle.$type = $type;
 
 handle.$eq =
 handle.$gt =

diff --git a/lib/schema/operators/type.js b/lib/schema/operators/type.js
@@ -0,0 +1,13 @@
+'use strict';
+
+/*!
+ * ignore
+ */
+
+module.exports = function(val) {
+  if (typeof val !== 'number' && typeof val !== 'string') {
+    throw new Error('$type parameter must be number or string');
+  }
+
+  return val;
+};
diff --git a/lib/schematype.js b/lib/schematype.js
@@ -3,6 +3,7 @@
  */
 
 var $exists = require('./schema/operators/exists');
+var $type = require('./schema/operators/type');
 var utils = require('./utils');
 var MongooseError = require('./error');
 var CastError = MongooseError.CastError;
@@ -922,13 +923,7 @@ SchemaType.prototype.$conditionalHandlers = {
   $ne: handleSingle,
   $nin: handleArray,
   $exists: $exists,
-  $type: function(val) {
-    if (typeof val !== 'number' && typeof val !== 'string') {
-      throw new Error('$type parameter must be number or string');
-    }
-
-    return val;
-  }
+  $type: $type
 };
 
 /**