@trackunit/date-and-time-utils 0.0.33 → 0.0.34

package/index.cjs.js

@@ -508,9 +508,17 @@ const endOfMonthUtil = (date, timeZone) => {
  * Output: 5
  */
 const differenceInMinutesUtil = (from, to) => {
-    return toZonedDateTimeUtil(from).until(toZonedDateTimeUtil(to), {
-        largestUnit: "minute",
-    }).minutes;
+    let until = new polyfill.Temporal.Duration();
+    try {
+        until = toZonedDateTimeUtil(from).toPlainTime().until(toZonedDateTimeUtil(to).toPlainTime(), {
+            largestUnit: "minutes",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    return until.minutes;
 };
 /**
  * Calculates the difference in hours between two dates.
@@ -534,9 +542,17 @@ const differenceInMinutesUtil = (from, to) => {
  * Output: 2
  */
 const differenceInHoursUtil = (from, to) => {
-    return toZonedDateTimeUtil(from).until(toZonedDateTimeUtil(to), {
-        largestUnit: "hour",
-    }).hours;
+    let until = new polyfill.Temporal.Duration();
+    try {
+        until = toZonedDateTimeUtil(from).toPlainTime().until(toZonedDateTimeUtil(to).toPlainTime(), {
+            largestUnit: "hours",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    return until.hours;
 };
 /**
  * Calculates the difference in days between two dates.
@@ -560,9 +576,17 @@ const differenceInHoursUtil = (from, to) => {
  * Output: 3
  */
 const differenceInDaysUtil = (from, to) => {
-    return toZonedDateTimeUtil(from).until(toZonedDateTimeUtil(to), {
-        largestUnit: "day",
-    }).days;
+    let until = new polyfill.Temporal.Duration();
+    try {
+        until = toZonedDateTimeUtil(from).toPlainDate().until(toZonedDateTimeUtil(to).toPlainDate(), {
+            largestUnit: "day",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error, until.days);
+    }
+    return until.days;
 };
 /**
  * Calculates the difference in weeks between two dates.
@@ -586,9 +610,17 @@ const differenceInDaysUtil = (from, to) => {
  * Output: 1
  */
 const differenceInWeeksUtil = (from, to) => {
-    return toZonedDateTimeUtil(from).until(toZonedDateTimeUtil(to), {
-        largestUnit: "week",
-    }).weeks;
+    let until = new polyfill.Temporal.Duration();
+    try {
+        until = toZonedDateTimeUtil(from).toPlainDate().until(toZonedDateTimeUtil(to).toPlainDate(), {
+            largestUnit: "week",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    return until.weeks;
 };
 /**
  * Calculates the difference in months between two dates.
@@ -612,9 +644,17 @@ const differenceInWeeksUtil = (from, to) => {
  * Output: 1
  */
 const differenceInMonthsUtil = (from, to) => {
-    return toZonedDateTimeUtil(from).until(toZonedDateTimeUtil(to), {
-        largestUnit: "month",
-    }).months;
+    let until = new polyfill.Temporal.Duration();
+    try {
+        until = toZonedDateTimeUtil(from).toPlainDate().until(toZonedDateTimeUtil(to).toPlainDate(), {
+            largestUnit: "month",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    return until.months;
 };
 /**
  * Checks if a date is in the future.
@@ -784,7 +824,9 @@ const isEqualUtil = (from, to) => {
 const timeSinceAuto = (from, to, timeZone, locale) => {
     let since;
     try {
-        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+        since = toZonedDateTimeUtil(from, timeZone)
+            .toPlainDateTime()
+            .since(toZonedDateTimeUtil(to, timeZone).toPlainDateTime(), {
             largestUnit: "years",
             smallestUnit: "seconds",
         });
@@ -836,9 +878,17 @@ const timeSinceAuto = (from, to, timeZone, locale) => {
  * Output: "480 seconds ago"
  */
 const timeSinceInSeconds = (from, to, timeZone, locale) => {
-    const duration = polyfill.Temporal.Duration.from(toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
-        largestUnit: "seconds",
-    }));
+    let since = new polyfill.Temporal.Duration();
+    try {
+        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+            largestUnit: "seconds",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    const duration = polyfill.Temporal.Duration.from(since);
     return getRelativeTimeFormat(locale).format(duration.seconds, "seconds");
 };
 /**
@@ -857,9 +907,17 @@ const timeSinceInSeconds = (from, to, timeZone, locale) => {
  * Output: "8 minutes ago"
  */
 const timeSinceInMinutes = (from, to, timeZone, locale) => {
-    const duration = polyfill.Temporal.Duration.from(toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
-        largestUnit: "minutes",
-    }));
+    let since = new polyfill.Temporal.Duration();
+    try {
+        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+            largestUnit: "minutes",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    const duration = polyfill.Temporal.Duration.from(since);
     return getRelativeTimeFormat(locale).format(duration.minutes, "minutes");
 };
 /**
@@ -878,9 +936,17 @@ const timeSinceInMinutes = (from, to, timeZone, locale) => {
  * Output: "3 hours ago"
  */
 const timeSinceInHours = (from, to, timeZone, locale) => {
-    const duration = polyfill.Temporal.Duration.from(toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
-        largestUnit: "hours",
-    }));
+    let since = new polyfill.Temporal.Duration();
+    try {
+        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+            largestUnit: "hours",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    const duration = polyfill.Temporal.Duration.from(since);
     return getRelativeTimeFormat(locale).format(duration.hours, "hours");
 };
 /**
@@ -905,9 +971,17 @@ const timeSinceInHours = (from, to, timeZone, locale) => {
  * Output: "6 days ago"
  */
 const timeSinceInDays = (from, to, timeZone, locale) => {
-    const duration = polyfill.Temporal.Duration.from(toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
-        largestUnit: "days",
-    }));
+    let since = new polyfill.Temporal.Duration();
+    try {
+        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+            largestUnit: "days",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    const duration = polyfill.Temporal.Duration.from(since);
     return getRelativeTimeFormat(locale).format(duration.days, "days");
 };
 /**
@@ -930,9 +1004,17 @@ const timeSinceInMonths = (from, to, timeZone, locale) => {
     if (isLeapYear) {
         return timeSinceInDays(from, to, timeZone, locale);
     }
-    const duration = polyfill.Temporal.Duration.from(toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
-        largestUnit: "months",
-    }));
+    let since = new polyfill.Temporal.Duration();
+    try {
+        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+            largestUnit: "months",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    const duration = polyfill.Temporal.Duration.from(since);
     return getRelativeTimeFormat(locale).format(duration.months, "months");
 };
 /**
@@ -955,9 +1037,17 @@ const timeSinceInYears = (from, to, timeZone, locale) => {
     if (isLeapYear) {
         return timeSinceInDays(from, to, timeZone, locale);
     }
-    const duration = polyfill.Temporal.Duration.from(toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
-        largestUnit: "years",
-    }));
+    let since = new polyfill.Temporal.Duration();
+    try {
+        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+            largestUnit: "years",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    const duration = polyfill.Temporal.Duration.from(since);
     return getRelativeTimeFormat(locale).format(duration.years, "years");
 };
 const getRelativeTimeFormat = (locale) => new Intl.RelativeTimeFormat(locale, { style: "long", numeric: "always" });
@@ -995,6 +1085,7 @@ const toDuration = (number, unit, roundAt) => {
             throw new Error("Not a valid unit", { cause: unit });
     }
 };
+const defaultDuration = { days: 0, hours: 0, minutes: 0, seconds: 0 };
 /**
  * Build a duration string
  *
@@ -1002,24 +1093,27 @@ const toDuration = (number, unit, roundAt) => {
  * @param unit - "days | "hours" | minutes
  */
 const durationBuilder = (number, unit) => {
-    const isInt = Number.isSafeInteger(number);
-    const { days, hours, minutes, seconds } = calculateTime(number, unit);
+    const isSigned = Math.sign(number) === -1;
+    const sign = isSigned ? "-" : "";
+    const unsignedNumber = Math.abs(number);
+    const isInt = Number.isSafeInteger(unsignedNumber);
+    const { days, hours, minutes, seconds } = !isInt ? calculateTime(unsignedNumber, unit) : defaultDuration;
     switch (unit) {
         case "days":
             if (isInt) {
-                return `P${number}D`;
+                return `${sign}P${unsignedNumber}D`;
             }
-            return `P${days}DT${hours}H${minutes}M${seconds}S`;
+            return `${sign}P${days}DT${hours}H${minutes}M${seconds}S`;
         case "hours":
             if (isInt) {
-                return `PT${number}H`;
+                return `${sign}PT${unsignedNumber}H`;
             }
-            return `PT${hours}H${minutes}M${seconds}S`;
+            return `${sign}PT${hours}H${minutes}M${seconds}S`;
         case "minutes":
             if (isInt) {
-                return `PT${number}M`;
+                return `${sign}PT${unsignedNumber}M`;
             }
-            return `PT${minutes}M${seconds}S`;
+            return `${sign}PT${minutes}M${seconds}S`;
         default:
             return `PT0S`;
     }
@@ -1175,7 +1269,7 @@ const toZonedDateTimeUtil = (date, timeZoneId, calendar) => {
     }
     return date.toZonedDateTime({
         calendar: polyfill.Temporal.Calendar.from(calendar !== null && calendar !== void 0 ? calendar : "iso8601"),
-        timeZone: polyfill.Temporal.TimeZone.from(timeZoneId !== null && timeZoneId !== void 0 ? timeZoneId : polyfill.Temporal.Now.timeZoneId()),
+        timeZone: polyfill.Temporal.TimeZone.from(timeZoneId || date.toString() || polyfill.Temporal.Now.timeZoneId()),
     });
 };
 /**

package/index.esm.js

@@ -504,9 +504,17 @@ const endOfMonthUtil = (date, timeZone) => {
  * Output: 5
  */
 const differenceInMinutesUtil = (from, to) => {
-    return toZonedDateTimeUtil(from).until(toZonedDateTimeUtil(to), {
-        largestUnit: "minute",
-    }).minutes;
+    let until = new Temporal.Duration();
+    try {
+        until = toZonedDateTimeUtil(from).toPlainTime().until(toZonedDateTimeUtil(to).toPlainTime(), {
+            largestUnit: "minutes",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    return until.minutes;
 };
 /**
  * Calculates the difference in hours between two dates.
@@ -530,9 +538,17 @@ const differenceInMinutesUtil = (from, to) => {
  * Output: 2
  */
 const differenceInHoursUtil = (from, to) => {
-    return toZonedDateTimeUtil(from).until(toZonedDateTimeUtil(to), {
-        largestUnit: "hour",
-    }).hours;
+    let until = new Temporal.Duration();
+    try {
+        until = toZonedDateTimeUtil(from).toPlainTime().until(toZonedDateTimeUtil(to).toPlainTime(), {
+            largestUnit: "hours",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    return until.hours;
 };
 /**
  * Calculates the difference in days between two dates.
@@ -556,9 +572,17 @@ const differenceInHoursUtil = (from, to) => {
  * Output: 3
  */
 const differenceInDaysUtil = (from, to) => {
-    return toZonedDateTimeUtil(from).until(toZonedDateTimeUtil(to), {
-        largestUnit: "day",
-    }).days;
+    let until = new Temporal.Duration();
+    try {
+        until = toZonedDateTimeUtil(from).toPlainDate().until(toZonedDateTimeUtil(to).toPlainDate(), {
+            largestUnit: "day",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error, until.days);
+    }
+    return until.days;
 };
 /**
  * Calculates the difference in weeks between two dates.
@@ -582,9 +606,17 @@ const differenceInDaysUtil = (from, to) => {
  * Output: 1
  */
 const differenceInWeeksUtil = (from, to) => {
-    return toZonedDateTimeUtil(from).until(toZonedDateTimeUtil(to), {
-        largestUnit: "week",
-    }).weeks;
+    let until = new Temporal.Duration();
+    try {
+        until = toZonedDateTimeUtil(from).toPlainDate().until(toZonedDateTimeUtil(to).toPlainDate(), {
+            largestUnit: "week",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    return until.weeks;
 };
 /**
  * Calculates the difference in months between two dates.
@@ -608,9 +640,17 @@ const differenceInWeeksUtil = (from, to) => {
  * Output: 1
  */
 const differenceInMonthsUtil = (from, to) => {
-    return toZonedDateTimeUtil(from).until(toZonedDateTimeUtil(to), {
-        largestUnit: "month",
-    }).months;
+    let until = new Temporal.Duration();
+    try {
+        until = toZonedDateTimeUtil(from).toPlainDate().until(toZonedDateTimeUtil(to).toPlainDate(), {
+            largestUnit: "month",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    return until.months;
 };
 /**
  * Checks if a date is in the future.
@@ -780,7 +820,9 @@ const isEqualUtil = (from, to) => {
 const timeSinceAuto = (from, to, timeZone, locale) => {
     let since;
     try {
-        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+        since = toZonedDateTimeUtil(from, timeZone)
+            .toPlainDateTime()
+            .since(toZonedDateTimeUtil(to, timeZone).toPlainDateTime(), {
             largestUnit: "years",
             smallestUnit: "seconds",
         });
@@ -832,9 +874,17 @@ const timeSinceAuto = (from, to, timeZone, locale) => {
  * Output: "480 seconds ago"
  */
 const timeSinceInSeconds = (from, to, timeZone, locale) => {
-    const duration = Temporal.Duration.from(toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
-        largestUnit: "seconds",
-    }));
+    let since = new Temporal.Duration();
+    try {
+        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+            largestUnit: "seconds",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    const duration = Temporal.Duration.from(since);
     return getRelativeTimeFormat(locale).format(duration.seconds, "seconds");
 };
 /**
@@ -853,9 +903,17 @@ const timeSinceInSeconds = (from, to, timeZone, locale) => {
  * Output: "8 minutes ago"
  */
 const timeSinceInMinutes = (from, to, timeZone, locale) => {
-    const duration = Temporal.Duration.from(toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
-        largestUnit: "minutes",
-    }));
+    let since = new Temporal.Duration();
+    try {
+        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+            largestUnit: "minutes",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    const duration = Temporal.Duration.from(since);
     return getRelativeTimeFormat(locale).format(duration.minutes, "minutes");
 };
 /**
@@ -874,9 +932,17 @@ const timeSinceInMinutes = (from, to, timeZone, locale) => {
  * Output: "3 hours ago"
  */
 const timeSinceInHours = (from, to, timeZone, locale) => {
-    const duration = Temporal.Duration.from(toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
-        largestUnit: "hours",
-    }));
+    let since = new Temporal.Duration();
+    try {
+        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+            largestUnit: "hours",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    const duration = Temporal.Duration.from(since);
     return getRelativeTimeFormat(locale).format(duration.hours, "hours");
 };
 /**
@@ -901,9 +967,17 @@ const timeSinceInHours = (from, to, timeZone, locale) => {
  * Output: "6 days ago"
  */
 const timeSinceInDays = (from, to, timeZone, locale) => {
-    const duration = Temporal.Duration.from(toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
-        largestUnit: "days",
-    }));
+    let since = new Temporal.Duration();
+    try {
+        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+            largestUnit: "days",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    const duration = Temporal.Duration.from(since);
     return getRelativeTimeFormat(locale).format(duration.days, "days");
 };
 /**
@@ -926,9 +1000,17 @@ const timeSinceInMonths = (from, to, timeZone, locale) => {
     if (isLeapYear) {
         return timeSinceInDays(from, to, timeZone, locale);
     }
-    const duration = Temporal.Duration.from(toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
-        largestUnit: "months",
-    }));
+    let since = new Temporal.Duration();
+    try {
+        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+            largestUnit: "months",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    const duration = Temporal.Duration.from(since);
     return getRelativeTimeFormat(locale).format(duration.months, "months");
 };
 /**
@@ -951,9 +1033,17 @@ const timeSinceInYears = (from, to, timeZone, locale) => {
     if (isLeapYear) {
         return timeSinceInDays(from, to, timeZone, locale);
     }
-    const duration = Temporal.Duration.from(toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
-        largestUnit: "years",
-    }));
+    let since = new Temporal.Duration();
+    try {
+        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+            largestUnit: "years",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn("Error: ", error);
+    }
+    const duration = Temporal.Duration.from(since);
     return getRelativeTimeFormat(locale).format(duration.years, "years");
 };
 const getRelativeTimeFormat = (locale) => new Intl.RelativeTimeFormat(locale, { style: "long", numeric: "always" });
@@ -991,6 +1081,7 @@ const toDuration = (number, unit, roundAt) => {
             throw new Error("Not a valid unit", { cause: unit });
     }
 };
+const defaultDuration = { days: 0, hours: 0, minutes: 0, seconds: 0 };
 /**
  * Build a duration string
  *
@@ -998,24 +1089,27 @@ const toDuration = (number, unit, roundAt) => {
  * @param unit - "days | "hours" | minutes
  */
 const durationBuilder = (number, unit) => {
-    const isInt = Number.isSafeInteger(number);
-    const { days, hours, minutes, seconds } = calculateTime(number, unit);
+    const isSigned = Math.sign(number) === -1;
+    const sign = isSigned ? "-" : "";
+    const unsignedNumber = Math.abs(number);
+    const isInt = Number.isSafeInteger(unsignedNumber);
+    const { days, hours, minutes, seconds } = !isInt ? calculateTime(unsignedNumber, unit) : defaultDuration;
     switch (unit) {
         case "days":
             if (isInt) {
-                return `P${number}D`;
+                return `${sign}P${unsignedNumber}D`;
             }
-            return `P${days}DT${hours}H${minutes}M${seconds}S`;
+            return `${sign}P${days}DT${hours}H${minutes}M${seconds}S`;
         case "hours":
             if (isInt) {
-                return `PT${number}H`;
+                return `${sign}PT${unsignedNumber}H`;
             }
-            return `PT${hours}H${minutes}M${seconds}S`;
+            return `${sign}PT${hours}H${minutes}M${seconds}S`;
         case "minutes":
             if (isInt) {
-                return `PT${number}M`;
+                return `${sign}PT${unsignedNumber}M`;
             }
-            return `PT${minutes}M${seconds}S`;
+            return `${sign}PT${minutes}M${seconds}S`;
         default:
             return `PT0S`;
     }
@@ -1171,7 +1265,7 @@ const toZonedDateTimeUtil = (date, timeZoneId, calendar) => {
     }
     return date.toZonedDateTime({
         calendar: Temporal.Calendar.from(calendar !== null && calendar !== void 0 ? calendar : "iso8601"),
-        timeZone: Temporal.TimeZone.from(timeZoneId !== null && timeZoneId !== void 0 ? timeZoneId : Temporal.Now.timeZoneId()),
+        timeZone: Temporal.TimeZone.from(timeZoneId || date.toString() || Temporal.Now.timeZoneId()),
     });
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/date-and-time-utils",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {