@boostercloud/framework-provider-azure 4.0.0 → 4.0.2

package/dist/helpers/query-helper.js

@@ -16,6 +16,7 @@ async function replaceOrDeleteItem(cosmosDb, container, config, id, partitionKey
         await cosmosDb.database(config.resourceNames.applicationStack).container(container).item(id, partitionKey).delete();
     }
 }
+const DEFAULT_PAGE_SIZE = 100;
 async function search(cosmosDb, config, containerName, filters, limit, afterCursor, paginatedVersion = false, order, projections = '*') {
     const logger = (0, framework_common_helpers_1.getLogger)(config, 'query-helper#search');
     const filterExpression = buildFilterExpression(filters);
@@ -38,20 +39,22 @@ async function search(cosmosDb, config, containerName, filters, limit, afterCurs
         const hasLegacyCursor = typeof (afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.id) === 'string' && /^\d+$/.test(afterCursor.id);
         // Use Cosmos DB's continuation token pagination
         const feedOptions = {};
-        if (limit) {
-            feedOptions.maxItemCount = limit;
-        }
         // Extract continuation token from the cursor (backward compatibility)
         if (afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.continuationToken) {
             feedOptions.continuationToken = afterCursor.continuationToken;
         }
-        else if (!canUseContinuationToken || hasLegacyCursor) {
+        // Azure Cosmos DB requires maxItemCount when using continuation tokens
+        // Always set maxItemCount in the continuation token path to ensure consistent page sizes
+        if (limit || (afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.continuationToken) || canUseContinuationToken) {
+            feedOptions.maxItemCount = limit !== null && limit !== void 0 ? limit : DEFAULT_PAGE_SIZE;
+        }
+        if (!(afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.continuationToken) && (!canUseContinuationToken || hasLegacyCursor)) {
             // Legacy cursor format - fallback to OFFSET for backward compatibility
-            const offset = (afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.id) ? parseInt(afterCursor.id) : 0;
-            let legacyQuery = `${finalQuery} OFFSET ${offset}`;
-            if (limit) {
-                legacyQuery += ` LIMIT ${limit} `;
-            }
+            const parsedLegacyId = (afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.id) ? parseInt(afterCursor.id, 10) : NaN;
+            const offset = Number.isFinite(parsedLegacyId) ? parsedLegacyId : 0;
+            // Azure Cosmos DB requires LIMIT when using OFFSET
+            const effectiveLimit = limit !== null && limit !== void 0 ? limit : DEFAULT_PAGE_SIZE;
+            const legacyQuery = `${finalQuery} OFFSET ${offset} LIMIT ${effectiveLimit} `;
             const legacyQuerySpec = { ...querySpec, query: legacyQuery };
             const { resources } = await container.items.query(legacyQuerySpec).fetchAll();
             const processedResources = processResources(resources);
@@ -59,20 +62,24 @@ async function search(cosmosDb, config, containerName, filters, limit, afterCurs
                 items: processedResources !== null && processedResources !== void 0 ? processedResources : [],
                 count: processedResources.length,
                 cursor: {
-                    id: (offset + processedResources.length).toString(),
+                    id: (offset + effectiveLimit).toString(),
                 },
             };
         }
         const queryIterator = container.items.query(querySpec, feedOptions);
         const { resources, continuationToken } = await queryIterator.fetchNext();
         const finalResources = processResources(resources || []);
+        // cursor.id advances by the page size (limit) to maintain consistent page-based offsets
+        // that frontends rely on (e.g., limit=5 produces cursors 5, 10 ,15, ...)
+        const parsedId = (afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.id) ? parseInt(afterCursor.id, 10) : NaN;
+        const previousOffset = Number.isFinite(parsedId) ? parsedId : 0;
+        const effectiveLimit = limit !== null && limit !== void 0 ? limit : DEFAULT_PAGE_SIZE;
         let cursor;
         if (continuationToken) {
-            cursor = { continuationToken };
+            cursor = { continuationToken, id: (previousOffset + effectiveLimit).toString() };
         }
         else if (finalResources.length > 0) {
-            const currentOffset = (afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.id) && !isNaN(parseInt(afterCursor.id)) ? parseInt(afterCursor.id) : 0;
-            cursor = { id: (currentOffset + finalResources.length).toString() }; // Use the length of the results to calculate the next id
+            cursor = { id: (previousOffset + effectiveLimit).toString() };
         }
         return {
             items: finalResources,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boostercloud/framework-provider-azure",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Handle Booster's integration with Azure",
   "keywords": [
     "framework-provider-azure"
@@ -25,16 +25,16 @@
   "dependencies": {
     "@azure/cosmos": "^4.3.0",
     "@azure/functions": "^4.0.0",
-    "@azure/identity": "~4.7.0",
+    "@azure/identity": "~4.13.0",
     "@azure/event-hubs": "5.11.1",
-    "@boostercloud/framework-common-helpers": "^4.0.0",
-    "@boostercloud/framework-types": "^4.0.0",
+    "@boostercloud/framework-common-helpers": "^4.0.2",
+    "@boostercloud/framework-types": "^4.0.2",
     "tslib": "^2.4.0",
     "@effect-ts/core": "^0.60.4",
     "@azure/web-pubsub": "~1.1.0"
   },
   "devDependencies": {
-    "@boostercloud/eslint-config": "^4.0.0",
+    "@boostercloud/eslint-config": "^4.0.2",
     "@types/chai": "4.2.18",
     "@types/chai-as-promised": "7.1.4",
     "@types/faker": "5.1.5",