@bbn/bbn 1.0.438 → 1.0.440

package/dist/date.d.ts

@@ -1,24 +1,37 @@
 declare class bbnDateTool {
     #private;
     constructor(value: any, inputFormat?: null | String);
-    get year(): Number;
+    toString(): number;
+    get year(): number;
     get month(): number;
     get day(): number;
     get hours(): number;
     get minutes(): number;
     get seconds(): number;
+    get tst(): number;
+    get mtst(): number;
     get YYYY(): string;
     get YY(): string;
     get MM(): string;
     get DD(): string;
-    add(value: number, unit: string | null): bbnDateTool;
+    get HH(): string;
+    get mm(): string;
+    get ss(): string;
+    add(value: number, unit?: string): bbnDateTool | null;
     sub(value: number, unit: string | null): bbnDateTool;
     dateFromFormat(value: string, unit: string | null): Date;
-    format(format: string): string;
+    format(format?: string): string;
     unix(ms?: boolean): number;
+    /**
+     * Compare this date to another date with a given precision.
+     * @returns -1 if this < other, 0 if equal, 1 if this > other
+     */
+    compare(date: any, unit?: string): -1 | 0 | 1;
     isBefore(date: any, unit?: string): Boolean;
     isAfter(date: any, unit?: string): Boolean;
     isSame(date: any, unit?: string): Boolean;
+    isAfterOrSame(date: any, unit?: string): Boolean;
+    isBeforeOrSame(date: any, unit?: string): Boolean;
     calendar(format: string): string;
     get daysInMonth(): Number | 0;
 }

package/dist/date.js

@@ -9,24 +9,147 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _bbnDateTool_value, _bbnDateTool_daysInMonth, _bbnDateTool_parts;
+var _bbnDateTool_value, _bbnDateTool_daysInMonth;
 import each from './fn/loop/each.js';
 import substr from './fn/string/substr.js';
 import isNumber from './fn/type/isNumber.js';
 import isDate from './fn/type/isDate.js';
-import getProperty from './fn/object/getProperty.js';
+const patterns = [
+    // MariaDB DATETIME "YYYY-MM-DD HH:MM:SS"
+    {
+        name: 'mariadb-datetime',
+        re: /^(\d{4})-(\d{2})-(\d{2})[ T](\d{2}):(\d{2}):(\d{2})$/,
+        map: m => ({
+            year: +m[1],
+            month: +m[2],
+            day: +m[3],
+            hours: +m[4],
+            minutes: +m[5],
+            seconds: +m[6],
+        })
+    },
+    // MariaDB DATETIME without seconds "YYYY-MM-DD HH:MM"
+    {
+        name: 'mariadb-datetime-no-sec',
+        re: /^(\d{4})-(\d{2})-(\d{2})[ T](\d{2}):(\d{2})$/,
+        map: m => ({
+            year: +m[1],
+            month: +m[2],
+            day: +m[3],
+            hours: +m[4],
+            minutes: +m[5],
+            seconds: 0,
+        })
+    },
+    // MariaDB DATE "YYYY-MM-DD"
+    {
+        name: 'mariadb-date',
+        re: /^(\d{4})-(\d{2})-(\d{2})$/,
+        map: m => ({
+            year: +m[1],
+            month: +m[2],
+            day: +m[3],
+            hours: 0,
+            minutes: 0,
+            seconds: 0,
+        })
+    },
+    // ISO / JS-style "YYYY-MM-DDTHH:MM[:SS][.sss][Z or ±HH:MM]"
+    {
+        name: 'iso-datetime',
+        re: /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(?::(\d{2}))?(?:\.\d+)?(?:Z|[+\-]\d{2}:?\d{2})?$/,
+        map: m => ({
+            year: +m[1],
+            month: +m[2],
+            day: +m[3],
+            hours: +m[4],
+            minutes: +m[5],
+            seconds: m[6] !== undefined ? +m[6] : 0,
+        })
+    },
+    // Simple slash date "YYYY/MM/DD"
+    {
+        name: 'slash-date',
+        re: /^(\d{2})\/(\d{2})\/(\d{4})$/,
+        map: m => ({
+            year: +m[3],
+            month: +m[2],
+            day: +m[1],
+            hours: 0,
+            minutes: 0,
+            seconds: 0,
+        })
+    },
+    // Slash datetime "YYYY/MM/DD HH:MM:SS"
+    {
+        name: 'slash-datetime',
+        re: /^(\d{2})\/(\d{2})\/(\d{4})[ T](\d{2}):(\d{2}):(\d{2})$/,
+        map: m => ({
+            year: +m[3],
+            month: +m[2],
+            day: +m[1],
+            hours: +m[4],
+            minutes: +m[5],
+            seconds: +m[6],
+        })
+    },
+];
+const unitsMap = {
+    'y': 'FullYear',
+    'm': 'Month',
+    'd': 'Date',
+    'h': 'Hours',
+    'n': 'Minutes',
+    's': 'Seconds'
+};
+const unitsCorrespondence = {
+    'YYYY': 'y',
+    'YY': 'y',
+    'yyyy': 'y',
+    'yy': 'y',
+    'year': 'y',
+    'Y': 'y',
+    'y': 'y',
+    'MM': 'm',
+    'M': 'm',
+    'month': 'm',
+    'mm': 'm',
+    'm': 'm',
+    'DD': 'd',
+    'day': 'd',
+    'D': 'd',
+    'dd': 'd',
+    'd': 'd',
+    'HH': 'h',
+    'hr': 'h',
+    'hour': 'h',
+    'H': 'h',
+    'hh': 'h',
+    'h': 'h',
+    'NN': 'n',
+    'nn': 'n',
+    'mn': 'n',
+    'minute': 'n',
+    'min': 'n',
+    'n': 'n',
+    'SS': 's',
+    'ss': 's',
+    'sec': 's',
+    's': 's',
+    'S': 's',
+};
 class bbnDateTool {
     constructor(value, inputFormat = null) {
         _bbnDateTool_value.set(this, void 0);
         _bbnDateTool_daysInMonth.set(this, undefined);
-        _bbnDateTool_parts.set(this, undefined);
-        if (inputFormat) {
+        if (!value) {
+            __classPrivateFieldSet(this, _bbnDateTool_value, new Date(), "f");
+        }
+        else if (inputFormat) {
+            __classPrivateFieldSet(this, _bbnDateTool_value, new Date(), "f");
         }
         else {
             let t = typeof value;
-            if (value === undefined) {
-                __classPrivateFieldSet(this, _bbnDateTool_value, new Date(), "f");
-            }
             if (t === 'number' || (isNumber(value) && value !== '')) {
                 if ((value < 5000) && isNumber(inputFormat)) {
                     value = Array.from(arguments);
@@ -39,11 +162,15 @@ class bbnDateTool {
                 }
             }
             if (t === 'string') {
-                if (value.length === 10) {
-                    __classPrivateFieldSet(this, _bbnDateTool_value, new Date(parseInt(substr(value, 0, 4)), parseInt(substr(value, 5, 2)) - 1, parseInt(substr(value, 8, 2)), 12), "f");
+                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");
+                    }
                 }
-                else if (value.length === 19) {
-                    __classPrivateFieldSet(this, _bbnDateTool_value, new Date(parseInt(substr(value, 0, 4)), parseInt(substr(value, 5, 2)) - 1, parseInt(substr(value, 8, 2)), parseInt(substr(value, 11, 2)), parseInt(substr(value, 14, 2)), parseInt(substr(value, 17, 2))), "f");
+                if (!__classPrivateFieldGet(this, _bbnDateTool_value, "f")) {
+                    throw new Error('Invalid date string format: ' + value);
                 }
             }
             else if (isDate(value)) {
@@ -62,6 +189,9 @@ class bbnDateTool {
             });
         }
     }
+    toString() {
+        return __classPrivateFieldGet(this, _bbnDateTool_value, "f") ? __classPrivateFieldGet(this, _bbnDateTool_value, "f").getTime() : 0;
+    }
     get year() {
         return __classPrivateFieldGet(this, _bbnDateTool_value, "f").getFullYear();
     }
@@ -80,6 +210,12 @@ class bbnDateTool {
     get seconds() {
         return __classPrivateFieldGet(this, _bbnDateTool_value, "f").getSeconds();
     }
+    get tst() {
+        return Math.ceil(__classPrivateFieldGet(this, _bbnDateTool_value, "f").getTime() / 1000);
+    }
+    get mtst() {
+        return __classPrivateFieldGet(this, _bbnDateTool_value, "f").getTime();
+    }
     get YYYY() {
         return this.year.toString();
     }
@@ -92,25 +228,43 @@ class bbnDateTool {
     get DD() {
         return this.day < 10 ? '0' + this.day.toString() : this.day.toString();
     }
-    add(value, unit) {
-        let newValue;
-        return new bbnDateTool(newValue);
+    get HH() {
+        return this.hours < 10 ? '0' + this.hours.toString() : this.hours.toString();
+    }
+    get mm() {
+        return this.minutes < 10 ? '0' + this.minutes.toString() : this.minutes.toString();
+    }
+    get ss() {
+        return this.seconds < 10 ? '0' + this.seconds.toString() : this.seconds.toString();
+    }
+    add(value, unit = 'd') {
+        const date = __classPrivateFieldGet(this, _bbnDateTool_value, "f") ? new Date(__classPrivateFieldGet(this, _bbnDateTool_value, "f").getTime()) : new Date();
+        if (unitsCorrespondence[unit]) {
+            const realUnit = unitsCorrespondence[unit];
+            const suffix = unitsMap[realUnit];
+            const getter = 'get' + suffix;
+            const setter = 'set' + suffix;
+            date[setter](date[getter]() + value);
+            return new bbnDateTool(date);
+        }
+        return null;
     }
     sub(value, unit) {
-        let newValue;
-        return new bbnDateTool(newValue);
+        return this.add(-value, unit);
     }
     dateFromFormat(value, unit) {
         const d = new Date();
         return d;
     }
-    format(format) {
+    format(format = '') {
+        const date = __classPrivateFieldGet(this, _bbnDateTool_value, "f") ? new Date(__classPrivateFieldGet(this, _bbnDateTool_value, "f").getTime()) : new Date();
         let str = '';
         if (format) {
-            const parts = format.split(/(YYYY|YY|MM|DD|HH|mm|ss)/);
+            const parts = format.split('/(' + Object.keys(unitsCorrespondence).join('|') + ')/');
             each(parts, (part) => {
-                if (part in this) {
-                    str += getProperty(this, part);
+                if (part in unitsCorrespondence) {
+                    const suffix = unitsMap[unitsCorrespondence[part]];
+                    str += date['get' + suffix]();
                 }
                 else {
                     str += part;
@@ -130,24 +284,102 @@ class bbnDateTool {
         }
         return 0;
     }
-    isBefore(date, unit = '') {
+    /**
+     * Compare this date to another date with a given precision.
+     * @returns -1 if this < other, 0 if equal, 1 if this > other
+     */
+    compare(date, unit = '') {
         const d = new bbnDateTool(date);
-        if (unit === 'd') {
+        const realUnit = unitsCorrespondence[unit] || null;
+        // If no unit or unknown unit, fall back to timestamp comparison
+        if (!realUnit) {
+            if (this.mtst < d.mtst) {
+                return -1;
+            }
+            if (this.mtst > d.mtst) {
+                return 1;
+            }
+            return 0;
         }
-        return false;
-    }
-    isAfter(date, unit = '') {
-        const d = new bbnDateTool(date);
-        if (unit === 'd') {
+        const order = ['y', 'm', 'd', 'h', 'n', 's'];
+        // Compare step by step until the requested precision
+        for (const u of order) {
+            const key = unitsMap[u];
+            const a = this[key];
+            const b = d[key];
+            if (a < b) {
+                return -1;
+            }
+            if (a > b) {
+                return 1;
+            }
+            // Stop when we've reached the desired unit
+            if (u === realUnit) {
+                break;
+            }
         }
-        return false;
+        return 0;
     }
-    isSame(date, unit = '') {
-        const d = new bbnDateTool(date);
-        if (unit === 'd') {
+    isBefore(date, unit = '') {
+        return this.compare(date, unit) === -1;
+    }
+    isAfter(date, unit = 'day') {
+        return this.compare(date, unit) === 1;
+    }
+    isSame(date, unit = 'day') {
+        return this.compare(date, unit) === 0;
+    }
+    isAfterOrSame(date, unit = '') {
+        return [0, 1].includes(this.compare(date, unit));
+    }
+    isBeforeOrSame(date, unit = '') {
+        return [-1, 0].includes(this.compare(date, unit));
+    }
+    /*
+      const d = new bbnDateTool(date);
+      if (unitsCorrespondence[unit]) {
+        const realUnit = unitsCorrespondence[unit];
+        switch (realUnit) {
+          case 'y':
+            return this.year < d.year;
+          case 'm':
+            return (this.year < d.year) || (this.year === d.year && this.month < d.month);
+          case 'd':
+            return (this.year < d.year) || (this.year === d.year && this.month < d.month) || (this.year === d.year && this.month === d.month && this.day < d.day);
+          case 'h':
+            return (this.year < d.year) || (this.year === d.year && this.month < d.month) || (this.year === d.year && this.month === d.month && this.day < d.day) || (this.year === d.year && this.month === d.month && this.day === d.day && this.hours < d.hours);
+          case 'n':
+            return (this.year < d.year) || (this.year === d.year && this.month < d.month) || (this.year === d.year && this.month === d.month && this.day < d.day) || (this.year === d.year && this.month === d.month && this.day === d.day && this.hours < d.hours) || (this.year === d.year && this.month === d.month && this.day === d.day && this.hours === d.hours && this.minutes < d.minutes);
+          case 's':
+            return (this.year < d.year) || (this.year === d.year && this.month < d.month) || (this.year === d.year && this.month === d.month && this.day < d.day) || (this.year === d.year && this.month === d.month && this.day === d.day && this.hours < d.hours) || (this.year === d.year && this.month === d.month && this.day === d.day && this.hours === d.hours && this.minutes < d.minutes) || (this.year === d.year && this.month === d.month && this.day === d.day && this.hours === d.hours && this.minutes === d.minutes && this.seconds < d.seconds);
         }
-        return false;
+      }
+  
+      return this.mtst < d.mtst;
     }
+  
+    isBeforeOrSame(date: any, unit: string = ''): Boolean {
+      const d = new bbnDateTool(date);
+      if (unitsCorrespondence[unit]) {
+        const realUnit = unitsCorrespondence[unit];
+        switch (realUnit) {
+          case 'y':
+            return this.year <= d.year;
+          case 'm':
+            return (this.year <= d.year) || (this.year === d.year && this.month <= d.month);
+          case 'd':
+            return (this.year <= d.year) || (this.year === d.year && this.month <= d.month) || (this.year === d.year && this.month === d.month && this.day <= d.day);
+          case 'h':
+            return (this.year <= d.year) || (this.year === d.year && this.month <= d.month) || (this.year === d.year && this.month === d.month && this.day <= d.day) || (this.year === d.year && this.month === d.month && this.day === d.day && this.hours <= d.hours);
+          case 'n':
+            return (this.year <= d.year) || (this.year === d.year && this.month <= d.month) || (this.year === d.year && this.month === d.month && this.day <= d.day) || (this.year === d.year && this.month === d.month && this.day === d.day && this.hours <= d.hours) || (this.year === d.year && this.month === d.month && this.day === d.day && this.hours === d.hours && this.minutes <= d.minutes);
+          case 's':
+            return (this.year <= d.year) || (this.year === d.year && this.month <= d.month) || (this.year === d.year && this.month === d.month && this.day <= d.day) || (this.year === d.year && this.month === d.month && this.day === d.day && this.hours <= d.hours) || (this.year === d.year && this.month === d.month && this.day === d.day && this.hours === d.hours && this.minutes <= d.minutes) || (this.year === d.year && this.month === d.month && this.day === d.day && this.hours === d.hours && this.minutes === d.minutes && this.seconds <= d.seconds);
+        }
+      }
+  
+      return this.mtst < d.mtst;
+    }*/
     calendar(format) {
         let str = '';
         if (format) {
@@ -183,7 +415,7 @@ class bbnDateTool {
         return __classPrivateFieldGet(this, _bbnDateTool_daysInMonth, "f");
     }
 }
-_bbnDateTool_value = new WeakMap(), _bbnDateTool_daysInMonth = new WeakMap(), _bbnDateTool_parts = new WeakMap();
+_bbnDateTool_value = new WeakMap(), _bbnDateTool_daysInMonth = new WeakMap();
 function generatorFunction(value, inputFormat = null) {
     return new bbnDateTool(value, inputFormat);
 }

package/package.json

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