smoothly 1.0.0-alpha.130 → 1.0.0-alpha.132

package/dist/cjs/{getLanguage-28ce96e4.js → getLanguage-9f898047.js}

@@ -5962,7 +5962,7 @@ var TimeRange$1;
     TimeRange.create = create;
 })(TimeRange$1 || (TimeRange$1 = {}));
 
-var TimeSpan$1;
+exports.TimeSpan = void 0;
 (function (TimeSpan) {
     function is(value) {
         return (typeof value == "object" &&
@@ -6010,20 +6010,15 @@ var TimeSpan$1;
         return performRound$1(result, round);
     }
     TimeSpan.toMilliseconds = toMilliseconds;
-    function sum(...addends) {
-        return addends.reduce((result, addend) => Object.entries(addend).reduce((result, [key, addend]) => {
-            const sum = (result[key] ?? 0) + addend;
-            return !sum
-                ? (({ [key]: _, ...result }) => result)(result)
-                : Object.assign(result, { [key]: (result[key] ?? 0) + addend });
-        }, result), {});
+    function unitByUnit(operation, left, ...rights) {
+        return rights.reduce((result, span) => Object.entries(span).reduce((result, [key, right]) => (({ [key]: left, ...result }) => Object.assign(result, { [key]: +operation(left ?? 0, right ?? 0).toFixed(9) }))(result), result), left);
     }
     function add(...addends) {
-        return addends.reduce((result, addend) => Object.entries(addend).reduce((result, [key, addend]) => (({ [key]: value, ...result }) => sum(result, from[key]((value ?? 0) + addend)))(result), result), {});
+        return normalize(unitByUnit((left, right) => left + right, {}, ...addends));
     }
     TimeSpan.add = add;
     function subtract(minuend, ...subtrahends) {
-        return subtrahends.reduce((result, subtrahend) => Object.entries(subtrahend).reduce((result, [key, subtrahend]) => (({ [key]: value, ...result }) => sum(result, from[key]((value ?? 0) - subtrahend)))(result), result), minuend);
+        return normalize(unitByUnit((left, right) => left - right, minuend, ...subtrahends));
     }
     TimeSpan.subtract = subtract;
     function fromHours(value, options) {
@@ -6032,13 +6027,11 @@ var TimeSpan$1;
         const hours = Math.trunc(value);
         const remainder = +(value % 1).toFixed(9);
         if (precision != "hours") {
-            result = fromMinutes(remainder * 60, { precision });
-            if (hours)
-                result.hours = hours;
+            result = { hours: hours, ...fromMinutes(remainder * 60, { precision, normalize: false }) };
         }
         else
-            result = sum({ hours: hours + Math.round(remainder) });
-        return result;
+            result = { hours: hours + Math.round(remainder) };
+        return options?.normalize == false ? result : normalize(result);
     }
     TimeSpan.fromHours = fromHours;
     function fromMinutes(value, options) {
@@ -6047,12 +6040,12 @@ var TimeSpan$1;
         const minutes = Math.trunc(value);
         const remainder = +(value % 1).toFixed(7);
         if (precision != "minutes")
-            result = sum({ minutes: minutes % 60 }, fromSeconds(remainder * 60, { precision }), Math.abs(minutes) < 60 ? {} : fromHours(Math.trunc(minutes / 60), { precision: "hours" }));
+            result = { minutes: minutes, ...fromSeconds(remainder * 60, { precision, normalize: false }) };
         else {
             const rounded = minutes + Math.round(remainder);
-            result = sum({ minutes: rounded % 60 }, fromHours(Math.trunc(rounded / 60), { precision: "hours" }));
+            result = add({ minutes: rounded % 60 }, fromHours(Math.trunc(rounded / 60), { precision: "hours", normalize: false }));
         }
-        return result;
+        return options?.normalize == false ? result : normalize(result);
     }
     TimeSpan.fromMinutes = fromMinutes;
     function fromSeconds(value, options) {
@@ -6061,29 +6054,45 @@ var TimeSpan$1;
         const seconds = Math.trunc(value);
         const remainder = +(value % 1).toFixed(5);
         if (precision != "seconds")
-            result = sum({ seconds: seconds % 60 }, fromMilliseconds(remainder * 1000), Math.abs(seconds) < 60 ? {} : fromMinutes(Math.trunc(seconds / 60), { precision: "minutes" }));
+            result = { ...(seconds && { seconds: seconds }), ...fromMilliseconds(remainder * 1000, { normalize: false }) };
         else {
             const rounded = seconds + Math.round(remainder);
-            result = sum({ seconds: rounded % 60 }, fromMinutes(Math.trunc(rounded / 60), { precision: "minutes" }));
+            result = add({ seconds: rounded % 60 }, fromMinutes(Math.trunc(rounded / 60), { precision: "minutes", normalize: false }));
         }
-        return result;
+        return options?.normalize == false ? result : normalize(result);
     }
     TimeSpan.fromSeconds = fromSeconds;
-    function fromMilliseconds(value) {
+    function fromMilliseconds(value, options) {
         const rounded = Math.round(value);
-        return sum({ milliseconds: rounded % 1000 }, Math.abs(rounded) < 1000 ? {} : fromSeconds(Math.trunc(rounded / 1000), { precision: "seconds" }));
+        const result = add(!rounded ? {} : { milliseconds: rounded % 1000 }, Math.abs(rounded) < 1000
+            ? {}
+            : fromSeconds(Math.trunc(rounded / 1000), { precision: "seconds", normalize: false }));
+        return options?.normalize == false ? result : normalize(result);
     }
     TimeSpan.fromMilliseconds = fromMilliseconds;
-    const from = {
-        years: (value) => ({ ...(value && { years: value }) }),
-        months: (value) => ({ ...(value && { months: value }) }),
-        days: (value) => ({ ...(value && { days: value }) }),
-        hours: fromHours,
-        minutes: fromMinutes,
-        seconds: fromSeconds,
-        milliseconds: fromMilliseconds,
-    };
-})(TimeSpan$1 || (TimeSpan$1 = {}));
+    function normalize(value) {
+        const result = {
+            milliseconds: Math.round(toMilliseconds(value) % 1000),
+            seconds: Math.trunc(toSeconds(value) % 60),
+            minutes: Math.trunc(toMinutes(value) % 60),
+            hours: Math.trunc(toHours(value)),
+        };
+        if (!(-1000 < result.milliseconds && result.milliseconds < 1000)) {
+            result.seconds += Math.trunc(result.milliseconds / 1000);
+            result.milliseconds = result.milliseconds % 1000;
+        }
+        if (!(-60 < result.seconds && result.seconds < 60)) {
+            result.minutes += Math.trunc(result.seconds / 60);
+            result.seconds = result.seconds % 60;
+        }
+        if (!(-60 < result.minutes && result.minutes < 60)) {
+            result.hours += Math.trunc(result.minutes);
+            result.minutes = result.minutes % 60;
+        }
+        return Object.fromEntries(Object.entries(result).filter(([, value]) => !!value));
+    }
+    TimeSpan.normalize = normalize;
+})(exports.TimeSpan || (exports.TimeSpan = {}));
 function dateToMilliseconds$1(span) {
     const now = Date.UTC(0, 0);
     const date = new Date(now);
@@ -12230,4 +12239,4 @@ function convert(language) {
 
 exports.getLanguage = getLanguage;
 
-//# sourceMappingURL=getLanguage-28ce96e4.js.map
+//# sourceMappingURL=getLanguage-9f898047.js.map