ag-common 0.0.638 → 0.0.640

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

@@ -27,7 +27,7 @@ export declare const scan: <T>(tableName: string, opt?: {
     /** ProjectionExpression. will csv values */
     requiredAttributeList?: string[];
     /** default =ALL */
-    maxCount?: number;
+    limit?: number;
 }) => Promise<{
     data: T[];
 } | {

package/dist/api/helpers/dynamo.js

@@ -143,16 +143,15 @@ const batchDelete = ({ tableName, keys, pkName, }) => __awaiter(void 0, void 0,
 });
 exports.batchDelete = batchDelete;
 const scan = (tableName, opt) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
     try {
         let ExclusiveStartKey;
         let Items = [];
         do {
-            let params = new lib_dynamodb_1.ScanCommand(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 && {
+            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 && {
                 ExpressionAttributeValues: opt.filter.attrValues,
             })))), ((opt === null || opt === void 0 ? void 0 : opt.requiredAttributeList) && {
                 ProjectionExpression: opt.requiredAttributeList.join(', '),
-            })), { ExclusiveStartKey, Limit: (_a = opt === null || opt === void 0 ? void 0 : opt.maxCount) !== null && _a !== void 0 ? _a : undefined }));
+            })), { ExclusiveStartKey }), ((opt === null || opt === void 0 ? void 0 : opt.limit) && { Limit: opt.limit })));
             (0, log_1.debug)(`running dynamo scan=${JSON.stringify(params, null, 2)}`);
             const { Items: newitems, LastEvaluatedKey,
             // eslint-disable-next-line no-await-in-loop
@@ -161,10 +160,9 @@ const scan = (tableName, opt) => __awaiter(void 0, void 0, void 0, function* ()
             if (newitems) {
                 Items.push(...newitems.map((r) => r));
             }
-        } while (ExclusiveStartKey &&
-            (!(opt === null || opt === void 0 ? void 0 : opt.maxCount) || Items.length < opt.maxCount));
-        if (opt === null || opt === void 0 ? void 0 : opt.maxCount) {
-            ({ part: Items } = (0, array_1.take)(Items, opt === null || opt === void 0 ? void 0 : opt.maxCount));
+        } 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 === null || opt === void 0 ? void 0 : opt.limit));
         }
         (0, log_1.debug)(`dynamo scan against ${tableName} ok, count=${Items === null || Items === void 0 ? void 0 : Items.length}`);
         return { data: Items };
@@ -176,7 +174,7 @@ const scan = (tableName, opt) => __awaiter(void 0, void 0, void 0, function* ()
 });
 exports.scan = scan;
 const getItemsDynamo = ({ tableName, items, }) => __awaiter(void 0, void 0, void 0, function* () {
-    var _b, _c;
+    var _a, _b;
     const params = new lib_dynamodb_1.BatchGetCommand({
         RequestItems: {
             [tableName]: {
@@ -188,7 +186,7 @@ const getItemsDynamo = ({ tableName, items, }) => __awaiter(void 0, void 0, void
     });
     try {
         let res = yield exports.dynamoDb.send(params);
-        let data = (_c = (_b = res.Responses) === null || _b === void 0 ? void 0 : _b[tableName].map((r) => r)) !== null && _c !== void 0 ? _c : [];
+        let data = (_b = (_a = res.Responses) === null || _a === void 0 ? void 0 : _a[tableName].map((r) => r)) !== null && _b !== void 0 ? _b : [];
         return { data };
     }
     catch (e) {
@@ -251,7 +249,7 @@ const queryDynamo = ({ tableName, pkName, pkValue, pkOperator = '=', skName, skV
     }
     const Items = [];
     do {
-        const params = new lib_dynamodb_1.QueryCommand(Object.assign(Object.assign(Object.assign({ TableName: tableName, KeyConditionExpression: kce, ExpressionAttributeNames: ean, ExpressionAttributeValues: eav, ScanIndexForward: sortAscending, Limit: limit !== null && limit !== void 0 ? limit : 1000 }, (indexName && { IndexName: indexName })), (startKey && {
+        const params = new lib_dynamodb_1.QueryCommand(Object.assign(Object.assign(Object.assign(Object.assign({ TableName: tableName, KeyConditionExpression: kce, ExpressionAttributeNames: ean, ExpressionAttributeValues: eav, ScanIndexForward: sortAscending }, (limit !== null && limit !== -1 && { Limit: limit || 1000 })), (indexName && { IndexName: indexName })), (startKey && {
             ExclusiveStartKey: startKey,
         })), (FilterExpression && { FilterExpression })));
         let lek;
@@ -284,7 +282,7 @@ exports.getDynamoTtlDays = getDynamoTtlDays;
 const getDynamoTtlMinutes = (mins) => Math.ceil(new Date().getTime() / 1000) + mins * 60;
 exports.getDynamoTtlMinutes = getDynamoTtlMinutes;
 const wipeTable = (tableName) => __awaiter(void 0, void 0, void 0, function* () {
-    var _d;
+    var _c;
     try {
         let infoV = yield exports.dynamoDb.send(new client_dynamodb_1.DescribeTableCommand({ TableName: tableName }));
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -298,7 +296,7 @@ const wipeTable = (tableName) => __awaiter(void 0, void 0, void 0, function* ()
             throw allraw.error;
         }
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        let all = ((_d = allraw === null || allraw === void 0 ? void 0 : allraw.data) === null || _d === void 0 ? void 0 : _d.map((d) => d)) || [];
+        let all = ((_c = allraw === null || allraw === void 0 ? void 0 : allraw.data) === null || _c === void 0 ? void 0 : _c.map((d) => d)) || [];
         (0, log_1.warn)(`will delete ${all === null || all === void 0 ? void 0 : all.length} items from ${tableName}`);
         yield (0, exports.batchDelete)({
             tableName,

package/dist/api/types/index.d.ts

@@ -58,7 +58,7 @@ export interface IQueryDynamo {
     skOperator?: TSkOperator;
     tableName: string;
     indexName?: string;
-    /** default 1000 */
+    /** default 1000. if -1 or null will not apply */
     limit?: number;
     startKey?: Key;
     filterName?: string;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.638",
+  "version": "0.0.640",
   "name": "ag-common",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -8,9 +8,9 @@
   "license": "ISC",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
-    "format": "eslint --ext .ts,.tsx,.js,.json src --fix",
+    "format": "eslint --ext .ts,.tsx src --fix",
     "lint:tsc": "tsc --noEmit",
-    "lint:eslint": "eslint --ext .ts,.tsx,.js,.json src",
+    "lint:eslint": "eslint --ext .ts,.tsx src",
     "lint": "pnpm run /^lint:/",
     "build": "rimraf dist && tsc -p tsconfig.build.json",
     "start": "cross-env BROWSER=none cross-env storybook dev -p 6006",