@astral/validations 4.8.0 → 4.9.0

package/README.md

@@ -28,6 +28,9 @@
     - [guid](#guid)
     - [pattern](#pattern)
     - [onlyNumber](#onlyNumber)
+    - [containsNumbers](#containsNumbers)
+    - [containsDifferentCases](#containsDifferentCases)
+    - [containsPunctuationMarks](#containsPunctuationMarks)
     - [snils](#snils)
     - [mobilePhone](#mobilePhone)
     - [innUL](#innUL)
@@ -448,6 +451,62 @@ validate('-1.2345')
 
 ---
 
+### containsNumbers
+
+Проверяет на наличие чисел в строке
+
+```ts
+import { string, containsNumbers } from '@astral/validations';
+
+const validate = string(containsNumbers());
+
+// undefined
+validate('test12345')
+
+// { message: 'Строка должна содержать числа' }
+validate('test')
+```
+
+---
+
+### containsDifferentCases
+
+Проверяет на наличие в строке символов разных регистров
+
+```ts
+import { string, containsDifferentCases } from '@astral/validations';
+
+const validate = string(containsDifferentCases());
+
+// undefined
+validate('testTEST')
+validate('тестТЕСТ')
+
+// { message: 'Строка должна содержать символы разного регистра' }
+validate('test')
+validate('ТЕСТ')
+```
+
+---
+
+### containsPunctuationMarks
+
+Проверяет на наличие в строке знаков пунктуации !$%&’()+,-./:;<=>?@[]^_{|}”
+
+```ts
+import { string, containsPunctuationMarks } from '@astral/validations';
+
+const validate = string(containsPunctuationMarks());
+
+// undefined
+validate('test?')
+
+// { message: 'Строка должна содержать знаки пунктуации' }
+validate('test')
+```
+
+---
+
 ### snils
 
 Проверяет валиден ли СНИЛС
@@ -1491,6 +1550,7 @@ validate(new Date())
 Guard, поддерживающие асинхронную валидацию имеют постфиксы ```async```:
 - ```objectAsync```
 - ```stringAsync```
+- ```optionalAsync```
 
 Пример:
 
@@ -1514,9 +1574,21 @@ const validate = objectAsync<Values>({
             message: 'Nickname занят',
         });
     }),
+    fullName: optionalAsync(stringAsync(async (value, ctx) => {
+        const nicknameIsAvailable = await checkNickname(value);
+
+        if (nicknameIsAvailable) {
+            return undefined;
+        }
+
+        return ctx.createError({
+            code: 'nickname-available',
+            message: 'Nickname занят',
+        });
+    })),
 });
 
-const result = await validate({ phone: '79308999999', nickname: 'Vasya' });
+const result = await validate({ phone: '79308999999', nickname: 'Vasya', fullName: '' });
 
 // { nickname: 'Nickname занят' }
 toPrettyError(result);

package/containsDifferentCases/constants.d.ts

@@ -0,0 +1,2 @@
+import { ErrorCode } from '../core';
+export declare const CONTAINS_DIFFERENT_CASES_ERROR_CODE: ErrorCode;

package/containsDifferentCases/constants.js

@@ -0,0 +1,2 @@
+import { createErrorCode } from '../core';
+export const CONTAINS_DIFFERENT_CASES_ERROR_CODE = createErrorCode('containsDifferentCases');

package/containsDifferentCases/containsDifferentCases.d.ts

@@ -0,0 +1,16 @@
+type ContainsDifferentCasesParams = {
+    /**
+     * @description Замена стандартного сообщения ошибки.
+     */
+    message?: string;
+};
+/**
+ * @description Проверяет на наличие в строке символов разных регистров
+ * @example
+ * ```ts
+ *  const validate = string(containsDifferentCases());
+ *  validate('testTEST');
+ * ```
+ */
+export declare const containsDifferentCases: <TLastSchemaValues extends Record<string, unknown>>(params?: ContainsDifferentCasesParams) => (value: string, prevCtx?: import("../core").ValidationContext<TLastSchemaValues> | undefined) => import("../core").ValidationResult;
+export {};

package/containsDifferentCases/containsDifferentCases.js

@@ -0,0 +1,22 @@
+import { createRule } from '../core';
+import { CONTAINS_DIFFERENT_CASES_ERROR_CODE } from './constants';
+/**
+ * @description Проверяет на наличие в строке символов разных регистров
+ * @example
+ * ```ts
+ *  const validate = string(containsDifferentCases());
+ *  validate('testTEST');
+ * ```
+ */
+export const containsDifferentCases = (params) => createRule((value, ctx) => {
+    const containsLowerCaseRegex = /(?=.*[A-ZА-ЯЁ])/;
+    const containsUpperCaseRegex = /(?=.*[a-zа-яё])/;
+    if (!containsLowerCaseRegex.test(value) ||
+        !containsUpperCaseRegex.test(value)) {
+        return ctx.createError({
+            code: CONTAINS_DIFFERENT_CASES_ERROR_CODE,
+            message: (params === null || params === void 0 ? void 0 : params.message) || 'Строка должна содержать символы разного регистра',
+        });
+    }
+    return undefined;
+});

package/containsDifferentCases/index.d.ts

@@ -0,0 +1,2 @@
+export * from './constants';
+export * from './containsDifferentCases';

package/containsDifferentCases/index.js

@@ -0,0 +1,2 @@
+export * from './constants';
+export * from './containsDifferentCases';

package/containsNumbers/constants.d.ts

@@ -0,0 +1,2 @@
+import { ErrorCode } from '../core';
+export declare const CONTAINS_NUMBERS_ERROR_CODE: ErrorCode;

package/containsNumbers/constants.js

@@ -0,0 +1,2 @@
+import { createErrorCode } from '../core';
+export const CONTAINS_NUMBERS_ERROR_CODE = createErrorCode('containsNumbers');

package/containsNumbers/containsNumbers.d.ts

@@ -0,0 +1,16 @@
+type ContainsNumbersParams = {
+    /**
+     * @description Замена стандартного сообщения ошибки.
+     */
+    message?: string;
+};
+/**
+ * @description Проверяет на наличие чисел в строке
+ * @example
+ * ```ts
+ *  const validate = string(containsNumbers());
+ *  validate('test123');
+ * ```
+ */
+export declare const containsNumbers: <TLastSchemaValues extends Record<string, unknown>>(params?: ContainsNumbersParams) => (value: string, prevCtx?: import("../core").ValidationContext<TLastSchemaValues> | undefined) => import("../core").ValidationResult;
+export {};

package/containsNumbers/containsNumbers.js

@@ -0,0 +1,20 @@
+import { createRule } from '../core';
+import { CONTAINS_NUMBERS_ERROR_CODE } from './constants';
+/**
+ * @description Проверяет на наличие чисел в строке
+ * @example
+ * ```ts
+ *  const validate = string(containsNumbers());
+ *  validate('test123');
+ * ```
+ */
+export const containsNumbers = (params) => createRule((value, ctx) => {
+    const containsNumbersRegex = /\d/;
+    if (!containsNumbersRegex.test(value)) {
+        return ctx.createError({
+            code: CONTAINS_NUMBERS_ERROR_CODE,
+            message: (params === null || params === void 0 ? void 0 : params.message) || 'Строка должна содержать числа',
+        });
+    }
+    return undefined;
+});

package/containsNumbers/index.d.ts

@@ -0,0 +1,2 @@
+export * from './constants';
+export * from './containsNumbers';

package/containsNumbers/index.js

@@ -0,0 +1,2 @@
+export * from './constants';
+export * from './containsNumbers';

package/containsPunctuationMarks/constants.d.ts

@@ -0,0 +1,2 @@
+import { ErrorCode } from '../core';
+export declare const CONTAINS_PUNCTUATION_MARKS_ERROR_CODE: ErrorCode;

package/containsPunctuationMarks/constants.js

@@ -0,0 +1,2 @@
+import { createErrorCode } from '../core';
+export const CONTAINS_PUNCTUATION_MARKS_ERROR_CODE = createErrorCode('containsPunctuationMarks');

package/containsPunctuationMarks/containsPunctuationMarks.d.ts

@@ -0,0 +1,16 @@
+type ContainsPunctuationMarksParams = {
+    /**
+     * @description Замена стандартного сообщения ошибки.
+     */
+    message?: string;
+};
+/**
+ * @description Проверяет на наличие в строке знаков пунктуации !$%&’()+,-./:;<=>?@[]^_{|}”
+ * @example
+ * ```ts
+ *  const validate = string(containsPunctuationMarks());
+ *  validate('test?');
+ * ```
+ */
+export declare const containsPunctuationMarks: <TLastSchemaValues extends Record<string, unknown>>(params?: ContainsPunctuationMarksParams) => (value: string, prevCtx?: import("../core").ValidationContext<TLastSchemaValues> | undefined) => import("../core").ValidationResult;
+export {};

package/containsPunctuationMarks/containsPunctuationMarks.js

@@ -0,0 +1,20 @@
+import { createRule } from '../core';
+import { CONTAINS_PUNCTUATION_MARKS_ERROR_CODE } from './constants';
+/**
+ * @description Проверяет на наличие в строке знаков пунктуации !$%&’()+,-./:;<=>?@[]^_{|}”
+ * @example
+ * ```ts
+ *  const validate = string(containsPunctuationMarks());
+ *  validate('test?');
+ * ```
+ */
+export const containsPunctuationMarks = (params) => createRule((value, ctx) => {
+    const containsPunctuationMarksRegex = /(?=.*[!$%&’”'"()+,-.\/:;<=>?@\[\]^_{|}])/;
+    if (!containsPunctuationMarksRegex.test(value)) {
+        return ctx.createError({
+            code: CONTAINS_PUNCTUATION_MARKS_ERROR_CODE,
+            message: (params === null || params === void 0 ? void 0 : params.message) || 'Строка должна содержать знаки пунктуации',
+        });
+    }
+    return undefined;
+});

package/containsPunctuationMarks/index.d.ts

@@ -0,0 +1,2 @@
+export * from './constants';
+export * from './containsPunctuationMarks';

package/containsPunctuationMarks/index.js

@@ -0,0 +1,2 @@
+export * from './constants';
+export * from './containsPunctuationMarks';

package/index.d.ts

@@ -1,5 +1,5 @@
 export { object, objectAsync, OBJECT_TYPE_ERROR_INFO, type Schema, type SchemaValue, type ObjectGuard, type ObjectAsyncGuard, } from './object';
-export { optional } from './optional';
+export { optional, optionalAsync } from './optional';
 export { string, STRING_TYPE_ERROR_INFO, stringAsync } from './string';
 export { date, INVALID_DATE_ERROR_INFO, DATE_TYPE_ERROR_INFO } from './date';
 export { number, NAN_NUMBER_ERROR_INFO, NUMBER_TYPE_ERROR_INFO, INFINITY_NUMBER_ERROR_INFO, } from './number';

package/index.js

@@ -1,5 +1,5 @@
 export { object, objectAsync, OBJECT_TYPE_ERROR_INFO, } from './object';
-export { optional } from './optional';
+export { optional, optionalAsync } from './optional';
 export { string, STRING_TYPE_ERROR_INFO, stringAsync } from './string';
 export { date, INVALID_DATE_ERROR_INFO, DATE_TYPE_ERROR_INFO } from './date';
 export { number, NAN_NUMBER_ERROR_INFO, NUMBER_TYPE_ERROR_INFO, INFINITY_NUMBER_ERROR_INFO, } from './number';

package/optional/index.d.ts

@@ -1 +1,2 @@
 export * from './optional';
+export * from './optionalAsync';

package/optional/index.js

@@ -1 +1,2 @@
 export * from './optional';
+export * from './optionalAsync';

package/optional/optionalAsync/index.d.ts

@@ -0,0 +1 @@
+export * from './optionalAsync';

package/optional/optionalAsync/index.js

@@ -0,0 +1 @@
+export * from './optionalAsync';

package/optional/optionalAsync/optionalAsync.d.ts

@@ -0,0 +1,6 @@
+import { AsyncIndependentValidationRule, AsyncValidationRule } from '../../core';
+/**
+ * @description Выключает проверку на required в guard. Предназначен для асинхронных правил.
+ * @example object({ name: optionalAsync(stringAsync(min(22))) })
+ */
+export declare const optionalAsync: <TLastSchemaValues extends Record<string, unknown>>(rule: AsyncValidationRule<unknown, TLastSchemaValues>) => AsyncIndependentValidationRule<unknown, TLastSchemaValues>;

package/optional/optionalAsync/optionalAsync.js

@@ -0,0 +1,18 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { callAsyncRule, createContext, } from '../../core';
+// TODO: необходимо добавить возможность использовать вложенные guards
+/**
+ * @description Выключает проверку на required в guard. Предназначен для асинхронных правил.
+ * @example object({ name: optionalAsync(stringAsync(min(22))) })
+ */
+export const optionalAsync = (rule) => (value, ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    return callAsyncRule(rule, value, createContext(ctx, value, { isOptional: true }));
+});

package/package.json

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