@thisisagile/easy 18.11.1 → 18.11.2

package/dist/index.js

@@ -264,7 +264,7 @@ __export(src_exports, {
   template: () => template,
   text: () => text,
   textValue: () => textValue,
-  timezone: () => timezone2,
+  timezone: () => timezone,
   timezones: () => timezones,
   toArray: () => toArray,
   toCacheOptions: () => toCacheOptions,
@@ -300,7 +300,7 @@ __export(src_exports, {
   tupleO: () => tupleO,
   uri: () => uri,
   use: () => use,
-  utc: () => utc2,
+  utc: () => utc,
   valid: () => valid,
   validate: () => validate,
   validateReject: () => validateReject,
@@ -1796,17 +1796,7 @@ function isStruct(s) {
 }
 
 // src/domain/DateTime.ts
-var import_dayjs = __toESM(require("dayjs"));
-var import_advancedFormat = __toESM(require("dayjs/plugin/advancedFormat"));
-var import_customParseFormat = __toESM(require("dayjs/plugin/customParseFormat"));
-var import_isoWeek = __toESM(require("dayjs/plugin/isoWeek"));
-var import_localizedFormat = __toESM(require("dayjs/plugin/localizedFormat"));
-var import_quarterOfYear = __toESM(require("dayjs/plugin/quarterOfYear"));
-var import_relativeTime = __toESM(require("dayjs/plugin/relativeTime"));
-var import_timezone = __toESM(require("dayjs/plugin/timezone"));
-var import_utc = __toESM(require("dayjs/plugin/utc"));
-var import_de = require("dayjs/locale/de");
-var import_nl = require("dayjs/locale/nl");
+var import_luxon = require("luxon");
 
 // src/types/IsDate.ts
 var isDate = (o) => o instanceof Date && !isNaN(o.getTime());
@@ -1838,58 +1828,19 @@ var seconds = {
 };
 
 // src/domain/DateTime.ts
-import_dayjs.default.extend(import_utc.default);
-import_dayjs.default.extend(import_timezone.default);
-import_dayjs.default.extend(import_customParseFormat.default);
-import_dayjs.default.extend(import_localizedFormat.default);
-import_dayjs.default.extend(import_relativeTime.default);
-import_dayjs.default.extend(import_isoWeek.default);
-import_dayjs.default.extend(import_advancedFormat.default);
-import_dayjs.default.extend(import_quarterOfYear.default);
-import_dayjs.default.tz.setDefault("UTC");
-var invalidDate = import_dayjs.default.utc(Number.NaN);
-var isDayjs = (value) => import_dayjs.default.isDayjs(value);
-var 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"
-];
-var fixedUnitMilliseconds = {
-  day: 864e5,
-  days: 864e5,
-  week: 6048e5,
-  weeks: 6048e5
-};
-var calendarUnitMonths = {
-  month: 1,
-  months: 1,
-  quarter: 3,
-  quarters: 3,
-  year: 12,
-  years: 12
-};
+import_luxon.Settings.defaultZone = "utc";
 var DateTime = class _DateTime extends Value {
-  date;
+  luxon;
   constructor(value, format) {
-    const date = choose(value).type(isDayjs, (date2) => date2).type(isDateTime, (dateTime) => dateTime.date).type(isNumber, (timestamp) => import_dayjs.default.utc(timestamp)).type(isDate, (date2) => import_dayjs.default.utc(date2)).type(isString, (string) => string === "" ? invalidDate : format ? parseFormatted(string, format) : parseIso(string)).else(invalidDate);
-    super(date.isValid() ? formatDateTime(date) : void 0);
-    this.date = date;
+    const luxon = choose(value).type(isString, (v) => format ? import_luxon.DateTime.fromFormat(v, format, { setZone: true }) : import_luxon.DateTime.fromISO(v, { setZone: true })).type(isNumber, (v) => import_luxon.DateTime.fromMillis(v)).type(isDate, (v) => import_luxon.DateTime.fromJSDate(v)).type(isDateTime, (v) => v.luxon).else(value instanceof import_luxon.DateTime ? value : import_luxon.DateTime.fromISO(void 0));
+    super(luxon.toISO() ?? void 0);
+    this.luxon = luxon;
   }
   static get now() {
-    return fromDayjs(import_dayjs.default.utc(Date.now()));
+    return new _DateTime(import_luxon.DateTime.utc());
   }
   get isValid() {
-    return isDefined(this.value) && this.date.isValid();
+    return isDefined(this.value) && this.utc.isValid;
   }
   /**
    * @deprecated Deprecated in favor for DateTime.from as that also accepts locales and another DateTime
@@ -1910,161 +1861,78 @@ var DateTime = class _DateTime extends Value {
     return this.withZone("Europe/Warsaw");
   }
   get utc() {
-    return this.date.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.locale(toDayjsLocale(locale)).from(d.utc),
-        () => this.utc.locale(toDayjsLocale(locale)).from(import_dayjs.default.utc(Date.now()))
+        (d) => this.utc.setLocale(locale).toRelative({ base: d.utc }),
+        () => this.utc.setLocale(locale).toRelative()
       )
     ) ?? "";
   }
   isAfter(dt2) {
-    return this.utc.valueOf() > dt2.utc.valueOf();
+    return this.utc > dt2.utc;
   }
   isBefore(dt2) {
-    return this.utc.valueOf() < dt2.utc.valueOf();
+    return this.utc < dt2.utc;
   }
   equals(dt2) {
-    return this.utc.valueOf() === dt2.utc.valueOf();
+    return this.utc.hasSame(dt2.utc, "millisecond");
   }
   add(n, unit = "day") {
-    return fromDayjs(change(this.date, n, unit, "add"));
+    return new _DateTime(this.luxon.plus(isNumber(n) ? { [unit]: n } : n));
   }
   subtract(n, unit = "day") {
-    return fromDayjs(change(this.date, n, unit, "subtract"));
+    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, toDayjsUnit(unit), true));
+    return Math[opts?.rounding ?? "floor"](this.utc.diff(other.utc).as(unit));
   }
   startOf(unit = "day") {
-    return fromDayjs(this.date.startOf(toDayjsBoundaryUnit(unit)));
+    return new _DateTime(this.luxon.startOf(unit));
   }
   endOf(unit = "day") {
-    return fromDayjs(this.date.endOf(toDayjsBoundaryUnit(unit)));
+    return new _DateTime(this.luxon.endOf(unit));
   }
   isWeekend() {
-    const day = this.date.day();
-    return day === 0 || day === 6;
+    return this.luxon.isWeekend;
   }
   withZone(zone) {
-    return fromDayjs(this.date.tz(zone));
+    return new _DateTime(this.luxon.setZone(zone));
   }
   toString() {
     return this.value ?? "";
   }
   toJSON() {
-    return this.isValid ? this.utc.format("YYYY-MM-DDTHH:mm:ss.SSS[Z]") : null;
+    return this.utc.toISO();
   }
   toFormat(format) {
-    return this.isValid ? this.date.format(toDayjsFormat(format)) : "";
+    return this.luxon.toFormat(format);
   }
   toLocale(locale = "nl-NL", format = "D") {
-    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));
+    return this.luxon.setLocale(locale).toFormat(format);
   }
   toFull(locale) {
     return this.toLocale(locale, "DDD");
   }
   toDate() {
-    return this.isValid ? this.utc.toDate() : void 0;
+    return this.isValid ? this.utc.toJSDate() : void 0;
   }
   toEpoch() {
-    return this.date.valueOf();
+    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(Date.UTC(td.getUTCFullYear(), td.getUTCMonth(), td.getUTCDate(), cd.getUTCHours(), cd.getUTCMinutes(), cd.getUTCSeconds()))).map((d) => new _DateTime(d)).value;
+    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);
-var parseIso = (value) => {
-  const offset = offsetOf(value);
-  if (offset) {
-    const date = import_dayjs.default.utc(value);
-    return date.isValid() ? inOffsetZone(date, offset) : invalidDate;
-  }
-  return (0, import_dayjs.default)(value, isoFormats, true).isValid() ? import_dayjs.default.utc(value) : invalidDate;
-};
-var parseFormatted = (value, format) => {
-  const dayjsFormat = toDayjsFormat(format);
-  const offset = offsetOf(value);
-  if (format.includes("ZZZ") && offset) {
-    const iso = import_dayjs.default.utc(value);
-    return iso.isValid() ? inOffsetZone(iso, offset) : invalidDate;
-  }
-  return import_dayjs.default.utc(value, dayjsFormat, true);
-};
-var offsetOf = (value) => value.match(/([+-]\d{2}:?\d{2})$/)?.[1];
-var fromDayjs = (date) => new DateTime(date);
-var formatDateTime = (date) => {
-  const formatted = date.format("YYYY-MM-DDTHH:mm:ss.SSSZ");
-  return timezoneOf(date) ? formatted : formatted.replace("+00:00", "Z");
-};
-var change = (date, value, unit, direction) => {
-  if (isNumber(value))
-    return changeUnit(date, value, unit, direction);
-  return Object.entries(value).reduce((result, [durationUnit, durationValue]) => changeUnit(result, durationValue ?? 0, durationUnit, direction), date);
-};
-var changeUnit = (date, value, unit, direction) => {
-  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));
-};
-var addMonths = (date, months) => {
-  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");
-};
-var inOffsetZone = (date, offset) => offsetToTimeZone(offset).map((zone) => date.tz(zone)).or(date.utcOffset(offset));
-var offsetToTimeZone = (offset) => 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)}`;
-});
-var toDayjsUnit = (unit) => unit.replace(/s$/, "");
-var toDayjsBoundaryUnit = (unit) => {
-  const dayjsUnit = toDayjsUnit(unit);
-  return dayjsUnit === "week" ? "isoWeek" : dayjsUnit;
-};
-var toDayjsFormat = (format) => 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");
-var toDayjsLocale = (locale) => locale.toLowerCase().split("-")[0];
-var formatWithIntl = (date, locale, options) => new Intl.DateTimeFormat(locale, { ...options, timeZone: timezoneOf(date) ?? "UTC" }).format(date.toDate());
-var timezoneOf = (date) => date.$x?.$timezone;
 
 // src/validation/Contraints.ts
 var constraint = (c, message) => (subject, property) => {
@@ -3526,7 +3394,7 @@ var timezones = [
   "Europe/Warsaw",
   "America/New_York"
 ];
-var timezone2 = {
+var timezone = {
   utc: "utc",
   amsterdam: "Europe/Amsterdam",
   berlin: "Europe/Berlin",
@@ -3537,8 +3405,8 @@ var timezone2 = {
   warsaw: "Europe/Warsaw",
   newYork: "America/New_York"
 };
-var utc2 = timezone2.utc;
-var ams = timezone2.amsterdam;
+var utc = timezone.utc;
+var ams = timezone.amsterdam;
 
 // src/types/Uri.ts
 var toSegment = (key, {
@@ -3655,7 +3523,7 @@ function dir(t) {
 }
 
 // src/utils/Period.ts
-var toStartEnd = ({ period: period2, start, end, zone = utc2 }) => {
+var toStartEnd = ({ period: period2, start, end, zone = utc }) => {
   const today = DateTime.now.withZone(zone).startOf("day");
   return choose(period2).equals("today", { start: today, end: today.endOf("day") }).equals("yesterday", { start: today.subtract(1, "day"), end: today }).equals("tomorrow", { start: today.add(1, "day"), end: today.add(1, "day").endOf("day") }).equals("this-week", { start: today.startOf("week"), end: today.endOf("week") }).equals("last-seven-days", { start: today.subtract(6, "day"), end: today.endOf("day") }).equals("last-week", {
     start: today.subtract(1, "week").startOf("week"),