@astral/validations 4.17.1 → 4.19.0

package/email/constants.d.ts

@@ -1,6 +1,8 @@
 import { type ErrorInfo } from '../core';
 export declare const EMAIL_REGEXP: RegExp;
 export declare const EMAIL_CYRILLIC_PUNYCODE_REGEXP: RegExp;
+export declare const LATIN_SYMBOLS: RegExp;
+export declare const CYRILLIC_SYMBOLS: RegExp;
 export declare const EMAIL_MAX_LENGTH = 254;
 export declare const PUNYCODE_REGEXP: RegExp;
 export declare const INVALID_EMAIL_ERROR_INFO: ErrorInfo;

package/email/constants.js

@@ -1,6 +1,8 @@
 import { createErrorCode } from '../core';
 export const EMAIL_REGEXP = /^[-\w.]+@([A-z0-9][-A-z0-9]+\.)+[A-z]{2,}$/;
-export const EMAIL_CYRILLIC_PUNYCODE_REGEXP = /^[-\w.<+]*\w+@((([A-z0-9][-_A-z0-9]+)|([А-яЁё0-9][-_А-яЁё0-9]+)|(xn--[a-z0-9]+))\.)+?(([A-zА-яЁё]{2,})|(xn--[a-z0-9]+))$/;
+export const EMAIL_CYRILLIC_PUNYCODE_REGEXP = /^([A-z0-9][-_\+A-z0-9]+)|([А-яЁё0-9][-_\+А-яЁё0-9]+)@((([A-z0-9][-_A-z0-9]+)|([А-яЁё0-9][-_А-яЁё0-9]+)|(xn--[a-z0-9]+))\.)+?(([A-zА-яЁё]{2,})|(xn--[a-z0-9]+))$/;
+export const LATIN_SYMBOLS = /[a-zA-Z]/;
+export const CYRILLIC_SYMBOLS = /[а-яА-ЯёЁ]/;
 export const EMAIL_MAX_LENGTH = 254;
 export const PUNYCODE_REGEXP = /^xn--/;
 export const INVALID_EMAIL_ERROR_INFO = {

package/email/email.js

@@ -1,5 +1,5 @@
 import { createRule } from '../core';
-import { DOUBLE_DOTS_EMAIL_ERROR_INFO, EMAIL_CYRILLIC_PUNYCODE_REGEXP, EMAIL_MAX_LENGTH, EMAIL_REGEXP, INVALID_EMAIL_ERROR_INFO, LENGTH_EMAIL_ERROR_INFO, PUNYCODE_REGEXP, } from './constants';
+import { CYRILLIC_SYMBOLS, DOUBLE_DOTS_EMAIL_ERROR_INFO, EMAIL_CYRILLIC_PUNYCODE_REGEXP, EMAIL_MAX_LENGTH, EMAIL_REGEXP, INVALID_EMAIL_ERROR_INFO, LATIN_SYMBOLS, LENGTH_EMAIL_ERROR_INFO, PUNYCODE_REGEXP, } from './constants';
 /**
  * Проверяет валидность email.
  * Работает с русскими доменами и punycode через параметр allowCyrillic.
@@ -32,6 +32,10 @@ export const email = (params) => createRule((value, ctx) => {
         return ctx.createError(Object.assign(Object.assign({}, DOUBLE_DOTS_EMAIL_ERROR_INFO), { message: (params === null || params === void 0 ? void 0 : params.doubleDotsErrorMessage) ||
                 DOUBLE_DOTS_EMAIL_ERROR_INFO.message }));
     }
+    //Проверка, что не может содержать одновременно латинские и кириллические символы
+    if (LATIN_SYMBOLS.test(hostname) && CYRILLIC_SYMBOLS.test(hostname)) {
+        return invalidEmailError;
+    }
     if (!PUNYCODE_REGEXP.test(hostname) &&
         hostname[2] === '-' &&
         hostname[3] === '-') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astral/validations",
-  "version": "4.17.1",
+  "version": "4.19.0",
   "browser": "./index.js",
   "main": "./index.js",
   "dependencies": {