@thisisagile/easy 18.10.0 → 18.11.1

package/dist/utils/Sentence.mjs

@@ -1,11 +1,11 @@
 import {
   text
-} from "../chunk-6Q7FX3KI.mjs";
+} from "../chunk-I2VWZJ2K.mjs";
 import "../chunk-SSROJBD5.mjs";
 import "../chunk-EBIF6AMC.mjs";
 import "../chunk-KCY4RPFR.mjs";
-import "../chunk-YW4JACEA.mjs";
-import "../chunk-VAJ64J43.mjs";
+import "../chunk-S3NSPQ7M.mjs";
+import "../chunk-NNA77YYC.mjs";
 import "../chunk-SJGQU3OG.mjs";
 import "../chunk-D5IYAIMK.mjs";
 import "../chunk-PF7HDF6B.mjs";

package/dist/utils/View.mjs

@@ -4,15 +4,15 @@ import {
   toViewer,
   view,
   views
-} from "../chunk-RDA6XPHT.mjs";
-import "../chunk-WM6VMJHW.mjs";
-import "../chunk-GMSPATXC.mjs";
-import "../chunk-6Q7FX3KI.mjs";
+} from "../chunk-EHVMIXKR.mjs";
+import "../chunk-3VDUMU5P.mjs";
+import "../chunk-PNSMLGOA.mjs";
+import "../chunk-I2VWZJ2K.mjs";
 import "../chunk-SSROJBD5.mjs";
 import "../chunk-EBIF6AMC.mjs";
 import "../chunk-KCY4RPFR.mjs";
-import "../chunk-YW4JACEA.mjs";
-import "../chunk-VAJ64J43.mjs";
+import "../chunk-S3NSPQ7M.mjs";
+import "../chunk-NNA77YYC.mjs";
 import "../chunk-SJGQU3OG.mjs";
 import "../chunk-D5IYAIMK.mjs";
 import "../chunk-PF7HDF6B.mjs";

package/dist/validation/Contraints.mjs

@@ -18,14 +18,14 @@ import {
   required,
   rule,
   valid
-} from "../chunk-4SM5CZ36.mjs";
+} from "../chunk-TNLJ45P5.mjs";
 import "../chunk-ADJAEGCT.mjs";
-import "../chunk-6Q7FX3KI.mjs";
+import "../chunk-I2VWZJ2K.mjs";
 import "../chunk-SSROJBD5.mjs";
 import "../chunk-EBIF6AMC.mjs";
 import "../chunk-KCY4RPFR.mjs";
-import "../chunk-YW4JACEA.mjs";
-import "../chunk-VAJ64J43.mjs";
+import "../chunk-S3NSPQ7M.mjs";
+import "../chunk-NNA77YYC.mjs";
 import "../chunk-SJGQU3OG.mjs";
 import "../chunk-D5IYAIMK.mjs";
 import "../chunk-PF7HDF6B.mjs";

package/dist/validation/Validate.mjs

@@ -3,12 +3,12 @@ import {
   isValid,
   validate,
   validateReject
-} from "../chunk-6Q7FX3KI.mjs";
+} from "../chunk-I2VWZJ2K.mjs";
 import "../chunk-SSROJBD5.mjs";
 import "../chunk-EBIF6AMC.mjs";
 import "../chunk-KCY4RPFR.mjs";
-import "../chunk-YW4JACEA.mjs";
-import "../chunk-VAJ64J43.mjs";
+import "../chunk-S3NSPQ7M.mjs";
+import "../chunk-NNA77YYC.mjs";
 import "../chunk-SJGQU3OG.mjs";
 import "../chunk-D5IYAIMK.mjs";
 import "../chunk-PF7HDF6B.mjs";

package/dist/validation/When.mjs

@@ -1,12 +1,12 @@
 import {
   When,
   when
-} from "../chunk-6Q7FX3KI.mjs";
+} from "../chunk-I2VWZJ2K.mjs";
 import "../chunk-SSROJBD5.mjs";
 import "../chunk-EBIF6AMC.mjs";
 import "../chunk-KCY4RPFR.mjs";
-import "../chunk-YW4JACEA.mjs";
-import "../chunk-VAJ64J43.mjs";
+import "../chunk-S3NSPQ7M.mjs";
+import "../chunk-NNA77YYC.mjs";
 import "../chunk-SJGQU3OG.mjs";
 import "../chunk-D5IYAIMK.mjs";
 import "../chunk-PF7HDF6B.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "18.10.0",
+  "version": "18.11.1",
   "description": "Straightforward library for building domain-driven microservice architectures",
   "author": "Sander Hoogendoorn",
   "license": "MIT",
@@ -25,7 +25,13 @@
     "test": "yarn g:jest --coverage",
     "prepack": "yarn g:copy-readme"
   },
-  "sideEffects": false,
+  "sideEffects": [
+    "./src/domain/DateTime.ts",
+    "./src/types/Meta.ts",
+    "./dist/domain/DateTime.*",
+    "./dist/types/Meta.*",
+    "./dist/index.js"
+  ],
   "files": [
     "dist",
     "src"
@@ -36,15 +42,14 @@
   "devDependencies": {
     "@thisisagile/easy-test": "*",
     "@types/form-urlencoded": "^4.4.2",
-    "@types/luxon": "3.4.2",
     "@types/validator": "^13.12.2"
   },
   "dependencies": {
     "@types/uuid": "^9.0.8",
     "axios": "^1.7.9",
+    "dayjs": "^1.11.21",
     "form-urlencoded": "^6.1.5",
     "jwt-decode": "^4.0.0",
-    "luxon": "^3.5.0",
     "reflect-metadata": "^0.2.2",
     "uuid": "^9.0.1",
     "validator": "^13.12.0"

package/src/domain/DateTime.ts

@@ -1,7 +1,16 @@
-import { DateTime as LuxonDateTime, DateTimeUnit as LuxonDateTimeUnit, DurationUnit as LuxonDurationUnit, Settings } from 'luxon';
+import dayjs, { Dayjs, ManipulateType, OpUnitType, QUnitType } from 'dayjs';
+import advancedFormat from 'dayjs/plugin/advancedFormat';
+import customParseFormat from 'dayjs/plugin/customParseFormat';
+import isoWeek from 'dayjs/plugin/isoWeek';
+import localizedFormat from 'dayjs/plugin/localizedFormat';
+import quarterOfYear from 'dayjs/plugin/quarterOfYear';
+import relativeTime from 'dayjs/plugin/relativeTime';
+import timezone from 'dayjs/plugin/timezone';
+import utc from 'dayjs/plugin/utc';
+import 'dayjs/locale/de';
+import 'dayjs/locale/nl';
 import { Value } from '../types/Value';
 import { Optional } from '../types/Types';
-import { choose } from '../types/Case';
 import { isDefined, isNumber, isString } from '../types/Is';
 import { isDate } from '../types/IsDate';
 import { isA } from '../types/IsA';
@@ -10,11 +19,30 @@ import { JsonValue } from '../types/Json';
 import { seconds } from '../utils/Seconds';
 import { tryTo } from '../types/Try';
 import { use } from '../types/Constructor';
+import { choose } from '../types/Case';
 
-Settings.defaultZone = 'utc';
-
-export type DateTimeUnit = LuxonDateTimeUnit;
-export type DurationUnit = LuxonDurationUnit;
+dayjs.extend(utc);
+dayjs.extend(timezone);
+dayjs.extend(customParseFormat);
+dayjs.extend(localizedFormat);
+dayjs.extend(relativeTime);
+dayjs.extend(isoWeek);
+dayjs.extend(advancedFormat);
+dayjs.extend(quarterOfYear);
+dayjs.tz.setDefault('UTC');
+
+export type DateTimeUnit = 'year' | 'quarter' | 'month' | 'week' | 'day' | 'hour' | 'minute' | 'second' | 'millisecond';
+export type DurationUnit =
+  | DateTimeUnit
+  | 'years'
+  | 'quarters'
+  | 'months'
+  | 'weeks'
+  | 'days'
+  | 'hours'
+  | 'minutes'
+  | 'seconds'
+  | 'milliseconds';
 export type Duration = Partial<Record<DurationUnit, number>>;
 
 export type DiffOptions = {
@@ -23,30 +51,65 @@ export type DiffOptions = {
 
 export type DatetimeInput = string | number | Date | DateTime | null;
 
+type DateTimeConstructorInput = DatetimeInput | Dayjs;
+type ZonedDayjs = Dayjs & { $x?: { $timezone?: string } };
+
+const invalidDate = dayjs.utc(Number.NaN);
+const isDayjs = (value: unknown): value is Dayjs => dayjs.isDayjs(value);
+const isoFormats = [
+  'YYYY-MM-DD',
+  'YYYY-MM-DDTHH:mm',
+  'YYYY-MM-DDTHH:mm:ss',
+  'YYYY-MM-DDTHH:mm:ss.SSS',
+  'YYYY-MM-DDTHH:mm[Z]',
+  'YYYY-MM-DDTHH:mm:ss[Z]',
+  'YYYY-MM-DDTHH:mm:ss.SSS[Z]',
+  'YYYY-MM-DDTHH:mmZ',
+  'YYYY-MM-DDTHH:mmZZ',
+  'YYYY-MM-DDTHH:mm:ssZ',
+  'YYYY-MM-DDTHH:mm:ssZZ',
+  'YYYY-MM-DDTHH:mm:ss.SSSZ',
+  'YYYY-MM-DDTHH:mm:ss.SSSZZ',
+];
+const fixedUnitMilliseconds: Partial<Record<DurationUnit, number>> = {
+  day: 86400000,
+  days: 86400000,
+  week: 604800000,
+  weeks: 604800000,
+};
+const calendarUnitMonths: Partial<Record<DurationUnit, number>> = {
+  month: 1,
+  months: 1,
+  quarter: 3,
+  quarters: 3,
+  year: 12,
+  years: 12,
+};
+
 export class DateTime extends Value<Optional<string>> {
-  protected readonly luxon: LuxonDateTime;
+  protected readonly date: Dayjs;
 
   constructor(value?: DatetimeInput);
   constructor(value?: string, format?: string);
-  constructor(value?: DatetimeInput, format?: 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;
+  constructor(value?: DateTimeConstructorInput, format?: string) {
+    const date = choose<DateTimeConstructorInput | undefined>(value)
+      .type(isDayjs, date => date)
+      .type(isDateTime, dateTime => dateTime.date)
+      .type(isNumber, timestamp => dayjs.utc(timestamp))
+      .type(isDate, date => dayjs.utc(date))
+      .type(isString, string => (string === '' ? invalidDate : format ? parseFormatted(string, format) : parseIso(string)))
+      .else(invalidDate);
+
+    super(date.isValid() ? formatDateTime(date) : undefined);
+    this.date = date;
   }
 
   static get now(): DateTime {
-    return new DateTime(LuxonDateTime.utc() as any);
+    return fromDayjs(dayjs.utc(Date.now()));
   }
 
   get isValid(): boolean {
-    return isDefined(this.value) && this.utc.isValid;
+    return isDefined(this.value) && this.date.isValid();
   }
 
   /**
@@ -72,8 +135,8 @@ export class DateTime extends Value<Optional<string>> {
     return this.withZone('Europe/Warsaw');
   }
 
-  protected get utc(): LuxonDateTime {
-    return this.luxon.setZone('utc');
+  protected get utc(): Dayjs {
+    return this.date.utc();
   }
 
   from(locale?: string): string;
@@ -85,23 +148,23 @@ export class DateTime extends Value<Optional<string>> {
       use((isString(dateOrLocale) ? dateOrLocale : maybeLocale) ?? 'en', locale =>
         ifDefined(
           isA<DateTime>(dateOrLocale) ? dateOrLocale : undefined,
-          d => this.utc.setLocale(locale).toRelative({ base: d.utc }),
-          () => this.utc.setLocale(locale).toRelative()
+          d => this.utc.locale(toDayjsLocale(locale)).from(d.utc),
+          () => this.utc.locale(toDayjsLocale(locale)).from(dayjs.utc(Date.now()))
         )
       ) ?? ''
     );
   }
 
   isAfter(dt: DateTime): boolean {
-    return this.utc > dt.utc;
+    return this.utc.valueOf() > dt.utc.valueOf();
   }
 
   isBefore(dt: DateTime): boolean {
-    return this.utc < dt.utc;
+    return this.utc.valueOf() < dt.utc.valueOf();
   }
 
   equals(dt: DateTime): boolean {
-    return this.utc.hasSame(dt.utc, 'millisecond');
+    return this.utc.valueOf() === dt.utc.valueOf();
   }
 
   add(n: number, unit?: DurationUnit): DateTime;
@@ -109,7 +172,7 @@ export class DateTime extends Value<Optional<string>> {
   add(duration: Duration): DateTime;
 
   add(n: number | Duration, unit: DurationUnit = 'day'): DateTime {
-    return new DateTime(this.luxon.plus(isNumber(n) ? { [unit]: n } : n) as any);
+    return fromDayjs(change(this.date, n, unit, 'add'));
   }
 
   subtract(n: number, unit?: DurationUnit): DateTime;
@@ -117,27 +180,28 @@ export class DateTime extends Value<Optional<string>> {
   subtract(duration: Duration): DateTime;
 
   subtract(n: number | Duration, unit: DurationUnit = 'day'): DateTime {
-    return new DateTime(this.luxon.minus(isNumber(n) ? { [unit]: n } : n) as any);
+    return fromDayjs(change(this.date, n, unit, 'subtract'));
   }
 
   diff(other: DateTime, unit: DateTimeUnit = 'day', opts?: DiffOptions): number {
-    return Math[opts?.rounding ?? 'floor'](this.utc.diff(other.utc).as(unit));
+    return Math[opts?.rounding ?? 'floor'](this.utc.diff(other.utc, toDayjsUnit(unit) as QUnitType | OpUnitType, true));
   }
 
   startOf(unit: DateTimeUnit = 'day'): DateTime {
-    return new DateTime(this.luxon.startOf(unit) as any);
+    return fromDayjs(this.date.startOf(toDayjsBoundaryUnit(unit)));
   }
 
   endOf(unit: DateTimeUnit = 'day'): DateTime {
-    return new DateTime(this.luxon.endOf(unit) as any);
+    return fromDayjs(this.date.endOf(toDayjsBoundaryUnit(unit)));
   }
 
   isWeekend(): boolean {
-    return this.luxon.isWeekend;
+    const day = this.date.day();
+    return day === 0 || day === 6;
   }
 
   withZone(zone: string): DateTime {
-    return new DateTime(this.luxon.setZone(zone) as any);
+    return fromDayjs(this.date.tz(zone));
   }
 
   toString(): string {
@@ -145,15 +209,30 @@ export class DateTime extends Value<Optional<string>> {
   }
 
   toJSON(): JsonValue {
-    return this.utc.toISO();
+    return this.isValid ? this.utc.format('YYYY-MM-DDTHH:mm:ss.SSS[Z]') : null;
   }
 
   toFormat(format: string): string {
-    return this.luxon.toFormat(format);
+    return this.isValid ? this.date.format(toDayjsFormat(format)) : '';
   }
 
   toLocale(locale = 'nl-NL', format = 'D'): string {
-    return this.luxon.setLocale(locale).toFormat(format);
+    if (!this.isValid) return '';
+
+    if (format === 'D') return formatWithIntl(this.date, locale, { year: 'numeric', month: 'numeric', day: 'numeric' });
+    if (format === 'DDD') return formatWithIntl(this.date, locale, { dateStyle: 'long' });
+    if (format === 'ffff') {
+      return formatWithIntl(this.date, locale, {
+        weekday: 'long',
+        year: 'numeric',
+        month: 'long',
+        day: 'numeric',
+        hour: 'numeric',
+        minute: '2-digit',
+        timeZoneName: timezoneOf(this.date) ? 'long' : 'short',
+      });
+    }
+    return this.date.locale(toDayjsLocale(locale)).format(toDayjsFormat(format));
   }
 
   toFull(locale?: string): string {
@@ -161,11 +240,11 @@ export class DateTime extends Value<Optional<string>> {
   }
 
   toDate(): Optional<Date> {
-    return this.isValid ? this.utc.toJSDate() : undefined;
+    return this.isValid ? this.utc.toDate() : undefined;
   }
 
   toEpoch(): number {
-    return this.luxon.toMillis();
+    return this.date.valueOf();
   }
 
   ago(end: DateTime = DateTime.now): string {
@@ -174,7 +253,7 @@ export class DateTime extends Value<Optional<string>> {
 
   withClock(clock: DateTime): DateTime {
     return tryTo(() => [this.toDate() as Date, clock.toDate() as Date])
-      .map(([td, cd]) => new Date(td.getFullYear(), td.getMonth(), td.getDate(), cd.getHours(), cd.getMinutes(), cd.getSeconds()))
+      .map(([td, cd]) => new Date(Date.UTC(td.getUTCFullYear(), td.getUTCMonth(), td.getUTCDate(), cd.getUTCHours(), cd.getUTCMinutes(), cd.getUTCSeconds())))
       .map(d => new DateTime(d)).value;
   }
 }
@@ -182,3 +261,90 @@ 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);
+
+const parseIso = (value: string): Dayjs => {
+  const offset = offsetOf(value);
+  if (offset) {
+    const date = dayjs.utc(value);
+    return date.isValid() ? inOffsetZone(date, offset) : invalidDate;
+  }
+  return dayjs(value, isoFormats, true).isValid() ? dayjs.utc(value) : invalidDate;
+};
+
+const parseFormatted = (value: string, format: string): Dayjs => {
+  const dayjsFormat = toDayjsFormat(format);
+  const offset = offsetOf(value);
+  if (format.includes('ZZZ') && offset) {
+    const iso = dayjs.utc(value);
+    return iso.isValid() ? inOffsetZone(iso, offset) : invalidDate;
+  }
+  return dayjs.utc(value, dayjsFormat, true);
+};
+
+const offsetOf = (value: string): string | undefined => value.match(/([+-]\d{2}:?\d{2})$/)?.[1];
+
+const fromDayjs = (date: Dayjs): DateTime => new DateTime(date as unknown as DatetimeInput);
+
+const formatDateTime = (date: Dayjs): string => {
+  const formatted = date.format('YYYY-MM-DDTHH:mm:ss.SSSZ');
+  return timezoneOf(date) ? formatted : formatted.replace('+00:00', 'Z');
+};
+
+const change = (date: Dayjs, value: number | Duration, unit: DurationUnit, direction: 'add' | 'subtract'): Dayjs => {
+  if (isNumber(value)) return changeUnit(date, value, unit, direction);
+  return Object.entries(value).reduce((result, [durationUnit, durationValue]) => changeUnit(result, durationValue ?? 0, durationUnit as DurationUnit, direction), date);
+};
+
+const changeUnit = (date: Dayjs, value: number, unit: DurationUnit, direction: 'add' | 'subtract'): Dayjs => {
+  const amount = direction === 'add' ? value : -value;
+  const milliseconds = fixedUnitMilliseconds[unit];
+  const months = calendarUnitMonths[unit];
+
+  if (months && !Number.isInteger(value)) return addMonths(date, amount * months);
+  if (milliseconds && !Number.isInteger(value)) return date.add(amount * milliseconds, 'millisecond');
+  return date.add(amount, toDayjsUnit(unit));
+};
+
+const addMonths = (date: Dayjs, months: number): Dayjs => {
+  const wholeMonths = Math.trunc(months);
+  const fraction = months - wholeMonths;
+  const shifted = date.add(wholeMonths, 'month');
+  if (fraction === 0) return shifted;
+
+  const next = shifted.add(months > 0 ? 1 : -1, 'month');
+  return shifted.add((next.valueOf() - shifted.valueOf()) * Math.abs(fraction), 'millisecond');
+};
+
+const inOffsetZone = (date: Dayjs, offset: string): Dayjs => offsetToTimeZone(offset).map(zone => date.tz(zone)).or(date.utcOffset(offset));
+
+const offsetToTimeZone = (offset: string) =>
+  tryTo(() => {
+    const [, sign, hours, minutes] = offset.match(/^([+-])(\d{2}):?(\d{2})$/) ?? [];
+    if (minutes !== '00') throw new Error();
+    if (hours === '00') return 'UTC';
+    return `Etc/GMT${sign === '+' ? '-' : '+'}${Number(hours)}`;
+  });
+
+const toDayjsUnit = (unit: DurationUnit): ManipulateType => unit.replace(/s$/, '') as ManipulateType;
+
+const toDayjsBoundaryUnit = (unit: DateTimeUnit): OpUnitType => {
+  const dayjsUnit = toDayjsUnit(unit);
+  return (dayjsUnit === 'week' ? 'isoWeek' : dayjsUnit) as OpUnitType;
+};
+
+const toDayjsFormat = (format: string): string =>
+  format
+    .replace(/'([^']+)'/g, '[$1]')
+    .replace(/EEE/g, 'ddd')
+    .replace(/yyyy/g, 'YYYY')
+    .replace(/dd/g, 'DD')
+    .replace(/LLL/g, 'MMM')
+    .replace(/ZZZ/g, 'ZZ')
+    .replace(/hh/g, 'HH');
+
+const toDayjsLocale = (locale: string): string => locale.toLowerCase().split('-')[0];
+
+const formatWithIntl = (date: Dayjs, locale: string, options: Intl.DateTimeFormatOptions): string =>
+  new Intl.DateTimeFormat(locale, { ...options, timeZone: timezoneOf(date) ?? 'UTC' }).format(date.toDate());
+
+const timezoneOf = (date: Dayjs): string | undefined => (date as ZonedDayjs).$x?.$timezone;

package/src/types/Text.ts

@@ -22,4 +22,6 @@ export const toWords = (input: unknown): string[] => {
 
 export const kebab = (s = ''): string => toWords(s).join('-').toLowerCase();
 
+export type KebabToCamel<S extends string> = S extends `${infer Head}-${infer Tail}` ? `${Head}${Capitalize<KebabToCamel<Tail>>}` : S;
+
 export const capitalize = (s = ''): string => s.charAt(0).toUpperCase() + s.slice(1);

package/dist/chunk-XKRR6345.mjs

@@ -1,140 +0,0 @@
-import {
-  seconds
-} from "./chunk-ZQXTKDWH.mjs";
-import {
-  isDate
-} from "./chunk-ADJAEGCT.mjs";
-import {
-  choose,
-  ifDefined,
-  tryTo
-} from "./chunk-6Q7FX3KI.mjs";
-import {
-  Value
-} from "./chunk-YW4JACEA.mjs";
-import {
-  isA
-} from "./chunk-D5IYAIMK.mjs";
-import {
-  use
-} from "./chunk-PF7HDF6B.mjs";
-import {
-  isDefined,
-  isNumber,
-  isString
-} from "./chunk-AAND4MKF.mjs";
-
-// src/domain/DateTime.ts
-import { DateTime as LuxonDateTime, Settings } from "luxon";
-Settings.defaultZone = "utc";
-var DateTime = class _DateTime extends Value {
-  luxon;
-  constructor(value, format) {
-    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).else(value instanceof LuxonDateTime ? value : LuxonDateTime.fromISO(void 0));
-    super(luxon.toISO() ?? void 0);
-    this.luxon = luxon;
-  }
-  static get now() {
-    return new _DateTime(LuxonDateTime.utc());
-  }
-  get isValid() {
-    return isDefined(this.value) && this.utc.isValid;
-  }
-  /**
-   * @deprecated Deprecated in favor for DateTime.from as that also accepts locales and another DateTime
-   */
-  get fromNow() {
-    return this.from();
-  }
-  get inAmsterdam() {
-    return this.withZone("Europe/Amsterdam");
-  }
-  get inNewYork() {
-    return this.withZone("America/New_York");
-  }
-  get inLondon() {
-    return this.withZone("Europe/London");
-  }
-  get inWarsaw() {
-    return this.withZone("Europe/Warsaw");
-  }
-  get utc() {
-    return this.luxon.setZone("utc");
-  }
-  from(dateOrLocale, maybeLocale) {
-    return use(
-      (isString(dateOrLocale) ? dateOrLocale : maybeLocale) ?? "en",
-      (locale) => ifDefined(
-        isA(dateOrLocale) ? dateOrLocale : void 0,
-        (d) => this.utc.setLocale(locale).toRelative({ base: d.utc }),
-        () => this.utc.setLocale(locale).toRelative()
-      )
-    ) ?? "";
-  }
-  isAfter(dt2) {
-    return this.utc > dt2.utc;
-  }
-  isBefore(dt2) {
-    return this.utc < dt2.utc;
-  }
-  equals(dt2) {
-    return this.utc.hasSame(dt2.utc, "millisecond");
-  }
-  add(n, unit = "day") {
-    return new _DateTime(this.luxon.plus(isNumber(n) ? { [unit]: n } : n));
-  }
-  subtract(n, unit = "day") {
-    return new _DateTime(this.luxon.minus(isNumber(n) ? { [unit]: n } : n));
-  }
-  diff(other, unit = "day", opts) {
-    return Math[opts?.rounding ?? "floor"](this.utc.diff(other.utc).as(unit));
-  }
-  startOf(unit = "day") {
-    return new _DateTime(this.luxon.startOf(unit));
-  }
-  endOf(unit = "day") {
-    return new _DateTime(this.luxon.endOf(unit));
-  }
-  isWeekend() {
-    return this.luxon.isWeekend;
-  }
-  withZone(zone) {
-    return new _DateTime(this.luxon.setZone(zone));
-  }
-  toString() {
-    return this.value ?? "";
-  }
-  toJSON() {
-    return this.utc.toISO();
-  }
-  toFormat(format) {
-    return this.luxon.toFormat(format);
-  }
-  toLocale(locale = "nl-NL", format = "D") {
-    return this.luxon.setLocale(locale).toFormat(format);
-  }
-  toFull(locale) {
-    return this.toLocale(locale, "DDD");
-  }
-  toDate() {
-    return this.isValid ? this.utc.toJSDate() : void 0;
-  }
-  toEpoch() {
-    return this.luxon.toMillis();
-  }
-  ago(end = _DateTime.now) {
-    return seconds.toText(end.diff(this, "second"));
-  }
-  withClock(clock) {
-    return tryTo(() => [this.toDate(), clock.toDate()]).map(([td, cd]) => new Date(td.getFullYear(), td.getMonth(), td.getDate(), cd.getHours(), cd.getMinutes(), cd.getSeconds())).map((d) => new _DateTime(d)).value;
-  }
-};
-var isDateTime = (dt2) => isDefined(dt2) && dt2 instanceof DateTime;
-var dt = (dt2) => new DateTime(dt2);
-
-export {
-  DateTime,
-  isDateTime,
-  dt
-};
-//# sourceMappingURL=chunk-XKRR6345.mjs.map

package/dist/chunk-XKRR6345.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';\nimport { tryTo } from '../types/Try';\nimport { use } from '../types/Constructor';\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 type DatetimeInput = string | number | Date | DateTime | null;\n\nexport class DateTime extends Value<Optional<string>> {\n  protected readonly luxon: LuxonDateTime;\n\n  constructor(value?: DatetimeInput);\n  constructor(value?: string, format?: string);\n  constructor(value?: DatetimeInput, format?: string) {\n    const luxon = 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 => v.luxon)\n      // Allow constructing with LuxonDateTime without exposing types\n      .else(value instanceof LuxonDateTime ? value : LuxonDateTime.fromISO(undefined as any));\n\n    super(luxon.toISO() ?? undefined);\n    this.luxon = luxon;\n  }\n\n  static get now(): DateTime {\n    return new DateTime(LuxonDateTime.utc() as any);\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  get inAmsterdam(): DateTime {\n    return this.withZone('Europe/Amsterdam');\n  }\n\n  get inNewYork(): DateTime {\n    return this.withZone('America/New_York');\n  }\n\n  get inLondon(): DateTime {\n    return this.withZone('Europe/London');\n  }\n\n  get inWarsaw(): DateTime {\n    return this.withZone('Europe/Warsaw');\n  }\n\n  protected get utc(): LuxonDateTime {\n    return this.luxon.setZone('utc');\n  }\n\n  from(locale?: string): string;\n\n  from(date?: DateTime, locale?: string): string;\n\n  from(dateOrLocale?: string | DateTime, maybeLocale?: string): string {\n    return (\n      use((isString(dateOrLocale) ? dateOrLocale : maybeLocale) ?? 'en', locale =>\n        ifDefined(\n          isA<DateTime>(dateOrLocale) ? dateOrLocale : undefined,\n          d => this.utc.setLocale(locale).toRelative({ base: d.utc }),\n          () => this.utc.setLocale(locale).toRelative()\n        )\n      ) ?? ''\n    );\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, unit?: DurationUnit): DateTime;\n\n  add(duration: Duration): DateTime;\n\n  add(n: number | Duration, unit: DurationUnit = 'day'): DateTime {\n    return new DateTime(this.luxon.plus(isNumber(n) ? { [unit]: n } : n) as any);\n  }\n\n  subtract(n: number, unit?: DurationUnit): DateTime;\n\n  subtract(duration: Duration): DateTime;\n\n  subtract(n: number | Duration, unit: DurationUnit = 'day'): DateTime {\n    return new DateTime(this.luxon.minus(isNumber(n) ? { [unit]: n } : n) as any);\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) as any);\n  }\n\n  endOf(unit: DateTimeUnit = 'day'): DateTime {\n    return new DateTime(this.luxon.endOf(unit) as any);\n  }\n\n  isWeekend(): boolean {\n    return this.luxon.isWeekend;\n  }\n\n  withZone(zone: string): DateTime {\n    return new DateTime(this.luxon.setZone(zone) as any);\n  }\n\n  toString(): string {\n    return this.value ?? '';\n  }\n\n  toJSON(): JsonValue {\n    return this.utc.toISO();\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  withClock(clock: DateTime): DateTime {\n    return tryTo(() => [this.toDate() as Date, clock.toDate() as Date])\n      .map(([td, cd]) => new Date(td.getFullYear(), td.getMonth(), td.getDate(), cd.getHours(), cd.getMinutes(), cd.getSeconds()))\n      .map(d => new DateTime(d)).value;\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":"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","names":["dt"]}