hh-contracts 0.0.90 → 0.0.92

package/build/common/constants/index.js

@@ -29,4 +29,3 @@ __exportStar(require("./role-types.constant"), exports);
 __exportStar(require("./route-component-key.constants"), exports);
 __exportStar(require("./slug.constant"), exports);
 __exportStar(require("./translatable-field.constant"), exports);
-__exportStar(require("./zod-error-mapping.constant"), exports);

package/build/common/models/translations.schemas.js

@@ -36,5 +36,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeTranslationsByLang = void 0;
 const z = __importStar(require("zod"));
 const language_keys_schema_1 = require("./language-keys.schema");
-const makeTranslationsByLang = (schema) => z.partialRecord(language_keys_schema_1.LanguageKeysSchema, schema);
+const makeTranslationsByLang = (schema) => z
+    .partialRecord(language_keys_schema_1.LanguageKeysSchema, schema)
+    .refine(translations => Object.keys(translations).length > 0, {
+    params: {
+        messageKey: 'zod.translations.must_not_be_empty',
+    },
+});
 exports.makeTranslationsByLang = makeTranslationsByLang;

package/build/common/utils/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./create-api"), exports);
+__exportStar(require("./zod-message-key"), exports);

package/build/common/utils/zod-message-key/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getZodMessageKey = void 0;
+var zod_message_key_util_1 = require("./zod-message-key.util");
+Object.defineProperty(exports, "getZodMessageKey", { enumerable: true, get: function () { return zod_message_key_util_1.getZodMessageKey; } });

package/build/common/utils/zod-message-key/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/common/utils/zod-message-key/zod-message-key.util.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getZodMessageKey = getZodMessageKey;
+// Базовая мапа обработчиков по кодам Zod v4
+const handlers = {
+    invalid_type: i => `zod.invalid_type.${i.expected}`,
+    invalid_format: i => {
+        const format = String(i.format);
+        return `zod.invalid_format.${format}`;
+    },
+    too_small: i => `zod.too_small.${i.origin}.${i.exact ? 'exact' : 'min'}`,
+    too_big: i => `zod.too_big.${i.origin}.${i.exact ? 'exact' : 'max'}`,
+    not_multiple_of: () => 'zod.not_multiple_of',
+    unrecognized_keys: () => 'zod.unrecognized_keys',
+    invalid_union: () => 'zod.invalid_union',
+    invalid_key: i => `zod.invalid_key.${i.origin}`,
+    invalid_element: i => `zod.invalid_element.${i.origin}`,
+    invalid_value: () => 'zod.invalid_value',
+    custom: i => (typeof i.params?.messageKey === 'string' ? i.params.messageKey : 'zod.custom'),
+};
+function getZodMessageKey(issue) {
+    const handler = handlers[issue.code];
+    const tail = handler ? handler(issue) : 'zod.unknown';
+    return `errors.${tail}`;
+}

package/common/constants/index.ts

@@ -13,4 +13,3 @@ export * from './role-types.constant';
 export * from './route-component-key.constants';
 export * from './slug.constant';
 export * from './translatable-field.constant';
-export * from './zod-error-mapping.constant';

package/common/models/translations.schemas.ts

@@ -2,7 +2,13 @@ import * as z from 'zod';
 import { LanguageKeysSchema } from './language-keys.schema';
 
 export const makeTranslationsByLang = <T extends z.ZodObject>(schema: T) =>
-  z.partialRecord(LanguageKeysSchema, schema);
+  z
+    .partialRecord(LanguageKeysSchema, schema)
+    .refine(translations => Object.keys(translations).length > 0, {
+      params: {
+        messageKey: 'zod.translations.must_not_be_empty',
+      },
+    });
 export type TranslationsByLang<T extends object> = Partial<
   Record<z.infer<typeof LanguageKeysSchema>, T>
 >;

package/common/utils/index.ts

@@ -1 +1,2 @@
 export * from './create-api';
+export * from './zod-message-key';

package/common/utils/zod-message-key/index.ts

@@ -0,0 +1 @@
+export { getZodMessageKey } from './zod-message-key.util';

package/common/utils/zod-message-key/types.ts

@@ -0,0 +1,7 @@
+import * as z from 'zod';
+
+export type TZodIssue = z.core.$ZodIssue;
+export type TCode = TZodIssue['code'];
+export type TIssueOf<C extends TCode> = Extract<TZodIssue, { code: C }>;
+export type THandler<C extends TCode> = (issue: TIssueOf<C>) => string;
+export type THandlerMap = Partial<{ [C in TCode]: THandler<C> }>;

package/common/utils/zod-message-key/zod-message-key.util.ts

@@ -0,0 +1,31 @@
+import * as z from 'zod';
+import { THandlerMap, TIssueOf, TZodIssue } from './types';
+
+// Базовая мапа обработчиков по кодам Zod v4
+const handlers = {
+  invalid_type: i => `zod.invalid_type.${i.expected}`,
+  invalid_format: i => {
+    const format = String(i.format);
+    return `zod.invalid_format.${format}`;
+  },
+
+  too_small: i => `zod.too_small.${i.origin}.${i.exact ? 'exact' : 'min'}`,
+  too_big: i => `zod.too_big.${i.origin}.${i.exact ? 'exact' : 'max'}`,
+
+  not_multiple_of: () => 'zod.not_multiple_of',
+
+  unrecognized_keys: () => 'zod.unrecognized_keys',
+  invalid_union: () => 'zod.invalid_union',
+
+  invalid_key: i => `zod.invalid_key.${i.origin}`,
+  invalid_element: i => `zod.invalid_element.${i.origin}`,
+  invalid_value: () => 'zod.invalid_value',
+  custom: i => (typeof i.params?.messageKey === 'string' ? i.params.messageKey : 'zod.custom'),
+} satisfies THandlerMap;
+
+export function getZodMessageKey(issue: TZodIssue): string {
+  const handler = handlers[issue.code] as ((i: TIssueOf<typeof issue.code>) => string) | undefined;
+  const tail = handler ? handler(issue) : 'zod.unknown';
+
+  return `errors.${tail}`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hh-contracts",
-  "version": "0.0.90",
+  "version": "0.0.92",
   "description": "",
   "main": "./build/index.js",
   "scripts": {

package/build/common/constants/zod-error-mapping.constant.js

@@ -1,46 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ZOD_ERROR_MAPPING = void 0;
-const z = __importStar(require("zod"));
-exports.ZOD_ERROR_MAPPING = {
-    [z.ZodIssueCode.invalid_type]: 'errors.validation.invalidType',
-    [z.ZodIssueCode.custom]: 'errors.validation.custom',
-    [z.ZodIssueCode.invalid_union]: 'errors.validation.invalidUnion',
-    [z.ZodIssueCode.unrecognized_keys]: 'errors.validation.unrecognizedKeys',
-    [z.ZodIssueCode.too_small]: 'errors.validation.tooSmall',
-    [z.ZodIssueCode.too_big]: 'errors.validation.tooBig',
-    [z.ZodIssueCode.not_multiple_of]: 'errors.validation.notMultipleOf',
-};

package/common/constants/zod-error-mapping.constant.ts

@@ -1,13 +0,0 @@
-import * as z from 'zod';
-
-export const ZOD_ERROR_MAPPING = {
-  [z.ZodIssueCode.invalid_type]: 'errors.validation.invalidType',
-  [z.ZodIssueCode.custom]: 'errors.validation.custom',
-  [z.ZodIssueCode.invalid_union]: 'errors.validation.invalidUnion',
-  [z.ZodIssueCode.unrecognized_keys]: 'errors.validation.unrecognizedKeys',
-  [z.ZodIssueCode.too_small]: 'errors.validation.tooSmall',
-  [z.ZodIssueCode.too_big]: 'errors.validation.tooBig',
-  [z.ZodIssueCode.not_multiple_of]: 'errors.validation.notMultipleOf',
-};
-
-export type TZodErorrKey = (typeof ZOD_ERROR_MAPPING)[keyof typeof ZOD_ERROR_MAPPING];