@anywayseo/gatsby-plugin 6.2.0 → 6.3.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@anywayseo/gatsby-plugin",
   "description": "Shared config for Anywayseo sites",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "author": "zerg41",
   "license": "MIT",
   "publishConfig": {
@@ -29,12 +29,12 @@
   },
   "dependencies": {
     "commonmark": "0.31.2",
-    "qs": "6.14.0"
+    "qs": "6.15.3"
   },
   "devDependencies": {
     "@types/commonmark": "0.27.10",
     "@types/node": "^20.0.0",
-    "@types/qs": "6.14.0",
+    "@types/qs": "6.15.1",
     "rimraf": "^6.0.1",
     "typescript": "^5.0.0"
   },

package/utils/strapi-source/strapi-content/fetch-entities.js

@@ -19,36 +19,30 @@ const helpers_1 = require("./helpers");
 const utils_1 = require("./utils");
 function fetchEntities(_a, schemas_1, strapiClient_1, reporter_1) {
     return __awaiter(this, arguments, void 0, function* ({ endpoint, queryParams, uid }, schemas, strapiClient, reporter) {
-        var _b, _c, _d, _e;
-        const params = (0, helpers_1.convertQueryParameters)(queryParams);
-        const query = qs_1.default.stringify(params, { encodeValuesOnly: true });
-        const path = `${endpoint}?${query}`;
-        reporter.info(`Starting to fetch ${endpoint} with ${query}`);
+        var _b, _c;
+        const isPaginated = Boolean(queryParams.pagination);
+        const pageSize = Math.min((_c = (_b = queryParams.pagination) === null || _b === void 0 ? void 0 : _b.pageSize) !== null && _c !== void 0 ? _c : utils_1.DEFAULT_PAGE_SIZE, utils_1.MAX_PAGE_SIZE);
+        const data = [];
+        let page = utils_1.INITIAL_PAGE;
         try {
-            const result = yield strapiClient.fetch(path);
-            const data = (0, utils_1.castArray)(result.data);
-            if (result.meta.pagination) {
-                const page = (_b = result.meta.pagination.page) !== null && _b !== void 0 ? _b : 1;
-                const pageCount = (_c = result.meta.pagination.pageCount) !== null && _c !== void 0 ? _c : 1;
-                const pagesToGet = Array.from({ length: pageCount - page }).map((_, index) => index + page + 1);
-                for (const pageToGet of pagesToGet) {
-                    const params = (0, helpers_1.convertQueryParameters)(Object.assign(Object.assign({}, queryParams), { pagination: {
-                            pageSize: (_e = (_d = queryParams.pagination) === null || _d === void 0 ? void 0 : _d.pageSize) !== null && _e !== void 0 ? _e : utils_1.DEFAULT_PAGE_SIZE,
-                            page: pageToGet,
-                        } }));
-                    const query = qs_1.default.stringify(params, { encodeValuesOnly: true });
-                    const path = `${endpoint}?${query}`;
-                    reporter.info(`Starting to fetch next page (${pageToGet}) of ${endpoint}`);
-                    try {
-                        const pageResult = yield strapiClient.fetch(path);
-                        if (pageResult.data) {
-                            data.push(pageResult.data);
-                        }
-                    }
-                    catch (error) {
-                        continue;
-                    }
+            while (true) {
+                const params = (0, helpers_1.convertQueryParameters)(Object.assign(Object.assign({}, queryParams), (isPaginated && { pagination: { pageSize, page } })));
+                const query = qs_1.default.stringify(params, { encodeValuesOnly: true });
+                const path = `${endpoint}?${query}`;
+                reporter.info(page === utils_1.INITIAL_PAGE
+                    ? `Starting to fetch ${endpoint} with ${query}`
+                    : `Starting to fetch next page (${page}) of ${endpoint}`);
+                const result = yield strapiClient.fetch(path);
+                const currentPageData = (0, utils_1.castArray)(result.data);
+                const currentPageSize = currentPageData.length;
+                data.push(...currentPageData);
+                // Strapi's meta.pagination.total/pageCount can't be trusted (some instances report 0
+                // regardless of actual content), so keep paging until a response comes back short of a
+                // full page rather than relying on that count.
+                if (!isPaginated || currentPageSize < pageSize) {
+                    break;
                 }
+                page += 1;
             }
             const entities = data.map((entity) => (0, clean_entity_1.cleanEntity)(entity, uid, schemas));
             return entities;

package/utils/strapi-source/strapi-content/utils.d.ts

@@ -1,5 +1,7 @@
 export declare const STRAPI_ID_PROPERTY = "strapi_id";
 export declare const DEFAULT_PAGE_SIZE = 25;
+export declare const MAX_PAGE_SIZE = 100;
+export declare const INITIAL_PAGE = 1;
 export declare function castArray<T>(value: T | T[]): T[];
 export declare function toSnakeCase(str?: string): string;
 export declare function pick<T extends Record<string, any>>(obj: T, keys: string[]): Partial<T>;

package/utils/strapi-source/strapi-content/utils.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_PAGE_SIZE = exports.STRAPI_ID_PROPERTY = void 0;
+exports.INITIAL_PAGE = exports.MAX_PAGE_SIZE = exports.DEFAULT_PAGE_SIZE = exports.STRAPI_ID_PROPERTY = void 0;
 exports.castArray = castArray;
 exports.toSnakeCase = toSnakeCase;
 exports.pick = pick;
 exports.STRAPI_ID_PROPERTY = 'strapi_id';
 exports.DEFAULT_PAGE_SIZE = 25;
+exports.MAX_PAGE_SIZE = 100;
+exports.INITIAL_PAGE = 1;
 function castArray(value) {
     return Array.isArray(value) ? value : [value];
 }