@thisisagile/easy 17.4.5 → 17.4.8

package/dist/validation/Validate.mjs

@@ -3,18 +3,18 @@ import {
   isValid,
   validate,
   validateReject
-} from "../chunk-QLM2AYD4.mjs";
+} from "../chunk-3DAZTFKD.mjs";
 import "../chunk-OFGI5FLG.mjs";
-import "../chunk-YK65IKP2.mjs";
-import "../chunk-VRLSZ2MW.mjs";
+import "../chunk-VVWELITO.mjs";
+import "../chunk-FZBUEEQB.mjs";
 import "../chunk-ISLR7BKT.mjs";
-import "../chunk-KAYSE6PM.mjs";
+import "../chunk-CLIM3GJ7.mjs";
 import "../chunk-CAHTK3AT.mjs";
-import "../chunk-TNOOLHK7.mjs";
-import "../chunk-KA3TZADE.mjs";
-import "../chunk-SRFFQJLL.mjs";
-import "../chunk-IVX4I3NC.mjs";
-import "../chunk-Q3TL43R2.mjs";
+import "../chunk-KK66VUSS.mjs";
+import "../chunk-55B7FIAE.mjs";
+import "../chunk-H7TRIY7A.mjs";
+import "../chunk-L5TIL3QC.mjs";
+import "../chunk-R43LAFNS.mjs";
 import "../chunk-EX7OK25Y.mjs";
 import "../chunk-JSON7A4X.mjs";
 import "../chunk-X7FZPY3P.mjs";

package/dist/validation/When.mjs

@@ -1,18 +1,18 @@
 import {
   When,
   when
-} from "../chunk-QLM2AYD4.mjs";
+} from "../chunk-3DAZTFKD.mjs";
 import "../chunk-OFGI5FLG.mjs";
-import "../chunk-YK65IKP2.mjs";
-import "../chunk-VRLSZ2MW.mjs";
+import "../chunk-VVWELITO.mjs";
+import "../chunk-FZBUEEQB.mjs";
 import "../chunk-ISLR7BKT.mjs";
-import "../chunk-KAYSE6PM.mjs";
+import "../chunk-CLIM3GJ7.mjs";
 import "../chunk-CAHTK3AT.mjs";
-import "../chunk-TNOOLHK7.mjs";
-import "../chunk-KA3TZADE.mjs";
-import "../chunk-SRFFQJLL.mjs";
-import "../chunk-IVX4I3NC.mjs";
-import "../chunk-Q3TL43R2.mjs";
+import "../chunk-KK66VUSS.mjs";
+import "../chunk-55B7FIAE.mjs";
+import "../chunk-H7TRIY7A.mjs";
+import "../chunk-L5TIL3QC.mjs";
+import "../chunk-R43LAFNS.mjs";
 import "../chunk-EX7OK25Y.mjs";
 import "../chunk-JSON7A4X.mjs";
 import "../chunk-X7FZPY3P.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "17.4.5",
+  "version": "17.4.8",
   "description": "Straightforward library for building domain-driven microservice architectures",
   "author": "Sander Hoogendoorn",
   "license": "MIT",
@@ -34,7 +34,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@thisisagile/easy-test": "17.4.5",
+    "@thisisagile/easy-test": "17.4.8",
     "@types/form-urlencoded": "^4.4.0",
     "@types/luxon": "3.4.2",
     "@types/validator": "^13.11.10"

package/src/domain/DateTime.ts

@@ -7,6 +7,7 @@ import { isDate } from '../types/IsDate';
 import { isA } from '../types/IsA';
 import { ifDefined } from '../utils/If';
 import { JsonValue } from '../types/Json';
+import { seconds } from '../utils/Seconds';
 
 Settings.defaultZone = 'utc';
 
@@ -139,6 +140,10 @@ export class DateTime extends Value<Optional<string>> {
   toDate(): Optional<Date> {
     return this.isValid ? this.utc.toJSDate() : undefined;
   }
+
+  ago(end: DateTime = DateTime.now): string {
+    return seconds.toText(end.diff(this, 'second'));
+  }
 }
 
 export const isDateTime = (dt?: unknown): dt is DateTime => isDefined(dt) && dt instanceof DateTime;

package/src/types/Object.ts

@@ -14,3 +14,7 @@ export function entries<T = unknown>(subject: { [p: string]: T } | ArrayLike<T>)
 export function values<T = unknown>(subject: { [p: string]: T } | ArrayLike<T>): List<T> {
   return toList([...Object.values<T>(subject), ...Object.values<T>(Object.getPrototypeOf(subject))]);
 }
+
+export function keys<T = unknown>(subject: { [p: string]: T } | ArrayLike<T>): List<string> {
+  return toList([...Object.keys(subject), ...Object.keys(Object.getPrototypeOf(subject))]);
+}

package/src/utils/Seconds.ts

@@ -10,14 +10,9 @@ export const seconds = {
     return { days, hours, minutes, seconds };
   },
 
-  toText: (s: number) => {
+  toText: (s: number): string => {
     const { days, hours, minutes, seconds: secs } = seconds.toDuration(s);
-    return toList(
-      ifTrue(days, d => `${d}d`),
-      ifTrue(hours, h => `${h}h`),
-      ifTrue(minutes, m => `${m}m`),
-      ifTrue(days + hours + minutes === 0, `${secs}s`)
-    )
+    return toList(ifTrue(days, `${days}d`), ifTrue(hours, `${hours}h`), ifTrue(minutes, `${minutes}m`), ifTrue(days + hours + minutes === 0, `${secs}s`))
       .mapDefined(s => s)
       .join(' ');
   },

package/src/utils/Traverse.ts

@@ -1,5 +1,26 @@
+import { AnyKey } from '../types/AnyKey';
+
 export const traverse = (subject: unknown = {}, property = ''): unknown => {
   const props = property.split('.');
   const p = props.shift() as string;
   return props.length === 0 ? (subject as any)[p] : traverse((subject as any)[p], props.join('.'));
 };
+
+export const traverseSet = <T>(subject: T, property: AnyKey<T>, value: unknown): unknown => {
+  const props = property.split('.');
+  const p = props.shift() as string;
+  return {
+    ...(subject as any),
+    [p]: props.length === 0 ? value : traverseSet((subject as any)[p], props.join('.'), value),
+  } as T;
+};
+
+export const accumulate = <T>(items: T[], ...keys: AnyKey<T>[]): T[] =>
+  items.map((t, i, arr) => {
+    const acc = keys.reduce(
+      (acc, v) => traverseSet(acc, v, i === 0 ? traverse(t, v) : (traverse(arr[i - 1], v) as number) + (traverse(t, v) as number)) as T,
+      t
+    );
+    arr[i] = acc;
+    return acc;
+  });

package/dist/chunk-5M76X6J5.mjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/domain/DateTime.ts"],"sourcesContent":["import { DateTime as LuxonDateTime, DateTimeUnit as LuxonDateTimeUnit, DurationUnit as LuxonDurationUnit, Settings } from 'luxon';\nimport { Value } from '../types/Value';\nimport { Optional } from '../types/Types';\nimport { choose } from '../types/Case';\nimport { isDefined, isNumber, isString } from '../types/Is';\nimport { isDate } from '../types/IsDate';\nimport { isA } from '../types/IsA';\nimport { ifDefined } from '../utils/If';\nimport { JsonValue } from '../types/Json';\n\nSettings.defaultZone = 'utc';\n\nexport type DateTimeUnit = LuxonDateTimeUnit;\nexport type DurationUnit = LuxonDurationUnit;\nexport type Duration = Partial<Record<DurationUnit, number>>;\n\nexport type DiffOptions = {\n  rounding: 'floor' | 'ceil' | 'round';\n};\n\nexport class DateTime extends Value<Optional<string>> {\n  constructor(value?: string | number | Date | DateTime | null, format?: string) {\n    super(\n      choose(value)\n        .type(isString, v => (format ? LuxonDateTime.fromFormat(v, format, { setZone: true }) : LuxonDateTime.fromISO(v, { setZone: true })))\n        .type(isNumber, v => LuxonDateTime.fromMillis(v))\n        .type(isDate, v => LuxonDateTime.fromJSDate(v))\n        .type(isDateTime, v => LuxonDateTime.fromISO(v.toString()))\n        .else(undefined as unknown as LuxonDateTime)\n        ?.toISO() as unknown as string\n    );\n  }\n\n  static get now(): DateTime {\n    return new DateTime(LuxonDateTime.utc().toISO());\n  }\n\n  get isValid(): boolean {\n    return isDefined(this.value) && this.utc.isValid;\n  }\n\n  /**\n   * @deprecated Deprecated in favor for DateTime.from as that also accepts locales and another DateTime\n   */\n  get fromNow(): string {\n    return this.from();\n  }\n\n  protected get utc(): LuxonDateTime {\n    return this.luxon.setZone('utc');\n  }\n\n  protected get luxon(): LuxonDateTime {\n    return LuxonDateTime.fromISO(this.value as string, { setZone: true });\n  }\n\n  from(date?: DateTime): string;\n\n  from(locale?: string): string;\n\n  from(date?: DateTime, locale?: string): string;\n\n  from(param?: string | DateTime, other?: string): string {\n    const date: Optional<DateTime> = isA<DateTime>(param) ? param : undefined;\n    const locale: string = (isString(param) ? param : undefined) ?? other ?? 'en';\n    return ifDefined(\n      date,\n      d => this.utc.setLocale(locale).toRelative({ base: d.utc }),\n      () => this.utc.setLocale(locale).toRelative()\n    ) as string;\n  }\n\n  isAfter(dt: DateTime): boolean {\n    return this.utc > dt.utc;\n  }\n\n  isBefore(dt: DateTime): boolean {\n    return this.utc < dt.utc;\n  }\n\n  equals(dt: DateTime): boolean {\n    return this.utc.hasSame(dt.utc, 'millisecond');\n  }\n\n  add(n: number): DateTime;\n  add(n: number, unit: DurationUnit): DateTime;\n  add(duration: Duration): DateTime;\n  add(n: number | Duration, unit?: DurationUnit): DateTime {\n    return new DateTime(this.luxon.plus(isNumber(n) ? { [unit ?? ('day' as string)]: n } : n).toISO());\n  }\n\n  subtract(n: number): DateTime;\n  subtract(n: number, unit: DurationUnit): DateTime;\n  subtract(duration: Duration): DateTime;\n  subtract(n: number | Duration, unit?: DurationUnit): DateTime {\n    return new DateTime(this.luxon.minus(isNumber(n) ? { [unit ?? ('day' as string)]: n } : n).toISO());\n  }\n\n  diff(other: DateTime, unit: DateTimeUnit = 'day', opts?: DiffOptions): number {\n    return Math[opts?.rounding ?? 'floor'](this.utc.diff(other.utc).as(unit));\n  }\n\n  startOf(unit: DateTimeUnit = 'day'): DateTime {\n    return new DateTime(this.luxon.startOf(unit).toISO());\n  }\n\n  endOf(unit: DateTimeUnit = 'day'): DateTime {\n    return new DateTime(this.luxon.endOf(unit).toISO());\n  }\n\n  isWeekend(): boolean {\n    return this.luxon.isWeekend;\n  }\n\n  withZone(zone: string): DateTime {\n    return new DateTime(this.utc.setZone(zone).toISO());\n  }\n\n  toString(): string {\n    return this.value ?? '';\n  }\n\n  toJSON(): JsonValue {\n    return this.utc.toISO() as unknown as JsonValue;\n  }\n\n  toFormat(format: string): string {\n    return this.luxon.toFormat(format);\n  }\n\n  toLocale(locale = 'nl-NL', format = 'D'): string {\n    return this.luxon.setLocale(locale).toFormat(format);\n  }\n\n  toFull(locale?: string): string {\n    return this.toLocale(locale, 'DDD');\n  }\n\n  toDate(): Optional<Date> {\n    return this.isValid ? this.utc.toJSDate() : undefined;\n  }\n}\n\nexport const isDateTime = (dt?: unknown): dt is DateTime => isDefined(dt) && dt instanceof DateTime;\n\nexport const dt = (dt?: unknown): DateTime => (isString(dt) || isNumber(dt) || dt instanceof Date ? new DateTime(dt) : new DateTime());\n"],"mappings":"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","names":["dt"]}

package/dist/chunk-DICMUQFL.mjs

@@ -1,11 +0,0 @@
-// src/utils/Traverse.ts
-var traverse = (subject = {}, property = "") => {
-  const props = property.split(".");
-  const p = props.shift();
-  return props.length === 0 ? subject[p] : traverse(subject[p], props.join("."));
-};
-
-export {
-  traverse
-};
-//# sourceMappingURL=chunk-DICMUQFL.mjs.map

package/dist/chunk-DICMUQFL.mjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/utils/Traverse.ts"],"sourcesContent":["export const traverse = (subject: unknown = {}, property = ''): unknown => {\n  const props = property.split('.');\n  const p = props.shift() as string;\n  return props.length === 0 ? (subject as any)[p] : traverse((subject as any)[p], props.join('.'));\n};\n"],"mappings":";AAAO,IAAM,WAAW,CAAC,UAAmB,CAAC,GAAG,WAAW,OAAgB;AACzE,QAAM,QAAQ,SAAS,MAAM,GAAG;AAChC,QAAM,IAAI,MAAM,MAAM;AACtB,SAAO,MAAM,WAAW,IAAK,QAAgB,CAAC,IAAI,SAAU,QAAgB,CAAC,GAAG,MAAM,KAAK,GAAG,CAAC;AACjG;","names":[]}