@boostercloud/framework-provider-azure 3.4.3-debug.3 → 3.4.3-debug.5

package/dist/helpers/query-helper.js

@@ -46,28 +46,35 @@ async function search(cosmosDb, config, containerName, filters, limit, afterCurs
         });
         // Use Cosmos DB's continuation token pagination
         const feedOptions = {};
-        if (limit) {
-            feedOptions.maxItemCount = limit;
-        }
+        // Track cumulative offset for cursor.id calculation
+        let cumulativeOffset = 0;
         // Extract continuation token from the cursor (backward compatibility)
         if (afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.continuationToken) {
             feedOptions.continuationToken = afterCursor.continuationToken;
+            // Extract cumulative id from cursor for tracking position across pages
+            cumulativeOffset = afterCursor.id && !isNaN(parseInt(afterCursor.id)) ? parseInt(afterCursor.id) : 0;
             logger.debug('PAGINATION DEBUG - Using provided continuation token:', {
                 continuationToken: afterCursor.continuationToken,
+                cumulativeOffset,
                 feedOptions,
             });
         }
-        else if (!canUseContinuationToken || hasLegacyCursor) {
+        // Azure Cosmos DB requires maxItemCount when using continuation tokens
+        // Always set maxItemCount when limit is provided or when using continuation token
+        if (limit || (afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.continuationToken)) {
+            feedOptions.maxItemCount = limit !== null && limit !== void 0 ? limit : 100;
+        }
+        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} `;
-            }
+            // Azure Cosmos DB requires LIMIT when using OFFSET
+            const effectiveLimit = limit !== null && limit !== void 0 ? limit : 100;
+            const legacyQuery = `${finalQuery} OFFSET ${offset} LIMIT ${effectiveLimit} `;
             const legacyQuerySpec = { ...querySpec, query: legacyQuery };
             logger.debug('PAGINATION DEBUG - Using LEGACY OFFSET/LIMIT approach:', {
                 reason: !canUseContinuationToken ? 'DISTINCT query detected' : 'Legacy numeric cursor detected',
                 offset,
+                effectiveLimit,
                 legacyQuery,
                 legacyQuerySpec,
             });
@@ -99,13 +106,24 @@ async function search(cosmosDb, config, containerName, filters, limit, afterCurs
         const finalResources = processResources(resources || []);
         let cursor;
         if (continuationToken) {
-            cursor = { continuationToken };
-            logger.debug('PAGINATION DEBUG - Setting cursor with continuation token:', cursor);
+            // Store both continuation token AND cumulative id for proper position tracking
+            const newCumulativeId = cumulativeOffset + finalResources.length;
+            cursor = { continuationToken, id: newCumulativeId.toString() };
+            logger.debug('PAGINATION DEBUG - Setting cursor with continuation token:', {
+                cursor,
+                previousOffset: cumulativeOffset,
+                currentPageSize: finalResources.length,
+                newCumulativeId,
+            });
         }
         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
-            logger.debug('PAGINATION DEBUG - No continuation token, setting fallback cursor:', cursor);
+            // Last page - use cumulative offset for final cursor position
+            cursor = { id: (cumulativeOffset + finalResources.length).toString() };
+            logger.debug('PAGINATION DEBUG - No continuation token, setting fallback cursor:', {
+                cursor,
+                previousOffset: cumulativeOffset,
+                currentPageSize: finalResources.length,
+            });
         }
         else {
             logger.debug('PAGINATION DEBUG - No continuation token and no resources, no cursor set');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boostercloud/framework-provider-azure",
-  "version": "3.4.3-debug.3",
+  "version": "3.4.3-debug.5",
   "description": "Handle Booster's integration with Azure",
   "keywords": [
     "framework-provider-azure"