date-vir 4.0.0 → 4.0.2

package/dist/cjs/formatting/relative-string.js

@@ -5,12 +5,13 @@ const common_1 = require("@augment-vir/common");
 const diff_dates_1 = require("../date-operations/diff-dates");
 const duration_1 = require("../duration");
 function toRelativeString({ fullDate, relativeTo, options = {}, }) {
+    const roundingDigits = options.decimalDigitCount || 0;
     const allUnitDiffs = (0, diff_dates_1.diffDatesAllUnits)({
         start: fullDate,
         end: relativeTo,
     });
     const unitsWithinBounds = (0, common_1.mapObjectValues)(allUnitDiffs, (durationUnit, duration) => {
-        const isAboveZero = Math.floor(Math.abs(duration)) > 0;
+        const isAboveZero = Math.floor(Math.abs((0, common_1.round)({ digits: 1, number: duration }))) > 0;
         return isAboveZero;
     });
     const unitToUse = duration_1.orderedDurationUnits.reduce((chosenUnit, currentUnit) => {
@@ -24,18 +25,19 @@ function toRelativeString({ fullDate, relativeTo, options = {}, }) {
     }, undefined);
     const shouldUseJustNow = options.blockJustNow
         ? false
-        : (unitToUse === duration_1.DurationUnit.Minutes && allUnitDiffs.minutes < 2) ||
+        : (0, common_1.areJsonEqual)(fullDate, relativeTo) ||
+            (unitToUse === duration_1.DurationUnit.Minutes && allUnitDiffs.minutes < 2) ||
             (unitToUse === duration_1.DurationUnit.Seconds && allUnitDiffs.seconds < 11) ||
             (unitToUse === duration_1.DurationUnit.Milliseconds && allUnitDiffs.milliseconds < 710);
     /** Some short circuits. */
-    if (unitToUse == undefined) {
-        return undefined;
-    }
-    else if (shouldUseJustNow) {
+    if (shouldUseJustNow) {
         return 'just now';
     }
+    else if (unitToUse == undefined) {
+        return undefined;
+    }
     const duration = allUnitDiffs[unitToUse];
-    const roundedAbsoluteDuration = Math.abs((0, common_1.round)({ digits: options.decimalDigitCount || 0, number: duration }));
+    const roundedAbsoluteDuration = Math.abs((0, common_1.round)({ digits: roundingDigits, number: duration }));
     const isDurationSingular = roundedAbsoluteDuration === 1;
     const unitName = [
         duration_1.singularDurationUnitNames[unitToUse],

package/dist/esm/formatting/relative-string.js

@@ -1,13 +1,14 @@
-import { mapObjectValues, round } from '@augment-vir/common';
+import { areJsonEqual, mapObjectValues, round } from '@augment-vir/common';
 import { diffDatesAllUnits } from '../date-operations/diff-dates';
 import { DurationUnit, orderedDurationUnits, singularDurationUnitNames } from '../duration';
 export function toRelativeString({ fullDate, relativeTo, options = {}, }) {
+    const roundingDigits = options.decimalDigitCount || 0;
     const allUnitDiffs = diffDatesAllUnits({
         start: fullDate,
         end: relativeTo,
     });
     const unitsWithinBounds = mapObjectValues(allUnitDiffs, (durationUnit, duration) => {
-        const isAboveZero = Math.floor(Math.abs(duration)) > 0;
+        const isAboveZero = Math.floor(Math.abs(round({ digits: 1, number: duration }))) > 0;
         return isAboveZero;
     });
     const unitToUse = orderedDurationUnits.reduce((chosenUnit, currentUnit) => {
@@ -21,18 +22,19 @@ export function toRelativeString({ fullDate, relativeTo, options = {}, }) {
     }, undefined);
     const shouldUseJustNow = options.blockJustNow
         ? false
-        : (unitToUse === DurationUnit.Minutes && allUnitDiffs.minutes < 2) ||
+        : areJsonEqual(fullDate, relativeTo) ||
+            (unitToUse === DurationUnit.Minutes && allUnitDiffs.minutes < 2) ||
             (unitToUse === DurationUnit.Seconds && allUnitDiffs.seconds < 11) ||
             (unitToUse === DurationUnit.Milliseconds && allUnitDiffs.milliseconds < 710);
     /** Some short circuits. */
-    if (unitToUse == undefined) {
-        return undefined;
-    }
-    else if (shouldUseJustNow) {
+    if (shouldUseJustNow) {
         return 'just now';
     }
+    else if (unitToUse == undefined) {
+        return undefined;
+    }
     const duration = allUnitDiffs[unitToUse];
-    const roundedAbsoluteDuration = Math.abs(round({ digits: options.decimalDigitCount || 0, number: duration }));
+    const roundedAbsoluteDuration = Math.abs(round({ digits: roundingDigits, number: duration }));
     const isDurationSingular = roundedAbsoluteDuration === 1;
     const unitName = [
         singularDurationUnitNames[unitToUse],

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "date-vir",
-    "version": "4.0.0",
+    "version": "4.0.2",
     "description": "Easy and explicit dates and times",
     "keywords": [
         "date",
@@ -77,5 +77,9 @@
         "typedoc": "^0.25.3",
         "typescript": "^5.2.2",
         "virmator": "^11.1.0"
+    },
+    "overrides": {
+        "@open-wc/scoped-elements": "2.2.3",
+        "@open-wc/testing-helpers": "2.3.1"
     }
 }