ag-common 0.0.805 → 0.0.807

package/dist/api/helpers/dynamo/get.js

@@ -136,8 +136,7 @@ const queryDynamo = (params) => __awaiter(void 0, void 0, void 0, function* () {
             }
             lastEvaluatedKey = result.LastEvaluatedKey;
             // If limit is undefined, we stop after one query (default to single page).
-            // This satisfies: "other never endlessly query" (unless limit is -1).
-            if (params.limit === undefined || params.limit === null) {
+            if (params.limit === undefined) {
                 break;
             }
             // If limit is > 0 and we've reached it, stop processing
@@ -169,9 +168,8 @@ const scan = (tableName, options) => __awaiter(void 0, void 0, void 0, function*
             if ((options === null || options === void 0 ? void 0 : options.limit) === undefined) {
                 break;
             }
-            if ((options === null || options === void 0 ? void 0 : options.limit) &&
-                options.limit > 0 &&
-                Items.length >= options.limit) {
+            const limit = options.limit;
+            if (limit > 0 && Items.length >= limit) {
                 return {
                     data: Items.slice(0, options.limit),
                     lastEvaluatedKey: ExclusiveStartKey,
@@ -245,7 +243,7 @@ const batchQueryDynamo = (params) => __awaiter(void 0, void 0, void 0, function*
             allItems.push(...result.data);
             totalProcessed += result.data.length;
             // If we have a limit and we've reached it, stop processing
-            if (params.limit && totalProcessed >= params.limit) {
+            if (params.limit && params.limit > 0 && totalProcessed >= params.limit) {
                 return {
                     data: allItems.slice(0, params.limit),
                 };
@@ -305,7 +303,7 @@ const executePartiQLQuery = (params) => __awaiter(void 0, void 0, void 0, functi
             }
             nextToken = result.NextToken;
             // If we have a limit and we've reached it, stop processing
-            if (params.limit && allItems.length >= params.limit) {
+            if (params.limit && params.limit > 0 && allItems.length >= params.limit) {
                 return {
                     data: allItems.slice(0, params.limit),
                 };
@@ -321,8 +319,10 @@ const executePartiQLQuery = (params) => __awaiter(void 0, void 0, void 0, functi
 });
 function queryWithGenerator(params) {
     return __asyncGenerator(this, arguments, function* queryWithGenerator_1() {
-        var _a;
-        const limit = (_a = params.limit) !== null && _a !== void 0 ? _a : 100;
+        let limit = undefined;
+        if (params.limit && params.limit !== -1) {
+            limit = params.limit;
+        }
         let items = [];
         let lastEvaluatedKey = params.exclusiveStartKey;
         try {
@@ -333,12 +333,17 @@ function queryWithGenerator(params) {
                     // Process items in chunks of BATCH_SIZE
                     if (!limit) {
                         yield yield __await(items);
-                        return yield __await(void 0);
+                        items = [];
+                        if (params.limit !== -1) {
+                            return yield __await(void 0);
+                        }
                     }
-                    while (items.length >= limit) {
-                        const batch = items.slice(0, limit);
-                        items = items.slice(limit);
-                        yield yield __await(batch);
+                    else {
+                        while (items.length >= limit) {
+                            const batch = items.slice(0, limit);
+                            items = items.slice(limit);
+                            yield yield __await(batch);
+                        }
                     }
                 }
                 lastEvaluatedKey = result.LastEvaluatedKey;
@@ -355,8 +360,10 @@ function queryWithGenerator(params) {
 }
 function scanWithGenerator(tableName, options) {
     return __asyncGenerator(this, arguments, function* scanWithGenerator_1() {
-        var _a;
-        const limit = (_a = options === null || options === void 0 ? void 0 : options.limit) !== null && _a !== void 0 ? _a : 100;
+        let limit = undefined;
+        if ((options === null || options === void 0 ? void 0 : options.limit) && options.limit !== -1) {
+            limit = options.limit;
+        }
         let items = [];
         let exclusiveStartKey;
         try {
@@ -367,12 +374,17 @@ function scanWithGenerator(tableName, options) {
                     // Process items in chunks of limit
                     if (!limit) {
                         yield yield __await(items);
-                        return yield __await(void 0);
+                        items = [];
+                        if ((options === null || options === void 0 ? void 0 : options.limit) !== -1) {
+                            return yield __await(void 0);
+                        }
                     }
-                    while (items.length >= limit) {
-                        const batch = items.slice(0, limit);
-                        items = items.slice(limit);
-                        yield yield __await(batch);
+                    else {
+                        while (items.length >= limit) {
+                            const batch = items.slice(0, limit);
+                            items = items.slice(limit);
+                            yield yield __await(batch);
+                        }
                     }
                 }
                 exclusiveStartKey = result.LastEvaluatedKey;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.805",
+  "version": "0.0.807",
   "name": "ag-common",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",