@boostercloud/framework-provider-azure 3.4.1 → 3.4.3

package/dist/helpers/query-helper.js

@@ -21,45 +21,92 @@ async function search(cosmosDb, config, containerName, filters, limit, afterCurs
     const filterExpression = buildFilterExpression(filters);
     const projectionsExpression = buildProjections(projections);
     const queryDefinition = `SELECT ${projectionsExpression} FROM c ${filterExpression !== '' ? `WHERE ${filterExpression}` : filterExpression}`;
-    const queryWithOrder = queryDefinition + buildOrderExpression(order);
-    let finalQuery = queryWithOrder;
-    if (paginatedVersion && limit) {
-        finalQuery += ` OFFSET ${(afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.id) || 0} LIMIT ${limit} `;
-    }
-    else {
-        if (limit) {
-            finalQuery += ` OFFSET 0 LIMIT ${limit} `;
-        }
-    }
+    const finalQuery = queryDefinition + buildOrderExpression(order);
     const querySpec = {
         query: finalQuery,
         parameters: buildExpressionAttributeValues(filters),
     };
     logger.debug('Running search with the following params: \n', JSON.stringify(querySpec));
-    let { resources } = await cosmosDb
-        .database(config.resourceNames.applicationStack)
-        .container(containerName)
-        .items.query(querySpec)
-        .fetchAll();
-    resources = nestProperties(resources);
-    resources = resources.map((resource) => ({
-        ...resource,
-        boosterMetadata: {
-            ...resource.boosterMetadata,
-            optimisticConcurrencyValue: resource._etag,
-        },
-    }));
+    const container = cosmosDb.database(config.resourceNames.applicationStack).container(containerName);
     if (paginatedVersion) {
+        const isDistinctQuery = /SELECT\s+DISTINCT\s+/i.test(finalQuery);
+        // Azure Cosmos DB continuation token compatibility rules:
+        // - Regular queries: Always use continuation tokens
+        // - DISTINCT queries: Always use OFFSET/LIMIT fallback (continuation tokens unreliable even with ORDER BY)
+        // - Legacy cursors: Numeric cursor.id values must use OFFSET/LIMIT for backward compatibility
+        const canUseContinuationToken = !isDistinctQuery;
+        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) {
+            // 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 legacyQuerySpec = { ...querySpec, query: legacyQuery };
+            const { resources } = await container.items.query(legacyQuerySpec).fetchAll();
+            const processedResources = processResources(resources);
+            return {
+                items: processedResources !== null && processedResources !== void 0 ? processedResources : [],
+                count: processedResources.length,
+                cursor: {
+                    id: (offset + processedResources.length).toString(),
+                },
+            };
+        }
+        const queryIterator = container.items.query(querySpec, feedOptions);
+        const { resources, continuationToken } = await queryIterator.fetchNext();
+        const finalResources = processResources(resources || []);
+        let cursor;
+        if (continuationToken) {
+            cursor = { continuationToken };
+        }
+        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
+        }
         return {
-            items: resources !== null && resources !== void 0 ? resources : [],
-            count: resources.length,
-            cursor: { id: ((limit ? limit : 1) + ((afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.id) ? parseInt(afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.id) : 0)).toString() },
+            items: finalResources,
+            count: finalResources.length,
+            cursor,
         };
     }
     else {
-        return resources !== null && resources !== void 0 ? resources : [];
+        // Non-paginated version - apply limit but fetch all results
+        let finalQueryForNonPaginated = finalQuery;
+        if (limit) {
+            finalQueryForNonPaginated += ` OFFSET 0 LIMIT ${limit} `;
+        }
+        const nonPaginatedQuerySpec = { ...querySpec, query: finalQueryForNonPaginated };
+        const { resources } = await container.items.query(nonPaginatedQuerySpec).fetchAll();
+        const processedResources = processResources(resources);
+        return processedResources !== null && processedResources !== void 0 ? processedResources : [];
     }
 }
+/**
+ * Processes raw Cosmos DB resources by nesting properties and adding Booster metadata
+ * @param resources - The raw resources to process
+ * @returns An array of processed resources with nested properties and Booster metadata
+ */
+function processResources(resources) {
+    const nestedResources = nestProperties(resources);
+    return nestedResources.map((resource) => ({
+        ...resource,
+        boosterMetadata: {
+            ...resource.boosterMetadata,
+            optimisticConcurrencyValue: resource._etag,
+        },
+    }));
+}
 function buildFilterExpression(filters, usedPlaceholders = []) {
     return Object.entries(filters)
         .map(([propName, filter]) => {

package/package.json

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