@bbn/bbn 1.0.443 → 1.0.445

package/dist/date.d.ts

@@ -8,6 +8,7 @@ declare class bbnDateTool {
     get hours(): number;
     get minutes(): number;
     get seconds(): number;
+    get weekday(): number;
     get tst(): number;
     get mtst(): number;
     get YYYY(): string;

package/dist/date.js

@@ -102,6 +102,14 @@ const unitsMap = {
     'n': 'Minutes',
     's': 'Seconds'
 };
+const formatsMap = {
+    'y': 'YYYY',
+    'm': 'MM',
+    'd': 'DD',
+    'h': 'HH',
+    'n': 'mm',
+    's': 'ss'
+};
 const unitsCorrespondence = {
     'YYYY': 'y',
     'YY': 'y',
@@ -210,6 +218,9 @@ class bbnDateTool {
     get seconds() {
         return __classPrivateFieldGet(this, _bbnDateTool_value, "f").getSeconds();
     }
+    get weekday() {
+        return __classPrivateFieldGet(this, _bbnDateTool_value, "f").getDay();
+    }
     get tst() {
         return Math.ceil(__classPrivateFieldGet(this, _bbnDateTool_value, "f").getTime() / 1000);
     }
@@ -256,13 +267,14 @@ class bbnDateTool {
         const d = new Date();
         return d;
     }
-    format(format = '') {
+    format(format = 'y-m-d h:n:s') {
         let str = '';
         if (format) {
-            const parts = format.split('/(' + Object.keys(unitsCorrespondence).join('|') + ')/');
+            const reg = new RegExp('(' + Object.keys(unitsCorrespondence).join('|') + ')', 'g');
+            const parts = format.split(reg);
             each(parts, (part) => {
                 if (part in unitsCorrespondence) {
-                    const suffix = unitsMap[unitsCorrespondence[part]].toLowerCase();
+                    const suffix = formatsMap[unitsCorrespondence[part]];
                     str += this[suffix];
                 }
                 else {
@@ -334,51 +346,6 @@ class bbnDateTool {
     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 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) {

package/package.json

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