ag-common 0.0.358 → 0.0.360

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

@@ -46,7 +46,8 @@ export declare const queryDynamo: <T>({ tableName, pkName, pkValue, pkOperator,
     Items: T[];
     startKey?: Key | undefined;
 }>;
-export declare const getDynamoTtl: (days: number) => number;
+export declare const getDynamoTtlDays: (days: number) => number;
+export declare const getDynamoTtlMinutes: (mins: number) => number;
 export declare const wipeTable: (tableName: string) => Promise<{
     errors?: string[] | undefined;
 }>;

package/dist/api/helpers/dynamo.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDynamoUpdates = exports.wipeTable = exports.getDynamoTtl = exports.queryDynamo = exports.getItemsDynamo = exports.getItemDynamo = exports.scan = exports.batchDelete = exports.batchWrite = exports.putDynamo = exports.setDynamo = exports.dynamoDb = void 0;
+exports.getDynamoUpdates = exports.wipeTable = exports.getDynamoTtlMinutes = exports.getDynamoTtlDays = exports.queryDynamo = exports.getItemsDynamo = exports.getItemDynamo = exports.scan = exports.batchDelete = exports.batchWrite = exports.putDynamo = exports.setDynamo = exports.dynamoDb = void 0;
 const log_1 = require("../../common/helpers/log");
 const array_1 = require("../../common/helpers/array");
 const sleep_1 = require("../../common/helpers/sleep");
@@ -317,8 +317,10 @@ const queryDynamo = ({ tableName, pkName, pkValue, pkOperator = '=', skName, skV
     return { Items, startKey: undefined };
 });
 exports.queryDynamo = queryDynamo;
-const getDynamoTtl = (days) => Math.ceil(new Date().getTime() / 1000) + days * 86400;
-exports.getDynamoTtl = getDynamoTtl;
+const getDynamoTtlDays = (days) => Math.ceil(new Date().getTime() / 1000) + days * 86400;
+exports.getDynamoTtlDays = getDynamoTtlDays;
+const getDynamoTtlMinutes = (mins) => Math.ceil(new Date().getTime() / 1000) + mins * 60;
+exports.getDynamoTtlMinutes = getDynamoTtlMinutes;
 const wipeTable = (tableName) => __awaiter(void 0, void 0, void 0, function* () {
     var _h;
     const dbRaw = new dynamodb_1.default({ apiVersion: '2012-10-08' });

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

@@ -1,3 +1,4 @@
+/** ensure that dynamo tables in stack dont exceed passed in provisioned limits */
 export declare const enforceDynamoProvisionCap: ({ tables, readsMax, writesMax, mustEqual, }: {
     tables: any[];
     /**
@@ -9,7 +10,7 @@ export declare const enforceDynamoProvisionCap: ({ tables, readsMax, writesMax,
      */
     writesMax?: number | undefined;
     /**
-     * default false. if true, will throw if cap isnt met
+     * default false. if true, will throw if cap isnt met. will still throw if exceeds.
      */
     mustEqual?: boolean | undefined;
 }) => void;

package/dist/api/helpers/enforceDynamoProvisionCap.js

@@ -9,6 +9,7 @@ const extractSum = ({ str, regex }) => {
     return (0, math_1.sumArray)(((_a = str
         .match(regex)) === null || _a === void 0 ? void 0 : _a.map((s2) => (0, string_1.trim)(s2.substring(s2.indexOf(':') + 1), ':', ',', ' ')).filter((r) => r && Number(r)).map((r) => Number(r))) || []);
 };
+/** ensure that dynamo tables in stack dont exceed passed in provisioned limits */
 const enforceDynamoProvisionCap = ({ tables, readsMax = 25, writesMax = 25, mustEqual = false, }) => {
     if (!tables || tables.length === 0) {
         (0, log_1.warn)('error in dynamo FT enforce');

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

@@ -46,7 +46,18 @@ export declare const deleteFiles: ({ Bucket, Keys, }: {
 }) => Promise<{
     error?: string;
 }>;
-export declare function listFiles(bucketName: string): Promise<string[]>;
+export declare const copyFile: ({ Bucket, fromKey, toKey, deleteSource, }: {
+    Bucket: string;
+    fromKey: string;
+    toKey: string;
+    /** if true, will delete original after copy. default false */
+    deleteSource?: boolean | undefined;
+}) => Promise<{
+    error?: string;
+}>;
+export declare function listFiles(bucketName: string, opt?: {
+    prefix?: string;
+}): Promise<string[]>;
 /**
  * allow uploading of file directly to s3
  * @param param0

package/dist/api/helpers/s3.js

@@ -24,7 +24,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPresignedPostURL = exports.listFiles = exports.deleteFiles = exports.deleteFile = exports.uploadFile = exports.putS3Object = exports.getS3Objects = exports.getS3Object = exports.setS3 = void 0;
+exports.getPresignedPostURL = exports.listFiles = exports.copyFile = exports.deleteFiles = exports.deleteFile = exports.uploadFile = exports.putS3Object = exports.getS3Objects = exports.getS3Object = exports.setS3 = void 0;
 const s3_1 = __importDefault(require("aws-sdk/clients/s3"));
 const log_1 = require("../../common/helpers/log");
 const array_1 = require("../../common/helpers/array");
@@ -110,7 +110,30 @@ const deleteFiles = ({ Bucket, Keys, }) => __awaiter(void 0, void 0, void 0, fun
     return {};
 });
 exports.deleteFiles = deleteFiles;
-function listFiles(bucketName) {
+const copyFile = ({ Bucket, fromKey, toKey, deleteSource = false, }) => __awaiter(void 0, void 0, void 0, function* () {
+    (0, log_1.debug)(`copying s3 file from ${Bucket}- ${fromKey} to ${toKey}`);
+    const res = yield s3
+        .copyObject({
+        //incl bucket
+        CopySource: Bucket + '/' + fromKey,
+        //dest
+        Bucket,
+        Key: toKey,
+    })
+        .promise();
+    if (res.$response.error) {
+        return { error: res.$response.error.message };
+    }
+    if (deleteSource) {
+        const df = yield (0, exports.deleteFile)({ Bucket, Key: fromKey });
+        if (df.error) {
+            return { error: df.error };
+        }
+    }
+    return {};
+});
+exports.copyFile = copyFile;
+function listFiles(bucketName, opt) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -124,6 +147,7 @@ function listFiles(bucketName) {
                     .listObjectsV2({
                     Bucket: bucketName,
                     ContinuationToken: response.NextContinuationToken,
+                    Prefix: opt === null || opt === void 0 ? void 0 : opt.prefix,
                 })
                     .promise();
                 (_b = (_a = response.Contents) === null || _a === void 0 ? void 0 : _a.filter((r) => r.Key)) === null || _b === void 0 ? void 0 : _b.map((c) => {

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

@@ -2,7 +2,7 @@ import { TGetAndValidateToken } from './validations';
 import { User } from '../../ui/helpers/jwt';
 import { TLang } from '../../common/helpers/i18n';
 import { APIGatewayEvent, APIGatewayProxyResult } from '../types';
-export declare type NextType<T> = ({ event, body, params, userProfile, lang, }: {
+export type NextType<T> = ({ event, body, params, userProfile, lang, }: {
     params: Record<string, string>;
     event: APIGatewayEvent;
     body: T;

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

@@ -8,7 +8,7 @@ export interface IGetAndValidateToken {
     tokenRaw?: string;
     COGNITO_USER_POOL_ID: string;
 }
-export declare type TGetAndValidateToken = (p: IGetAndValidateToken) => Promise<{
+export type TGetAndValidateToken = (p: IGetAndValidateToken) => Promise<{
     error?: APIGatewayProxyResult;
     token?: string;
     userProfile?: User;

package/dist/api/openapi-postfix.js

@@ -4,28 +4,34 @@
 /* eslint-disable no-console */
 const fs = require('fs');
 const process = require('process');
-var pathV = require('path');
-var cwd = process.cwd();
-var resolvePath = (p) => pathV.resolve(cwd, p);
+const pathV = require('path');
+const cwd = process.cwd();
+const resolvePath = (p) => pathV.resolve(cwd, p);
 function run() {
-    var files = fs
+    const files = fs
         .readdirSync(resolvePath('./dist/api'))
-        .filter((r) => r.endsWith('.js'))
-        .map((s) => `./dist/api/${s}`);
-    var found = false;
-    files.filter(fs.existsSync).forEach((f) => {
-        var c = fs.readFileSync(f).toString();
-        if (c.includes('url_1')) {
-            console.log('removing url_1 from ' + f);
-            c = c.replace(/url_1\./gim, '');
+        .filter((r) => r.endsWith('.js') || r.endsWith('.d.ts'))
+        .map((s) => `./dist/api/${s}`)
+        .filter(fs.existsSync)
+        .map((file) => ({ file, content: fs.readFileSync(file).toString() }));
+    let found = false;
+    files.forEach(({ file, content }) => {
+        if (content.includes('url_1')) {
+            console.log('removing url_1 from ' + file);
+            content = content.replace(/url_1\./gim, '');
             found = true;
         }
-        if (c.includes('this.configuration.queryParamsStringify(')) {
-            console.log('fixing queryparams default from ' + f);
-            c = c.replace(/this.configuration.queryParamsStringify\(/gim, '(this.configuration.queryParamsStringify||querystring)(');
+        if (content.includes('this.configuration.queryParamsStringify(')) {
+            console.log('fixing queryparams default from ' + file);
+            content = content.replace(/this.configuration.queryParamsStringify\(/gim, '(this.configuration.queryParamsStringify||querystring)(');
             found = true;
         }
-        fs.writeFileSync(f, c);
+        if (content.includes(`import("axios").`)) {
+            console.log('fixing axios import from ' + file);
+            content = content.replace(/import\("axios"\)\./gim, '');
+            found = true;
+        }
+        fs.writeFileSync(file, content);
     });
     if (!found) {
         console.log('error: no files were fixed');

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

@@ -97,7 +97,7 @@ export interface DynamoDBStreamEvent {
         userIdentity?: any;
     }[];
 }
-export declare type Key = {
+export type Key = {
     [key: string]: AttributeValue;
 };
 export {};

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

@@ -50,7 +50,7 @@ export interface ILambdaConfigs {
         default?: ILambdaConfig;
     };
 }
-export declare type TSkOperator = 'BETWEEN' | '<' | '<=' | '=' | '>=' | '>' | '<>' | 'BEGINS_WITH';
+export type TSkOperator = 'BETWEEN' | '<' | '<=' | '=' | '>=' | '>' | '<>' | 'BEGINS_WITH';
 export interface IQueryDynamo {
     pkName: string;
     pkValue: string | number;

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

@@ -1,10 +1,10 @@
-declare type TLangExceptEn = 'id' | 'vi' | 'pt';
-export declare type TLang = TLangExceptEn | 'en';
+type TLangExceptEn = 'id' | 'vi' | 'pt';
+export type TLang = TLangExceptEn | 'en';
 export declare const AllLang: TLang[];
 /**
  * null = wont translate. undefined = fallback to eng
  */
-export declare type TResource = {
+export type TResource = {
     [k in TLangExceptEn]?: string | null;
 } & {
     en: string;

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

@@ -1,4 +1,4 @@
-export declare type TLogType = 'TRACE' | 'DEBUG' | 'INFO' | 'WARN' | 'ERROR' | 'FATAL';
+export type TLogType = 'TRACE' | 'DEBUG' | 'INFO' | 'WARN' | 'ERROR' | 'FATAL';
 export declare const GetLogLevel: (l: TLogType) => number;
 export declare const SetLogLevel: (l: TLogType) => void;
 export declare const debug: (...args: unknown[]) => void;

package/dist/ui/components/BorderGradient/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-declare type IOnClick = React.MouseEvent<HTMLDivElement, MouseEvent> | React.MouseEvent<HTMLAnchorElement, MouseEvent>;
+type IOnClick = React.MouseEvent<HTMLDivElement, MouseEvent> | React.MouseEvent<HTMLAnchorElement, MouseEvent>;
 export interface IBorderGradient {
     canClick?: boolean;
     noGrow?: boolean;

package/dist/ui/components/RowOrColumn/index.d.ts

@@ -8,6 +8,6 @@ export interface IRowOrColumn {
     title?: string;
     enableOverflow?: boolean;
 }
-export declare type IFlexColumn = IRowOrColumn;
-export declare type IFlexRow = IRowOrColumn;
+export type IFlexColumn = IRowOrColumn;
+export type IFlexRow = IRowOrColumn;
 export declare const RowOrColumn: (props: IRowOrColumn) => JSX.Element;

package/dist/ui/components/Search/types.d.ts

@@ -29,9 +29,9 @@ export interface ISearchDialog<T> {
         totalItems?: (showing: number, outof: number) => string;
     };
 }
-export declare type TSearchModalRes<T> = undefined | {
+export type TSearchModalRes<T> = undefined | {
     foundItem: T;
     searchText: string;
 };
-export declare type ISearchModal<T> = ISearchDialog<T>;
-export declare type ISearchInline<T> = ISearchDialog<T>;
+export type ISearchModal<T> = ISearchDialog<T>;
+export type ISearchInline<T> = ISearchDialog<T>;

package/dist/ui/components/SparkLine/index.d.ts

@@ -9,7 +9,7 @@ export interface ISparkLine {
     pointTitleF?: (p: TSparkLineData) => string;
     title?: string;
 }
-export declare type TSparkLineData = {
+export type TSparkLineData = {
     x: number;
     y: number;
 };

package/dist/ui/helpers/axiosHelper.js

@@ -39,23 +39,23 @@ const axiosHelper = ({ verb, url, body, headers, timeout = 30000, retryMax = 0,
             }
             let noBody = false;
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            let axios = axios_1.default.post;
+            let axiosV = axios_1.default.post;
             if (verb === 'put') {
-                axios = axios_1.default.put;
+                axiosV = axios_1.default.put;
             }
             else if (verb === 'post') {
-                axios = axios_1.default.post;
+                axiosV = axios_1.default.post;
             }
             else if (verb === 'patch') {
-                axios = axios_1.default.patch;
+                axiosV = axios_1.default.patch;
             }
             else if (verb === 'delete') {
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                axios = axios_1.default.delete;
+                axiosV = axios_1.default.delete;
                 noBody = true;
             }
             if (noBody) {
-                ret = yield axios(url, {
+                ret = yield axiosV(url, {
                     headers: setHeaders,
                     timeout,
                     timeoutErrorMessage: `${url} timeout`,
@@ -66,7 +66,7 @@ const axiosHelper = ({ verb, url, body, headers, timeout = 30000, retryMax = 0,
                     setHeaders['Content-Type'] =
                         setHeaders['Content-Type'] || 'application/json';
                 }
-                ret = yield axios(url, body, { headers: setHeaders });
+                ret = yield axiosV(url, body, { headers: setHeaders });
             }
             return ret;
         }

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

@@ -1,7 +1,7 @@
 import { ICallOpenApi, OverrideAuth } from './types';
 import { CacheItems } from '../routes';
 import { AxiosWrapperLite } from '../jwt';
-export declare type TCallOpenApiCached<T, TDefaultApi> = ICallOpenApi<T, TDefaultApi> & {
+export type TCallOpenApiCached<T, TDefaultApi> = ICallOpenApi<T, TDefaultApi> & {
     /**
      * if falsey, will run callOpenApi directly
      */

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

@@ -1,3 +1,9 @@
 import { AxiosResponse } from 'axios';
 import { ApiResponse } from './types';
+/**
+ * shim to convert raw response to an axios style response.
+ * must convert all DefaultClass requests to the Raw equivalent
+ * @param p
+ * @returns
+ */
 export declare const apiResponseToAxiosResponse: <T>(p: () => Promise<ApiResponse<T>>) => Promise<AxiosResponse<T, any>>;

package/dist/ui/helpers/callOpenApi/helpers.js

@@ -11,6 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apiResponseToAxiosResponse = void 0;
 const array_1 = require("../../../common/helpers/array");
+/**
+ * shim to convert raw response to an axios style response.
+ * must convert all DefaultClass requests to the Raw equivalent
+ * @param p
+ * @returns
+ */
 const apiResponseToAxiosResponse = (p) => __awaiter(void 0, void 0, void 0, function* () {
     return p()
         .then((r) => __awaiter(void 0, void 0, void 0, function* () {

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

@@ -1,13 +1,13 @@
 import { ICallOpenApi } from './types';
 import { CacheItems } from '../routes';
 import { AxiosWrapper } from '../jwt';
-export declare type TUseCallOpenApiDispatch<A> = (value: A) => A;
-export declare type TUseCallOpenApi<T> = AxiosWrapper<T> & {
+export type TUseCallOpenApiDispatch<A> = (value: A) => A;
+export type TUseCallOpenApi<T> = AxiosWrapper<T> & {
     loaded: boolean;
     loadcount: number;
     setData: (d: TUseCallOpenApiDispatch<T | undefined>) => void;
 };
-declare type TUseCallOpenApiInt<T, TDefaultApi> = ICallOpenApi<T, TDefaultApi> & {
+type TUseCallOpenApiInt<T, TDefaultApi> = ICallOpenApi<T, TDefaultApi> & {
     cacheKey: string;
     /**
      * will shortcut and return the appropriate axioswrapper data if cachekey is found

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

@@ -1,4 +1,4 @@
-export declare type TOnMessage = (m: string, options?: {
+export type TOnMessage = (m: string, options?: {
     appearance: 'error' | 'success';
 }) => void;
 export interface ICognitoAuth {

package/dist/ui/helpers/cookie/const.d.ts

@@ -1,6 +1,6 @@
 export declare const expireDate = "Thu, 01 Jan 1970 00:00:00 UTC";
 export declare const maxCookieLen = 4000;
-export declare type Dispatch<A> = (value: A) => void;
-export declare type SetStateAction<S> = S | ((prevState: S) => S);
-export declare type ReturnType<T> = [T, Dispatch<SetStateAction<T>>];
-export declare type TParse<T> = (s: string | null | undefined) => T;
+export type Dispatch<A> = (value: A) => void;
+export type SetStateAction<S> = S | ((prevState: S) => S);
+export type ReturnType<T> = [T, Dispatch<SetStateAction<T>>];
+export type TParse<T> = (s: string | null | undefined) => T;

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

@@ -1,7 +1,7 @@
 import { ICognitoAuth } from './cognito';
 import { AxiosWrapperLite } from './jwt';
 import { TLang } from '../../common/helpers/i18n';
-export declare type TProtocol = 'http:' | 'https:';
+export type TProtocol = 'http:' | 'https:';
 export interface LocationSubset {
     /**
      * slash only path eg /aaa/bbb
@@ -33,7 +33,7 @@ export interface LocationSubset {
      */
     path: string;
 }
-export declare type CacheItems = CacheItem<any>[];
+export type CacheItems = CacheItem<any>[];
 export interface CacheItem<T> {
     cacheKey: string;
     prefillData: AxiosWrapperLite<T>;

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

@@ -1,5 +1,5 @@
 import { DependencyList, EffectCallback } from 'react';
-declare type HookWithDependencies<C, R> = (callback: C, deps: DependencyList) => R;
+type HookWithDependencies<C, R> = (callback: C, deps: DependencyList) => R;
 export declare const useGranularHook: <T extends HookWithDependencies<C, ReturnType<T>>, C>(hook: T, callback: C, primaryDeps: DependencyList, secondaryDeps: DependencyList) => ReturnType<T>;
 export declare const useGranularEffect: (effect: EffectCallback, primaryDeps: DependencyList, secondaryDeps: DependencyList) => void;
 export {};

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

@@ -1,5 +1,5 @@
 import { RefObject } from 'react';
-declare type Event = MouseEvent | TouchEvent;
+type Event = MouseEvent | TouchEvent;
 export declare function useOnClickOutside<T extends HTMLElement = HTMLElement>(p: {
     /**
      * default false

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "ag-common",
-  "version": "0.0.358",
+  "version": "0.0.360",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
   "repository": "github:andreigec/ag-common",
   "license": "ISC",
-  "packageManager": "yarn@3.3.0",
   "scripts": {
+    "preinstall": "npx only-allow pnpm",
     "format": "npx eslint --ext .ts,.tsx ./src --fix",
-    "build": "rimraf dist && yarn lint && tsc",
+    "build": "rimraf dist && npm run lint && tsc",
     "lint": "npx eslint --ext .ts,.tsx ./src",
     "start": "cross-env BROWSER=none start-storybook -p 6006",
     "build-storybook": "build-storybook -o docs --quiet"