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

package/index.cjs.js

@@ -782,32 +782,43 @@ const isEqualUtil = (from, to) => {
  * Output:  "1 year ago"
  */
 const timeSinceAuto = (from, to, timeZone, locale) => {
-    const duration = polyfill.Temporal.Duration.from(toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
-        largestUnit: "years",
-        smallestUnit: "seconds",
-    }));
+    let since;
+    try {
+        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+            largestUnit: "years",
+            smallestUnit: "seconds",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn(new Error("Not a valid duration", { cause: error }));
+        return "";
+    }
+    const duration = polyfill.Temporal.Duration.from(since);
     if (duration.blank) {
         return getRelativeTimeFormat(locale).format(-1, "seconds");
     }
     if (duration.years !== 0) {
-        return timeSinceInYears(from, to, timeZone, locale);
+        return getRelativeTimeFormat(locale).format(duration.years, "years");
     }
     if (duration.months !== 0) {
-        return timeSinceInMonths(from, to, timeZone, locale);
+        return getRelativeTimeFormat(locale).format(duration.months, "months");
     }
     if (duration.days !== 0) {
-        return timeSinceInDays(from, to, timeZone, locale);
+        return getRelativeTimeFormat(locale).format(duration.days, "days");
     }
     if (duration.hours !== 0) {
-        return timeSinceInHours(from, to, timeZone, locale);
+        return getRelativeTimeFormat(locale).format(duration.hours, "hours");
     }
     if (duration.minutes !== 0) {
-        return timeSinceInMinutes(from, to, timeZone, locale);
+        return getRelativeTimeFormat(locale).format(duration.minutes, "minutes");
     }
     if (duration.seconds !== 0) {
-        return timeSinceInSeconds(from, to, timeZone, locale);
+        return getRelativeTimeFormat(locale).format(duration.seconds, "seconds");
     }
-    throw new Error("Not a valid duration", { cause: duration });
+    // eslint-disable-next-line no-console
+    console.warn(new Error("Not a valid duration", { cause: duration }));
+    return "";
 };
 /**
  * Calculates the time duration between two TemporalDate objects and returns the duration in seconds as a formatted string.
@@ -984,7 +995,6 @@ 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
  *
@@ -992,27 +1002,24 @@ const defaultDuration = { days: 0, hours: 0, minutes: 0, seconds: 0 };
  * @param unit - "days | "hours" | minutes
  */
 const durationBuilder = (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;
+    const isInt = Number.isSafeInteger(number);
+    const { days, hours, minutes, seconds } = calculateTime(number, unit);
     switch (unit) {
         case "days":
             if (isInt) {
-                return `${sign}P${unsignedNumber}D`;
+                return `P${number}D`;
             }
-            return `${sign}P${days}DT${hours}H${minutes}M${seconds}S`;
+            return `P${days}DT${hours}H${minutes}M${seconds}S`;
         case "hours":
             if (isInt) {
-                return `${sign}PT${unsignedNumber}H`;
+                return `PT${number}H`;
             }
-            return `${sign}PT${hours}H${minutes}M${seconds}S`;
+            return `PT${hours}H${minutes}M${seconds}S`;
         case "minutes":
             if (isInt) {
-                return `${sign}PT${unsignedNumber}M`;
+                return `PT${number}M`;
             }
-            return `${sign}PT${minutes}M${seconds}S`;
+            return `PT${minutes}M${seconds}S`;
         default:
             return `PT0S`;
     }

package/index.esm.js

@@ -778,32 +778,43 @@ const isEqualUtil = (from, to) => {
  * Output:  "1 year ago"
  */
 const timeSinceAuto = (from, to, timeZone, locale) => {
-    const duration = Temporal.Duration.from(toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
-        largestUnit: "years",
-        smallestUnit: "seconds",
-    }));
+    let since;
+    try {
+        since = toZonedDateTimeUtil(from, timeZone).since(toZonedDateTimeUtil(to, timeZone), {
+            largestUnit: "years",
+            smallestUnit: "seconds",
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn(new Error("Not a valid duration", { cause: error }));
+        return "";
+    }
+    const duration = Temporal.Duration.from(since);
     if (duration.blank) {
         return getRelativeTimeFormat(locale).format(-1, "seconds");
     }
     if (duration.years !== 0) {
-        return timeSinceInYears(from, to, timeZone, locale);
+        return getRelativeTimeFormat(locale).format(duration.years, "years");
     }
     if (duration.months !== 0) {
-        return timeSinceInMonths(from, to, timeZone, locale);
+        return getRelativeTimeFormat(locale).format(duration.months, "months");
     }
     if (duration.days !== 0) {
-        return timeSinceInDays(from, to, timeZone, locale);
+        return getRelativeTimeFormat(locale).format(duration.days, "days");
     }
     if (duration.hours !== 0) {
-        return timeSinceInHours(from, to, timeZone, locale);
+        return getRelativeTimeFormat(locale).format(duration.hours, "hours");
     }
     if (duration.minutes !== 0) {
-        return timeSinceInMinutes(from, to, timeZone, locale);
+        return getRelativeTimeFormat(locale).format(duration.minutes, "minutes");
     }
     if (duration.seconds !== 0) {
-        return timeSinceInSeconds(from, to, timeZone, locale);
+        return getRelativeTimeFormat(locale).format(duration.seconds, "seconds");
     }
-    throw new Error("Not a valid duration", { cause: duration });
+    // eslint-disable-next-line no-console
+    console.warn(new Error("Not a valid duration", { cause: duration }));
+    return "";
 };
 /**
  * Calculates the time duration between two TemporalDate objects and returns the duration in seconds as a formatted string.
@@ -980,7 +991,6 @@ 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
  *
@@ -988,27 +998,24 @@ const defaultDuration = { days: 0, hours: 0, minutes: 0, seconds: 0 };
  * @param unit - "days | "hours" | minutes
  */
 const durationBuilder = (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;
+    const isInt = Number.isSafeInteger(number);
+    const { days, hours, minutes, seconds } = calculateTime(number, unit);
     switch (unit) {
         case "days":
             if (isInt) {
-                return `${sign}P${unsignedNumber}D`;
+                return `P${number}D`;
             }
-            return `${sign}P${days}DT${hours}H${minutes}M${seconds}S`;
+            return `P${days}DT${hours}H${minutes}M${seconds}S`;
         case "hours":
             if (isInt) {
-                return `${sign}PT${unsignedNumber}H`;
+                return `PT${number}H`;
             }
-            return `${sign}PT${hours}H${minutes}M${seconds}S`;
+            return `PT${hours}H${minutes}M${seconds}S`;
         case "minutes":
             if (isInt) {
-                return `${sign}PT${unsignedNumber}M`;
+                return `PT${number}M`;
             }
-            return `${sign}PT${minutes}M${seconds}S`;
+            return `PT${minutes}M${seconds}S`;
         default:
             return `PT0S`;
     }

package/package.json

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