hh-contracts 0.0.35 → 0.0.36

package/build/common/constants/locales.constant.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LANGUAGE_VALUES = exports.LANGUAGE = void 0;
+exports.LANGUAGE_KYES = exports.LANGUAGE = void 0;
 const icon_key_constant_1 = require("./icon-key.constant");
 exports.LANGUAGE = {
     en: {
@@ -18,4 +18,4 @@ exports.LANGUAGE = {
         postgressLocale: 'ru_RU',
     },
 };
-exports.LANGUAGE_VALUES = Object.keys(exports.LANGUAGE);
+exports.LANGUAGE_KYES = Object.keys(exports.LANGUAGE);

package/build/common/models/index.js

@@ -23,4 +23,5 @@ __exportStar(require("./order.schema"), exports);
 __exportStar(require("./pagination.schema"), exports);
 __exportStar(require("./search.schema"), exports);
 __exportStar(require("./timestamp.schemas"), exports);
-__exportStar(require("./language-values.schema"), exports);
+__exportStar(require("./language-keys.schema"), exports);
+__exportStar(require("./translations.schemas"), exports);

package/build/common/models/language-keys.schema.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LanguageKeysSchema = void 0;
+const zod_1 = require("zod");
+const constants_1 = require("../constants");
+exports.LanguageKeysSchema = zod_1.z.enum(constants_1.LANGUAGE_KYES, {
+    invalid_type_error: 'languageInvalid',
+    required_error: 'languageRequired',
+});

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TranslationsSchema = exports.TranslationsArraySchema = exports.TranslationItemSchema = void 0;
+const zod_1 = require("zod");
+const language_keys_schema_1 = require("./language-keys.schema");
+exports.TranslationItemSchema = zod_1.z.object({
+    lang: language_keys_schema_1.LanguageKeysSchema,
+    field: zod_1.z.enum(['name']), // или z.string() если будет расширяться
+    text: zod_1.z.string().min(1, { message: 'translationRequired' }),
+});
+exports.TranslationsArraySchema = zod_1.z.array(exports.TranslationItemSchema);
+exports.TranslationsSchema = zod_1.z.object({
+    translations: exports.TranslationsArraySchema,
+});

package/build/permissions/contracts/create-permission.contract.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreatePermissionContract = void 0;
 const common_1 = require("../../common");
 const permissions_api_1 = require("../permissions.api");
-const permission_model_1 = require("../permission.model");
-const permission_response_schema_1 = require("../permission.response.schema");
-const CreatePermissionContractRequestSchema = permission_model_1.PersistedPermissionSchema.omit({
+const permission_models_1 = require("../permission.models");
+const CreatePermissionContractRequestSchema = permission_models_1.PermissionWithTranslationsSchema.omit({
     id: true,
     createdAt: true,
     updatedAt: true,
@@ -16,5 +15,5 @@ var CreatePermissionContract;
     CreatePermissionContract.endpoint = permissions_api_1.PERMISSIONS_CONTROLLER.endpoints.create;
     CreatePermissionContract.httpMethod = common_1.HTTP_METHOD.post;
     CreatePermissionContract.RequestSchema = CreatePermissionContractRequestSchema;
-    CreatePermissionContract.ResponseSchema = permission_response_schema_1.PermissionResponseSchema;
+    CreatePermissionContract.ResponseSchema = permission_models_1.PermissionWithTranslationsSchema;
 })(CreatePermissionContract || (exports.CreatePermissionContract = CreatePermissionContract = {}));

package/build/permissions/contracts/delete-permission.contract.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeletePermissionContract = void 0;
 const common_1 = require("../../common");
-const permission_model_1 = require("../permission.model");
 const permissions_api_1 = require("../permissions.api");
+const permission_models_1 = require("../permission.models");
 var DeletePermissionContract;
 (function (DeletePermissionContract) {
     DeletePermissionContract.getUrl = permissions_api_1.PERMISSIONS_API.delete;
     DeletePermissionContract.endpoint = permissions_api_1.PERMISSIONS_CONTROLLER.endpoints.delete;
     DeletePermissionContract.httpMethod = common_1.HTTP_METHOD.delete;
-    DeletePermissionContract.ResponseSchema = permission_model_1.PersistedPermissionSchema;
+    DeletePermissionContract.ResponseSchema = permission_models_1.PermissionWithTranslationsSchema;
 })(DeletePermissionContract || (exports.DeletePermissionContract = DeletePermissionContract = {}));

package/build/permissions/contracts/find-many-permission.contract.js

@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FindManyPermissionsContract = void 0;
 const zod_1 = require("zod");
 const common_1 = require("../../common");
-const permission_model_1 = require("../permission.model");
+const permission_models_1 = require("../permission.models");
 const permissions_api_1 = require("../permissions.api");
-const BaseQuerySchema = permission_model_1.PersistedPermissionSchema.pick({
+const BaseQuerySchema = permission_models_1.PermissionListItemSchema.pick({
     subject: true,
     action: true,
 }).partial();
-const OrderBySchema = permission_model_1.PersistedPermissionSchema.keyof().optional();
-const FindManyPermissionsContractRequestSchema = BaseQuerySchema.merge(common_1.CommonQueryParamsSchema).extend({ orderBy: OrderBySchema, lang: zod_1.z.enum(common_1.LANGUAGE_VALUES).optional() });
+const OrderBySchema = permission_models_1.PermissionListItemSchema.keyof().optional();
+const FindManyPermissionsContractRequestSchema = BaseQuerySchema.merge(common_1.CommonQueryParamsSchema).extend({ orderBy: OrderBySchema, lang: zod_1.z.enum(common_1.LANGUAGE_KYES).optional() });
 const FindManyPermissionsContractResponseSchema = zod_1.z
     .object({
-    permissions: zod_1.z.array(permission_model_1.PersistedPermissionSchema),
+    permissions: zod_1.z.array(permission_models_1.PermissionListItemSchema),
 })
     .merge(common_1.PaginationResponseSchema);
 var FindManyPermissionsContract;

package/build/permissions/contracts/find-permission.contract.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FindPermissionContract = void 0;
 const common_1 = require("../../common");
-const permission_model_1 = require("../permission.model");
+const permission_models_1 = require("../permission.models");
 const permissions_api_1 = require("../permissions.api");
 // const FindPermissionContractResponseSchema = PersistedPermissionSchema.transform(
 //   ({ conditions, ...permission }) => ({
@@ -16,5 +16,5 @@ var FindPermissionContract;
     FindPermissionContract.endpoint = permissions_api_1.PERMISSIONS_CONTROLLER.endpoints.find;
     FindPermissionContract.httpMethod = common_1.HTTP_METHOD.get;
     // export const ResponseSchema = FindPermissionContractResponseSchema;
-    FindPermissionContract.ResponseSchema = permission_model_1.PersistedPermissionSchema;
+    FindPermissionContract.ResponseSchema = permission_models_1.PermissionWithTranslationsSchema;
 })(FindPermissionContract || (exports.FindPermissionContract = FindPermissionContract = {}));

package/build/permissions/contracts/update-permission.contract.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdatePermissionContract = void 0;
 const common_1 = require("../../common");
-const permission_model_1 = require("../permission.model");
+const permission_models_1 = require("../permission.models");
 const permissions_api_1 = require("../permissions.api");
 const create_permission_contract_1 = require("./create-permission.contract");
 var UpdatePermissionContract;
@@ -11,5 +11,5 @@ var UpdatePermissionContract;
     UpdatePermissionContract.endpoint = permissions_api_1.PERMISSIONS_CONTROLLER.endpoints.update;
     UpdatePermissionContract.httpMethod = common_1.HTTP_METHOD.put;
     UpdatePermissionContract.RequestSchema = create_permission_contract_1.CreatePermissionContract.RequestSchema;
-    UpdatePermissionContract.ResponseSchema = permission_model_1.PersistedPermissionSchema;
+    UpdatePermissionContract.ResponseSchema = permission_models_1.PermissionWithTranslationsSchema;
 })(UpdatePermissionContract || (exports.UpdatePermissionContract = UpdatePermissionContract = {}));

package/build/permissions/index.js

@@ -14,6 +14,6 @@ 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("./permission.model"), exports);
+__exportStar(require("./permission.models"), exports);
 __exportStar(require("./permissions.api"), exports);
 __exportStar(require("./contracts"), exports);

package/build/permissions/{permission.model.js → permission.models.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PersistedPermissionSchema = exports.JsonConditionsSchema = void 0;
+exports.PermissionListItemSchema = exports.PermissionWithTranslationsSchema = exports.PersistedPermissionSchema = exports.JsonConditionsSchema = void 0;
 const zod_1 = require("zod");
 const common_1 = require("../common");
 exports.JsonConditionsSchema = zod_1.z
@@ -22,11 +22,6 @@ exports.JsonConditionsSchema = zod_1.z
 exports.PersistedPermissionSchema = zod_1.z
     .object({
     id: zod_1.z.number({ invalid_type_error: 'idInvalid' }).positive({ message: 'idMustBePositive' }),
-    name_i18n: zod_1.z
-        .record(common_1.LanguageValuesSchema, zod_1.z.string().transform(s => s.trim()))
-        .refine(val => Object.values(val).some(str => str.length > 0), {
-        message: 'atLeastOneTranslationRequired',
-    }),
     action: zod_1.z.nativeEnum(common_1.AppAbility.ACTION, {
         invalid_type_error: 'actionInvalid',
         required_error: 'actionRequired',
@@ -38,3 +33,7 @@ exports.PersistedPermissionSchema = zod_1.z
     conditions: exports.JsonConditionsSchema,
 })
     .merge(common_1.TimestampSchema);
+exports.PermissionWithTranslationsSchema = exports.PersistedPermissionSchema.merge(common_1.TranslationsSchema);
+exports.PermissionListItemSchema = exports.PersistedPermissionSchema.extend({
+    name: zod_1.z.string(),
+});

package/build/permissions/permission.response.schema.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PermissionResponseSchema = void 0;
-const permission_model_1 = require("./permission.model");
-exports.PermissionResponseSchema = permission_model_1.PersistedPermissionSchema.transform(({ conditions, ...rest }) => ({
+const permission_models_1 = require("./permission.models");
+exports.PermissionResponseSchema = permission_models_1.PersistedPermissionSchema.transform(({ conditions, ...rest }) => ({
     ...rest,
     conditions: conditions ? JSON.parse(conditions) : undefined,
 }));

package/common/constants/locales.constant.ts

@@ -22,4 +22,4 @@ export type TLanguage = keyof typeof LANGUAGE;
 export type TLocale = (typeof LANGUAGE)[TLanguage]['locale'];
 export type TPostgresLocale = (typeof LANGUAGE)[TLanguage]['postgressLocale'];
 
-export const LANGUAGE_VALUES = Object.keys(LANGUAGE) as [TLanguage, ...TLanguage[]];
+export const LANGUAGE_KYES = Object.keys(LANGUAGE) as [TLanguage, ...TLanguage[]];

package/common/models/index.ts

@@ -7,4 +7,5 @@ export * from './order.schema';
 export * from './pagination.schema';
 export * from './search.schema';
 export * from './timestamp.schemas';
-export * from './language-values.schema';
+export * from './language-keys.schema';
+export * from './translations.schemas';

package/common/models/language-keys.schema.ts

@@ -0,0 +1,7 @@
+import { z } from 'zod';
+import { LANGUAGE_KYES } from '../constants';
+
+export const LanguageKeysSchema = z.enum(LANGUAGE_KYES, {
+  invalid_type_error: 'languageInvalid',
+  required_error: 'languageRequired',
+});

package/common/models/translations.schemas.ts

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+import { LanguageKeysSchema } from './language-keys.schema';
+
+export const TranslationItemSchema = z.object({
+  lang: LanguageKeysSchema,
+  field: z.enum(['name']), // или z.string() если будет расширяться
+  text: z.string().min(1, { message: 'translationRequired' }),
+});
+
+export const TranslationsArraySchema = z.array(TranslationItemSchema);
+
+export const TranslationsSchema = z.object({
+  translations: TranslationsArraySchema,
+});

package/package.json

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

package/permissions/contracts/create-permission.contract.ts

@@ -1,10 +1,9 @@
 import { z } from 'zod';
 import { HTTP_METHOD } from '../../common';
 import { PERMISSIONS_API, PERMISSIONS_CONTROLLER } from '../permissions.api';
-import { PersistedPermissionSchema } from '../permission.model';
-import { PermissionResponseSchema } from '../permission.response.schema';
+import { PermissionWithTranslationsSchema } from '../permission.models';
 
-const CreatePermissionContractRequestSchema = PersistedPermissionSchema.omit({
+const CreatePermissionContractRequestSchema = PermissionWithTranslationsSchema.omit({
   id: true,
   createdAt: true,
   updatedAt: true,
@@ -18,6 +17,6 @@ export namespace CreatePermissionContract {
   export const RequestSchema = CreatePermissionContractRequestSchema;
   export type TRequest = z.infer<typeof RequestSchema>;
 
-  export const ResponseSchema = PermissionResponseSchema;
+  export const ResponseSchema = PermissionWithTranslationsSchema;
   export type TResponse = z.infer<typeof ResponseSchema>;
 }

package/permissions/contracts/delete-permission.contract.ts

@@ -1,13 +1,13 @@
 import { z } from 'zod';
 import { HTTP_METHOD } from '../../common';
-import { PersistedPermissionSchema } from '../permission.model';
 import { PERMISSIONS_API, PERMISSIONS_CONTROLLER } from '../permissions.api';
+import { PermissionWithTranslationsSchema } from '../permission.models';
 
 export namespace DeletePermissionContract {
   export const getUrl = PERMISSIONS_API.delete;
   export const endpoint = PERMISSIONS_CONTROLLER.endpoints.delete;
   export const httpMethod = HTTP_METHOD.delete;
 
-  export const ResponseSchema = PersistedPermissionSchema;
+  export const ResponseSchema = PermissionWithTranslationsSchema;
   export type TResponse = z.infer<typeof ResponseSchema>;
 }

package/permissions/contracts/find-many-permission.contract.ts

@@ -3,25 +3,25 @@ import {
   HTTP_METHOD,
   CommonQueryParamsSchema,
   PaginationResponseSchema,
-  LANGUAGE_VALUES,
+  LANGUAGE_KYES,
 } from '../../common';
-import { PersistedPermissionSchema } from '../permission.model';
+import { PermissionListItemSchema } from '../permission.models';
 import { PERMISSIONS_API, PERMISSIONS_CONTROLLER } from '../permissions.api';
 
-const BaseQuerySchema = PersistedPermissionSchema.pick({
+const BaseQuerySchema = PermissionListItemSchema.pick({
   subject: true,
   action: true,
 }).partial();
 
-const OrderBySchema = PersistedPermissionSchema.keyof().optional();
+const OrderBySchema = PermissionListItemSchema.keyof().optional();
 
 const FindManyPermissionsContractRequestSchema = BaseQuerySchema.merge(
   CommonQueryParamsSchema,
-).extend({ orderBy: OrderBySchema, lang: z.enum(LANGUAGE_VALUES).optional() });
+).extend({ orderBy: OrderBySchema, lang: z.enum(LANGUAGE_KYES).optional() });
 
 const FindManyPermissionsContractResponseSchema = z
   .object({
-    permissions: z.array(PersistedPermissionSchema),
+    permissions: z.array(PermissionListItemSchema),
   })
   .merge(PaginationResponseSchema);
 

package/permissions/contracts/find-permission.contract.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { HTTP_METHOD } from '../../common';
-import { PersistedPermissionSchema } from '../permission.model';
+import { PermissionWithTranslationsSchema } from '../permission.models';
 import { PERMISSIONS_API, PERMISSIONS_CONTROLLER } from '../permissions.api';
 
 // const FindPermissionContractResponseSchema = PersistedPermissionSchema.transform(
@@ -16,6 +16,6 @@ export namespace FindPermissionContract {
   export const httpMethod = HTTP_METHOD.get;
 
   // export const ResponseSchema = FindPermissionContractResponseSchema;
-  export const ResponseSchema = PersistedPermissionSchema;
+  export const ResponseSchema = PermissionWithTranslationsSchema;
   export type TResponse = z.infer<typeof ResponseSchema>;
 }

package/permissions/contracts/update-permission.contract.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { HTTP_METHOD } from '../../common';
-import { PersistedPermissionSchema } from '../permission.model';
+import { PermissionWithTranslationsSchema } from '../permission.models';
 import { PERMISSIONS_API, PERMISSIONS_CONTROLLER } from '../permissions.api';
 import { CreatePermissionContract } from './create-permission.contract';
 
@@ -12,6 +12,6 @@ export namespace UpdatePermissionContract {
   export const RequestSchema = CreatePermissionContract.RequestSchema;
   export type TRequest = z.infer<typeof RequestSchema>;
 
-  export const ResponseSchema = PersistedPermissionSchema;
+  export const ResponseSchema = PermissionWithTranslationsSchema;
   export type TResponse = z.infer<typeof ResponseSchema>;
 }

package/permissions/index.ts

@@ -1,3 +1,3 @@
-export * from './permission.model';
+export * from './permission.models';
 export * from './permissions.api';
 export * from './contracts';

package/permissions/{permission.model.ts → permission.models.ts}

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { AppAbility, LanguageValuesSchema, TimestampSchema } from '../common';
+import { AppAbility, TranslationsSchema, TimestampSchema } from '../common';
 
 export const JsonConditionsSchema = z
   .string()
@@ -22,14 +22,7 @@ export const JsonConditionsSchema = z
 export const PersistedPermissionSchema = z
   .object({
     id: z.number({ invalid_type_error: 'idInvalid' }).positive({ message: 'idMustBePositive' }),
-    name_i18n: z
-      .record(
-        LanguageValuesSchema,
-        z.string().transform(s => s.trim()),
-      )
-      .refine(val => Object.values(val).some(str => str.length > 0), {
-        message: 'atLeastOneTranslationRequired',
-      }),
+
     action: z.nativeEnum(AppAbility.ACTION, {
       invalid_type_error: 'actionInvalid',
       required_error: 'actionRequired',
@@ -41,4 +34,13 @@ export const PersistedPermissionSchema = z
     conditions: JsonConditionsSchema,
   })
   .merge(TimestampSchema);
+
 export type TPersistedPermission = z.infer<typeof PersistedPermissionSchema>;
+
+export const PermissionWithTranslationsSchema = PersistedPermissionSchema.merge(TranslationsSchema);
+export type TPermissionWithTranslations = z.infer<typeof PermissionWithTranslationsSchema>;
+
+export const PermissionListItemSchema = PersistedPermissionSchema.extend({
+  name: z.string(),
+});
+export type TPermissionListItem = z.infer<typeof PermissionListItemSchema>;

package/permissions/permission.response.schema.ts

@@ -1,4 +1,4 @@
-import { PersistedPermissionSchema } from './permission.model';
+import { PersistedPermissionSchema } from './permission.models';
 
 export const PermissionResponseSchema = PersistedPermissionSchema.transform(
   ({ conditions, ...rest }) => ({

package/build/common/models/language-values.schema.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LanguageValuesSchema = void 0;
-const zod_1 = require("zod");
-const constants_1 = require("../constants");
-exports.LanguageValuesSchema = zod_1.z.enum(constants_1.LANGUAGE_VALUES);

package/common/models/language-values.schema.ts

@@ -1,4 +0,0 @@
-import { z } from 'zod';
-import { LANGUAGE_VALUES } from '../constants';
-
-export const LanguageValuesSchema = z.enum(LANGUAGE_VALUES);