@bbn/bbn 1.0.449 → 1.0.451

package/dist/date.d.ts

@@ -34,8 +34,9 @@ declare class bbnDateTool {
     isSame(date: any, unit?: string): Boolean;
     isAfterOrSame(date: any, unit?: string): Boolean;
     isBeforeOrSame(date: any, unit?: string): Boolean;
+    fromNow(unit?: string): string;
     fromDate(date: any, unit?: string): string;
-    guessUnit(value: number): string | null;
+    guessUnit(valueInMs: number): string | null;
     diff(date: any, unit?: string, abs?: boolean): number;
     calendar(format: string): string;
     get daysInMonth(): Number | 0;

package/dist/date.js

@@ -10,6 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _bbnDateTool_value, _bbnDateTool_daysInMonth;
+import _ from './_.js';
 import each from './fn/loop/each.js';
 import substr from './fn/string/substr.js';
 import isNumber from './fn/type/isNumber.js';
@@ -409,20 +410,25 @@ class bbnDateTool {
     isBeforeOrSame(date, unit = '') {
         return [-1, 0].includes(this.compare(date, unit));
     }
-    fromDate(date, unit = '') {
-        const diff = this.diff(date, unit);
+    fromNow(unit = '') {
+        const date = new Date();
+        const chosenUnit = unitsCorrespondence[unit] || this.guessUnit(this.diff(date));
+        const diff = this.diff(date, chosenUnit);
         const rtf = new Intl.RelativeTimeFormat(undefined, { numeric: "auto" });
-        const chosenUnit = unitsCorrespondence[unit] || this.guessUnit(diff) || 's';
         // FORCED UNIT MODE
         const match = bbn.fn.getRow(units, d => d[0] === chosenUnit);
         if (!match) {
             throw new Error('Invalid unit for fromDate: ' + unit);
         }
-        const [u, rtfUnit, ms] = match;
-        return rtf.format(diff, rtfUnit);
+        return rtf.format(diff, match[1]);
+    }
+    fromDate(date, unit = '') {
+        const chosenUnit = unitsCorrespondence[unit] || this.guessUnit(this.diff(date));
+        const diff = this.diff(date, chosenUnit);
+        return diff > 0 ? _('%d %s before', diff, unit) : (diff < 0 ? _('%d %s after', -diff, unit) : _("The same %s", unit));
     }
-    guessUnit(value) {
-        const absDiff = Math.abs(value);
+    guessUnit(valueInMs) {
+        const absDiff = Math.abs(valueInMs);
         for (const [shortUnit, rtfUnit, ms] of units) {
             if ((absDiff >= ms) || (rtfUnit === "second")) {
                 return shortUnit;
@@ -432,7 +438,7 @@ class bbnDateTool {
     diff(date, unit = '', abs = false) {
         const target = (date instanceof bbnDateTool) ? date.mtst : new Date(date).getTime();
         const now = this.mtst;
-        let diff = target - now;
+        let diff = now - target;
         if (abs) {
             diff = Math.abs(diff);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbn/bbn",
-  "version": "1.0.449",
+  "version": "1.0.451",
   "description": "Javascript toolkit",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",