consistent error messages

Automattic · Nov 5, 2024 · cd1d6da · cd1d6da
1 parent 15027c9
commit cd1d6da
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/lib/error/objectParameter.js b/lib/error/objectParameter.js
@@ -17,10 +17,9 @@ const MongooseError = require('./mongooseError');
  */
 
 class ObjectParameterError extends MongooseError {
-
   constructor(value, paramName, fnName) {
     super('Parameter "' + paramName + '" to ' + fnName +
-      '() must be an object, got "' + value.toString() + '" (type ' + typeof value + ')');
+      '() must be an object, got "' + (value == null ? value : value.toString()) + '" (type ' + typeof value + ')');
   }
 }
 

diff --git a/lib/query.js b/lib/query.js
@@ -469,6 +469,10 @@ Query.prototype._validateOp = function() {
   if (this.op != null && !validOpsSet.has(this.op)) {
     this.error(new Error('Query has invalid `op`: "' + this.op + '"'));
   }
+
+  if (this.op !== 'estimatedDocumentCount' && this._conditions === null) {
+    throw new ObjectParameterError(this._conditions, 'filter', this.op);
+  }
 };
 
 /**

diff --git a/test/query.test.js b/test/query.test.js
@@ -4423,39 +4423,39 @@ describe('Query', function() {
 
     await assert.rejects(
       () => UserModel.find(null),
-      /MongoServerError: Expected field filterto be of type object/
+      /ObjectParameterError: Parameter "filter" to find\(\) must be an object, got "null"/
     );
     await assert.rejects(
       () => UserModel.findOne(null),
-      /MongoServerError: Expected field filterto be of type object/
+      /ObjectParameterError: Parameter "filter" to findOne\(\) must be an object, got "null"/
     );
     await assert.rejects(
       () => UserModel.findOneAndUpdate(null, { name: 'test2' }),
-      /MongoInvalidArgumentError: Argument "filter" must be an object/
+      /ObjectParameterError: Parameter "filter" to findOneAndUpdate\(\) must be an object, got "null"/
     );
     await assert.rejects(
       () => UserModel.findOneAndReplace(null, { name: 'test2' }),
-      /MongoInvalidArgumentError: Argument "filter" must be an object/
+      /ObjectParameterError: Parameter "filter" to findOneAndReplace\(\) must be an object, got "null"/
     );
     await assert.rejects(
       () => UserModel.findOneAndDelete(null),
-      /MongoInvalidArgumentError: Argument "filter" must be an object/
+      /ObjectParameterError: Parameter "filter" to findOneAndDelete\(\) must be an object, got "null"/
     );
     await assert.rejects(
       () => UserModel.updateOne(null, { name: 'test2' }),
-      /MongoInvalidArgumentError: Selector must be a valid JavaScript object/
+      /ObjectParameterError: Parameter "filter" to updateOne\(\) must be an object, got "null"/
     );
     await assert.rejects(
       () => UserModel.updateMany(null, { name: 'test2' }),
-      /MongoInvalidArgumentError: Selector must be a valid JavaScript object/
+      /ObjectParameterError: Parameter "filter" to updateMany\(\) must be an object, got "null"/
     );
     await assert.rejects(
       () => UserModel.deleteOne(null),
-      /MongoServerError: BSON field 'delete.deletes.q' is missing but a required field/
+      /ObjectParameterError: Parameter "filter" to deleteOne\(\) must be an object, got "null"/
     );
     await assert.rejects(
       () => UserModel.deleteMany(null),
-      /MongoServerError: BSON field 'delete.deletes.q' is missing but a required field/
+      /ObjectParameterError: Parameter "filter" to deleteMany\(\) must be an object, got "null"/
     );
   });
 });