ag-common 0.0.310 → 0.0.313

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

@@ -36,7 +36,7 @@ export declare const getItemsDynamo: <T>({ tableName, items, }: {
     }[];
     tableName: string;
 }) => Promise<T[]>;
-export declare const queryDynamo: <T>({ tableName, pkName, pkValue, pkOperator, skName, skValue, skOperator, indexName, count, startKey: startKeyIn, filterName, filterValue, filterOperator, }: IQueryDynamo) => Promise<{
+export declare const queryDynamo: <T>({ tableName, pkName, pkValue, pkOperator, skName, skValue, skOperator, indexName, count, startKey: startKeyIn, filterName, filterValue, filterOperator, sortAscending, }: IQueryDynamo) => Promise<{
     Items: T[];
     startKey?: Key | undefined;
 }>;

package/dist/api/helpers/dynamo.js

@@ -42,7 +42,7 @@ const putDynamo = (item, tableName) => __awaiter(void 0, void 0, void 0, functio
     return { data: item };
 });
 exports.putDynamo = putDynamo;
-let batchWriteRaw = (req, debugMsg) => __awaiter(void 0, void 0, void 0, function* () {
+let batchWriteRaw = (req) => __awaiter(void 0, void 0, void 0, function* () {
     let count = 0;
     let max = 5;
     // eslint-disable-next-line no-constant-condition
@@ -58,20 +58,20 @@ let batchWriteRaw = (req, debugMsg) => __awaiter(void 0, void 0, void 0, functio
         catch (e) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             let es = e.toString();
+            let msg = es;
+            (0, log_1.warn)('dynamo write error', msg);
             if (es.indexOf('429') !== -1 ||
                 es.indexOf('ProvisionedThroughputExceeded') !== -1) {
                 count += 1;
+                msg = `batch write throttled. retry ${count}/${max}`;
             }
-            if (count >= max) {
+            else {
                 throw e;
             }
-            let msg = `batch write throttled. retry ${count}/${max}`;
-            if (!debugMsg) {
-                (0, log_1.info)(msg);
-            }
-            else {
-                debugMsg(msg);
+            if (count >= max) {
+                throw e;
             }
+            (0, log_1.warn)(`dynamo retry ${count}/${max}`);
             yield (0, sleep_1.sleep)(2000);
         }
 });
@@ -90,7 +90,7 @@ const batchWrite = (tableName, itemsIn, breakOnError = false) => __awaiter(void
                 PutRequest: { Item: item },
             })),
         };
-        let res = yield batchWriteRaw(req, (m) => (0, log_1.info)(`${m} remaining=${rest.length}`));
+        let res = yield batchWriteRaw(req);
         const newError = (_b = (_a = res.$response) === null || _a === void 0 ? void 0 : _a.error) !== null && _b !== void 0 ? _b : null;
         if (newError) {
             error.push(newError);
@@ -212,19 +212,7 @@ const getItemsDynamo = ({ tableName, items, }) => __awaiter(void 0, void 0, void
     }
 });
 exports.getItemsDynamo = getItemsDynamo;
-const queryDynamo = ({ tableName, pkName, pkValue, 
-/**
- * default =
- */
-pkOperator = '=', skName, skValue, 
-/**
- * default =
- */
-skOperator = '=', indexName, count = 1000, startKey: startKeyIn, filterName, filterValue, 
-/**
- * default =
- */
-filterOperator = '=', }) => __awaiter(void 0, void 0, void 0, function* () {
+const queryDynamo = ({ tableName, pkName, pkValue, pkOperator = '=', skName, skValue, skOperator = '=', indexName, count = 1000, startKey: startKeyIn, filterName, filterValue, filterOperator = '=', sortAscending = true, }) => __awaiter(void 0, void 0, void 0, function* () {
     var _g, _h;
     let startKey = startKeyIn;
     let kce = `#${pkName.toLowerCase()} ${pkOperator} :${pkName.toLowerCase()}`;
@@ -278,6 +266,7 @@ filterOperator = '=', }) => __awaiter(void 0, void 0, void 0, function* () {
             ExpressionAttributeValues: eav,
             ExclusiveStartKey: startKey,
             FilterExpression,
+            ScanIndexForward: sortAscending,
         };
         if (count > 0) {
             params.Limit = count;

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

@@ -54,16 +54,22 @@ export declare type TSkOperator = 'BETWEEN' | '<' | '<=' | '=' | '>=' | '>' | '<
 export interface IQueryDynamo {
     pkName: string;
     pkValue: string | number;
+    /** default, = */
     pkOperator?: string;
     skName?: string;
     skValue?: string | number | string[] | number[];
+    /** default, = */
     skOperator?: TSkOperator;
     tableName: string;
     indexName?: string;
+    /** default 1000 */
     count?: number;
     startKey?: Key;
     filterName?: string;
     filterValue?: string | number | boolean;
+    /** default, = */
     filterOperator?: string;
+    /** default = true */
+    sortAscending?: boolean;
 }
 export * from './aws';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.310",
+  "version": "0.0.313",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -42,14 +42,14 @@
     "@storybook/react": "6.5.10",
     "@storybook/theming": "6.5.10",
     "@types/jsonwebtoken": "8.5.8",
-    "@types/node": "18.7.1",
+    "@types/node": "18.7.5",
     "@types/react": "18.0.17",
     "@types/react-dom": "18.0.6",
     "@types/styled-components": "5.1.26",
-    "@typescript-eslint/eslint-plugin": "5.33.0",
-    "@typescript-eslint/parser": "5.33.0",
+    "@typescript-eslint/eslint-plugin": "5.33.1",
+    "@typescript-eslint/parser": "5.33.1",
     "cross-env": "7.0.3",
-    "eslint": "8.21.0",
+    "eslint": "8.22.0",
     "eslint-config-airbnb-typescript": "17.0.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-import": "2.26.0",