@thisisagile/easy 17.12.0 → 17.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "17.12.0",
+  "version": "17.12.2",
   "description": "Straightforward library for building domain-driven microservice architectures",
   "author": "Sander Hoogendoorn",
   "license": "MIT",

package/src/domain/DateTime.ts

@@ -22,20 +22,25 @@ export type DiffOptions = {
 type DatetimeInput = string | number | Date | DateTime | null;
 
 export class DateTime extends Value<Optional<string>> {
+  protected readonly luxon: LuxonDateTime;
+
+  constructor(value?: DatetimeInput);
+  constructor(value?: string, format?: string);
   constructor(value?: DatetimeInput, format?: string) {
-    super(
-      choose(value)
-        .type(isString, v => (format ? LuxonDateTime.fromFormat(v, format, { setZone: true }) : LuxonDateTime.fromISO(v, { setZone: true })))
-        .type(isNumber, v => LuxonDateTime.fromMillis(v))
-        .type(isDate, v => LuxonDateTime.fromJSDate(v))
-        .type(isDateTime, v => LuxonDateTime.fromISO(v.toString()))
-        .else(undefined as unknown as LuxonDateTime)
-        ?.toISO() as unknown as string
-    );
+    const luxon = choose(value)
+      .type(isString, v => (format ? LuxonDateTime.fromFormat(v, format, { setZone: true }) : LuxonDateTime.fromISO(v, { setZone: true })))
+      .type(isNumber, v => LuxonDateTime.fromMillis(v))
+      .type(isDate, v => LuxonDateTime.fromJSDate(v))
+      .type(isDateTime, v => v.luxon)
+      // Allow constructing with LuxonDateTime without exposing types
+      .else(value instanceof LuxonDateTime ? value : LuxonDateTime.fromISO(undefined as any));
+
+    super(luxon.toISO() ?? undefined);
+    this.luxon = luxon;
   }
 
   static get now(): DateTime {
-    return new DateTime(LuxonDateTime.utc().toISO());
+    return new DateTime(LuxonDateTime.utc() as any);
   }
 
   get isValid(): boolean {
@@ -53,24 +58,16 @@ export class DateTime extends Value<Optional<string>> {
     return this.luxon.setZone('utc');
   }
 
-  protected get luxon(): LuxonDateTime {
-    return LuxonDateTime.fromISO(this.value as string, { setZone: true });
-  }
-
-  from(date?: DateTime): string;
-
   from(locale?: string): string;
-
   from(date?: DateTime, locale?: string): string;
-
-  from(param?: string | DateTime, other?: string): string {
-    const date: Optional<DateTime> = isA<DateTime>(param) ? param : undefined;
-    const locale: string = (isString(param) ? param : undefined) ?? other ?? 'en';
+  from(dateOrLocale?: string | DateTime, maybeLocale?: string): string {
+    const date: Optional<DateTime> = isA<DateTime>(dateOrLocale) ? dateOrLocale : undefined;
+    const locale: string = (isString(dateOrLocale) ? dateOrLocale : undefined) ?? maybeLocale ?? 'en';
     return ifDefined(
       date,
       d => this.utc.setLocale(locale).toRelative({ base: d.utc }),
       () => this.utc.setLocale(locale).toRelative()
-    ) as string;
+    ) ?? "";
   }
 
   isAfter(dt: DateTime): boolean {
@@ -85,18 +82,16 @@ export class DateTime extends Value<Optional<string>> {
     return this.utc.hasSame(dt.utc, 'millisecond');
   }
 
-  add(n: number): DateTime;
-  add(n: number, unit: DurationUnit): DateTime;
+  add(n: number, unit?: DurationUnit): DateTime;
   add(duration: Duration): DateTime;
-  add(n: number | Duration, unit?: DurationUnit): DateTime {
-    return new DateTime(this.luxon.plus(isNumber(n) ? { [unit ?? ('day' as string)]: n } : n).toISO());
+  add(n: number | Duration, unit: DurationUnit = 'day'): DateTime {
+    return new DateTime(this.luxon.plus(isNumber(n) ? { [unit]: n } : n) as any);
   }
 
-  subtract(n: number): DateTime;
-  subtract(n: number, unit: DurationUnit): DateTime;
+  subtract(n: number, unit?: DurationUnit): DateTime;
   subtract(duration: Duration): DateTime;
-  subtract(n: number | Duration, unit?: DurationUnit): DateTime {
-    return new DateTime(this.luxon.minus(isNumber(n) ? { [unit ?? ('day' as string)]: n } : n).toISO());
+  subtract(n: number | Duration, unit: DurationUnit = 'day'): DateTime {
+    return new DateTime(this.luxon.minus(isNumber(n) ? { [unit]: n } : n) as any);
   }
 
   diff(other: DateTime, unit: DateTimeUnit = 'day', opts?: DiffOptions): number {
@@ -104,11 +99,11 @@ export class DateTime extends Value<Optional<string>> {
   }
 
   startOf(unit: DateTimeUnit = 'day'): DateTime {
-    return new DateTime(this.luxon.startOf(unit).toISO());
+    return new DateTime(this.luxon.startOf(unit) as any);
   }
 
   endOf(unit: DateTimeUnit = 'day'): DateTime {
-    return new DateTime(this.luxon.endOf(unit).toISO());
+    return new DateTime(this.luxon.endOf(unit) as any);
   }
 
   isWeekend(): boolean {
@@ -116,7 +111,7 @@ export class DateTime extends Value<Optional<string>> {
   }
 
   withZone(zone: string): DateTime {
-    return new DateTime(this.utc.setZone(zone).toISO());
+    return new DateTime(this.luxon.setZone(zone) as any);
   }
 
   toString(): string {
@@ -124,7 +119,7 @@ export class DateTime extends Value<Optional<string>> {
   }
 
   toJSON(): JsonValue {
-    return this.utc.toISO() as unknown as JsonValue;
+    return this.utc.toISO();
   }
 
   toFormat(format: string): string {
@@ -155,3 +150,4 @@ export class DateTime extends Value<Optional<string>> {
 export const isDateTime = (dt?: unknown): dt is DateTime => isDefined(dt) && dt instanceof DateTime;
 
 export const dt = (dt?: DatetimeInput): DateTime => new DateTime(dt);
+

package/dist/chunk-45AKKIFU.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';\nimport { seconds } from '../utils/Seconds';\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\ntype DatetimeInput = string | number | Date | DateTime | null;\n\nexport class DateTime extends Value<Optional<string>> {\n  constructor(value?: DatetimeInput, 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  toEpoch(): number {\n    return this.luxon.toMillis();\n  }\n\n  ago(end: DateTime = DateTime.now): string {\n    return seconds.toText(end.diff(this, 'second'));\n  }\n}\n\nexport const isDateTime = (dt?: unknown): dt is DateTime => isDefined(dt) && dt instanceof DateTime;\n\nexport const dt = (dt?: DatetimeInput): DateTime => new DateTime(dt);\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAS,YAAY,eAAqF,gBAAgB;AAW1H,SAAS,cAAc;AAYhB,IAAM,WAAN,MAAM,kBAAiB,MAAwB;AAAA,EACpD,YAAY,OAAuB,QAAiB;AAClD;AAAA,MACE,OAAO,KAAK,EACT,KAAK,UAAU,OAAM,SAAS,cAAc,WAAW,GAAG,QAAQ,EAAE,SAAS,KAAK,CAAC,IAAI,cAAc,QAAQ,GAAG,EAAE,SAAS,KAAK,CAAC,CAAE,EACnI,KAAK,UAAU,OAAK,cAAc,WAAW,CAAC,CAAC,EAC/C,KAAK,QAAQ,OAAK,cAAc,WAAW,CAAC,CAAC,EAC7C,KAAK,YAAY,OAAK,cAAc,QAAQ,EAAE,SAAS,CAAC,CAAC,EACzD,KAAK,MAAqC,GACzC,MAAM;AAAA,IACZ;AAAA,EACF;AAAA,EAEA,WAAW,MAAgB;AACzB,WAAO,IAAI,UAAS,cAAc,IAAI,EAAE,MAAM,CAAC;AAAA,EACjD;AAAA,EAEA,IAAI,UAAmB;AACrB,WAAO,UAAU,KAAK,KAAK,KAAK,KAAK,IAAI;AAAA,EAC3C;AAAA;AAAA;AAAA;AAAA,EAKA,IAAI,UAAkB;AACpB,WAAO,KAAK,KAAK;AAAA,EACnB;AAAA,EAEA,IAAc,MAAqB;AACjC,WAAO,KAAK,MAAM,QAAQ,KAAK;AAAA,EACjC;AAAA,EAEA,IAAc,QAAuB;AACnC,WAAO,cAAc,QAAQ,KAAK,OAAiB,EAAE,SAAS,KAAK,CAAC;AAAA,EACtE;AAAA,EAQA,KAAK,OAA2B,OAAwB;AACtD,UAAM,OAA2B,IAAc,KAAK,IAAI,QAAQ;AAChE,UAAM,UAAkB,SAAS,KAAK,IAAI,QAAQ,WAAc,SAAS;AACzE,WAAO;AAAA,MACL;AAAA,MACA,OAAK,KAAK,IAAI,UAAU,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC;AAAA,MAC1D,MAAM,KAAK,IAAI,UAAU,MAAM,EAAE,WAAW;AAAA,IAC9C;AAAA,EACF;AAAA,EAEA,QAAQA,KAAuB;AAC7B,WAAO,KAAK,MAAMA,IAAG;AAAA,EACvB;AAAA,EAEA,SAASA,KAAuB;AAC9B,WAAO,KAAK,MAAMA,IAAG;AAAA,EACvB;AAAA,EAEA,OAAOA,KAAuB;AAC5B,WAAO,KAAK,IAAI,QAAQA,IAAG,KAAK,aAAa;AAAA,EAC/C;AAAA,EAKA,IAAI,GAAsB,MAA+B;AACvD,WAAO,IAAI,UAAS,KAAK,MAAM,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC,QAAS,KAAgB,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC;AAAA,EACnG;AAAA,EAKA,SAAS,GAAsB,MAA+B;AAC5D,WAAO,IAAI,UAAS,KAAK,MAAM,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC,QAAS,KAAgB,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC;AAAA,EACpG;AAAA,EAEA,KAAK,OAAiB,OAAqB,OAAO,MAA4B;AAC5E,WAAO,KAAK,MAAM,YAAY,OAAO,EAAE,KAAK,IAAI,KAAK,MAAM,GAAG,EAAE,GAAG,IAAI,CAAC;AAAA,EAC1E;AAAA,EAEA,QAAQ,OAAqB,OAAiB;AAC5C,WAAO,IAAI,UAAS,KAAK,MAAM,QAAQ,IAAI,EAAE,MAAM,CAAC;AAAA,EACtD;AAAA,EAEA,MAAM,OAAqB,OAAiB;AAC1C,WAAO,IAAI,UAAS,KAAK,MAAM,MAAM,IAAI,EAAE,MAAM,CAAC;AAAA,EACpD;AAAA,EAEA,YAAqB;AACnB,WAAO,KAAK,MAAM;AAAA,EACpB;AAAA,EAEA,SAAS,MAAwB;AAC/B,WAAO,IAAI,UAAS,KAAK,IAAI,QAAQ,IAAI,EAAE,MAAM,CAAC;AAAA,EACpD;AAAA,EAEA,WAAmB;AACjB,WAAO,KAAK,SAAS;AAAA,EACvB;AAAA,EAEA,SAAoB;AAClB,WAAO,KAAK,IAAI,MAAM;AAAA,EACxB;AAAA,EAEA,SAAS,QAAwB;AAC/B,WAAO,KAAK,MAAM,SAAS,MAAM;AAAA,EACnC;AAAA,EAEA,SAAS,SAAS,SAAS,SAAS,KAAa;AAC/C,WAAO,KAAK,MAAM,UAAU,MAAM,EAAE,SAAS,MAAM;AAAA,EACrD;AAAA,EAEA,OAAO,QAAyB;AAC9B,WAAO,KAAK,SAAS,QAAQ,KAAK;AAAA,EACpC;AAAA,EAEA,SAAyB;AACvB,WAAO,KAAK,UAAU,KAAK,IAAI,SAAS,IAAI;AAAA,EAC9C;AAAA,EAEA,UAAkB;AAChB,WAAO,KAAK,MAAM,SAAS;AAAA,EAC7B;AAAA,EAEA,IAAI,MAAgB,UAAS,KAAa;AACxC,WAAO,QAAQ,OAAO,IAAI,KAAK,MAAM,QAAQ,CAAC;AAAA,EAChD;AACF;AAEO,IAAM,aAAa,CAACA,QAAiC,UAAUA,GAAE,KAAKA,eAAc;AAEpF,IAAM,KAAK,CAACA,QAAiC,IAAI,SAASA,GAAE;","names":["dt"]}