ag-common 0.0.75 → 0.0.79

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

@@ -11,11 +11,13 @@ export declare const batchWrite: <T extends {}>(tableName: string, itemsIn: T[],
 } | {
     error?: undefined;
 }>;
-export declare const batchDelete: ({ tableName, keys, breakOnError, pkName, }: {
+export declare const batchDelete: ({ tableName, breakOnError, pkName, keys, rangeName, rangeKeys, }: {
     pkName: string;
     breakOnError?: boolean | undefined;
     tableName: string;
     keys: string[];
+    rangeName?: string | undefined;
+    rangeKeys?: string[] | undefined;
 }) => Promise<{
     error: string;
 } | {

package/dist/api/helpers/dynamo.js

@@ -17,6 +17,7 @@ const aws_sdk_1 = __importDefault(require("aws-sdk"));
 const log_1 = require("../../common/helpers/log");
 const array_1 = require("../../common/helpers/array");
 const sleep_1 = require("../../common/helpers/sleep");
+const async_1 = require("../../common/helpers/async");
 // eslint-disable-next-line import/no-mutable-exports
 exports.dynamoDb = new aws_sdk_1.default.DynamoDB.DocumentClient();
 const setDynamo = (region) => {
@@ -106,21 +107,26 @@ const batchWrite = (tableName, itemsIn, breakOnError = false) => __awaiter(void
     return {};
 });
 exports.batchWrite = batchWrite;
-const batchDelete = ({ tableName, keys, breakOnError = true, pkName, }) => __awaiter(void 0, void 0, void 0, function* () {
-    var _c, _d;
+const batchDelete = ({ tableName, breakOnError = true, pkName, keys, rangeName, rangeKeys, }) => __awaiter(void 0, void 0, void 0, function* () {
     (0, log_1.info)(`wipe keys dynamo:${tableName} - count=${keys.length}`);
     const error = [];
     let breakV = false;
-    for (let key of keys) {
+    yield (0, async_1.asyncForEach)(keys, (key, i) => __awaiter(void 0, void 0, void 0, function* () {
+        var _c, _d;
         if (breakV) {
-            break;
+            return;
         }
-        const res = yield exports.dynamoDb
-            .delete({
+        let params = {
             TableName: tableName,
-            Key: { [`${pkName}`]: key },
-        })
-            .promise();
+            Key: { [pkName]: key },
+        };
+        if (rangeName) {
+            let rangeValue = rangeKeys === null || rangeKeys === void 0 ? void 0 : rangeKeys[i];
+            if (rangeValue) {
+                params.Key[rangeName] = rangeValue;
+            }
+        }
+        const res = yield exports.dynamoDb.delete(params).promise();
         const newError = (_d = (_c = res.$response) === null || _c === void 0 ? void 0 : _c.error) !== null && _d !== void 0 ? _d : null;
         if (newError) {
             error.push(newError);
@@ -128,7 +134,7 @@ const batchDelete = ({ tableName, keys, breakOnError = true, pkName, }) => __awa
                 breakV = true;
             }
         }
-    }
+    }));
     if ((error === null || error === void 0 ? void 0 : error.length) > 0) {
         const me = error.join('\n');
         (0, log_1.error)(`batch write error=${me}`);

package/dist/ui/helpers/callOpenApi.js

@@ -12,8 +12,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.callOpenApi = void 0;
 const cookie_1 = require("./cookie");
 const sleep_1 = require("../../common/helpers/sleep");
+const array_1 = require("../../common/helpers/array");
 const callOpenApi = ({ func, apiUrl, overrideAuth, refreshToken, logout, newDefaultApi, }) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let error;
     let data;
@@ -49,11 +50,15 @@ const callOpenApi = ({ func, apiUrl, overrideAuth, refreshToken, logout, newDefa
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const ae = e;
             const status = (_c = ae.response) === null || _c === void 0 ? void 0 : _c.status;
-            const errorMessage = (((_d = ae.response) === null || _d === void 0 ? void 0 : _d.data) ||
-                ((_e = ae.response) === null || _e === void 0 ? void 0 : _e.statusText) ||
-                ((_f = ae.response) === null || _f === void 0 ? void 0 : _f.status) ||
-                ae.message ||
-                'ERROR');
+            const errorMessage = [
+                (_f = (_e = (_d = ae.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.toString()) !== null && _f !== void 0 ? _f : '',
+                (_j = (_h = (_g = ae.response) === null || _g === void 0 ? void 0 : _g.statusText) === null || _h === void 0 ? void 0 : _h.toString()) !== null && _j !== void 0 ? _j : '',
+                (_m = (_l = (_k = ae.response) === null || _k === void 0 ? void 0 : _k.status) === null || _l === void 0 ? void 0 : _l.toString()) !== null && _m !== void 0 ? _m : '',
+                (_p = (_o = ae.message) === null || _o === void 0 ? void 0 : _o.toString()) !== null && _p !== void 0 ? _p : '',
+            ]
+                .filter(array_1.notEmpty)
+                .sort((a, b) => (a.length < b.length ? -1 : 1))
+                .join('\n');
             if (status === 403 || status === 401) {
                 logout();
                 return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.75",
+  "version": "0.0.79",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -14,8 +14,8 @@
   },
   "dependencies": {
     "aws-cdk-lib": "2.8.0",
-    "aws-sdk": "2.1058.0",
-    "axios": "0.24.0",
+    "aws-sdk": "2.1060.0",
+    "axios": "0.25.0",
     "constructs": "10.0.39",
     "jsonwebtoken": "8.5.1",
     "jwks-rsa": "2.0.5",
@@ -24,17 +24,17 @@
     "react-dom": "17.0.2",
     "react-hot-toast": "2.2.0",
     "styled-components": "5.3.3",
-    "typescript": "4.5.4"
+    "typescript": "4.5.5"
   },
   "devDependencies": {
     "@types/jsonwebtoken": "8.5.8",
-    "@types/node": "17.0.9",
+    "@types/node": "17.0.10",
     "@types/react": "17.0.38",
     "@types/react-dom": "17.0.11",
     "@types/styled-components": "5.1.20",
-    "@typescript-eslint/eslint-plugin": "5.9.1",
-    "@typescript-eslint/parser": "5.9.1",
-    "eslint": "8.6.0",
+    "@typescript-eslint/eslint-plugin": "5.10.0",
+    "@typescript-eslint/parser": "5.10.0",
+    "eslint": "8.7.0",
     "eslint-config-airbnb-typescript": "16.1.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-config-react-app": "7.0.0",