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

package/index.cjs.js

@@ -984,31 +984,105 @@ 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
+ *
+ * @param number - number to convert
+ * @param unit - "days | "hours" | minutes
+ */
 const durationBuilder = (number, unit) => {
-    const days = Math.floor(number);
-    const hours = unit === "hours" ? Math.floor(number) : Math.floor((number * 24) % 24);
-    const minutes = unit === "minutes" ? Math.floor(number) : Math.floor((number * 24 * 60) % 60);
-    const seconds = Math.floor((number * 24 * 60 * 60) % 60);
+    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 (Number.isSafeInteger(number)) {
-                return `P${number}D`;
+            if (isInt) {
+                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 (Number.isSafeInteger(number)) {
-                return `PT${number}H`;
+            if (isInt) {
+                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 (Number.isSafeInteger(number)) {
-                return `PT${number}M`;
+            if (isInt) {
+                return `${sign}PT${unsignedNumber}M`;
             }
-            return `PT${minutes}M${seconds}S`;
+            return `${sign}PT${minutes}M${seconds}S`;
         default:
             return `PT0S`;
     }
 };
+/**
+ * Calculate time in days, hours, minutes, and seconds
+ *
+ * @param {number} number - number to convert
+ * @param {TemporalTimeTypes} unit - "days | "hours" | minutes
+ */
+const calculateTime = (number, unit) => {
+    switch (unit) {
+        case "days":
+            return convertToDays(number);
+        case "hours":
+            return Object.assign({ days: 0 }, convertToHours(number));
+        case "minutes":
+            return Object.assign({ days: 0, hours: 0 }, convertToMinutes(number));
+        default:
+            return { days: 0, hours: 0, minutes: 0, seconds: 0 };
+    }
+};
+/**
+ * Convert a number to days, hours, minutes, and seconds
+ *
+ * @param number - number to convert
+ */
+const convertToDays = (number) => {
+    const days = Math.floor(number);
+    const remainingHours = (number - days) * 24;
+    const hours = Math.floor(remainingHours);
+    const remainingMinutes = (remainingHours - hours) * 60;
+    const minutes = Math.floor(remainingMinutes);
+    const seconds = Math.round((remainingMinutes - minutes) * 60);
+    return {
+        days,
+        hours,
+        minutes,
+        seconds,
+    };
+};
+/**
+ * Convert a number to hours, minutes, and seconds
+ *
+ * @param number - number to convert
+ */
+const convertToHours = (number) => {
+    const hours = Math.floor(number);
+    const decimalMinutes = (number - hours) * 60;
+    const minutes = Math.floor(decimalMinutes);
+    const seconds = Math.round((decimalMinutes - minutes) * 60);
+    return {
+        hours,
+        minutes,
+        seconds,
+    };
+};
+/**
+ * Convert a number to minutes and seconds
+ *
+ * @param number - number to convert
+ */
+const convertToMinutes = (number) => {
+    const minutes = number < 0 ? 0 : Math.floor(number);
+    const seconds = Math.round((number - minutes) * 60);
+    return {
+        minutes,
+        seconds,
+    };
+};
 /**
  * Converts a JavaScript Date object to a Temporal Instant.
  *

package/index.esm.js

@@ -980,31 +980,105 @@ 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
+ *
+ * @param number - number to convert
+ * @param unit - "days | "hours" | minutes
+ */
 const durationBuilder = (number, unit) => {
-    const days = Math.floor(number);
-    const hours = unit === "hours" ? Math.floor(number) : Math.floor((number * 24) % 24);
-    const minutes = unit === "minutes" ? Math.floor(number) : Math.floor((number * 24 * 60) % 60);
-    const seconds = Math.floor((number * 24 * 60 * 60) % 60);
+    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 (Number.isSafeInteger(number)) {
-                return `P${number}D`;
+            if (isInt) {
+                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 (Number.isSafeInteger(number)) {
-                return `PT${number}H`;
+            if (isInt) {
+                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 (Number.isSafeInteger(number)) {
-                return `PT${number}M`;
+            if (isInt) {
+                return `${sign}PT${unsignedNumber}M`;
             }
-            return `PT${minutes}M${seconds}S`;
+            return `${sign}PT${minutes}M${seconds}S`;
         default:
             return `PT0S`;
     }
 };
+/**
+ * Calculate time in days, hours, minutes, and seconds
+ *
+ * @param {number} number - number to convert
+ * @param {TemporalTimeTypes} unit - "days | "hours" | minutes
+ */
+const calculateTime = (number, unit) => {
+    switch (unit) {
+        case "days":
+            return convertToDays(number);
+        case "hours":
+            return Object.assign({ days: 0 }, convertToHours(number));
+        case "minutes":
+            return Object.assign({ days: 0, hours: 0 }, convertToMinutes(number));
+        default:
+            return { days: 0, hours: 0, minutes: 0, seconds: 0 };
+    }
+};
+/**
+ * Convert a number to days, hours, minutes, and seconds
+ *
+ * @param number - number to convert
+ */
+const convertToDays = (number) => {
+    const days = Math.floor(number);
+    const remainingHours = (number - days) * 24;
+    const hours = Math.floor(remainingHours);
+    const remainingMinutes = (remainingHours - hours) * 60;
+    const minutes = Math.floor(remainingMinutes);
+    const seconds = Math.round((remainingMinutes - minutes) * 60);
+    return {
+        days,
+        hours,
+        minutes,
+        seconds,
+    };
+};
+/**
+ * Convert a number to hours, minutes, and seconds
+ *
+ * @param number - number to convert
+ */
+const convertToHours = (number) => {
+    const hours = Math.floor(number);
+    const decimalMinutes = (number - hours) * 60;
+    const minutes = Math.floor(decimalMinutes);
+    const seconds = Math.round((decimalMinutes - minutes) * 60);
+    return {
+        hours,
+        minutes,
+        seconds,
+    };
+};
+/**
+ * Convert a number to minutes and seconds
+ *
+ * @param number - number to convert
+ */
+const convertToMinutes = (number) => {
+    const minutes = number < 0 ? 0 : Math.floor(number);
+    const seconds = Math.round((number - minutes) * 60);
+    return {
+        minutes,
+        seconds,
+    };
+};
 /**
  * Converts a JavaScript Date object to a Temporal Instant.
  *

package/package.json

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