@strapi/utils 4.0.0 → 4.0.1

package/lib/convert-query-params.js

@@ -110,6 +110,8 @@ const convertLimitQueryParams = limitQuery => {
     throw new Error(`convertLimitQueryParams expected a positive integer got ${limitAsANumber}`);
   }
 
+  if (limitAsANumber === -1) return null;
+
   return limitAsANumber;
 };
 

package/lib/pagination.js

@@ -27,7 +27,7 @@ const withMaxLimit = (limit, maxLimit = -1) => {
 // Ensure minimum page & pageSize values (page >= 1, pageSize >= 0, start >= 0, limit >= 0)
 const ensureMinValues = ({ start, limit }) => ({
   start: Math.max(start, 0),
-  limit: Math.max(limit, 1),
+  limit: limit === -1 ? limit : Math.max(limit, 1),
 });
 
 const ensureMaxValues = (maxLimit = -1) => ({ start, limit }) => ({
@@ -35,6 +35,12 @@ const ensureMaxValues = (maxLimit = -1) => ({ start, limit }) => ({
   limit: withMaxLimit(limit, maxLimit),
 });
 
+// Apply maxLimit as the limit when limit is -1
+const withNoLimit = (pagination, maxLimit = -1) => ({
+  ...pagination,
+  limit: pagination.limit === -1 ? maxLimit : pagination.limit,
+});
+
 const withDefaultPagination = (args, { defaults = {}, maxLimit = -1 } = {}) => {
   const defaultValues = merge(STRAPI_DEFAULTS, defaults);
 
@@ -67,7 +73,10 @@ const withDefaultPagination = (args, { defaults = {}, maxLimit = -1 } = {}) => {
 
   // Page / PageSize
   if (usePagePagination) {
-    const { page, pageSize } = merge(defaultValues.page, args);
+    const { page, pageSize } = merge(defaultValues.page, {
+      ...args,
+      pageSize: Math.max(1, args.pageSize),
+    });
 
     Object.assign(pagination, {
       start: (page - 1) * pageSize,
@@ -75,6 +84,9 @@ const withDefaultPagination = (args, { defaults = {}, maxLimit = -1 } = {}) => {
     });
   }
 
+  // Handle -1 limit
+  Object.assign(pagination, withNoLimit(pagination, maxLimit));
+
   const replacePaginationAttributes = pipe(
     // Remove pagination attributes
     omit(paginationAttributes),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/utils",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Shared utilities for the Strapi packages",
   "keywords": [
     "strapi",
@@ -31,6 +31,9 @@
   "directories": {
     "lib": "./lib"
   },
+  "scripts": {
+    "test:unit": "jest --verbose"
+  },
   "dependencies": {
     "@sindresorhus/slugify": "1.1.0",
     "date-fns": "2.24.0",
@@ -42,5 +45,5 @@
     "node": ">=12.x.x <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "b181702f0202b2c6d645d42b195a831f25cd0b03"
+  "gitHead": "e2cd01e8c6cbfeba15ad7787e38b6eebcbb92221"
 }