hh-contracts 0.0.78 → 0.0.79

package/build/common/constants/role-types.constant.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ROLE_TYPE_VALUES = exports.ROLE_TYPES = void 0;
 exports.ROLE_TYPES = {
+    superAdmin: 'superAdmin',
     system: 'system',
     hotel: 'hotel',
     guest: 'guest',

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

@@ -33,36 +33,9 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TranslationsSchema = exports.TranslationsArraySchema = exports.TranslationItemSchema = exports.TranslationPersistedSchema = void 0;
+exports.StringTranslationsByLangSchema = exports.makeTranslationsByLang = void 0;
 const z = __importStar(require("zod"));
 const language_keys_schema_1 = require("./language-keys.schema");
-const translatable_field_constant_1 = require("../constants/translatable-field.constant");
-const constants_1 = require("../constants");
-exports.TranslationPersistedSchema = z.object({
-    entityName: z.enum(constants_1.ENTITY_VALUES),
-    entityId: z.string(),
-    lang: language_keys_schema_1.LanguageKeysSchema,
-    field: z.enum(translatable_field_constant_1.TRANSLATABLE_FIELD_VALUES),
-    text: z.string().min(1),
-});
-exports.TranslationItemSchema = exports.TranslationPersistedSchema.omit({
-    entityId: true,
-    entityName: true,
-    field: true,
-});
-exports.TranslationsArraySchema = z
-    .array(exports.TranslationItemSchema)
-    .refine(items => items.length > 0, {
-    params: { translationKey: 'errors.validation.atLeastOneTranslationRequired' },
-})
-    .refine(items => {
-    const langs = items.map(item => item.lang);
-    const uniqueLangs = new Set(langs);
-    return langs.length === uniqueLangs.size;
-}, {
-    params: { translationKey: 'errors.validation.duplicateLanguagesNotAllowed' },
-});
-exports.TranslationsSchema = z.object({
-    name: exports.TranslationsArraySchema,
-    description: exports.TranslationsArraySchema,
-});
+const makeTranslationsByLang = (schema) => z.record(language_keys_schema_1.LanguageKeysSchema, schema);
+exports.makeTranslationsByLang = makeTranslationsByLang;
+exports.StringTranslationsByLangSchema = (0, exports.makeTranslationsByLang)(z.string().min(1));

package/build/hotels/hotel.model.js

@@ -39,8 +39,6 @@ const common_1 = require("../common");
 exports.HotelPersistedSchema = z
     .object({
     id: z.uuid(),
-    //убрать из модели так как у одного отеля может быть несколько юр лиц
-    companyId: z.uuid(),
     slug: common_1.SlugSchema,
     status: z.enum(common_1.AppStatuses.HOTEL_VALUES),
     hasServices: z.boolean(),

package/build/index.js

@@ -23,3 +23,4 @@ __exportStar(require("./permissions"), exports);
 __exportStar(require("./roles"), exports);
 __exportStar(require("./tenants"), exports);
 __exportStar(require("./translate"), exports);
+__exportStar(require("./translations"), exports);

package/build/pages/models/page.schema.js

@@ -52,7 +52,7 @@ exports.PageLangTranslationSchema = z.object({
         .default({}),
     blocks: blocks_1.BlocksTranslationSchema.default({}),
 });
-const TranslationsSchema = z.record(common_1.LanguageKeysSchema, exports.PageLangTranslationSchema);
+const TranslationsSchema = (0, common_1.makeTranslationsByLang)(exports.PageLangTranslationSchema);
 exports.PageSchema = z.object({
     meta: MetaSchema,
     blocks: z.array(blocks_1.BlockSchema),

package/build/permissions/permission.models.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PermissionListItemSchema = exports.PermissionWithTranslationsSchema = exports.PermissionPersistedSchema = exports.JsonConditionsSchema = void 0;
+exports.PermissionListItemSchema = exports.PermissionWithTranslationsSchema = exports.PermissionLangTranslationSchema = exports.PermissionPersistedSchema = exports.JsonConditionsSchema = void 0;
 const z = __importStar(require("zod"));
 const common_1 = require("../common");
 exports.JsonConditionsSchema = z
@@ -51,7 +51,7 @@ exports.JsonConditionsSchema = z
     catch {
         return false;
     }
-}, { params: { translationKey: 'errors.validation.invalidJson' } });
+}, { params: { messageKey: 'errors.validation.invalidJson' } });
 exports.PermissionPersistedSchema = z
     .object({
     id: z.uuid(),
@@ -60,10 +60,13 @@ exports.PermissionPersistedSchema = z
     conditions: exports.JsonConditionsSchema,
 })
     .extend(common_1.TimestampSchema.shape);
+// V2 translations: all translatable fields are inside per-language translation object
+exports.PermissionLangTranslationSchema = z.object({
+    name: z.string().min(3),
+    description: z.string().optional(),
+});
 exports.PermissionWithTranslationsSchema = exports.PermissionPersistedSchema.extend({
-    translations: common_1.TranslationsSchema.pick({ name: true, description: true }).partial({
-        description: true,
-    }),
+    translations: (0, common_1.makeTranslationsByLang)(exports.PermissionLangTranslationSchema),
 });
 exports.PermissionListItemSchema = exports.PermissionPersistedSchema.extend({
     name: z.string().nullable(),

package/build/roles/role.models.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RoleListItemSchema = exports.RoleWithTranslationsSchema = exports.RoleWithPermissionsSchema = exports.RolePersistedSchema = void 0;
+exports.RoleListItemSchema = exports.RoleWithTranslationsSchema = exports.RoleLangTranslationSchema = exports.RoleWithPermissionsSchema = exports.RolePersistedSchema = void 0;
 const z = __importStar(require("zod"));
 const common_1 = require("../common");
 const permissions_1 = require("../permissions");
@@ -48,11 +48,12 @@ exports.RolePersistedSchema = z
 exports.RoleWithPermissionsSchema = exports.RolePersistedSchema.extend({
     permissionIds: common_1.UuidArraySchema.optional(),
 });
+exports.RoleLangTranslationSchema = z.object({
+    name: z.string().min(3),
+    description: z.string().optional(),
+});
 exports.RoleWithTranslationsSchema = exports.RoleWithPermissionsSchema.extend({
-    translations: common_1.TranslationsSchema.pick({
-        name: true,
-        description: true,
-    }).partial({ description: true }),
+    translations: (0, common_1.makeTranslationsByLang)(exports.RoleLangTranslationSchema),
 });
 exports.RoleListItemSchema = exports.RolePersistedSchema.extend({
     name: z.string().nullable(),

package/build/translations/index.js

@@ -0,0 +1,17 @@
+"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./translation.models"), exports);

package/build/translations/translation.models.js

@@ -0,0 +1,50 @@
+"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.TranslationItemSchema = exports.TranslationPersistedSchema = void 0;
+const z = __importStar(require("zod"));
+const common_1 = require("../common");
+exports.TranslationPersistedSchema = z.object({
+    entityName: z.enum(common_1.ENTITY_VALUES),
+    entityId: z.string(),
+    lang: common_1.LanguageKeysSchema,
+    field: z.string().min(1).max(255),
+    text: z.string().min(1),
+});
+exports.TranslationItemSchema = exports.TranslationPersistedSchema.omit({
+    entityId: true,
+    entityName: true,
+    field: true,
+});

package/common/constants/app-errors.constant.ts

@@ -217,21 +217,10 @@ export type TAppError = TMappedErrors<typeof APP_ERRORS>;
 export type TAppErrorCode = TAppError['code'];
 export type TAppErrorMessageKey = TAppError['messageKey'];
 
-// type StringLeafPaths<T, K extends keyof T = keyof T> = K extends string
-//   ? T[K] extends string
-//     ? K
-//     : T[K] extends Record<string, any>
-//     ? `${K}.${StringLeafPaths<T[K]>}`
-//     : never
-//   : never;
-
-// export type I18nStringPath = StringLeafPaths<I18nTranslations>;
-
 export interface IBaseErrorDetails {
   type?: string;
   message?: string;
-  messageKey?: TAppErrorMessageKey; // Вместо I18nPath
-  directMessage?: string;
+  messageKey?: string;
   params?: Record<string, unknown>;
 }
 

package/common/constants/role-types.constant.ts

@@ -1,4 +1,5 @@
 export const ROLE_TYPES = {
+  superAdmin: 'superAdmin',
   system: 'system',
   hotel: 'hotel',
   guest: 'guest',

package/common/models/translations.schemas.ts

@@ -1,43 +1,8 @@
 import * as z from 'zod';
 import { LanguageKeysSchema } from './language-keys.schema';
-import { TRANSLATABLE_FIELD_VALUES } from '../constants/translatable-field.constant';
-import { ENTITY_VALUES } from '../constants';
 
-export const TranslationPersistedSchema = z.object({
-  entityName: z.enum(ENTITY_VALUES),
-  entityId: z.string(),
-  lang: LanguageKeysSchema,
-  field: z.enum(TRANSLATABLE_FIELD_VALUES),
-  text: z.string().min(1),
-});
-export type TTranslationPersisted = z.infer<typeof TranslationPersistedSchema>;
+export const makeTranslationsByLang = <T extends z.ZodTypeAny>(schema: T) =>
+  z.record(LanguageKeysSchema, schema);
+export type TranslationsByLang<T> = Partial<Record<z.infer<typeof LanguageKeysSchema>, T>>;
 
-export const TranslationItemSchema = TranslationPersistedSchema.omit({
-  entityId: true,
-  entityName: true,
-  field: true,
-});
-export type TTranslationItem = z.infer<typeof TranslationItemSchema>;
-
-export const TranslationsArraySchema = z
-  .array(TranslationItemSchema)
-  .refine(items => items.length > 0, {
-    params: { translationKey: 'errors.validation.atLeastOneTranslationRequired' },
-  })
-  .refine(
-    items => {
-      const langs = items.map(item => item.lang);
-      const uniqueLangs = new Set(langs);
-      return langs.length === uniqueLangs.size;
-    },
-    {
-      params: { translationKey: 'errors.validation.duplicateLanguagesNotAllowed' },
-    },
-  );
-export type TTranslationsArray = z.infer<typeof TranslationsArraySchema>;
-
-export const TranslationsSchema = z.object({
-  name: TranslationsArraySchema,
-  description: TranslationsArraySchema,
-});
-export type TTranslations = z.infer<typeof TranslationsSchema>;
+export const StringTranslationsByLangSchema = makeTranslationsByLang(z.string().min(1));

package/hotels/hotel.model.ts

@@ -4,8 +4,6 @@ import { LANGUAGE_KEYS, TimestampSchema, AppStatuses, SlugSchema } from '../comm
 export const HotelPersistedSchema = z
   .object({
     id: z.uuid(),
-    //убрать из модели так как у одного отеля может быть несколько юр лиц
-    companyId: z.uuid(),
     slug: SlugSchema,
     status: z.enum(AppStatuses.HOTEL_VALUES),
     hasServices: z.boolean(),

package/index.ts

@@ -7,3 +7,4 @@ export * from './permissions';
 export * from './roles';
 export * from './tenants';
 export * from './translate';
+export * from './translations';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hh-contracts",
-  "version": "0.0.78",
+  "version": "0.0.79",
   "description": "",
   "main": "./build/index.js",
   "scripts": {
@@ -10,6 +10,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "zod": "^4.0.17"
+    "zod": "^4.1.9"
   }
 }

package/pages/models/page.schema.ts

@@ -1,5 +1,5 @@
 import * as z from 'zod';
-import { AppStatuses, LanguageKeysSchema, SlugSchema } from '../../common';
+import { AppStatuses, LanguageKeysSchema, makeTranslationsByLang, SlugSchema } from '../../common';
 import { BlocksTranslationSchema, BlockSchema } from './blocks';
 
 const MetaSchema = z.object({
@@ -18,7 +18,7 @@ export const PageLangTranslationSchema = z.object({
     .default({}),
   blocks: BlocksTranslationSchema.default({}),
 });
-const TranslationsSchema = z.record(LanguageKeysSchema, PageLangTranslationSchema);
+const TranslationsSchema = makeTranslationsByLang(PageLangTranslationSchema);
 
 export const PageSchema = z.object({
   meta: MetaSchema,

package/permissions/permission.models.ts

@@ -1,5 +1,5 @@
 import * as z from 'zod';
-import { AppAbility, TimestampSchema, TranslationsSchema } from '../common';
+import { AppAbility, TimestampSchema, makeTranslationsByLang } from '../common';
 
 export const JsonConditionsSchema = z
   .string()
@@ -16,7 +16,7 @@ export const JsonConditionsSchema = z
         return false;
       }
     },
-    { params: { translationKey: 'errors.validation.invalidJson' } },
+    { params: { messageKey: 'errors.validation.invalidJson' } },
   );
 
 export const PermissionPersistedSchema = z
@@ -31,10 +31,14 @@ export const PermissionPersistedSchema = z
 
 export type TPermissionPersisted = z.infer<typeof PermissionPersistedSchema>;
 
+// V2 translations: all translatable fields are inside per-language translation object
+export const PermissionLangTranslationSchema = z.object({
+  name: z.string().min(3),
+  description: z.string().optional(),
+});
+
 export const PermissionWithTranslationsSchema = PermissionPersistedSchema.extend({
-  translations: TranslationsSchema.pick({ name: true, description: true }).partial({
-    description: true,
-  }),
+  translations: makeTranslationsByLang(PermissionLangTranslationSchema),
 });
 export type TPermissionWithTranslations = z.infer<typeof PermissionWithTranslationsSchema>;
 

package/roles/role.models.ts

@@ -1,5 +1,10 @@
 import * as z from 'zod';
-import { ROLE_TYPE_VALUES, TimestampSchema, TranslationsSchema, UuidArraySchema } from '../common';
+import {
+  ROLE_TYPE_VALUES,
+  TimestampSchema,
+  UuidArraySchema,
+  makeTranslationsByLang,
+} from '../common';
 import { PermissionListItemSchema } from '../permissions';
 
 export const RolePersistedSchema = z
@@ -17,11 +22,13 @@ export const RoleWithPermissionsSchema = RolePersistedSchema.extend({
 });
 export type TRoleWithPermissions = z.infer<typeof RoleWithPermissionsSchema>;
 
+export const RoleLangTranslationSchema = z.object({
+  name: z.string().min(3),
+  description: z.string().optional(),
+});
+
 export const RoleWithTranslationsSchema = RoleWithPermissionsSchema.extend({
-  translations: TranslationsSchema.pick({
-    name: true,
-    description: true,
-  }).partial({ description: true }),
+  translations: makeTranslationsByLang(RoleLangTranslationSchema),
 });
 export type TRoleWithTranslations = z.infer<typeof RoleWithTranslationsSchema>;
 

package/translations/index.ts

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

package/translations/translation.models.ts

@@ -0,0 +1,18 @@
+import * as z from 'zod';
+import { ENTITY_VALUES, LanguageKeysSchema } from '../common';
+
+export const TranslationPersistedSchema = z.object({
+  entityName: z.enum(ENTITY_VALUES),
+  entityId: z.string(),
+  lang: LanguageKeysSchema,
+  field: z.string().min(1).max(255),
+  text: z.string().min(1),
+});
+export type TTranslationPersisted = z.infer<typeof TranslationPersistedSchema>;
+
+export const TranslationItemSchema = TranslationPersistedSchema.omit({
+  entityId: true,
+  entityName: true,
+  field: true,
+});
+export type TTranslationItem = z.infer<typeof TranslationItemSchema>;

package/build/common/transforms/index.js

@@ -1,2 +0,0 @@
-"use strict";
-//export * from './navigation-item.transform';

package/build/common/transforms/navigation-item.transform.js

@@ -1,27 +0,0 @@
-"use strict";
-// import * as z from 'zod';
-// import { NavigationItemEntityBaseSchema, NavigationItemEntitySchema } from '../models';
-// import { TDeepOptionalize } from '../types';
-// const NavigationItemBase = NavigationItemEntityBaseSchema.transform(
-//   ({ parentId, description, iconKey, link, routeComponentKey, disabled, order, ...rest }) => ({
-//     ...rest,
-//     description: description || undefined,
-//     iconKey: iconKey || undefined,
-//     link: link || undefined,
-//     routeComponentKey: routeComponentKey || undefined,
-//     disabled: disabled === null ? undefined : disabled,
-//   }),
-// );
-// type TInput = z.input<typeof NavigationItemEntityBaseSchema> & {
-//   children?: TInput[];
-// };
-// type TOutput = z.output<typeof NavigationItemBase> & {
-//   children?: TOutput[];
-// };
-// export const NavigationItem = z.lazy(() =>
-//   NavigationItemEntitySchema.transform(({ children, ...rest }) => ({
-//     ...NavigationItemBase.parse(rest),
-//     children: children?.length ? children.map(child => NavigationItem.parse(child)) : undefined,
-//   })),
-// );
-// export type TNavigationItem = TDeepOptionalize<z.infer<typeof NavigationItem>>;

package/common/transforms/index.ts

@@ -1 +0,0 @@
-//export * from './navigation-item.transform';

package/common/transforms/navigation-item.transform.ts

@@ -1,29 +0,0 @@
-// import * as z from 'zod';
-// import { NavigationItemEntityBaseSchema, NavigationItemEntitySchema } from '../models';
-// import { TDeepOptionalize } from '../types';
-
-// const NavigationItemBase = NavigationItemEntityBaseSchema.transform(
-//   ({ parentId, description, iconKey, link, routeComponentKey, disabled, order, ...rest }) => ({
-//     ...rest,
-//     description: description || undefined,
-//     iconKey: iconKey || undefined,
-//     link: link || undefined,
-//     routeComponentKey: routeComponentKey || undefined,
-//     disabled: disabled === null ? undefined : disabled,
-//   }),
-// );
-
-// type TInput = z.input<typeof NavigationItemEntityBaseSchema> & {
-//   children?: TInput[];
-// };
-// type TOutput = z.output<typeof NavigationItemBase> & {
-//   children?: TOutput[];
-// };
-
-// export const NavigationItem = z.lazy(() =>
-//   NavigationItemEntitySchema.transform(({ children, ...rest }) => ({
-//     ...NavigationItemBase.parse(rest),
-//     children: children?.length ? children.map(child => NavigationItem.parse(child)) : undefined,
-//   })),
-// );
-// export type TNavigationItem = TDeepOptionalize<z.infer<typeof NavigationItem>>;