@astral/validations 4.1.0 → 4.3.0

package/README.md

@@ -37,6 +37,9 @@
     - [personName](#personName)
     - [personSurname](#personSurname)
     - [personPatronymic](#personPatronymic)
+    - [passportSeries](#passportSeries)
+    - [passportNumber](#passportNumber)
+    - [passportCode](#passportCode)
   - [date](#date)
     - [min](#min-date)
     - [max](#max-date)
@@ -641,6 +644,84 @@ validate('');
 validate('Иванович--Иванович');
 ```
 
+---
+
+### passportSeries
+
+Проверяет валидна ли серия паспорта
+
+#### [Требования на реализацию](https://track.astral.ru/soft/wiki/pages/viewpage.action?pageId=3813152849#id-Требованиянареализацию-8.1.Серияпаспорта)
+
+```ts
+import { string, passportSeries } from '@astral/validations';
+
+const validate = string(passportSeries());
+
+// undefined
+validate('9217');
+
+// { message: 'Проверьте серию' }
+validate('0017');
+
+// { message: 'Длина поля должна быть равна 4 символам' }
+validate('917');
+
+// { message: 'Только цифры' }
+validate('91а7');
+```
+
+---
+
+### passportNumber
+
+Проверяет валиден ли номер паспорта
+
+#### [Требования на реализацию](https://track.astral.ru/soft/wiki/pages/viewpage.action?pageId=3813152849#id-Требованиянареализацию-8.2.Номерпаспорта)
+
+```ts
+import { string, passportNumber } from '@astral/validations';
+
+const validate = string(passportNumber());
+
+// undefined
+validate('704564');
+
+// { message: 'Проверьте номер' }
+validate('000100');
+
+// { message: 'Длина поля должна быть равна 6 символам' }
+validate('7045');
+
+// { message: 'Только цифры' }
+validate('70а5');
+```
+
+---
+
+### passportCode
+
+Проверяет валиден ли код паспорта
+
+#### [Требования на реализацию](https://track.astral.ru/soft/wiki/pages/viewpage.action?pageId=3813152849#id-Требованиянареализацию-8.3.Кодподразделения)
+
+```ts
+import { string, passportCode } from '@astral/validations';
+
+const validate = string(passportCode());
+
+// undefined
+validate('123256');
+
+// { message: 'Проверьте код' }
+validate('000-456');
+
+// { message: 'Длина поля должна быть равна 6 символам' }
+validate('1234');
+
+// { message: 'Только цифры' }
+validate('1а3');
+```
+
 
 ## date
 

package/index.d.ts

@@ -19,13 +19,16 @@ export { email, LENGTH_EMAIL_ERROR_INFO, INVALID_EMAIL_ERROR_INFO, } from './ema
 export { mobilePhone, MOBILE_PHONE_ERROR_INFO } from './mobilePhone';
 export { innUL, INN_UL_ERROR_INFO } from './innUL';
 export { innIP, INN_IP_ERROR_INFO } from './innIP';
-export { kpp, INVALID_KPP_ERROR_INFO } from './kpp';
+export { kpp, INVALID_KPP_ERROR_INFO, KPP_DOUBLE_ZERO_START_ERROR_INFO, KPP_ZEROS_ONLY_ERROR_INFO, } from './kpp';
 export { snils, SNILS_ERROR_INFO } from './snils';
 export { createRule, REQUIRED_ERROR_INFO, type ValidationRule } from './core';
 export { ogrnUL, OGRN_UL_ERROR_INFO } from './ogrnUL';
 export { ogrnIP, OGRN_IP_ERROR_INFO } from './ogrnIP';
 export { personName, PERSON_NAME_ERROR_INFO } from './personName';
 export { personSurname, PERSON_SURNAME_ERROR_INFO } from './personSurname';
+export { passportSeries, PASSPORT_SERIES_ERROR_INFO, PASSPORT_SERIES_ERROR_LENGTH_INFO, PASSPORT_SERIES_ONLY_DIGITS_ERROR_INFO, } from './passportSeries';
+export { passportNumber, PASSPORT_NUMBER_ERROR_INFO, PASSPORT_NUMBER_LENGTH_ERROR_INFO, PASSPORT_NUMBER_ONLY_DIGITS_ERROR_INFO, } from './passportNumber';
+export { passportCode, PASSPORT_CODE_ERROR_INFO, PASSPORT_CODE_LENGTH_ERROR_INFO, PASSPORT_CODE_ONLY_DIGITS_ERROR_INFO, } from './passportCode';
 export { personPatronymic, PERSON_PATRONYMIC_ERROR_INFO, } from './personPatronymic';
 export { any } from './any';
 export { when } from './when';

package/index.js

@@ -19,13 +19,16 @@ export { email, LENGTH_EMAIL_ERROR_INFO, INVALID_EMAIL_ERROR_INFO, } from './ema
 export { mobilePhone, MOBILE_PHONE_ERROR_INFO } from './mobilePhone';
 export { innUL, INN_UL_ERROR_INFO } from './innUL';
 export { innIP, INN_IP_ERROR_INFO } from './innIP';
-export { kpp, INVALID_KPP_ERROR_INFO } from './kpp';
+export { kpp, INVALID_KPP_ERROR_INFO, KPP_DOUBLE_ZERO_START_ERROR_INFO, KPP_ZEROS_ONLY_ERROR_INFO, } from './kpp';
 export { snils, SNILS_ERROR_INFO } from './snils';
 export { createRule, REQUIRED_ERROR_INFO } from './core';
 export { ogrnUL, OGRN_UL_ERROR_INFO } from './ogrnUL';
 export { ogrnIP, OGRN_IP_ERROR_INFO } from './ogrnIP';
 export { personName, PERSON_NAME_ERROR_INFO } from './personName';
 export { personSurname, PERSON_SURNAME_ERROR_INFO } from './personSurname';
+export { passportSeries, PASSPORT_SERIES_ERROR_INFO, PASSPORT_SERIES_ERROR_LENGTH_INFO, PASSPORT_SERIES_ONLY_DIGITS_ERROR_INFO, } from './passportSeries';
+export { passportNumber, PASSPORT_NUMBER_ERROR_INFO, PASSPORT_NUMBER_LENGTH_ERROR_INFO, PASSPORT_NUMBER_ONLY_DIGITS_ERROR_INFO, } from './passportNumber';
+export { passportCode, PASSPORT_CODE_ERROR_INFO, PASSPORT_CODE_LENGTH_ERROR_INFO, PASSPORT_CODE_ONLY_DIGITS_ERROR_INFO, } from './passportCode';
 export { personPatronymic, PERSON_PATRONYMIC_ERROR_INFO, } from './personPatronymic';
 export { any } from './any';
 export { when } from './when';

package/kpp/constants.d.ts

@@ -1,3 +1,5 @@
 import { ErrorInfo } from '../core';
 export declare const INVALID_KPP_ERROR_INFO: ErrorInfo;
+export declare const KPP_ZEROS_ONLY_ERROR_INFO: ErrorInfo;
+export declare const KPP_DOUBLE_ZERO_START_ERROR_INFO: ErrorInfo;
 export declare const KPP_REGEX: RegExp;

package/kpp/constants.js

@@ -1,6 +1,14 @@
 import { createErrorCode } from '../core';
 export const INVALID_KPP_ERROR_INFO = {
-    code: createErrorCode('kpp-invalid'),
-    message: 'Некорректный КПП',
+    code: createErrorCode('kpp-invalid-pattern'),
+    message: 'Проверьте КПП',
+};
+export const KPP_ZEROS_ONLY_ERROR_INFO = {
+    code: createErrorCode('kpp-invalid-zeros-only'),
+    message: 'Не может состоять только из нулей',
+};
+export const KPP_DOUBLE_ZERO_START_ERROR_INFO = {
+    code: createErrorCode('kpp-invalid-double-zero-start'),
+    message: 'Не может начинаться с 00',
 };
 export const KPP_REGEX = /^(\d{4}([A-Z]|\d){2}\d{3})$/;

package/kpp/kpp.js

@@ -1,5 +1,5 @@
-import { createRule, isStringOfZeros } from '../core';
-import { INVALID_KPP_ERROR_INFO, KPP_REGEX } from './constants';
+import { createRule, isNoDoubleZeroStart, isStringOfZeros, } from '../core';
+import { INVALID_KPP_ERROR_INFO, KPP_DOUBLE_ZERO_START_ERROR_INFO, KPP_REGEX, KPP_ZEROS_ONLY_ERROR_INFO, } from './constants';
 /**
  * @description Проверяет валидность кода КПП
  * @example
@@ -9,8 +9,18 @@ import { INVALID_KPP_ERROR_INFO, KPP_REGEX } from './constants';
  * ```
  */
 export const kpp = (params) => createRule((value, ctx) => {
-    if (isStringOfZeros(value) || !KPP_REGEX.test(value)) {
-        return ctx.createError(Object.assign(Object.assign({}, INVALID_KPP_ERROR_INFO), { message: (params === null || params === void 0 ? void 0 : params.message) || INVALID_KPP_ERROR_INFO.message }));
+    const createKppError = (errorInfoObj) => ctx.createError({
+        message: (params === null || params === void 0 ? void 0 : params.message) || errorInfoObj.message,
+        code: errorInfoObj.code,
+    });
+    if (!KPP_REGEX.test(value)) {
+        return createKppError(INVALID_KPP_ERROR_INFO);
+    }
+    if (isStringOfZeros(value)) {
+        return createKppError(KPP_ZEROS_ONLY_ERROR_INFO);
+    }
+    if (!isNoDoubleZeroStart(value)) {
+        return createKppError(KPP_DOUBLE_ZERO_START_ERROR_INFO);
     }
     return undefined;
 }, { exclude: params === null || params === void 0 ? void 0 : params.exclude });

package/package.json

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

package/passportCode/constants.d.ts

@@ -0,0 +1,4 @@
+import { ErrorInfo } from '../core';
+export declare const PASSPORT_CODE_ERROR_INFO: ErrorInfo;
+export declare const PASSPORT_CODE_LENGTH_ERROR_INFO: ErrorInfo;
+export declare const PASSPORT_CODE_ONLY_DIGITS_ERROR_INFO: ErrorInfo;

package/passportCode/constants.js

@@ -0,0 +1,13 @@
+import { createErrorCode } from '../core';
+export const PASSPORT_CODE_ERROR_INFO = {
+    code: createErrorCode('passportCode'),
+    message: 'Проверьте код',
+};
+export const PASSPORT_CODE_LENGTH_ERROR_INFO = {
+    code: createErrorCode('passportCode'),
+    message: 'Длина поля должна быть равна 6 символам',
+};
+export const PASSPORT_CODE_ONLY_DIGITS_ERROR_INFO = {
+    code: createErrorCode('passportCode'),
+    message: 'Только цифры',
+};

package/passportCode/index.d.ts

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

package/passportCode/index.js

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

package/passportCode/passportCode.d.ts

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

package/passportCode/passportCode.js

@@ -0,0 +1,38 @@
+import { createRule, isNoDoubleZeroStart } from '../core';
+import { onlyNumber } from '../onlyNumber';
+import { PASSPORT_CODE_ERROR_INFO, PASSPORT_CODE_LENGTH_ERROR_INFO, PASSPORT_CODE_ONLY_DIGITS_ERROR_INFO, } from './constants';
+/**
+ * @description Проверяет валиден ли код паспорта
+ * @example
+ * ```ts
+ * const validate = string(passportCode());
+ * validate('123456');
+ * ```
+ */
+export const passportCode = (params) => createRule((value, ctx) => {
+    if (onlyNumber()(value)) {
+        return ctx.createError({
+            message: (params === null || params === void 0 ? void 0 : params.message) || PASSPORT_CODE_ONLY_DIGITS_ERROR_INFO.message,
+            code: PASSPORT_CODE_ONLY_DIGITS_ERROR_INFO.code,
+        });
+    }
+    if (!isNoDoubleZeroStart(value)) {
+        return ctx.createError({
+            message: (params === null || params === void 0 ? void 0 : params.message) || PASSPORT_CODE_ERROR_INFO.message,
+            code: PASSPORT_CODE_ERROR_INFO.code,
+        });
+    }
+    if (value.length !== 6) {
+        return ctx.createError({
+            message: (params === null || params === void 0 ? void 0 : params.message) || PASSPORT_CODE_LENGTH_ERROR_INFO.message,
+            code: PASSPORT_CODE_LENGTH_ERROR_INFO.code,
+        });
+    }
+    if (!/^([0-9]{2}[0-3])/.test(value)) {
+        return ctx.createError({
+            message: (params === null || params === void 0 ? void 0 : params.message) || PASSPORT_CODE_ERROR_INFO.message,
+            code: PASSPORT_CODE_ERROR_INFO.code,
+        });
+    }
+    return undefined;
+}, { exclude: params === null || params === void 0 ? void 0 : params.exclude });

package/passportNumber/constants.d.ts

@@ -0,0 +1,4 @@
+import { ErrorInfo } from '../core';
+export declare const PASSPORT_NUMBER_ERROR_INFO: ErrorInfo;
+export declare const PASSPORT_NUMBER_LENGTH_ERROR_INFO: ErrorInfo;
+export declare const PASSPORT_NUMBER_ONLY_DIGITS_ERROR_INFO: ErrorInfo;

package/passportNumber/constants.js

@@ -0,0 +1,13 @@
+import { createErrorCode } from '../core';
+export const PASSPORT_NUMBER_ERROR_INFO = {
+    code: createErrorCode('passportNumber'),
+    message: 'Проверьте номер',
+};
+export const PASSPORT_NUMBER_LENGTH_ERROR_INFO = {
+    code: createErrorCode('passportNumber'),
+    message: 'Длина поля должна быть равна 6 символам',
+};
+export const PASSPORT_NUMBER_ONLY_DIGITS_ERROR_INFO = {
+    code: createErrorCode('passportNumber'),
+    message: 'Только цифры',
+};

package/passportNumber/index.d.ts

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

package/passportNumber/index.js

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

package/passportNumber/passportNumber.d.ts

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

package/passportNumber/passportNumber.js

@@ -0,0 +1,32 @@
+import { onlyNumber } from '../onlyNumber';
+import { createRule } from '../core';
+import { PASSPORT_NUMBER_ERROR_INFO, PASSPORT_NUMBER_LENGTH_ERROR_INFO, PASSPORT_NUMBER_ONLY_DIGITS_ERROR_INFO, } from './constants';
+/**
+ * @description Проверяет валиден ли номер паспорта
+ * @example
+ * ```ts
+ * const validate = string(passportNumber());
+ * validate('704564');
+ * ```
+ */
+export const passportNumber = (params) => createRule((value, ctx) => {
+    if (onlyNumber()(value)) {
+        return ctx.createError({
+            message: (params === null || params === void 0 ? void 0 : params.message) || PASSPORT_NUMBER_ONLY_DIGITS_ERROR_INFO.message,
+            code: PASSPORT_NUMBER_ONLY_DIGITS_ERROR_INFO.code,
+        });
+    }
+    if (value.length !== 6) {
+        return ctx.createError({
+            message: (params === null || params === void 0 ? void 0 : params.message) || PASSPORT_NUMBER_LENGTH_ERROR_INFO.message,
+            code: PASSPORT_NUMBER_LENGTH_ERROR_INFO.code,
+        });
+    }
+    if (value < '000101' || value > '999999') {
+        return ctx.createError({
+            message: (params === null || params === void 0 ? void 0 : params.message) || PASSPORT_NUMBER_ERROR_INFO.message,
+            code: PASSPORT_NUMBER_ERROR_INFO.code,
+        });
+    }
+    return undefined;
+}, { exclude: params === null || params === void 0 ? void 0 : params.exclude });

package/passportSeries/constants.d.ts

@@ -0,0 +1,4 @@
+import { ErrorInfo } from '../core';
+export declare const PASSPORT_SERIES_ERROR_INFO: ErrorInfo;
+export declare const PASSPORT_SERIES_ERROR_LENGTH_INFO: ErrorInfo;
+export declare const PASSPORT_SERIES_ONLY_DIGITS_ERROR_INFO: ErrorInfo;

package/passportSeries/constants.js

@@ -0,0 +1,13 @@
+import { createErrorCode } from '../core';
+export const PASSPORT_SERIES_ERROR_INFO = {
+    code: createErrorCode('passportSeries'),
+    message: 'Проверьте серию',
+};
+export const PASSPORT_SERIES_ERROR_LENGTH_INFO = {
+    code: createErrorCode('passportSeries'),
+    message: 'Длина поля должна быть равна 4 символам',
+};
+export const PASSPORT_SERIES_ONLY_DIGITS_ERROR_INFO = {
+    code: createErrorCode('passportSeries'),
+    message: 'Только цифры',
+};

package/passportSeries/index.d.ts

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

package/passportSeries/index.js

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

package/passportSeries/passportSeries.d.ts

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

package/passportSeries/passportSeries.js

@@ -0,0 +1,32 @@
+import { createRule, isNoDoubleZeroStart } from '../core';
+import { onlyNumber } from '../onlyNumber';
+import { PASSPORT_SERIES_ERROR_INFO, PASSPORT_SERIES_ERROR_LENGTH_INFO, PASSPORT_SERIES_ONLY_DIGITS_ERROR_INFO, } from './constants';
+/**
+ * @description Проверяет валидна ли серия паспорта
+ * @example
+ * ```ts
+ * const validate = string(passportSeries());
+ * validate('9217');
+ * ```
+ */
+export const passportSeries = (params) => createRule((value, ctx) => {
+    if (onlyNumber()(value)) {
+        return ctx.createError({
+            message: (params === null || params === void 0 ? void 0 : params.message) || PASSPORT_SERIES_ONLY_DIGITS_ERROR_INFO.message,
+            code: PASSPORT_SERIES_ONLY_DIGITS_ERROR_INFO.code,
+        });
+    }
+    if (value.length !== 4) {
+        return ctx.createError({
+            message: (params === null || params === void 0 ? void 0 : params.message) || PASSPORT_SERIES_ERROR_LENGTH_INFO.message,
+            code: PASSPORT_SERIES_ERROR_LENGTH_INFO.code,
+        });
+    }
+    if (!isNoDoubleZeroStart(value)) {
+        return ctx.createError({
+            message: (params === null || params === void 0 ? void 0 : params.message) || PASSPORT_SERIES_ERROR_INFO.message,
+            code: PASSPORT_SERIES_ERROR_INFO.code,
+        });
+    }
+    return undefined;
+}, { exclude: params === null || params === void 0 ? void 0 : params.exclude });