@bbn/bbn 1.0.447 → 1.0.448

package/dist/date.d.ts

@@ -16,8 +16,8 @@ declare class bbnDateTool {
     get MM(): string;
     get DD(): string;
     get HH(): string;
-    get mm(): string;
-    get ss(): string;
+    get II(): 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;

package/dist/date.js

@@ -99,7 +99,7 @@ const unitsMap = {
     'm': 'Month',
     'd': 'Date',
     'h': 'Hours',
-    'n': 'Minutes',
+    'i': 'Minutes',
     's': 'Seconds'
 };
 const formatsMap = {
@@ -107,41 +107,72 @@ const formatsMap = {
     'm': 'MM',
     'd': 'DD',
     'h': 'HH',
-    'n': 'mm',
-    's': 'ss'
+    'i': 'II',
+    's': 'SS'
 };
 const unitsCorrespondence = {
+    'years': 'y',
+    'year': 'y',
+    'YEARS': 'y',
+    'YEAR': 'y',
+    'Years': 'y',
+    'Year': 'y',
     'YYYY': 'y',
     'YY': 'y',
     'yyyy': 'y',
     'yy': 'y',
-    'year': 'y',
     'Y': 'y',
     'y': 'y',
+    'months': 'm',
+    'month': 'm',
+    'Months': 'm',
+    'Month': 'm',
+    'MONTHS': 'm',
+    'MONTH': 'm',
     'MM': 'm',
     'M': 'm',
-    'month': 'm',
-    'mm': 'm',
     'm': 'm',
-    'DD': 'd',
+    'days': 'd',
     'day': 'd',
+    'Days': 'd',
+    'Day': 'd',
+    'DAYS': 'd',
+    'DAY': 'd',
+    'DD': 'd',
     'D': 'd',
     'dd': 'd',
     'd': 'd',
+    'hours': 'h',
+    'hour': 'h',
+    'Hours': 'h',
+    'Hour': 'h',
+    'HOURS': 'h',
+    'HOUR': 'h',
     'HH': 'h',
     'hr': 'h',
-    'hour': 'h',
     'H': 'h',
     'hh': 'h',
     'h': 'h',
-    'NN': 'n',
-    'nn': 'n',
-    'mn': 'n',
-    'minute': 'n',
-    'min': 'n',
-    'n': 'n',
+    'minutes': 'i',
+    'minute': 'i',
+    'Minutes': 'i',
+    'Minute': 'i',
+    'MINUTES': 'i',
+    'MINUTE': 'i',
+    'II': 'i',
+    'ii': 'i',
+    'mn': 'i',
+    'mm': 'i',
+    'min': 'i',
+    'n': 'i',
     'SS': 's',
     'ss': 's',
+    'seconds': 's',
+    'second': 's',
+    'Seconds': 's',
+    'Second': 's',
+    'SECONDS': 's',
+    'SECOND': 's',
     'sec': 's',
     's': 's',
     'S': 's',
@@ -242,10 +273,10 @@ class bbnDateTool {
     get HH() {
         return this.hours < 10 ? '0' + this.hours.toString() : this.hours.toString();
     }
-    get mm() {
+    get II() {
         return this.minutes < 10 ? '0' + this.minutes.toString() : this.minutes.toString();
     }
-    get ss() {
+    get SS() {
         return this.seconds < 10 ? '0' + this.seconds.toString() : this.seconds.toString();
     }
     add(value, unit = 'd') {
@@ -267,7 +298,7 @@ class bbnDateTool {
         const d = new Date();
         return d;
     }
-    format(format = 'y-m-d h:n:s') {
+    format(format = 'y-m-d h:i:s') {
         let str = '';
         if (format) {
             const reg = new RegExp('(' + Object.keys(unitsCorrespondence).join('|') + ')', 'g');
@@ -312,7 +343,7 @@ class bbnDateTool {
             }
             return 0;
         }
-        const order = ['y', 'm', 'd', 'h', 'n', 's'];
+        const order = ['y', 'm', 'd', 'h', 'i', 's'];
         // Compare step by step until the requested precision
         for (const u of order) {
             const key = unitsMap[u].toLowerCase();

package/dist/fn/datetime/dateSQL.js

@@ -1,5 +1,4 @@
-import date from './date.js';
-import dayjs from 'dayjs';
+import date from '../../date.js';
 /**
  * Returns a date with SQL format.
  *
@@ -21,7 +20,7 @@ import dayjs from 'dayjs';
 export default function dateSQL(v, dayOnly) {
     let value = date(v);
     if (value) {
-        return dayjs(value).format('YYYY-MM-DD' + (dayOnly ? '' : ' HH:mm:ss'));
+        return value.format('YYYY-MM-DD' + (dayOnly ? '' : ' HH:mm:ss'));
     }
 }
 ;

package/package.json

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