@astral/validations 4.21.1 → 4.21.3

package/email/constants.d.ts

@@ -1,5 +1,7 @@
 import { type ErrorInfo } from '../core';
 export declare const EMAIL_REGEXP: RegExp;
+export declare const ALLOWED_USERNAME_START_SYMBOL_REGEXP: RegExp;
+export declare const ALLOWED_HOSTNAME_START_SYMBOL_REGEXP: RegExp;
 export declare const EMAIL_CYRILLIC_PUNYCODE_REGEXP: RegExp;
 export declare const LATIN_SYMBOLS: RegExp;
 export declare const CYRILLIC_SYMBOLS: RegExp;

package/email/constants.js

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

package/email/email.js

@@ -1,5 +1,5 @@
 import { createRule } from '../core';
-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';
+import { ALLOWED_HOSTNAME_START_SYMBOL_REGEXP, ALLOWED_USERNAME_START_SYMBOL_REGEXP, 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.
@@ -22,7 +22,7 @@ export const email = (params) => createRule((value, ctx) => {
         return ctx.createError(Object.assign(Object.assign({}, LENGTH_EMAIL_ERROR_INFO), { message: (params === null || params === void 0 ? void 0 : params.invalidLengthMessage) || LENGTH_EMAIL_ERROR_INFO.message }));
     }
     const [username, hostname] = value.split('@');
-    if (username.startsWith('.') || username.startsWith('-')) {
+    if (!ALLOWED_USERNAME_START_SYMBOL_REGEXP.test(username)) {
         return invalidEmailError;
     }
     if (username.endsWith('.')) {
@@ -36,7 +36,7 @@ export const email = (params) => createRule((value, ctx) => {
     if (LATIN_SYMBOLS.test(hostname) && CYRILLIC_SYMBOLS.test(hostname)) {
         return invalidEmailError;
     }
-    if (hostname.startsWith('.') || hostname.startsWith('-')) {
+    if (!ALLOWED_HOSTNAME_START_SYMBOL_REGEXP.test(hostname)) {
         return invalidEmailError;
     }
     if (hostname.endsWith('.')) {

package/node/email/constants.d.ts

@@ -1,5 +1,7 @@
 import { type ErrorInfo } from '../core';
 export declare const EMAIL_REGEXP: RegExp;
+export declare const ALLOWED_USERNAME_START_SYMBOL_REGEXP: RegExp;
+export declare const ALLOWED_HOSTNAME_START_SYMBOL_REGEXP: RegExp;
 export declare const EMAIL_CYRILLIC_PUNYCODE_REGEXP: RegExp;
 export declare const LATIN_SYMBOLS: RegExp;
 export declare const CYRILLIC_SYMBOLS: RegExp;

package/node/email/constants.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DOUBLE_DOTS_EMAIL_ERROR_INFO = exports.LENGTH_EMAIL_ERROR_INFO = exports.INVALID_EMAIL_ERROR_INFO = exports.PUNYCODE_REGEXP = exports.EMAIL_MAX_LENGTH = exports.CYRILLIC_SYMBOLS = exports.LATIN_SYMBOLS = exports.EMAIL_CYRILLIC_PUNYCODE_REGEXP = exports.EMAIL_REGEXP = void 0;
+exports.DOUBLE_DOTS_EMAIL_ERROR_INFO = exports.LENGTH_EMAIL_ERROR_INFO = exports.INVALID_EMAIL_ERROR_INFO = exports.PUNYCODE_REGEXP = exports.EMAIL_MAX_LENGTH = exports.CYRILLIC_SYMBOLS = exports.LATIN_SYMBOLS = exports.EMAIL_CYRILLIC_PUNYCODE_REGEXP = exports.ALLOWED_HOSTNAME_START_SYMBOL_REGEXP = exports.ALLOWED_USERNAME_START_SYMBOL_REGEXP = exports.EMAIL_REGEXP = void 0;
 const core_1 = require("../core");
-exports.EMAIL_REGEXP = /^[-\w.<]+@([A-z0-9][-A-z0-9]+\.)+[A-z]{2,}$/;
+exports.EMAIL_REGEXP = /^[-\w.<+]+@([A-z0-9][-A-z0-9]+\.)+[A-z]{2,}$/;
+exports.ALLOWED_USERNAME_START_SYMBOL_REGEXP = /^[A-Za-zА-Яа-яЁё0-9<]/;
+exports.ALLOWED_HOSTNAME_START_SYMBOL_REGEXP = /^[A-Za-zА-Яа-яЁё0-9]/;
 exports.EMAIL_CYRILLIC_PUNYCODE_REGEXP = /^([A-Za-zА-Яа-яЁё0-9]|[<A-Za-zА-Яа-яЁё0-9][-_.+A-Za-zА-Яа-яЁё0-9]*)@((([A-Za-zА-Яа-яЁё0-9][-_A-Za-zА-Яа-яЁё0-9]+)|(xn--[a-z0-9]+))\.+)*([A-Za-zА-Яа-яЁё]{2,}|xn--[a-z0-9]+)$/;
 exports.LATIN_SYMBOLS = /[a-zA-Z]/;
 exports.CYRILLIC_SYMBOLS = /[а-яА-ЯёЁ]/;

package/node/email/email.js

@@ -25,7 +25,7 @@ const email = (params) => (0, core_1.createRule)((value, ctx) => {
         return ctx.createError(Object.assign(Object.assign({}, constants_1.LENGTH_EMAIL_ERROR_INFO), { message: (params === null || params === void 0 ? void 0 : params.invalidLengthMessage) || constants_1.LENGTH_EMAIL_ERROR_INFO.message }));
     }
     const [username, hostname] = value.split('@');
-    if (username.startsWith('.') || username.startsWith('-')) {
+    if (!constants_1.ALLOWED_USERNAME_START_SYMBOL_REGEXP.test(username)) {
         return invalidEmailError;
     }
     if (username.endsWith('.')) {
@@ -39,7 +39,7 @@ const email = (params) => (0, core_1.createRule)((value, ctx) => {
     if (constants_1.LATIN_SYMBOLS.test(hostname) && constants_1.CYRILLIC_SYMBOLS.test(hostname)) {
         return invalidEmailError;
     }
-    if (hostname.startsWith('.') || hostname.startsWith('-')) {
+    if (!constants_1.ALLOWED_HOSTNAME_START_SYMBOL_REGEXP.test(hostname)) {
         return invalidEmailError;
     }
     if (hostname.endsWith('.')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astral/validations",
-  "version": "4.21.1",
+  "version": "4.21.3",
   "browser": "./index.js",
   "main": "./mode/index.js",
   "dependencies": {
@@ -22,9 +22,9 @@
   "module": "./index.js",
   "exports": {
     ".": {
-      "vitest": "./node/index.js",
       "module": "./index.js",
-      "require": "./node/index.js"
+      "require": "./node/index.js",
+      "types": "./index.d.ts"
     }
   }
 }