@astral/validations 4.2.0 → 4.4.0

package/README.md

@@ -25,6 +25,7 @@
     - [min](#min-string)
     - [max](#max-string)
     - [email](#email)
+    - [guid](#guid)
     - [pattern](#pattern)
     - [onlyNumber](#onlyNumber)
     - [snils](#snils)
@@ -386,6 +387,25 @@ validateEmail('longlonglong.......')
 
 ---
 
+### guid
+
+Проверяет валиден ли GUID.
+
+```ts
+import { string, guid } from '@astral/validations';
+
+const validate = string(guid());
+
+// undefined
+validate('C56A4180-65AA-42EC-A945-5FD21DEC0538');
+
+
+// { message: 'Некорректный GUID' }
+validate('x56a4180-h5aa-42ec-a945-5fd21dec0538');
+```
+
+---
+
 ### pattern
 
 Проверяет строку на соответствие регулярному выражению.

package/guid/constants.d.ts

@@ -0,0 +1,3 @@
+import { ErrorInfo } from '../core';
+export declare const GUID_REGEXP: RegExp;
+export declare const INVALID_GUID_ERROR_INFO: ErrorInfo;

package/guid/constants.js

@@ -0,0 +1,6 @@
+import { createErrorCode } from '../core';
+export const GUID_REGEXP = /^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$/;
+export const INVALID_GUID_ERROR_INFO = {
+    code: createErrorCode('guid-invalid'),
+    message: 'Некорректный GUID',
+};

package/guid/guid.d.ts

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

package/guid/guid.js

@@ -0,0 +1,16 @@
+import { createRule } from '../core';
+import { GUID_REGEXP, INVALID_GUID_ERROR_INFO } from './constants';
+/**
+ * @description Проверяет валидность GUID.
+ * @example
+ * ```ts
+ *  const validate = string(guid());
+ *  validate('C56A4180-65AA-42EC-A945-5FD21DEC0538');
+ * ```
+ */
+export const guid = (params) => createRule((value, ctx) => {
+    if (!GUID_REGEXP.test(value)) {
+        return ctx.createError(Object.assign(Object.assign({}, INVALID_GUID_ERROR_INFO), { message: (params === null || params === void 0 ? void 0 : params.message) || INVALID_GUID_ERROR_INFO.message }));
+    }
+    return undefined;
+});

package/guid/index.d.ts

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

package/guid/index.js

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

package/index.d.ts

@@ -16,10 +16,11 @@ export { pattern, PATTERN_ERROR_CODE } from './pattern';
 export { onlyNumber, ONLY_NUMBER_ERROR_CODE } from './onlyNumber';
 export { toPlainError } from './toPlainError';
 export { email, LENGTH_EMAIL_ERROR_INFO, INVALID_EMAIL_ERROR_INFO, } from './email';
+export { guid, INVALID_GUID_ERROR_INFO } from './guid';
 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';

package/index.js

@@ -16,10 +16,11 @@ export { pattern, PATTERN_ERROR_CODE } from './pattern';
 export { onlyNumber, ONLY_NUMBER_ERROR_CODE } from './onlyNumber';
 export { toPlainError } from './toPlainError';
 export { email, LENGTH_EMAIL_ERROR_INFO, INVALID_EMAIL_ERROR_INFO, } from './email';
+export { guid, INVALID_GUID_ERROR_INFO } from './guid';
 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';

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.2.0",
+  "version": "4.4.0",
   "browser": "./index.js",
   "main": "./index.js",
   "dependencies": {