ag-common 0.0.726 → 0.0.727

package/dist/api/helpers/dynamo.d.ts

@@ -27,7 +27,6 @@ interface ScanOptions {
      */
     filter?: DynamoFilter;
     requiredAttributeList?: string[];
-    limit?: number;
 }
 interface DynamoQueryParams {
     tableName: string;
@@ -57,7 +56,10 @@ export declare const batchDelete: (params: {
     pkName: string;
 }) => Promise<DynamoDBResult<void>>;
 export declare const scan: <T>(tableName: string, options?: ScanOptions) => Promise<DynamoDBResult<T[]>>;
-export declare function scanWithGenerator<T>(tableName: string, options?: ScanOptions): AsyncGenerator<T[], void, unknown>;
+export declare function scanWithGenerator<T>(tableName: string, options?: ScanOptions & {
+    /** how many to return in scan generator. default 100 */
+    BATCH_SIZE?: number;
+}): AsyncGenerator<T[], void, unknown>;
 export declare const getItemsDynamo: <T>(params: {
     tableName: string;
     items: {

package/dist/api/helpers/dynamo.js

@@ -131,7 +131,7 @@ const scan = (tableName, options) => __awaiter(void 0, void 0, void 0, function*
         }, {});
         const expressionAttributeNames = Object.assign(Object.assign({}, projectionAttrs), (_b = options === null || options === void 0 ? void 0 : options.filter) === null || _b === void 0 ? void 0 : _b.attrNames);
         do {
-            const params = new lib_dynamodb_1.ScanCommand(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ TableName: tableName }, ((options === null || options === void 0 ? void 0 : options.filter) && Object.assign({ FilterExpression: options.filter.filterExpression }, (options.filter.attrValues && {
+            const params = new lib_dynamodb_1.ScanCommand(Object.assign(Object.assign(Object.assign(Object.assign({ TableName: tableName }, ((options === null || options === void 0 ? void 0 : options.filter) && Object.assign({ FilterExpression: options.filter.filterExpression }, (options.filter.attrValues && {
                 ExpressionAttributeValues: options.filter.attrValues,
             })))), (Object.keys(expressionAttributeNames).length > 0 && {
                 ExpressionAttributeNames: expressionAttributeNames,
@@ -139,22 +139,14 @@ const scan = (tableName, options) => __awaiter(void 0, void 0, void 0, function*
                 ProjectionExpression: options.requiredAttributeList
                     .map((_, index) => `#proj${index}`)
                     .join(', '),
-            })), { ExclusiveStartKey }), ((options === null || options === void 0 ? void 0 : options.limit) &&
-                Items.length < options.limit && {
-                Limit: options.limit - Items.length,
-            })));
+            })), { ExclusiveStartKey }));
             const result = yield withRetry(() => exports.dynamoDb.send(params), 'scan');
             if (result.Items) {
                 Items.push(...result.Items);
             }
             ExclusiveStartKey = result.LastEvaluatedKey;
-            if ((options === null || options === void 0 ? void 0 : options.limit) && Items.length >= options.limit) {
-                break;
-            }
         } while (ExclusiveStartKey);
-        return {
-            data: (options === null || options === void 0 ? void 0 : options.limit) ? Items.slice(0, options.limit) : Items,
-        };
+        return { data: Items };
     }
     catch (e) {
         return { error: e.toString() };
@@ -163,17 +155,16 @@ const scan = (tableName, options) => __awaiter(void 0, void 0, void 0, function*
 exports.scan = scan;
 function scanWithGenerator(tableName, options) {
     return __asyncGenerator(this, arguments, function* scanWithGenerator_1() {
-        var _a, _b;
-        const BATCH_SIZE = 25;
+        var _a, _b, _c;
+        const BATCH_SIZE = (_a = options === null || options === void 0 ? void 0 : options.BATCH_SIZE) !== null && _a !== void 0 ? _a : 100;
         let items = [];
         let exclusiveStartKey;
-        let totalItems = 0;
         try {
-            const projectionAttrs = (_a = options === null || options === void 0 ? void 0 : options.requiredAttributeList) === null || _a === void 0 ? void 0 : _a.reduce((acc, attr, index) => {
+            const projectionAttrs = (_b = options === null || options === void 0 ? void 0 : options.requiredAttributeList) === null || _b === void 0 ? void 0 : _b.reduce((acc, attr, index) => {
                 acc[`#proj${index}`] = attr;
                 return acc;
             }, {});
-            const expressionAttributeNames = Object.assign(Object.assign({}, projectionAttrs), (_b = options === null || options === void 0 ? void 0 : options.filter) === null || _b === void 0 ? void 0 : _b.attrNames);
+            const expressionAttributeNames = Object.assign(Object.assign({}, projectionAttrs), (_c = options === null || options === void 0 ? void 0 : options.filter) === null || _c === void 0 ? void 0 : _c.attrNames);
             do {
                 const params = new lib_dynamodb_1.ScanCommand(Object.assign(Object.assign(Object.assign(Object.assign({ TableName: tableName, Limit: BATCH_SIZE }, ((options === null || options === void 0 ? void 0 : options.filter) && Object.assign({ FilterExpression: options.filter.filterExpression }, (options.filter.attrValues && {
                     ExpressionAttributeValues: options.filter.attrValues,
@@ -191,30 +182,14 @@ function scanWithGenerator(tableName, options) {
                     while (items.length >= BATCH_SIZE) {
                         const batch = items.slice(0, BATCH_SIZE);
                         items = items.slice(BATCH_SIZE);
-                        totalItems += batch.length;
-                        // If we've reached the limit, yield the final batch and return
-                        if ((options === null || options === void 0 ? void 0 : options.limit) && totalItems >= options.limit) {
-                            const remainingCount = options.limit - (totalItems - batch.length);
-                            yield yield __await(batch.slice(0, remainingCount));
-                            return yield __await(void 0);
-                        }
                         yield yield __await(batch);
                     }
                 }
                 exclusiveStartKey = result.LastEvaluatedKey;
-            } while (exclusiveStartKey &&
-                (!(options === null || options === void 0 ? void 0 : options.limit) || totalItems < options.limit));
+            } while (exclusiveStartKey);
             // Yield any remaining items
             if (items.length > 0) {
-                if (options === null || options === void 0 ? void 0 : options.limit) {
-                    const remainingCount = options.limit - totalItems;
-                    if (remainingCount > 0) {
-                        yield yield __await(items.slice(0, remainingCount));
-                    }
-                }
-                else {
-                    yield yield __await(items);
-                }
+                yield yield __await(items);
             }
         }
         catch (e) {

package/package.json

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