ag-common 0.0.319 → 0.0.322

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

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

package/dist/api/helpers/dynamo.js

@@ -33,10 +33,8 @@ const putDynamo = (item, tableName) => __awaiter(void 0, void 0, void 0, functio
     (0, log_1.info)(`running dynamo put=${JSON.stringify(params, null, 2)}`);
     // write the todo to the database
     const put = yield exports.dynamoDb.put(params).promise();
-    if (put.$response.error &&
-        put.$response.error.statusCode &&
-        put.$response.error.statusCode >= 400) {
-        throw new Error(put.$response.error.message);
+    if (put.$response.error && put.$response.error.statusCode) {
+        return { error: put.$response.error.message };
     }
     // put never returns into, so just use what we have already
     return { data: item };
@@ -53,6 +51,9 @@ let batchWriteRaw = (req) => __awaiter(void 0, void 0, void 0, function* () {
                 RequestItems: req,
             })
                 .promise();
+            if (res.$response.error) {
+                throw new Error(res.$response.error.message);
+            }
             return res;
         }
         catch (e) {
@@ -153,9 +154,7 @@ const scan = (tableName) => __awaiter(void 0, void 0, void 0, function* () {
             .scan({ TableName: tableName, ExclusiveStartKey })
             .promise();
         ExclusiveStartKey = LastEvaluatedKey;
-        if ($response.error &&
-            $response.error.statusCode &&
-            $response.error.statusCode >= 400) {
+        if ($response.error && $response.error.statusCode) {
             throw new Error($response.error.message);
         }
         if (newitems) {
@@ -213,7 +212,7 @@ const getItemsDynamo = ({ tableName, items, }) => __awaiter(void 0, void 0, void
 });
 exports.getItemsDynamo = getItemsDynamo;
 const queryDynamo = ({ tableName, pkName, pkValue, pkOperator = '=', skName, skValue, skOperator = '=', indexName, count = 1000, startKey: startKeyIn, filterName, filterValue, filterOperator = '=', sortAscending = true, }) => __awaiter(void 0, void 0, void 0, function* () {
-    var _g, _h;
+    var _g;
     let startKey = startKeyIn;
     let kce = `#${pkName.toLowerCase()} ${pkOperator} :${pkName.toLowerCase()}`;
     const ean = { [`#${pkName.toLowerCase()}`]: pkName };
@@ -293,7 +292,7 @@ const queryDynamo = ({ tableName, pkName, pkValue, pkOperator = '=', skName, skV
             throw e;
         }
         startKey = lek;
-        if ($response.error && ((_g = $response.error.statusCode) !== null && _g !== void 0 ? _g : 0) >= 400) {
+        if ($response.error) {
             (0, log_1.error)('error. query params=', JSON.stringify(params));
             throw new Error($response.error.message);
         }
@@ -301,7 +300,7 @@ const queryDynamo = ({ tableName, pkName, pkValue, pkOperator = '=', skName, skV
         if (newitems) {
             Items.push(...newitems.map((r) => r));
         }
-        if (count > 0 && ((_h = newitems === null || newitems === void 0 ? void 0 : newitems.length) !== null && _h !== void 0 ? _h : 0) >= count) {
+        if (count > 0 && ((_g = newitems === null || newitems === void 0 ? void 0 : newitems.length) !== null && _g !== void 0 ? _g : 0) >= count) {
             return { Items, startKey };
         }
     } while (startKey && Object.keys(startKey).length > 0);
@@ -311,7 +310,7 @@ exports.queryDynamo = queryDynamo;
 const getDynamoTtl = (days) => Math.ceil(new Date().getTime() / 1000) + days * 86400;
 exports.getDynamoTtl = getDynamoTtl;
 const wipeTable = (tableName) => __awaiter(void 0, void 0, void 0, function* () {
-    var _j;
+    var _h;
     const dbRaw = new dynamodb_1.default({ apiVersion: '2012-10-08' });
     let infoV = yield dbRaw
         .describeTable({
@@ -326,7 +325,7 @@ const wipeTable = (tableName) => __awaiter(void 0, void 0, void 0, function* ()
         TableName: tableName,
     })
         .promise();
-    (0, log_1.warn)(`will delete ${(_j = all === null || all === void 0 ? void 0 : all.Items) === null || _j === void 0 ? void 0 : _j.length} items from ${tableName}`);
+    (0, log_1.warn)(`will delete ${(_h = all === null || all === void 0 ? void 0 : all.Items) === null || _h === void 0 ? void 0 : _h.length} items from ${tableName}`);
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     const datagr = (0, array_1.chunk)(all.Items, 25);

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

@@ -13,7 +13,9 @@ export declare const putS3Object: ({ Body, Bucket, Key, ContentType, }: {
     Body: string | Blob;
     Bucket: string;
     Key: string;
-}) => Promise<void>;
+}) => Promise<{
+    error?: string;
+}>;
 export declare const uploadFile: ({ Bucket, Key, Body, }: {
     Bucket: string;
     Key: string;
@@ -22,4 +24,6 @@ export declare const uploadFile: ({ Bucket, Key, Body, }: {
 export declare const deleteFile: ({ Bucket, Key, }: {
     Bucket: string;
     Key: string;
-}) => Promise<void>;
+}) => Promise<{
+    error?: string;
+}>;

package/dist/api/helpers/s3.js

@@ -25,7 +25,7 @@ const getS3Object = ({ fileurl, }) => __awaiter(void 0, void 0, void 0, function
 });
 exports.getS3Object = getS3Object;
 const putS3Object = ({ Body, Bucket, Key, ContentType, }) => __awaiter(void 0, void 0, void 0, function* () {
-    yield s3
+    const r = yield s3
         .putObject({
         Body,
         Bucket,
@@ -33,6 +33,10 @@ const putS3Object = ({ Body, Bucket, Key, ContentType, }) => __awaiter(void 0, v
         ContentType,
     })
         .promise();
+    if (r.$response.error) {
+        return { error: r.$response.error.message };
+    }
+    return {};
 });
 exports.putS3Object = putS3Object;
 const uploadFile = ({ Bucket, Key, Body, }) => __awaiter(void 0, void 0, void 0, function* () {
@@ -43,7 +47,8 @@ exports.uploadFile = uploadFile;
 const deleteFile = ({ Bucket, Key, }) => __awaiter(void 0, void 0, void 0, function* () {
     const res = yield s3.deleteObject({ Bucket, Key }).promise();
     if (res.$response.error) {
-        throw res.$response.error;
+        return { error: res.$response.error.message };
     }
+    return {};
 });
 exports.deleteFile = deleteFile;

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

@@ -8,5 +8,9 @@ export interface ISendEmail {
     sourceArn: string;
     from: string;
 }
-export declare const sendEmail: ({ to, message, subject, sourceArn, from, }: ISendEmail) => Promise<void>;
-export declare const sendEmails: (emails: ISendEmail[]) => Promise<void[]>;
+export declare const sendEmail: ({ to, message, subject, sourceArn, from, }: ISendEmail) => Promise<{
+    error?: string;
+}>;
+export declare const sendEmails: (emails: ISendEmail[]) => Promise<{
+    error?: string | undefined;
+}[]>;

package/dist/api/helpers/ses.js

@@ -20,6 +20,7 @@ const setSes = (region) => {
 };
 exports.setSes = setSes;
 const sendEmail = ({ to, message, subject, sourceArn, from, }) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     // Create sendEmail params
     const params = {
         Destination: {
@@ -42,7 +43,11 @@ const sendEmail = ({ to, message, subject, sourceArn, from, }) => __awaiter(void
         ReplyToAddresses: [from],
         SourceArn: sourceArn,
     };
-    yield exports.ses.sendEmail(params).promise();
+    const res = yield exports.ses.sendEmail(params).promise();
+    if (res.$response.error) {
+        return { error: (_a = res.$response.error) === null || _a === void 0 ? void 0 : _a.message };
+    }
+    return {};
 });
 exports.sendEmail = sendEmail;
 const sendEmails = (emails) => __awaiter(void 0, void 0, void 0, function* () { return Promise.all(emails.map(exports.sendEmail)); });

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

@@ -1,4 +1,6 @@
 import SQS from 'aws-sdk/clients/sqs';
 export declare let sqs: SQS;
 export declare const setSqs: (region: string) => void;
-export declare const sendMessages: <T>(items: T[], queueUrl: string) => Promise<void>;
+export declare const sendMessages: <T>(items: T[], queueUrl: string) => Promise<{
+    error?: string;
+}>;

package/dist/api/helpers/sqs.js

@@ -30,10 +30,9 @@ const sendMessages = (items, queueUrl) => __awaiter(void 0, void 0, void 0, func
         })),
     };
     const put = yield exports.sqs.sendMessageBatch(req).promise();
-    if (put.$response.error &&
-        put.$response.error.statusCode &&
-        put.$response.error.statusCode >= 400) {
-        throw new Error(put.$response.error.message);
+    if (put.$response.error && put.$response.error.statusCode) {
+        return { error: put.$response.error.message };
     }
+    return {};
 });
 exports.sendMessages = sendMessages;

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

@@ -3,7 +3,21 @@ export declare const addHours: (d: number, h: number) => Date;
 export declare const addDays: (dIn: Date, count: number) => Date;
 export declare const addMinutes: (date: Date, minutes: number) => Date;
 export declare const lastDayInMonth: (date: Date) => Date;
-export declare const dateDiffDays: (date1: Date, date2: Date) => number;
+/**
+ * breaks ticks into time diffs
+ * @param lowDate
+ * @param highDate defaults to Date.Now
+ * @returns
+ */
+export declare const dateDiff: (lowDate: Date, highDate?: Date) => {
+    totalMinutes: number;
+    totalHours: number;
+    totalDays: number;
+    totalYears: number;
+};
+/**
+ * convert csharp datetime to js datetime
+ */
 export declare const CSharpToJs: (charpTicks: number) => Date;
 /**
  *

package/dist/common/helpers/date.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dateTimeToNearestMinute = exports.CSharpToJs = exports.dateDiffDays = exports.lastDayInMonth = exports.addMinutes = exports.addDays = exports.addHours = exports.getTimeSeconds = void 0;
+exports.dateTimeToNearestMinute = exports.CSharpToJs = exports.dateDiff = exports.lastDayInMonth = exports.addMinutes = exports.addDays = exports.addHours = exports.getTimeSeconds = void 0;
+const math_1 = require("./math");
 const getTimeSeconds = () => Math.ceil(new Date().getTime() / 1000);
 exports.getTimeSeconds = getTimeSeconds;
 const addHours = (d, h) => {
@@ -17,14 +18,24 @@ const addMinutes = (date, minutes) => new Date(date.getTime() + minutes * 60000)
 exports.addMinutes = addMinutes;
 const lastDayInMonth = (date) => new Date(date.getFullYear(), date.getMonth() + 1, 0);
 exports.lastDayInMonth = lastDayInMonth;
-const dateDiffDays = (date1, date2) => {
-    const dt1 = new Date(date1);
-    const dt2 = new Date(date2);
-    return Math.floor((Date.UTC(dt2.getFullYear(), dt2.getMonth(), dt2.getDate()) -
-        Date.UTC(dt1.getFullYear(), dt1.getMonth(), dt1.getDate())) /
-        1000);
+/**
+ * breaks ticks into time diffs
+ * @param lowDate
+ * @param highDate defaults to Date.Now
+ * @returns
+ */
+const dateDiff = (lowDate, highDate) => {
+    const ticksSince = (highDate !== null && highDate !== void 0 ? highDate : new Date()).getTime() - lowDate.getTime();
+    const totalMinutes = (0, math_1.toFixedDown)(ticksSince / 1000 / 60, 0);
+    const totalHours = (0, math_1.toFixedDown)(totalMinutes / 60, 0);
+    const totalDays = (0, math_1.toFixedDown)(totalHours / 24, 0);
+    const totalYears = (0, math_1.toFixedDown)(totalDays / 365, 0);
+    return { totalMinutes, totalHours, totalDays, totalYears };
 };
-exports.dateDiffDays = dateDiffDays;
+exports.dateDiff = dateDiff;
+/**
+ * convert csharp datetime to js datetime
+ */
 const CSharpToJs = (charpTicks) => {
     // ticks are in nanotime; convert to microtime
     const ticks = charpTicks / 10000;

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

@@ -61,3 +61,4 @@ export declare const chunkString: (str: string, length: number) => string[];
  */
 export declare function stringToObject(raw: string, splitKeyValue: string, splitKeys: string): Record<string, string>;
 export declare const indexOfNumber: (str: string, char: string, num?: number) => number | undefined;
+export declare function isValidUrl(raw: string): boolean;

package/dist/common/helpers/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.indexOfNumber = exports.stringToObject = exports.chunkString = exports.safeStringify = exports.containsInsensitive = exports.containsInsensitiveIndex = exports.replaceRemove = exports.toTitleCase = exports.niceUrl = exports.truncate = exports.trim = exports.trimSide = exports.csvJSON = exports.fromBase64 = exports.toBase64 = void 0;
+exports.isValidUrl = exports.indexOfNumber = exports.stringToObject = exports.chunkString = exports.safeStringify = exports.containsInsensitive = exports.containsInsensitiveIndex = exports.replaceRemove = exports.toTitleCase = exports.niceUrl = exports.truncate = exports.trim = exports.trimSide = exports.csvJSON = exports.fromBase64 = exports.toBase64 = void 0;
 const toBase64 = (str) => Buffer.from(str).toString('base64');
 exports.toBase64 = toBase64;
 const fromBase64 = (str) => Buffer.from(decodeURIComponent(str), 'base64').toString();
@@ -197,3 +197,14 @@ const indexOfNumber = (str, char, num = 0) => {
     return ret;
 };
 exports.indexOfNumber = indexOfNumber;
+function isValidUrl(raw) {
+    let url;
+    try {
+        url = new URL(raw);
+    }
+    catch (_) {
+        return false;
+    }
+    return url.protocol === 'http:' || url.protocol === 'https:';
+}
+exports.isValidUrl = isValidUrl;

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

@@ -1,2 +1,8 @@
-export declare const daydiffstr: (dayticks: number) => string;
+/**
+ * returns appropriate time diff string
+ * @param lowDate
+ * @param highDate defaults to Date.Now
+ * @returns
+ */
+export declare const dateDiffToString: (lowDate: Date, highDate?: Date) => string;
 export declare const getDMY: (date: Date, dayOffset?: number) => string;

package/dist/ui/helpers/date.js

@@ -1,28 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDMY = exports.daydiffstr = void 0;
+exports.getDMY = exports.dateDiffToString = void 0;
 const plural_1 = require("./plural");
 const date_1 = require("../../common/helpers/date");
-const math_1 = require("../../common/helpers/math");
-const daydiffstr = (dayticks) => {
-    const ticksSince = new Date().getTime() - dayticks;
-    const totalMinutes = (0, math_1.toFixedDown)(ticksSince / 1000 / 60, 0);
-    const totalHours = (0, math_1.toFixedDown)(totalMinutes / 60, 0);
-    const totalDays = (0, math_1.toFixedDown)(totalHours / 24, 0);
-    const totalYears = (0, math_1.toFixedDown)(totalDays / 365, 0);
-    let ts = `${totalYears} ${(0, plural_1.plural)('yr', totalYears)} ago `;
-    if (totalMinutes < 60) {
-        ts = `${totalMinutes} ${(0, plural_1.plural)('min', totalMinutes)} ago `;
+/**
+ * returns appropriate time diff string
+ * @param lowDate
+ * @param highDate defaults to Date.Now
+ * @returns
+ */
+const dateDiffToString = (lowDate, highDate) => {
+    if (!lowDate) {
+        return '';
     }
-    else if (totalHours < 24) {
-        ts = `${totalHours} ${(0, plural_1.plural)('hr', totalHours)} ago `;
+    const d = (0, date_1.dateDiff)(lowDate, highDate !== null && highDate !== void 0 ? highDate : new Date());
+    let ts = `${d.totalYears} ${(0, plural_1.plural)('yr', d.totalYears)} ago `;
+    if (d.totalMinutes < 60) {
+        ts = `${d.totalMinutes} ${(0, plural_1.plural)('min', d.totalMinutes)} ago `;
     }
-    else if (totalDays < 365) {
-        ts = `${totalDays} ${(0, plural_1.plural)('day', totalDays)} ago `;
+    else if (d.totalHours < 24) {
+        ts = `${d.totalHours} ${(0, plural_1.plural)('hr', d.totalHours)} ago `;
+    }
+    else if (d.totalDays < 365) {
+        ts = `${d.totalDays} ${(0, plural_1.plural)('day', d.totalDays)} ago `;
     }
     return ts;
 };
-exports.daydiffstr = daydiffstr;
+exports.dateDiffToString = dateDiffToString;
 const getDMY = (date, dayOffset) => {
     const date1 = (0, date_1.addDays)(date, dayOffset || 0);
     const d = String(date1.getDate()).padStart(2, '0');

package/dist/ui/helpers/useLocalStorage.js

@@ -4,7 +4,7 @@ exports.UseLocalStorage = exports.getLocalStorageItem = exports.setLocalStorageI
 const log_1 = require("../../common/helpers/log");
 const object_1 = require("../../common/helpers/object");
 const react_1 = require("react");
-const getTimeSeconds = () => Math.ceil(new Date().getTime() / 1000);
+const date_1 = require("../../common/helpers/date");
 const clearLocalStorageItem = (key) => {
     if (typeof window === 'undefined') {
         return;
@@ -41,7 +41,7 @@ const setLocalStorageItem = (key, value, ttl) => {
             return;
         }
         const set = {
-            expiry: !ttl ? undefined : getTimeSeconds() + ttl,
+            expiry: !ttl ? undefined : (0, date_1.getTimeSeconds)() + ttl,
             val: JSON.stringify(value),
         };
         window.localStorage.setItem(key, JSON.stringify(set));
@@ -58,7 +58,7 @@ const getLocalStorageItem = (key, initialValue, ttl) => {
     }
     const itemraw = window.localStorage.getItem(key);
     const item = (0, object_1.tryJsonParse)(itemraw, undefined);
-    if (!item || (item.expiry && getTimeSeconds() > item.expiry)) {
+    if (!item || (item.expiry && (0, date_1.getTimeSeconds)() > item.expiry)) {
         (0, exports.setLocalStorageItem)(key, initialValue, ttl);
         return initialValue;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.319",
+  "version": "0.0.322",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",