hh-contracts 0.0.30 → 0.0.31

package/build/common/models/common-query-params.schema.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommonQueryParamsSchema = void 0;
+const order_schema_1 = require("./order.schema");
+const pagination_schema_1 = require("./pagination.schema");
+const search_schema_1 = require("./search.schema");
+exports.CommonQueryParamsSchema = order_schema_1.OrderSchema.merge(search_schema_1.SearchSchema).merge(pagination_schema_1.PaginationRequestSchema);

package/build/common/models/index.js

@@ -14,6 +14,7 @@ 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("./common-query-params.schema"), exports);
 __exportStar(require("./icon-key.schema"), exports);
 __exportStar(require("./info.schema"), exports);
 __exportStar(require("./json.schema"), exports);

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

@@ -9,16 +9,8 @@ const BaseQuerySchema = permission_model_1.PermissionSchema.pick({
     subject: true,
     action: true,
 }).partial();
-const OrderBySchema = permission_model_1.PermissionSchema.pick({
-    name: true,
-    subject: true,
-})
-    .keyof()
-    .optional();
-const FindManyPermissionsContractRequestSchema = BaseQuerySchema.extend({ orderBy: OrderBySchema })
-    .merge(common_1.OrderSchema)
-    .merge(common_1.SearchSchema)
-    .merge(common_1.PaginationRequestSchema);
+const OrderBySchema = permission_model_1.PermissionSchema.keyof().optional();
+const FindManyPermissionsContractRequestSchema = BaseQuerySchema.merge(common_1.CommonQueryParamsSchema).extend({ orderBy: OrderBySchema });
 const FindManyPermissionsContractResponseSchema = zod_1.z
     .object({
     permissions: zod_1.z.array(permission_model_1.PermissionSchema),
@@ -29,6 +21,7 @@ var FindManyPermissionsContract;
     FindManyPermissionsContract.getUrl = permissions_api_1.PERMISSIONS_API.findMany;
     FindManyPermissionsContract.endpoint = permissions_api_1.PERMISSIONS_CONTROLLER.endpoints.findMany;
     FindManyPermissionsContract.httpMethod = common_1.HTTP_METHOD.get;
+    FindManyPermissionsContract.BaseFilter = BaseQuerySchema;
     FindManyPermissionsContract.RequestSchema = FindManyPermissionsContractRequestSchema;
     FindManyPermissionsContract.ResponseSchema = FindManyPermissionsContractResponseSchema;
 })(FindManyPermissionsContract || (exports.FindManyPermissionsContract = FindManyPermissionsContract = {}));

package/common/models/common-query-params.schema.ts

@@ -0,0 +1,8 @@
+import { z } from 'zod';
+import { OrderSchema } from './order.schema';
+import { PaginationRequestSchema } from './pagination.schema';
+import { SearchSchema } from './search.schema';
+
+export const CommonQueryParamsSchema =
+  OrderSchema.merge(SearchSchema).merge(PaginationRequestSchema);
+export type TCommonQueryParams = z.infer<typeof CommonQueryParamsSchema>;

package/common/models/index.ts

@@ -1,3 +1,4 @@
+export * from './common-query-params.schema';
 export * from './icon-key.schema';
 export * from './info.schema';
 export * from './json.schema';

package/package.json

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

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

@@ -1,11 +1,5 @@
 import { z } from 'zod';
-import {
-  HTTP_METHOD,
-  OrderSchema,
-  PaginationRequestSchema,
-  PaginationResponseSchema,
-  SearchSchema,
-} from '../../common';
+import { HTTP_METHOD, CommonQueryParamsSchema, PaginationResponseSchema } from '../../common';
 import { PermissionSchema } from '../permission.model';
 import { PERMISSIONS_API, PERMISSIONS_CONTROLLER } from '../permissions.api';
 
@@ -13,16 +7,12 @@ const BaseQuerySchema = PermissionSchema.pick({
   subject: true,
   action: true,
 }).partial();
-const OrderBySchema = PermissionSchema.pick({
-  name: true,
-  subject: true,
-})
-  .keyof()
-  .optional();
-const FindManyPermissionsContractRequestSchema = BaseQuerySchema.extend({ orderBy: OrderBySchema })
-  .merge(OrderSchema)
-  .merge(SearchSchema)
-  .merge(PaginationRequestSchema);
+
+const OrderBySchema = PermissionSchema.keyof().optional();
+
+const FindManyPermissionsContractRequestSchema = BaseQuerySchema.merge(
+  CommonQueryParamsSchema,
+).extend({ orderBy: OrderBySchema });
 
 const FindManyPermissionsContractResponseSchema = z
   .object({
@@ -35,6 +25,9 @@ export namespace FindManyPermissionsContract {
   export const endpoint = PERMISSIONS_CONTROLLER.endpoints.findMany;
   export const httpMethod = HTTP_METHOD.get;
 
+  export const BaseFilter = BaseQuerySchema;
+  export type TBaseFilter = z.infer<typeof BaseFilter>;
+
   export const RequestSchema = FindManyPermissionsContractRequestSchema;
   export type TRequest = z.infer<typeof RequestSchema>;