@bbn/bbn 2.0.151 → 2.0.153

package/dist/dt/classes/dateTime.js

@@ -15,8 +15,7 @@ export default class bbnDtDateTime extends bbnDt {
                 value = new Temporal.PlainDateTime(y.getFullYear(), y.getMonth() + 1, y.getDate(), y.getHours(), y.getMinutes(), y.getSeconds(), y.getMilliseconds());
             }
             else if (typeof y === 'number') {
-                const d = new Date(y);
-                value = new Temporal.PlainDateTime(d.getFullYear(), d.getMonth() + 1, d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds(), d.getMilliseconds());
+                value = Temporal.Instant.fromEpochMilliseconds(y).toZonedDateTimeISO(bbnDt.systemTimeZoneId).toPlainDateTime();
             }
             else {
                 throw new Error('Invalid value for bbnDtDateTime');
@@ -30,7 +29,7 @@ export default class bbnDtDateTime extends bbnDt {
     }
     format(format) {
         // long
-        if (format === true) {
+        if ([true, 'long', 'full'].includes(format)) {
             format = getRow(bbn.dt.locales.date, { year: 'numeric', month: 'long', day: 'long', weekday: 'long', hour: '2-digit', minute: '2-digit', second: undefined }).pattern;
         }
         // short
@@ -44,7 +43,7 @@ export default class bbnDtDateTime extends bbnDt {
             return '';
         }
         const date = new Date(this.year(), this.month() - 1, this.day(), this.hour(), this.minute(), this.second());
-        const opt = Object.assign(Object.assign({ year: 'numeric', month: long ? 'long' : 'numeric', day: 'numeric' }, (weekday ? { weekday: (long ? 'long' : 'short') } : {})), (withTime ? { hour: (long ? '2-digit' : 'numeric'), minute: '2-digit' } : {}));
+        const opt = Object.assign(Object.assign({ year: 'numeric', month: long ? 'long' : '2-digit', day: '2-digit' }, (weekday ? { weekday: (long ? 'long' : 'short') } : {})), (withTime ? { hour: (long ? '2-digit' : 'numeric'), minute: '2-digit' } : {}));
         const d = new Intl.DateTimeFormat([bbn.env.lang, ...navigator.languages], opt);
         return d.format(date);
     }

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

@@ -7,12 +7,13 @@ export declare abstract class bbnDt<TValue extends bbnDtTemporal> {
     readonly __bbnNoData = true;
     readonly __isBbnDt = true;
     isValid: boolean;
+    defaultValue: TimeProperties | undefined;
     constructor(value?: TValue);
     setValid(isValid: boolean): void;
     get value(): TValue | undefined;
     get hasFullDate(): boolean;
     /** System time zone ID (e.g. "Europe/Rome") */
-    private static readonly systemTimeZoneId;
+    static readonly systemTimeZoneId: string;
     /**
      * Convert this.value (PlainDate, PlainTime, PlainDateTime, YearMonth,
      * MonthDay, ZonedDateTime) into epoch milliseconds, using the system
@@ -51,10 +52,8 @@ export declare abstract class bbnDt<TValue extends bbnDtTemporal> {
     isAfterOrSame(other: any, unit?: string): boolean;
     isSame(other: any, unit?: string): boolean;
     equals(other: any): boolean;
-    toJSON(): {
-        kind: bbnDtKind;
-        value: string;
-    };
+    toJSON(): string;
+    timezone(d: any): string | bbnDt<any>;
     toString(): string;
     year(v?: any): number | bbnDt<any>;
     month(v?: any): number | bbnDt<any>;
@@ -62,6 +61,7 @@ export declare abstract class bbnDt<TValue extends bbnDtTemporal> {
     hour(v?: any): number | bbnDt<any>;
     minute(v?: any): number | bbnDt<any>;
     second(v?: any): number | bbnDt<any>;
+    millisecond(v?: any): number | bbnDt<any>;
     weekday(v?: any, past?: any): number | bbnDt<any>;
     date(v?: any): string | bbnDt<any>;
     datetime(v?: any): string | bbnDt<any>;
@@ -87,6 +87,7 @@ export declare abstract class bbnDt<TValue extends bbnDtTemporal> {
     get mm(): string;
     get I(): string;
     get SS(): string;
+    get SSS(): string;
     get S(): string;
     get WW(): string;
     get W(): string;
@@ -110,8 +111,8 @@ export declare abstract class bbnDt<TValue extends bbnDtTemporal> {
     setWeekday(weekday: number | string, past?: boolean, locale?: string): bbnDt<any>;
     diff(date: any, unit?: string, abs?: boolean): number;
     guessUnit(valueInMs: number): string | null;
-    fromNow(unit?: string): any;
-    fromDate(date: any, unit?: string): string;
+    fromNow(unit?: string): string;
+    fromDate(date: bbnDt<any>, unit?: string): string;
     startOf(unit?: string): bbnDt<any>;
     endOf(unit?: string): bbnDt<any>;
     clone(): bbnDt<any>;

package/dist/dt/classes/dt.js

@@ -51,6 +51,20 @@ export class bbnDt {
             configurable: true
         });
         __classPrivateFieldSet(this, _bbnDt_value, value, "f");
+        const d = new Date();
+        Object.defineProperty(this, 'defaultValue', {
+            value: {
+                year: d.getFullYear(),
+                month: d.getMonth() + 1,
+                day: d.getDate(),
+                hour: d.getHours(),
+                minute: d.getMinutes(),
+                second: d.getSeconds(),
+                millisecond: d.getMilliseconds()
+            },
+            writable: false,
+            configurable: false
+        });
     }
     setValid(isValid) {
         Object.defineProperty(this, 'isValid', {
@@ -77,52 +91,57 @@ export class bbnDt {
      *  - month-day  → that month/day in *this year* at 00:00 in system tz
      */
     toEpochMs() {
+        if (this.kind === 'zoned') {
+            const v = this.value;
+            return v.toInstant().epochMilliseconds;
+        }
         const tz = bbnDt.systemTimeZoneId;
+        let iso;
         switch (this.kind) {
-            case 'zoned': {
-                const v = this.value;
-                return v.toInstant().epochMilliseconds;
-            }
             case 'dateTime': {
                 const v = this.value;
                 // RFC 9557 string: "YYYY-MM-DDTHH:mm:ss[Europe/Rome]"
-                const iso = `${v.toString()}[${tz}]`;
-                const zdt = Temporal.ZonedDateTime.from(iso);
-                return zdt.toInstant().epochMilliseconds;
+                return v.toZonedDateTime(tz).toInstant().epochMilliseconds;
+                iso = `${v.toString()}[${tz}]`;
             }
             case 'date': {
                 const d = this.value;
+                return d.toZonedDateTime({
+                    timeZone: tz,
+                    plainTime: {
+                        hour: this.defaultValue.hour,
+                        minute: this.defaultValue.minute,
+                        second: this.defaultValue.second,
+                        millisecond: this.defaultValue.millisecond
+                    }
+                }).toInstant().epochMilliseconds;
+                const today = new Date();
                 // "YYYY-MM-DDT00:00[Europe/Rome]"
-                const iso = `${d.toString()}T00:00[${tz}]`;
-                const zdt = Temporal.ZonedDateTime.from(iso);
-                return zdt.toInstant().epochMilliseconds;
+                iso = `${d.toString()}T00:00[${tz}]`;
             }
             case 'time': {
                 const t = this.value;
                 const today = Temporal.Now.plainDateISO();
                 // "YYYY-MM-DDTHH:mm[:ss][Europe/Rome]"
-                const iso = `${today.toString()}T${t.toString()}[${tz}]`;
-                const zdt = Temporal.ZonedDateTime.from(iso);
-                return zdt.toInstant().epochMilliseconds;
+                iso = `${today.toString()}T${t.toString()}[${tz}]`;
             }
             case 'yearMonth': {
                 const ym = this.value;
                 const d = ym.toPlainDate({ day: 1 }); // first day of month
-                const iso = `${d.toString()}T00:00[${tz}]`;
-                const zdt = Temporal.ZonedDateTime.from(iso);
-                return zdt.toInstant().epochMilliseconds;
+                iso = `${d.toString()}T00:00[${tz}]`;
             }
             case 'monthDay': {
                 const md = this.value;
                 const today = Temporal.Now.plainDateISO();
                 const d = md.toPlainDate({ year: today.year }); // current year
-                const iso = `${d.toString()}T00:00[${tz}]`;
-                const zdt = Temporal.ZonedDateTime.from(iso);
-                return zdt.toInstant().epochMilliseconds;
+                iso = `${d.toString()}T00:00[${tz}]`;
             }
-            default:
-                throw new Error(`Unsupported kind '${this.kind}' in toEpochMs`);
         }
+        if (iso) {
+            const zdt = Temporal.ZonedDateTime.from(iso);
+            return zdt.toInstant().epochMilliseconds; // - Math.round(zdt.offsetNanoseconds / 1000000);
+        }
+        throw new Error(`Unsupported kind '${this.kind}' in toEpochMs`);
     }
     /**
      * "Now" value in the same *kind* as this instance.
@@ -326,13 +345,48 @@ export class bbnDt {
     }
     // ---- Serialization ----
     toJSON() {
-        return {
-            kind: this.kind,
-            value: String(this.value)
-        };
+        if ('toZonedDateTime' in __classPrivateFieldGet(this, _bbnDt_value, "f")) {
+            const zdt = __classPrivateFieldGet(this, _bbnDt_value, "f").toZonedDateTime(bbnDt.systemTimeZoneId);
+            const zdt2 = zdt.withTimeZone('UTC');
+            return bbn.dt(zdt2).format('YYYY-MM-DDTHH:II:SS.SSS') + 'Z';
+        }
+        if (this.kind === 'zoned') {
+            return this.timezone('America/New_York').format('YYYY-MM-DDTHH:II:SS.SSS') + 'Z';
+        }
+    }
+    timezone(d) {
+        switch (this.kind) {
+            case 'zoned':
+                if (d === undefined) {
+                    const v = this.value;
+                    return v.timeZoneId;
+                }
+                else {
+                    const v = this.value;
+                    const newZdt = v.withTimeZone(d);
+                    return bbn.dt(newZdt);
+                }
+                break;
+            case 'dateTime':
+                if (d === undefined) {
+                    const v = this.value;
+                    const iso = `${v.toString()}[${bbnDt.systemTimeZoneId}]`;
+                    const zdt = Temporal.ZonedDateTime.from(iso);
+                    return zdt.timeZoneId;
+                }
+                else {
+                    const v = this.value;
+                    const iso = `${v.toString()}[${d}]`;
+                    const zdt = Temporal.ZonedDateTime.from(iso);
+                    return bbn.dt(zdt);
+                }
+                break;
+            default:
+                throw new Error(`timezone() is not supported for kind '${this.kind}'`);
+        }
     }
     toString() {
-        return String(this.value);
+        return new Date(this.valueOf()).toString();
     }
     year(v) {
         if (!this.value) {
@@ -421,6 +475,22 @@ export class bbnDt {
         }
         return this.value.second;
     }
+    millisecond(v) {
+        if (!this.value) {
+            return undefined;
+        }
+        if (!('millisecond' in this.value)) {
+            if (this.hasFullDate) {
+                return 0;
+            }
+            throw new Error('millisecond() is not supported for this type');
+        }
+        if ((v !== undefined) && !(v instanceof Event)) {
+            const d = this.value.with({ millisecond: v });
+            return new this.constructor(d);
+        }
+        return this.value.millisecond;
+    }
     weekday(v, past) {
         if (!this.value) {
             return undefined;
@@ -470,7 +540,7 @@ export class bbnDt {
         if (!this.value) {
             return '';
         }
-        return bbn.dt.locales.formatters.short.format(new Date(this.toEpochMs()));
+        return bbn.dt.locales.formatters[long ? 'long' : 'numeric'].format(new Date(this.toEpochMs()));
     }
     ftime(withSeconds = true) {
         if (!this.value) {
@@ -482,10 +552,25 @@ export class bbnDt {
         if (!this.value) {
             return undefined;
         }
-        if (!('weekOfYear' in this.value)) {
-            throw new Error('week() is not supported for this type');
-        }
-        return this.value.weekOfYear;
+        const year = this.year();
+        // Normalize to UTC midnight to avoid DST issues
+        const d = new Date(Date.UTC(year, this.month() - 1, this.day()));
+        const jan1 = new Date(Date.UTC(year, 0, 1));
+        const MS_PER_DAY = 24 * 60 * 60 * 1000;
+        const diffDays = Math.floor((d.getTime() - jan1.getTime()) / MS_PER_DAY); // 0 for Jan 1
+        const jan1Dow = jan1.getUTCDay(); // 0–6, Sunday=0
+        // How many days long is week 1?
+        // Week 1 starts on Jan 1 and ends the day before the first `weekStart` after Jan 1.
+        let offset = (bbn.dt.locales.weekStart - jan1Dow + 7) % 7;
+        const firstWeekLength = offset === 0 ? 7 : offset;
+        // Still in the first (possibly partial) week
+        if (diffDays < firstWeekLength) {
+            return 1;
+        }
+        // Remaining days after week 1
+        const remainingDays = diffDays - firstWeekLength;
+        // Each full block of 7 days is one more week
+        return 2 + Math.floor(remainingDays / 7);
     }
     get YYYY() {
         if ('year' in this.value) {
@@ -567,7 +652,7 @@ export class bbnDt {
             return h < 10 ? '0' + h.toString() : h.toString();
         }
         else if (this.hasFullDate) {
-            return '00';
+            return this.defaultValue.hour.toString().padStart(2, '0');
         }
         return undefined;
     }
@@ -586,7 +671,7 @@ export class bbnDt {
             return i < 10 ? '0' + i.toString() : i.toString();
         }
         else if (this.hasFullDate) {
-            return '00';
+            return this.defaultValue.minute.toString().padStart(2, '0');
         }
         return undefined;
     }
@@ -596,7 +681,7 @@ export class bbnDt {
             return i < 10 ? '0' + i.toString() : i.toString();
         }
         else if (this.hasFullDate) {
-            return '00';
+            return this.defaultValue.minute.toString().padStart(2, '0');
         }
         return undefined;
     }
@@ -615,7 +700,17 @@ export class bbnDt {
             return s < 10 ? '0' + s.toString() : s.toString();
         }
         else if (this.hasFullDate) {
-            return '00';
+            return this.defaultValue.second.toString().padStart(2, '0');
+        }
+        return undefined;
+    }
+    get SSS() {
+        if ('millisecond' in this.value) {
+            const s = parseInt(this.millisecond().toString());
+            return s < 10 ? '00' + s.toString() : (s < 100 ? '0' + s.toString() : s.toString());
+        }
+        else if (this.hasFullDate) {
+            return this.defaultValue.millisecond.toString().padStart(3, '0');
         }
         return undefined;
     }
@@ -704,13 +799,16 @@ export class bbnDt {
         const diffDays = startThis.diff(startNow, "day");
         const rtf = new Intl.RelativeTimeFormat(bbn.env.lang, { numeric: "auto" });
         let phrase;
-        if (diffDays >= -6 && diffDays <= 6) {
+        if (Math.abs(diffDays) <= 6) {
             phrase = rtf.format(diffDays, "day");
         }
-        else {
+        else if (Math.abs(diffDays) <= 30) {
             const diffWeeks = Math.floor(diffDays / 7);
             phrase = rtf.format(diffWeeks, "week");
         }
+        else {
+            return this.fdate();
+        }
         return `${phrase} ${this.ftime()}`;
     }
     matchFormat(value, format) {
@@ -845,7 +943,7 @@ export class bbnDt {
     guessUnit(valueInMs) {
         const absDiff = Math.abs(valueInMs);
         for (const [shortUnit, rtfUnit, ms] of units) {
-            if ((absDiff >= ms) || (rtfUnit === 'second')) {
+            if ((absDiff >= ms) || (rtfUnit === 'millisecond')) {
                 return shortUnit;
             }
         }
@@ -853,7 +951,7 @@ export class bbnDt {
     }
     fromNow(unit = '') {
         const nowValue = bbnDt.nowForKind(this.kind);
-        const temp = bbn.dt(nowValue, null, this.kind);
+        const temp = bbn.dt(undefined, null, this.kind);
         const rawDiffMs = this.diff(temp);
         const chosenUnit = unitsCorrespondence[unit] || this.guessUnit(rawDiffMs);
         if (!chosenUnit) {

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

@@ -12,15 +12,7 @@ export default class bbnDtDuration {
     hours(remaining?: boolean): number;
     minutes(remaining?: boolean): number;
     seconds(remaining?: boolean): number;
-    toJSON(): {
-        years: number;
-        months: number;
-        days: number;
-        hours: number;
-        minutes: number;
-        seconds: number;
-        milliseconds: number;
-    };
+    toJSON(): string;
     /**
      * Returns the full duration expressed as X (float), like Day.js.
      */

package/dist/dt/classes/duration.js

@@ -83,15 +83,7 @@ class bbnDtDuration {
     //   "asX" conversions
     // -----------------------
     toJSON() {
-        return {
-            years: this.years(true),
-            months: this.months(true),
-            days: this.days(true),
-            hours: this.hours(true),
-            minutes: this.minutes(true),
-            seconds: this.seconds(true),
-            milliseconds: this.toMilliseconds()
-        };
+        return this.value.toJSON();
     }
     /**
      * Returns the full duration expressed as X (float), like Day.js.

package/dist/dt/classes/zoned.js

@@ -6,7 +6,7 @@ export default class bbnDtZoned extends bbnDt {
         let value;
         if (!z) {
             const date = new Date();
-            value = new Temporal.ZonedDateTime(BigInt(date.getTime() * 1000000), Intl.DateTimeFormat().resolvedOptions().timeZone);
+            value = Temporal.Now.zonedDateTimeISO(Intl.DateTimeFormat().resolvedOptions().timeZone);
         }
         else if (y === undefined) {
             if (z instanceof Temporal.ZonedDateTime) {
@@ -16,8 +16,7 @@ export default class bbnDtZoned extends bbnDt {
                 value = fromJsDate(z, true);
             }
             else if (typeof z === 'number') {
-                const d = new Date(z);
-                value = fromJsDate(d, true);
+                value = Temporal.Instant.fromEpochMilliseconds(z).toZonedDateTimeISO(Intl.DateTimeFormat().resolvedOptions().timeZone);
             }
             else {
                 throw new Error('Invalid value for bbnDtZoned');

package/dist/dt/functions/buildLocaleFromIntl.js

@@ -235,7 +235,9 @@ const buildLocaleFromIntl = () => {
     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 fmtNum = new Intl.DateTimeFormat(langs, { year: 'numeric', month: 'numeric', day: 'numeric' });
     const rtf = new Intl.RelativeTimeFormat(langs, { numeric: 'auto' });
+    const locale = new Intl.Locale(langs[0]);
     // Create 12 dates for months (2020 chosen arbitrarily)
     const monthsLong = [];
     const monthsShort = [];
@@ -259,12 +261,15 @@ const buildLocaleFromIntl = () => {
         formatters: {
             short: fmtShort,
             long: fmtLong,
+            numeric: fmtNum,
             relative: rtf
         },
+        firstDayOfWeek: locale.weekInfo.firstDay,
         monthsLong,
         monthsShort,
         weekdaysLong,
         weekdaysShort,
+        locale,
         date,
         time,
         datetime

package/dist/dt/vars/units.d.ts

@@ -1,6 +1,6 @@
-declare const units: [string, Intl.RelativeTimeFormatUnit, number][];
+declare const units: [TimeFormatSymbol, TimeFormatUnit, number][];
 declare const unitsCorrespondence: {
-    [key: string]: string;
+    [key: string]: TimeFormatSymbol;
 };
 declare const unitsMap: {
     [key: string]: string;

package/dist/dt/vars/units.js

@@ -5,7 +5,8 @@ const units = [
     ['d', "day", 24 * 60 * 60 * 1000],
     ['h', "hour", 60 * 60 * 1000],
     ['i', "minute", 60 * 1000],
-    ['s', "second", 1000]
+    ['s', "second", 1000],
+    ['l', "millisecond", 1]
 ];
 const unitsCorrespondence = {
     'years': 'y',
@@ -60,6 +61,9 @@ const unitsCorrespondence = {
     'mn': 'i',
     'mm': 'i',
     'min': 'i',
+    'ms': 'l',
+    'SSS': 'l',
+    'sss': 'l',
     'SS': 's',
     'ss': 's',
     'seconds': 's',
@@ -97,6 +101,7 @@ const unitsMap = {
     'h': 'Hours',
     'i': 'Minutes',
     's': 'Seconds',
+    'l': 'Milliseconds',
     'z': 'Offset'
 };
 const formatsMap = {

package/dist/dt.js

@@ -190,7 +190,7 @@ const dt = (value, inputFormat = null, cls = 'auto') => {
         }
     }
     if (typeof value === 'number') {
-        return new bbnDtDateTime(value < 99999999999 ? value * 1000 : value);
+        return new bbnDtDateTime(Math.abs(value) < 99999999999 ? value * 1000 : value);
     }
     else if (value.__isBbnDt) {
         return value;

package/package.json

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