@bbn/bbn 2.0.149 → 2.0.151

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

@@ -90,6 +90,8 @@ export declare abstract class bbnDt<TValue extends bbnDtTemporal> {
     get S(): string;
     get WW(): string;
     get W(): string;
+    get Z(): string;
+    get ZZ(): string;
     unix(ms?: boolean | number): number | bbnDt<any>;
     format(format?: string): string;
     calendar(short?: boolean): string;
@@ -113,7 +115,7 @@ export declare abstract class bbnDt<TValue extends bbnDtTemporal> {
     startOf(unit?: string): bbnDt<any>;
     endOf(unit?: string): bbnDt<any>;
     clone(): bbnDt<any>;
-    inLeapYear(): boolean;
+    isLeapYear(): boolean;
     daysInMonth(): number;
     valueOf(): number;
 }

package/dist/dt/classes/dt.js

@@ -431,7 +431,7 @@ export class bbnDt {
         if ((v !== undefined) && !(v instanceof Event)) {
             return this.setWeekday(v, past);
         }
-        return this.value.dayOfWeek;
+        return this.value.dayOfWeek % 7;
     }
     date(v) {
         if (!this.value) {
@@ -640,6 +640,20 @@ export class bbnDt {
         }
         return undefined;
     }
+    get Z() {
+        if (this.kind === 'zoned') {
+            const zdt = this.value;
+            return zdt.offset;
+        }
+        return undefined;
+    }
+    get ZZ() {
+        if (this.kind === 'zoned') {
+            const zdt = this.value;
+            return zdt.offset.replace(':', '');
+        }
+        return undefined;
+    }
     unix(ms = false) {
         if (typeof ms === 'number') {
             const Ctor = this.constructor;
@@ -673,7 +687,7 @@ export class bbnDt {
                     }
                     else {
                         const suffix = formatsMap[unitsCorrespondence[part]];
-                        str += this[suffix];
+                        str += this[suffix] || '';
                     }
                 }
                 else {
@@ -826,7 +840,7 @@ export class bbnDt {
             throw new Error('Invalid unit for diff: ' + unit);
         }
         const [, , ms] = match; // [shortUnit, rtfUnit, ms]
-        return Math.round(diff / ms);
+        return Math.floor(diff / ms);
     }
     guessUnit(valueInMs) {
         const absDiff = Math.abs(valueInMs);
@@ -1059,7 +1073,7 @@ export class bbnDt {
     clone() {
         return this.withValue(this.value);
     }
-    inLeapYear() {
+    isLeapYear() {
         if (this.isValid) {
             const year = this.year();
             return (year % 4 === 0 && year % 100 !== 0) || (year % 400 === 0);
@@ -1088,7 +1102,7 @@ export class bbnDt {
         }
     }
     valueOf() {
-        return this.unix();
+        return this.unix(true);
     }
 }
 _bbnDt_value = new WeakMap();

package/dist/dt/functions/parse.js

@@ -411,10 +411,10 @@ export default function parse(input, format, cls = 'auto', force, locale) {
                 ctx.week = n;
             }
         },
-        // Timezone offset (Z)
+        // Timezone offset
         {
-            token: 'Z',
-            regex: '(?:Z|[+-]\\d{2}:?\\d{2})',
+            token: 'ZZ',
+            regex: '(?:Z?[+-]\\d{2}\\d{2})',
             apply: (v, ctx) => {
                 if (v === 'Z' || v === 'z') {
                     ctx.offsetMinutes = 0;
@@ -422,17 +422,27 @@ export default function parse(input, format, cls = 'auto', force, locale) {
                 }
                 const sign = v[0] === '-' ? -1 : 1;
                 const rest = v.slice(1); // "02:00" or "0500"
-                let hh;
-                let mm;
-                if (rest.includes(':')) {
-                    const [h, m] = rest.split(':');
-                    hh = parseInt(h, 10);
-                    mm = parseInt(m, 10);
+                const hh = parseInt(rest.slice(0, 2), 10);
+                const mm = parseInt(rest.slice(2), 10);
+                if (hh < 0 || hh > 23 || mm < 0 || mm > 59) {
+                    throw new Error('Invalid timezone offset: ' + v);
                 }
-                else {
-                    hh = parseInt(rest.slice(0, 2), 10);
-                    mm = parseInt(rest.slice(2, 4), 10);
+                ctx.offsetMinutes = sign * (hh * 60 + mm);
+            }
+        },
+        {
+            token: 'Z',
+            regex: '(?:Z?[+-]\\d{2}\\:{1}\\d{2})',
+            apply: (v, ctx) => {
+                if (v === 'Z' || v === 'z') {
+                    ctx.offsetMinutes = 0;
+                    return;
                 }
+                const sign = v[0] === '-' ? -1 : 1;
+                const rest = v.slice(1); // "02:00" or "0500"
+                const [h, m] = rest.split(':');
+                let hh = parseInt(h, 10);
+                let mm = parseInt(m, 10);
                 if (hh < 0 || hh > 23 || mm < 0 || mm > 59) {
                     throw new Error('Invalid timezone offset: ' + v);
                 }
@@ -467,8 +477,9 @@ export default function parse(input, format, cls = 'auto', force, locale) {
     ];
     function parseWithFormat(fmt, cls = 'auto') {
         var _a;
+        const currentDate = new bbnDtDateTime();
         const ctx = {
-            year: 1970,
+            year: currentDate.year(),
             month: 1,
             day: 1,
             hour: 0,
@@ -545,7 +556,7 @@ export default function parse(input, format, cls = 'auto', force, locale) {
         let match = fullRegex.exec(input);
         if (!match) {
             if (force) {
-                const inputDate = new bbnDtDateTime(1970, 1, 1, 0, 0, 0, 0);
+                const inputDate = new bbnDtDateTime(currentDate.year(), 1, 1, 0, 0, 0, 0);
                 input = inputDate.format(fmt);
                 isValid = false;
                 match = fullRegex.exec(input);

package/dist/dt/vars/units.js

@@ -85,7 +85,9 @@ const unitsCorrespondence = {
     's': 's',
     'S': 's',
     'W': 'w',
-    'w': 'w'
+    'w': 'w',
+    'ZZ': 'z',
+    'Z': 'z'
 };
 const unitsMap = {
     'y': 'Year',
@@ -94,7 +96,8 @@ const unitsMap = {
     'w': 'Week',
     'h': 'Hours',
     'i': 'Minutes',
-    's': 'Seconds'
+    's': 'Seconds',
+    'z': 'Offset'
 };
 const formatsMap = {
     'y': 'YYYY',
@@ -104,6 +107,7 @@ const formatsMap = {
     'w': 'WW',
     'h': 'HH',
     'i': 'II',
-    's': 'SS'
+    's': 'SS',
+    'z': 'Z'
 };
 export { units, unitsCorrespondence, unitsMap, formatsMap };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbn/bbn",
-  "version": "2.0.149",
+  "version": "2.0.151",
   "description": "Javascript toolkit",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,7 +15,7 @@
     "pub": "npm version patch && npm publish",
     "build": "./node_modules/.bin/rollup -c",
     "all": "npm run type && npm run test && npm run gitauto && npm version patch && npm run build && npm run gitend && npm publish",
-    "test": "IS_TESTING=true mocha ./test/type.mjs",
+    "test": "IS_TESTING=true npx mocha",
     "wtf": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [
@@ -32,8 +32,9 @@
     "@rollup/plugin-typescript": "^12.3.0",
     "@types/mocha": "^10.0.10",
     "chai": "^6.2.1",
-    "jsdom": "27.2.0",
-    "jsdom-global": "3.0.2",
+    "dayjs": "^1.11.19",
+    "jsdom": "^27.2.0",
+    "jsdom-global": "^3.0.2",
     "mocha": "^11.7.5",
     "rollup": "^4.53.2",
     "ts-loader": "^9.5.4",