hh-contracts 0.0.25 → 0.0.27

package/build/common/models/pagination.schema.js

@@ -1,14 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PaginationSchema = void 0;
+exports.PaginationRequestSchema = exports.PaginationResponseSchema = void 0;
 const zod_1 = require("zod");
 const constants_1 = require("../constants");
-exports.PaginationSchema = zod_1.z.object({
-    page: zod_1.z.coerce.number().positive().default(constants_1.DEFAULT_PAGINATION_CONFIG.page),
+exports.PaginationResponseSchema = zod_1.z.object({
+    page: zod_1.z.coerce.number().positive(),
+    pageSize: zod_1.z.coerce.number().positive(),
+    total: zod_1.z.coerce.number().nonnegative(),
+});
+exports.PaginationRequestSchema = zod_1.z.object({
+    page: zod_1.z.coerce.number().positive().optional().default(constants_1.DEFAULT_PAGINATION_CONFIG.page),
     pageSize: zod_1.z.coerce
         .number()
         .positive()
+        .optional()
         .default(constants_1.DEFAULT_PAGINATION_CONFIG.pageSize)
         .transform(val => Math.min(val, constants_1.DEFAULT_PAGINATION_CONFIG.maxPageSize)),
-    total: zod_1.z.coerce.number().nonnegative(),
 });

package/build/common/models/search.schema.js

@@ -2,10 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SearchSchema = void 0;
 const zod_1 = require("zod");
-const pagination_schema_1 = require("./pagination.schema");
-exports.SearchSchema = pagination_schema_1.PaginationSchema.pick({
-    page: true,
-    pageSize: true,
-}).extend({
+exports.SearchSchema = zod_1.z.object({
     searchText: zod_1.z.string().min(1).optional(),
 });

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

@@ -17,12 +17,13 @@ const OrderBySchema = permission_model_1.PermissionSchema.pick({
     .optional();
 const FindManyPermissionsContractRequestSchema = BaseQuerySchema.extend({ orderBy: OrderBySchema })
     .merge(common_1.OrderSchema)
-    .merge(common_1.SearchSchema);
+    .merge(common_1.SearchSchema)
+    .merge(common_1.PaginationRequestSchema);
 const FindManyPermissionsContractResponseSchema = zod_1.z
     .object({
     permissions: zod_1.z.array(permission_model_1.PermissionSchema),
 })
-    .merge(common_1.PaginationSchema);
+    .merge(common_1.PaginationResponseSchema);
 var FindManyPermissionsContract;
 (function (FindManyPermissionsContract) {
     FindManyPermissionsContract.getUrl = permissions_api_1.PERMISSIONS_API.findMany;

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

@@ -9,5 +9,8 @@ var 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 = permission_model_1.PermissionSchema;
+    FindPermissionContract.ResponseSchema = permission_model_1.PermissionSchema.transform((conditions, ...permission) => ({
+        ...permission,
+        conditions: conditions === null ? undefined : conditions,
+    }));
 })(FindPermissionContract || (exports.FindPermissionContract = FindPermissionContract = {}));

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

@@ -9,7 +9,7 @@ var UpdatePermissionContract;
 (function (UpdatePermissionContract) {
     UpdatePermissionContract.getUrl = permissions_api_1.PERMISSIONS_API.update;
     UpdatePermissionContract.endpoint = permissions_api_1.PERMISSIONS_CONTROLLER.endpoints.update;
-    UpdatePermissionContract.httpMethod = common_1.HTTP_METHOD.patch;
-    UpdatePermissionContract.RequestSchema = create_permission_contract_1.CreatePermissionContract.RequestSchema.partial();
+    UpdatePermissionContract.httpMethod = common_1.HTTP_METHOD.put;
+    UpdatePermissionContract.RequestSchema = create_permission_contract_1.CreatePermissionContract.RequestSchema;
     UpdatePermissionContract.ResponseSchema = permission_model_1.PermissionSchema;
 })(UpdatePermissionContract || (exports.UpdatePermissionContract = UpdatePermissionContract = {}));

package/common/models/pagination.schema.ts

@@ -1,12 +1,18 @@
 import { z } from 'zod';
 import { DEFAULT_PAGINATION_CONFIG } from '../constants';
 
-export const PaginationSchema = z.object({
-  page: z.coerce.number().positive().default(DEFAULT_PAGINATION_CONFIG.page),
+export const PaginationResponseSchema = z.object({
+  page: z.coerce.number().positive(),
+  pageSize: z.coerce.number().positive(),
+  total: z.coerce.number().nonnegative(),
+});
+
+export const PaginationRequestSchema = z.object({
+  page: z.coerce.number().positive().optional().default(DEFAULT_PAGINATION_CONFIG.page),
   pageSize: z.coerce
     .number()
     .positive()
+    .optional()
     .default(DEFAULT_PAGINATION_CONFIG.pageSize)
     .transform(val => Math.min(val, DEFAULT_PAGINATION_CONFIG.maxPageSize)),
-  total: z.coerce.number().nonnegative(),
 });

package/common/models/search.schema.ts

@@ -1,9 +1,5 @@
 import { z } from 'zod';
-import { PaginationSchema } from './pagination.schema';
 
-export const SearchSchema = PaginationSchema.pick({
-  page: true,
-  pageSize: true,
-}).extend({
+export const SearchSchema = z.object({
   searchText: z.string().min(1).optional(),
 });

package/package.json

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

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

@@ -1,5 +1,11 @@
 import { z } from 'zod';
-import { HTTP_METHOD, OrderSchema, PaginationSchema, SearchSchema } from '../../common';
+import {
+  HTTP_METHOD,
+  OrderSchema,
+  PaginationRequestSchema,
+  PaginationResponseSchema,
+  SearchSchema,
+} from '../../common';
 import { PermissionSchema } from '../permission.model';
 import { PERMISSIONS_API, PERMISSIONS_CONTROLLER } from '../permissions.api';
 
@@ -15,13 +21,14 @@ const OrderBySchema = PermissionSchema.pick({
   .optional();
 const FindManyPermissionsContractRequestSchema = BaseQuerySchema.extend({ orderBy: OrderBySchema })
   .merge(OrderSchema)
-  .merge(SearchSchema);
+  .merge(SearchSchema)
+  .merge(PaginationRequestSchema);
 
 const FindManyPermissionsContractResponseSchema = z
   .object({
     permissions: z.array(PermissionSchema),
   })
-  .merge(PaginationSchema);
+  .merge(PaginationResponseSchema);
 
 export namespace FindManyPermissionsContract {
   export const getUrl = PERMISSIONS_API.findMany;

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

@@ -8,6 +8,9 @@ export namespace FindPermissionContract {
   export const endpoint = PERMISSIONS_CONTROLLER.endpoints.find;
   export const httpMethod = HTTP_METHOD.get;
 
-  export const ResponseSchema = PermissionSchema;
+  export const ResponseSchema = PermissionSchema.transform((conditions, ...permission) => ({
+    ...permission,
+    conditions: conditions === null ? undefined : conditions,
+  }));
   export type TResponse = z.infer<typeof ResponseSchema>;
 }

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

@@ -7,9 +7,9 @@ import { CreatePermissionContract } from './create-permission.contract';
 export namespace UpdatePermissionContract {
   export const getUrl = PERMISSIONS_API.update;
   export const endpoint = PERMISSIONS_CONTROLLER.endpoints.update;
-  export const httpMethod = HTTP_METHOD.patch;
+  export const httpMethod = HTTP_METHOD.put;
 
-  export const RequestSchema = CreatePermissionContract.RequestSchema.partial();
+  export const RequestSchema = CreatePermissionContract.RequestSchema;
   export type TRequest = z.infer<typeof RequestSchema>;
 
   export const ResponseSchema = PermissionSchema;