@astral/validations 4.23.0 → 4.24.0

package/emailOrPhone/constants.d.ts

@@ -1,2 +1,3 @@
 import { type ErrorInfo } from '../core';
 export declare const EMAIL_OR_PHONE_ERROR_INFO: ErrorInfo;
+export declare const EMAIL_OR_PHONE_REQUIRED_ERROR_INFO: ErrorInfo;

package/emailOrPhone/constants.js

@@ -1,5 +1,9 @@
-import { createErrorCode } from '../core';
+import { REQUIRED_ERROR_INFO, createErrorCode } from '../core';
 export const EMAIL_OR_PHONE_ERROR_INFO = {
     code: createErrorCode('mobileOrPhone'),
     message: 'Некорректный формат',
 };
+export const EMAIL_OR_PHONE_REQUIRED_ERROR_INFO = {
+    code: createErrorCode('mobileOrPhone-required'),
+    message: REQUIRED_ERROR_INFO.message,
+};

package/emailOrPhone/emailOrPhone.d.ts

@@ -1,3 +1,4 @@
+import { type ValidationContext } from '../core';
 /**
  * Guard для поля "Email или телефон". Проверяет валидность email или мобильного телефона.
  * - Если строка содержит кириллицу, латиницу или символ @ - проверяется как email
@@ -9,4 +10,4 @@
  *  validate({ value: '+7 (999) 999-99-99', normalizedValue: '79999999999', type: 'phone' });
  * ```
  */
-export declare const emailOrPhone: <TLastSchemaValues extends Record<string, unknown>>() => import("../core").Guard<TLastSchemaValues, {}>;
+export declare const emailOrPhone: <TLastSchemaValues extends Record<string, unknown>>() => (value: unknown, ctx?: ValidationContext<TLastSchemaValues>) => import("../core").ValidationResult;

package/emailOrPhone/emailOrPhone.js

@@ -1,7 +1,7 @@
 import { createGuard } from '../core';
 import { email } from '../email';
 import { mobilePhone } from '../mobilePhone';
-import { EMAIL_OR_PHONE_ERROR_INFO } from './constants';
+import { EMAIL_OR_PHONE_ERROR_INFO, EMAIL_OR_PHONE_REQUIRED_ERROR_INFO, } from './constants';
 /**
  * Guard для поля "Email или телефон". Проверяет валидность email или мобильного телефона.
  * - Если строка содержит кириллицу, латиницу или символ @ - проверяется как email
@@ -13,26 +13,41 @@ import { EMAIL_OR_PHONE_ERROR_INFO } from './constants';
  *  validate({ value: '+7 (999) 999-99-99', normalizedValue: '79999999999', type: 'phone' });
  * ```
  */
-export const emailOrPhone = () => createGuard((value, ctx) => {
-    if (!value ||
+// Отдельная функциональная обертка необходима для работы с guard optional
+export const emailOrPhone = () => (value, ctx) => createGuard((_, innerCtx) => {
+    const requiredValue = value &&
+        typeof value === 'object' &&
+        'value' in value &&
+        !Boolean(value.value);
+    const checkValidObject = !value ||
         typeof value !== 'object' ||
         !('value' in value) ||
         !('normalizedValue' in value) ||
-        !('type' in value)) {
-        return ctx.createError({
+        !('type' in value);
+    if (requiredValue && (ctx === null || ctx === void 0 ? void 0 : ctx.isOptional)) {
+        return undefined;
+    }
+    if (requiredValue) {
+        return innerCtx.createError({
+            code: EMAIL_OR_PHONE_REQUIRED_ERROR_INFO.code,
+            message: EMAIL_OR_PHONE_REQUIRED_ERROR_INFO.message,
+        });
+    }
+    if (checkValidObject) {
+        return innerCtx.createError({
             code: EMAIL_OR_PHONE_ERROR_INFO.code,
             message: EMAIL_OR_PHONE_ERROR_INFO.message,
         });
     }
     const { value: formattedValue = '', normalizedValue = '', type, } = value;
     if (type === 'email') {
-        return email()(formattedValue, ctx);
+        return email()(formattedValue, innerCtx);
     }
     if (type === 'phone') {
-        return mobilePhone()(normalizedValue, ctx);
+        return mobilePhone()(normalizedValue, innerCtx);
     }
-    return ctx.createError({
+    return innerCtx.createError({
         message: EMAIL_OR_PHONE_ERROR_INFO.message,
         code: EMAIL_OR_PHONE_ERROR_INFO.code,
     });
-});
+})(value, ctx);

package/minYearsOld/minYearsOld.js

@@ -36,7 +36,7 @@ export function minYearsOld(age, params) {
         if (value < BIRTH_DATE_MIN) {
             return ctx.createError({
                 code: BIRTH_DATE_MIN_ERROR_CODE,
-                message: getMessage(`Не ранее ${BIRTH_DATE_MIN}`),
+                message: getMessage(`Не ранее ${BIRTH_DATE_MIN.toLocaleDateString('ru-RU')}`),
             });
         }
         return undefined;

package/node/emailOrPhone/constants.d.ts

@@ -1,2 +1,3 @@
 import { type ErrorInfo } from '../core';
 export declare const EMAIL_OR_PHONE_ERROR_INFO: ErrorInfo;
+export declare const EMAIL_OR_PHONE_REQUIRED_ERROR_INFO: ErrorInfo;

package/node/emailOrPhone/constants.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EMAIL_OR_PHONE_ERROR_INFO = void 0;
+exports.EMAIL_OR_PHONE_REQUIRED_ERROR_INFO = exports.EMAIL_OR_PHONE_ERROR_INFO = void 0;
 const core_1 = require("../core");
 exports.EMAIL_OR_PHONE_ERROR_INFO = {
     code: (0, core_1.createErrorCode)('mobileOrPhone'),
     message: 'Некорректный формат',
 };
+exports.EMAIL_OR_PHONE_REQUIRED_ERROR_INFO = {
+    code: (0, core_1.createErrorCode)('mobileOrPhone-required'),
+    message: core_1.REQUIRED_ERROR_INFO.message,
+};

package/node/emailOrPhone/emailOrPhone.d.ts

@@ -1,3 +1,4 @@
+import { type ValidationContext } from '../core';
 /**
  * Guard для поля "Email или телефон". Проверяет валидность email или мобильного телефона.
  * - Если строка содержит кириллицу, латиницу или символ @ - проверяется как email
@@ -9,4 +10,4 @@
  *  validate({ value: '+7 (999) 999-99-99', normalizedValue: '79999999999', type: 'phone' });
  * ```
  */
-export declare const emailOrPhone: <TLastSchemaValues extends Record<string, unknown>>() => import("../core").Guard<TLastSchemaValues, {}>;
+export declare const emailOrPhone: <TLastSchemaValues extends Record<string, unknown>>() => (value: unknown, ctx?: ValidationContext<TLastSchemaValues>) => import("../core").ValidationResult;

package/node/emailOrPhone/emailOrPhone.js

@@ -16,27 +16,42 @@ const constants_1 = require("./constants");
  *  validate({ value: '+7 (999) 999-99-99', normalizedValue: '79999999999', type: 'phone' });
  * ```
  */
-const emailOrPhone = () => (0, core_1.createGuard)((value, ctx) => {
-    if (!value ||
+// Отдельная функциональная обертка необходима для работы с guard optional
+const emailOrPhone = () => (value, ctx) => (0, core_1.createGuard)((_, innerCtx) => {
+    const requiredValue = value &&
+        typeof value === 'object' &&
+        'value' in value &&
+        !Boolean(value.value);
+    const checkValidObject = !value ||
         typeof value !== 'object' ||
         !('value' in value) ||
         !('normalizedValue' in value) ||
-        !('type' in value)) {
-        return ctx.createError({
+        !('type' in value);
+    if (requiredValue && (ctx === null || ctx === void 0 ? void 0 : ctx.isOptional)) {
+        return undefined;
+    }
+    if (requiredValue) {
+        return innerCtx.createError({
+            code: constants_1.EMAIL_OR_PHONE_REQUIRED_ERROR_INFO.code,
+            message: constants_1.EMAIL_OR_PHONE_REQUIRED_ERROR_INFO.message,
+        });
+    }
+    if (checkValidObject) {
+        return innerCtx.createError({
             code: constants_1.EMAIL_OR_PHONE_ERROR_INFO.code,
             message: constants_1.EMAIL_OR_PHONE_ERROR_INFO.message,
         });
     }
     const { value: formattedValue = '', normalizedValue = '', type, } = value;
     if (type === 'email') {
-        return (0, email_1.email)()(formattedValue, ctx);
+        return (0, email_1.email)()(formattedValue, innerCtx);
     }
     if (type === 'phone') {
-        return (0, mobilePhone_1.mobilePhone)()(normalizedValue, ctx);
+        return (0, mobilePhone_1.mobilePhone)()(normalizedValue, innerCtx);
     }
-    return ctx.createError({
+    return innerCtx.createError({
         message: constants_1.EMAIL_OR_PHONE_ERROR_INFO.message,
         code: constants_1.EMAIL_OR_PHONE_ERROR_INFO.code,
     });
-});
+})(value, ctx);
 exports.emailOrPhone = emailOrPhone;

package/node/minYearsOld/minYearsOld.js

@@ -39,7 +39,7 @@ function minYearsOld(age, params) {
         if (value < constants_1.BIRTH_DATE_MIN) {
             return ctx.createError({
                 code: constants_1.BIRTH_DATE_MIN_ERROR_CODE,
-                message: getMessage(`Не ранее ${constants_1.BIRTH_DATE_MIN}`),
+                message: getMessage(`Не ранее ${constants_1.BIRTH_DATE_MIN.toLocaleDateString('ru-RU')}`),
             });
         }
         return undefined;

package/package.json

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