@bbn/bbn 2.0.131 → 2.0.133

package/dist/dt/classes/dt.d.ts

@@ -44,11 +44,11 @@ export declare abstract class bbnDt<TValue extends bbnDtTemporal> {
     compare(other: any, unit?: string): -1 | 0 | 1;
     add(amount: number | bbnDtDuration | object, unit?: string): bbnDt<any>;
     subtract(amount: number | bbnDtDuration | object, unit?: string): bbnDt<any>;
-    isBefore(other: any): boolean;
-    isBeforeOrSame(other: any): boolean;
-    isAfter(other: any): boolean;
-    isAfterOrSame(other: any): boolean;
-    isSame(other: any): boolean;
+    isBefore(other: any, unit?: string): boolean;
+    isBeforeOrSame(other: any, unit?: string): boolean;
+    isAfter(other: any, unit?: string): boolean;
+    isAfterOrSame(other: any, unit?: string): boolean;
+    isSame(other: any, unit?: string): boolean;
     equals(other: any): boolean;
     toJSON(): {
         kind: bbnDtKind;
@@ -65,6 +65,8 @@ export declare abstract class bbnDt<TValue extends bbnDtTemporal> {
     date(v?: any): string | bbnDt<any>;
     datetime(v?: any): string | bbnDt<any>;
     time(v?: any): string | bbnDt<any>;
+    fdate(long?: boolean): string;
+    ftime(withSeconds?: boolean): string;
     week(): number;
     get YYYY(): string;
     get YY(): string;
@@ -89,6 +91,7 @@ export declare abstract class bbnDt<TValue extends bbnDtTemporal> {
     get W(): string;
     unix(ms?: boolean | number): number | bbnDt<any>;
     format(format?: string): string;
+    calendar(short?: boolean): string;
     matchFormat(value: any, format: string): boolean;
     getWeekday(n: 0 | 1 | 2 | 3 | 4 | 5 | 6, mode?: string, locale?: string): string | object;
     getWeekdayIndex: (name: string, locale?: string) => number;

package/dist/dt/classes/dt.js

@@ -304,20 +304,20 @@ export class bbnDt {
             return new this.constructor(d);
         }
     }
-    isBefore(other) {
-        return this.compare(other) < 0;
+    isBefore(other, unit) {
+        return this.compare(other, unit) < 0;
     }
-    isBeforeOrSame(other) {
-        return this.compare(other) <= 0;
+    isBeforeOrSame(other, unit) {
+        return this.compare(other, unit) <= 0;
     }
-    isAfter(other) {
-        return this.compare(other) > 0;
+    isAfter(other, unit) {
+        return this.compare(other, unit) > 0;
     }
-    isAfterOrSame(other) {
-        return this.compare(other) >= 0;
+    isAfterOrSame(other, unit) {
+        return this.compare(other, unit) >= 0;
     }
-    isSame(other) {
-        return this.compare(other) === 0;
+    isSame(other, unit) {
+        return this.compare(other, unit) === 0;
     }
     equals(other) {
         return this.isSame(other);
@@ -464,6 +464,18 @@ export class bbnDt {
         }
         return this.HH + ':' + this.II + ':' + this.SS;
     }
+    fdate(long = false) {
+        if (!this.value) {
+            return '';
+        }
+        return bbn.dt.locales.formatters.short.format(new Date(this.toEpochMs()));
+    }
+    ftime(withSeconds = true) {
+        if (!this.value) {
+            return '';
+        }
+        return this.format('HH:II' + (withSeconds ? ':SS' : ''));
+    }
     week() {
         if (!this.value) {
             return undefined;
@@ -669,6 +681,22 @@ export class bbnDt {
         }
         return str;
     }
+    calendar(short) {
+        const now = this.constructor.now();
+        const startThis = this.startOf("day");
+        const startNow = now.startOf("day");
+        const diffDays = startThis.diff(startNow, "day");
+        const rtf = new Intl.RelativeTimeFormat(bbn.env.lang, { numeric: "auto" });
+        let phrase;
+        if (diffDays >= -6 && diffDays <= 6) {
+            phrase = rtf.format(diffDays, "day");
+        }
+        else {
+            const diffWeeks = Math.floor(diffDays / 7);
+            phrase = rtf.format(diffWeeks, "week");
+        }
+        return `${phrase} ${this.ftime()}`;
+    }
     matchFormat(value, format) {
         try {
             this.parse(value, format);

package/dist/dt/functions/buildLocaleFromIntl.js

@@ -233,6 +233,9 @@ const buildLocaleFromIntl = () => {
     const fmtMonthShort = new Intl.DateTimeFormat(langs, { month: 'short' });
     const fmtWeekLong = new Intl.DateTimeFormat(langs, { weekday: 'long' });
     const fmtWeekShort = new Intl.DateTimeFormat(langs, { weekday: 'short' });
+    const fmtShort = new Intl.DateTimeFormat(langs, { dateStyle: 'short', timeStyle: 'short' });
+    const fmtLong = new Intl.DateTimeFormat(langs, { dateStyle: 'long', timeStyle: 'long' });
+    const rtf = new Intl.RelativeTimeFormat(langs, { numeric: 'auto' });
     // Create 12 dates for months (2020 chosen arbitrarily)
     const monthsLong = [];
     const monthsShort = [];
@@ -253,6 +256,11 @@ const buildLocaleFromIntl = () => {
     }
     const { date, time, datetime } = getCommonFormatsForLocale(langs);
     extend(bbn.dt.locales, {
+        formatters: {
+            short: fmtShort,
+            long: fmtLong,
+            relative: rtf
+        },
         monthsLong,
         monthsShort,
         weekdaysLong,

package/dist/fn/datetime/calendar.js

@@ -26,6 +26,6 @@ export default function calendar(d, wrong_result = false) {
     if (!r.isValid) {
         return wrong_result && isString(wrong_result) ? wrong_result : '';
     }
-    return r.fdate();
+    return r.calendar();
 }
 ;

package/package.json

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