feat: add lang for regex rule

upjs · May 26, 2022 · c6e2183 · c6e2183
1 parent 572f4eb
commit c6e2183
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/locales/en.ts b/src/locales/en.ts
@@ -20,6 +20,7 @@ const enLang: Record<LangKeys, string> = {
   [rules.MIN_LENGTH]: 'Min length is $1',
   [rules.NUM_DASH]: 'Please enter numbers with dashes and underscores',
   [rules.NUMBER]: 'Please enter a valid number',
+  [rules.REGEX]: "The value doesn't match the pattern",
   [rules.REQUIRED]: 'This field is required',
   [rules.STARTS_WITH]: 'The value must start with "$1"',
   [rules.WITHIN]: 'The value is incorrect',

diff --git a/src/locales/fa.ts b/src/locales/fa.ts
@@ -18,6 +18,7 @@ const faLang: Record<LangKeys, string> = {
   [rules.LESS_EQUAL]: 'لطفا یک عدد کوچکتر یا مساوی $1 وارد کنید',
   [rules.MAX_LENGTH]: 'حداکثر طول مجاز این فیلد $1 است',
   [rules.MIN_LENGTH]: 'حداقل طول مجاز این فیلد $1 است',
+  [rules.REGEX]: 'مقدار وارد شده با الگوی مشخص شده همخوانی ندارد',
   [rules.REQUIRED]: 'این فیلد الزامی است',
   [rules.NUM_DASH]: 'لطفاً فقط اعداد با زیرخط و خط فاصله وارد کنید',
   [rules.NUMBER]: 'لطفا یک عدد معتبر وارد کنید',

diff --git a/src/rules/regex.ts b/src/rules/regex.ts
@@ -2,6 +2,7 @@ import { Rule } from '@/types';
 import { RuleError } from '@/modules/rule-error';
 import { when } from '@/utils/helpers';
 import { ARGUMENT_MUST_BE_PROVIDED, INVALID_PATTERN } from '@/types/error-dev';
+import { REGEX } from '@/types/rules';
 
 const isValidPattern = (pattern: string) => {
   try {
@@ -23,13 +24,13 @@ const stringToRegex = (str: string) => {
   return new RegExp(main, options);
 };
 
-function required(value: string, pattern: string): true | RuleError {
+function regex(value: string, pattern: string): true | RuleError {
   when(!pattern).throwError(ARGUMENT_MUST_BE_PROVIDED);
   when(isValidPattern(pattern) === false).throwError(INVALID_PATTERN);
 
   const regExp = stringToRegex(pattern);
 
-  return regExp.test(value) || new RuleError("The value doesn't match the pattern");
+  return regExp.test(value) || new RuleError(REGEX);
 }
 
-export default required as Rule;
+export default regex as Rule;
diff --git a/tests/rules/regex.test.ts b/tests/rules/regex.test.ts
@@ -42,7 +42,6 @@ describe('rules: regex', () => {
   it('should throw error on invalid argument', () => {
     expect(() => regex('...')).toThrowError(ARGUMENT_MUST_BE_PROVIDED);
     expect(() => regex('...', '')).toThrowError(ARGUMENT_MUST_BE_PROVIDED);
-    expect(() => regex()).toThrowError(ARGUMENT_MUST_BE_PROVIDED);
 
     // Invalid Patterns
     expect(() => regex('...', '^/[a-z')).toThrowError(INVALID_PATTERN);