fix: refactor error messages

Author: faisal154

spec/ParseQuery.FullTextSearch.spec.js

@@ -113,7 +113,7 @@ describe('Parse.Query Full Text Search testing', () => {
     await expectAsync(invalidQuery()).toBeRejectedWith(
       new Parse.Error(
         Parse.Error.INVALID_JSON,
-        ErrorMessage.queryValueTypeInvalid('object', '$text', '$search')
+        ErrorMessage.queryValueTypeInvalid('object', '$text.$search')
       )
     );
   });
@@ -125,7 +125,7 @@ describe('Parse.Query Full Text Search testing', () => {
     await expectAsync(query.find()).toBeRejectedWith(
       new Parse.Error(
         Parse.Error.INVALID_JSON,
-        ErrorMessage.queryValueTypeInvalid('string', '$text', '$language')
+        ErrorMessage.queryValueTypeInvalid('string', '$text.$language')
       )
     );
   });
@@ -137,7 +137,7 @@ describe('Parse.Query Full Text Search testing', () => {
     await expectAsync(query.find()).toBeRejectedWith(
       new Parse.Error(
         Parse.Error.INVALID_JSON,
-        ErrorMessage.queryValueTypeInvalid('boolean', '$text', '$caseSensitive')
+        ErrorMessage.queryValueTypeInvalid('boolean', '$text.$caseSensitive')
       )
     );
   });
@@ -149,7 +149,7 @@ describe('Parse.Query Full Text Search testing', () => {
     await expectAsync(query.find()).toBeRejectedWith(
       new Parse.Error(
         Parse.Error.INVALID_JSON,
-        ErrorMessage.queryValueTypeInvalid('boolean', '$text', '$diacriticSensitive')
+        ErrorMessage.queryValueTypeInvalid('boolean', '$text.$diacriticSensitive')
       )
     );
   });

src/Adapters/Storage/Mongo/MongoTransform.js

@@ -901,13 +901,13 @@ function transformConstraint(constraint, field, count = false) {
         if (typeof search !== 'object') {
           throw new Parse.Error(
             Parse.Error.INVALID_JSON,
-            ErrorMessage.queryValueTypeInvalid('object', '$text', '$search')
+            ErrorMessage.queryValueTypeInvalid('object', '$text.$search')
           );
         }
         if (!search.$term || typeof search.$term !== 'string') {
           throw new Parse.Error(
             Parse.Error.INVALID_JSON,
-            ErrorMessage.queryValueTypeInvalid('string', '$text', '$term')
+            ErrorMessage.queryValueTypeInvalid('string', '$text.$term')
           );
         } else {
           answer[key] = {
@@ -917,23 +917,23 @@ function transformConstraint(constraint, field, count = false) {
         if (search.$language && typeof search.$language !== 'string') {
           throw new Parse.Error(
             Parse.Error.INVALID_JSON,
-            ErrorMessage.queryValueTypeInvalid('string', '$text', '$language')
+            ErrorMessage.queryValueTypeInvalid('string', '$text.$language')
           );
         } else if (search.$language) {
           answer[key].$language = search.$language;
         }
         if (search.$caseSensitive && typeof search.$caseSensitive !== 'boolean') {
           throw new Parse.Error(
             Parse.Error.INVALID_JSON,
-            ErrorMessage.queryValueTypeInvalid('boolean', '$text', '$caseSensitive')
+            ErrorMessage.queryValueTypeInvalid('boolean', '$text.$caseSensitive')
           );
         } else if (search.$caseSensitive) {
           answer[key].$caseSensitive = search.$caseSensitive;
         }
         if (search.$diacriticSensitive && typeof search.$diacriticSensitive !== 'boolean') {
           throw new Parse.Error(
             Parse.Error.INVALID_JSON,
-            ErrorMessage.queryValueTypeInvalid('boolean', '$text', '$diacriticSensitive')
+            ErrorMessage.queryValueTypeInvalid('boolean', '$text.$diacriticSensitive')
           );
         } else if (search.$diacriticSensitive) {
           answer[key].$diacriticSensitive = search.$diacriticSensitive;

src/Adapters/Storage/Postgres/PostgresStorageAdapter.js

@@ -540,19 +540,19 @@ const buildWhereClause = ({ schema, query, index, caseInsensitive }): WhereClaus
       if (typeof search !== 'object') {
         throw new Parse.Error(
           Parse.Error.INVALID_JSON,
-          ErrorMessage.queryValueTypeInvalid('object', '$text', '$search')
+          ErrorMessage.queryValueTypeInvalid('object', '$text.$search')
         );
       }
       if (!search.$term || typeof search.$term !== 'string') {
         throw new Parse.Error(
           Parse.Error.INVALID_JSON,
-          ErrorMessage.queryValueTypeInvalid('string', '$text', '$term')
+          ErrorMessage.queryValueTypeInvalid('string', '$text.$term')
         );
       }
       if (search.$language && typeof search.$language !== 'string') {
         throw new Parse.Error(
           Parse.Error.INVALID_JSON,
-          ErrorMessage.queryValueTypeInvalid('string', '$text', '$language')
+          ErrorMessage.queryValueTypeInvalid('string', '$text.$language')
         );
       } else if (search.$language) {
         language = search.$language;

src/Errors/message.js

@@ -30,16 +30,13 @@ export const ErrorMessage = {
   duplicateValue: () => 'A duplicate value for a field with unique values was provided.',
   databaseAdapterError: () => 'Database adapter error.',
   geoJsonInvalidVertices: () => 'GeoJSON: Loop must have at least 3 different vertices.',
-  invalidPolygonValues: () => 'Polygon must have atleast 3 values.',
+  invalidPolygonValues: () => 'Polygon must have at least 3 values.',
   invalidNestedKey: () => "Nested keys should not contain the '$' or '.' characters",
   objectFieldValueInvalid: type => `Invalid ${type} value provided.`,
   queryAllValueInvalid: value => `All $all values must be of regex type or none: ${value}.`,
-  queryValueTypeInvalid: (type, key, value) =>
-    `Invalid ${key}: ${value}${value ? ',' : ''} should be ${type}.`,
-  valueNotSupported: value =>
-    `Invalid ${value} not supported, please use $regex or create a separate lower case column.`,
-  databasePostgresExtensionRequired: (value, extension) =>
-    `Invalid ${value} not supported, install ${extension} Extension.`,
+  queryValueTypeInvalid: (type, key) => `Value of '${key}' must be of type ${type}.`,
+  databasePostgresExtensionRequired: (key, extension) =>
+    `Query key ${key} requires Postgres extension ${extension}.`,
   fieldMissingForVerificationFunc: () =>
     'An appName, publicServerURL, and emailAdapter are required for password reset and email verification functionality.',
 };