ag-common 0.0.78 → 0.0.84

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

@@ -11,13 +11,13 @@ export declare const batchWrite: <T extends {}>(tableName: string, itemsIn: T[],
 } | {
     error?: undefined;
 }>;
-export declare const batchDelete: ({ tableName, keys, breakOnError, pkName, rangeName, rangeValue, }: {
+export declare const batchDelete: ({ tableName, breakOnError, pkName, keys, rangeName, rangeKeys, }: {
     pkName: string;
     breakOnError?: boolean | undefined;
     tableName: string;
     keys: string[];
     rangeName?: string | undefined;
-    rangeValue?: 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,24 @@ const batchWrite = (tableName, itemsIn, breakOnError = false) => __awaiter(void
     return {};
 });
 exports.batchWrite = batchWrite;
-const batchDelete = ({ tableName, keys, breakOnError = true, pkName, rangeName, rangeValue, }) => __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;
         }
         let params = {
             TableName: tableName,
             Key: { [pkName]: key },
         };
         if (rangeName) {
-            params.Key[rangeName] = rangeValue;
+            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;
@@ -130,7 +134,7 @@ const batchDelete = ({ tableName, keys, breakOnError = true, pkName, rangeName,
                 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/api/helpers/validateOpenApi.js

@@ -58,7 +58,7 @@ function validateOpenApi({ event, next, authorized, schema, COGNITO_USER_POOL_ID
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             params: undefined,
             query: event.queryStringParameters,
-            body: event.body && JSON.parse(event.body),
+            body: (0, object_1.tryJsonParse)(event.body, event.body),
             headers: (0, object_1.objectKeysToLowerCase)(event === null || event === void 0 ? void 0 : event.headers),
         };
         const method = event.requestContext.httpMethod.toLowerCase();
@@ -116,7 +116,7 @@ function validateOpenApi({ event, next, authorized, schema, COGNITO_USER_POOL_ID
         const res = yield next({
             params,
             event,
-            body: (event.body && JSON.parse(event.body)),
+            body: (0, object_1.tryJsonParse)(event.body, event.body),
             userProfile,
             lang: (0, i18n_1.getValidatedLang)((_e = event.headers['x-lang']) !== null && _e !== void 0 ? _e : ''),
         });

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

@@ -18,6 +18,9 @@ export interface APIGatewayEvent {
     resource: string;
     path: string;
     requestContext: {
+        authorizer?: {
+            data?: string;
+        };
         connectionId: string;
         domainName: string;
         identity: {

package/dist/ui/helpers/callOpenApi.d.ts

@@ -1,13 +1,3 @@
-import { AxiosResponse } from 'axios';
-import { AxiosWrapper, User } from './jwt';
-export interface OverrideAuth {
-    id_token?: string;
-}
-export declare const callOpenApi: <T, TDefaultApi>({ func, apiUrl, overrideAuth, refreshToken, logout, newDefaultApi, }: {
-    func: (f: TDefaultApi) => Promise<AxiosResponse<T, any>>;
-    apiUrl: string;
-    overrideAuth?: OverrideAuth | undefined;
-    logout: () => void;
-    refreshToken: () => Promise<User | undefined>;
-    newDefaultApi: (config: any) => TDefaultApi;
-}) => Promise<AxiosWrapper<T | undefined>>;
+import { AxiosWrapper } from './jwt';
+import { ICallOpenApi } from './types';
+export declare const callOpenApi: <T, TDefaultApi>({ func, apiUrl, overrideAuth, refreshToken, logout, newDefaultApi, }: ICallOpenApi<T, TDefaultApi>) => Promise<AxiosWrapper<T | undefined>>;

package/dist/ui/helpers/callOpenApi.js

@@ -51,6 +51,7 @@ const callOpenApi = ({ func, apiUrl, overrideAuth, refreshToken, logout, newDefa
             const ae = e;
             const status = (_c = ae.response) === null || _c === void 0 ? void 0 : _c.status;
             const errorMessage = [
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 (_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 : '',

package/dist/ui/helpers/index.d.ts

@@ -13,6 +13,8 @@ export * from './mutex';
 export * from './mutexData';
 export * from './plural';
 export * from './routes';
+export * from './types';
+export * from './useCallOpenApi';
 export * from './useContextMenu';
 export * from './useLocalStorage';
 export * from './useLockBodyScroll';

package/dist/ui/helpers/index.js

@@ -25,6 +25,8 @@ __exportStar(require("./mutex"), exports);
 __exportStar(require("./mutexData"), exports);
 __exportStar(require("./plural"), exports);
 __exportStar(require("./routes"), exports);
+__exportStar(require("./types"), exports);
+__exportStar(require("./useCallOpenApi"), exports);
 __exportStar(require("./useContextMenu"), exports);
 __exportStar(require("./useLocalStorage"), exports);
 __exportStar(require("./useLockBodyScroll"), exports);

package/dist/ui/helpers/types.d.ts

@@ -0,0 +1,13 @@
+import { AxiosResponse } from 'axios';
+import { User } from './jwt';
+export interface OverrideAuth {
+    id_token?: string;
+}
+export interface ICallOpenApi<T, TDefaultApi> {
+    func: (f: TDefaultApi) => Promise<AxiosResponse<T>>;
+    apiUrl: string;
+    overrideAuth?: OverrideAuth;
+    logout: () => void;
+    refreshToken: () => Promise<User | undefined>;
+    newDefaultApi: (config: any) => TDefaultApi;
+}

package/dist/ui/helpers/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/ui/helpers/useCallOpenApi.d.ts

@@ -0,0 +1,10 @@
+import { AxiosWrapper } from './jwt';
+import { ICallOpenApi } from './types';
+declare type AxiosWrapperWrap<T> = AxiosWrapper<T | undefined> & {
+    loaded: boolean;
+    loadcount: number;
+};
+export declare const useCallOpenApi: <T, TDefaultApi>(p: ICallOpenApi<T, TDefaultApi> & {
+    cacheKey: string;
+}) => AxiosWrapperWrap<T>;
+export {};

package/dist/ui/helpers/useCallOpenApi.js

@@ -0,0 +1,47 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useCallOpenApi = void 0;
+const react_1 = require("react");
+const callOpenApi_1 = require("./callOpenApi");
+const defaultV = (def) => ({
+    loading: false,
+    data: def,
+    datetime: new Date().getTime(),
+    reFetch: () => __awaiter(void 0, void 0, void 0, function* () { }),
+    error: undefined,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    url: undefined,
+    //
+    loaded: false,
+    loadcount: 0,
+});
+const useCallOpenApi = (p) => {
+    const [data, setData] = (0, react_1.useState)(defaultV(undefined));
+    (0, react_1.useEffect)(() => {
+        function run() {
+            return __awaiter(this, void 0, void 0, function* () {
+                const res = yield (0, callOpenApi_1.callOpenApi)(p);
+                setData((d) => (Object.assign(Object.assign({}, res), { loaded: true, loading: false, loadcount: d.loadcount + 1 })));
+            });
+        }
+        const { error, loaded, loading, loadcount } = data;
+        if (loaded || loading || (error && loadcount < 2)) {
+            return;
+        }
+        setData((d) => (Object.assign(Object.assign({}, d), { loading: true })));
+        void run();
+    }, [data, p, setData]);
+    return Object.assign(Object.assign({}, data), { reFetch: () => __awaiter(void 0, void 0, void 0, function* () {
+            setData(defaultV(undefined));
+        }) });
+};
+exports.useCallOpenApi = useCallOpenApi;

package/dist/ui/helpers/useOpenApiStore.d.ts

@@ -1,7 +1,7 @@
 import { AxiosResponse } from 'axios';
-import { OverrideAuth } from './callOpenApi';
 import { CacheItems } from './routes';
 import { AxiosWrapper, User } from './jwt';
+import { OverrideAuth } from './types';
 export declare const deleteMutexData: (key: string) => void;
 export declare const setMutexData: ({ key, data, ttlSeconds, }: {
     key: string;

package/dist/ui/helpers/useOpenApiStore.js

@@ -42,22 +42,15 @@ exports.setMutexData = setMutexData;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const getMutexData = (key) => mutexData.getData(key);
 exports.getMutexData = getMutexData;
-function mLock({ key, func, ttlSeconds = 3600, logout, refreshToken, apiUrl, newDefaultApi, overrideAuth, }) {
+function mLock(p) {
     return __awaiter(this, void 0, void 0, function* () {
         let unlock;
         try {
-            unlock = yield mutex.capture(key);
-            if (mutexData.getData(key)) {
+            unlock = yield mutex.capture(p.key);
+            if (mutexData.getData(p.key)) {
                 return;
             }
-            const newData = yield (0, callOpenApi_1.callOpenApi)({
-                apiUrl,
-                func,
-                logout,
-                refreshToken,
-                newDefaultApi,
-                overrideAuth,
-            });
+            const newData = yield (0, callOpenApi_1.callOpenApi)(p);
             if (!newData) {
                 return;
             }
@@ -65,9 +58,13 @@ function mLock({ key, func, ttlSeconds = 3600, logout, refreshToken, apiUrl, new
                 (0, log_1.error)('api error:', newData.error);
             }
             else {
-                mutexData.setData({ key, data: newData, ttlSeconds });
+                mutexData.setData({
+                    key: p.key,
+                    data: newData,
+                    ttlSeconds: p.ttlSeconds,
+                });
             }
-            mutexData.pingSubscribers(key);
+            mutexData.pingSubscribers(p.key);
         }
         catch (e) {
             (0, log_1.error)('mutex error:', e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.78",
+  "version": "0.0.84",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -13,10 +13,8 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "aws-cdk-lib": "2.8.0",
     "aws-sdk": "2.1060.0",
     "axios": "0.25.0",
-    "constructs": "10.0.39",
     "jsonwebtoken": "8.5.1",
     "jwks-rsa": "2.0.5",
     "openapi-request-validator": "10.0.0",
@@ -24,7 +22,9 @@
     "react-dom": "17.0.2",
     "react-hot-toast": "2.2.0",
     "styled-components": "5.3.3",
-    "typescript": "4.5.4"
+    "typescript": "4.5.5",
+    "aws-cdk-lib": "2.x",
+    "constructs": "10.x"
   },
   "devDependencies": {
     "@types/jsonwebtoken": "8.5.8",
@@ -32,8 +32,8 @@
     "@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",
+    "@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",