hh-contracts 0.0.89 → 0.0.91

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/build/translate/contracts/translate-object.contract.js

@@ -40,7 +40,11 @@ const translate_api_1 = require("../translate.api");
 const permissions_1 = require("../../permissions");
 const roles_1 = require("../../roles");
 const translate_schemas_1 = require("../translate.schemas");
-const makeReqVariant = (entity, schema, skipKeys) => z.object({ entity: z.literal(entity), object: schema, skipKeys });
+const makeReqVariant = (entity, schema) => z.object({
+    entity: z.literal(entity),
+    object: schema,
+    skipKeys: z.array(z.string()).optional(),
+});
 const makeResVariant = (entity, schema) => z.object({
     entity: z.literal(entity),
     translations: z.object({}).catchall(schema),

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.89",
+  "version": "0.0.91",
   "description": "",
   "main": "./build/index.js",
   "scripts": {

package/translate/contracts/translate-object.contract.ts

@@ -5,11 +5,12 @@ import { PermissionTranslationsSchema } from '../../permissions';
 import { RoleTranslationsSchema } from '../../roles';
 import { BaseTranslateSchema } from '../translate.schemas';
 
-const makeReqVariant = <E extends TEntity, S extends z.ZodTypeAny>(
-  entity: E,
-  schema: S,
-  skipKeys?: readonly (keyof z.infer<S>)[],
-) => z.object({ entity: z.literal(entity), object: schema, skipKeys });
+const makeReqVariant = <E extends TEntity, S extends z.ZodObject>(entity: E, schema: S) =>
+  z.object({
+    entity: z.literal(entity),
+    object: schema,
+    skipKeys: z.array(z.string()).optional(),
+  });
 
 const makeResVariant = <E extends TEntity, S extends z.ZodTypeAny>(entity: E, schema: S) =>
   z.object({