ag-common 0.0.604 → 0.0.606

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

@@ -26,4 +26,17 @@ export declare const CSharpToJs: (charpTicks: number) => Date;
  * @returns
  */
 export declare const dateTimeToNearestMinute: (minutes: number, date?: Date) => Date;
-export declare const getUtcDateTime: () => Date;
+export declare const dayInMs = 86400000;
+/** strings are padded numbers, eg '02' */
+export interface IUtcDateParams {
+    year: number;
+    month: number;
+    day: number;
+    hours: number;
+    minutes: number;
+    seconds: number;
+}
+export declare const getUtcDateTime: (skipTime?: boolean) => {
+    ticks: number;
+};
+export declare const toMs: ({ day, hours, minutes, month, seconds, year, }: IUtcDateParams) => number;

package/dist/common/helpers/date.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUtcDateTime = exports.dateTimeToNearestMinute = exports.CSharpToJs = exports.dateDiff = exports.lastDayInMonth = exports.addMinutes = exports.addDays = exports.addHours = exports.getTimeSeconds = void 0;
+exports.toMs = exports.getUtcDateTime = exports.dayInMs = 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;
@@ -62,15 +62,48 @@ const dateTimeToNearestMinute = (minutes, date) => {
     return rounded;
 };
 exports.dateTimeToNearestMinute = dateTimeToNearestMinute;
-const getUtcDateTime = () => {
+exports.dayInMs = 8.64e7;
+const getUtcDateTime = (
+/** if true will 0 H,M,S */
+skipTime) => {
     const date = new Date();
-    const year = date.getUTCFullYear();
-    const month = ('0' + (date.getUTCMonth() + 1)).slice(-2);
-    const day = ('0' + date.getUTCDate()).slice(-2);
-    const hours = ('0' + date.getUTCHours()).slice(-2);
-    const minutes = ('0' + date.getUTCMinutes()).slice(-2);
-    const seconds = ('0' + date.getUTCSeconds()).slice(-2);
-    const datetime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds} UTC`;
-    return new Date(datetime);
+    const p = {
+        year: date.getUTCFullYear(),
+        month: date.getUTCMonth() + 1,
+        day: date.getUTCDate(),
+        hours: date.getUTCHours(),
+        minutes: date.getUTCMinutes(),
+        seconds: date.getUTCSeconds(),
+        tz: 'UTC',
+    };
+    if (skipTime) {
+        p.hours = p.minutes = p.seconds = 0;
+    }
+    const ticks = (0, exports.toMs)(p);
+    return { ticks };
 };
 exports.getUtcDateTime = getUtcDateTime;
+const toMs = ({ day, hours, minutes, month, seconds, year, }) => {
+    // Calculate milliseconds in a year (365 days x 24 hours x 60 minutes x 60 seconds x 1000 milliseconds)
+    const millisecondsInYear = 365 * 24 * 60 * 60 * 1000;
+    // Calculate milliseconds in a month (based on 30 days)
+    const millisecondsInMonth = 30 * 24 * 60 * 60 * 1000;
+    // Calculate milliseconds in a day
+    const millisecondsInDay = 24 * 60 * 60 * 1000;
+    // Calculate milliseconds in an hour
+    const millisecondsInHour = 60 * 60 * 1000;
+    // Calculate milliseconds in a minute
+    const millisecondsInMinute = 60 * 1000;
+    // Calculate milliseconds in a second
+    const millisecondsInSecond = 1000;
+    // Calculate milliseconds since epoch based on given datetime values
+    // Note: Math.floor() is used to round down to the nearest integer
+    const millisecondsSinceEpoch = (year - 1970) * millisecondsInYear +
+        (month - 1) * millisecondsInMonth +
+        (day - 1) * millisecondsInDay +
+        hours * millisecondsInHour +
+        minutes * millisecondsInMinute +
+        seconds * millisecondsInSecond;
+    return millisecondsSinceEpoch;
+};
+exports.toMs = toMs;

package/dist/common/helpers/log.js

@@ -2,7 +2,8 @@
 /* eslint-disable no-console */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fatal = exports.error = exports.trace = exports.warn = exports.info = exports.debug = exports.SetLogLevel = exports.SetLogShim = exports.GetLogLevel = void 0;
-const _1 = require(".");
+const array_1 = require("./array");
+const redact_1 = require("./string/redact");
 const GetLogLevel = (l) => ['TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'].findIndex((s) => s === l);
 exports.GetLogLevel = GetLogLevel;
 let logShim;
@@ -32,7 +33,11 @@ function logprocess(type, args) {
     }
     ////////
     const datetime = new Date().toLocaleTimeString('en-GB');
-    const log = [`[${datetime}]`, type, ...args.filter(_1.notEmpty)];
+    const log = [
+        `[${datetime}]`,
+        type,
+        ...args.filter(array_1.notEmpty).map((s) => (0, redact_1.redactObject)(s)),
+    ];
     if (logShim) {
         logShim(...log);
         return;

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

@@ -4,6 +4,7 @@ export * from './contains';
 export * from './getExtendedStringSegment';
 export * from './json';
 export * from './object';
+export * from './redact';
 export * from './surround';
 export * from './trim';
 export * from './truncate';

package/dist/common/helpers/string/index.js

@@ -20,6 +20,7 @@ __exportStar(require("./contains"), exports);
 __exportStar(require("./getExtendedStringSegment"), exports);
 __exportStar(require("./json"), exports);
 __exportStar(require("./object"), exports);
+__exportStar(require("./redact"), exports);
 __exportStar(require("./surround"), exports);
 __exportStar(require("./trim"), exports);
 __exportStar(require("./truncate"), exports);

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

@@ -0,0 +1,2 @@
+export declare function redactString(str: string): string;
+export declare function redactObject<T>(ob: T): T;

package/dist/common/helpers/string/redact.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.redactObject = exports.redactString = void 0;
+function redactString(str) {
+    let ret = str;
+    ret = ret !== null && ret !== void 0 ? ret : '';
+    const repl = '$1<redacted>$2';
+    ret = ret.replace(/(\b)grant_type.+?(\b)/gm, repl);
+    ret = ret.replace(/(\b)Bearer .+?(\b)/gm, repl);
+    ret = ret.replace(/(\b)eyJ[a-zA-Z0-9]{10}.+?(\b)/gm, repl);
+    return ret;
+}
+exports.redactString = redactString;
+function redactObject(ob) {
+    if (typeof ob === 'string') {
+        return redactString(ob);
+    }
+    else if (typeof ob === 'object') {
+        try {
+            return JSON.parse(redactString(JSON.stringify(ob)));
+        }
+        catch (e) {
+            return ob;
+        }
+    }
+    return ob;
+}
+exports.redactObject = redactObject;

package/dist/ui/components/SparkLine/index.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SparkLine = void 0;
 const styled_1 = __importDefault(require("@emotion/styled"));
 const react_1 = __importDefault(require("react"));
+const common_1 = require("../../../common");
 const math_1 = require("../../../common/helpers/math");
 const Base = styled_1.default.div `
   width: calc(100% - 1rem - 2px);
@@ -32,7 +33,7 @@ const SparkLine = (p) => {
     const xMax = Math.max(...raw.map((d) => d.x));
     const yMin = Math.min(...raw.map((d) => d.y));
     const yMax = Math.max(...raw.map((d) => d.y));
-    const data = raw.map((orig) => ({
+    const data = (0, common_1.distinctBy)(raw.map((orig) => ({
         x: (0, math_1.rangePercentage)({
             value: orig.x,
             min: xMin,
@@ -44,7 +45,7 @@ const SparkLine = (p) => {
             max: yMax,
         }) * 100,
         orig,
-    }));
+    })), (s) => s.x);
     return (react_1.default.createElement(Base, { className: p.className, title: p.title },
         react_1.default.createElement(Points, null, data.map((pt) => {
             var _a, _b;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.604",
+  "version": "0.0.606",
   "name": "ag-common",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -13,7 +13,7 @@
     "lint": "npx eslint --ext .ts,.tsx .",
     "start": "cross-env BROWSER=none cross-env storybook dev -p 6006",
     "build-storybook": "storybook build -o docs --quiet",
-    "test-run": "ts-node -- src/api/helpers/s3.test.ts"
+    "test": "globstar -- node --import tsx --test \"src/**/redact.test.ts\""
   },
   "dependencies": {
     "@aws-sdk/client-dynamodb": "^3.390",
@@ -52,17 +52,16 @@
     "@storybook/react": "7.6.12",
     "@storybook/react-webpack5": "7.6.12",
     "@storybook/theming": "7.6.12",
-    "@types/jest": "29.5.12",
     "@types/jsonwebtoken": "9.0.5",
     "@types/node": "20.11.16",
     "@types/react": "18.2.51",
     "@types/react-dom": "18.2.18",
     "cross-env": "7.0.3",
     "eslint-config-e7npm": "0.0.79",
-    "jest": "29.7.0",
+    "globstar": "^1.0.0",
     "rimraf": "5.0.5",
     "storybook": "7.6.12",
-    "ts-jest": "29.1.2"
+    "tsx": "^4.7.0"
   },
   "files": [
     "dist/**/*",