ag-common 0.0.19 → 0.0.23

package/dist/api/helpers/validateOpenApi.js

@@ -46,6 +46,12 @@ const getOperation = ({ path, method, resource, schema, }) => {
 function validateOpenApi({ event, next, authorized, schema, COGNITO_USER_POOL_ID, }) {
     var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function* () {
+        if (!schema) {
+            throw new Error('schema undefined!');
+        }
+        if (!COGNITO_USER_POOL_ID) {
+            throw new Error('COGNITO_USER_POOL_ID undefined');
+        }
         const request = {
             method: event.httpMethod,
             path: event.path,

package/dist/api/types.d.ts

@@ -63,6 +63,8 @@ export interface APIGatewayEvent {
     resource: string;
     path: string;
     requestContext: {
+        connectionId: string;
+        domainName: string;
         identity: {
             userAgent: string;
             sourceIp: string;

package/dist/common/helpers/async.d.ts

@@ -0,0 +1,13 @@
+/**
+ * run async forEach over all array items
+ * @param array
+ * @param callback
+ */
+export declare function asyncForEach<T>(array: T[], callback: (i: T, index: number, array: T[]) => void): Promise<void>;
+/**
+ * run async map over all array items
+ * @param array
+ * @param callback
+ * @returns
+ */
+export declare function asyncMap<T, TY>(array: T[], callback: (i: T, index: number, array: T[]) => Promise<TY>): Promise<TY[]>;

package/dist/common/helpers/async.js

@@ -0,0 +1,41 @@
+"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.asyncMap = exports.asyncForEach = void 0;
+/**
+ * run async forEach over all array items
+ * @param array
+ * @param callback
+ */
+function asyncForEach(array, callback) {
+    return __awaiter(this, void 0, void 0, function* () {
+        for (let index = 0; index < array.length; index += 1) {
+            yield callback(array[index], index, array);
+        }
+    });
+}
+exports.asyncForEach = asyncForEach;
+/**
+ * run async map over all array items
+ * @param array
+ * @param callback
+ * @returns
+ */
+function asyncMap(array, callback) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ret = [];
+        for (let index = 0; index < array.length; index += 1) {
+            ret.push(yield callback(array[index], index, array));
+        }
+        return ret;
+    });
+}
+exports.asyncMap = asyncMap;

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

@@ -1,4 +1,5 @@
 export * from './array';
+export * from './async';
 export * from './date';
 export * from './distinctBy';
 export * from './email';

package/dist/common/helpers/index.js

@@ -11,6 +11,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./array"), exports);
+__exportStar(require("./async"), exports);
 __exportStar(require("./date"), exports);
 __exportStar(require("./distinctBy"), exports);
 __exportStar(require("./email"), exports);

package/dist/common/helpers/log.d.ts

@@ -1,8 +1,8 @@
 export declare type TLogType = 'TRACE' | 'DEBUG' | 'INFO' | 'WARN' | 'ERROR' | 'FATAL';
 export declare const GetLogLevel: (l: TLogType) => number;
-export declare const trace: (...args: any[]) => void;
 export declare const debug: (...args: any[]) => void;
 export declare const info: (...args: any[]) => void;
 export declare const warn: (...args: any[]) => void;
+export declare const trace: (...args: any[]) => void;
 export declare const error: (...args: any[]) => void;
 export declare const fatal: (...args: any[]) => void;

package/dist/common/helpers/log.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fatal = exports.error = exports.warn = exports.info = exports.debug = exports.trace = exports.GetLogLevel = void 0;
+exports.fatal = exports.error = exports.trace = exports.warn = exports.info = exports.debug = exports.GetLogLevel = void 0;
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const _1 = require(".");
 const GetLogLevel = (l) => ['TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'].findIndex((s) => s === l);
@@ -11,68 +11,43 @@ function dateF() {
     const str = `${d.getHours()}:${d.getMinutes()}:${d.getSeconds()}`;
     return str;
 }
-function nicify(...args) {
-    const ret = [];
-    args.forEach((a) => {
-        a.forEach((v) => {
-            if (v !== null &&
-                typeof v !== 'undefined' &&
-                v.toString().indexOf('Error:') !== -1 &&
-                v.stack) {
-                ret.push(`${v.stack}`);
-            }
-            else if (typeof v === 'string') {
-                if (v.trim() !== 'undefined') {
-                    ret.push(`${v.trim()}`);
-                }
-            }
-            else if (typeof v === 'object') {
-                ret.push(JSON.parse(JSON.stringify(v)));
-            }
-            else {
-                ret.push(v);
-            }
-        });
-    });
-    return ret;
-}
-function logprocess(type, date, args) {
+function logprocess(type, args) {
     var _a;
-    const msg = `[${date}] ${type} `;
-    const argsClean = args.filter(_1.notEmpty);
     const min = (0, exports.GetLogLevel)((_a = process.env.LOG_LEVEL) === null || _a === void 0 ? void 0 : _a.toUpperCase()) || 'WARN';
     const typesLogLevel = (0, exports.GetLogLevel)(type);
     // env ignores it
     if (typesLogLevel < min) {
         return;
     }
+    ////////
+    const log = [`[${dateF()}]`, type, ...args.filter(_1.notEmpty)];
     switch (type) {
         case 'TRACE': {
-            console.trace(msg, ...argsClean);
+            console.trace(...log);
             break;
         }
         case 'DEBUG': {
-            console.debug(msg, ...argsClean);
+            console.debug(...log);
             break;
         }
         case 'INFO': {
-            console.log(msg, ...argsClean);
+            console.log(...log);
             break;
         }
         case 'WARN': {
-            console.warn(msg, ...argsClean);
+            console.warn(...log);
             break;
         }
         case 'ERROR': {
-            console.error(msg, ...argsClean);
+            console.error(...log);
             break;
         }
         case 'FATAL': {
-            console.error(msg, ...argsClean);
+            console.error(...log);
             break;
         }
         default: {
-            console.log(msg, ...argsClean);
+            console.log(...log);
             break;
         }
     }
@@ -131,23 +106,25 @@ function printStackTrace(...args) {
     }
     return callstack.join('\n');
 }
+const debug = (...args) => logprocess('DEBUG', args);
+exports.debug = debug;
+const info = (...args) => logprocess('INFO', args);
+exports.info = info;
+const warn = (...args) => logprocess('WARN', args);
+exports.warn = warn;
+//
 const trace = (...args) => {
-    const argsNice = nicify(args);
     args.push(printStackTrace());
-    logprocess('TRACE', dateF(), argsNice);
+    logprocess('TRACE', args);
 };
 exports.trace = trace;
-const debug = (...args) => logprocess('DEBUG', dateF(), nicify(args));
-exports.debug = debug;
-const info = (...args) => logprocess('INFO', dateF(), nicify(args));
-exports.info = info;
-const warn = (...args) => logprocess('WARN', dateF(), nicify(args));
-exports.warn = warn;
-const error = (...args) => logprocess('ERROR', dateF(), nicify(args));
+const error = (...args) => {
+    args.push(printStackTrace());
+    logprocess('ERROR', args);
+};
 exports.error = error;
 const fatal = (...args) => {
-    const argsNice = nicify(args);
     args.push(printStackTrace());
-    logprocess('FATAL', dateF(), argsNice);
+    logprocess('FATAL', args);
 };
 exports.fatal = fatal;

package/dist/common/helpers/string.d.ts

@@ -16,3 +16,10 @@ export declare const niceUrl: (siteUrl: string) => ISite | undefined;
  * @returns
  */
 export declare function toTitleCase(str: string): string;
+/**
+ * remove all found params from str
+ * @param str
+ * @param params allows single chars and/or strings
+ * @returns
+ */
+export declare function replaceRemove(str: string, ...params: string[]): string;

package/dist/common/helpers/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toTitleCase = exports.niceUrl = exports.truncate = exports.trim = exports.trimSide = exports.csvJSON = void 0;
+exports.replaceRemove = exports.toTitleCase = exports.niceUrl = exports.truncate = exports.trim = exports.trimSide = exports.csvJSON = void 0;
 const csvJSON = (csv) => {
     const lines = csv.split('\n');
     const result = [];
@@ -75,3 +75,37 @@ function toTitleCase(str) {
     return str.replace(/\w\S*/g, (txt) => txt && txt.charAt(0).toUpperCase() + txt.substring(1).toLowerCase());
 }
 exports.toTitleCase = toTitleCase;
+/**
+ * remove all found params from str
+ * @param str
+ * @param params allows single chars and/or strings
+ * @returns
+ */
+function replaceRemove(str, ...params) {
+    const replaceSingles = [];
+    const replaceStrings = [];
+    params.forEach((p) => {
+        if (typeof p !== 'string') {
+            throw new Error('trim only supports strings');
+        }
+        if (p.length === 1) {
+            replaceSingles.push(p);
+        }
+        else {
+            replaceStrings.push(p);
+        }
+    });
+    let firstLength = 0;
+    let changedLength = 0;
+    let ret = str;
+    const singleRegex = `[${replaceSingles.join('')}]*`;
+    const stringRegex = `(${replaceStrings.map((s) => `(${s})`).join('|')})*`;
+    do {
+        firstLength = ret.length;
+        ret = ret.replace(new RegExp(stringRegex, 'gim'), '');
+        ret = ret.replace(new RegExp(singleRegex, 'gim'), '');
+        changedLength = ret.length;
+    } while (changedLength < firstLength);
+    return ret;
+}
+exports.replaceRemove = replaceRemove;

package/dist/ui/helpers/callOpenApi.js

@@ -53,7 +53,7 @@ const callOpenApi = ({ func, apiUrl, overrideAuth, refreshToken, logout, newDefa
                 ((_e = ae.response) === null || _e === void 0 ? void 0 : _e.statusText) ||
                 ((_f = ae.response) === null || _f === void 0 ? void 0 : _f.status) ||
                 'ERROR');
-            if (status === 403) {
+            if (status === 403 || status === 401) {
                 logout();
                 return {
                     error: ae,
@@ -76,10 +76,7 @@ const callOpenApi = ({ func, apiUrl, overrideAuth, refreshToken, logout, newDefa
         data,
         error,
         loading: false,
-        reFetch: () => __awaiter(void 0, void 0, void 0, function* () {
-            const ret = func(cl);
-            return ret;
-        }),
+        reFetch: () => __awaiter(void 0, void 0, void 0, function* () { return func(cl); }),
         url: func.toString(),
         datetime: new Date().getTime(),
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.19",
+  "version": "0.0.23",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -42,7 +42,7 @@
     "@types/jsonwebtoken": "8.5.6"
   },
   "scripts": {
-    "build": "rimraf dist && tsc",
+    "build": "rimraf dist && yarn checklint && tsc",
     "fix": "./node_modules/.bin/eslint --fix './src/**/*.ts' './src/**/*.tsx'",
     "checklint": "npx eslint --ext .ts,.tsx ./src",
     "start": "tsc --watch"