Merge pull request #5 from balavishnuvj/upgrade/fastest-validator

Updates: Fastest validator - 1.4.1

Author: balavishnuvj

package.json

@@ -46,6 +46,6 @@
     "react": "^16.12.0"
   },
   "dependencies": {
-    "fastest-validator": "0.6.19"
+    "fastest-validator": "1.4.1"
   }
 }

src/constants.js

@@ -1,57 +1,63 @@
-export const PER_FIELD_SCHEMA = {
-  $$strict: true, // no additional properties allowed
-  defaultValue: { type: 'any', optional: true },
+const PER_FIELD_CONFIG = {
+  defaultValue: { type: "any", optional: true },
   required: [
-    { type: 'boolean', optional: true },
+    { type: "boolean", optional: true },
     {
-      type: 'object',
+      type: "object",
       optional: true,
       props: {
-        errorMsg: { type: 'string' },
+        errorMsg: { type: "string" },
       },
     },
   ],
   min: [
-    { type: 'number', optional: true, positive: true, integer: true },
+    { type: "number", optional: true, positive: true, integer: true },
     {
-      type: 'object',
+      type: "object",
       optional: true,
       props: {
-        errorMsg: { type: 'string' },
-        length: { type: 'number', positive: true, integer: true },
+        errorMsg: { type: "string" },
+        length: { type: "number", positive: true, integer: true },
       },
     },
   ],
   max: [
-    { type: 'number', optional: true, positive: true, integer: true },
+    { type: "number", optional: true, positive: true, integer: true },
     {
-      type: 'object',
+      type: "object",
       optional: true,
       props: {
-        errorMsg: { type: 'string' },
-        length: { type: 'number', positive: true, integer: true },
+        errorMsg: { type: "string" },
+        length: { type: "number", positive: true, integer: true },
       },
     },
   ],
   patterns: {
-    type: 'array',
+    type: "array",
     items: {
-      type: 'object',
+      type: "object",
       props: {
-        regex: { type: 'regex' },
-        errorMsg: { type: 'string' },
+        regex: { type: "regex" },
+        errorMsg: { type: "string" },
       },
     },
     optional: true,
   },
-  validationFns: { type: 'array', items: 'function', optional: true },
+  validationFns: { type: "array", items: "function", optional: true },
+};
+
+export const PER_FIELD_SCHEMA = {
+  $$strict: true, // no additional properties allowed
+  ...PER_FIELD_CONFIG,
 };
+
 export const FIELD_CONFIG_SCHEMA = {
+  $$strict: true, // no additional properties allowed
   configs: {
-    type: 'array',
+    type: "array",
     items: {
-      type: 'object',
-      props: PER_FIELD_SCHEMA,
+      type: "object",
+      props: PER_FIELD_CONFIG,
     },
   },
 };

src/schema-validator.js

@@ -1,12 +1,30 @@
-import Validator from 'fastest-validator';
+import Validator from "fastest-validator";
 
-const validator = new Validator();
+const validator = new Validator({
+  messages: {
+    regex: "The '{field}' field must be an valid regex! Actual: {actual}",
+  },
+});
 
 // Register a custom 'regex' validator
-validator.add('regex', (value) => {
-  if (!(value instanceof RegExp))
-    return validator.makeError('regex', null, value);
-  return true;
+// validator.add("regex", (value) => {
+//   if (!(value instanceof RegExp))
+//     return validator.makeError("regex", null, value);
+//   return true;
+// });
+validator.add("regex", function ({ schema, messages }, path, context) {
+  return {
+    source: `
+          if (!(value instanceof RegExp))
+              ${this.makeError({
+                type: "regex",
+                actual: "value",
+                messages,
+              })}
+
+          return value;
+      `,
+  };
 });
 export function getSchemaValidator(schema) {
   return validator.compile(schema);

yarn.lock

@@ -1886,10 +1886,10 @@ fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
-fastest-validator@0.6.19:
-  version "0.6.19"
-  resolved "https://registry.yarnpkg.com/fastest-validator/-/fastest-validator-0.6.19.tgz#5522cf29a13090df71862c7df4b29d1f49165a91"
-  integrity sha512-U+hjn/Au+sgGfrwb26t26hywrItCdkpQ7VEJPY7Ey0FU2mnH/L4xhcs0R9Bd+y57aUKlasC3W4J6t8fOyXji6Q==
+fastest-validator@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/fastest-validator/-/fastest-validator-1.4.1.tgz#a49bb73bbb1cac3e94f890fb91f2f264a0957413"
+  integrity sha512-KOs52Z8HjcTPXzgxy9O0drpeuYq0epry/sZMIBwNOYB9bUyRgeGeyqbEsfX7HvIsBT8Yfb7LwgenaQ2obHF40Q==
 
 fb-watchman@^2.0.0:
   version "2.0.1"