@bbn/bbn 2.0.152 → 2.0.153

package/dist/dt/classes/dateTime.js

@@ -43,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

@@ -53,6 +53,7 @@ export declare abstract class bbnDt<TValue extends bbnDtTemporal> {
     isSame(other: any, unit?: string): boolean;
     equals(other: any): boolean;
     toJSON(): string;
+    timezone(d: any): string | bbnDt<any>;
     toString(): string;
     year(v?: any): number | bbnDt<any>;
     month(v?: any): number | bbnDt<any>;
@@ -111,7 +112,7 @@ export declare abstract class bbnDt<TValue extends bbnDtTemporal> {
     diff(date: any, unit?: string, abs?: boolean): number;
     guessUnit(valueInMs: number): string | null;
     fromNow(unit?: string): string;
-    fromDate(date: any, 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

@@ -101,7 +101,7 @@ export class bbnDt {
             case 'dateTime': {
                 const v = this.value;
                 // RFC 9557 string: "YYYY-MM-DDTHH:mm:ss[Europe/Rome]"
-                return v.toZonedDateTime(tz, { disambiguation: "earlier" }).toInstant().epochMilliseconds;
+                return v.toZonedDateTime(tz).toInstant().epochMilliseconds;
                 iso = `${v.toString()}[${tz}]`;
             }
             case 'date': {
@@ -345,7 +345,45 @@ export class bbnDt {
     }
     // ---- Serialization ----
     toJSON() {
-        return this.format('YYYY-MM-DDTHH:II:SS.SSS[Z]');
+        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 new Date(this.valueOf()).toString();
@@ -502,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) {
@@ -514,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) {
@@ -746,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) {
@@ -895,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/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/functions/parse.js

@@ -476,6 +476,7 @@ export default function parse(input, format, cls = 'auto', force, locale) {
         }
     ];
     function parseWithFormat(fmt, cls = 'auto') {
+        var _a;
         const currentDate = new bbnDtDateTime();
         const ctx = {
             year: currentDate.year(),
@@ -602,7 +603,7 @@ export default function parse(input, format, cls = 'auto', force, locale) {
             try {
                 pdt = new T.PlainDateTime(ctx.year, ctx.month, ctx.day, ctx.hour, ctx.minute, ctx.second, ctx.ms * 1000000);
             }
-            catch (_a) {
+            catch (_b) {
                 throw new Error('Invalid date/time components');
             }
             if (ctx.timeZone) {
@@ -612,7 +613,7 @@ export default function parse(input, format, cls = 'auto', force, locale) {
             }
             else {
                 const utcMs = Date.UTC(ctx.year, ctx.month - 1, ctx.day, ctx.hour, ctx.minute, ctx.second, ctx.ms);
-                const epochMs = utcMs; // - (ctx.offsetMinutes ?? 0) * 60_000;
+                const epochMs = utcMs - ((_a = ctx.offsetMinutes) !== null && _a !== void 0 ? _a : 0) * 60000;
                 dtObj = new bbnDtZoned(T.Instant.fromEpochMilliseconds(epochMs).toZonedDateTimeISO(T.Now.timeZoneId()));
             }
         }

package/package.json

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