hh-contracts 0.0.33 → 0.0.35

package/build/common/constants/index.js

@@ -15,10 +15,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./app-ability.constant"), exports);
+__exportStar(require("./app-error.constant"), exports);
+__exportStar(require("./locales.constant"), exports);
 __exportStar(require("./default-pagination-config.constant"), exports);
 __exportStar(require("./http-method.constant"), exports);
 __exportStar(require("./icon-key.constant"), exports);
 __exportStar(require("./navigation-item-type.constant"), exports);
 __exportStar(require("./order-direction.constant"), exports);
 __exportStar(require("./route-component-key.constants"), exports);
-__exportStar(require("./app-error.constant"), exports);

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

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LANGUAGE_VALUES = exports.LANGUAGE = void 0;
+const icon_key_constant_1 = require("./icon-key.constant");
+exports.LANGUAGE = {
+    en: {
+        value: 'en',
+        label: 'English',
+        flag: icon_key_constant_1.ICON_KEY.flagGB,
+        locale: 'en-US',
+        postgressLocale: 'en_US',
+    },
+    ru: {
+        value: 'ru',
+        label: 'Русский',
+        flag: icon_key_constant_1.ICON_KEY.flagRU,
+        locale: 'ru-RU',
+        postgressLocale: 'ru_RU',
+    },
+};
+exports.LANGUAGE_VALUES = Object.keys(exports.LANGUAGE);

package/build/common/models/index.js

@@ -23,3 +23,4 @@ __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);

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

@@ -0,0 +1,6 @@
+"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/build/permissions/contracts/create-permission.contract.js

@@ -1,32 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreatePermissionContract = void 0;
-const zod_1 = require("zod");
 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.PermissionSchema.omit({
+const CreatePermissionContractRequestSchema = permission_model_1.PersistedPermissionSchema.omit({
     id: true,
     createdAt: true,
     updatedAt: true,
-}).extend({
-    conditions: zod_1.z
-        .string()
-        .transform(val => (val === '' ? undefined : val))
-        .optional()
-        .nullable()
-        .refine(val => {
-        if (val === undefined || val === null)
-            return true;
-        try {
-            JSON.parse(val);
-            return true;
-        }
-        catch {
-            return false;
-        }
-    }, { message: 'invalidJson' }),
 });
 var CreatePermissionContract;
 (function (CreatePermissionContract) {

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

@@ -9,5 +9,5 @@ var 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.PermissionSchema;
+    DeletePermissionContract.ResponseSchema = permission_model_1.PersistedPermissionSchema;
 })(DeletePermissionContract || (exports.DeletePermissionContract = DeletePermissionContract = {}));

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

@@ -5,15 +5,15 @@ const zod_1 = require("zod");
 const common_1 = require("../../common");
 const permission_model_1 = require("../permission.model");
 const permissions_api_1 = require("../permissions.api");
-const BaseQuerySchema = permission_model_1.PermissionSchema.pick({
+const BaseQuerySchema = permission_model_1.PersistedPermissionSchema.pick({
     subject: true,
     action: true,
 }).partial();
-const OrderBySchema = permission_model_1.PermissionSchema.keyof().optional();
-const FindManyPermissionsContractRequestSchema = BaseQuerySchema.merge(common_1.CommonQueryParamsSchema).extend({ orderBy: OrderBySchema });
+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 FindManyPermissionsContractResponseSchema = zod_1.z
     .object({
-    permissions: zod_1.z.array(permission_model_1.PermissionSchema),
+    permissions: zod_1.z.array(permission_model_1.PersistedPermissionSchema),
 })
     .merge(common_1.PaginationResponseSchema);
 var FindManyPermissionsContract;

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

@@ -4,14 +4,17 @@ exports.FindPermissionContract = void 0;
 const common_1 = require("../../common");
 const permission_model_1 = require("../permission.model");
 const permissions_api_1 = require("../permissions.api");
-const FindPermissionContractResponseSchema = permission_model_1.PermissionSchema.transform(({ conditions, ...permission }) => ({
-    ...permission,
-    conditions: conditions === null ? undefined : conditions,
-}));
+// const FindPermissionContractResponseSchema = PersistedPermissionSchema.transform(
+//   ({ conditions, ...permission }) => ({
+//     ...permission,
+//     conditions: conditions === null ? undefined : conditions,
+//   }),
+// );
 var FindPermissionContract;
 (function (FindPermissionContract) {
     FindPermissionContract.getUrl = permissions_api_1.PERMISSIONS_API.find;
     FindPermissionContract.endpoint = permissions_api_1.PERMISSIONS_CONTROLLER.endpoints.find;
     FindPermissionContract.httpMethod = common_1.HTTP_METHOD.get;
-    FindPermissionContract.ResponseSchema = FindPermissionContractResponseSchema;
+    // export const ResponseSchema = FindPermissionContractResponseSchema;
+    FindPermissionContract.ResponseSchema = permission_model_1.PersistedPermissionSchema;
 })(FindPermissionContract || (exports.FindPermissionContract = FindPermissionContract = {}));

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

@@ -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.PermissionSchema;
+    UpdatePermissionContract.ResponseSchema = permission_model_1.PersistedPermissionSchema;
 })(UpdatePermissionContract || (exports.UpdatePermissionContract = UpdatePermissionContract = {}));

package/build/permissions/permission.model.js

@@ -1,16 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PermissionSchema = void 0;
+exports.PersistedPermissionSchema = exports.JsonConditionsSchema = void 0;
 const zod_1 = require("zod");
 const common_1 = require("../common");
-exports.PermissionSchema = zod_1.z
+exports.JsonConditionsSchema = zod_1.z
+    .string()
+    .transform(val => (val === '' ? undefined : val))
+    .optional()
+    .nullable()
+    .refine(val => {
+    if (val === undefined || val === null)
+        return true;
+    try {
+        JSON.parse(val);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}, { message: 'invalidJson' });
+exports.PersistedPermissionSchema = zod_1.z
     .object({
     id: zod_1.z.number({ invalid_type_error: 'idInvalid' }).positive({ message: 'idMustBePositive' }),
-    name: zod_1.z
-        .string({ required_error: 'nameRequired' })
-        .trim()
-        .min(1, { message: 'nameRequired' })
-        .max(50, { message: 'nameTooLong' }),
+    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',
@@ -19,6 +35,6 @@ exports.PermissionSchema = zod_1.z
         invalid_type_error: 'subjectInvalid',
         required_error: 'subjectRequired',
     }),
-    conditions: zod_1.z.string().optional().nullable(),
+    conditions: exports.JsonConditionsSchema,
 })
     .merge(common_1.TimestampSchema);

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

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

package/common/constants/index.ts

@@ -1,8 +1,9 @@
 export * from './app-ability.constant';
+export * from './app-error.constant';
+export * from './locales.constant';
 export * from './default-pagination-config.constant';
 export * from './http-method.constant';
 export * from './icon-key.constant';
 export * from './navigation-item-type.constant';
 export * from './order-direction.constant';
 export * from './route-component-key.constants';
-export * from './app-error.constant';

package/common/constants/locales.constant.ts

@@ -0,0 +1,25 @@
+import { ICON_KEY } from './icon-key.constant';
+
+export const LANGUAGE = {
+  en: {
+    value: 'en',
+    label: 'English',
+    flag: ICON_KEY.flagGB,
+    locale: 'en-US',
+    postgressLocale: 'en_US',
+  } as const,
+  ru: {
+    value: 'ru',
+    label: 'Русский',
+    flag: ICON_KEY.flagRU,
+    locale: 'ru-RU',
+    postgressLocale: 'ru_RU',
+  } as const,
+} as const;
+
+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[]];

package/common/models/index.ts

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

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

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

package/package.json

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

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

@@ -1,31 +1,13 @@
 import { z } from 'zod';
 import { HTTP_METHOD } from '../../common';
 import { PERMISSIONS_API, PERMISSIONS_CONTROLLER } from '../permissions.api';
-import { PermissionSchema } from '../permission.model';
+import { PersistedPermissionSchema } from '../permission.model';
 import { PermissionResponseSchema } from '../permission.response.schema';
 
-const CreatePermissionContractRequestSchema = PermissionSchema.omit({
+const CreatePermissionContractRequestSchema = PersistedPermissionSchema.omit({
   id: true,
   createdAt: true,
   updatedAt: true,
-}).extend({
-  conditions: z
-    .string()
-    .transform(val => (val === '' ? undefined : val))
-    .optional()
-    .nullable()
-    .refine(
-      val => {
-        if (val === undefined || val === null) return true;
-        try {
-          JSON.parse(val);
-          return true;
-        } catch {
-          return false;
-        }
-      },
-      { message: 'invalidJson' },
-    ),
 });
 
 export namespace CreatePermissionContract {

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

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

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

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

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

@@ -1,20 +1,21 @@
 import { z } from 'zod';
 import { HTTP_METHOD } from '../../common';
-import { PermissionSchema } from '../permission.model';
+import { PersistedPermissionSchema } from '../permission.model';
 import { PERMISSIONS_API, PERMISSIONS_CONTROLLER } from '../permissions.api';
 
-const FindPermissionContractResponseSchema = PermissionSchema.transform(
-  ({ conditions, ...permission }) => ({
-    ...permission,
-    conditions: conditions === null ? undefined : conditions,
-  }),
-);
+// const FindPermissionContractResponseSchema = PersistedPermissionSchema.transform(
+//   ({ conditions, ...permission }) => ({
+//     ...permission,
+//     conditions: conditions === null ? undefined : conditions,
+//   }),
+// );
 
 export namespace FindPermissionContract {
   export const getUrl = PERMISSIONS_API.find;
   export const endpoint = PERMISSIONS_CONTROLLER.endpoints.find;
   export const httpMethod = HTTP_METHOD.get;
 
-  export const ResponseSchema = FindPermissionContractResponseSchema;
+  // export const ResponseSchema = FindPermissionContractResponseSchema;
+  export const ResponseSchema = PersistedPermissionSchema;
   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 { PermissionSchema } from '../permission.model';
+import { PersistedPermissionSchema } from '../permission.model';
 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 = PermissionSchema;
+  export const ResponseSchema = PersistedPermissionSchema;
   export type TResponse = z.infer<typeof ResponseSchema>;
 }

package/permissions/permission.model.ts

@@ -1,14 +1,35 @@
 import { z } from 'zod';
-import { AppAbility, TimestampSchema } from '../common';
+import { AppAbility, LanguageValuesSchema, TimestampSchema } from '../common';
 
-export const PermissionSchema = z
+export const JsonConditionsSchema = z
+  .string()
+  .transform(val => (val === '' ? undefined : val))
+  .optional()
+  .nullable()
+  .refine(
+    val => {
+      if (val === undefined || val === null) return true;
+      try {
+        JSON.parse(val);
+        return true;
+      } catch {
+        return false;
+      }
+    },
+    { message: 'invalidJson' },
+  );
+
+export const PersistedPermissionSchema = z
   .object({
     id: z.number({ invalid_type_error: 'idInvalid' }).positive({ message: 'idMustBePositive' }),
-    name: z
-      .string({ required_error: 'nameRequired' })
-      .trim()
-      .min(1, { message: 'nameRequired' })
-      .max(50, { message: 'nameTooLong' }),
+    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',
@@ -17,7 +38,7 @@ export const PermissionSchema = z
       invalid_type_error: 'subjectInvalid',
       required_error: 'subjectRequired',
     }),
-    conditions: z.string().optional().nullable(),
+    conditions: JsonConditionsSchema,
   })
   .merge(TimestampSchema);
-export type TPersistedPermission = z.infer<typeof PermissionSchema>;
+export type TPersistedPermission = z.infer<typeof PersistedPermissionSchema>;

package/permissions/permission.response.schema.ts

@@ -1,6 +1,8 @@
-import { PermissionSchema } from './permission.model';
+import { PersistedPermissionSchema } from './permission.model';
 
-export const PermissionResponseSchema = PermissionSchema.transform(({ conditions, ...rest }) => ({
-  ...rest,
-  conditions: conditions ? JSON.parse(conditions) : undefined,
-}));
+export const PermissionResponseSchema = PersistedPermissionSchema.transform(
+  ({ conditions, ...rest }) => ({
+    ...rest,
+    conditions: conditions ? JSON.parse(conditions) : undefined,
+  }),
+);