@bbn/bbn 1.0.448 → 1.0.449

package/dist/date.d.ts

@@ -1,7 +1,7 @@
 declare class bbnDateTool {
     #private;
     constructor(value: any, inputFormat?: null | String);
-    toString(): number;
+    toString(): string;
     get year(): number;
     get month(): number;
     get day(): number;
@@ -18,6 +18,7 @@ declare class bbnDateTool {
     get HH(): string;
     get II(): string;
     get SS(): string;
+    get WW(): string;
     add(value: number, unit?: string): bbnDateTool | null;
     sub(value: number, unit: string | null): bbnDateTool;
     dateFromFormat(value: string, unit: string | null): Date;
@@ -33,6 +34,9 @@ declare class bbnDateTool {
     isSame(date: any, unit?: string): Boolean;
     isAfterOrSame(date: any, unit?: string): Boolean;
     isBeforeOrSame(date: any, unit?: string): Boolean;
+    fromDate(date: any, unit?: string): string;
+    guessUnit(value: number): string | null;
+    diff(date: any, unit?: string, abs?: boolean): number;
     calendar(format: string): string;
     get daysInMonth(): Number | 0;
 }

package/dist/date.js

@@ -94,10 +94,20 @@ const patterns = [
         })
     },
 ];
+const units = [
+    ['y', "year", 365 * 24 * 60 * 60 * 1000],
+    ['m', "month", 30 * 24 * 60 * 60 * 1000],
+    ['w', "week", 7 * 24 * 60 * 60 * 1000],
+    ['d', "day", 24 * 60 * 60 * 1000],
+    ['h', "hour", 60 * 60 * 1000],
+    ['i', "minute", 60 * 1000],
+    ['s', "second", 1000]
+];
 const unitsMap = {
     'y': 'Year',
     'm': 'Month',
     'd': 'Date',
+    'w': 'Week',
     'h': 'Hours',
     'i': 'Minutes',
     's': 'Seconds'
@@ -106,6 +116,7 @@ const formatsMap = {
     'y': 'YYYY',
     'm': 'MM',
     'd': 'DD',
+    'w': 'WW',
     'h': 'HH',
     'i': 'II',
     's': 'SS'
@@ -176,6 +187,9 @@ const unitsCorrespondence = {
     'sec': 's',
     's': 's',
     'S': 's',
+    'WW': 'w',
+    'W': 'w',
+    'w': 'w'
 };
 class bbnDateTool {
     constructor(value, inputFormat = null) {
@@ -229,7 +243,7 @@ class bbnDateTool {
         }
     }
     toString() {
-        return __classPrivateFieldGet(this, _bbnDateTool_value, "f") ? __classPrivateFieldGet(this, _bbnDateTool_value, "f").getTime() : 0;
+        return __classPrivateFieldGet(this, _bbnDateTool_value, "f") ? this.format() : '';
     }
     get year() {
         return __classPrivateFieldGet(this, _bbnDateTool_value, "f").getFullYear();
@@ -279,6 +293,11 @@ class bbnDateTool {
     get SS() {
         return this.seconds < 10 ? '0' + this.seconds.toString() : this.seconds.toString();
     }
+    get WW() {
+        const firstDayOfYear = new Date(this.year, 0, 1);
+        const pastDaysOfYear = (__classPrivateFieldGet(this, _bbnDateTool_value, "f").getTime() - firstDayOfYear.getTime()) / 86400000;
+        return String(Math.ceil((pastDaysOfYear + firstDayOfYear.getDay() + 1) / 7)).padStart(2, '0');
+    }
     add(value, unit = 'd') {
         const date = __classPrivateFieldGet(this, _bbnDateTool_value, "f") ? new Date(__classPrivateFieldGet(this, _bbnDateTool_value, "f").getTime()) : new Date();
         if (unitsCorrespondence[unit]) {
@@ -301,9 +320,22 @@ class bbnDateTool {
     format(format = 'y-m-d h:i:s') {
         let str = '';
         if (format) {
-            const reg = new RegExp('(' + Object.keys(unitsCorrespondence).join('|') + ')', 'g');
+            const reg = new RegExp('(\[|\]|' + Object.keys(unitsCorrespondence).join('|') + ')', 'g');
+            let opened = 0;
             const parts = format.split(reg);
             each(parts, (part) => {
+                if (part === '[') {
+                    opened++;
+                    return;
+                }
+                else if (part === ']') {
+                    opened--;
+                    return;
+                }
+                if (opened > 0) {
+                    str += part;
+                    return;
+                }
                 if (part in unitsCorrespondence) {
                     const suffix = formatsMap[unitsCorrespondence[part]];
                     str += this[suffix];
@@ -377,6 +409,44 @@ class bbnDateTool {
     isBeforeOrSame(date, unit = '') {
         return [-1, 0].includes(this.compare(date, unit));
     }
+    fromDate(date, unit = '') {
+        const diff = this.diff(date, unit);
+        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);
+    }
+    guessUnit(value) {
+        const absDiff = Math.abs(value);
+        for (const [shortUnit, rtfUnit, ms] of units) {
+            if ((absDiff >= ms) || (rtfUnit === "second")) {
+                return shortUnit;
+            }
+        }
+    }
+    diff(date, unit = '', abs = false) {
+        const target = (date instanceof bbnDateTool) ? date.mtst : new Date(date).getTime();
+        const now = this.mtst;
+        let diff = target - now;
+        if (abs) {
+            diff = Math.abs(diff);
+        }
+        if (!unit) {
+            return diff;
+        }
+        const realUnit = unitsCorrespondence[unit];
+        const match = bbn.fn.getRow(units, d => d[0] === realUnit);
+        if (!match) {
+            throw new Error('Invalid unit for diff: ' + unit);
+        }
+        const [u, rtfUnit, ms] = match;
+        return Math.round(diff / ms);
+    }
     calendar(format) {
         let str = '';
         if (format) {

package/package.json

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