@bbn/bbn 2.0.6 → 2.0.8

package/dist/date.d.ts

@@ -27,9 +27,9 @@ declare class bbnDateTool {
     year(v?: number): number | bbnDateTool;
     month(v?: number): number | bbnDateTool;
     day(v?: number): number | bbnDateTool;
-    hours(v?: number): number | bbnDateTool;
-    minutes(v?: number): number | bbnDateTool;
-    seconds(v?: number): number | bbnDateTool;
+    hour(v?: number): number | bbnDateTool;
+    minute(v?: number): number | bbnDateTool;
+    second(v?: number): number | bbnDateTool;
     weekday(v?: number, past?: boolean): number | bbnDateTool;
     /**
      * Returns the ISO-8601 week number of this date.

package/dist/date.js

@@ -16,6 +16,8 @@ import substr from './fn/string/substr.js';
 import isNumber from './fn/type/isNumber.js';
 import isDate from './fn/type/isDate.js';
 import isPrimitive from './fn/type/isPrimitive.js';
+import extend from './fn/object/extend.js';
+import getRow from './fn/object/getRow.js';
 const patterns = [
     // MariaDB DATETIME "YYYY-MM-DD HH:MM:SS"
     {
@@ -25,9 +27,9 @@ const patterns = [
             year: +m[1],
             month: +m[2],
             day: +m[3],
-            hours: +m[4],
-            minutes: +m[5],
-            seconds: +m[6],
+            hour: +m[4],
+            minute: +m[5],
+            second: +m[6],
         })
     },
     // MariaDB DATETIME without seconds "YYYY-MM-DD HH:MM"
@@ -38,9 +40,9 @@ const patterns = [
             year: +m[1],
             month: +m[2],
             day: +m[3],
-            hours: +m[4],
-            minutes: +m[5],
-            seconds: 0,
+            hour: +m[4],
+            minute: +m[5],
+            second: 0,
         })
     },
     // MariaDB DATE "YYYY-MM-DD"
@@ -51,9 +53,9 @@ const patterns = [
             year: +m[1],
             month: +m[2],
             day: +m[3],
-            hours: 0,
-            minutes: 0,
-            seconds: 0,
+            hour: 0,
+            minute: 0,
+            second: 0,
         })
     },
     // ISO / JS-style "YYYY-MM-DDTHH:MM[:SS][.sss][Z or ±HH:MM]"
@@ -64,9 +66,9 @@ const patterns = [
             year: +m[1],
             month: +m[2],
             day: +m[3],
-            hours: +m[4],
-            minutes: +m[5],
-            seconds: m[6] !== undefined ? +m[6] : 0,
+            hour: +m[4],
+            minute: +m[5],
+            second: m[6] !== undefined ? +m[6] : 0,
         })
     },
     // Simple slash date "YYYY/MM/DD"
@@ -77,9 +79,9 @@ const patterns = [
             year: +m[3],
             month: +m[2],
             day: +m[1],
-            hours: 0,
-            minutes: 0,
-            seconds: 0,
+            hour: 0,
+            minute: 0,
+            second: 0,
         })
     },
     // Slash datetime "YYYY/MM/DD HH:MM:SS"
@@ -90,9 +92,9 @@ const patterns = [
             year: +m[3],
             month: +m[2],
             day: +m[1],
-            hours: +m[4],
-            minutes: +m[5],
-            seconds: +m[6],
+            hour: +m[4],
+            minute: +m[5],
+            second: +m[6],
         })
     },
 ];
@@ -235,7 +237,7 @@ const buildLocaleFromIntl = () => {
         weekdaysShort,
     };
 };
-const locales = buildLocaleFromIntl();
+const locales = {};
 class bbnDateDuration {
     constructor(len, unit, fromMs = false) {
         _bbnDateDuration_instances.add(this);
@@ -246,7 +248,7 @@ class bbnDateDuration {
             throw new Error('Invalid unit for duration: ' + unit);
         }
         __classPrivateFieldSet(this, _bbnDateDuration_unit, realUnit, "f");
-        const row = bbn.fn.getRow(units, d => d[0] === realUnit);
+        const row = getRow(units, d => d[0] === realUnit);
         if (!row) {
             throw new Error('Invalid unit for duration: ' + realUnit);
         }
@@ -316,7 +318,7 @@ class bbnDateDuration {
         const targetUnit = unit
             ? (unitsCorrespondence[unit] || unit)
             : __classPrivateFieldGet(this, _bbnDateDuration_unit, "f");
-        const row = bbn.fn.getRow(units, d => d[0] === targetUnit);
+        const row = getRow(units, d => d[0] === targetUnit);
         if (!row) {
             throw new Error('Invalid unit for duration: ' + (unit !== null && unit !== void 0 ? unit : targetUnit));
         }
@@ -330,7 +332,7 @@ class bbnDateDuration {
     }
 }
 _bbnDateDuration_durationMs = new WeakMap(), _bbnDateDuration_unit = new WeakMap(), _bbnDateDuration_instances = new WeakSet(), _bbnDateDuration_getUnitRowByName = function _bbnDateDuration_getUnitRowByName(name) {
-    const row = bbn.fn.getRow(units, d => d[1] === name);
+    const row = getRow(units, d => d[1] === name);
     if (!row) {
         throw new Error('Unit name not found: ' + name);
     }
@@ -373,6 +375,9 @@ class bbnDateTool {
      */
     static parse(input, format, locale) {
         var _a, _b, _c, _d;
+        if (!('monthsLong' in locales)) {
+            extend(locales, buildLocaleFromIntl());
+        }
         const loc = {
             monthsLong: (_a = locale === null || locale === void 0 ? void 0 : locale.monthsLong) !== null && _a !== void 0 ? _a : locales.monthsLong,
             monthsShort: (_b = locale === null || locale === void 0 ? void 0 : locale.monthsShort) !== null && _b !== void 0 ? _b : locales.monthsShort,
@@ -794,8 +799,8 @@ class bbnDateTool {
                 for (const p of patterns) {
                     const m = value.match(p.re);
                     if (m) {
-                        const { year, month, day, hours, minutes, seconds } = p.map(m);
-                        __classPrivateFieldSet(this, _bbnDateTool_value, new Date(year, month - 1, day, hours, minutes, seconds, 0), "f");
+                        const { year, month, day, hour, minute, second } = p.map(m);
+                        __classPrivateFieldSet(this, _bbnDateTool_value, new Date(year, month - 1, day, hour, minute, second, 0), "f");
                     }
                 }
                 if (!__classPrivateFieldGet(this, _bbnDateTool_value, "f")) {
@@ -845,7 +850,7 @@ class bbnDateTool {
         }
         return __classPrivateFieldGet(this, _bbnDateTool_value, "f").getDate();
     }
-    hours(v) {
+    hour(v) {
         if (0 in arguments) {
             const d = this.copy();
             d.setHours(v);
@@ -853,7 +858,7 @@ class bbnDateTool {
         }
         return __classPrivateFieldGet(this, _bbnDateTool_value, "f").getHours();
     }
-    minutes(v) {
+    minute(v) {
         if (0 in arguments) {
             const d = this.copy();
             d.setMinutes(v);
@@ -861,7 +866,7 @@ class bbnDateTool {
         }
         return __classPrivateFieldGet(this, _bbnDateTool_value, "f").getMinutes();
     }
-    seconds(v) {
+    second(v) {
         if (0 in arguments) {
             const d = this.copy();
             d.setSeconds(v);
@@ -956,25 +961,25 @@ class bbnDateTool {
         return this.day().toString();
     }
     get HH() {
-        const h = parseInt(this.hours().toString());
+        const h = parseInt(this.hour().toString());
         return h < 10 ? '0' + h.toString() : h.toString();
     }
     get H() {
-        return this.hours().toString();
+        return this.hour().toString();
     }
     get II() {
-        const i = parseInt(this.minutes().toString());
+        const i = parseInt(this.minute().toString());
         return i < 10 ? '0' + i.toString() : i.toString();
     }
     get I() {
-        return this.minutes().toString();
+        return this.minute().toString();
     }
     get SS() {
-        const s = parseInt(this.seconds().toString());
+        const s = parseInt(this.second().toString());
         return s < 10 ? '0' + s.toString() : s.toString();
     }
     get S() {
-        return this.seconds().toString();
+        return this.second().toString();
     }
     get WW() {
         const y = parseInt(this.year().toString());
@@ -1146,7 +1151,7 @@ class bbnDateTool {
         const order = ['y', 'm', 'd', 'h', 'i', 's'];
         // Compare step by step until the requested precision
         for (const u of order) {
-            const key = (_a = bbn.fn.getRow(units, un => un[0] === u)) === null || _a === void 0 ? void 0 : _a[1];
+            const key = (_a = getRow(units, un => un[0] === u)) === null || _a === void 0 ? void 0 : _a[1];
             const a = this[key]();
             const b = d[key]();
             if (a < b) {
@@ -1183,7 +1188,7 @@ class bbnDateTool {
         const diff = this.diff(date, chosenUnit);
         const rtf = new Intl.RelativeTimeFormat([bbn.env.lang, ...navigator.languages], { numeric: "auto" });
         // FORCED UNIT MODE
-        const match = bbn.fn.getRow(units, d => d[0] === chosenUnit);
+        const match = getRow(units, d => d[0] === chosenUnit);
         if (!match) {
             throw new Error('Invalid unit for fromDate: ' + unit);
         }
@@ -1213,7 +1218,7 @@ class bbnDateTool {
             return diff;
         }
         const realUnit = unitsCorrespondence[unit];
-        const match = bbn.fn.getRow(units, d => d[0] === realUnit);
+        const match = getRow(units, d => d[0] === realUnit);
         if (!match) {
             throw new Error('Invalid unit for diff: ' + unit);
         }
@@ -1355,7 +1360,7 @@ class bbnDateTool {
             case "w": {
                 // Week starting Monday:
                 // JS getDay(): 0 (Sun) .. 6 (Sat)
-                const current = new Date(this.year(), this.month() - 1, this.day(), this.hours(), this.minutes(), this.seconds(), 0);
+                const current = new Date(this.year(), this.month() - 1, this.day(), this.hour(), this.minute(), this.second(), 0);
                 const wd = current.getDay(); // 0..6
                 const diffToMonday = (wd + 6) % 7; // 0 for Monday, 6 for Sunday
                 d = new Date(current.getFullYear(), current.getMonth(), current.getDate() - diffToMonday, 0, 0, 0, 0);
@@ -1365,13 +1370,13 @@ class bbnDateTool {
                 d = new Date(this.year(), this.month() - 1, this.day(), 0, 0, 0, 0);
                 break;
             case "h":
-                d = new Date(this.year(), this.month() - 1, this.day(), this.hours(), 0, 0, 0);
+                d = new Date(this.year(), this.month() - 1, this.day(), this.hour(), 0, 0, 0);
                 break;
             case "i":
-                d = new Date(this.year(), this.month() - 1, this.day(), this.hours(), this.minutes(), 0, 0);
+                d = new Date(this.year(), this.month() - 1, this.day(), this.hour(), this.minute(), 0, 0);
                 break;
             case "s":
-                d = new Date(this.year(), this.month() - 1, this.day(), this.hours(), this.minutes(), this.seconds(), 0);
+                d = new Date(this.year(), this.month() - 1, this.day(), this.hour(), this.minute(), this.second(), 0);
                 break;
             default:
                 throw new Error('Invalid unit for startOf: ' + unit);
@@ -1409,13 +1414,13 @@ class bbnDateTool {
                 d = new Date(this.year(), this.month() - 1, this.day(), 23, 59, 59, 999);
                 break;
             case "hour":
-                d = new Date(this.year(), this.month() - 1, this.day(), this.hours(), 59, 59, 999);
+                d = new Date(this.year(), this.month() - 1, this.day(), this.hour(), 59, 59, 999);
                 break;
             case "minute":
-                d = new Date(this.year(), this.month() - 1, this.day(), this.hours(), this.minutes(), 59, 999);
+                d = new Date(this.year(), this.month() - 1, this.day(), this.hour(), this.minute(), 59, 999);
                 break;
             case "second":
-                d = new Date(this.year(), this.month() - 1, this.day(), this.hours(), this.minutes(), this.seconds(), 999);
+                d = new Date(this.year(), this.month() - 1, this.day(), this.hour(), this.minute(), this.second(), 999);
                 break;
             default:
                 d = new Date(this.mtst);

package/package.json

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