fix: merge limitless and page query schemas

Author: vladjerca

projects/api/src/contracts/_internal/request/limitlessQuerySchema.ts

@@ -1,5 +1,10 @@
 import { z } from '../z.ts';
 
 export const limitlessQuerySchema = z.object({
-  limit: z.literal('all').optional(),
+  limit: z.number()
+    .int()
+    .or(z.literal('all'))
+    .optional().openapi({
+      description: 'The number of items per page',
+    }),
 });

projects/api/src/contracts/lists/index.ts

@@ -36,7 +36,8 @@ const ENTITY_LEVEL = builder.router({
       ),
     query: extendedMediaQuerySchema
       .merge(mediaFilterParamsSchema)
-      .and(pageQuerySchema.or(limitlessQuerySchema)),
+      .merge(pageQuerySchema)
+      .merge(limitlessQuerySchema),
     responses: {
       200: z.union([listedMovieResponseSchema, listedShowResponseSchema])
         .array(),

projects/api/src/contracts/movies/index.ts

@@ -145,7 +145,8 @@ const ENTITY_LEVEL = builder.router({
     path: '/comments/:sort',
     method: 'GET',
     query: extendedProfileQuerySchema
-      .and(pageQuerySchema.or(limitlessQuerySchema)),
+      .merge(pageQuerySchema)
+      .merge(limitlessQuerySchema),
     pathParams: idParamsSchema.merge(commentsSortParamsSchema),
     responses: {
       200: commentResponseSchema.array(),

projects/api/src/contracts/shows/index.ts

@@ -105,7 +105,8 @@ const EPISODE_LEVEL = builder.router({
       .merge(episodeParamsSchema)
       .merge(commentsSortParamsSchema),
     query: extendedProfileQuerySchema
-      .and(pageQuerySchema.or(limitlessQuerySchema)),
+      .merge(pageQuerySchema)
+      .merge(limitlessQuerySchema),
     responses: {
       200: commentResponseSchema.array(),
     },

projects/api/src/contracts/users/index.ts

@@ -51,7 +51,8 @@ const GLOBAL_LEVEL = builder.router({
       path: '/likes/comments',
       method: 'GET',
       query: extendedQuerySchemaFactory<['comments', 'min', 'full', 'images']>()
-        .and(pageQuerySchema.or(limitlessQuerySchema)),
+        .merge(pageQuerySchema)
+        .merge(limitlessQuerySchema),
       responses: {
         200: likedCommentResponseSchema.array(),
       },
@@ -60,7 +61,8 @@ const GLOBAL_LEVEL = builder.router({
       path: '/likes/lists',
       method: 'GET',
       query: extendedQuerySchemaFactory<['comments', 'min', 'full', 'images']>()
-        .and(pageQuerySchema.or(limitlessQuerySchema)),
+        .merge(pageQuerySchema)
+        .merge(limitlessQuerySchema),
       responses: {
         200: likedListResponseSchema.array(),
       },

projects/api/src/contracts/users/subroutes/userLists.ts

@@ -45,7 +45,8 @@ const list = builder.router({
     query: extendedMediaQuerySchema
       .merge(sortQuerySchema)
       .merge(mediaFilterParamsSchema)
-      .and(pageQuerySchema.or(limitlessQuerySchema)),
+      .merge(pageQuerySchema)
+      .merge(limitlessQuerySchema),
     responses: {
       200: z.union([listedMovieResponseSchema, listedShowResponseSchema])
         .array(),