fix: query limit should be used even if maxLimit = NO_PAGINATION (#959)

ppetzold · Aug 26, 2024 · deae15f · deae15f
1 parent 0d20ff4
commit deae15f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/paginate.spec.ts b/src/paginate.spec.ts
@@ -340,20 +340,19 @@ describe('paginate', () => {
         expect(result.data).toStrictEqual(cats)
     })
 
-    it('should limit to defaultLimit, if limit is differt FROM NO_PAGINATION ecc....', async () => {
+    it('should limit to query limit, even if maxLimit is set to NO_PAGINATION', async () => {
         const config: PaginateConfig<CatEntity> = {
             sortableColumns: ['id'],
             maxLimit: PaginationLimit.NO_PAGINATION,
-            defaultLimit: 1,
         }
         const query: PaginateQuery = {
             path: '',
-            limit: -2,
+            limit: 2,
         }
 
         const result = await paginate<CatEntity>(query, catRepo, config)
 
-        expect(result.data).toStrictEqual(cats.slice(0, 1))
+        expect(result.meta.itemsPerPage).toBe(2)
     })
 
     it('should default to limit defaultLimit, if maxLimit is NO_PAGINATION', async () => {

diff --git a/src/paginate.ts b/src/paginate.ts
@@ -197,8 +197,10 @@ export async function paginate<T extends ObjectLiteral>(
     const limit =
         query.limit === PaginationLimit.COUNTER_ONLY
             ? PaginationLimit.COUNTER_ONLY
-            : isPaginated
-            ? query.limit === PaginationLimit.NO_PAGINATION || maxLimit === PaginationLimit.NO_PAGINATION
+            : isPaginated === true
+            ? maxLimit === PaginationLimit.NO_PAGINATION
+                ? query.limit ?? defaultLimit
+                : query.limit === PaginationLimit.NO_PAGINATION
                 ? defaultLimit
                 : Math.min(query.limit ?? defaultLimit, maxLimit)
             : defaultLimit