@bbn/bbn 1.0.447 → 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;
@@ -16,8 +16,9 @@ declare class bbnDateTool {
     get MM(): string;
     get DD(): string;
     get HH(): string;
-    get mm(): string;
-    get ss(): 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,57 +94,102 @@ 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',
-    'n': 'Minutes',
+    'i': 'Minutes',
     's': 'Seconds'
 };
 const formatsMap = {
     'y': 'YYYY',
     'm': 'MM',
     'd': 'DD',
+    'w': 'WW',
     'h': 'HH',
-    'n': 'mm',
-    's': 'ss'
+    'i': 'II',
+    's': 'SS'
 };
 const unitsCorrespondence = {
+    'years': 'y',
+    'year': 'y',
+    'YEARS': 'y',
+    'YEAR': 'y',
+    'Years': 'y',
+    'Year': 'y',
     'YYYY': 'y',
     'YY': 'y',
     'yyyy': 'y',
     'yy': 'y',
-    'year': 'y',
     'Y': 'y',
     'y': 'y',
+    'months': 'm',
+    'month': 'm',
+    'Months': 'm',
+    'Month': 'm',
+    'MONTHS': 'm',
+    'MONTH': 'm',
     'MM': 'm',
     'M': 'm',
-    'month': 'm',
-    'mm': 'm',
     'm': 'm',
-    'DD': 'd',
+    'days': 'd',
     'day': 'd',
+    'Days': 'd',
+    'Day': 'd',
+    'DAYS': 'd',
+    'DAY': 'd',
+    'DD': 'd',
     'D': 'd',
     'dd': 'd',
     'd': 'd',
+    'hours': 'h',
+    'hour': 'h',
+    'Hours': 'h',
+    'Hour': 'h',
+    'HOURS': 'h',
+    'HOUR': 'h',
     'HH': 'h',
     'hr': 'h',
-    'hour': 'h',
     'H': 'h',
     'hh': 'h',
     'h': 'h',
-    'NN': 'n',
-    'nn': 'n',
-    'mn': 'n',
-    'minute': 'n',
-    'min': 'n',
-    'n': 'n',
+    'minutes': 'i',
+    'minute': 'i',
+    'Minutes': 'i',
+    'Minute': 'i',
+    'MINUTES': 'i',
+    'MINUTE': 'i',
+    'II': 'i',
+    'ii': 'i',
+    'mn': 'i',
+    'mm': 'i',
+    'min': 'i',
+    'n': 'i',
     'SS': 's',
     'ss': 's',
+    'seconds': 's',
+    'second': 's',
+    'Seconds': 's',
+    'Second': 's',
+    'SECONDS': 's',
+    'SECOND': 's',
     'sec': 's',
     's': 's',
     'S': 's',
+    'WW': 'w',
+    'W': 'w',
+    'w': 'w'
 };
 class bbnDateTool {
     constructor(value, inputFormat = null) {
@@ -198,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();
@@ -242,12 +287,17 @@ class bbnDateTool {
     get HH() {
         return this.hours < 10 ? '0' + this.hours.toString() : this.hours.toString();
     }
-    get mm() {
+    get II() {
         return this.minutes < 10 ? '0' + this.minutes.toString() : this.minutes.toString();
     }
-    get ss() {
+    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]) {
@@ -267,12 +317,25 @@ class bbnDateTool {
         const d = new Date();
         return d;
     }
-    format(format = 'y-m-d h:n:s') {
+    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];
@@ -312,7 +375,7 @@ class bbnDateTool {
             }
             return 0;
         }
-        const order = ['y', 'm', 'd', 'h', 'n', 's'];
+        const order = ['y', 'm', 'd', 'h', 'i', 's'];
         // Compare step by step until the requested precision
         for (const u of order) {
             const key = unitsMap[u].toLowerCase();
@@ -346,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/dist/fn/datetime/dateSQL.js

@@ -1,5 +1,4 @@
-import date from './date.js';
-import dayjs from 'dayjs';
+import date from '../../date.js';
 /**
  * Returns a date with SQL format.
  *
@@ -21,7 +20,7 @@ import dayjs from 'dayjs';
 export default function dateSQL(v, dayOnly) {
     let value = date(v);
     if (value) {
-        return dayjs(value).format('YYYY-MM-DD' + (dayOnly ? '' : ' HH:mm:ss'));
+        return value.format('YYYY-MM-DD' + (dayOnly ? '' : ' HH:mm:ss'));
     }
 }
 ;

package/package.json

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