ag-common 0.0.80 → 0.0.86

package/dist/api/helpers/openApiHelpers.js

@@ -34,7 +34,8 @@ const setUpApiGw = ({ stack, NODE_ENV, baseUrl, certificate, hostedZone, shortSt
     });
     return api;
 };
-const getDynamoPermissions = ({ lambdaPermissions, pathV, verb, seenPermissions, }) => {
+const setupLambda = ({ lambdaPermissions, pathV, verb, seenPermissions, }) => {
+    var _a, _b, _c, _d;
     const pathCompute = pathV + '/' + verb;
     const lp = lambdaPermissions === null || lambdaPermissions === void 0 ? void 0 : lambdaPermissions[pathCompute];
     if (lp) {
@@ -48,11 +49,12 @@ const getDynamoPermissions = ({ lambdaPermissions, pathV, verb, seenPermissions,
         seenPermissions.default = true;
     }
     //
-    const readTables = (0, distinctBy_1.distinctBy)([...((def === null || def === void 0 ? void 0 : def.reads) || []), ...((lp === null || lp === void 0 ? void 0 : lp.reads) || [])], (s) => s.shortName);
-    const writeTables = (0, distinctBy_1.distinctBy)([...((def === null || def === void 0 ? void 0 : def.writes) || []), ...((lp === null || lp === void 0 ? void 0 : lp.writes) || [])], (s) => s.shortName);
+    const readTables = (0, distinctBy_1.distinctBy)([...(((_a = def === null || def === void 0 ? void 0 : def.dynamo) === null || _a === void 0 ? void 0 : _a.reads) || []), ...(((_b = lp === null || lp === void 0 ? void 0 : lp.dynamo) === null || _b === void 0 ? void 0 : _b.reads) || [])], (s) => s.shortName);
+    const writeTables = (0, distinctBy_1.distinctBy)([...(((_c = def === null || def === void 0 ? void 0 : def.dynamo) === null || _c === void 0 ? void 0 : _c.writes) || []), ...(((_d = lp === null || lp === void 0 ? void 0 : lp.dynamo) === null || _d === void 0 ? void 0 : _d.writes) || [])], (s) => s.shortName);
     const policies = [...(def.policies || []), ...((lp === null || lp === void 0 ? void 0 : lp.policies) || [])].filter(__1.notEmpty);
+    const env = Object.assign(Object.assign({}, (def.env || {})), ((lp === null || lp === void 0 ? void 0 : lp.env) || {}));
     const tables = [...readTables, ...writeTables];
-    const environment = {};
+    const environment = env;
     Object.values(tables).forEach((v) => {
         environment[v.shortName] = v.table.tableName;
     });
@@ -89,7 +91,7 @@ const openApiImpl = (p) => {
     paths.forEach(({ fullPath, verbs, pathList }) => {
         const apiPath = addApiPaths(api, pathList, apiRoots);
         verbs.forEach((verb) => {
-            const { environment, readTables, writeTables, policies } = getDynamoPermissions({
+            const { environment, readTables, writeTables, policies } = setupLambda({
                 lambdaPermissions,
                 pathV: fullPath,
                 verb,

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/index.d.ts

@@ -17,17 +17,17 @@ export interface IGeneratedDynamoData {
     table: dynamodb.ITable;
     shortName: string;
 }
-export interface ILambdaPermissions {
-    [pathHyphenVerb: string]: {
+export interface ILambdaPermission {
+    dynamo?: {
         reads?: IGeneratedDynamoData[];
         writes?: IGeneratedDynamoData[];
-        policies?: iam.PolicyStatement[];
-    } & {
-        default?: {
-            reads?: IGeneratedDynamoData[];
-            writes?: IGeneratedDynamoData[];
-            policies?: iam.PolicyStatement[];
-        };
+    };
+    policies?: iam.PolicyStatement[];
+    env?: Record<string, string>;
+}
+export interface ILambdaPermissions {
+    [pathHyphenVerb: string]: ILambdaPermission & {
+        default?: ILambdaPermission;
     };
 }
 export interface IQueryDynamo {

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,14 @@
+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;
+    disabled?: boolean;
+}

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 (p.disabled || 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.80",
+  "version": "0.0.86",
   "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",
+    "aws-sdk": "2.1062.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,14 +22,16 @@
     "react-dom": "17.0.2",
     "react-hot-toast": "2.2.0",
     "styled-components": "5.3.3",
-    "typescript": "4.5.5"
+    "typescript": "4.5.5",
+    "aws-cdk-lib": "2.x",
+    "constructs": "10.x"
   },
   "devDependencies": {
     "@types/jsonwebtoken": "8.5.8",
     "@types/node": "17.0.10",
     "@types/react": "17.0.38",
     "@types/react-dom": "17.0.11",
-    "@types/styled-components": "5.1.20",
+    "@types/styled-components": "5.1.21",
     "@typescript-eslint/eslint-plugin": "5.10.0",
     "@typescript-eslint/parser": "5.10.0",
     "eslint": "8.7.0",