@bbn/bbn 1.0.439 → 1.0.441

package/dist/date.js

@@ -9,11 +9,91 @@ 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';
+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',
@@ -62,7 +142,6 @@ class bbnDateTool {
     constructor(value, inputFormat = null) {
         _bbnDateTool_value.set(this, void 0);
         _bbnDateTool_daysInMonth.set(this, undefined);
-        _bbnDateTool_parts.set(this, undefined);
         if (!value) {
             __classPrivateFieldSet(this, _bbnDateTool_value, new Date(), "f");
         }
@@ -83,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)) {
@@ -181,7 +264,7 @@ class bbnDateTool {
             each(parts, (part) => {
                 if (part in unitsCorrespondence) {
                     const suffix = unitsMap[unitsCorrespondence[part]];
-                    str += date['get' + suffix]();
+                    str += date[suffix];
                 }
                 else {
                     str += part;
@@ -332,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.439",
+  "version": "1.0.441",
   "description": "Javascript toolkit",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",