@bbn/bbn 1.0.486 → 1.0.488

package/dist/date.d.ts

@@ -23,18 +23,22 @@ declare class bbnDateTool {
     get MMMM(): string;
     get MMM(): string;
     get MM(): string;
+    get M(): string;
     get EE(): string;
     get DD(): string;
+    get D(): string;
     get HH(): string;
+    get H(): string;
     get II(): string;
+    get I(): string;
     get SS(): string;
+    get S(): string;
     get WW(): string;
     get isValid(): boolean;
     get daysInMonth(): number;
     valueOf(): number;
     add(value: number, unit?: string): bbnDateTool | null;
-    sub(value: number, unit: string | null): bbnDateTool;
-    subtract(value: number, unit: string | null): bbnDateTool;
+    subtract(value: number, unit?: string): bbnDateTool;
     dateFromFormat(value: string, unit: string | null): Date;
     date(): string;
     datetime(): string;
@@ -82,6 +86,7 @@ declare class bbnDateTool {
      * Units: year, month, week, day, hour, minute, second
      */
     endOf(unit?: string): bbnDateTool;
+    duration(num: number, unit?: string): any;
 }
 declare function generatorFunction(value: any, inputFormat?: null | String): bbnDateTool;
 export default generatorFunction;

package/dist/date.js

@@ -9,7 +9,7 @@ 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;
+var _bbnDateDuration_instances, _bbnDateDuration_durationMs, _bbnDateDuration_unit, _bbnDateDuration_getUnitRowByName, _bbnDateDuration_getUnitValue, _bbnDateTool_value, _bbnDateTool_daysInMonth, _bbnDateTool_isDuration;
 import _ from './_.js';
 import each from './fn/loop/each.js';
 import substr from './fn/string/substr.js';
@@ -204,18 +204,127 @@ const unitsCorrespondence = {
     'W': 'w',
     'w': 'w'
 };
+class bbnDateDuration {
+    constructor(len, unit, fromMs = false) {
+        _bbnDateDuration_instances.add(this);
+        _bbnDateDuration_durationMs.set(this, 0);
+        _bbnDateDuration_unit.set(this, '');
+        const realUnit = unitsCorrespondence[unit] || unit;
+        if (!realUnit) {
+            throw new Error('Invalid unit for duration: ' + unit);
+        }
+        __classPrivateFieldSet(this, _bbnDateDuration_unit, realUnit, "f");
+        const row = bbn.fn.getRow(units, d => d[0] === realUnit);
+        if (!row) {
+            throw new Error('Invalid unit for duration: ' + realUnit);
+        }
+        const msPerUnit = row[2];
+        __classPrivateFieldSet(this, _bbnDateDuration_durationMs, fromMs ? len : len * msPerUnit, "f");
+    }
+    // -----------------------
+    //     Public getters
+    // -----------------------
+    years(remaining = false) { return __classPrivateFieldGet(this, _bbnDateDuration_instances, "m", _bbnDateDuration_getUnitValue).call(this, 'year', remaining); }
+    months(remaining = false) { return __classPrivateFieldGet(this, _bbnDateDuration_instances, "m", _bbnDateDuration_getUnitValue).call(this, 'month', remaining); }
+    weeks(remaining = false) { return __classPrivateFieldGet(this, _bbnDateDuration_instances, "m", _bbnDateDuration_getUnitValue).call(this, 'week', remaining); }
+    days(remaining = false) { return __classPrivateFieldGet(this, _bbnDateDuration_instances, "m", _bbnDateDuration_getUnitValue).call(this, 'day', remaining); }
+    hours(remaining = false) { return __classPrivateFieldGet(this, _bbnDateDuration_instances, "m", _bbnDateDuration_getUnitValue).call(this, 'hour', remaining); }
+    minutes(remaining = false) { return __classPrivateFieldGet(this, _bbnDateDuration_instances, "m", _bbnDateDuration_getUnitValue).call(this, 'minute', remaining); }
+    seconds(remaining = false) { return __classPrivateFieldGet(this, _bbnDateDuration_instances, "m", _bbnDateDuration_getUnitValue).call(this, 'second', remaining); }
+    // -----------------------
+    //      Day.js style
+    //   "asX" conversions
+    // -----------------------
+    /**
+     * Returns the full duration expressed as X (float), like Day.js.
+     */
+    asYears() {
+        const [, , ms] = __classPrivateFieldGet(this, _bbnDateDuration_instances, "m", _bbnDateDuration_getUnitRowByName).call(this, 'year');
+        return __classPrivateFieldGet(this, _bbnDateDuration_durationMs, "f") / ms;
+    }
+    asMonths() {
+        const [, , ms] = __classPrivateFieldGet(this, _bbnDateDuration_instances, "m", _bbnDateDuration_getUnitRowByName).call(this, 'month');
+        return __classPrivateFieldGet(this, _bbnDateDuration_durationMs, "f") / ms;
+    }
+    asWeeks() {
+        const [, , ms] = __classPrivateFieldGet(this, _bbnDateDuration_instances, "m", _bbnDateDuration_getUnitRowByName).call(this, 'week');
+        return __classPrivateFieldGet(this, _bbnDateDuration_durationMs, "f") / ms;
+    }
+    asDays() {
+        const [, , ms] = __classPrivateFieldGet(this, _bbnDateDuration_instances, "m", _bbnDateDuration_getUnitRowByName).call(this, 'day');
+        return __classPrivateFieldGet(this, _bbnDateDuration_durationMs, "f") / ms;
+    }
+    asHours() {
+        const [, , ms] = __classPrivateFieldGet(this, _bbnDateDuration_instances, "m", _bbnDateDuration_getUnitRowByName).call(this, 'hour');
+        return __classPrivateFieldGet(this, _bbnDateDuration_durationMs, "f") / ms;
+    }
+    asMinutes() {
+        const [, , ms] = __classPrivateFieldGet(this, _bbnDateDuration_instances, "m", _bbnDateDuration_getUnitRowByName).call(this, 'minute');
+        return __classPrivateFieldGet(this, _bbnDateDuration_durationMs, "f") / ms;
+    }
+    asSeconds() {
+        const [, , ms] = __classPrivateFieldGet(this, _bbnDateDuration_instances, "m", _bbnDateDuration_getUnitRowByName).call(this, 'second');
+        return __classPrivateFieldGet(this, _bbnDateDuration_durationMs, "f") / ms;
+    }
+    /**
+     * Add any unit (or instance default).
+     */
+    add(value, unit) {
+        const targetUnit = unit
+            ? (unitsCorrespondence[unit] || unit)
+            : __classPrivateFieldGet(this, _bbnDateDuration_unit, "f");
+        const row = bbn.fn.getRow(units, d => d[0] === targetUnit);
+        if (!row) {
+            throw new Error('Invalid unit for duration: ' + (unit !== null && unit !== void 0 ? unit : targetUnit));
+        }
+        return new bbnDateDuration(__classPrivateFieldGet(this, _bbnDateDuration_durationMs, "f") + value * row[2], __classPrivateFieldGet(this, _bbnDateDuration_unit, "f"), true);
+    }
+    subtract(value, unit) {
+        return this.add(-value, unit);
+    }
+    toMilliseconds() {
+        return __classPrivateFieldGet(this, _bbnDateDuration_durationMs, "f");
+    }
+}
+_bbnDateDuration_durationMs = new WeakMap(), _bbnDateDuration_unit = new WeakMap(), _bbnDateDuration_instances = new WeakSet(), _bbnDateDuration_getUnitRowByName = function _bbnDateDuration_getUnitRowByName(name) {
+    const row = bbn.fn.getRow(units, d => d[1] === name);
+    if (!row) {
+        throw new Error('Unit name not found: ' + name);
+    }
+    return row;
+}, _bbnDateDuration_getUnitValue = function _bbnDateDuration_getUnitValue(name, remaining) {
+    const index = units.findIndex(([, n]) => n === name);
+    if (index === -1) {
+        throw new Error('Unit not found: ' + name);
+    }
+    const unitMs = units[index][2];
+    // Total units
+    if (!remaining) {
+        return Math.floor(__classPrivateFieldGet(this, _bbnDateDuration_durationMs, "f") / unitMs);
+    }
+    // Remaining units
+    let remainingMs = __classPrivateFieldGet(this, _bbnDateDuration_durationMs, "f");
+    for (let i = 0; i < index; i++) {
+        const [, , msHigher] = units[i];
+        const amount = Math.floor(remainingMs / msHigher);
+        remainingMs -= amount * msHigher;
+    }
+    return Math.floor(remainingMs / unitMs);
+};
 class bbnDateTool {
     constructor(value, inputFormat = null) {
         _bbnDateTool_value.set(this, void 0);
         _bbnDateTool_daysInMonth.set(this, 0);
+        _bbnDateTool_isDuration.set(this, false);
+        let t = typeof value;
         if (!value) {
             __classPrivateFieldSet(this, _bbnDateTool_value, new Date(), "f");
         }
         else if (inputFormat) {
+            /** @todo read the date from the input format */
             __classPrivateFieldSet(this, _bbnDateTool_value, new Date(), "f");
         }
         else {
-            let t = typeof value;
             if (t === 'number' || (isNumber(value) && value !== '')) {
                 if ((value < 5000) && isNumber(inputFormat)) {
                     value = Array.from(arguments);
@@ -362,6 +471,9 @@ class bbnDateTool {
         const m = parseInt(this.month().toString());
         return m < 10 ? '0' + m.toString() : m.toString();
     }
+    get M() {
+        return this.month().toString();
+    }
     get EE() {
         return this.weekday().toString();
     }
@@ -369,18 +481,30 @@ class bbnDateTool {
         const d = parseInt(this.day().toString());
         return d < 10 ? '0' + d.toString() : d.toString();
     }
+    get D() {
+        return this.day().toString();
+    }
     get HH() {
         const h = parseInt(this.hours().toString());
         return h < 10 ? '0' + h.toString() : h.toString();
     }
+    get H() {
+        return this.hours().toString();
+    }
     get II() {
         const i = parseInt(this.minutes().toString());
         return i < 10 ? '0' + i.toString() : i.toString();
     }
+    get I() {
+        return this.minutes().toString();
+    }
     get SS() {
         const s = parseInt(this.seconds().toString());
         return s < 10 ? '0' + s.toString() : s.toString();
     }
+    get S() {
+        return this.seconds().toString();
+    }
     get WW() {
         const y = parseInt(this.year().toString());
         const firstDayOfYear = new Date(y, 0, 1);
@@ -430,9 +554,6 @@ class bbnDateTool {
         }
         return null;
     }
-    sub(value, unit) {
-        return this.add(-value, unit);
-    }
     subtract(value, unit) {
         return this.add(-value, unit);
     }
@@ -814,8 +935,11 @@ class bbnDateTool {
         }
         return new bbnDateTool(d);
     }
+    duration(num, unit = 's') {
+        return new bbnDateDuration(num, unit);
+    }
 }
-_bbnDateTool_value = new WeakMap(), _bbnDateTool_daysInMonth = new WeakMap();
+_bbnDateTool_value = new WeakMap(), _bbnDateTool_daysInMonth = new WeakMap(), _bbnDateTool_isDuration = new WeakMap();
 function generatorFunction(value, inputFormat = null) {
     if (value instanceof bbnDateTool) {
         return value;

package/package.json

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