ag-common 0.0.722 → 0.0.724

package/dist/api/helpers/dynamo.js

@@ -156,26 +156,42 @@ const batchDelete = (_a) => __awaiter(void 0, [_a], void 0, function* ({ tableNa
 });
 exports.batchDelete = batchDelete;
 const scan = (tableName, opt) => __awaiter(void 0, void 0, void 0, function* () {
+    var _b, _c;
     try {
         let ExclusiveStartKey;
         let Items = [];
+        // Handle projection attributes
+        const projectionAttrs = (_b = opt === null || opt === void 0 ? void 0 : opt.requiredAttributeList) === null || _b === void 0 ? void 0 : _b.reduce((acc, attr, index) => {
+            const escapedName = `#proj${index}`;
+            acc[escapedName] = attr;
+            return acc;
+        }, {});
+        // Merge projection attribute names with filter attribute names
+        const expressionAttributeNames = Object.assign(Object.assign({}, projectionAttrs), (_c = opt === null || opt === void 0 ? void 0 : opt.filter) === null || _c === void 0 ? void 0 : _c.attrNames);
         do {
-            let params = new lib_dynamodb_1.ScanCommand(Object.assign(Object.assign(Object.assign(Object.assign({ TableName: tableName }, ((opt === null || opt === void 0 ? void 0 : opt.filter) && Object.assign({ FilterExpression: opt.filter.filterExpression, ExpressionAttributeNames: opt.filter.attrNames }, (opt.filter.attrValues && {
+            const params = new lib_dynamodb_1.ScanCommand(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ TableName: tableName }, ((opt === null || opt === void 0 ? void 0 : opt.filter) && Object.assign({ FilterExpression: opt.filter.filterExpression }, (opt.filter.attrValues && {
                 ExpressionAttributeValues: opt.filter.attrValues,
-            })))), ((opt === null || opt === void 0 ? void 0 : opt.requiredAttributeList) && {
-                ProjectionExpression: opt.requiredAttributeList.join(', '),
-            })), { ExclusiveStartKey }), ((opt === null || opt === void 0 ? void 0 : opt.limit) && { Limit: opt.limit })));
+            })))), (Object.keys(expressionAttributeNames).length > 0 && {
+                ExpressionAttributeNames: expressionAttributeNames,
+            })), ((opt === null || opt === void 0 ? void 0 : opt.requiredAttributeList) && {
+                ProjectionExpression: opt.requiredAttributeList
+                    .map((_, index) => `#proj${index}`)
+                    .join(', '),
+            })), { ExclusiveStartKey }), (((opt === null || opt === void 0 ? void 0 : opt.limit) && Items.length < opt.limit) && {
+                Limit: opt.limit - Items.length
+            })));
             (0, log_1.debug)(`running dynamo scan=${JSON.stringify(params, null, 2)}`);
-            const { Items: newitems, LastEvaluatedKey,
-            // eslint-disable-next-line no-await-in-loop
-             } = yield exports.dynamoDb.send(params);
+            const { Items: newItems = [], LastEvaluatedKey, } = yield exports.dynamoDb.send(params);
             ExclusiveStartKey = LastEvaluatedKey;
-            if (newitems) {
-                Items.push(...newitems.map((r) => r));
+            Items.push(...newItems);
+            // Break the loop if we've reached the limit
+            if ((opt === null || opt === void 0 ? void 0 : opt.limit) && Items.length >= opt.limit) {
+                break;
             }
-        } while (ExclusiveStartKey && (!(opt === null || opt === void 0 ? void 0 : opt.limit) || Items.length < opt.limit));
-        if (opt === null || opt === void 0 ? void 0 : opt.limit) {
-            ({ part: Items } = (0, array_1.take)(Items, opt.limit));
+        } while (ExclusiveStartKey);
+        // Ensure we don't return more items than the limit
+        if ((opt === null || opt === void 0 ? void 0 : opt.limit) && Items.length > opt.limit) {
+            Items = Items.slice(0, opt.limit);
         }
         (0, log_1.debug)(`dynamo scan against ${tableName} ok, count=${Items.length}`);
         return { data: Items };
@@ -186,8 +202,8 @@ const scan = (tableName, opt) => __awaiter(void 0, void 0, void 0, function* ()
     }
 });
 exports.scan = scan;
-const getItemsDynamo = (_b) => __awaiter(void 0, [_b], void 0, function* ({ tableName, items, }) {
-    var _c, _d;
+const getItemsDynamo = (_d) => __awaiter(void 0, [_d], void 0, function* ({ tableName, items, }) {
+    var _e, _f;
     const params = new lib_dynamodb_1.BatchGetCommand({
         RequestItems: {
             [tableName]: {
@@ -199,7 +215,7 @@ const getItemsDynamo = (_b) => __awaiter(void 0, [_b], void 0, function* ({ tabl
     });
     try {
         let res = yield exports.dynamoDb.send(params);
-        let data = (_d = (_c = res.Responses) === null || _c === void 0 ? void 0 : _c[tableName].map((r) => r)) !== null && _d !== void 0 ? _d : [];
+        let data = (_f = (_e = res.Responses) === null || _e === void 0 ? void 0 : _e[tableName].map((r) => r)) !== null && _f !== void 0 ? _f : [];
         return { data };
     }
     catch (e) {
@@ -209,7 +225,7 @@ const getItemsDynamo = (_b) => __awaiter(void 0, [_b], void 0, function* ({ tabl
     }
 });
 exports.getItemsDynamo = getItemsDynamo;
-const getItemDynamo = (_e) => __awaiter(void 0, [_e], void 0, function* ({ tableName, pkName, pkValue, }) {
+const getItemDynamo = (_g) => __awaiter(void 0, [_g], void 0, function* ({ tableName, pkName, pkValue, }) {
     let r = yield (0, exports.getItemsDynamo)({ tableName, items: [{ pkName, pkValue }] });
     if ('error' in r) {
         return { error: r.error };
@@ -217,7 +233,7 @@ const getItemDynamo = (_e) => __awaiter(void 0, [_e], void 0, function* ({ table
     return { data: r.data[0] };
 });
 exports.getItemDynamo = getItemDynamo;
-const queryDynamo = (_f) => __awaiter(void 0, [_f], void 0, function* ({ tableName, pkName, pkValue, pkOperator = '=', skName, skValue, skOperator = '=', indexName, limit = 1000, startKey, filterName, filterValue, filterOperator = '=', sortAscending = true, }) {
+const queryDynamo = (_h) => __awaiter(void 0, [_h], void 0, function* ({ tableName, pkName, pkValue, pkOperator = '=', skName, skValue, skOperator = '=', indexName, limit = 1000, startKey, filterName, filterValue, filterOperator = '=', sortAscending = true, }) {
     let kce = `#${pkName.toLowerCase()} ${pkOperator} :${pkName.toLowerCase()}`;
     const ean = { [`#${pkName.toLowerCase()}`]: pkName };
     const eav = {

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

@@ -30,11 +30,13 @@ export declare function getS3Objects({ bucket, keys, }: {
     data: IS3Object;
     error?: undefined;
 }, void, unknown>;
-export declare const putS3Object: ({ Body, Bucket, Key, ContentType, }: {
+export declare const putS3Object: ({ Body, Bucket, Key, ContentType, CacheControl, }: {
     ContentType?: string;
     Body: string | Blob | Buffer;
     Bucket: string;
     Key: string;
+    /** default public, max-age=300 */
+    CacheControl?: string;
 }) => Promise<{
     error?: string;
 }>;

package/dist/api/helpers/s3.js

@@ -74,9 +74,9 @@ function getS3Objects(_a) {
     });
 }
 exports.getS3Objects = getS3Objects;
-const putS3Object = (_b) => __awaiter(void 0, [_b], void 0, function* ({ Body, Bucket, Key, ContentType, }) {
+const putS3Object = (_b) => __awaiter(void 0, [_b], void 0, function* ({ Body, Bucket, Key, ContentType, CacheControl = 'public, max-age=300', }) {
     try {
-        yield exports.s3.send(new client_s3_1.PutObjectCommand({ Body, Bucket, Key, ContentType }));
+        yield exports.s3.send(new client_s3_1.PutObjectCommand({ Body, Bucket, Key, ContentType, CacheControl }));
         return {};
     }
     catch (e) {

package/package.json

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