@remnawave/backend-contract 0.0.38 → 0.0.40

package/build/commands/users/get-all-users-v2.command.js

@@ -7,27 +7,27 @@ const users_schema_1 = require("../../models/users.schema");
 var GetAllUsersV2Command;
 (function (GetAllUsersV2Command) {
     GetAllUsersV2Command.url = api_1.REST_API.USERS.GET_ALL_V2;
+    const FilterSchema = zod_1.z.object({
+        id: zod_1.z.string(),
+        value: zod_1.z.string(),
+    });
+    const SortingSchema = zod_1.z.object({
+        id: zod_1.z.string(),
+        desc: zod_1.z.boolean(),
+    });
+    // Основная схема для запроса
     GetAllUsersV2Command.RequestQuerySchema = zod_1.z.object({
         start: zod_1.z.coerce.number().optional(),
         size: zod_1.z.coerce.number().optional(),
         filters: zod_1.z
-            .string()
-            .transform((str) => JSON.parse(str))
-            .pipe(zod_1.z.array(zod_1.z.object({
-            id: zod_1.z.string(),
-            value: zod_1.z.string(),
-        })))
+            .preprocess((str) => (typeof str === 'string' ? JSON.parse(str) : str), zod_1.z.array(FilterSchema))
             .optional(),
         filterModes: zod_1.z
-            .string()
-            .transform((str) => JSON.parse(str))
-            .pipe(zod_1.z.record(zod_1.z.string(), zod_1.z.string()))
+            .preprocess((str) => (typeof str === 'string' ? JSON.parse(str) : str), zod_1.z.record(zod_1.z.string(), zod_1.z.string()))
             .optional(),
         globalFilterMode: zod_1.z.string().optional(),
         sorting: zod_1.z
-            .string()
-            .transform((str) => JSON.parse(str))
-            .pipe(zod_1.z.array(zod_1.z.object({ id: zod_1.z.string(), desc: zod_1.z.boolean() })))
+            .preprocess((str) => (typeof str === 'string' ? JSON.parse(str) : str), zod_1.z.array(SortingSchema))
             .optional(),
     });
     GetAllUsersV2Command.ResponseSchema = zod_1.z.object({

package/commands/users/get-all-users-v2.command.ts

@@ -5,31 +5,40 @@ import { UsersSchema } from '../../models/users.schema';
 export namespace GetAllUsersV2Command {
     export const url = REST_API.USERS.GET_ALL_V2;
 
+    const FilterSchema = z.object({
+        id: z.string(),
+        value: z.string(),
+    });
+
+    const SortingSchema = z.object({
+        id: z.string(),
+        desc: z.boolean(),
+    });
+
+    // Основная схема для запроса
     export const RequestQuerySchema = z.object({
         start: z.coerce.number().optional(),
         size: z.coerce.number().optional(),
         filters: z
-            .string()
-            .transform((str) => JSON.parse(str))
-            .pipe(
-                z.array(
-                    z.object({
-                        id: z.string(),
-                        value: z.string(),
-                    }),
-                ),
+            .preprocess(
+                (str) => (typeof str === 'string' ? JSON.parse(str) : str),
+                z.array(FilterSchema),
             )
             .optional(),
+
         filterModes: z
-            .string()
-            .transform((str) => JSON.parse(str))
-            .pipe(z.record(z.string(), z.string()))
+            .preprocess(
+                (str) => (typeof str === 'string' ? JSON.parse(str) : str),
+                z.record(z.string(), z.string()),
+            )
             .optional(),
         globalFilterMode: z.string().optional(),
+
         sorting: z
-            .string()
-            .transform((str) => JSON.parse(str))
-            .pipe(z.array(z.object({ id: z.string(), desc: z.boolean() })))
+            .preprocess(
+                (str) => (typeof str === 'string' ? JSON.parse(str) : str),
+                z.array(SortingSchema),
+            )
             .optional(),
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remnawave/backend-contract",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "description": "A contract library for Remnawave",
   "main": "index.js",
   "scripts": {