@bbn/bbn 1.0.456 → 1.0.458

package/dist/date.d.ts

@@ -32,6 +32,7 @@ declare class bbnDateTool {
      * @returns -1 if this < other, 0 if equal, 1 if this > other
      */
     compare(date: any, unit?: string): -1 | 0 | 1;
+    isValid(): boolean;
     isBefore(date: any, unit?: string): Boolean;
     isAfter(date: any, unit?: string): Boolean;
     isSame(date: any, unit?: string): Boolean;
@@ -42,7 +43,7 @@ declare class bbnDateTool {
     guessUnit(valueInMs: number): string | null;
     diff(date: any, unit?: string, abs?: boolean): number;
     calendar(format: string): string;
-    get daysInMonth(): Number | 0;
+    get daysInMonth(): number;
 }
 declare function generatorFunction(value: any, inputFormat?: null | String): bbnDateTool;
 export default generatorFunction;

package/dist/date.js

@@ -203,7 +203,7 @@ const unitsCorrespondence = {
 class bbnDateTool {
     constructor(value, inputFormat = null) {
         _bbnDateTool_value.set(this, void 0);
-        _bbnDateTool_daysInMonth.set(this, undefined);
+        _bbnDateTool_daysInMonth.set(this, 0);
         if (!value) {
             __classPrivateFieldSet(this, _bbnDateTool_value, new Date(), "f");
         }
@@ -428,6 +428,9 @@ class bbnDateTool {
         }
         return 0;
     }
+    isValid() {
+        return __classPrivateFieldGet(this, _bbnDateTool_value, "f") !== undefined;
+    }
     isBefore(date, unit = '') {
         return this.compare(date, unit) === -1;
     }
@@ -493,10 +496,7 @@ class bbnDateTool {
         return str;
     }
     get daysInMonth() {
-        if (!__classPrivateFieldGet(this, _bbnDateTool_value, "f")) {
-            return 0;
-        }
-        if (!__classPrivateFieldGet(this, _bbnDateTool_daysInMonth, "f")) {
+        if (this.isValid && !__classPrivateFieldGet(this, _bbnDateTool_daysInMonth, "f")) {
             switch (__classPrivateFieldGet(this, _bbnDateTool_value, "f").getMonth()) {
                 case 1:
                     if (__classPrivateFieldGet(this, _bbnDateTool_value, "f").getFullYear() % 4 === 0) {

package/dist/fn/datetime/calendar.d.ts

@@ -16,4 +16,4 @@
  * @param    {String | Boolean} wrong_result Whether or not include the time in the date
  * @returns  {String}
  */
-export default function calendar(d: any, wrong_result?: boolean): any;
+export default function calendar(d: any, wrong_result?: boolean): string | true;

package/dist/fn/datetime/calendar.js

@@ -1,9 +1,7 @@
 import dayjs from 'dayjs';
 import isLeapYear from 'dayjs/plugin/isLeapYear.js';
 import dayjs_plugin_calendar from 'dayjs/plugin/calendar.js';
-import fdate from './fdate.js';
-import date from './date.js';
-import isDate from '../type/isDate.js';
+import date from '../../date.js';
 import isString from '../type/isString.js';
 const bbn = {
     _: st => st
@@ -29,20 +27,10 @@ dayjs.extend(isLeapYear);
  * @returns  {String}
  */
 export default function calendar(d, wrong_result = false) {
-    if (undefined === dayjs) {
-        return fdate(d, wrong_result);
-    }
     let r = date(d);
-    if (!isDate(r)) {
+    if (!r.isValid) {
         return wrong_result && isString(wrong_result) ? wrong_result : '';
     }
-    return dayjs(r).calendar(null, {
-        sameDay: '[' + bbn._('Today') + ']',
-        nextDay: '[' + bbn._('Tomorrow') + ']',
-        nextWeek: 'ddd D',
-        lastDay: '[' + bbn._('Yesterday') + ']',
-        lastWeek: 'ddd D',
-        sameElse: 'L',
-    });
+    return r.fdate();
 }
 ;

package/dist/fn/datetime/daysInMonth.d.ts

@@ -13,4 +13,4 @@
  * @param    {String|Date} v
  * @returns  {Number}
  */
-export default function daysInMonth(v: any): number | false;
+export default function daysInMonth(v: any): number;

package/dist/fn/datetime/daysInMonth.js

@@ -1,4 +1,4 @@
-import date from './date.js';
+import date from '../../date.js';
 /**
  * Returns the number of days of the month given in the date.
  * @method   daysInMonth
@@ -16,9 +16,6 @@ import date from './date.js';
  */
 export default function daysInMonth(v) {
     let d = date(v);
-    if (d) {
-        return dayjs(d).daysInMonth();
-    }
-    return false;
+    return d.daysInMonth;
 }
 ;

package/dist/fn/datetime/fdate.d.ts

@@ -7,4 +7,4 @@
  * @param    {String}      wrong_result
  * @returns
  */
-export default function fdate(d: any, wrong_result?: boolean): any;
+export default function fdate(d: any, wrong_result?: boolean): string | true;

package/dist/fn/datetime/fdate.js

@@ -1,6 +1,4 @@
-import fdatetime from './fdatetime.js';
-import date from './date.js';
-import isDate from '../type/isDate.js';
+import date from '../../date.js';
 import isString from '../type/isString.js';
 /**
  * @method   fdate
@@ -12,17 +10,15 @@ import isString from '../type/isString.js';
  * @returns
  */
 export default function fdate(d, wrong_result = false) {
+    let r = date(d);
+    let time = false;
     // Retro compatibility
     if (wrong_result === true) {
-        return fdatetime(d);
+        time = true;
     }
-    let r = date(d);
-    if (!isDate(r)) {
+    if (!r.isValid) {
         return wrong_result && isString(wrong_result) ? wrong_result : '';
     }
-    if (undefined !== dayjs) {
-        return dayjs(r).format('L');
-    }
-    return r.toLocaleDateString();
+    return r.fdate(true, time);
 }
 ;

package/dist/fn/datetime/fdatetime.d.ts

@@ -5,4 +5,4 @@
  * @memberof bbn.fn
  * @returns  {*}
  */
-export default function fdatetime(d: any, wrong_result?: boolean): any;
+export default function fdatetime(d: any, wrong_result?: boolean): string | true;

package/dist/fn/datetime/fdatetime.js

@@ -1,5 +1,4 @@
-import date from './date.js';
-import isDate from '../type/isDate.js';
+import date from '../../date.js';
 import isString from '../type/isString.js';
 /**
  * @method   fdatetime
@@ -10,20 +9,9 @@ import isString from '../type/isString.js';
  */
 export default function fdatetime(d, wrong_result = false) {
     let r = date(d);
-    if (!isDate(r)) {
+    if (!r.isValid) {
         return wrong_result && isString(wrong_result) ? wrong_result : '';
     }
-    if (undefined !== dayjs) {
-        return dayjs(r).calendar(null, {
-            sameDay: '[' + bbn._('Today') + '] HH:mm',
-            nextDay: '[' + bbn._('Tomorrow') + '] HH:mm',
-            nextWeek: 'ddd D HH:mm',
-            lastDay: '[' + bbn._('Yesterday') + '] HH:mm',
-            lastWeek: 'ddd D HH:mm',
-            sameElse: 'DD/MM/YYYY HH:mm',
-        });
-        //return dayjs(r).format("DD/MM/YYYY HH:mm")
-    }
-    return r.toLocaleDateString();
+    return r.fdate(false, true);
 }
 ;

package/dist/fn/datetime/formatDate.d.ts

@@ -1 +1 @@
-export default function formatDate(date: any, format: any): string;
+export default function formatDate(dateToFormat: any, format: any): string;

package/dist/fn/datetime/formatDate.js

@@ -1,4 +1,9 @@
-export default function formatDate(date, format) {
-    return dayjs(date).format(format);
+import date from '../../date.js';
+export default function formatDate(dateToFormat, format) {
+    const d = date(dateToFormat);
+    if (!d.isValid) {
+        return '';
+    }
+    return d.format(format);
 }
 ;

package/dist/fn/datetime/ftime.js

@@ -1,5 +1,4 @@
-import date from './date.js';
-import isDate from '../type/isDate.js';
+import date from '../../date.js';
 import isString from '../type/isString.js';
 /**
  * @method   ftime
@@ -10,12 +9,9 @@ import isString from '../type/isString.js';
  */
 export default function ftime(d, wrong_result) {
     let r = date(d);
-    if (!isDate(r)) {
+    if (!r.isValid) {
         return wrong_result && isString(wrong_result) ? wrong_result : '';
     }
-    if (undefined !== dayjs) {
-        return dayjs(r).calendar();
-    }
-    return r.toLocaleDateString();
+    return r.ftime();
 }
 ;

package/package.json

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