react-hook-form-rules 1.5.9 → 1.7.1

package/rules/patterns/get-pattern-rule.ts

@@ -0,0 +1,12 @@
+/**
+ * Returns a rule that validates the pattern.
+ * @param options - Parameters.
+ * @param options.pattern - Regular expression.
+ * @param options.message - Custom message.
+ *
+ * @example rules: { pattern: getPatternRule(pattern) }
+ */
+export const getPatternRule = (pattern: RegExp, message: string) => ({
+  value: pattern,
+  message,
+})

package/rules/{link → patterns}/get-url-rule.ts

@@ -1,4 +1,6 @@
-const DEFAULT_MESSAGE = "The URL does not match the format.";
+import { translate } from "../../i18n";
+import { getPatternRule } from "./get-pattern-rule";
+
 const DEFAULT_PATTERN =
   /(http(s)?):\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/;
 
@@ -13,14 +15,9 @@ interface UrlRule {
  * @param options.pattern - Regular expression.
  * @param options.message - Custom message.
  *
- * @example rules: { pattern: getUrlValidationRule() }
+ * @example rules: { pattern: getUrlRule() }
  */
 export const getUrlRule = ({
   pattern = DEFAULT_PATTERN,
-  message = DEFAULT_MESSAGE,
-}: UrlRule) => {
-  return {
-    message,
-    value: pattern,
-  };
-};
+  message = translate('url'),
+}: UrlRule) => getPatternRule(pattern, message)

package/rules/patterns/tests/get-email-rule.test.ts

@@ -0,0 +1,27 @@
+import { getEmailRule } from "../get-email-rule";
+
+const DEFAULT_MESSAGE = "Please check the correctness of the entered email address.";
+const DEFAULT_PATTERN = /^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$/;
+
+describe('Тестирование функции getEmailRule', () => {
+  test('Проверка значения по умолчанию', () => {
+    expect(getEmailRule({})).toEqual({
+      message: DEFAULT_MESSAGE,
+      value: DEFAULT_PATTERN
+    });
+  });
+
+  test('Проверка передачи кастомного сообщения', () => {
+    expect(getEmailRule({ message: 'Custom message' })).toEqual({
+      message: 'Custom message',
+      value: DEFAULT_PATTERN
+    });
+  })
+
+  test('Проверка передачи камсного паттерна', () => {
+    expect(getEmailRule({ pattern: /test/ })).toEqual({
+      message: DEFAULT_MESSAGE,
+      value: /test/
+    });
+  })
+})

package/rules/patterns/tests/get-pattern-rule.test.ts

@@ -0,0 +1,10 @@
+import { getPatternRule } from "../get-pattern-rule";
+
+describe('Тестирование функции getEmailRule', () => {
+  test('Проверка кастомного сообщения', () => {
+    expect(getPatternRule(/-/, 'test message')).toEqual({
+      message: 'test message',
+      value: /-/
+    });
+  });
+})

package/rules/patterns/tests/get-url-rule.test.ts

@@ -0,0 +1,28 @@
+import { getUrlRule } from "../get-url-rule";
+
+const DEFAULT_MESSAGE = "The URL does not match the format.";
+const DEFAULT_PATTERN =
+  /(http(s)?):\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/;
+
+describe('Тестирование функции getEmailRule', () => {
+  test('Проверка значения по умолчанию', () => {
+    expect(getUrlRule({})).toEqual({
+      message: DEFAULT_MESSAGE,
+      value: DEFAULT_PATTERN
+    });
+  });
+
+  test('Проверка передачи кастомного сообщения', () => {
+    expect(getUrlRule({ message: 'Custom message' })).toEqual({
+      message: 'Custom message',
+      value: DEFAULT_PATTERN
+    });
+  })
+
+  test('Проверка передачи камсного паттерна', () => {
+    expect(getUrlRule({ pattern: /test/ })).toEqual({
+      message: DEFAULT_MESSAGE,
+      value: /test/
+    });
+  })
+})

package/rules/link/get-email-rule.ts

@@ -1,25 +0,0 @@
-const DEFAULT_PATTERN = /^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$/;
-const DEFAULT_MESSAGE = "Please check the correctness of the entered email address.";
-
-interface EmailRule {
-  pattern?: RegExp;
-  message?: string;
-}
-
-/**
- * Validates an email address.
- * @param options - Parameters.
- * @param options.pattern - Regular expression.
- * @param options.message - Custom message.
- *
- * @example rules: { pattern: getEmailRule() }
- */
-export const getEmailRule = ({
-  pattern = DEFAULT_PATTERN,
-  message = DEFAULT_MESSAGE,
-}: EmailRule) => {
-  return {
-    value: pattern,
-    message,
-  };
-};